Index: modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java =================================================================== --- modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java (revision 556414) +++ modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java (working copy) @@ -52,7 +52,7 @@ */ public String[] allFamilies; - public static final String DEFAULT_NAME = IS_FONTLIB ? "Luxi Sans" : "Default"; /* Default font name */ //$NON-NLS-1$ + public static final String DEFAULT_NAME = IS_FONTLIB ? "Courier" : "Default"; /* Default font name */ //$NON-NLS-1$ public static final String DIALOG_NAME = "Dialog"; /* Dialog font name */ //$NON-NLS-1$ /** Index: modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp =================================================================== --- modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp (revision 556414) +++ modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp (working copy) @@ -377,21 +377,21 @@ } subFamilyName[j] = 0; -/*#ifdef WIN32 +//#ifdef WIN32 -#define COMPARE_IT (!_wcsicmp((fwchar_t *)subFamilyName,L"Italic")) -#define COMPARE_BD (!_wcsicmp((fwchar_t *)subFamilyName,L"Bold")) -#define COMPARE_BDIT (!_wcsicmp((fwchar_t *)subFamilyName,L"Bold Italic")) -#define COMPARE_REG (!_wcsicmp((fwchar_t *)subFamilyName,L"Regular") || !_wcsicmp((fwchar_t *)subFamilyName,L"Normal")) +#define COMPARE_IT (!fwcscmp((ufshort *)subFamilyName,"Italic")) +#define COMPARE_BD (!fwcscmp((ufshort *)subFamilyName,"Bold")) +#define COMPARE_BDIT (!fwcscmp((ufshort *)subFamilyName,"Bold Italic")) +#define COMPARE_REG (!fwcscmp((ufshort *)subFamilyName,"Regular") || !fwcscmp((fwchar_t *)subFamilyName,"Normal")) -#else*/ +/*#else #define COMPARE_IT (compare((fwchar_t *)subFamilyName, "Italic")) #define COMPARE_BD (compare((fwchar_t *)subFamilyName, "Bold")) #define COMPARE_BDIT (compare((fwchar_t *)subFamilyName, "Bold Italic")) #define COMPARE_REG (compare((fwchar_t *)subFamilyName, "Regular") || compare((fwchar_t *)subFamilyName, "Normal")) -//#endif +#endif*/ if COMPARE_IT { Index: modules/awt/src/main/native/fontlib/shared/TypeDefinition.h =================================================================== --- modules/awt/src/main/native/fontlib/shared/TypeDefinition.h (revision 556414) +++ modules/awt/src/main/native/fontlib/shared/TypeDefinition.h (working copy) @@ -30,6 +30,7 @@ typedef unsigned short fwchar_t; fint fwcslen(fwchar_t* str); +fint fwcscmp(fwchar_t* str1, fchar* str2); fint fwcscmp(fwchar_t* str1, fwchar_t* str2); #endif Index: modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp =================================================================== --- modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp (revision 556414) +++ modules/awt/src/main/native/fontlib/shared/TypeDefinition.cpp (working copy) @@ -33,10 +33,29 @@ return counter; } +fint fwcscmp(fwchar_t* str1, fchar* str2) +{ + if (str1 == 0 || str2 == 0) + return (fint)(str1 - (fwchar_t*)str2); + + fwchar_t* tmpstr1 = str1; + fchar* tmpstr2 = str2; + while(*tmpstr1 != 0 || *tmpstr2 !=0) + { + if (*tmpstr1 != (fwchar_t)(*tmpstr2)) + return -1; + + tmpstr1++; + tmpstr2++; + } + + return 0; +} + fint fwcscmp(fwchar_t* str1, fwchar_t* str2) { if (str1 == 0 || str2 == 0) - return str1 - str2; + return (fint)(str1 - str2); fwchar_t* tmpstr1 = str1; fwchar_t* tmpstr2 = str2;