[PATCH] usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts.

[Dmitry Timoshkov]

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

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 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 322091c547..20025a6e93 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -3607,10 +3607,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 && ((ScriptCache *)*psc)->sfnt)
+        fuOptions |= ETO_GLYPH_INDEX; /* We do actually have glyph indices */
 
     if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx))))
         return E_OUTOFMEMORY;
-- 
2.26.2

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=75838

Your paranoid android.


=== debiant (32 bit report) ===

usp10:
Unhandled exception: page fault on read access to 0x000000b8 in 32-bit code (0x6281d340).

Report validation errors:
usp10:usp10 crashed (c0000005)

=== debiant (32 bit Chinese:China report) ===

usp10:
Unhandled exception: page fault on read access to 0x000000b8 in 32-bit code (0x6281d340).

Report validation errors:
usp10:usp10 crashed (c0000005)

=== debiant (32 bit WoW report) ===

usp10:
Unhandled exception: page fault on read access to 0x000000b8 in 32-bit code (0x6281d340).

Report validation errors:
usp10:usp10 crashed (c0000005)

=== debiant (64 bit WoW report) ===

usp10:
Unhandled exception: page fault on read access to 0x000000b8 in 32-bit code (0x6281d340).

Report validation errors:
usp10:usp10 crashed (c0000005)