Commit 4b7877d7 authored by Michael Ploujnikov's avatar Michael Ploujnikov Committed by Alexandre Julliard

secur32/tests: Win64 printf format warning fixes.

parent b6a9109c
...@@ -4,7 +4,6 @@ SRCDIR = @srcdir@ ...@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
TESTDLL = secur32.dll TESTDLL = secur32.dll
IMPORTS = crypt32 advapi32 kernel32 IMPORTS = crypt32 advapi32 kernel32
EXTRADEFS = -DWINE_NO_LONG_AS_INT
CTESTS = \ CTESTS = \
main.c \ main.c \
......
...@@ -98,7 +98,7 @@ static const char* getSecError(SECURITY_STATUS status) ...@@ -98,7 +98,7 @@ static const char* getSecError(SECURITY_STATUS status)
_SEC_ERR(SEC_E_NO_CREDENTIALS); _SEC_ERR(SEC_E_NO_CREDENTIALS);
_SEC_ERR(SEC_E_OUT_OF_SEQUENCE); _SEC_ERR(SEC_E_OUT_OF_SEQUENCE);
default: default:
sprintf(buf, "%08lx\n", status); sprintf(buf, "%08x\n", status);
return buf; return buf;
} }
#undef _SEC_ERR #undef _SEC_ERR
...@@ -140,18 +140,18 @@ static void testEnumerateSecurityPackages(void) ...@@ -140,18 +140,18 @@ static void testEnumerateSecurityPackages(void)
sec_status = pEnumerateSecurityPackagesA(&num_packages, &pkg_info); sec_status = pEnumerateSecurityPackagesA(&num_packages, &pkg_info);
ok(sec_status == SEC_E_OK, ok(sec_status == SEC_E_OK,
"EnumerateSecurityPackages() should return %ld, not %08lx\n", "EnumerateSecurityPackages() should return %d, not %08x\n",
(LONG)SEC_E_OK, (LONG)sec_status); 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); num_packages);
ok(pkg_info != NULL, ok(pkg_info != NULL,
"pkg_info should not be NULL after EnumerateSecurityPackages\n"); "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){ 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"); trace("Supported flags:\n");
if(pkg_info[i].fCapabilities & SECPKG_FLAG_INTEGRITY) if(pkg_info[i].fCapabilities & SECPKG_FLAG_INTEGRITY)
trace("\tSECPKG_FLAG_INTEGRITY\n"); trace("\tSECPKG_FLAG_INTEGRITY\n");
......
...@@ -179,7 +179,7 @@ static const char* getSecError(SECURITY_STATUS status) ...@@ -179,7 +179,7 @@ static const char* getSecError(SECURITY_STATUS status)
_SEC_ERR(SEC_E_OUT_OF_SEQUENCE); _SEC_ERR(SEC_E_OUT_OF_SEQUENCE);
_SEC_ERR(SEC_E_MESSAGE_ALTERED); _SEC_ERR(SEC_E_MESSAGE_ALTERED);
default: default:
sprintf(buf, "%08lx\n", status); sprintf(buf, "%08x\n", status);
return buf; return buf;
} }
#undef _SEC_ERR #undef _SEC_ERR
......
...@@ -53,7 +53,7 @@ static void testGetComputerObjectNameA(void) ...@@ -53,7 +53,7 @@ static void testGetComputerObjectNameA(void)
(GetLastError() == ERROR_INVALID_PARAMETER)) || (GetLastError() == ERROR_INVALID_PARAMETER)) ||
(GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) ||
(GetLastError() == ERROR_NO_SUCH_DOMAIN), (GetLastError() == ERROR_NO_SUCH_DOMAIN),
"GetComputerObjectNameA(%d) failed: %ld\n", "GetComputerObjectNameA(%d) failed: %d\n",
formats[i], GetLastError()); formats[i], GetLastError());
if (rc) if (rc)
trace("GetComputerObjectNameA() returned %s\n", name); trace("GetComputerObjectNameA() returned %s\n", name);
...@@ -75,7 +75,7 @@ static void testGetComputerObjectNameW(void) ...@@ -75,7 +75,7 @@ static void testGetComputerObjectNameW(void)
(GetLastError() == ERROR_INVALID_PARAMETER)) || (GetLastError() == ERROR_INVALID_PARAMETER)) ||
(GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) ||
(GetLastError() == ERROR_NO_SUCH_DOMAIN), (GetLastError() == ERROR_NO_SUCH_DOMAIN),
"GetComputerObjectNameW(%d) failed: %ld\n", "GetComputerObjectNameW(%d) failed: %d\n",
formats[i], GetLastError()); formats[i], GetLastError());
if (rc) { if (rc) {
char name[256]; char name[256];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment