[PATCH 2/2] Fix a test failure on several platforms

Paul Vriens Paul.Vriens.Wine at gmail.com
Mon Dec 21 11:51:18 CST 2009


---
 dlls/ole32/tests/storage32.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c
index 07ac810..2011375 100644
--- a/dlls/ole32/tests/storage32.c
+++ b/dlls/ole32/tests/storage32.c
@@ -999,7 +999,9 @@ static void test_streamenum(void)
     /* the storage is left open until the enumerator is freed */
     r = StgOpenStorage( filename, NULL, STGM_SHARE_EXCLUSIVE |
                             STGM_READWRITE |STGM_TRANSACTED, NULL, 0, &stg);
-    ok(r==STG_E_SHAREVIOLATION, "StgCreateDocfile failed, res=%x\n", r);
+    ok(r==STG_E_SHAREVIOLATION ||
+       r==STG_E_LOCKVIOLATION, /* XP-SP2/W2K3-SP1 and below */
+       "StgCreateDocfile failed, res=%x\n", r);
 
     r = IEnumSTATSTG_Release(ee);
     ok (r == 0, "enum not released\n");
-- 
1.6.2.5


--------------000803020809060700010609--



More information about the wine-patches mailing list