[ros-diffs] [greatlrd] 28727: redirect GetTextCharsetInfo to win32k implement GetTextExtentPointI

Author: greatlrd
Date: Sat Sep  1 03:32:54 2007
New Revision: 28727
URL: http://svn.reactos.org/svn/reactos?rev=28727&view=rev
Log:
redirect GetTextCharsetInfo to win32k
implement GetTextExtentPointI
Modified:
    trunk/reactos/dll/win32/gdi32/gdi32.def
    trunk/reactos/dll/win32/gdi32/misc/stubs.c
    trunk/reactos/dll/win32/gdi32/objects/text.c
Modified: trunk/reactos/dll/win32/gdi32/gdi32.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Sep  1 03:32:54 2007
@@ -438,7 +438,7 @@
 GetTextAlign@4=NtGdiGetTextAlign@4
 GetTextCharacterExtra@4
 GetTextCharset@4
-GetTextCharsetInfo@12
+GetTextCharsetInfo@12=NtGdiGetTextCharsetInfo@12
 GetTextColor@4=NtGdiGetTextColor@4
 GetTextExtentExPointA@28
 GetTextExtentExPointI@28
Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Sep  1 03:32:54 2007
@@ -1761,20 +1761,16 @@
 }
 /*
- * @unimplemented
+ * @implemented
  */
 BOOL
 STDCALL
-GetTextExtentPointI(
-       HDC hdc,
-       LPWORD pgiIn,
-       int cgi,
-       LPSIZE lpSize
-)
-{
-       UNIMPLEMENTED;
-       SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-       return 0;
+GetTextExtentPointI(HDC hdc,
+                    LPWORD pgiIn,
+                    int cgi,
+                    LPSIZE lpSize)
+{
+    return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,2);
 }
Modified: trunk/reactos/dll/win32/gdi32/objects/text.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/text.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/text.c Sat Sep  1 03:32:54 2007
@@ -72,28 +72,13 @@
  */
 int
 STDCALL
-GetTextCharset(
-       HDC     hdc
-       )
+GetTextCharset(HDC hdc)
 {
     /* MSDN docs say this is equivalent */
-        return GetTextCharsetInfo(hdc, NULL, 0);
-}
-
-
-/*
- * @implemented
- */
-int
-STDCALL
-GetTextCharsetInfo(
-       HDC             hdc,
-       LPFONTSIGNATURE lpSig,
-       DWORD           dwFlags
-       )
-{
-        return NtGdiGetTextCharsetInfo(hdc, lpSig, dwFlags);
-}
+    return NtGdiGetTextCharsetInfo(hdc,NULL,0);
+}
+
+
 /*