Module: wine Branch: master Commit: 86abd84167a4b04fdcd319b1d436a8229841bb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86abd84167a4b04fdcd319b1d4...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Oct 25 11:54:33 2012 +0200
gdi32: Fix mapping of symbol font glyphs even when no encoding is specified.
---
dlls/gdi32/freetype.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b22fb52..81ba8a3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5580,7 +5580,12 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) if (codepage_sets_default_used(font->codepage)) default_used_pointer = &default_used; if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || default_used) - ret = 0; + { + if (font->codepage == CP_SYMBOL && wc < 0x100) + ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)wc); + else + ret = 0; + } else ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)buf); TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, buf, ret, default_used);