Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FONTS][NTGDI] Change Marlett.ttf charset and delete charset hacks

Browse source
This commit is contained in:
Katayama Hirofumi MZ 2019-07-21 12:59:06 +09:00
parent 5666ea2061
commit 023794c7c1
2 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
media/fonts/Marlett.ttf
View file

Binary file not shown.

27
win32ss/gdi/ntgdi/freetype.c
View file

@ -50,10 +50,6 @@ static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)};
FT_Library g_FreeTypeLibrary;
/* special font names */
static const UNICODE_STRING g_MarlettW = RTL_CONSTANT_STRING(L"Marlett");
#define MARLETT_HACK_CHARSET
/* registry */
static UNICODE_STRING g_FontRegPath =
RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts");
@ -1307,14 +1303,6 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont)
if (FT_IS_SFNT(Face))
{
FontGDI->CharSet = IntGetCharSet(iCharSet, os2_ulCodePageRange1);
#ifdef MARLETT_HACK_CHARSET
/* FIXME: CharSet is invalid on our Marlett */
if (RtlEqualUnicodeString(&Entry->FaceName, &g_MarlettW, TRUE))
{
FontGDI->CharSet = SYMBOL_CHARSET;
}
#endif
}
else
{
@ -4549,21 +4537,6 @@ GetFontPenalty(const LOGFONTW * LogFont,
Byte = LogFont->lfCharSet;
#ifdef MARLETT_HACK_CHARSET
if (Byte == DEFAULT_CHARSET)
{
if (_wcsicmp(LogFont->lfFaceName, L"Marlett") == 0)
{
if (Byte == ANSI_CHARSET)
{
DPRINT("Warning: FIXME: It's Marlett but ANSI_CHARSET.\n");
}
/* We assume SYMBOL_CHARSET for "Marlett" font */
Byte = SYMBOL_CHARSET;
}
}
#endif
if (Byte != TM->tmCharSet)
{
if (Byte != DEFAULT_CHARSET && Byte != ANSI_CHARSET)