src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp

@@ -2355,10 +2355,13 @@
 {
     TRY;
 
     int width = ::GetSystemMetrics(SM_CXSCREEN);
 
+    if (!Devices::GetInstance()) {
+        Devices::UpdateInstance(env);
+    }
     Devices::InstanceAccess devices;
     AwtWin32GraphicsDevice *device = devices->GetDevice(
                         AwtWin32GraphicsDevice::GetDefaultDeviceIndex());
 
     return (device == NULL) ? width : device->ScaleDownX(width);

@@ -2374,10 +2377,14 @@
 Java_sun_awt_windows_WToolkit_getScreenHeight(JNIEnv *env, jobject self)
 {
     TRY;
 
     int height = ::GetSystemMetrics(SM_CYSCREEN);
+
+    if (!Devices::GetInstance()) {
+        Devices::UpdateInstance(env);
+    }
     Devices::InstanceAccess devices;
     AwtWin32GraphicsDevice *device = devices->GetDevice(
                         AwtWin32GraphicsDevice::GetDefaultDeviceIndex());
 
     return (device == NULL) ? height : device->ScaleDownY(height);