Dmitry Timoshkov : gdi32: Remove a redundant check for Roman font presence.
Alexandre Julliard
julliard at winehq.org
Mon Mar 14 14:29:35 CDT 2011
Module: wine
Branch: master
Commit: d9d52672374ff11d4866e07955ba1e2a32ae4cd1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d52672374ff11d4866e07955ba1e2a32ae4cd1
Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date: Mon Mar 14 13:05:09 2011 +0800
gdi32: Remove a redundant check for Roman font presence.
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();
More information about the wine-cvs
mailing list