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

Rename NtGdiGettextFace into NtGdiGetTextFaceW and add bAliasName parameter. Change parameter names in GetTextFaceW. Update ntgdibad.h

Browse source 
svn path=/trunk/; revision=27892
This commit is contained in:
Timo Kreuzer 2007-07-26 23:02:47 +00:00
parent f08a04538a
commit 7f36f5002f
4 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -308,12 +308,12 @@ ExtTextOutW(
int int
STDCALL STDCALL
GetTextFaceW( GetTextFaceW(
HDC a0, HDC hDC,
int a1, int nCount,
LPWSTR a2 LPWSTR lpFaceName
) )
{ {
return NtGdiGetTextFace(a0, a1, a2); return NtGdiGetTextFaceW(hDC, nCount, lpFaceName, FALSE);
} }

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

@ -605,13 +605,6 @@ NtGdiGetTextCharset(HDC hDC);
/* Needs to be done in user-mode, using shared GDI Object Attributes. */ /* Needs to be done in user-mode, using shared GDI Object Attributes. */
COLORREF STDCALL NtGdiGetTextColor(HDC hDC); COLORREF STDCALL NtGdiGetTextColor(HDC hDC);
/* Rename to NtGdiGetTextFaceW, add FALSE at the end. */
int
STDCALL
NtGdiGetTextFace(HDC hDC,
int Count,
LPWSTR FaceName);
/* Use NtGdiGetTextMetricsW with 0 at the end */ /* Use NtGdiGetTextMetricsW with 0 at the end */
BOOL BOOL
STDCALL STDCALL

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

@ -3648,14 +3648,23 @@ NtGdiGetTextExtentPoint32(HDC hDC,
return TRUE; return TRUE;
} }
INT STDCALL W32KAPI
NtGdiGetTextFace(HDC hDC, INT Count, LPWSTR FaceName) INT
APIENTRY
NtGdiGetTextFaceW(
IN HDC hDC,
IN INT Count,
OUT OPTIONAL LPWSTR FaceName,
IN BOOL bAliasName
)
{ {
PDC Dc; PDC Dc;
HFONT hFont; HFONT hFont;
PTEXTOBJ TextObj; PTEXTOBJ TextObj;
NTSTATUS Status; NTSTATUS Status;
/* FIXME: Handle bAliasName */
Dc = DC_LockDc(hDC); Dc = DC_LockDc(hDC);
if (Dc == NULL) if (Dc == NULL)
{ {

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

@ -152,7 +152,7 @@ NtGdiGetTextColor 1
NtGdiGetTextExtentExW 8 NtGdiGetTextExtentExW 8
NtGdiGetTextExtent 5 NtGdiGetTextExtent 5
NtGdiGetTextExtentPoint32 4 NtGdiGetTextExtentPoint32 4
NtGdiGetTextFace 3 NtGdiGetTextFaceW 4
NtGdiGetTextMetrics 2 NtGdiGetTextMetrics 2
NtGdiGetViewportExtEx 2 NtGdiGetViewportExtEx 2
NtGdiGetViewportOrgEx 2 NtGdiGetViewportOrgEx 2