From 6d1c5612ccef0cb1c435ecce9ce04fbf96658542 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Fri, 20 Jan 2006 00:52:35 +0000
Subject: [PATCH] Move GetTextCharset & Info to text.c. This part of a Wine
 port.

svn path=/trunk/; revision=20949
---
 reactos/lib/gdi32/include/precomp.h |  1 +
 reactos/lib/gdi32/misc/stubs.c      | 32 --------------------------
 reactos/lib/gdi32/objects/text.c    | 35 +++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/reactos/lib/gdi32/include/precomp.h b/reactos/lib/gdi32/include/precomp.h
index 1eeb88ebdc2..aff53ed0616 100644
--- a/reactos/lib/gdi32/include/precomp.h
+++ b/reactos/lib/gdi32/include/precomp.h
@@ -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>
diff --git a/reactos/lib/gdi32/misc/stubs.c b/reactos/lib/gdi32/misc/stubs.c
index d212219ad1b..db94b81f7c1 100644
--- a/reactos/lib/gdi32/misc/stubs.c
+++ b/reactos/lib/gdi32/misc/stubs.c
@@ -257,38 +257,6 @@ GetTextCharacterExtra(
 }
 
 
-/*
- * @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
  */
diff --git a/reactos/lib/gdi32/objects/text.c b/reactos/lib/gdi32/objects/text.c
index 49678558cf0..b7b5e831a76 100644
--- a/reactos/lib/gdi32/objects/text.c
+++ b/reactos/lib/gdi32/objects/text.c
@@ -1,6 +1,10 @@
 #include "precomp.h"
 
 
+#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
+
+        
+
 /*
  * @implemented
  */
@@ -46,6 +50,37 @@ TextOutW(
 }
 
 
+/*
+ * @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
  */