Paul Vriens : crypt32/tests: Use CryptAcquireContextA instead of CryptAcquireContextW.
Alexandre Julliard
julliard at winehq.org
Tue Aug 26 07:07:45 CDT 2008
Module: wine
Branch: master
Commit: 5f727cb2afbfafc3b396cf4902e55ca95dbc69d5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f727cb2afbfafc3b396cf4902e55ca95dbc69d5
Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date: Tue Aug 26 12:10:52 2008 +0200
crypt32/tests: Use CryptAcquireContextA instead of CryptAcquireContextW.
---
dlls/crypt32/tests/msg.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c
index 369576d..ba35b89 100644
--- a/dlls/crypt32/tests/msg.c
+++ b/dlls/crypt32/tests/msg.c
@@ -1900,7 +1900,7 @@ static void test_signed_msg_get_param(void)
if (!ret && GetLastError() == NTE_EXISTS)
ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL,
PROV_RSA_FULL, 0);
- ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError());
+ ok(ret, "CryptAcquireContextA failed: %x\n", GetLastError());
msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING,
CMSG_CRYPT_RELEASE_CONTEXT_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL);
ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError());
@@ -1935,12 +1935,12 @@ static void test_signed_msg_get_param(void)
signer.SignerId.dwIdChoice = CERT_ID_KEY_IDENTIFIER;
signer.SignerId.KeyId.cbData = sizeof(serialNum);
signer.SignerId.KeyId.pbData = (BYTE *)serialNum;
- ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL,
+ ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL,
PROV_RSA_FULL, CRYPT_NEWKEYSET);
if (!ret && GetLastError() == NTE_EXISTS)
- ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL,
+ ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL,
PROV_RSA_FULL, 0);
- ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError());
+ ok(ret, "CryptAcquireContextA failed: %x\n", GetLastError());
msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING,
CMSG_CRYPT_RELEASE_CONTEXT_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL);
ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError());
@@ -2791,6 +2791,8 @@ static BOOL detect_nt(void)
CMSG_SIGNER_ENCODE_INFO signer = { sizeof(signer), 0 };
CERT_INFO certInfo = { 0 };
+ if (!pCryptAcquireContextW)
+ return FALSE;
certInfo.SerialNumber.cbData = sizeof(serialNum);
certInfo.SerialNumber.pbData = serialNum;
More information about the wine-cvs
mailing list