infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-05 13:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

8163177: Fix for 8152971 breaks builds with VS2010

Browse Source 
Reviewed-by: simonis, pnarayanan
This commit is contained in:
Christoph Langer 2016-08-04 15:58:28 +02:00
parent 3c2ec5319e
commit 3673248f32
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/src/java.desktop/windows/native/libfontmanager/fontpath.c
View File

@ -263,6 +263,7 @@ static int CALLBACK EnumFamilyNamesW(
jstring familyLC;
size_t slen;
LOGFONTW lfw;
jboolean mapHasKey;
/* Exceptions indicate critical errors such that program cannot continue
* with further execution. Henceforth, the function returns immediately
@ -311,10 +312,10 @@ static int CALLBACK EnumFamilyNamesW(
}
/* check if already seen this family with a different charset */
jboolean mapHasKey = (*env)->CallBooleanMethod(env,
fmi->familyToFontListMap,
fmi->containsKeyMID,
familyLC);
mapHasKey = (*env)->CallBooleanMethod(env,
fmi->familyToFontListMap,
fmi->containsKeyMID,
familyLC);
if ((*env)->ExceptionCheck(env)) {
/* Delete the created references before return */
DeleteLocalReference(env, fmi->family);
@ -535,6 +536,7 @@ Java_sun_awt_Win32FontManager_populateFontFileNameMap0
jclass classIDString;
jmethodID putMID;
GdiFontMapInfo fmi;
LOGFONTW lfw;
/* Check we were passed all the maps we need, and do lookup of
* methods for JNI up-calls
@ -598,7 +600,6 @@ Java_sun_awt_Win32FontManager_populateFontFileNameMap0
}
/* Enumerate fonts via GDI to build maps of fonts and families */
LOGFONTW lfw;
memset(&lfw, 0, sizeof(lfw));
lfw.lfCharSet = DEFAULT_CHARSET; /* all charsets */
wcscpy(lfw.lfFaceName, L""); /* one face per family (CHECK) */