Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed NtGdiExtTextOut/PolyTextOut. Update related files.

Browse source 
svn path=/trunk/; revision=31619
This commit is contained in:
James Tabor 2008-01-06 02:16:09 +00:00
parent 0eadf4a00c
commit 4197bbe411
7 changed files with 17 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/gdi32/objects/text.c
View file

@ -43,7 +43,7 @@ TextOutW(
LPCWSTR lpString, LPCWSTR lpString,
int cbString) 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 @@ ExtTextOutW(
CONST INT *lpDx 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);
} }

19
reactos/include/reactos/win32k/ntgdibad.h
View file

@ -108,18 +108,6 @@ NtGdiEnumFonts(HDC hDC,
FONTENUMPROCW FontFunc, FONTENUMPROCW FontFunc,
LPARAM lParam); 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. */ /* Should be done in user-mode. */
BOOL BOOL
STDCALL STDCALL
@ -163,13 +151,6 @@ NtGdiOffsetWindowOrgEx (
LPPOINT Point 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. */ /* Should be done in user-mode. */
BOOL BOOL
STDCALL STDCALL

2
reactos/subsystems/win32/win32k/ntuser/desktop.c
View file

@ -1509,7 +1509,7 @@ NtUserPaintDesktop(HDC hDC)
align_old = NtGdiSetTextAlign(hDC, TA_RIGHT); align_old = NtGdiSetTextAlign(hDC, TA_RIGHT);
mode_old = NtGdiSetBkMode(hDC, TRANSPARENT); 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); NtGdiSetBkMode(hDC, mode_old);
NtGdiSetTextAlign(hDC, align_old); NtGdiSetTextAlign(hDC, align_old);

4
reactos/subsystems/win32/win32k/ntuser/painting.c
View file

@ -1609,9 +1609,9 @@ UserDrawCaptionText(HDC hDc,
//FIXME: If string doesn't fit to rc, truncate it and add ellipsis. //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, lpRc->top, 0, NULL, Text->Buffer,
Text->Length/sizeof(WCHAR), NULL); Text->Length/sizeof(WCHAR), NULL, 0);
NtGdiSetTextColor(hDc, OldTextColor); NtGdiSetTextColor(hDc, OldTextColor);
NtGdiSelectFont(hDc, hOldFont); NtGdiSelectFont(hDc, hOldFont);

32
reactos/subsystems/win32/win32k/objects/text.c
View file

@ -1523,16 +1523,18 @@ NtGdiGlyphCacheSet(
return GlyphCopy; return GlyphCopy;
} }
BOOL STDCALL BOOL
NtGdiExtTextOut( APIENTRY
HDC hDC, NtGdiExtTextOutW(
INT XStart, IN HDC hDC,
INT YStart, IN INT XStart,
UINT fuOptions, IN INT YStart,
CONST RECT *lprc, IN UINT fuOptions,
LPCWSTR UnsafeString, IN OPTIONAL LPRECT lprc,
UINT Count, IN LPWSTR UnsafeString,
CONST INT *UnsafeDx) IN INT Count,
IN OPTIONAL LPINT UnsafeDx,
IN DWORD dwCodePage)
{ {
/* /*
* FIXME: * FIXME:
@ -3998,16 +4000,6 @@ NtGdiGetTextMetricsW(
return TRUE; return TRUE;
} }
BOOL
STDCALL
NtGdiPolyTextOut(HDC hDC,
CONST LPPOLYTEXTW txt,
int Count)
{
UNIMPLEMENTED;
return FALSE;
}
BOOL BOOL
STDCALL STDCALL
NtGdiRemoveFontResource(LPCWSTR FileName) NtGdiRemoveFontResource(LPCWSTR FileName)

22
reactos/subsystems/win32/win32k/stubs/stubs.c
View file

@ -2023,28 +2023,6 @@ NtGdiEudcLoadUnloadLink(
return FALSE; 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 * @unimplemented
*/ */

2
reactos/subsystems/win32/win32k/w32ksvc.db
View file

@ -721,14 +721,12 @@ NtGdiAddFontResource 2
NtGdiCreateDIBitmap 6 NtGdiCreateDIBitmap 6
NtGdiCreateScalableFontResource 4 NtGdiCreateScalableFontResource 4
NtGdiEnumFonts 4 NtGdiEnumFonts 4
NtGdiExtTextOut 8
NtGdiGetAspectRatioFilterEx 2 NtGdiGetAspectRatioFilterEx 2
NtGdiGetFontFamilyInfo 4 NtGdiGetFontFamilyInfo 4
NtGdiGetFontLanguageInfo 1 NtGdiGetFontLanguageInfo 1
NtGdiGetTextExtentPoint32 4 NtGdiGetTextExtentPoint32 4
NtGdiOffsetViewportOrgEx 4 NtGdiOffsetViewportOrgEx 4
NtGdiOffsetWindowOrgEx 4 NtGdiOffsetWindowOrgEx 4
NtGdiPolyTextOut 3
NtGdiRemoveFontResource 1 NtGdiRemoveFontResource 1
# #
# ReactOS only system calls # ReactOS only system calls