Author: gschneider
Date: Tue Aug 18 21:51:32 2009
New Revision: 42773
URL:
http://svn.reactos.org/svn/reactos?rev=42773&view=rev
Log:
- 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
Modified:
trunk/reactos/subsystems/win32/win32k/objects/freetype.c
Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Tue Aug 18
21:51:32 2009
@@ -3695,7 +3695,10 @@
}
/* 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,