Module: wine Branch: master Commit: 60d29d1d0d478f94e4375f8fac4fca1d30e843fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d29d1d0d478f94e4375f8fac...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jul 1 14:13:07 2013 +0200
gdi32: Don't load linked fonts only to look up control characters.
---
dlls/gdi32/freetype.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bdd6df7..72d8377 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7605,6 +7605,8 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, return TRUE; }
+ if (c < 32) goto done; /* don't check linked fonts for control characters */ + LIST_FOR_EACH_ENTRY(child_font, &font->child_fonts, CHILD_FONT, entry) { if(!child_font->font) @@ -7624,6 +7626,8 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, return TRUE; } } + +done: *glyph = get_default_char_index(font); *vert = FALSE; return FALSE;