From 5fb284721d3a4b80f66f2f6840d15ac2eac6e568 Mon Sep 17 00:00:00 2001
From: Paul Vriens <paul.vriens.wine@gmail.com>
Date: Fri, 15 Jun 2007 16:55:21 +0200
Subject: [PATCH] crypt32/tests: Don't crash on Vista.

---
 dlls/crypt32/tests/main.c | 72 +++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 30 deletions(-)

diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c
index 73ead4aac75..e55d2d38677 100644
--- a/dlls/crypt32/tests/main.c
+++ b/dlls/crypt32/tests/main.c
@@ -44,16 +44,20 @@ static void test_findAttribute(void)
     ok(ret == NULL, "Expected failure\n");
     ok(GetLastError() == 0xdeadbeef, "Last error was set to %08x\n",
      GetLastError());
-    /* crashes
-    SetLastError(0xdeadbeef);
-    ret = CertFindAttribute(NULL, 1, NULL);
-     */
-    /* returns NULL, last error is ERROR_INVALID_PARAMETER */
-    SetLastError(0xdeadbeef);
-    ret = CertFindAttribute(NULL, 1, &attr);
-    ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
-     "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(),
-     GetLastError());
+    if (0)
+    {
+        /* crashes */
+        SetLastError(0xdeadbeef);
+        ret = CertFindAttribute(NULL, 1, NULL);
+        /* returns NULL, last error is ERROR_INVALID_PARAMETER
+         * crashes on Vista
+         */
+        SetLastError(0xdeadbeef);
+        ret = CertFindAttribute(NULL, 1, &attr);
+        ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
+         "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(),
+         GetLastError());
+    }
     /* returns NULL, last error not set */
     SetLastError(0xdeadbeef);
     ret = CertFindAttribute("bogus", 1, &attr);
@@ -85,16 +89,20 @@ static void test_findExtension(void)
     ok(ret == NULL, "Expected failure\n");
     ok(GetLastError() == 0xdeadbeef, "Last error was set to %08x\n",
      GetLastError());
-    /* crashes
-    SetLastError(0xdeadbeef);
-    ret = CertFindExtension(NULL, 1, NULL);
-     */
-    /* returns NULL, last error is ERROR_INVALID_PARAMETER */
-    SetLastError(0xdeadbeef);
-    ret = CertFindExtension(NULL, 1, &ext);
-    ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
-     "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(),
-     GetLastError());
+    if (0)
+    {
+        /* crashes */
+        SetLastError(0xdeadbeef);
+        ret = CertFindExtension(NULL, 1, NULL);
+        /* returns NULL, last error is ERROR_INVALID_PARAMETER
+         * crashes on Vista
+         */
+        SetLastError(0xdeadbeef);
+        ret = CertFindExtension(NULL, 1, &ext);
+        ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
+         "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(),
+         GetLastError());
+    }
     /* returns NULL, last error not set */
     SetLastError(0xdeadbeef);
     ret = CertFindExtension("bogus", 1, &ext);
@@ -126,16 +134,20 @@ static void test_findRDNAttr(void)
     };
     CERT_NAME_INFO nameInfo = { sizeof(rdns) / sizeof(rdns[0]), rdns };
 
-    /* crashes
-    SetLastError(0xdeadbeef);
-    ret = CertFindRDNAttr(NULL, NULL);
-     */
-    /* returns NULL, last error is ERROR_INVALID_PARAMETER */
-    SetLastError(0xdeadbeef);
-    ret = CertFindRDNAttr(NULL, &nameInfo);
-    ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
-     "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(),
-     GetLastError());
+    if (0)
+    {
+        /* crashes */
+        SetLastError(0xdeadbeef);
+        ret = CertFindRDNAttr(NULL, NULL);
+        /* returns NULL, last error is ERROR_INVALID_PARAMETER
+         * crashes on Vista
+         */
+        SetLastError(0xdeadbeef);
+        ret = CertFindRDNAttr(NULL, &nameInfo);
+        ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
+         "Expected ERROR_INVALID_PARAMETER, got %d (%08x)\n", GetLastError(),
+         GetLastError());
+    }
     /* returns NULL, last error not set */
     SetLastError(0xdeadbeef);
     ret = CertFindRDNAttr("bogus", &nameInfo);