ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Move EnumFonts16 and EnumFontFamilies16 to gdi16.c.

This commit is contained in:
Michael Stefaniuc 2008-02-18 23:21:25 +01:00 committed by Alexandre Julliard
parent 3055239f69
commit e9a8e6a426
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/gdi32/font.c
View File

@ -860,27 +860,6 @@ INT WINAPI EnumFontFamiliesExA( HDC hDC, LPLOGFONTA plf,
return FONT_EnumFontFamiliesEx( hDC, plfW, (FONTENUMPROCW)efproc, lParam, 0); 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.@) * EnumFontFamiliesA (GDI32.@)
*/ */
@ -923,15 +902,6 @@ INT WINAPI EnumFontFamiliesW( HDC hDC, LPCWSTR lpFamily,
return EnumFontFamiliesExW( hDC, plf, efproc, lpData, 0 ); 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.@) * EnumFontsA (GDI32.@)
*/ */

32
dlls/gdi32/gdi16.c
View File

@ -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) * 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) * GetKerningPairs (GDI.332)
* *