From caeec5d1904317a4a12725203e41510f2ea91f32 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 26 Jul 2007 13:57:17 +0000
Subject: [PATCH] - 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            |  2 +-
 reactos/include/reactos/win32k/ntgdibad.h         |  9 ---------
 reactos/subsystems/win32/win32k/ntuser/desktop.c  |  2 +-
 reactos/subsystems/win32/win32k/ntuser/painting.c |  6 +++---
 reactos/subsystems/win32/win32k/objects/text.c    | 11 -----------
 reactos/tools/nci/w32ksvc.db                      |  1 -
 6 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/reactos/dll/win32/gdi32/objects/text.c b/reactos/dll/win32/gdi32/objects/text.c
index a3a1a79cd00..17717a53d4b 100644
--- a/reactos/dll/win32/gdi32/objects/text.c
+++ b/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);
 }
 
 
diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/include/reactos/win32k/ntgdibad.h
index 581742c7798..7b52e731d5b 100644
--- a/reactos/include/reactos/win32k/ntgdibad.h
+++ b/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
diff --git a/reactos/subsystems/win32/win32k/ntuser/desktop.c b/reactos/subsystems/win32/win32k/ntuser/desktop.c
index 60c518f0172..ae7ed29fdf6 100644
--- a/reactos/subsystems/win32/win32k/ntuser/desktop.c
+++ b/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);
diff --git a/reactos/subsystems/win32/win32k/ntuser/painting.c b/reactos/subsystems/win32/win32k/ntuser/painting.c
index 6185bafdd15..5071cb1e77c 100644
--- a/reactos/subsystems/win32/win32k/ntuser/painting.c
+++ b/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, 
-      lpRc->top, Text->Buffer, 
-      Text->Length/sizeof(WCHAR));
+   NtGdiExtTextOut(hDc, lpRc->left, 
+      lpRc->top, 0, NULL, Text->Buffer, 
+      Text->Length/sizeof(WCHAR), NULL);
    
    NtGdiSetTextColor(hDc, OldTextColor);
    NtGdiSelectObject(hDc, hOldFont);
diff --git a/reactos/subsystems/win32/win32k/objects/text.c b/reactos/subsystems/win32/win32k/objects/text.c
index b2907b40a7d..63f85560cd8 100644
--- a/reactos/subsystems/win32/win32k/objects/text.c
+++ b/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,
diff --git a/reactos/tools/nci/w32ksvc.db b/reactos/tools/nci/w32ksvc.db
index 755c042ba02..9dc116f1be8 100644
--- a/reactos/tools/nci/w32ksvc.db
+++ b/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