[ros-diffs] [tkreuzer] 27890: - rename NtGdiGetTextExentExPoint to NtGdiGetTextExtentExW and add 8th parameter (currently unhandled)

Author: tkreuzer
Date: Fri Jul 27 02:37:08 2007
New Revision: 27890

URL: http://svn.reactos.org/svn/reactos?rev=27890&view=rev
Log:
- rename NtGdiGetTextExentExPoint to NtGdiGetTextExtentExW and add 8th parameter (currently unhandled)

Modified:
    trunk/reactos/dll/win32/gdi32/objects/text.c
    trunk/reactos/subsystems/win32/win32k/objects/text.c
    trunk/reactos/tools/nci/w32ksvc.db

Modified: trunk/reactos/dll/win32/gdi32/objects/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/tex...
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/text.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/text.c Fri Jul 27 02:37:08 2007
@@ -169,8 +169,8 @@
    LPSIZE		lpSize
    )
 {
-  return NtGdiGetTextExtentExPoint (
-    hdc, lpszStr, cchString, nMaxExtent, lpnFit, alpDx, lpSize );
+  return NtGdiGetTextExtentExW (
+    hdc, (LPWSTR)lpszStr, cchString, nMaxExtent, (PULONG)lpnFit, (PULONG)alpDx, lpSize, 0 );
 }

@@ -198,8 +198,8 @@
     SetLastError (RtlNtStatusToDosError(Status));
   else
   {
-    rc = NtGdiGetTextExtentExPoint (
-      hdc, lpszStrW, cchString, nMaxExtent, lpnFit, alpDx, lpSize );
+    rc = NtGdiGetTextExtentExW (
+      hdc, lpszStrW, cchString, nMaxExtent, (PULONG)lpnFit, (PULONG)alpDx, lpSize, 0 );

HEAP_free ( lpszStrW );
   }

Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/text.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/text.c Fri Jul 27 02:37:08 2007
@@ -3405,15 +3405,19 @@
   return TRUE;
 }

+W32KAPI
 BOOL
-STDCALL
-NtGdiGetTextExtentExPoint(HDC hDC,
-                         LPCWSTR UnsafeString,
-                         int Count,
-                         int MaxExtent,
-                         LPINT UnsafeFit,
-                         LPINT UnsafeDx,
-                         LPSIZE UnsafeSize)
+APIENTRY
+NtGdiGetTextExtentExW(
+    IN HDC hDC,
+    IN OPTIONAL LPWSTR UnsafeString,
+    IN ULONG Count,
+    IN ULONG MaxExtent,
+    OUT OPTIONAL PULONG UnsafeFit,
+    OUT OPTIONAL PULONG UnsafeDx,
+    OUT LPSIZE UnsafeSize,
+    IN FLONG fl
+)
 {
   PDC dc;
   LPWSTR String;
@@ -3423,6 +3427,8 @@
   INT Fit;
   LPINT Dx;
   PTEXTOBJ TextObj;
+
+  /* FIXME: Handle fl */

if (Count < 0)
     {
@@ -3558,7 +3564,7 @@
                    LPSIZE psize,
                    UINT flOpts)
 {
-  return NtGdiGetTextExtentExPoint(hdc, lpwsz, cwc, 0, NULL, NULL, psize);
+  return NtGdiGetTextExtentExW(hdc, lpwsz, cwc, 0, NULL, NULL, psize, 0);
 }

BOOL

Modified: trunk/reactos/tools/nci/w32ksvc.db
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=27...
==============================================================================
--- trunk/reactos/tools/nci/w32ksvc.db (original)
+++ trunk/reactos/tools/nci/w32ksvc.db Fri Jul 27 02:37:08 2007
@@ -149,7 +149,7 @@
 NtGdiGetTextAlign			1
 NtGdiGetTextCharsetInfo			3
 NtGdiGetTextColor			1
-NtGdiGetTextExtentExPoint		7
+NtGdiGetTextExtentExW		8
 NtGdiGetTextExtent		5
 NtGdiGetTextExtentPoint32		4
 NtGdiGetTextFace			3