Skip to content

Commit 9bc0232

Browse files
mkartashevmrserb
mkartashev
authored and
mrserb
committed
8269223: -Xcheck:jni WARNINGs working with fonts on Linux
Reviewed-by: prr, serb
1 parent 2ff4c01 commit 9bc0232

File tree

5 files changed

+105
-7
lines changed

5 files changed

+105
-7
lines changed

‎src/java.desktop/share/native/libfontmanager/freetypeScaler.c‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@
4646

4747
#include "fontscaler.h"
4848

49+
#define CHECK_EXCEPTION(env, describe) \
50+
if ((*(env))->ExceptionCheck(env)) { \
51+
if (describe) (*(env))->ExceptionDescribe(env);\
52+
else (*(env))->ExceptionClear(env); \
53+
}
54+
4955
#define ftFixed1 (FT_Fixed) (1 << 16)
5056
#define FloatToFTFixed(f) (FT_Fixed)((f) * (float)(ftFixed1))
5157
#define FTFixedToFloat(x) ((x) / (float)(ftFixed1))
@@ -97,12 +103,18 @@ void z_error(char *s) {}
97103
/**************** Error handling utilities *****************/
98104

99105
static jmethodID invalidateScalerMID;
106+
static jboolean debugFonts; // Stores the value of FontUtilities.debugFonts()
100107

101108
JNIEXPORT void JNICALL
102109
Java_sun_font_FreetypeFontScaler_initIDs(
103110
JNIEnv *env, jobject scaler, jclass FFSClass) {
104111
invalidateScalerMID =
105112
(*env)->GetMethodID(env, FFSClass, "invalidateScaler", "()V");
113+
114+
jboolean ignoreException;
115+
debugFonts = JNU_CallStaticMethodByName(env, &ignoreException,
116+
"sun/font/FontUtilities",
117+
"debugFonts", "()Z").z;
106118
}
107119

