Nikolay Sivov : dwrite: Fix explicit levels returned for LRE and RLE control characters.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: abfc973c85290d8c30bf0c7d19b03a2ef85e7208
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=abfc973c85290d8c30bf0c7d19b03a2ef85e7208

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Apr  5 11:56:06 2017 +0300

dwrite: Fix explicit levels returned for LRE and RLE control characters.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dwrite/bidi.c           | 4 ++--
 dlls/dwrite/tests/analyzer.c | 6 ------
 dlls/dwrite/tests/layout.c   | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c
index 3a7367e..d4ee2ca 100644
--- a/dlls/dwrite/bidi.c
+++ b/dlls/dwrite/bidi.c
@@ -278,7 +278,7 @@ static void bidi_resolve_explicit(UINT8 baselevel, UINT8 *classes, UINT8 *levels
         /* X2 */
         case RLE:
             least_odd = get_greater_odd_level(stack[stack_top].level);
-            levels[i] = stack[stack_top].level;
+            levels[i] = valid_level(least_odd) ? least_odd : stack[stack_top].level;
             if (valid_level(least_odd))
                 push_stack(least_odd, NI, FALSE);
             else if (overflow_isolate_count == 0)
@@ -288,7 +288,7 @@ static void bidi_resolve_explicit(UINT8 baselevel, UINT8 *classes, UINT8 *levels
         /* X3 */
         case LRE:
             least_even = get_greater_even_level(stack[stack_top].level);
-            levels[i] = stack[stack_top].level;
+            levels[i] = valid_level(least_even) ? least_even : stack[stack_top].level;
             if (valid_level(least_even))
                 push_stack(least_even, NI, FALSE);
             else if (overflow_isolate_count == 0)
diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c
index 7af19d7..2e2a2e9 100644
--- a/dlls/dwrite/tests/analyzer.c
+++ b/dlls/dwrite/tests/analyzer.c
@@ -2282,42 +2282,36 @@ static const struct bidi_test bidi_tests[] = {
       DWRITE_READING_DIRECTION_LEFT_TO_RIGHT,
       { 2, 2, 0, 0 },
       { 0, 0, 0, 0 },
-      TRUE
     },
     {
       { 'a', LRE, PDF, 'b', 0 },
       DWRITE_READING_DIRECTION_LEFT_TO_RIGHT,
       { 0, 2, 2, 0 },
       { 0, 0, 0, 0 },
-      TRUE
     },
     {
       { RLE, PDF, 'a', 'b', 0 },
       DWRITE_READING_DIRECTION_LEFT_TO_RIGHT,
       { 1, 1, 0, 0 },
       { 0, 0, 0, 0 },
-      TRUE
     },
     {
       { 'a', RLE, PDF, 'b', 0 },
       DWRITE_READING_DIRECTION_LEFT_TO_RIGHT,
       { 0, 1, 1, 0 },
       { 0, 0, 0, 0 },
-      TRUE
     },
     {
       { 'a', RLE, PDF, 'b', 0 },
       DWRITE_READING_DIRECTION_RIGHT_TO_LEFT,
       { 1, 3, 3, 1 },
       { 2, 2, 2, 2 },
-      TRUE
     },
     {
       { LRE, PDF, 'a', 'b', 0 },
       DWRITE_READING_DIRECTION_RIGHT_TO_LEFT,
       { 2, 2, 1, 1 },
       { 1, 1, 2, 2 },
-      TRUE
     },
     {
       { PDF, 'a', 'b', 0 },
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index ecc57df..38b818c 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -1648,7 +1648,7 @@ todo_wine
     flush_sequence(sequences, RENDERER_ID);
     hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0);
     ok(hr == S_OK, "got 0x%08x\n", hr);
-    ok_sequence(sequences, RENDERER_ID, draw_seq3, "draw test 3", TRUE);
+    ok_sequence(sequences, RENDERER_ID, draw_seq3, "draw test 3", FALSE);
     IDWriteTextLayout_Release(layout);
 
     /* strikethrough splits ranges from renderer point of view, but doesn't break