[PATCH] Use CryptAcquireContextA instead of CryptAcquireContextW

[Paul Vriens]

---
 dlls/crypt32/tests/msg.c |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c
index 369576d..fa90609 100644
--- a/dlls/crypt32/tests/msg.c
+++ b/dlls/crypt32/tests/msg.c
@@ -34,8 +34,6 @@ static char oid_rsa_md5[] = szOID_RSA_MD5;
 
 static BOOL (WINAPI * pCryptAcquireContextA)
                         (HCRYPTPROV *, LPCSTR, LPCSTR, DWORD, DWORD);
-static BOOL (WINAPI * pCryptAcquireContextW)
-                        (HCRYPTPROV *, LPCWSTR, LPCWSTR, DWORD, DWORD);
 
 static void init_function_pointers(void)
 {
@@ -47,7 +45,6 @@ static void init_function_pointers(void)
       trace("GetProcAddress(%s) failed\n", #func);
 
     GET_PROC(hAdvapi32, CryptAcquireContextA)
-    GET_PROC(hAdvapi32, CryptAcquireContextW)
 
 #undef GET_PROC
 }
@@ -1014,8 +1011,6 @@ static void test_hash_msg(void)
 
 static const CHAR cspNameA[] = { 'W','i','n','e','C','r','y','p','t','T','e',
  'm','p',0 };
-static const WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e',
- 'm','p',0 };
 static BYTE serialNum[] = { 1 };
 static BYTE encodedCommonName[] = { 0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,
  0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00 };
@@ -1097,7 +1092,7 @@ static void test_signed_msg_open(void)
         ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL,
                                     PROV_RSA_FULL, 0);
     }
-    ok(ret, "CryptAcquireContext failed: 0x%x\n", GetLastError());
+    ok(ret, "CryptAcquireContextA failed: 0x%x\n", GetLastError());
 
     if (ret) {
         msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo,
@@ -1185,7 +1180,7 @@ static void test_signed_msg_update(void)
         ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL,
                                     PROV_RSA_FULL, 0);
     }
-    ok(ret, "CryptAcquireContext failed: 0x%x\n", GetLastError());
+    ok(ret, "CryptAcquireContextA failed: 0x%x\n", GetLastError());
 
     if (!ret) {
         skip("No context for tests\n");
@@ -1900,7 +1895,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 +1930,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());
@@ -2799,10 +2794,10 @@ static BOOL detect_nt(void)
     signer.pCertInfo = &certInfo;
     signer.HashAlgorithm.pszObjId = oid_rsa_md5;
 
-    ret = pCryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL,
+    ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL,
                                 PROV_RSA_FULL, CRYPT_NEWKEYSET);
     if (!ret && GetLastError() == NTE_EXISTS) {
-        ret = pCryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL,
+        ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL,
                                     PROV_RSA_FULL, 0);
     }
 
@@ -2810,7 +2805,7 @@ static BOOL detect_nt(void)
 
     /* cleanup */
     CryptReleaseContext(signer.hCryptProv, 0);
-    pCryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, PROV_RSA_FULL,
+    pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL, PROV_RSA_FULL,
                           CRYPT_DELETEKEYSET);
 
     return TRUE;
-- 
1.5.4.1


--------------050204060101080407010008--