Skip to content

Commit 152947a

Browse files
committed
[WIN32K] Add missing definitions to text.h
1 parent 5de41fa commit 152947a

File tree

2 files changed

+45
-5
lines changed

2 files changed

+45
-5
lines changed

win32ss/gdi/font/font.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ typedef struct _RFONT
302302
POINTL ptlSim;
303303
} RFONT;
304304

305-
typedef struct _LFONT
305+
struct _LFONT
306306
{
307307
BASEOBJECT baseobj;
308308
LFTYPE lft;
@@ -312,7 +312,7 @@ typedef struct _LFONT
312312
ULONG iNameHash;
313313
WCHAR awchFace[LF_FACESIZE];
314314
ENUMLOGFONTEXDVW elfexw;
315-
} LFONT, *PLFONT;
315+
};// LFONT, *PLFONT;
316316

317317
enum _ESTROBJ_FLAGS
318318
{

win32ss/gdi/ntgdi/text.h

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,28 @@
33
/* GDI logical font object */
44
typedef struct _LFONT TEXTOBJ, *PTEXTOBJ;
55

6+
typedef struct _LFONT LFONT, *PLFONT;
7+
68
/* Internal interface */
79

810
#define TEXTOBJ_UnlockText(pBMObj) GDIOBJ_vUnlockObject ((POBJ)pBMObj)
911
NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont);
1012
BOOL FASTCALL InitFontSupport(VOID);
1113
ULONG FASTCALL FontGetObject(PTEXTOBJ TextObj, ULONG Count, PVOID Buffer);
12-
BOOL FASTCALL GreTextOutW(HDC,int,int,LPCWSTR,int);
13-
HFONT FASTCALL GreCreateFontIndirectW( LOGFONTW * );
14-
BOOL WINAPI GreGetTextMetricsW( _In_ HDC hdc, _Out_ LPTEXTMETRICW lptm);
14+
15+
HFONT
16+
NTAPI
17+
GreCreateFontIndirectW(
18+
_In_ const LOGFONTW *plfw);
19+
20+
BOOL
21+
NTAPI
22+
GreTextOutW(
23+
_In_ HDC hdc,
24+
_In_ int xStart,
25+
_In_ int yStart,
26+
_In_ LPCWSTR pwcString,
27+
_In_ int cwc);
1528

1629
BOOL
1730
NTAPI
@@ -25,3 +38,30 @@ GreExtTextOutW(
2538
IN INT,
2639
IN OPTIONAL LPINT,
2740
IN DWORD);
41+
42+
BOOL
43+
WINAPI
44+
GreGetTextMetricsW(
45+
_In_ HDC hdc,
46+
_Out_ LPTEXTMETRICW lptm);
47+
48+
BOOL
49+
NTAPI
50+
GreGetTextExtentW(
51+
HDC hdc,
52+
LPWSTR lpwsz,
53+
INT cwc,
54+
LPSIZE psize,
55+
UINT flOpts);
56+
57+
BOOL
58+
NTAPI
59+
GreGetTextExtentExW(
60+
IN HDC hdc,
61+
IN OPTIONAL LPWSTR lpwsz,
62+
IN ULONG cwc,
63+
IN ULONG dxMax,
64+
OUT OPTIONAL ULONG *pcch,
65+
OUT OPTIONAL PULONG pdxOut,
66+
OUT LPSIZE psize,
67+
IN FLONG fl);

0 commit comments

Comments
 (0)