Author: jimtabor Date: Sun Jan 6 05:16:09 2008 New Revision: 31619
URL: http://svn.reactos.org/svn/reactos?rev=31619&view=rev Log: Removed NtGdiExtTextOut/PolyTextOut. Update related files.
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/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/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 Sun Jan 6 05:16:09 2008 @@ -43,7 +43,7 @@ LPCWSTR lpString, int cbString) { - return NtGdiExtTextOut(hdc, nXStart, nYStart, 0, NULL, lpString, cbString, NULL); + return NtGdiExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cbString, NULL, 0); }
@@ -350,7 +350,7 @@ CONST INT *lpDx ) { - return NtGdiExtTextOut(hdc, X, Y, fuOptions, lprc, lpString, cbCount, lpDx); + return NtGdiExtTextOutW(hdc, X, Y, fuOptions, (LPRECT)lprc, (LPWSTR)lpString, cbCount, (LPINT)lpDx, 0); }
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 Sun Jan 6 05:16:09 2008 @@ -108,18 +108,6 @@ FONTENUMPROCW FontFunc, LPARAM lParam);
-/* Use NtGdiExtTextOutW with 0, 0 at the end. */ -BOOL -STDCALL -NtGdiExtTextOut(HDC hdc, - int X, - int Y, - UINT fuOptions, - CONST RECT *lprc, - LPCWSTR lpString, - UINT cbCount, - CONST INT *lpDx); - /* Should be done in user-mode. */ BOOL STDCALL @@ -162,13 +150,6 @@ int YOffset, LPPOINT Point ); - -/* Use NtGdiPolyTextOutW with 0 at the end. */ -BOOL -STDCALL -NtGdiPolyTextOut(HDC hDC, - CONST LPPOLYTEXTW txt, - int Count);
/* Should be done in user-mode. */ BOOL
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 Sun Jan 6 05:16:09 2008 @@ -1509,7 +1509,7 @@ align_old = NtGdiSetTextAlign(hDC, TA_RIGHT); mode_old = NtGdiSetBkMode(hDC, TRANSPARENT);
- NtGdiExtTextOut(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL); + NtGdiExtTextOutW(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL, 0);
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 Sun Jan 6 05:16:09 2008 @@ -1609,9 +1609,9 @@
//FIXME: If string doesn't fit to rc, truncate it and add ellipsis.
- NtGdiExtTextOut(hDc, lpRc->left, + NtGdiExtTextOutW(hDc, lpRc->left, lpRc->top, 0, NULL, Text->Buffer, - Text->Length/sizeof(WCHAR), NULL); + Text->Length/sizeof(WCHAR), NULL, 0);
NtGdiSetTextColor(hDc, OldTextColor); NtGdiSelectFont(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 Sun Jan 6 05:16:09 2008 @@ -1523,16 +1523,18 @@ return GlyphCopy; }
-BOOL STDCALL -NtGdiExtTextOut( - HDC hDC, - INT XStart, - INT YStart, - UINT fuOptions, - CONST RECT *lprc, - LPCWSTR UnsafeString, - UINT Count, - CONST INT *UnsafeDx) +BOOL +APIENTRY +NtGdiExtTextOutW( + IN HDC hDC, + IN INT XStart, + IN INT YStart, + IN UINT fuOptions, + IN OPTIONAL LPRECT lprc, + IN LPWSTR UnsafeString, + IN INT Count, + IN OPTIONAL LPINT UnsafeDx, + IN DWORD dwCodePage) { /* * FIXME: @@ -4000,16 +4002,6 @@
BOOL STDCALL -NtGdiPolyTextOut(HDC hDC, - CONST LPPOLYTEXTW txt, - int Count) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL NtGdiRemoveFontResource(LPCWSTR FileName) { DPRINT1("NtGdiRemoveFontResource is UNIMPLEMENTED\n");
Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/stu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sun Jan 6 05:16:09 2008 @@ -2023,28 +2023,6 @@ return FALSE; }
- - /* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiExtTextOutW( - IN HDC hdc, - IN INT x, - IN INT y, - IN UINT flOpts, - IN OPTIONAL LPRECT prcl, - IN LPWSTR pwsz, - IN INT cwc, - IN OPTIONAL LPINT pdx, - IN DWORD dwCodePage) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* * @unimplemented */
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sun Jan 6 05:16:09 2008 @@ -721,14 +721,12 @@ NtGdiCreateDIBitmap 6 NtGdiCreateScalableFontResource 4 NtGdiEnumFonts 4 -NtGdiExtTextOut 8 NtGdiGetAspectRatioFilterEx 2 NtGdiGetFontFamilyInfo 4 NtGdiGetFontLanguageInfo 1 NtGdiGetTextExtentPoint32 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 -NtGdiPolyTextOut 3 NtGdiRemoveFontResource 1 # # ReactOS only system calls
-
jimtabor＠svn.reactos.org