Author: tkreuzer Date: Thu Jul 26 17:57:17 2007 New Revision: 27840
URL: http://svn.reactos.org/svn/reactos?rev=27840&view=rev Log: - TextOutW: call NtGdiExtTextOut - remove NtGdiTextOut from win32k todo: NtGdiExtTextOut -> NtGdiExtTextOutW (does someone know what the 9th parameter is?)
Modified: trunk/reactos/dll/win32/gdi32/objects/text.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/tools/nci/w32ksvc.db
Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/tex... ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Thu Jul 26 17:57:17 2007 @@ -43,7 +43,7 @@ LPCWSTR lpString, int cbString) { - return NtGdiTextOut(hdc, nXStart, nYStart, lpString, cbString); + return NtGdiExtTextOut(hdc, nXStart, nYStart, 0, NULL, lpString, cbString, NULL); }
Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntgd... ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Thu Jul 26 17:57:17 2007 @@ -1116,15 +1116,6 @@ 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
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Thu Jul 26 17:57:17 2007 @@ -1502,7 +1502,7 @@ 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);
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Thu Jul 26 17:57:17 2007 @@ -1554,9 +1554,9 @@
//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);
Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Thu Jul 26 17:57:17 2007 @@ -3844,17 +3844,6 @@ 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,
Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=27... ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Thu Jul 26 17:57:17 2007 @@ -270,7 +270,6 @@ NtGdiStrokeAndFillPath 1 NtGdiStrokePath 1 NtGdiSwapBuffers 1 -NtGdiTextOut 5 NtGdiTransparentBlt 11 NtGdiTranslateCharsetInfo 3 NtGdiUnrealizeObject 1