Michael Stefaniuc : gdi32: Move EnumFonts16 and EnumFontFamilies16 to gdi16 .c.
Alexandre Julliard
julliard at winehq.org
Tue Feb 19 08:05:16 CST 2008
Module: wine
Branch: master
Commit: e9a8e6a42602e37f320a26d2593683f8121d3085
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9a8e6a42602e37f320a26d2593683f8121d3085
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Mon Feb 18 23:21:25 2008 +0100
gdi32: Move EnumFonts16 and EnumFontFamilies16 to gdi16.c.
---
dlls/gdi32/font.c | 30 ------------------------------
dlls/gdi32/gdi16.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 86b3003..e2aca59 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -861,27 +861,6 @@ INT WINAPI EnumFontFamiliesExA( HDC hDC, LPLOGFONTA plf,
}
/***********************************************************************
- * 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.@)
*/
INT WINAPI EnumFontFamiliesA( HDC hDC, LPCSTR lpFamily,
@@ -924,15 +903,6 @@ INT WINAPI EnumFontFamiliesW( HDC hDC, LPCWSTR lpFamily,
}
/***********************************************************************
- * EnumFonts (GDI.70)
- */
-INT16 WINAPI EnumFonts16( HDC16 hDC, LPCSTR lpName, FONTENUMPROC16 efproc,
- LPARAM lpData )
-{
- return EnumFontFamilies16( hDC, lpName, efproc, lpData );
-}
-
-/***********************************************************************
* EnumFontsA (GDI32.@)
*/
INT WINAPI EnumFontsA( HDC hDC, LPCSTR lpName, FONTENUMPROCA efproc,
diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c
index 069c528..813c57e 100644
--- a/dlls/gdi32/gdi16.c
+++ b/dlls/gdi32/gdi16.c
@@ -1046,6 +1046,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)
*/
INT16 WINAPI EnumObjects16( HDC16 hdc, INT16 obj, GOBJENUMPROC16 proc, LPARAM lParam )
@@ -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)
*
More information about the wine-cvs
mailing list