Rename NtGdiGetTextExtentPoint to NtGdiGetTextExtent and correct the declaration.

svn path=/trunk/; revision=20950

reactos/include/win32k/ntgdibad.h

@@ -714,14 +714,6 @@ NtGdiGetTextExtentExPoint(HDC  hDC,
                                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

reactos/lib/gdi32/objects/text.c

@@ -155,7 +155,7 @@ GetTextExtentPointW(
 	LPSIZE		lpSize
 	)
 {
-  return NtGdiGetTextExtentPoint(hdc, lpString, cbString, lpSize);
+  return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cbString, lpSize, 0);
 }
 
 

reactos/subsys/win32k/objects/text.c

@@ -2446,12 +2446,13 @@ NtGdiGetTextExtentExPoint(HDC hDC,
 
 BOOL
 STDCALL
-NtGdiGetTextExtentPoint(HDC hDC,
+NtGdiGetTextExtent(HDC hdc,
-                       LPCWSTR String,
+                   LPWSTR lpwsz,
-                       int Count,
+                   INT cwc,
-                       LPSIZE Size)
+                   LPSIZE psize,
+                   UINT flOpts)
 {
-  return NtGdiGetTextExtentExPoint(hDC, String, Count, 0, NULL, NULL, Size);
+  return NtGdiGetTextExtentExPoint(hdc, lpwsz, cwc, 0, NULL, NULL, psize);
 }
 
 BOOL

reactos/tools/nci/w32ksvc.db

@@ -159,7 +159,7 @@ NtGdiGetTextCharset			1
 NtGdiGetTextCharsetInfo			3
 NtGdiGetTextColor			1
 NtGdiGetTextExtentExPoint		7
-NtGdiGetTextExtentPoint			4
+NtGdiGetTextExtent		5
 NtGdiGetTextExtentPoint32		4
 NtGdiGetTextFace			3
 NtGdiGetTextMetrics			2