- Improve glyph guard from r42749: allow displaying glyphs if the application knows the character placements

- Some rendering engines (like FF3) do the conversion without using GetCharacterPlacementA/W

svn path=/trunk/; revision=42773
This commit is contained in:
Gregor Schneider 2009-08-18 19:51:32 +00:00
parent 4e9ecfe8a7
commit e74d2c5ce4

View file

@ -3695,7 +3695,10 @@ NtGdiExtTextOutW(
}
/* FIXME: remove this as soon as GetCharacterPlacementA/W work properly */
fuOptions &= ~ETO_GLYPH_INDEX;
if ((fuOptions & ETO_GLYPH_INDEX) && (fuOptions != (ETO_GLYPH_INDEX | ETO_PDY)))
{
fuOptions &= ~ETO_GLYPH_INDEX;
}
/* Finally call the internal routine */
Result = GreExtTextOutW(hDC,