diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 86b3003d737..e2aca593f21 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -860,27 +860,6 @@ INT WINAPI EnumFontFamiliesExA( HDC hDC, LPLOGFONTA plf, return FONT_EnumFontFamiliesEx( hDC, plfW, (FONTENUMPROCW)efproc, lParam, 0); } -/*********************************************************************** - * EnumFontFamilies (GDI.330) - */ -INT16 WINAPI EnumFontFamilies16( HDC16 hDC, LPCSTR lpFamily, - FONTENUMPROC16 efproc, LPARAM lpData ) -{ - LOGFONT16 lf, *plf; - - if (lpFamily) - { - if (!*lpFamily) return 1; - lstrcpynA( lf.lfFaceName, lpFamily, LF_FACESIZE ); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfPitchAndFamily = 0; - plf = &lf; - } - else plf = NULL; - - return EnumFontFamiliesEx16( hDC, plf, efproc, lpData, 0 ); -} - /*********************************************************************** * EnumFontFamiliesA (GDI32.@) */ @@ -923,15 +902,6 @@ INT WINAPI EnumFontFamiliesW( HDC hDC, LPCWSTR lpFamily, return EnumFontFamiliesExW( hDC, plf, efproc, lpData, 0 ); } -/*********************************************************************** - * EnumFonts (GDI.70) - */ -INT16 WINAPI EnumFonts16( HDC16 hDC, LPCSTR lpName, FONTENUMPROC16 efproc, - LPARAM lpData ) -{ - return EnumFontFamilies16( hDC, lpName, efproc, lpData ); -} - /*********************************************************************** * EnumFontsA (GDI32.@) */ diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 069c5283608..813c57e4f3e 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -1045,6 +1045,16 @@ BOOL16 WINAPI DeleteObject16( HGDIOBJ16 obj ) } +/*********************************************************************** + * EnumFonts (GDI.70) + */ +INT16 WINAPI EnumFonts16( HDC16 hDC, LPCSTR lpName, FONTENUMPROC16 efproc, + LPARAM lpData ) +{ + return EnumFontFamilies16( hDC, lpName, efproc, lpData ); +} + + /*********************************************************************** * EnumObjects (GDI.71) */ @@ -1928,6 +1938,28 @@ BOOL16 WINAPI GetRasterizerCaps16( LPRASTERIZER_STATUS lprs, UINT16 cbNumBytes ) } +/*********************************************************************** + * EnumFontFamilies (GDI.330) + */ +INT16 WINAPI EnumFontFamilies16( HDC16 hDC, LPCSTR lpFamily, + FONTENUMPROC16 efproc, LPARAM lpData ) +{ + LOGFONT16 lf, *plf; + + if (lpFamily) + { + if (!*lpFamily) return 1; + lstrcpynA( lf.lfFaceName, lpFamily, LF_FACESIZE ); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = 0; + plf = &lf; + } + else plf = NULL; + + return EnumFontFamiliesEx16( hDC, plf, efproc, lpData, 0 ); +} + + /************************************************************************* * GetKerningPairs (GDI.332) *