commit eee179206e3aecd07f63cf76a8e54c3c0cd1bc7e
author Juan Lang <juan.lang@gmail.com> Fri Nov 20 12:20:17 2009 -0800
committer Alexandre Julliard <julliard@winehq.org> Sat Nov 21 14:31:44 2009 +0100
tree aa321485ca4c0646f29fc2d83dfb7e790ac0e455
parent 1a392e1a3045ba827e24b4940bf64334daefc690

crypt32/tests: Fix tests on Win9x/ME.

dlls/crypt32/tests/cert.c

diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c
index c42bb18..89268c0 100644
--- a/dlls/crypt32/tests/cert.c
+++ b/dlls/crypt32/tests/cert.c
@@ -3200,21 +3200,28 @@
     SetLastError(0xdeadbeef);
     ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE,
      1, (void **)&certs[1], 0, NULL, &status);
-    todo_wine
-    ok(!ret && GetLastError() == CRYPT_E_REVOCATION_OFFLINE,
-     "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", GetLastError());
-    todo_wine
-    ok(status.dwError == CRYPT_E_REVOCATION_OFFLINE,
-     "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", status.dwError);
+    ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* Win9x */ ||
+     GetLastError() == CRYPT_E_REVOCATION_OFFLINE),
+     "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n",
+     GetLastError());
+    ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK /* Win9x */ ||
+     status.dwError == CRYPT_E_REVOCATION_OFFLINE,
+     "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n",
+     status.dwError);
     ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex);
     /* Both certs together can't, either (they're not CRLs) */
     SetLastError(0xdeadbeef);
     ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE,
      2, (void **)certs, 0, NULL, &status);
-    ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK,
-     "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError());
-    ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK,
-     "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError);
+    ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK ||
+     GetLastError() == CRYPT_E_REVOCATION_OFFLINE /* WinME */),
+     "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n",
+     GetLastError());
+    ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK ||
+     status.dwError == CRYPT_E_REVOCATION_OFFLINE /* WinME */,
+     "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n",
+     status.dwError);
+    ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex);
     ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex);
     /* Now add a CRL to the hCrlStore */
     revPara.hCrlStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
@@ -3224,10 +3231,14 @@
     SetLastError(0xdeadbeef);
     ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE,
      2, (void **)certs, 0, &revPara, &status);
-    ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK,
-     "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError());
-    ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK,
-     "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError);
+    ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK ||
+     GetLastError() == CRYPT_E_REVOCATION_OFFLINE /* WinME */),
+     "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n",
+     GetLastError());
+    ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK ||
+     status.dwError == CRYPT_E_REVOCATION_OFFLINE /* WinME */,
+     "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n",
+     status.dwError);
     ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex);
     /* Specifying CERT_VERIFY_REV_CHAIN_FLAG doesn't change things either */
     SetLastError(0xdeadbeef);