Dmitry Timoshkov : usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts.

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: 70bbc9566431ad520fa48de4ce7e1fc8688f0095
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=70bbc9566431ad520fa48de4c...

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Tue Jul 21 18:57:00 2020 +0800

usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts.

Use same check as ScriptShapeOpenType() does, fixes painting of
non-latin characters in Wordpad using MS Sans Serif font.

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
Signed-off-by: Aric Stewart <aric(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 24e09ac5823083bfd2e283e8b19e96a60d745e6e)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/usp10/usp10.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index f0978680a91..9f3847b657c 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -3606,10 +3606,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN
     if (!hdc || !psc) return E_INVALIDARG;
     if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG;
 
-    fuOptions &= ETO_CLIPPED + ETO_OPAQUE;
+    fuOptions &= ETO_CLIPPED | ETO_OPAQUE;
     fuOptions |= ETO_IGNORELANGUAGE;
-    if  (!psa->fNoGlyphIndex)                                     /* Have Glyphs?                      */
-        fuOptions |= ETO_GLYPH_INDEX;                             /* Say don't do translation to glyph */
+    if (!psa->fNoGlyphIndex && *psc && ((ScriptCache *)*psc)->sfnt)
+        fuOptions |= ETO_GLYPH_INDEX; /* We do actually have glyph indices */
 
     if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx))))
         return E_OUTOFMEMORY;