Nikolay Sivov : dwrite/tests: Relax tests that fail on some Win10 versions.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Sun Oct 20 15:21:55 2019 +0300

dwrite/tests: Relax tests that fail on some Win10 versions.

GetString() return value contradicts other methods,and partially buffer writes
don't happen elsewhere. It's not worth to replicate this.

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

---

 dlls/dwrite/tests/font.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index 32156fdedd..c2f9dc0b1f 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -1738,7 +1738,7 @@ static void test_GetFamilyNames(void)
     ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr);
 
     hr = IDWriteLocalizedStrings_GetString(names, 10, NULL, 0);
-    ok(hr == E_FAIL, "got 0x%08x\n", hr);
+    ok(FAILED(hr), "Unexpected hr %#x.\n", hr);
 
     if (0)
         hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 100);
@@ -1751,12 +1751,12 @@ static void test_GetFamilyNames(void)
     buffer[0] = 1;
     hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len-1);
     ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr);
-    ok(buffer[0] == 0, "got %x\n", buffer[0]);
+    ok(buffer[0] == 0 || broken(buffer[0] == 'T'), "Unexpected buffer contents, %#x.\n", buffer[0]);
 
     buffer[0] = 1;
     hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len);
     ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr);
-    ok(buffer[0] == 0, "got %x\n", buffer[0]);
+    ok(buffer[0] == 0 || broken(buffer[0] == 'T'), "Unexpected buffer contents, %#x.\n", buffer[0]);
 
     buffer[0] = 0;
     hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len+1);