gdi32: Remove a redundant check for Roman font presence.

Dmitry Timoshkov dmitry at codeweavers.com
Mon Mar 14 00:05:09 CDT 2011


Wine ships Tahoma and many other built-in fonts these days.
---
 dlls/gdi32/freetype.c |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 512e08b..4582216 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -471,8 +471,6 @@ struct font_mapping
 
 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_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);
 
         } 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 );
 	return NULL;
     }
-    if(!have_installed_roman_font)
-    {
-	TRACE("No roman font installed\n");
-        LeaveCriticalSection( &freetype_cs );
-	return NULL;
-    }
 
     ret = alloc_font();
 
-- 
1.7.3.5




More information about the wine-patches mailing list