Index: reactos/media/fonts/Marlett.ttf =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: reactos/win32ss/gdi/ntgdi/freetype.c =================================================================== --- reactos/win32ss/gdi/ntgdi/freetype.c (revision 74278) +++ reactos/win32ss/gdi/ntgdi/freetype.c (working copy) @@ -49,7 +49,6 @@ FT_Library library; /* special font names */ -static const UNICODE_STRING MarlettW = RTL_CONSTANT_STRING(L"Marlett"); static const UNICODE_STRING SystemW = RTL_CONSTANT_STRING(L"System"); static const UNICODE_STRING FixedSysW = RTL_CONSTANT_STRING(L"FixedSys"); @@ -863,12 +862,6 @@ IntUnLockFreeType; } - /* FIXME: CharSet is invalid on Marlett */ - if (RtlEqualUnicodeString(&Entry->FaceName, &MarlettW, TRUE)) - { - FontGDI->CharSet = SYMBOL_CHARSET; - } - ++FontCount; DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name); DPRINT("Num glyphs: %d\n", Face->num_glyphs); @@ -3647,18 +3640,6 @@ else /* Request is non-"System" font */ { Byte = RequestedCharSet; - if (Byte == DEFAULT_CHARSET) - { - if (RtlEqualUnicodeString(RequestedNameW, &MarlettW, TRUE)) - { - if (Byte == ANSI_CHARSET) - { - DPRINT("Warning: FIXME: It's Marlett but ANSI_CHARSET.\n"); - } - /* We assume SYMBOL_CHARSET for "Marlett" font */ - Byte = SYMBOL_CHARSET; - } - } if (Byte != TM->tmCharSet) {