[PATCH] scrrun/tests: Fix some test failures on Windows 2003.

Sven Baars sven.wine at gmail.com
Sat Oct 5 12:25:00 CDT 2019


Signed-off-by: Sven Baars <sven.wine at gmail.com>
---
These appear to be the same as the ones already marked broken for win2k.

 dlls/scrrun/tests/filesystem.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c
index ed49856921..46d452f113 100644
--- a/dlls/scrrun/tests/filesystem.c
+++ b/dlls/scrrun/tests/filesystem.c
@@ -1897,7 +1897,7 @@ todo_wine
     lstrcatW(buffW, crlfW);
     str = NULL;
     hr = ITextStream_Read(stream, 500, &str);
-    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr);
     ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str));
     SysFreeString(str);
 
@@ -1920,7 +1920,7 @@ todo_wine
     lstrcatW(buffW, L"123");
     str = NULL;
     hr = ITextStream_Read(stream, 500, &str);
-    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr);
     ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str));
     SysFreeString(str);
 
@@ -1942,7 +1942,7 @@ todo_wine
 
     str = (void*)0xdeadbeef;
     hr = ITextStream_Read(stream, 500, &str);
-    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr);
     ok(!wcscmp(str, L"123"), "got %s\n", wine_dbgstr_w(str));
 
     ITextStream_Release(stream);
@@ -1960,7 +1960,7 @@ todo_wine
 
     str = (void*)0xdeadbeef;
     hr = ITextStream_Read(stream, 500, &str);
-    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr);
     ok(!wcscmp(str, L"test"), "got %s\n", wine_dbgstr_w(str));
 
     ITextStream_Release(stream);
@@ -1981,7 +1981,7 @@ todo_wine
 
     str = NULL;
     hr = ITextStream_Read(stream, 500, &str);
-    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr);
     ok(!lstrcmpW(L"test123", str), "got %s\n", wine_dbgstr_w(str));
     SysFreeString(str);
 
@@ -2003,7 +2003,7 @@ todo_wine
 
     str = (void*)0xdeadbeef;
     hr = ITextStream_Read(stream, 500, &str);
-    ok(hr == S_FALSE, "got 0x%08x\n", hr);
+    ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr);
     ok(!wcscmp(str, L"test string"), "got %s\n", wine_dbgstr_w(str));
 
     ITextStream_Release(stream);
-- 
2.17.1




More information about the wine-devel mailing list