infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-26 18:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

8144074: [PIT] Crash calling Toolkit.getScreenSize() on Windows

Browse Source 
Reviewed-by: flar
This commit is contained in:
Phil Race 2015-12-02 09:12:39 -08:00
parent 155cc1f5bc
commit 0302ed2ed2
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
View File

@ -2357,6 +2357,9 @@ Java_sun_awt_windows_WToolkit_getScreenWidth(JNIEnv *env, jobject self)
int width = ::GetSystemMetrics(SM_CXSCREEN);
if (!Devices::GetInstance()) {
Devices::UpdateInstance(env);
}
Devices::InstanceAccess devices;
AwtWin32GraphicsDevice *device = devices->GetDevice(
AwtWin32GraphicsDevice::GetDefaultDeviceIndex());
@ -2376,6 +2379,10 @@ 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());

35
jdk/test/java/awt/Toolkit/GetSizeTest/GetScreenSizeTest.java Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
@test
@bug 8144074
@summary Crash while getting screen size during Toolkit initialisation
@run main/othervm GetScreenSize
*/
public class GetScreenSize {
public static void main(String[] args) {
java.awt.Toolkit.getDefaultToolkit().getScreenSize();
}
}