Austin English : crypt32: Fix a couple of test failures on Vista.

Alexandre Julliard julliard at winehq.org
Wed Jul 2 06:03:31 CDT 2008


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

Author: Austin English <austinenglish at gmail.com>
Date:   Tue Jul  1 15:09:17 2008 -0500

crypt32: Fix a couple of test failures on Vista.

---

 dlls/crypt32/tests/crl.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c
index 3a65c7d..561953b 100644
--- a/dlls/crypt32/tests/crl.c
+++ b/dlls/crypt32/tests/crl.c
@@ -164,11 +164,13 @@ static void testAddCRL(void)
     /* Weird--bad add disposition leads to an access violation in Windows. */
     ret = CertAddEncodedCRLToStore(0, X509_ASN_ENCODING, signedCRL,
      sizeof(signedCRL), 0, NULL);
-    ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION,
-     "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError());
+    ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION ||
+                GetLastError() == E_INVALIDARG /* Vista */),
+     "Expected STATUS_ACCESS_VIOLATION or E_INVALIDARG, got %08x\n", GetLastError());
     ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL,
      sizeof(signedCRL), 0, NULL);
-    ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION,
+    ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION ||
+                GetLastError() == E_INVALIDARG /* Vista */),
      "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError());
 
     /* Weird--can add a CRL to the NULL store (does this have special meaning?)




More information about the wine-cvs mailing list