infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-25 09:40:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8172999: Crash on Windows getting FontMetrics since JDK 9 b96

Browse Source 
Reviewed-by: serb, vadim
This commit is contained in:
Phil Race 2017-01-20 10:28:34 -08:00
parent 3713153413
commit bf606da869
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.cpp
View File

@ -854,6 +854,10 @@ int AwtWin32GraphicsDevice::GetScreenFromHMONITOR(HMONITOR mon) {
"AwtWin32GraphicsDevice::GetScreenFromHMONITOR mhnd=%x", mon);
DASSERT(mon != NULL);
JNIEnv *env = (JNIEnv*) JNU_GetEnv(jvm, JNI_VERSION_1_2);
if (!Devices::GetInstance()) {
Devices::UpdateInstance(env);
}
Devices::InstanceAccess devices;
for (int i = 0; i < devices->GetNumDevices(); i++) {

42
jdk/test/java/awt/FontMetrics/FontCrash.java Normal file
View File

@ -0,0 +1,42 @@
/*
* Copyright (c) 2017, 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 8172999
* @summary Verify no crash loading font metrics instance.
* @run main/othervm FontCrash
*/
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Toolkit;
public class FontCrash {
public static void main(String[] args) {
System.setProperty("java2d.font.usePlatformFont", "true");
Font f = new Font(Font.DIALOG,Font.PLAIN,12);
Toolkit tk = Toolkit.getDefaultToolkit();
tk.getFontMetrics(f);
}
}