Detlef Riekenberg : crypt32/test: When using dynamic binding for functions, do it in all locations.
Alexandre Julliard
julliard at winehq.org
Wed Nov 3 11:37:02 CDT 2010
Module: wine
Branch: master
Commit: 661a8f3787682c6ff134e4c315cc755667af7530
URL: http://source.winehq.org/git/wine.git/?a=commit;h=661a8f3787682c6ff134e4c315cc755667af7530
Author: Detlef Riekenberg <wine.dev at web.de>
Date: Tue Nov 2 23:41:59 2010 +0100
crypt32/test: When using dynamic binding for functions, do it in all locations.
---
dlls/crypt32/tests/chain.c | 16 ++++++++--------
dlls/crypt32/tests/crl.c | 24 ++++++++++++------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c
index c172fe5..11f297c 100644
--- a/dlls/crypt32/tests/chain.c
+++ b/dlls/crypt32/tests/chain.c
@@ -3695,7 +3695,7 @@ static void testGetCertChain(void)
{
ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE,
"expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n");
- CertFreeCertificateChain(chain);
+ pCertFreeCertificateChain(chain);
}
oids[0] = oid_server_auth;
ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, ¶,
@@ -3706,7 +3706,7 @@ static void testGetCertChain(void)
ok(!(chain->TrustStatus.dwErrorStatus &
CERT_TRUST_IS_NOT_VALID_FOR_USAGE),
"didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n");
- CertFreeCertificateChain(chain);
+ pCertFreeCertificateChain(chain);
}
oids[1] = one_two_three;
para.RequestedUsage.Usage.cUsageIdentifier = 2;
@@ -3718,7 +3718,7 @@ static void testGetCertChain(void)
{
ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE,
"expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n");
- CertFreeCertificateChain(chain);
+ pCertFreeCertificateChain(chain);
}
para.RequestedUsage.dwType = USAGE_MATCH_TYPE_OR;
ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, ¶,
@@ -3729,7 +3729,7 @@ static void testGetCertChain(void)
ok(!(chain->TrustStatus.dwErrorStatus &
CERT_TRUST_IS_NOT_VALID_FOR_USAGE),
"didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n");
- CertFreeCertificateChain(chain);
+ pCertFreeCertificateChain(chain);
}
CertCloseStore(store, 0);
CertFreeCertificateContext(cert);
@@ -4443,7 +4443,7 @@ static void check_ssl_policy(void)
CertAddEncodedCertificateToStore(testRoot, X509_ASN_ENCODING, chain0_0,
sizeof(chain0_0), CERT_STORE_ADD_ALWAYS, NULL);
engineConfig.hExclusiveRoot = testRoot;
- if (!CertCreateCertificateChainEngine(&engineConfig, &engine))
+ if (!pCertCreateCertificateChainEngine(&engineConfig, &engine))
{
skip("Couldn't create chain engine\n");
return;
@@ -4464,7 +4464,7 @@ static void check_ssl_policy(void)
sslPolicyPara.fdwChecks |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID;
CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, engine,
winehqPolicyCheckWithMatchingName, &oct2007, &policyPara);
- CertFreeCertificateChainEngine(engine);
+ pCertFreeCertificateChainEngine(engine);
CertCloseStore(testRoot, 0);
/* Test chain30, which has an invalid critical extension in an intermediate
* cert, against the SSL policy.
@@ -4553,9 +4553,9 @@ START_TEST(chain)
pCertVerifyCertificateChainPolicy = (void*)GetProcAddress(hCrypt32, "CertVerifyCertificateChainPolicy");
testCreateCertChainEngine();
- if (!pCertGetCertificateChain)
+ if (!pCertGetCertificateChain || !pCertFreeCertificateChain)
{
- win_skip("CertGetCertificateChain() is not available\n");
+ win_skip("Cert*CertificateChain functions not available\n");
}
else
{
diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c
index bb62219..214d612 100644
--- a/dlls/crypt32/tests/crl.c
+++ b/dlls/crypt32/tests/crl.c
@@ -408,9 +408,9 @@ static void testFindCRL(void)
BOOL ret;
if (!store) return;
- if (!pCertFindCRLInStore)
+ if (!pCertFindCRLInStore || !pCertFindCertificateInCRL)
{
- win_skip("CertFindCRLInStore() is not available\n");
+ win_skip("CertFindCRLInStore or CertFindCertificateInCRL not available\n");
return;
}
@@ -521,7 +521,7 @@ static void testFindCRL(void)
PCRL_ENTRY entry;
count++;
- if (CertFindCertificateInCRL(cert, context, 0, NULL, &entry) &&
+ if (pCertFindCertificateInCRL(cert, context, 0, NULL, &entry) &&
entry)
revoked_count++;
}
@@ -557,7 +557,7 @@ static void testFindCRL(void)
PCRL_ENTRY entry;
count++;
- if (CertFindCertificateInCRL(cert, context, 0, NULL, &entry) &&
+ if (pCertFindCertificateInCRL(cert, context, 0, NULL, &entry) &&
entry)
revoked_count++;
}
@@ -586,7 +586,7 @@ static void testFindCRL(void)
PCRL_ENTRY entry;
count++;
- if (CertFindCertificateInCRL(cert, context, 0, NULL, &entry) &&
+ if (pCertFindCertificateInCRL(cert, context, 0, NULL, &entry) &&
entry)
revoked_count++;
}
@@ -626,7 +626,7 @@ static void testFindCRL(void)
PCRL_ENTRY entry;
count++;
- if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
+ if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
entry)
revoked_count++;
}
@@ -646,7 +646,7 @@ static void testFindCRL(void)
PCRL_ENTRY entry;
count++;
- if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
+ if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
entry)
revoked_count++;
}
@@ -663,7 +663,7 @@ static void testFindCRL(void)
PCRL_ENTRY entry;
count++;
- if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
+ if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
entry)
revoked_count++;
}
@@ -680,7 +680,7 @@ static void testFindCRL(void)
PCRL_ENTRY entry;
count++;
- if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
+ if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
entry)
revoked_count++;
}
@@ -697,7 +697,7 @@ static void testFindCRL(void)
PCRL_ENTRY entry;
count++;
- if (CertFindCertificateInCRL(rootCert, context, 0, NULL, &entry) &&
+ if (pCertFindCertificateInCRL(rootCert, context, 0, NULL, &entry) &&
entry)
revoked_count++;
}
@@ -716,7 +716,7 @@ static void testFindCRL(void)
PCRL_ENTRY entry;
count++;
- if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
+ if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
entry)
revoked_count++;
}
@@ -734,7 +734,7 @@ static void testFindCRL(void)
PCRL_ENTRY entry;
count++;
- if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
+ if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) &&
entry)
revoked_count++;
}
More information about the wine-cvs
mailing list