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

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

svn path=/trunk/; revision=42773

diff --git a/reactos/subsystems/win32/win32k/objects/freetype.c b/reactos/subsystems/win32/win32k/objects/freetype.c
index 7a5ae4c..727e239 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/freetype.c
+++ b/reactos/subsystems/win32/win32k/objects/freetype.c
@@ -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,