Modified: trunk/reactos/lib/gdi32/misc/stubsa.c
Modified: trunk/reactos/lib/gdi32/misc/stubsw.c
Modified: trunk/reactos/lib/gdi32/objects/font.c
--- trunk/reactos/lib/gdi32/misc/stubsa.c 2005-11-15 16:48:24 UTC (rev 19249)
+++ trunk/reactos/lib/gdi32/misc/stubsa.c 2005-11-15 16:53:06 UTC (rev 19250)
@@ -32,44 +32,9 @@
return 0;
}
-
/*
* @unimplemented
*/
-int
-STDCALL
-EnumFontsA (
- HDC hDC,
- LPCSTR lpFaceName,
- FONTENUMPROCA FontFunc,
- LPARAM lParam
- )
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-#if 0
- NTSTATUS Status;
- LPWSTR lpFaceNameW;
- int rc = 0;
-
- Status = HEAP_strdupA2W ( &lpFaceNameW, lpFaceName );
- if (!NT_SUCCESS (Status))
- SetLastError (RtlNtStatusToDosError(Status));
- else
- {
- rc = NtGdiEnumFonts ( hDC, lpFaceNameW, FontFunc, lParam );
-
- HEAP_free ( lpFaceNameW );
- }
- return rc;
-#endif
-}
-
-
-/*
- * @unimplemented
- */
UINT
APIENTRY
GetOutlineTextMetricsA(
--- trunk/reactos/lib/gdi32/misc/stubsw.c 2005-11-15 16:48:24 UTC (rev 19249)
+++ trunk/reactos/lib/gdi32/misc/stubsw.c 2005-11-15 16:53:06 UTC (rev 19250)
@@ -40,32 +40,9 @@
#endif
}
-
/*
* @unimplemented
*/
-int
-STDCALL
-EnumFontsW(
- HDC hDC,
- LPCWSTR lpFaceName,
- FONTENUMPROCW FontFunc,
- LPARAM lParam
- )
-{
-#if 0
- return NtGdiEnumFonts ( hDC, lpFaceName, FontFunc, lParam );
-#else
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-#endif
-}
-
-
-/*
- * @unimplemented
- */
UINT
APIENTRY
GetOutlineTextMetricsW(
--- trunk/reactos/lib/gdi32/objects/font.c 2005-11-15 16:48:24 UTC (rev 19249)
+++ trunk/reactos/lib/gdi32/objects/font.c 2005-11-15 16:53:06 UTC (rev 19250)
@@ -834,3 +834,58 @@
return (sz.cx / 26 + 1) / 2;
}
+
+/*
+ * @unimplemented
+ */
+int
+STDCALL
+EnumFontsW(
+ HDC hDC,
+ LPCWSTR lpFaceName,
+ FONTENUMPROCW FontFunc,
+ LPARAM lParam
+ )
+{
+#if 0
+ return NtGdiEnumFonts ( hDC, lpFaceName, FontFunc, lParam );
+#else
+ return EnumFontFamiliesW( hDC, lpFaceName, FontFunc, lParam );
+#endif
+}
+
+/*
+ * @unimplemented
+ */
+int
+STDCALL
+EnumFontsA (
+ HDC hDC,
+ LPCSTR lpFaceName,
+ FONTENUMPROCA FontFunc,
+ LPARAM lParam
+ )
+{
+#if 0
+ NTSTATUS Status;
+ LPWSTR lpFaceNameW;
+ int rc = 0;
+
+ Status = HEAP_strdupA2W ( &lpFaceNameW, lpFaceName );
+ if (!NT_SUCCESS (Status))
+ SetLastError (RtlNtStatusToDosError(Status));
+ else
+ {
+ rc = NtGdiEnumFonts ( hDC, lpFaceNameW, FontFunc, lParam );
+
+ HEAP_free ( lpFaceNameW );
+ }
+ return rc;
+#else
+ return EnumFontFamiliesA( hDC, lpFaceName, FontFunc, lParam );
+#endif
+}
+
+
+
+