Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 04:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K] Realize PTEXTOBJ in FontGetObject if it was not initialized

Browse source
This commit is contained in:
Mark Jansen 2018-09-01 21:40:12 +02:00
parent 0364c58b0d
commit 6b67ef6e10
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
win32ss/gdi/ntgdi/font.c
View file

@ -109,7 +109,7 @@ GreGetKerningPairs(
currently selected font. If not valid, GetCharacterPlacement ignores the currently selected font. If not valid, GetCharacterPlacement ignores the
value. value.
M$ must use a preset "compiled in" support for each language based releases. MS must use a preset "compiled in" support for each language based releases.
ReactOS uses FreeType, this will need to be supported. ATM this is hard coded ReactOS uses FreeType, this will need to be supported. ATM this is hard coded
for GCPCLASS_LATIN! for GCPCLASS_LATIN!
@ -295,6 +295,18 @@ FontGetObject(PTEXTOBJ plfont, ULONG cjBuffer, PVOID pvBuffer)
ULONG cjMaxSize; ULONG cjMaxSize;
ENUMLOGFONTEXDVW *plf = &plfont->logfont; ENUMLOGFONTEXDVW *plf = &plfont->logfont;
if (!(plfont->fl & TEXTOBJECT_INIT))
{
NTSTATUS Status;
DPRINT1("FontGetObject font not initialized!\n");
Status = TextIntRealizeFont(plfont->BaseObject.hHmgr, plfont);
if (!NT_SUCCESS(Status))
{
DPRINT1("FontGetObject(TextIntRealizeFont) Status = 0x%lx\n", Status);
}
}
/* If buffer is NULL, only the size is requested */ /* If buffer is NULL, only the size is requested */
if (pvBuffer == NULL) return sizeof(LOGFONTW); if (pvBuffer == NULL) return sizeof(LOGFONTW);