Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

- TextOutW: call NtGdiExtTextOut

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

svn path=/trunk/; revision=27840
This commit is contained in:
Timo Kreuzer 2007-07-26 13:57:17 +00:00
parent 308132efa0
commit caeec5d190
6 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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);
}

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

@ -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

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

@ -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);

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

@ -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);

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

@ -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,

1
reactos/tools/nci/w32ksvc.db
View file

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