Juan Lang : cryptnet: Fix test failures on Windows Vista/2008.

[Alexandre Julliard]

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

Author: Juan Lang 
Date:   Thu Oct 16 16:21:03 2008 -0700

cryptnet: Fix test failures on Windows Vista/2008.

---

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

diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c
index 0907a53..2a40ed6 100644
--- a/dlls/cryptnet/tests/cryptnet.c
+++ b/dlls/cryptnet/tests/cryptnet.c
@@ -285,6 +285,12 @@ static void test_retrieveObjectByUrl(void)
     pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef;
     ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray,
      NULL, NULL, NULL, NULL);
+    if (!ret && GetLastError() == ERROR_NOT_SUPPORTED)
+    {
+        /* File URL support was apparently removed in Vista/Windows 2008 */
+        skip("File URLs not supported\n");
+        return;
+    }
     ok(ret, "CryptRetrieveObjectByUrlA failed: %d\n", GetLastError());
     ok(pBlobArray && pBlobArray != (CRYPT_BLOB_ARRAY *)0xdeadbeef,
      "Expected a valid pointer\n");
@@ -306,10 +312,8 @@ static void test_retrieveObjectByUrl(void)
     SetLastError(0xdeadbeef);
     ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl,
      NULL, NULL, NULL, NULL);
-    /* vista: ERROR_NOT_SUPPORTED, w2k3,XP, newer w2k: CRYPT_E_NO_MATCH,
-       95: OSS_DATA_ERROR */
-    ok(!ret && (GetLastError() == ERROR_NOT_SUPPORTED ||
-                GetLastError() == CRYPT_E_NO_MATCH ||
+    /* 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 "