Skip to content

W
wine-cw
Commit d9d52672 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

gdi32: Remove a redundant check for Roman font presence.

Wine ships Tahoma and many other built-in fonts these days.
parent 31abbd70
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 11 deletions
dlls/gdi32/freetype.c
View file @ d9d52672
...@@ -471,8 +471,6 @@ struct font_mapping ...@@ -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_ ...@@ -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) ...@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment