Nikolay Sivov : dwrite: Fix identical ranges merging.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Dec 25 15:58:02 2015 +0300

dwrite: Fix identical ranges merging.

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

---

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

diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index 62beea4..ef8d8bf 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -2136,7 +2136,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo
 
     /* for all existing ranges covered by new one update value */
     while (cur && is_in_layout_range(&value->range, &cur->range)) {
-        changed = set_layout_range_attrval(cur, attr, value);
+        changed |= set_layout_range_attrval(cur, attr, value);
         cur = LIST_ENTRY(list_next(ranges, &cur->entry), struct layout_range_header, entry);
     }
 
@@ -2145,7 +2145,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo
         r.startPosition = cur->range.startPosition;
         r.length = value->range.startPosition + value->range.length - cur->range.startPosition;
         left = alloc_layout_range_from(cur, &r);
-        changed = set_layout_range_attrval(left, attr, value);
+        changed |= set_layout_range_attrval(left, attr, value);
         cur->range.startPosition += left->range.length;
         cur->range.length -= left->range.length;
         list_add_before(&cur->entry, &left->entry);
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index da7dfe9..637a8ea 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -2056,17 +2056,17 @@ if (0) /* crashes on native */
     range.length = 0;
     hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(WCHAR), &range);
     ok(hr == S_OK, "got 0x%08x\n", hr);
-todo_wine {
+todo_wine
     ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW));
     ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length);
-}
+
     /* check what's returned for positions after the text */
     buffW[0] = 0;
     range.length = 0;
     hr = IDWriteTextLayout_GetLocaleName(layout, 100, buffW, sizeof(buffW)/sizeof(WCHAR), &range);
     ok(hr == S_OK, "got 0x%08x\n", hr);
-    ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW));
 todo_wine
+    ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW));
     ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length);
 
     IDWriteTextLayout_Release(layout);