diff --git a/win32ss/gdi/gdi32/objects/font.c b/win32ss/gdi/gdi32/objects/font.c index 566d703ccb5..a42b02c043d 100644 --- a/win32ss/gdi/gdi32/objects/font.c +++ b/win32ss/gdi/gdi32/objects/font.c @@ -335,11 +335,8 @@ IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam, } } - DPRINT("qsort\n"); qsort(Info, FontFamilyCount, sizeof(*Info), IntFontFamilyCompare); - DPRINT("qsort done\n"); FontFamilyCount = IntFontFamilyListUnique(Info, FontFamilyCount, LogFont, dwFlags); - DPRINT("unique done\n"); for (i = 0; i < FontFamilyCount; i++) { @@ -384,6 +381,17 @@ int WINAPI EnumFontFamiliesExW(HDC hdc, LPLOGFONTW lpLogfont, FONTENUMPROCW lpEnumFontFamExProc, LPARAM lParam, DWORD dwFlags) { + if (lpLogfont) + { + DPRINT("EnumFontFamiliesExW(%p, %p(%S, %u, %u), %p, %p, 0x%08lX)\n", + hdc, lpLogfont, lpLogfont->lfFaceName, lpLogfont->lfCharSet, + lpLogfont->lfPitchAndFamily, lpEnumFontFamExProc, lParam, dwFlags); + } + else + { + DPRINT("EnumFontFamiliesExW(%p, NULL, %p, %p, 0x%08lX)\n", + hdc, lpEnumFontFamExProc, lParam, dwFlags); + } return IntEnumFontFamilies(hdc, lpLogfont, lpEnumFontFamExProc, lParam, IEFF_UNICODE | IEFF_EXTENDED); } @@ -398,6 +406,9 @@ EnumFontFamiliesW(HDC hdc, LPCWSTR lpszFamily, FONTENUMPROCW lpEnumFontFamProc, { LOGFONTW LogFont; + DPRINT("EnumFontFamiliesW(%p, %S, %p, %p)\n", + hdc, lpszFamily, lpEnumFontFamProc, lParam); + ZeroMemory(&LogFont, sizeof(LOGFONTW)); LogFont.lfCharSet = DEFAULT_CHARSET; if (NULL != lpszFamily) @@ -419,6 +430,18 @@ EnumFontFamiliesExA (HDC hdc, LPLOGFONTA lpLogfont, FONTENUMPROCA lpEnumFontFamE { LOGFONTW LogFontW, *pLogFontW; + if (lpLogfont) + { + DPRINT("EnumFontFamiliesExA(%p, %p(%s, %u, %u), %p, %p, 0x%08lX)\n", + hdc, lpLogfont, lpLogfont->lfFaceName, lpLogfont->lfCharSet, + lpLogfont->lfPitchAndFamily, lpEnumFontFamExProc, lParam, dwFlags); + } + else + { + DPRINT("EnumFontFamiliesExA(%p, NULL, %p, %p, 0x%08lX)\n", + hdc, lpEnumFontFamExProc, lParam, dwFlags); + } + if (lpLogfont) { LogFontA2W(&LogFontW,lpLogfont); @@ -440,6 +463,9 @@ EnumFontFamiliesA(HDC hdc, LPCSTR lpszFamily, FONTENUMPROCA lpEnumFontFamProc, { LOGFONTW LogFont; + DPRINT("EnumFontFamiliesA(%p, %s, %p, %p)\n", + hdc, lpszFamily, lpEnumFontFamProc, lParam); + ZeroMemory(&LogFont, sizeof(LOGFONTW)); LogFont.lfCharSet = DEFAULT_CHARSET; if (NULL != lpszFamily)