#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)
{
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
{
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);
}
}
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();