Alexandre Julliard : ole32/tests: Fix a couple of test failures on Win9x and NT4.
Alexandre Julliard
julliard at winehq.org
Fri Nov 14 07:54:46 CST 2008
Module: wine
Branch: master
Commit: f8b8478f91ae7dcee61bffa7215f1c3cc4c95cbb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b8478f91ae7dcee61bffa7215f1c3cc4c95cbb
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Nov 13 21:45:57 2008 +0100
ole32/tests: Fix a couple of test failures on Win9x and NT4.
---
dlls/ole32/tests/storage32.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c
index 6a7158b..f65af73 100644
--- a/dlls/ole32/tests/storage32.c
+++ b/dlls/ole32/tests/storage32.c
@@ -262,7 +262,8 @@ static void test_storage_stream(void)
r = IStorage_CreateStream(stg, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm );
ok(r==STG_E_INVALIDNAME, "IStorage->CreateStream wrong error\n");
r = IStorage_CreateStream(stg, longname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm );
- ok(r==STG_E_INVALIDNAME, "IStorage->CreateStream wrong error, got %d GetLastError()=%d\n", r, GetLastError());
+ ok(r==STG_E_INVALIDNAME || broken(r==S_OK) /* nt4 */,
+ "IStorage->CreateStream wrong error, got %d GetLastError()=%d\n", r, GetLastError());
r = IStorage_CreateStream(stg, stmname, STGM_READWRITE, 0, 0, &stm );
ok(r==STG_E_INVALIDFLAG, "IStorage->CreateStream wrong error\n");
r = IStorage_CreateStream(stg, stmname, STGM_READ, 0, 0, &stm );
@@ -1100,7 +1101,8 @@ static void _test_file_access(LPCSTR file, const struct access_res *ares, DWORD
line, idx, ares[idx].gothandle,
(hfile != INVALID_HANDLE_VALUE));
- ok(lasterr == ares[idx].lasterr,
+ ok(lasterr == ares[idx].lasterr ||
+ broken(lasterr == 0xdeadbeef) /* win9x */,
"(%d, lasterr, %d): Expected %d, got %d\n",
line, idx, ares[idx].lasterr, lasterr);
More information about the wine-cvs
mailing list