Detlef Riekenberg : wintrust/tests: Fix some tests on win9x.

[Alexandre Julliard]

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

Author: Detlef Riekenberg 
Date:   Wed Apr  8 19:53:59 2009 +0200

wintrust/tests: Fix some tests on win9x.

---

dlls/wintrust/tests/crypt.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c
index 9129fa9..cfb9564 100644
--- a/dlls/wintrust/tests/crypt.c
+++ b/dlls/wintrust/tests/crypt.c
@@ -854,7 +854,9 @@ static void test_cdf_parsing(void)
     catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback);
     ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n");
     todo_wine
-    ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_SHARING_VIOLATION ||
+        broken(GetLastError() == ERROR_SUCCESS),    /* win9x */
+        "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
     DeleteFileA(cdffileA);

/* Header and member only */
@@ -868,7 +870,9 @@ static void test_cdf_parsing(void)
     catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback);
     ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n");
     todo_wine
-    ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_SHARING_VIOLATION ||
+        broken(GetLastError() == ERROR_SUCCESS),    /* win9x */
+        "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
     DeleteFileA(cdffileA);
     ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n");

@@ -882,7 +886,9 @@ static void test_cdf_parsing(void)
     catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback);
     ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n");
     todo_wine
-    ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_SHARING_VIOLATION ||
+        broken(GetLastError() == ERROR_SUCCESS),    /* win9x */
+        "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
     DeleteFileA(cdffileA);
     ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n");