gdi32: Move the dumping of the font list out of freetype.c.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-10-31 10:21:00 +01:00
parent 8d4336c5fa
commit ef77b38888
2 changed files with 19 additions and 19 deletions

View File

@ -667,6 +667,24 @@ static void load_gdi_font_replacements(void)
RegCloseKey( hkey );
}
static void dump_gdi_font_list(void)
{
struct gdi_font_family *family;
struct gdi_font_face *face;
LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry )
{
TRACE( "Family: %s\n", debugstr_w(family->family_name) );
LIST_FOR_EACH_ENTRY( face, &family->faces, struct gdi_font_face, entry )
{
TRACE( "\t%s\t%s\t%08x", debugstr_w(face->style_name), debugstr_w(face->full_name),
face->fs.fsCsb[0] );
if (!face->scalable) TRACE(" %d", face->size.height );
TRACE("\n");
}
}
}
struct gdi_font_face *create_face( const WCHAR *style, const WCHAR *fullname, const WCHAR *file,
UINT index, FONTSIGNATURE fs, DWORD ntmflags, DWORD version,
DWORD flags, const struct bitmap_font_size *size )
@ -2778,6 +2796,7 @@ void font_init(void)
load_gdi_font_subst();
load_gdi_font_replacements();
load_system_links();
dump_gdi_font_list();
dump_gdi_font_subst();
}

View File

@ -1653,23 +1653,6 @@ static INT CDECL freetype_remove_font( const WCHAR *file, DWORD flags )
return count;
}
static void DumpFontList(void)
{
Family *family;
Face *face;
LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) {
TRACE( "Family: %s\n", debugstr_w(family->family_name) );
LIST_FOR_EACH_ENTRY( face, &family->faces, Face, entry ) {
TRACE( "\t%s\t%s\t%08x", debugstr_w(face->style_name), debugstr_w(face->full_name),
face->fs.fsCsb[0] );
if(!face->scalable)
TRACE(" %d", face->size.height);
TRACE("\n");
}
}
}
#ifdef __ANDROID__
static BOOL ReadFontDir(const char *dirname, BOOL external_fonts)
{
@ -2321,8 +2304,6 @@ BOOL WineEngInit( const struct font_backend_funcs **funcs )
reorder_font_list();
DumpFontList();
if(disposition == REG_CREATED_NEW_KEY)
update_reg_entries();