Move GetTextCharset & Info to text.c. This part of a Wine port.
Modified: trunk/reactos/lib/gdi32/include/precomp.h
Modified: trunk/reactos/lib/gdi32/misc/stubs.c
Modified: trunk/reactos/lib/gdi32/objects/text.c
_____
Modified: trunk/reactos/lib/gdi32/include/precomp.h
--- trunk/reactos/lib/gdi32/include/precomp.h 2006-01-20 00:24:34 UTC
(rev 20948)
+++ trunk/reactos/lib/gdi32/include/precomp.h 2006-01-20 00:52:35 UTC
(rev 20949)
@@ -15,6 +15,7 @@
/* SDK/DDK/NDK Headers. */
#include <windows.h>
#include <ndk/ntndk.h>
+#include <wingdi.h>
#include <winddi.h>
#include <d3dnthal.h>
#include <prntfont.h>
_____
Modified: trunk/reactos/lib/gdi32/misc/stubs.c
--- trunk/reactos/lib/gdi32/misc/stubs.c 2006-01-20 00:24:34 UTC
(rev 20948)
+++ trunk/reactos/lib/gdi32/misc/stubs.c 2006-01-20 00:52:35 UTC
(rev 20949)
@@ -260,38 +260,6 @@
/*
* @unimplemented
*/
-int
-STDCALL
-GetTextCharset(
- HDC hdc
- )
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-
-/*
- * @unimplemented
- */
-int
-STDCALL
-GetTextCharsetInfo(
- HDC hdc,
- LPFONTSIGNATURE lpSig,
- DWORD dwFlags
- )
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-
-/*
- * @unimplemented
- */
DWORD
STDCALL
GetFontLanguageInfo(
_____
Modified: trunk/reactos/lib/gdi32/objects/text.c
--- trunk/reactos/lib/gdi32/objects/text.c 2006-01-20 00:24:34 UTC
(rev 20948)
+++ trunk/reactos/lib/gdi32/objects/text.c 2006-01-20 00:52:35 UTC
(rev 20949)
@@ -1,6 +1,10 @@
#include "precomp.h"
+#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try
again later.\n", __FUNCTION__);
+
+
+
/*
* @implemented
*/
@@ -49,6 +53,37 @@
/*
* @implemented
*/
+int
+STDCALL
+GetTextCharset(
+ HDC hdc
+ )
+{
+ /* MSDN docs say this is equivalent */
+ return GetTextCharsetInfo(hdc, NULL, 0);
+}
+
+
+/*
+ * @unimplemented
+ */
+int
+STDCALL
+GetTextCharsetInfo(
+ HDC hdc,
+ LPFONTSIGNATURE lpSig,
+ DWORD dwFlags
+ )
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+
+/*
+ * @implemented
+ */
BOOL
STDCALL
GetTextMetricsA(
Show replies by date