ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Return ANSI character code as glyph index for bitmap fonts.

This commit is contained in:
Akihiro Sagawa 2013-12-11 21:11:15 +09:00 committed by Alexandre Julliard
parent bfafb1ffc5
commit 882398b0a9
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/gdi32/freetype.c
View File

@ -5998,7 +5998,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph)
} }
else else
ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)buf); 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); TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, (unsigned char)buf, ret, default_used);
return ret; return ret;
} }
@ -6015,6 +6015,34 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph)
return glyphId; return glyphId;
} }
/* helper for freetype_GetGlyphIndices */
static FT_UInt get_gdi_glyph_index(const GdiFont *font, UINT glyph)
{
WCHAR wc = (WCHAR)glyph;
BOOL default_used = FALSE;
BOOL *default_used_pointer = NULL;
FT_UInt ret;
char buf;
if(font->ft_face->charmap->encoding != FT_ENCODING_NONE)
return get_glyph_index(font, 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)
{
if (font->codepage == CP_SYMBOL && wc < 0x100)
ret = (unsigned char)wc;
else
ret = 0;
}
else
ret = (unsigned char)buf;
TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, (unsigned char)buf, ret, default_used);
return ret;
}
static FT_UInt get_default_char_index(GdiFont *font) static FT_UInt get_default_char_index(GdiFont *font)
{ {
FT_UInt default_char; FT_UInt default_char;
@ -6061,7 +6089,7 @@ static DWORD freetype_GetGlyphIndices( PHYSDEV dev, LPCWSTR lpstr, INT count, LP
for(i = 0; i < count; i++) for(i = 0; i < count; i++)
{ {
pgi[i] = get_glyph_index(physdev->font, lpstr[i]); pgi[i] = get_gdi_glyph_index(physdev->font, lpstr[i]);
if (pgi[i] == 0) if (pgi[i] == 0)
{ {
if (!got_default) if (!got_default)