Dmitry Timoshkov : shlwapi/tests: Fix stream test failures under some win2000 versions.

Alexandre Julliard julliard at winehq.org
Thu Sep 19 17:21:01 CDT 2013


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

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Thu Sep 19 16:09:41 2013 +0900

shlwapi/tests: Fix stream test failures under some win2000 versions.

---

 dlls/shlwapi/tests/istream.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c
index 67f467b..48f417f 100644
--- a/dlls/shlwapi/tests/istream.c
+++ b/dlls/shlwapi/tests/istream.c
@@ -222,8 +222,8 @@ static void test_stream_read_write(IStream *stream, DWORD mode)
     ret = stream->lpVtbl->Read(stream, buf, 2, &count);
     if (written != 0)
     {
-        ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written);
-        if (mode == STGM_WRITE || mode == STGM_READWRITE)
+        ok(ret == S_OK || broken(ret == S_FALSE) /* win2000 */, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written);
+        if (ret == S_OK && (mode == STGM_WRITE || mode == STGM_READWRITE))
         {
             ok(count == 2, "expected 2, got %u\n", count);
             ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]);




More information about the wine-cvs mailing list