Paul Vriens : crypt32/tests: Fix a test on Vista.
Alexandre Julliard
julliard at winehq.org
Mon Sep 8 07:41:49 CDT 2008
Module: wine
Branch: master
Commit: e8b8856df0692412529a76a1a85a1ea814549d7b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b8856df0692412529a76a1a85a1ea814549d7b
Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date: Sat Sep 6 14:15:54 2008 +0200
crypt32/tests: Fix a test on Vista.
---
dlls/crypt32/tests/chain.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c
index ccb4cfc..45d45b8 100644
--- a/dlls/crypt32/tests/chain.c
+++ b/dlls/crypt32/tests/chain.c
@@ -1612,14 +1612,18 @@ static void testGetCertChain(void)
SetLastError(0xdeadbeef);
ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, ¶, 0, NULL,
&chain);
- ok(!ret && GetLastError() == ERROR_INVALID_DATA,
- "Expected ERROR_INVALID_DATA, got %d\n", GetLastError());
+ ok(!ret, "Expected failure\n");
+ ok(GetLastError() == ERROR_INVALID_DATA ||
+ GetLastError() == CRYPT_E_ASN1_BADTAG /* Vista */,
+ "Expected ERROR_INVALID_DATA or CRYPT_E_ASN1_BADTAG, got %d\n", GetLastError());
para.cbSize = sizeof(para);
SetLastError(0xdeadbeef);
ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, ¶, 0, NULL,
&chain);
- ok(!ret && GetLastError() == ERROR_INVALID_DATA,
- "Expected ERROR_INVALID_DATA, got %d\n", GetLastError());
+ ok(!ret, "Expected failure\n");
+ ok(GetLastError() == ERROR_INVALID_DATA ||
+ GetLastError() == CRYPT_E_ASN1_BADTAG /* Vista */,
+ "Expected ERROR_INVALID_DATA or CRYPT_E_ASN1_BADTAG, got %d\n", GetLastError());
CertFreeCertificateContext(cert);
for (i = 0; i < sizeof(chainCheck) / sizeof(chainCheck[0]); i++)
More information about the wine-cvs
mailing list