gdi32: Remove a redundant check for Roman font presence.
Wine ships Tahoma and many other built-in fonts these days.
This commit is contained in:
parent
31abbd7082
commit
d9d5267237
|
@ -471,8 +471,6 @@ struct font_mapping
|
||||||
|
|
||||||
static struct list mappings_list = LIST_INIT( mappings_list );
|
static struct list mappings_list = LIST_INIT( mappings_list );
|
||||||
|
|
||||||
static BOOL have_installed_roman_font = FALSE; /* CreateFontInstance will fail if this is still FALSE */
|
|
||||||
|
|
||||||
static CRITICAL_SECTION freetype_cs;
|
static CRITICAL_SECTION freetype_cs;
|
||||||
static CRITICAL_SECTION_DEBUG critsect_debug =
|
static CRITICAL_SECTION_DEBUG critsect_debug =
|
||||||
{
|
{
|
||||||
|
@ -1523,9 +1521,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(face->fs.fsCsb[0] & FS_SYMBOL))
|
|
||||||
have_installed_roman_font = TRUE;
|
|
||||||
|
|
||||||
AddFaceToFamily(face, family);
|
AddFaceToFamily(face, family);
|
||||||
|
|
||||||
} while(!FT_IS_SCALABLE(ft_face) && ++bitmap_num < ft_face->num_fixed_sizes);
|
} while(!FT_IS_SCALABLE(ft_face) && ++bitmap_num < ft_face->num_fixed_sizes);
|
||||||
|
@ -3530,12 +3525,6 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont)
|
||||||
LeaveCriticalSection( &freetype_cs );
|
LeaveCriticalSection( &freetype_cs );
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if(!have_installed_roman_font)
|
|
||||||
{
|
|
||||||
TRACE("No roman font installed\n");
|
|
||||||
LeaveCriticalSection( &freetype_cs );
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = alloc_font();
|
ret = alloc_font();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue