Nikolay Sivov : dwrite/tests: Fix test failures on older versions.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Dec 29 15:49:00 CST 2015


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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Dec 28 07:35:10 2015 +0300

dwrite/tests: Fix test failures on older versions.

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

---

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

diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index 637a8ea..13ce6f8 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -2058,7 +2058,8 @@ if (0) /* crashes on native */
     ok(hr == S_OK, "got 0x%08x\n", hr);
 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);
+    ok((range.startPosition == 0 && range.length == ~0u) ||
+        broken(range.startPosition == 0 && range.length == 4) /* vista/win7 */, "got %u,%u\n", range.startPosition, range.length);
 
     /* check what's returned for positions after the text */
     buffW[0] = 0;
@@ -2067,7 +2068,8 @@ todo_wine
     ok(hr == S_OK, "got 0x%08x\n", hr);
 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);
+    ok((range.startPosition == 0 && range.length == ~0u) ||
+        broken(range.startPosition == 4 && range.length == ~0u-4) /* vista/win7 */, "got %u,%u\n", range.startPosition, range.length);
 
     IDWriteTextLayout_Release(layout);
     IDWriteTextFormat_Release(format);




More information about the wine-cvs mailing list