[ros-diffs] [jimtabor] 26542: Move CreateFontIndirectEx from stubs to font.c.

Author: jimtabor
Date: Fri Apr 27 19:26:21 2007
New Revision: 26542

URL: http://svn.reactos.org/svn/reactos?rev=26542&view=rev
Log:
Move CreateFontIndirectEx from stubs to font.c.

Modified:
    trunk/reactos/dll/win32/gdi32/misc/stubsa.c
    trunk/reactos/dll/win32/gdi32/misc/stubsw.c
    trunk/reactos/dll/win32/gdi32/objects/font.c

Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubsa.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c Fri Apr 27 19:26:21 2007
@@ -269,30 +269,6 @@
 	return 0;
 }
 
-
-/*
- * @unimplemented
- */
-HFONT
-STDCALL
-CreateFontIndirectExA(const ENUMLOGFONTEXDVA *elfexd)
-{
-  if (elfexd)
-  {
-    ENUMLOGFONTEXDVW Logfont;
-
-    EnumLogFontExW2A( (LPENUMLOGFONTEXA) elfexd,
-                                      &Logfont.elfEnumLogfontEx );
-
-    RtlCopyMemory( &Logfont.elfDesignVector,
-                           (PVOID) &elfexd->elfDesignVector,
-                                             sizeof(DESIGNVECTOR));
-
-    return NtGdiHfontCreate( &Logfont, 0, 0, 0, NULL);
-  }
-  else return NULL;
-}
-
 /*
  * @unimplemented
  */

Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Fri Apr 27 19:26:21 2007
@@ -349,20 +349,6 @@
 /*
  * @unimplemented
  */
-HFONT
-STDCALL
-CreateFontIndirectExW(const ENUMLOGFONTEXDVW *elfexd)
-{
-  if ( elfexd )
-  {
-   return NtGdiHfontCreate((PENUMLOGFONTEXDVW) elfexd, 0, 0, 0, NULL );
-  }
-  else return NULL;
-}
-
-/*
- * @unimplemented
- */
 DWORD
 STDCALL
 GetGlyphIndicesW(

Modified: trunk/reactos/dll/win32/gdi32/objects/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/font.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/font.c Fri Apr 27 19:26:21 2007
@@ -817,6 +817,48 @@
   TMDIFF Tmd;   // Should not be zero.
 
   return NtGdiGetOutlineTextMetricsInternalW(hdc, cbData, lpOTM, &Tmd);
+}
+
+
+/*
+ * @implemented
+ */
+HFONT
+STDCALL
+CreateFontIndirectExA(const ENUMLOGFONTEXDVA *elfexd)
+{
+  if (elfexd)
+  {
+    ENUMLOGFONTEXDVW Logfont;
+
+    EnumLogFontExW2A( (LPENUMLOGFONTEXA) elfexd,
+                                      &Logfont.elfEnumLogfontEx );
+
+    RtlCopyMemory( &Logfont.elfDesignVector,
+                           (PVOID) &elfexd->elfDesignVector,
+                                             sizeof(DESIGNVECTOR));
+
+    return NtGdiHfontCreate( &Logfont, 0, 0, 0, NULL);
+  }
+  else return NULL;
+}
+
+
+/*
+ * @implemented
+ */
+HFONT
+STDCALL
+CreateFontIndirectExW(const ENUMLOGFONTEXDVW *elfexd)
+{
+  /* Msdn: Note, this function ignores the elfDesignVector member in 
+           ENUMLOGFONTEXDV.
+   */
+  if ( elfexd )
+  {
+   return NtGdiHfontCreate((PENUMLOGFONTEXDVW) elfexd, 0, 0, 0, NULL );
+  }
+  else return NULL;
 }