ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32/tests: Don't shadow a variable with a variable of a different type.

Browse Source
This commit is contained in:
Juan Lang 2012-05-17 15:55:16 -07:00 committed by Alexandre Julliard
parent 568233621f
commit 03e409bbd2
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/crypt32/tests/cert.c
View File

@ -2098,7 +2098,6 @@ static void testCreateSelfSignCert(void)
if (context) if (context)
{ {
DWORD size = 0; DWORD size = 0;
PCRYPT_KEY_PROV_INFO info;
/* The context must have a key provider info property */ /* The context must have a key provider info property */
ret = CertGetCertificateContextProperty(context, ret = CertGetCertificateContextProperty(context,
@ -2106,24 +2105,25 @@ static void testCreateSelfSignCert(void)
ok(ret && size, "Expected non-zero key provider info\n"); ok(ret && size, "Expected non-zero key provider info\n");
if (size) if (size)
{ {
info = HeapAlloc(GetProcessHeap(), 0, size); PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size);
if (info)
if (pInfo)
{ {
ret = CertGetCertificateContextProperty(context, ret = CertGetCertificateContextProperty(context,
CERT_KEY_PROV_INFO_PROP_ID, info, &size); CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size);
ok(ret, "CertGetCertificateContextProperty failed: %08x\n", ok(ret, "CertGetCertificateContextProperty failed: %08x\n",
GetLastError()); GetLastError());
if (ret) if (ret)
{ {
/* Sanity-check the key provider */ /* Sanity-check the key provider */
ok(!lstrcmpW(info->pwszContainerName, cspNameW), ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW),
"Unexpected key container\n"); "Unexpected key container\n");
ok(!lstrcmpW(info->pwszProvName, MS_DEF_PROV_W), ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W),
"Unexpected provider\n"); "Unexpected provider\n");
ok(info->dwKeySpec == AT_SIGNATURE, ok(pInfo->dwKeySpec == AT_SIGNATURE,
"Expected AT_SIGNATURE, got %d\n", info->dwKeySpec); "Expected AT_SIGNATURE, got %d\n", pInfo->dwKeySpec);
} }
HeapFree(GetProcessHeap(), 0, info); HeapFree(GetProcessHeap(), 0, pInfo);
} }
} }
@ -2152,7 +2152,6 @@ static void testCreateSelfSignCert(void)
if (context) if (context)
{ {
DWORD size = 0; DWORD size = 0;
PCRYPT_KEY_PROV_INFO info;
/* The context must have a key provider info property */ /* The context must have a key provider info property */
ret = CertGetCertificateContextProperty(context, ret = CertGetCertificateContextProperty(context,
@ -2160,24 +2159,25 @@ static void testCreateSelfSignCert(void)
ok(ret && size, "Expected non-zero key provider info\n"); ok(ret && size, "Expected non-zero key provider info\n");
if (size) if (size)
{ {
info = HeapAlloc(GetProcessHeap(), 0, size); PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size);
if (info)
if (pInfo)
{ {
ret = CertGetCertificateContextProperty(context, ret = CertGetCertificateContextProperty(context,
CERT_KEY_PROV_INFO_PROP_ID, info, &size); CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size);
ok(ret, "CertGetCertificateContextProperty failed: %08x\n", ok(ret, "CertGetCertificateContextProperty failed: %08x\n",
GetLastError()); GetLastError());
if (ret) if (ret)
{ {
/* Sanity-check the key provider */ /* Sanity-check the key provider */
ok(!lstrcmpW(info->pwszContainerName, cspNameW), ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW),
"Unexpected key container\n"); "Unexpected key container\n");
ok(!lstrcmpW(info->pwszProvName, MS_DEF_PROV_W), ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W),
"Unexpected provider\n"); "Unexpected provider\n");
ok(info->dwKeySpec == AT_KEYEXCHANGE, ok(pInfo->dwKeySpec == AT_KEYEXCHANGE,
"Expected AT_KEYEXCHANGE, got %d\n", info->dwKeySpec); "Expected AT_KEYEXCHANGE, got %d\n", pInfo->dwKeySpec);
} }
HeapFree(GetProcessHeap(), 0, info); HeapFree(GetProcessHeap(), 0, pInfo);
} }
} }