Skip to content

W
wine-cw
Commit 182e0289 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

get_glyph_index should return the nonexistent glyph for bitmap fonts

when a unicode character cannot be represented as a single byte in the font's codepage.
parent e0845857
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
dlls/gdi/freetype.c
View file @ 182e0289
...@@ -2468,9 +2468,15 @@ static FT_UInt get_glyph_index(GdiFont font, UINT glyph) ...@@ -2468,9 +2468,15 @@ static FT_UInt get_glyph_index(GdiFont font, UINT glyph)
{ {
if(font->ft_face->charmap->encoding == FT_ENCODING_NONE) { if(font->ft_face->charmap->encoding == FT_ENCODING_NONE) {
WCHAR wc = (WCHAR)glyph; WCHAR wc = (WCHAR)glyph;
BOOL default_used;
FT_UInt ret;
char buf; char buf;
WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), 0, 0); if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, &default_used) || default_used)
return pFT_Get_Char_Index(font->ft_face, (unsigned char)buf); 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);
return ret;
} }
if(font->charset == SYMBOL_CHARSET && glyph < 0x100) if(font->charset == SYMBOL_CHARSET && glyph < 0x100)
......
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