From eb3712b47ddeecc6e1e33f7707e2a8f4691c37ef Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 26 Jul 2007 22:37:08 +0000
Subject: [PATCH] - rename NtGdiGetTextExentExPoint to NtGdiGetTextExtentExW
 and add 8th parameter (currently unhandled)

svn path=/trunk/; revision=27890
---
 reactos/dll/win32/gdi32/objects/text.c        |  8 +++----
 .../subsystems/win32/win32k/objects/text.c    | 24 ++++++++++++-------
 reactos/tools/nci/w32ksvc.db                  |  2 +-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/reactos/dll/win32/gdi32/objects/text.c b/reactos/dll/win32/gdi32/objects/text.c
index 17717a53d4b..e4ad1cc26cd 100644
--- a/reactos/dll/win32/gdi32/objects/text.c
+++ b/reactos/dll/win32/gdi32/objects/text.c
@@ -169,8 +169,8 @@ GetTextExtentExPointW(
 	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 @@ GetTextExtentExPointA(
     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 );
   }
diff --git a/reactos/subsystems/win32/win32k/objects/text.c b/reactos/subsystems/win32/win32k/objects/text.c
index 63f85560cd8..c5e979307c8 100644
--- a/reactos/subsystems/win32/win32k/objects/text.c
+++ b/reactos/subsystems/win32/win32k/objects/text.c
@@ -3405,15 +3405,19 @@ TextIntGetTextExtentPoint(PDC dc,
   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;
@@ -3424,6 +3428,8 @@ NtGdiGetTextExtentExPoint(HDC hDC,
   LPINT Dx;
   PTEXTOBJ TextObj;
 
+  /* FIXME: Handle fl */
+
   if (Count < 0)
     {
       SetLastWin32Error(ERROR_INVALID_PARAMETER);
@@ -3558,7 +3564,7 @@ NtGdiGetTextExtent(HDC hdc,
                    LPSIZE psize,
                    UINT flOpts)
 {
-  return NtGdiGetTextExtentExPoint(hdc, lpwsz, cwc, 0, NULL, NULL, psize);
+  return NtGdiGetTextExtentExW(hdc, lpwsz, cwc, 0, NULL, NULL, psize, 0);
 }
 
 BOOL
diff --git a/reactos/tools/nci/w32ksvc.db b/reactos/tools/nci/w32ksvc.db
index f96712b77fc..c410e9ac76c 100644
--- a/reactos/tools/nci/w32ksvc.db
+++ b/reactos/tools/nci/w32ksvc.db
@@ -149,7 +149,7 @@ NtGdiGetSystemPaletteUse		1
 NtGdiGetTextAlign			1
 NtGdiGetTextCharsetInfo			3
 NtGdiGetTextColor			1
-NtGdiGetTextExtentExPoint		7
+NtGdiGetTextExtentExW		8
 NtGdiGetTextExtent		5
 NtGdiGetTextExtentPoint32		4
 NtGdiGetTextFace			3