stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8323664: java/awt/font/JNICheck/FreeTypeScalerJNICheck.java still fails with JNI warning on some Windows configurations

Browse Source 
Reviewed-by: prr, mbaesken, aivanov
This commit is contained in:
Christoph Langer 2024-02-15 22:36:54 +00:00
parent 0fdfdf71f2
commit 99c9ae127c
2 changed files with 16 additions and 16 deletions
src/java.desktop/windows/native/libawt/windows
awt_Debug.cpp
test/jdk/java/awt/font/JNICheck
FreeTypeScalerJNICheck.java

21
src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2024, 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
@ -153,21 +153,20 @@ AwtDebugSupport::~AwtDebugSupport() {
static jboolean isHeadless() {
jmethodID headlessFn;
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
jclass graphicsEnvClass = env->FindClass(
"java/awt/GraphicsEnvironment");
// be on the safe side and avoid JNI warnings by calling ExceptionCheck
// an accumulated exception is not cleared
env->ExceptionCheck();
jclass graphicsEnvClass = env->FindClass("java/awt/GraphicsEnvironment");
if (graphicsEnvClass != NULL) {
headlessFn = env->GetStaticMethodID(
graphicsEnvClass, "isHeadless", "()Z");
headlessFn = env->GetStaticMethodID(graphicsEnvClass, "isHeadless", "()Z");
if (headlessFn != NULL) {
return env->CallStaticBooleanMethod(graphicsEnvClass,
headlessFn);
return env->CallStaticBooleanMethod(graphicsEnvClass, headlessFn);
}
}
return true;
}
void AwtDebugSupport::AssertCallback(const char * expr, const char * file, int line) {
static const int ASSERT_MSG_SIZE = 1024;
static const char * AssertFmt =
@ -177,9 +176,9 @@ void AwtDebugSupport::AssertCallback(const char * expr, const char * file, int l
"Do you want to break into the debugger?";
static char assertMsg[ASSERT_MSG_SIZE+1];
DWORD lastError = GetLastError();
LPSTR msgBuffer = NULL;
int ret = IDNO;
DWORD lastError = GetLastError();
LPSTR msgBuffer = NULL;
int ret = IDNO;
static jboolean headless = isHeadless();
DWORD fret= FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |

11
test/jdk/java/awt/font/JNICheck/FreeTypeScalerJNICheck.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, JetBrains s.r.o.. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@ -45,7 +45,10 @@ public class FreeTypeScalerJNICheck {
} else {
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder("-Xcheck:jni", FreeTypeScalerJNICheck.class.getName(), "runtest");
OutputAnalyzer oa = ProcessTools.executeProcess(pb);
oa.shouldContain("Done").shouldNotContain("WARNING").shouldHaveExitValue(0);
oa.shouldContain("Done")
.shouldNotContain("WARNING")
.shouldNotContain("AWT Assertion")
.shouldHaveExitValue(0);
}
}
@ -54,8 +57,7 @@ public class FreeTypeScalerJNICheck {
BufferedImage bi = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
Graphics2D g2d = bi.createGraphics();
for (String ff : families)
{
for (String ff : families) {
Font font = new Font(ff, Font.PLAIN, 12);
Rectangle2D bounds = font.getStringBounds("test", g2d.getFontRenderContext());
g2d.setFont(font);
@ -66,4 +68,3 @@ public class FreeTypeScalerJNICheck {
System.out.println("Done");
}
}