usp10: Do not fall back to presentation form B if the contextual feature exists…

usp10: Do not fall back to presentation form B if the contextual feature exists in ContextualShape_Arabic(). E.g., the base form of 'ا' may be the same as the isolated form, in which case the "isol" feature may not have a substitution for it. At the same time, while the presentation form B glyph may look the same or similar as the base form, it may have a different glyph ID. This can break e.g. GSUB_LOOKUP_CONTEXT_CHAINED substitutions because of the unexpected glyph ID. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

usp10: Do not fall back to presentation form B if the contextual feature exists…
502d2398 · Henri Verbeet · Alexandre Julliard · 36c52522 · 502d2398
Commit 502d2398 authored Mar 07, 2017 by Henri Verbeet Committed by Alexandre Julliard Mar 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

shape.c dlls/usp10/shape.c +7 -1

No files found.
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -1129,8 +1129,14 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p
                    offset = *pcGlyphs - prevCount;
                    glyph_index += dirL * (offset + 1);
                }
+                shaped = TRUE;
+            }
+            else if (nextIndex == GSUB_E_NOGLYPH)
+            {
+                char_index += dirL;
+                glyph_index += dirL;
+                shaped = TRUE;
            }
-            shaped = (nextIndex > GSUB_E_NOGLYPH);
        }

        if (!shaped)