- TextOutW: call NtGdiExtTextOut

- remove NtGdiTextOut from win32k
todo: NtGdiExtTextOut -> NtGdiExtTextOutW (does someone know what the 9th parameter is?)

svn path=/trunk/; revision=27840

reactos/dll/win32/gdi32/objects/text.c

@@ -43,7 +43,7 @@ TextOutW(
 	LPCWSTR  lpString,
 	int  cbString)
 {
-  return NtGdiTextOut(hdc, nXStart, nYStart, lpString, cbString);
+  return NtGdiExtTextOut(hdc, nXStart, nYStart, 0, NULL, lpString, cbString, NULL);
 }
 
 

reactos/include/reactos/win32k/ntgdibad.h

@@ -1116,15 +1116,6 @@ NtGdiStretchDIBits (
 	DWORD			ROP
 	);
 
-/* Use NtGdiExtTextOutW with 0, 0 at the end. */
-BOOL
-STDCALL
-NtGdiTextOut(HDC  hDC,
-                  int  XStart,
-                  int  YStart,
-                  LPCWSTR  String,
-                  int  Count);
-
 /* Needs to be done in user-mode. */
 BOOL
 STDCALL

reactos/subsystems/win32/win32k/ntuser/desktop.c

@@ -1502,7 +1502,7 @@ NtUserPaintDesktop(HDC hDC)
          align_old = NtGdiSetTextAlign(hDC, TA_RIGHT);
          mode_old = NtGdiSetBkMode(hDC, TRANSPARENT);
 
-         NtGdiTextOut(hDC, rect.right-16, rect.bottom-48, s_wszVersion, len);
+         NtGdiExtTextOut(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL);
 
          NtGdiSetBkMode(hDC, mode_old);
          NtGdiSetTextAlign(hDC, align_old);

reactos/subsystems/win32/win32k/ntuser/painting.c

@@ -1554,9 +1554,9 @@ UserDrawCaptionText(HDC hDc,
    
    //FIXME: If string doesn't fit to rc, truncate it and add ellipsis.
    
-   NtGdiTextOut(hDc, lpRc->left, 
+   NtGdiExtTextOut(hDc, lpRc->left, 
-      lpRc->top, Text->Buffer, 
+      lpRc->top, 0, NULL, Text->Buffer, 
-      Text->Length/sizeof(WCHAR));
+      Text->Length/sizeof(WCHAR), NULL);
    
    NtGdiSetTextColor(hDc, OldTextColor);
    NtGdiSelectObject(hDc, hOldFont);

reactos/subsystems/win32/win32k/objects/text.c

@@ -3844,17 +3844,6 @@ NtGdiSetTextJustification(HDC  hDC,
   return FALSE;
 }
 
-BOOL STDCALL
-NtGdiTextOut(
-   HDC hDC,
-   INT XStart,
-   INT YStart,
-   LPCWSTR String,
-   INT Count)
-{
-   return NtGdiExtTextOut(hDC, XStart, YStart, 0, NULL, String, Count, NULL);
-}
-
 DWORD STDCALL
 NtGdiGetFontData(
    HDC hDC,

reactos/tools/nci/w32ksvc.db

@@ -270,7 +270,6 @@ NtGdiStretchDIBits			13
 NtGdiStrokeAndFillPath			1
 NtGdiStrokePath				1
 NtGdiSwapBuffers			1
-NtGdiTextOut				5
 NtGdiTransparentBlt			 11
 NtGdiTranslateCharsetInfo		3
 NtGdiUnrealizeObject			1