Austin English : cryptnet/tests: Remove win9x hacks.

[Alexandre Julliard]

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

Author: Austin English 
Date:   Fri Feb 25 14:30:25 2011 -0800

cryptnet/tests: Remove win9x hacks.

---

dlls/cryptnet/tests/cryptnet.c |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c
index 113406c..a7fc9ec 100644
--- a/dlls/cryptnet/tests/cryptnet.c
+++ b/dlls/cryptnet/tests/cryptnet.c
@@ -365,12 +365,9 @@ static void test_retrieveObjectByUrl(void)
     SetLastError(0xdeadbeef);
     ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl,
      NULL, NULL, NULL, NULL);
-    /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, 95: OSS_DATA_ERROR */
-    ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH ||
-                GetLastError() == CRYPT_E_ASN1_BADTAG ||
-                GetLastError() == OSS_DATA_ERROR),
-       "got 0x%x/%u (expected CRYPT_E_NO_MATCH or CRYPT_E_ASN1_BADTAG or "
-       "OSS_DATA_ERROR)\n", GetLastError(), GetLastError());
+    /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH */
+    ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH),
+        "got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError());

/* only newer versions of cryptnet do the cleanup */
     if(!ret && GetLastError() != CRYPT_E_ASN1_BADTAG &&
@@ -408,9 +405,8 @@ static void test_retrieveObjectByUrl(void)
     cert = (PCCERT_CONTEXT)0xdeadbeef;
     ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0,
      (void **)&cert, NULL, NULL, NULL, &aux);
-    /* w2k: success, 9x: fail with E_INVALIDARG */
-    ok(ret || (GetLastError() == E_INVALIDARG),
-       "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n",
+    /* w2k: success */
+    ok(ret, "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n",
        ret, GetLastError(), GetLastError());
     if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef)
         CertFreeCertificateContext(cert);
@@ -419,9 +415,8 @@ static void test_retrieveObjectByUrl(void)
     aux.cbSize = sizeof(aux);
     ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0,
      (void **)&cert, NULL, NULL, NULL, &aux);
-    /* w2k: success, 9x: fail with E_INVALIDARG */
-    ok(ret || (GetLastError() == E_INVALIDARG),
-       "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n",
+    /* w2k: success */
+    ok(ret, "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n",
        ret, GetLastError(), GetLastError());
     if (!ret) {
         /* no more tests useful */