Paul Vriens : crypt32/tests: Don't crash on Vista.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jun 18 08:04:58 CDT 2007
Module: wine
Branch: master
Commit: 5fb284721d3a4b80f66f2f6840d15ac2eac6e568
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb284721d3a4b80f66f2f6840d15ac2eac6e568
Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date: Fri Jun 15 16:55:21 2007 +0200
crypt32/tests: Don't crash on Vista.
---
dlls/crypt32/tests/main.c | 72 ++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c
index 73ead4a..e55d2d3 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);
More information about the wine-cvs
mailing list