Index: reactos/win32ss/gdi/gdi32/objects/font.c =================================================================== --- reactos/win32ss/gdi/gdi32/objects/font.c (revision 74543) +++ reactos/win32ss/gdi/gdi32/objects/font.c (working copy) @@ -352,17 +352,24 @@ EnumFontFamiliesA(HDC hdc, LPCSTR lpszFamily, FONTENUMPROCA lpEnumFontFamProc, LPARAM lParam) { - LOGFONTW LogFont; + LOGFONTW LogFont, *plf; - ZeroMemory(&LogFont, sizeof(LOGFONTW)); - LogFont.lfCharSet = DEFAULT_CHARSET; - if (NULL != lpszFamily) + if (lpszFamily) { if (!*lpszFamily) return 1; + + /* EnumFontFamilies uses lfCharSet, lfFaceName and lfPitchAndFamily */ MultiByteToWideChar(CP_THREAD_ACP, 0, lpszFamily, -1, LogFont.lfFaceName, LF_FACESIZE); + LogFont.lfCharSet = DEFAULT_CHARSET; + LogFont.lfPitchAndFamily = 0; + plf = &LogFont; } + else + { + plf = NULL; + } - return IntEnumFontFamilies(hdc, &LogFont, lpEnumFontFamProc, lParam, FALSE); + return IntEnumFontFamilies(hdc, plf, lpEnumFontFamProc, lParam, FALSE); }