reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 20:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdi32: Use a separate variable to indicate the default has been retrieved.

Browse Source
This commit is contained in:
Huw Davies 2011-09-28 13:46:48 +01:00 committed by Alexandre Julliard
parent 54f71a0d8e
commit b4430319f1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/gdi32/freetype.c
View File

@ -4602,16 +4602,21 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count,
LPWORD pgi, DWORD flags)
{
int i;
int default_char = -1;
WORD default_char;
BOOL got_default = FALSE;
if (flags & GGI_MARK_NONEXISTING_GLYPHS) default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */
if (flags & GGI_MARK_NONEXISTING_GLYPHS)
{
default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */
got_default = TRUE;
}
for(i = 0; i < count; i++)
{
pgi[i] = get_glyph_index(font, lpstr[i]);
if (pgi[i] == 0)
{
if (default_char == -1)
if (!got_default)
{
if (FT_IS_SFNT(font->ft_face))
{
@ -4624,6 +4629,7 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count,
WineEngGetTextMetrics(font, &textm);
default_char = textm.tmDefaultChar;
}
got_default = TRUE;
}
pgi[i] = default_char;
}