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

[WIN32SS][NTGDI] Fix and improve font dumping (#1768)

Browse source 
Fix and improve font dumping. CORE-16245
- FontGDI->FontObj is not a pointer.
- "%s" does null check, so we remove redundant null checks.
- Add FaceName and StyleName dumping.
This commit is contained in:
Katayama Hirofumi MZ 2019-07-30 18:15:56 +09:00 committed by GitHub
parent b382145539
commit 7c9755b47d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
win32ss/gdi/ntgdi/freetype.c
View file

@ -382,11 +382,12 @@ static __inline FT_Fixed FT_FixedFromFIXED(FIXED f)
#if DBG
VOID DumpFontGDI(PFONTGDI FontGDI)
VOID DumpFontEntry(PFONT_ENTRY FontEntry)
{
const char *family_name;
const char *style_name;
FT_Face Face;
PFONTGDI FontGDI = FontEntry->Font;
if (!FontGDI)
{
@ -398,12 +399,7 @@ VOID DumpFontGDI(PFONTGDI FontGDI)
if (Face)
{
family_name = Face->family_name;
if (!family_name)
family_name = "<NULL>";
style_name = Face->style_name;
if (!style_name)
style_name = "<NULL>";
}
else
{
@ -411,32 +407,32 @@ VOID DumpFontGDI(PFONTGDI FontGDI)
style_name = "<invalid>";
}
DPRINT("family_name '%s', style_name '%s', FontGDI %p, FontObj %p, iUnique %lu, SharedFace %p, Face %p, CharSet %u, Filename '%S'\n",
family_name,
style_name,
FontGDI,
FontGDI->FontObj,
FontGDI->iUnique,
FontGDI->SharedFace,
Face,
FontGDI->CharSet,
FontGDI->Filename);
DPRINT("family_name '%s', style_name '%s', FaceName '%wZ', StyleName '%wZ', FontGDI %p, "
"FontObj %p, iUnique %lu, SharedFace %p, Face %p, CharSet %u, Filename '%S'\n",
family_name,
style_name,
&FontEntry->FaceName,
&FontEntry->StyleName,
FontGDI,
&FontGDI->FontObj,
FontGDI->iUnique,
FontGDI->SharedFace,
Face,
FontGDI->CharSet,
FontGDI->Filename);
}
VOID DumpFontList(PLIST_ENTRY Head)
{
PLIST_ENTRY Entry;
PFONT_ENTRY CurrentEntry;
PFONTGDI FontGDI;
DPRINT("## DumpFontList(%p)\n", Head);
for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink)
{
CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
FontGDI = CurrentEntry->Font;
DumpFontGDI(FontGDI);
DumpFontEntry(CurrentEntry);
}
}
@ -1365,11 +1361,8 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont)
Entry->NotEnum = (Characteristics & FR_NOT_ENUM);
InsertTailList(&LoadedFontList, &Entry->ListEntry);
DPRINT("Font loaded: %s (%s)\n",
Face->family_name ? Face->family_name : "<NULL>",
Face->style_name ? Face->style_name : "<NULL>");
DPRINT("Num glyphs: %d\n", Face->num_glyphs);
DPRINT("CharSet: %d\n", FontGDI->CharSet);
DPRINT("Font loaded: %s (%s), CharSet %u, Num glyphs %d\n",
Face->family_name, Face->style_name, FontGDI->CharSet, Face->num_glyphs);
}
IntLockFreeType();