secur32/tests: Win64 printf format warning fixes.
Michael [Plouj] Ploujnikov
ploujj at gmail.com
Tue Oct 10 16:47:35 CDT 2006
--
() ASCII Ribbon Campaign
/\ - against HTML mail & vCards
-------------- next part --------------
secur32/tests: Win64 printf format warning fixes.
From: Michael Ploujnikov <ploujj at gmail.com>
Removed some unnecessary casts to LONG as well.
---
dlls/secur32/tests/Makefile.in | 1 -
dlls/secur32/tests/main.c | 12 ++++----
dlls/secur32/tests/ntlm.c | 2 +
dlls/secur32/tests/schannel.c | 60 ++++++++++++++++++++--------------------
dlls/secur32/tests/secur32.c | 4 +--
5 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/dlls/secur32/tests/Makefile.in b/dlls/secur32/tests/Makefile.in
index 493f58c..45cfeab 100644
--- a/dlls/secur32/tests/Makefile.in
+++ b/dlls/secur32/tests/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = secur32.dll
IMPORTS = crypt32 advapi32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
CTESTS = \
main.c \
diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c
index cb4d82d..011b3db 100644
--- a/dlls/secur32/tests/main.c
+++ b/dlls/secur32/tests/main.c
@@ -98,7 +98,7 @@ #define _SEC_ERR(x) case (x): return #x;
_SEC_ERR(SEC_E_NO_CREDENTIALS);
_SEC_ERR(SEC_E_OUT_OF_SEQUENCE);
default:
- sprintf(buf, "%08lx\n", status);
+ sprintf(buf, "%08x\n", status);
return buf;
}
#undef _SEC_ERR
@@ -140,18 +140,18 @@ static void testEnumerateSecurityPackage
sec_status = pEnumerateSecurityPackagesA(&num_packages, &pkg_info);
ok(sec_status == SEC_E_OK,
- "EnumerateSecurityPackages() should return %ld, not %08lx\n",
- (LONG)SEC_E_OK, (LONG)sec_status);
+ "EnumerateSecurityPackages() should return %d, not %08x\n",
+ SEC_E_OK, sec_status);
- ok(num_packages > 0, "Number of sec packages should be > 0 ,but is %ld\n",
+ ok(num_packages > 0, "Number of sec packages should be > 0 ,but is %d\n",
num_packages);
ok(pkg_info != NULL,
"pkg_info should not be NULL after EnumerateSecurityPackages\n");
- trace("Number of packages: %ld\n", num_packages);
+ trace("Number of packages: %d\n", num_packages);
for(i = 0; i < num_packages; ++i){
- trace("%ld: Package \"%s\"\n", i, pkg_info[i].Name);
+ trace("%d: Package \"%s\"\n", i, pkg_info[i].Name);
trace("Supported flags:\n");
if(pkg_info[i].fCapabilities & SECPKG_FLAG_INTEGRITY)
trace("\tSECPKG_FLAG_INTEGRITY\n");
diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c
index 244a502..8d18d70 100644
--- a/dlls/secur32/tests/ntlm.c
+++ b/dlls/secur32/tests/ntlm.c
@@ -179,7 +179,7 @@ #define _SEC_ERR(x) case (x): return #x;
_SEC_ERR(SEC_E_OUT_OF_SEQUENCE);
_SEC_ERR(SEC_E_MESSAGE_ALTERED);
default:
- sprintf(buf, "%08lx\n", status);
+ sprintf(buf, "%08x\n", status);
return buf;
}
#undef _SEC_ERR
diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
index 9d1fd1b..23e2a0a 100644
--- a/dlls/secur32/tests/schannel.c
+++ b/dlls/secur32/tests/schannel.c
@@ -139,18 +139,18 @@ static void testAcquireSecurityContext(v
st = pAcquireCredentialsHandleA(NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL,
NULL);
ok(st == SEC_E_SECPKG_NOT_FOUND,
- "Expected SEC_E_SECPKG_NOT_FOUND, got %08lx\n", st);
+ "Expected SEC_E_SECPKG_NOT_FOUND, got %08x\n", st);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, 0, NULL, NULL, NULL,
NULL, NULL, NULL);
- ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08lx\n",
+ ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n",
st);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_BOTH, NULL,
NULL, NULL, NULL, NULL, NULL);
- ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08lx\n",
+ ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n",
st);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, NULL, NULL, NULL, NULL, NULL);
- ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08lx\n",
+ ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n",
st);
/* Crashes
st = pAcquireCredentialsHandleA(NULL, UNISP_NAME_A, SECPKG_CRED_OUTBOUND,
@@ -158,12 +158,12 @@ static void testAcquireSecurityContext(v
*/
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, NULL, NULL, NULL, &cred, NULL);
- ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08lx\n", st);
+ ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
pFreeCredentialsHandle(&cred);
memset(&cred, 0, sizeof(cred));
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, NULL, NULL, NULL, &cred, &exp);
- ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08lx\n", st);
+ ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
ok(exp.HighPart == 0 && exp.LowPart == 0,
"Expected 0 expiry, got %08lx%08lx\n", exp.HighPart, exp.LowPart);
pFreeCredentialsHandle(&cred);
@@ -172,23 +172,23 @@ static void testAcquireSecurityContext(v
memset(&schanCred, 0, sizeof(schanCred));
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, &schanCred, NULL, NULL, NULL, NULL);
- ok(st == SEC_E_INTERNAL_ERROR, "Expected SEC_E_INTERNAL_ERROR, got %08lx\n",
+ ok(st == SEC_E_INTERNAL_ERROR, "Expected SEC_E_INTERNAL_ERROR, got %08x\n",
st);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, NULL, NULL);
- ok(st == SEC_E_INTERNAL_ERROR, "Expected SEC_E_INTERNAL_ERROR, got %08lx\n",
+ ok(st == SEC_E_INTERNAL_ERROR, "Expected SEC_E_INTERNAL_ERROR, got %08x\n",
st);
/* No cert in SCHANNEL_CRED succeeds for outbound.. */
schanCred.dwVersion = SCHANNEL_CRED_VERSION;
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
- ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08lx\n", st);
+ ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
pFreeCredentialsHandle(&cred);
/* but fails for inbound. */
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, NULL, NULL);
- ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08lx\n",
+ ok(st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_NO_CREDENTIALS, got %08x\n",
st);
/* Crashes with bad paCred pointer
@@ -205,12 +205,12 @@ static void testAcquireSecurityContext(v
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, &schanCred, NULL, NULL, NULL, NULL);
ok(st == SEC_E_UNKNOWN_CREDENTIALS || SEC_E_NO_CREDENTIALS,
- "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08lx\n",
+ "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n",
st);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, NULL, NULL);
ok(st == SEC_E_UNKNOWN_CREDENTIALS || SEC_E_NO_CREDENTIALS,
- "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08lx\n",
+ "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n",
st);
/* Good cert, but missing private key. Windows fails with
@@ -221,12 +221,12 @@ static void testAcquireSecurityContext(v
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_UNKNOWN_CREDENTIALS || SEC_E_NO_CREDENTIALS,
- "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08lx\n",
+ "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n",
st);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, NULL, NULL);
ok(st == SEC_E_UNKNOWN_CREDENTIALS || SEC_E_NO_CREDENTIALS,
- "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08lx\n",
+ "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_NO_CREDENTIALS, got %08x\n",
st);
/* Good cert, with CRYPT_KEY_PROV_INFO set before it's had a key loaded. */
@@ -236,17 +236,17 @@ static void testAcquireSecurityContext(v
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_UNKNOWN_CREDENTIALS,
- "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08lx\n", st);
+ "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_UNKNOWN_CREDENTIALS,
- "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08lx\n", st);
+ "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st);
ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL,
CRYPT_NEWKEYSET);
- ok(ret, "CryptAcquireContextW failed: %08lx\n", GetLastError());
+ ok(ret, "CryptAcquireContextW failed: %08x\n", GetLastError());
ret = CryptImportKey(csp, (LPBYTE)privKey, sizeof(privKey), 0, 0, &key);
- ok(ret, "CryptImportKey failed: %08lx\n", GetLastError());
+ ok(ret, "CryptImportKey failed: %08x\n", GetLastError());
if (ret)
{
PCCERT_CONTEXT tmp;
@@ -260,39 +260,39 @@ static void testAcquireSecurityContext(v
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_INTERNAL_ERROR,
- "Expected SEC_E_INTERNAL_ERROR, got %08lx\n", st);
+ "Expected SEC_E_INTERNAL_ERROR, got %08x\n", st);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_INTERNAL_ERROR,
- "Expected SEC_E_INTERNAL_ERROR, got %08lx\n", st);
+ "Expected SEC_E_INTERNAL_ERROR, got %08x\n", st);
schanCred.dwVersion = SCH_CRED_V2;
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_INTERNAL_ERROR,
- "Expected SEC_E_INTERNAL_ERROR, got %08lx\n", st);
+ "Expected SEC_E_INTERNAL_ERROR, got %08x\n", st);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_INTERNAL_ERROR,
- "Expected SEC_E_INTERNAL_ERROR, got %08lx\n", st);
+ "Expected SEC_E_INTERNAL_ERROR, got %08x\n", st);
/* Succeeds on V3 or higher */
schanCred.dwVersion = SCH_CRED_V3;
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
- ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08lx\n", st);
+ ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
pFreeCredentialsHandle(&cred);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
- ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08lx\n", st);
+ ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
pFreeCredentialsHandle(&cred);
schanCred.dwVersion = SCHANNEL_CRED_VERSION;
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
- ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08lx\n", st);
+ ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
pFreeCredentialsHandle(&cred);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
- ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08lx\n", st);
+ ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st);
pFreeCredentialsHandle(&cred);
/* How about more than one cert? */
@@ -301,22 +301,22 @@ static void testAcquireSecurityContext(v
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_UNKNOWN_CREDENTIALS,
- "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08lx\n", st);
+ "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_UNKNOWN_CREDENTIALS,
- "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08lx\n", st);
+ "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st);
tmp = certs[0];
certs[0] = certs[1];
certs[1] = tmp;
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_UNKNOWN_CREDENTIALS,
- "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08lx\n", st);
+ "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st);
st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND,
NULL, &schanCred, NULL, NULL, &cred, NULL);
ok(st == SEC_E_UNKNOWN_CREDENTIALS,
- "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08lx\n", st);
+ "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st);
/* FIXME: what about two valid certs? */
CryptDestroyKey(key);
diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c
index b3240ca..da20af3 100644
--- a/dlls/secur32/tests/secur32.c
+++ b/dlls/secur32/tests/secur32.c
@@ -53,7 +53,7 @@ static void testGetComputerObjectNameA(v
(GetLastError() == ERROR_INVALID_PARAMETER)) ||
(GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) ||
(GetLastError() == ERROR_NO_SUCH_DOMAIN),
- "GetComputerObjectNameA(%d) failed: %ld\n",
+ "GetComputerObjectNameA(%d) failed: %d\n",
formats[i], GetLastError());
if (rc)
trace("GetComputerObjectNameA() returned %s\n", name);
@@ -75,7 +75,7 @@ static void testGetComputerObjectNameW(v
(GetLastError() == ERROR_INVALID_PARAMETER)) ||
(GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) ||
(GetLastError() == ERROR_NO_SUCH_DOMAIN),
- "GetComputerObjectNameW(%d) failed: %ld\n",
+ "GetComputerObjectNameW(%d) failed: %d\n",
formats[i], GetLastError());
if (rc) {
char name[256];
More information about the wine-patches
mailing list