usp10: Properly determine the glyph run direction when shaping Script_Arabic.

In particular, if fLogicalOrder and fRTL are both set, the glyph order is swapped compared to the character order. In all other cases it's the same. 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: Properly determine the glyph run direction when shaping Script_Arabic.
f13dea56 · Henri Verbeet · Alexandre Julliard · c94a5fd2 · f13dea56
Commit f13dea56 authored Mar 02, 2017 by Henri Verbeet Committed by Alexandre Julliard Mar 06, 2017
Show whitespace changes
Inline Side-by-side

Showing with 13 additions and 13 deletions

shape.c dlls/usp10/shape.c +13 -13

No files found.
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -1055,15 +1055,15 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p
        return;
    }

-    if (!psa->fLogicalOrder && psa->fRTL)
+    if (psa->fLogicalOrder && psa->fRTL)
    {
-        dirR = 1;
-        dirL = -1;
+        dirR = -1;
+        dirL = 1;
    }
    else
    {
-        dirR = -1;
-        dirL = 1;
+        dirR = 1;
+        dirL = -1;
    }

    load_ot_tables(hdc, psc);
@@ -2946,20 +2946,20 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI
    spaces = HeapAlloc(GetProcessHeap(),0,cGlyphs);
    memset(spaces,0,cGlyphs);

-    if (!psa->fLogicalOrder && psa->fRTL)
-    {
-        initGlyph = cGlyphs-1;
-        finaGlyph = 0;
-        dirR = 1;
-        dirL = -1;
-    }
-    else
+    if (psa->fLogicalOrder && psa->fRTL)
    {
        initGlyph = 0;
        finaGlyph = cGlyphs-1;
        dirR = -1;
        dirL = 1;
    }
+    else
+    {
+        initGlyph = cGlyphs-1;
+        finaGlyph = 0;
+        dirR = 1;
+        dirL = -1;
+    }

    for (i = 0; i < cGlyphs; i++)
    {