108120
static void freeNativeResources(JNIEnv *env, FTScalerInfo* scalerInfo) {
@@ -137,6 +149,9 @@ static void invalidateJavaScaler(JNIEnv *env,
137149
FTScalerInfo* scalerInfo) {
138150
freeNativeResources(env, scalerInfo);
139151
(*env)->CallVoidMethod(env, scaler, invalidateScalerMID);
152+
// NB: Exceptions must not be cleared (and therefore no JNI calls
153+
// performed) after calling this method because it intentionally
154+
// leaves an exception pending.
140155
}
141156

142157
/******************* I/O handlers ***************************/
@@ -187,6 +202,7 @@ static unsigned long ReadTTFontFileFunc(FT_Stream stream,
187202
scalerInfo->font2D,
188203
sunFontIDs.ttReadBlockMID,
189204
bBuffer, offset, numBytes);
205+
CHECK_EXCEPTION(env, debugFonts);
190206
if (bread < 0) {
191207
return 0;
192208
} else {
@@ -206,7 +222,8 @@ static unsigned long ReadTTFontFileFunc(FT_Stream stream,
206222
(*env)->CallObjectMethod(env, scalerInfo->font2D,
207223
sunFontIDs.ttReadBytesMID,
208224
offset, numBytes);
209-
/* If there's an OutofMemoryError then byteArray will be null */
225+
CHECK_EXCEPTION(env, debugFonts);
226+
/* If there's an OutOfMemoryError then byteArray will be null */
210227
if (byteArray == NULL) {
211228
return 0;
212229
} else {
@@ -239,6 +256,7 @@ static unsigned long ReadTTFontFileFunc(FT_Stream stream,
239256
sunFontIDs.ttReadBlockMID,
240257
bBuffer, offset,
241258
scalerInfo->fontDataLength);
259+
CHECK_EXCEPTION(env, debugFonts);
242260
if (bread <= 0) {
243261
return 0;
244262
} else if ((unsigned long)bread < numBytes) {

‎src/java.desktop/windows/native/libawt/java2d/d3d/D3DRenderQueue.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,11 @@ void D3DRQ_FlushBuffer(void *pParam)
866866

867867
if (!JNU_IsNull(env, pFlush->runnable)) {
868868
J2dTraceLn(J2D_TRACE_VERBOSE, " executing runnable");
869-
JNU_CallMethodByName(env, NULL, pFlush->runnable, "run", "()V");
869+
jboolean hasException;
870+
JNU_CallMethodByName(env, &hasException, pFlush->runnable, "run", "()V");
871+
if (hasException) {
872+
J2dTraceLn(J2D_TRACE_ERROR, " exception occurred while executing runnable");
873+
}
870874
}
871875
}
872876

‎src/java.desktop/windows/native/libawt/windows/awt_Component.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6569,11 +6569,11 @@ JNIEXPORT void JNICALL
65696569
Java_java_awt_Component_initIDs(JNIEnv *env, jclass cls)
65706570
{
65716571
TRY;
6572-
jclass inputEventClazz = env->FindClass("java/awt/event/InputEvent");
6573-
CHECK_NULL(inputEventClazz);
6574-
jmethodID getButtonDownMasksID = env->GetStaticMethodID(inputEventClazz, "getButtonDownMasks", "()[I");
6575-
CHECK_NULL(getButtonDownMasksID);
6576-
jintArray obj = (jintArray)env->CallStaticObjectMethod(inputEventClazz, getButtonDownMasksID);
6572+
jboolean ignoreException;
6573+
jintArray obj = (jintArray)JNU_CallStaticMethodByName(env, &ignoreException,
6574+
"java/awt/event/InputEvent",
6575+
"getButtonDownMasks", "()[I").l;
6576+
CHECK_NULL(obj);
65776577
jint * tmp = env->GetIntArrayElements(obj, JNI_FALSE);
65786578
CHECK_NULL(tmp);
65796579
jsize len = env->GetArrayLength(obj);

‎src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -752,6 +752,7 @@ void AwtDesktopProperties::SetStringProperty(LPCTSTR propName, LPTSTR value) {
752752
key, jValue);
753753
GetEnv()->DeleteLocalRef(jValue);
754754
GetEnv()->DeleteLocalRef(key);
755+
(void)safe_ExceptionOccurred(GetEnv());
755756
}
756757

757758
void AwtDesktopProperties::SetIntegerProperty(LPCTSTR propName, int value) {
@@ -764,6 +765,7 @@ void AwtDesktopProperties::SetIntegerProperty(LPCTSTR propName, int value) {
764765
AwtDesktopProperties::setIntegerPropertyID,
765766
key, (jint)value);
766767
GetEnv()->DeleteLocalRef(key);
768+
(void)safe_ExceptionOccurred(GetEnv());
767769
}
768770

769771
void AwtDesktopProperties::SetBooleanProperty(LPCTSTR propName, BOOL value) {
@@ -775,6 +777,7 @@ void AwtDesktopProperties::SetBooleanProperty(LPCTSTR propName, BOOL value) {
775777
AwtDesktopProperties::setBooleanPropertyID,
776778
key, value ? JNI_TRUE : JNI_FALSE);
777779
GetEnv()->DeleteLocalRef(key);
780+
(void)safe_ExceptionOccurred(GetEnv());
778781
}
779782

780783
void AwtDesktopProperties::SetColorProperty(LPCTSTR propName, DWORD value) {
@@ -787,6 +790,7 @@ void AwtDesktopProperties::SetColorProperty(LPCTSTR propName, DWORD value) {
787790
key, GetRValue(value), GetGValue(value),
788791
GetBValue(value));
789792
GetEnv()->DeleteLocalRef(key);
793+
(void)safe_ExceptionOccurred(GetEnv());
790794
}
791795

792796
void AwtDesktopProperties::SetFontProperty(HDC dc, int fontID,
@@ -849,6 +853,7 @@ void AwtDesktopProperties::SetFontProperty(HDC dc, int fontID,
849853
key, fontName, style, pointSize);
850854
GetEnv()->DeleteLocalRef(key);
851855
GetEnv()->DeleteLocalRef(fontName);
856+
(void)safe_ExceptionOccurred(GetEnv());
852857
}
853858
}
854859
delete[] face;
@@ -896,6 +901,7 @@ void AwtDesktopProperties::SetFontProperty(LPCTSTR propName, const LOGFONT & fon
896901
key, fontName, style, pointSize);
897902
GetEnv()->DeleteLocalRef(key);
898903
GetEnv()->DeleteLocalRef(fontName);
904+
(void)safe_ExceptionOccurred(GetEnv());
899905
}
900906

901907
void AwtDesktopProperties::SetSoundProperty(LPCTSTR propName, LPCTSTR winEventName) {
@@ -913,6 +919,7 @@ void AwtDesktopProperties::SetSoundProperty(LPCTSTR propName, LPCTSTR winEventNa
913919
key, event);
914920
GetEnv()->DeleteLocalRef(event);
915921
GetEnv()->DeleteLocalRef(key);
922+
(void)safe_ExceptionOccurred(GetEnv());
916923
}
917924

918925
void AwtDesktopProperties::PlayWindowsSound(LPCTSTR event) {

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

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/*
2+
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
3+
* Copyright (c) 2021, JetBrains s.r.o.. All rights reserved.
4+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5+
*
6+
* This code is free software; you can redistribute it and/or modify it
7+
* under the terms of the GNU General Public License version 2 only, as
8+
* published by the Free Software Foundation.
9+
*
10+
* This code is distributed in the hope that it will be useful, but WITHOUT
11+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13+
* version 2 for more details (a copy is included in the LICENSE file that
14+
* accompanied this code).
15+
*
16+
* You should have received a copy of the GNU General Public License version
17+
* 2 along with this work; if not, write to the Free Software Foundation,
18+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
19+
*
20+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
21+
* or visit www.oracle.com if you need additional information or have any
22+
* questions.
23+
*/
24+
25+
/* @test
26+
* @bug 8269223
27+
* @summary Verifies that -Xcheck:jni issues no warnings from freetypeScaler.c
28+
* @library /test/lib
29+
* @run main FreeTypeScalerJNICheck
30+
*/
31+
import java.awt.Font;
32+
import java.awt.FontMetrics;
33+
import java.awt.GraphicsEnvironment;
34+
import java.awt.Graphics2D;
35+
import java.awt.geom.Rectangle2D;
36+
import java.awt.image.BufferedImage;
37+
import javax.swing.JFrame;
38+
import jdk.test.lib.process.ProcessTools;
39+
import jdk.test.lib.process.OutputAnalyzer;
40+
41+
public class FreeTypeScalerJNICheck {
42+
public static void main(String[] args) throws Exception {
43+
if (args.length > 0 && args[0].equals("runtest")) {
44+
runTest();
45+
} else {
46+
ProcessBuilder pb = ProcessTools.createTestJvm("-Xcheck:jni", FreeTypeScalerJNICheck.class.getName(), "runtest");
47+
OutputAnalyzer oa = ProcessTools.executeProcess(pb);
48+
oa.shouldContain("Done").shouldNotContain("WARNING").shouldHaveExitValue(0);
49+
}
50+
}
51+
52+
public static void runTest() {
53+
String families[] = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
54+
BufferedImage bi = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
55+
Graphics2D g2d = bi.createGraphics();
56+
57+
for (String ff : families)
58+
{
59+
Font font = new Font(ff, Font.PLAIN, 12);
60+
Rectangle2D bounds = font.getStringBounds("test", g2d.getFontRenderContext());
61+
g2d.setFont(font);
62+
FontMetrics metrics = g2d.getFontMetrics(font);
63+
System.out.println(bounds.getHeight() + metrics.getHeight()); // use bounds and metrics
64+
}
65+
66+
System.out.println("Done");
67+
}
68+
}
69+

0 commit comments

Comments
 (0)