Detlef Riekenberg : crypt32/tests: Fix failures on win7 and above.
Alexandre Julliard
julliard at winehq.org
Tue Nov 27 14:30:47 CST 2012
Module: wine
Branch: master
Commit: 70a0190e9679385bd2272fc3dfc9d4a842b734ed
URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a0190e9679385bd2272fc3dfc9d4a842b734ed
Author: Detlef Riekenberg <wine.dev at web.de>
Date: Mon Nov 26 23:20:23 2012 +0100
crypt32/tests: Fix failures on win7 and above.
---
dlls/crypt32/tests/chain.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c
index 2e4da55..9624a81 100644
--- a/dlls/crypt32/tests/chain.c
+++ b/dlls/crypt32/tests/chain.c
@@ -4626,16 +4626,18 @@ static void testVerifyCertChainPolicy(void)
ret = pCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, NULL,
&policyStatus);
ok(ret, "CertVerifyCertificateChainPolicy failed: %08x\n", GetLastError());
- ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT,
- "Expected CERT_E_UNTRUSTEDROOT, got %08x\n", policyStatus.dwError);
+ ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT ||
+ policyStatus.dwError == TRUST_E_CERT_SIGNATURE, /* win7 + win8 */
+ "Expected CERT_E_UNTRUSTEDROOT or TRUST_E_CERT_SIGNATURE, got %08x\n", policyStatus.dwError);
ok(policyStatus.lChainIndex == 0 && policyStatus.lElementIndex == 0,
"Expected both indexes 0, got %d, %d\n", policyStatus.lChainIndex,
policyStatus.lElementIndex);
ret = pCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain,
&policyPara, &policyStatus);
ok(ret, "CertVerifyCertificateChainPolicy failed: %08x\n", GetLastError());
- ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT,
- "Expected CERT_E_UNTRUSTEDROOT, got %08x\n", policyStatus.dwError);
+ ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT ||
+ policyStatus.dwError == TRUST_E_CERT_SIGNATURE, /* win7 + win8 */
+ "Expected CERT_E_UNTRUSTEDROOT or TRUST_E_CERT_SIGNATURE, got %08x\n", policyStatus.dwError);
ok(policyStatus.lChainIndex == 0 && policyStatus.lElementIndex == 0,
"Expected both indexes 0, got %d, %d\n", policyStatus.lChainIndex,
policyStatus.lElementIndex);
More information about the wine-cvs
mailing list