Rename NtGdiGetTextExtentPoint to NtGdiGetTextExtent and correct the declaration.

Modified: trunk/reactos/include/win32k/ntgdibad.h
Modified: trunk/reactos/lib/gdi32/objects/text.c
Modified: trunk/reactos/subsys/win32k/objects/text.c
Modified: trunk/reactos/tools/nci/w32ksvc.db

--- trunk/reactos/include/win32k/ntgdibad.h	2006-01-20 00:52:35 UTC (rev 20949)
+++ trunk/reactos/include/win32k/ntgdibad.h	2006-01-20 01:54:56 UTC (rev 20950)
@@ -714,14 +714,6 @@

                                LPINT  Dx,
                                LPSIZE  Size);
 

-/* Rename to NtGdiGetTextExtent. Add 0 at the end. */
-BOOL
-STDCALL
-NtGdiGetTextExtentPoint(HDC  hDC,
-                             LPCWSTR  String,
-                             int  Count,
-                             LPSIZE  Size);
-

 /* Rename to NtGdiGetTextFaceW, add FALSE at the end. */
 int
 STDCALL

--- trunk/reactos/lib/gdi32/objects/text.c	2006-01-20 00:52:35 UTC (rev 20949)
+++ trunk/reactos/lib/gdi32/objects/text.c	2006-01-20 01:54:56 UTC (rev 20950)
@@ -155,7 +155,7 @@

 	LPSIZE		lpSize
 	)
 {

-  return NtGdiGetTextExtentPoint(hdc, lpString, cbString, lpSize);

+  return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cbString, lpSize, 0);

 }
 
 

--- trunk/reactos/subsys/win32k/objects/text.c	2006-01-20 00:52:35 UTC (rev 20949)
+++ trunk/reactos/subsys/win32k/objects/text.c	2006-01-20 01:54:56 UTC (rev 20950)
@@ -2446,12 +2446,13 @@

 
 BOOL
 STDCALL

-NtGdiGetTextExtentPoint(HDC hDC,
-                       LPCWSTR String,
-                       int Count,
-                       LPSIZE Size)

+NtGdiGetTextExtent(HDC hdc,
+                   LPWSTR lpwsz,
+                   INT cwc,
+                   LPSIZE psize,
+                   UINT flOpts)

 {

-  return NtGdiGetTextExtentExPoint(hDC, String, Count, 0, NULL, NULL, Size);

+  return NtGdiGetTextExtentExPoint(hdc, lpwsz, cwc, 0, NULL, NULL, psize);

 }
 
 BOOL

--- trunk/reactos/tools/nci/w32ksvc.db	2006-01-20 00:52:35 UTC (rev 20949)
+++ trunk/reactos/tools/nci/w32ksvc.db	2006-01-20 01:54:56 UTC (rev 20950)
@@ -159,7 +159,7 @@

 NtGdiGetTextCharsetInfo			3
 NtGdiGetTextColor			1
 NtGdiGetTextExtentExPoint		7

-NtGdiGetTextExtentPoint			4

+NtGdiGetTextExtent		5

 NtGdiGetTextExtentPoint32		4
 NtGdiGetTextFace			3
 NtGdiGetTextMetrics			2