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) @@ -310,17 +310,24 @@ EnumFontFamiliesW(HDC hdc, LPCWSTR lpszFamily, FONTENUMPROCW 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 */ lstrcpynW(LogFont.lfFaceName, lpszFamily, LF_FACESIZE); + LogFont.lfCharSet = DEFAULT_CHARSET; + LogFont.lfPitchAndFamily = 0; + plf = &LogFont; } + else + { + plf = NULL; + } - return IntEnumFontFamilies(hdc, &LogFont, lpEnumFontFamProc, lParam, TRUE); + return IntEnumFontFamilies(hdc, plf, lpEnumFontFamProc, lParam, TRUE); }