[PATCH 1/3] gdi32: Move EnumFonts16 and EnumFontFamilies16 to gdi16.c.

[Michael Stefaniuc]

---
 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 3624e97..27b01b1 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -878,27 +878,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,
@@ -941,15 +920,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 b0cea2e..aeb0ba8 100644
--- a/dlls/gdi32/gdi16.c
+++ b/dlls/gdi32/gdi16.c
@@ -1027,6 +1027,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 )
@@ -1820,6 +1830,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)
  *
-- 
1.5.4.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20080218/b98a4118/attachment.pgp