[PATCH 08/17] dlls/advapi32: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Mon Feb 7 16:10:27 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/advapi32/Makefile.in | 2 -
dlls/advapi32/advapi.c | 12 +++--
dlls/advapi32/cred.c | 54 ++++++++++++------------
dlls/advapi32/crypt.c | 100 +++++++++++++++++++++++----------------------
dlls/advapi32/eventlog.c | 16 ++++---
dlls/advapi32/lsa.c | 30 +++++++-------
dlls/advapi32/registry.c | 16 ++++---
dlls/advapi32/security.c | 82 ++++++++++++++++++-------------------
dlls/advapi32/service.c | 14 +++---
dlls/advapi32/wmi.c | 18 ++++----
10 files changed, 172 insertions(+), 172 deletions(-)
diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in
index 5653db884b3..f791e497a74 100644
--- a/dlls/advapi32/Makefile.in
+++ b/dlls/advapi32/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_ADVAPI32_
+EXTRADEFS = -D_ADVAPI32_
MODULE = advapi32.dll
IMPORTLIB = advapi32
IMPORTS = kernelbase sechost msvcrt
diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c
index 33c63f3cb20..ce91cf9276a 100644
--- a/dlls/advapi32/advapi.c
+++ b/dlls/advapi32/advapi.c
@@ -180,7 +180,7 @@ BOOL WINAPI InitiateSystemShutdownExA( LPSTR lpMachineName, LPSTR lpMessage,
DWORD dwTimeout, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown,
DWORD dwReason)
{
- FIXME("%s %s %d %d %d %#x\n", debugstr_a(lpMachineName),
+ FIXME("%s %s %ld %d %d %#lx\n", debugstr_a(lpMachineName),
debugstr_a(lpMessage), dwTimeout, bForceAppsClosed,
bRebootAfterShutdown, dwReason);
return TRUE;
@@ -195,7 +195,7 @@ BOOL WINAPI InitiateSystemShutdownExW( LPWSTR lpMachineName, LPWSTR lpMessage,
DWORD dwTimeout, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown,
DWORD dwReason)
{
- FIXME("%s %s %d %d %d %#x\n", debugstr_w(lpMachineName),
+ FIXME("%s %s %ld %d %d %#lx\n", debugstr_w(lpMachineName),
debugstr_w(lpMessage), dwTimeout, bForceAppsClosed,
bRebootAfterShutdown, dwReason);
return TRUE;
@@ -222,7 +222,7 @@ BOOL WINAPI InitiateSystemShutdownW( LPWSTR lpMachineName, LPWSTR lpMessage, DWO
*/
DWORD WINAPI InitiateShutdownA(char *name, char *message, DWORD seconds, DWORD flags, DWORD reason)
{
- FIXME("%s, %s, %d, %d, %d stub\n", debugstr_a(name), debugstr_a(message), seconds, flags, reason);
+ FIXME("%s, %s, %ld, %ld, %ld stub\n", debugstr_a(name), debugstr_a(message), seconds, flags, reason);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -231,7 +231,7 @@ DWORD WINAPI InitiateShutdownA(char *name, char *message, DWORD seconds, DWORD f
*/
DWORD WINAPI InitiateShutdownW(WCHAR *name, WCHAR *message, DWORD seconds, DWORD flags, DWORD reason)
{
- FIXME("%s, %s, %d, %d, %d stub\n", debugstr_w(name), debugstr_w(message), seconds, flags, reason);
+ FIXME("%s, %s, %ld, %ld, %ld stub\n", debugstr_w(name), debugstr_w(message), seconds, flags, reason);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -241,7 +241,7 @@ BOOL WINAPI LogonUserA( LPCSTR lpszUsername, LPCSTR lpszDomain, LPCSTR lpszPassw
WCHAR *usernameW = NULL, *domainW = NULL, *passwordW = NULL;
BOOL ret = FALSE;
- TRACE("%s %s %p 0x%08x 0x%08x %p\n", debugstr_a(lpszUsername),
+ TRACE("%s %s %p 0x%08lx 0x%08lx %p\n", debugstr_a(lpszUsername),
debugstr_a(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken);
if (lpszUsername && !(usernameW = strdupAW( lpszUsername ))) return FALSE;
@@ -260,7 +260,7 @@ done:
BOOL WINAPI LogonUserW( LPCWSTR lpszUsername, LPCWSTR lpszDomain, LPCWSTR lpszPassword,
DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken )
{
- FIXME("%s %s %p 0x%08x 0x%08x %p - stub\n", debugstr_w(lpszUsername),
+ FIXME("%s %s %p 0x%08lx 0x%08lx %p - stub\n", debugstr_w(lpszUsername),
debugstr_w(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken);
*phToken = (HANDLE *)0xdeadbeef;
diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c
index de94cb1b876..9d8e4faceeb 100644
--- a/dlls/advapi32/cred.c
+++ b/dlls/advapi32/cred.c
@@ -303,11 +303,11 @@ static DWORD host_write_credential( const CREDENTIALW *credential, BOOL preserve
BOOL ret;
if (credential->Flags)
- FIXME( "flags 0x%x not written\n", credential->Flags );
+ FIXME( "flags 0x%lx not written\n", credential->Flags );
if (credential->Type != CRED_TYPE_DOMAIN_PASSWORD)
- FIXME( "credential type of %d not supported\n", credential->Type );
+ FIXME( "credential type of %ld not supported\n", credential->Type );
if (credential->Persist != CRED_PERSIST_LOCAL_MACHINE)
- FIXME( "persist value of %d not supported\n", credential->Persist );
+ FIXME( "persist value of %ld not supported\n", credential->Persist );
if (credential->AttributeCount)
FIXME( "custom attributes not supported\n" );
@@ -721,7 +721,7 @@ BOOL WINAPI CredDeleteA(LPCSTR TargetName, DWORD Type, DWORD Flags)
DWORD len;
BOOL ret;
- TRACE("(%s, %d, 0x%x)\n", debugstr_a(TargetName), Type, Flags);
+ TRACE("(%s, %ld, 0x%lx)\n", debugstr_a(TargetName), Type, Flags);
if (!TargetName)
{
@@ -784,7 +784,7 @@ BOOL WINAPI CredDeleteW(LPCWSTR TargetName, DWORD Type, DWORD Flags)
DWORD ret;
LPWSTR key_name;
- TRACE("(%s, %d, 0x%x)\n", debugstr_w(TargetName), Type, Flags);
+ TRACE("(%s, %ld, 0x%lx)\n", debugstr_w(TargetName), Type, Flags);
if (!TargetName)
{
@@ -794,14 +794,14 @@ BOOL WINAPI CredDeleteW(LPCWSTR TargetName, DWORD Type, DWORD Flags)
if (Type != CRED_TYPE_GENERIC && Type != CRED_TYPE_DOMAIN_PASSWORD)
{
- FIXME("unhandled type %d\n", Type);
+ FIXME("unhandled type %ld\n", Type);
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
if (Flags)
{
- FIXME("unhandled flags 0x%x\n", Flags);
+ FIXME("unhandled flags 0x%lx\n", Flags);
SetLastError(ERROR_INVALID_FLAGS);
return FALSE;
}
@@ -816,7 +816,7 @@ BOOL WINAPI CredDeleteW(LPCWSTR TargetName, DWORD Type, DWORD Flags)
ret = open_cred_mgr_key(&hkeyMgr, TRUE);
if (ret != ERROR_SUCCESS)
{
- WARN("couldn't open/create manager key, error %d\n", ret);
+ WARN("couldn't open/create manager key, error %ld\n", ret);
SetLastError(ERROR_NO_SUCH_LOGON_SESSION);
return FALSE;
}
@@ -847,7 +847,7 @@ BOOL WINAPI CredEnumerateA(LPCSTR Filter, DWORD Flags, DWORD *Count,
INT needed;
char *buffer;
- TRACE("(%s, 0x%x, %p, %p)\n", debugstr_a(Filter), Flags, Count, Credentials);
+ TRACE("(%s, 0x%lx, %p, %p)\n", debugstr_a(Filter), Flags, Count, Credentials);
if (Filter)
{
@@ -1012,7 +1012,7 @@ BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, PCREDENTIA
char *buffer;
BYTE key_data[KEY_SIZE];
- TRACE("(%s, 0x%x, %p, %p)\n", debugstr_w(Filter), Flags, Count, Credentials);
+ TRACE("(%s, 0x%lx, %p, %p)\n", debugstr_w(Filter), Flags, Count, Credentials);
if (Flags)
{
@@ -1023,7 +1023,7 @@ BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, PCREDENTIA
ret = open_cred_mgr_key(&hkeyMgr, FALSE);
if (ret != ERROR_SUCCESS)
{
- WARN("couldn't open/create manager key, error %d\n", ret);
+ WARN("couldn't open/create manager key, error %ld\n", ret);
SetLastError(ERROR_NO_SUCH_LOGON_SESSION);
return FALSE;
}
@@ -1119,7 +1119,7 @@ BOOL WINAPI CredReadA(LPCSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALA *
PCREDENTIALW CredentialW;
INT len;
- TRACE("(%s, %d, 0x%x, %p)\n", debugstr_a(TargetName), Type, Flags, Credential);
+ TRACE("(%s, %ld, 0x%lx, %p)\n", debugstr_a(TargetName), Type, Flags, Credential);
if (!TargetName)
{
@@ -1249,7 +1249,7 @@ BOOL WINAPI CredReadW(LPCWSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALW
DWORD len;
BYTE key_data[KEY_SIZE];
- TRACE("(%s, %d, 0x%x, %p)\n", debugstr_w(TargetName), Type, Flags, Credential);
+ TRACE("(%s, %ld, 0x%lx, %p)\n", debugstr_w(TargetName), Type, Flags, Credential);
if (!TargetName)
{
@@ -1259,14 +1259,14 @@ BOOL WINAPI CredReadW(LPCWSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALW
if (Type != CRED_TYPE_GENERIC && Type != CRED_TYPE_DOMAIN_PASSWORD)
{
- FIXME("unhandled type %d\n", Type);
+ FIXME("unhandled type %ld\n", Type);
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
if (Flags)
{
- FIXME("unhandled flags 0x%x\n", Flags);
+ FIXME("unhandled flags 0x%lx\n", Flags);
SetLastError(ERROR_INVALID_FLAGS);
return FALSE;
}
@@ -1285,7 +1285,7 @@ BOOL WINAPI CredReadW(LPCWSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALW
ret = open_cred_mgr_key(&hkeyMgr, FALSE);
if (ret != ERROR_SUCCESS)
{
- WARN("couldn't open/create manager key, error %d\n", ret);
+ WARN("couldn't open/create manager key, error %ld\n", ret);
SetLastError(ERROR_NO_SUCH_LOGON_SESSION);
return FALSE;
}
@@ -1347,7 +1347,7 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf
BOOL ret;
PCREDENTIALW* CredentialsW;
- TRACE("(%p, 0x%x, %p, %p)\n", TargetInformation, Flags, Size, Credentials);
+ TRACE("(%p, 0x%lx, %p, %p)\n", TargetInformation, Flags, Size, Credentials);
/* follow Windows behavior - do not test for NULL, initialize early */
*Size = 0;
@@ -1486,7 +1486,7 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf
BOOL WINAPI CredReadDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInformation, DWORD Flags,
DWORD *Size, PCREDENTIALW **Credentials)
{
- FIXME("(%p, 0x%x, %p, %p) stub\n", TargetInformation, Flags, Size, Credentials);
+ FIXME("(%p, 0x%lx, %p, %p) stub\n", TargetInformation, Flags, Size, Credentials);
/* follow Windows behavior - do not test for NULL, initialize early */
*Size = 0;
@@ -1510,7 +1510,7 @@ BOOL WINAPI CredWriteA(PCREDENTIALA Credential, DWORD Flags)
INT len;
PCREDENTIALW CredentialW;
- TRACE("(%p, 0x%x)\n", Credential, Flags);
+ TRACE("(%p, 0x%lx)\n", Credential, Flags);
if (!Credential || !Credential->TargetName)
{
@@ -1546,7 +1546,7 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags)
LPWSTR key_name;
BYTE key_data[KEY_SIZE];
- TRACE("(%p, 0x%x)\n", Credential, Flags);
+ TRACE("(%p, 0x%lx)\n", Credential, Flags);
if (!Credential || !Credential->TargetName)
{
@@ -1556,23 +1556,23 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags)
if (Flags & ~CRED_PRESERVE_CREDENTIAL_BLOB)
{
- FIXME("unhandled flags 0x%x\n", Flags);
+ FIXME("unhandled flags 0x%lx\n", Flags);
SetLastError(ERROR_INVALID_FLAGS);
return FALSE;
}
if (Credential->Type != CRED_TYPE_GENERIC && Credential->Type != CRED_TYPE_DOMAIN_PASSWORD)
{
- FIXME("unhandled type %d\n", Credential->Type);
+ FIXME("unhandled type %ld\n", Credential->Type);
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
- TRACE("Credential->Flags = 0x%08x\n", Credential->Flags);
- TRACE("Credential->Type = %u\n", Credential->Type);
+ TRACE("Credential->Flags = 0x%08lx\n", Credential->Flags);
+ TRACE("Credential->Type = %lu\n", Credential->Type);
TRACE("Credential->TargetName = %s\n", debugstr_w(Credential->TargetName));
TRACE("Credential->Comment = %s\n", debugstr_w(Credential->Comment));
- TRACE("Credential->Persist = %u\n", Credential->Persist);
+ TRACE("Credential->Persist = %lu\n", Credential->Persist);
TRACE("Credential->TargetAlias = %s\n", debugstr_w(Credential->TargetAlias));
TRACE("Credential->UserName = %s\n", debugstr_w(Credential->UserName));
@@ -1604,7 +1604,7 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags)
ret = open_cred_mgr_key(&hkeyMgr, FALSE);
if (ret != ERROR_SUCCESS)
{
- WARN("couldn't open/create manager key, error %d\n", ret);
+ WARN("couldn't open/create manager key, error %ld\n", ret);
SetLastError(ERROR_NO_SUCH_LOGON_SESSION);
return FALSE;
}
@@ -1649,7 +1649,7 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags)
*/
WINADVAPI BOOL WINAPI CredGetSessionTypes(DWORD persistCount, LPDWORD persists)
{
- TRACE("(%u, %p)\n", persistCount, persists);
+ TRACE("(%lu, %p)\n", persistCount, persists);
memset(persists, CRED_PERSIST_NONE, persistCount*sizeof(*persists));
if (CRED_TYPE_GENERIC < persistCount)
diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index 20c55558fa5..d4e015ffa33 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -364,7 +364,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer,
DWORD keytype, type, len;
ULONG r;
- TRACE("(%p, %s, %s, %d, %08x)\n", phProv, debugstr_w(pszContainer),
+ TRACE("(%p, %s, %s, %ld, %08lx)\n", phProv, debugstr_w(pszContainer),
debugstr_w(pszProvider), dwProvType, dwFlags);
if (dwProvType < 1 || dwProvType > MAXPROVTYPES)
@@ -388,7 +388,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer,
* then try the machine default CSP
*/
if ( !(keyname = CRYPT_GetTypeKeyName(dwProvType, TRUE)) ) {
- TRACE("No provider registered for crypto provider type %d.\n", dwProvType);
+ TRACE("No provider registered for crypto provider type %ld.\n", dwProvType);
SetLastError(NTE_PROV_TYPE_NOT_DEF);
return FALSE;
}
@@ -396,7 +396,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer,
{
CRYPT_Free(keyname);
if ( !(keyname = CRYPT_GetTypeKeyName(dwProvType, FALSE)) ) {
- TRACE("No type registered for crypto provider type %d.\n", dwProvType);
+ TRACE("No type registered for crypto provider type %ld.\n", dwProvType);
RegCloseKey(key);
SetLastError(NTE_PROV_TYPE_NOT_DEF);
goto error;
@@ -413,7 +413,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer,
r = RegQueryValueExW(key, L"Name", NULL, &keytype, NULL, &len);
if( r != ERROR_SUCCESS || !len || keytype != REG_SZ)
{
- TRACE("error %d reading size of 'Name' from registry\n", r );
+ TRACE("error %ld reading size of 'Name' from registry\n", r );
RegCloseKey(key);
SetLastError(NTE_PROV_TYPE_ENTRY_BAD);
goto error;
@@ -427,7 +427,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer,
r = RegQueryValueExW(key, L"Name", NULL, NULL, (LPBYTE)provname, &len);
if( r != ERROR_SUCCESS )
{
- TRACE("error %d reading 'Name' from registry\n", r );
+ TRACE("error %ld reading 'Name' from registry\n", r );
RegCloseKey(key);
SetLastError(NTE_PROV_TYPE_ENTRY_BAD);
goto error;
@@ -459,7 +459,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer,
}
if (type != dwProvType)
{
- TRACE("Crypto provider has wrong type (%d vs expected %d).\n", type, dwProvType);
+ TRACE("Crypto provider has wrong type (%ld vs expected %ld).\n", type, dwProvType);
SetLastError(NTE_PROV_TYPE_NO_MATCH);
goto error;
}
@@ -467,7 +467,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer,
r = RegQueryValueExW(key, L"Image Path", NULL, &keytype, NULL, &len);
if ( r != ERROR_SUCCESS || keytype != REG_SZ)
{
- TRACE("error %d reading size of 'Image Path' from registry\n", r );
+ TRACE("error %ld reading size of 'Image Path' from registry\n", r );
RegCloseKey(key);
SetLastError(NTE_PROV_TYPE_ENTRY_BAD);
goto error;
@@ -481,7 +481,7 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer,
r = RegQueryValueExW(key, L"Image Path", NULL, NULL, (LPBYTE)temp, &len);
if( r != ERROR_SUCCESS )
{
- TRACE("error %d reading 'Image Path' from registry\n", r );
+ TRACE("error %ld reading 'Image Path' from registry\n", r );
RegCloseKey(key);
SetLastError(NTE_PROV_TYPE_ENTRY_BAD);
goto error;
@@ -569,7 +569,7 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer,
PWSTR pProvider = NULL, pContainer = NULL;
BOOL ret = FALSE;
- TRACE("(%p, %s, %s, %d, %08x)\n", phProv, debugstr_a(pszContainer),
+ TRACE("(%p, %s, %s, %ld, %08lx)\n", phProv, debugstr_a(pszContainer),
debugstr_a(pszProvider), dwProvType, dwFlags);
if ( !CRYPT_ANSIToUnicode(pszContainer, &pContainer, -1) )
@@ -611,7 +611,7 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl
{
PCRYPTPROV pProv = provider_from_handle(hProv);
- TRACE("(0x%lx, %p, %08x)\n", hProv, pdwReserved, dwFlags);
+ TRACE("(0x%Ix, %p, %08lx)\n", hProv, pdwReserved, dwFlags);
if (!pProv)
return FALSE;
@@ -638,7 +638,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags)
PCRYPTPROV pProv = provider_from_handle(hProv);
BOOL ret = TRUE;
- TRACE("(0x%lx, %08x)\n", hProv, dwFlags);
+ TRACE("(0x%Ix, %08lx)\n", hProv, dwFlags);
if (!pProv)
return FALSE;
@@ -680,7 +680,7 @@ BOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer)
{
PCRYPTPROV prov = provider_from_handle(hProv);
- TRACE("(0x%lx, %d, %p)\n", hProv, dwLen, pbBuffer);
+ TRACE("(0x%Ix, %ld, %p)\n", hProv, dwLen, pbBuffer);
if (!prov)
return FALSE;
@@ -714,7 +714,7 @@ BOOL WINAPI CryptCreateHash (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey,
PCRYPTPROV prov;
PCRYPTHASH hash;
- TRACE("(0x%lx, 0x%x, 0x%lx, %08x, %p)\n", hProv, Algid, hKey, dwFlags, phHash);
+ TRACE("(0x%Ix, 0x%x, 0x%Ix, %08lx, %p)\n", hProv, Algid, hKey, dwFlags, phHash);
if (!(prov = provider_from_handle(hProv)))
return FALSE;
@@ -779,7 +779,7 @@ BOOL WINAPI CryptDecrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, BOOL Final,
PCRYPTPROV prov;
PCRYPTKEY key;
- TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen);
+ TRACE("(0x%Ix, 0x%Ix, %d, %08lx, %p, %p)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen);
if (!(key = key_from_handle(hKey)))
return FALSE;
@@ -821,7 +821,7 @@ BOOL WINAPI CryptDeriveKey (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseData
PCRYPTHASH hash;
PCRYPTKEY key;
- TRACE("(0x%lx, 0x%08x, 0x%lx, 0x%08x, %p)\n", hProv, Algid, hBaseData, dwFlags, phKey);
+ TRACE("(0x%Ix, 0x%08x, 0x%Ix, 0x%08lx, %p)\n", hProv, Algid, hBaseData, dwFlags, phKey);
if (!(prov = provider_from_handle(hProv)))
return FALSE;
@@ -873,7 +873,7 @@ BOOL WINAPI CryptDestroyHash (HCRYPTHASH hHash)
PCRYPTPROV prov;
BOOL ret;
- TRACE("(0x%lx)\n", hHash);
+ TRACE("(0x%Ix)\n", hHash);
if (!(hash = hash_from_handle(hHash)))
return FALSE;
@@ -909,7 +909,7 @@ BOOL WINAPI CryptDestroyKey (HCRYPTKEY hKey)
PCRYPTKEY key;
BOOL ret;
- TRACE("(0x%lx)\n", hKey);
+ TRACE("(0x%Ix)\n", hKey);
if (!(key = key_from_handle(hKey)))
return FALSE;
@@ -948,7 +948,7 @@ BOOL WINAPI CryptDuplicateHash (HCRYPTHASH hHash, DWORD *pdwReserved,
PCRYPTPROV prov;
PCRYPTHASH orghash, newhash;
- TRACE("(0x%lx, %p, %08x, %p)\n", hHash, pdwReserved, dwFlags, phHash);
+ TRACE("(0x%Ix, %p, %08lx, %p)\n", hHash, pdwReserved, dwFlags, phHash);
if (!(orghash = hash_from_handle(hHash)))
return FALSE;
@@ -1004,7 +1004,7 @@ BOOL WINAPI CryptDuplicateKey (HCRYPTKEY hKey, DWORD *pdwReserved, DWORD dwFlags
PCRYPTPROV prov;
PCRYPTKEY orgkey, newkey;
- TRACE("(0x%lx, %p, %08x, %p)\n", hKey, pdwReserved, dwFlags, phKey);
+ TRACE("(0x%Ix, %p, %08lx, %p)\n", hKey, pdwReserved, dwFlags, phKey);
if (!(orgkey = key_from_handle(hKey)))
return FALSE;
@@ -1070,7 +1070,7 @@ BOOL WINAPI CryptEncrypt (HCRYPTKEY hKey, HCRYPTHASH hHash, BOOL Final,
PCRYPTPROV prov;
PCRYPTKEY key;
- TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p, %d)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen);
+ TRACE("(0x%Ix, 0x%Ix, %d, %08lx, %p, %p, %ld)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen);
if (!(key = key_from_handle(hKey)))
return FALSE;
@@ -1117,7 +1117,7 @@ BOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved,
HKEY hKey;
BOOL ret;
- TRACE("(%d, %p, %d, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags,
+ TRACE("(%ld, %p, %ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags,
pdwProvType, pszProvName, pcbProvName);
if (pdwReserved || !pcbProvName)
@@ -1202,7 +1202,7 @@ BOOL WINAPI CryptEnumProvidersA (DWORD dwIndex, DWORD *pdwReserved,
DWORD bufsize;
BOOL ret;
- TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags,
+ TRACE("(%ld, %p, %08lx, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags,
pdwProvType, pszProvName, pcbProvName);
if(!CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &bufsize))
@@ -1258,7 +1258,7 @@ BOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved,
PWSTR keyname, ch;
DWORD result;
- TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved,
+ TRACE("(%ld, %p, %08lx, %p, %p, %p)\n", dwIndex, pdwReserved,
dwFlags, pdwProvType, pszTypeName, pcbTypeName);
if (pdwReserved || !pdwProvType || !pcbTypeName)
@@ -1328,7 +1328,7 @@ BOOL WINAPI CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved,
DWORD bufsize;
BOOL ret;
- TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags,
+ TRACE("(%ld, %p, %08lx, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags,
pdwProvType, pszTypeName, pcbTypeName);
if(!CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &bufsize))
@@ -1381,7 +1381,7 @@ BOOL WINAPI CryptExportKey (HCRYPTKEY hKey, HCRYPTKEY hExpKey, DWORD dwBlobType,
PCRYPTPROV prov;
PCRYPTKEY key, expkey = NULL;
- TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p)\n", hKey, hExpKey, dwBlobType, dwFlags, pbData, pdwDataLen);
+ TRACE("(0x%Ix, 0x%Ix, %ld, %08lx, %p, %p)\n", hKey, hExpKey, dwBlobType, dwFlags, pbData, pdwDataLen);
if (!(key = key_from_handle(hKey)))
return FALSE;
@@ -1420,7 +1420,7 @@ BOOL WINAPI CryptGenKey (HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYPTKE
PCRYPTPROV prov;
PCRYPTKEY key;
- TRACE("(0x%lx, %d, %08x, %p)\n", hProv, Algid, dwFlags, phKey);
+ TRACE("(0x%Ix, %d, %08lx, %p)\n", hProv, Algid, dwFlags, phKey);
if (!(prov = provider_from_handle(hProv)))
return FALSE;
@@ -1533,7 +1533,7 @@ BOOL WINAPI CryptGetDefaultProviderA (DWORD dwProvType, DWORD *pdwReserved,
DWORD bufsize;
BOOL ret;
- TRACE("(%d, %p, %08x, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName);
+ TRACE("(%ld, %p, %08lx, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName);
CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, NULL, &bufsize);
if ( pszProvName && !(str = CRYPT_Alloc(bufsize)) )
@@ -1582,7 +1582,7 @@ BOOL WINAPI CryptGetHashParam (HCRYPTHASH hHash, DWORD dwParam, BYTE *pbData,
PCRYPTPROV prov;
PCRYPTHASH hash;
- TRACE("(0x%lx, %d, %p, %p, %08x)\n", hHash, dwParam, pbData, pdwDataLen, dwFlags);
+ TRACE("(0x%Ix, %ld, %p, %p, %08lx)\n", hHash, dwParam, pbData, pdwDataLen, dwFlags);
if (!(hash = hash_from_handle(hHash)))
return FALSE;
@@ -1624,7 +1624,7 @@ BOOL WINAPI CryptGetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData,
PCRYPTPROV prov;
PCRYPTKEY key;
- TRACE("(0x%lx, %d, %p, %p, %08x)\n", hKey, dwParam, pbData, pdwDataLen, dwFlags);
+ TRACE("(0x%Ix, %ld, %p, %p, %08lx)\n", hKey, dwParam, pbData, pdwDataLen, dwFlags);
if (!(key = key_from_handle(hKey)))
return FALSE;
@@ -1664,7 +1664,7 @@ BOOL WINAPI CryptGetProvParam (HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData,
{
PCRYPTPROV prov;
- TRACE("(0x%lx, %d, %p, %p, %08x)\n", hProv, dwParam, pbData, pdwDataLen, dwFlags);
+ TRACE("(0x%Ix, %ld, %p, %p, %08lx)\n", hProv, dwParam, pbData, pdwDataLen, dwFlags);
if (!(prov = provider_from_handle(hProv)))
return FALSE;
@@ -1691,7 +1691,7 @@ BOOL WINAPI CryptGetUserKey (HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *phUse
PCRYPTPROV prov;
PCRYPTKEY key;
- TRACE("(0x%lx, %d, %p)\n", hProv, dwKeySpec, phUserKey);
+ TRACE("(0x%Ix, %ld, %p)\n", hProv, dwKeySpec, phUserKey);
if (!(prov = provider_from_handle(hProv)))
return FALSE;
@@ -1742,7 +1742,7 @@ BOOL WINAPI CryptHashData (HCRYPTHASH hHash, const BYTE *pbData, DWORD dwDataLen
PCRYPTHASH hash;
PCRYPTPROV prov;
- TRACE("(0x%lx, %p, %d, %08x)\n", hHash, pbData, dwDataLen, dwFlags);
+ TRACE("(0x%Ix, %p, %ld, %08lx)\n", hHash, pbData, dwDataLen, dwFlags);
if (!(hash = hash_from_handle(hHash)))
return FALSE;
@@ -1777,7 +1777,7 @@ BOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags
PCRYPTKEY key;
PCRYPTPROV prov;
- TRACE("(0x%lx, 0x%lx, %08x)\n", hHash, hKey, dwFlags);
+ TRACE("(0x%Ix, 0x%Ix, %08lx)\n", hHash, hKey, dwFlags);
if (!(hash = hash_from_handle(hHash)))
return FALSE;
@@ -1818,7 +1818,7 @@ BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLe
PCRYPTPROV prov;
PCRYPTKEY pubkey = NULL, importkey;
- TRACE("(0x%lx, %p, %d, 0x%lx, %08x, %p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey);
+ TRACE("(0x%Ix, %p, %ld, 0x%Ix, %08lx, %p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey);
if (!(prov = provider_from_handle(hProv)))
return FALSE;
@@ -1880,7 +1880,7 @@ BOOL WINAPI CryptSignHashW (HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescript
PCRYPTHASH hash;
PCRYPTPROV prov;
- TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n",
+ TRACE("(0x%Ix, %ld, %s, %08lx, %p, %p)\n",
hHash, dwKeySpec, debugstr_w(sDescription), dwFlags, pbSignature, pdwSigLen);
if (!(hash = hash_from_handle(hHash)))
@@ -1908,7 +1908,7 @@ BOOL WINAPI CryptSignHashA (HCRYPTHASH hHash, DWORD dwKeySpec, LPCSTR sDescripti
LPWSTR wsDescription;
BOOL result;
- TRACE("(0x%lx, %d, %s, %08x, %p, %p)\n",
+ TRACE("(0x%Ix, %ld, %s, %08lx, %p, %p)\n",
hHash, dwKeySpec, debugstr_a(sDescription), dwFlags, pbSignature, pdwSigLen);
CRYPT_ANSIToUnicode(sDescription, &wsDescription, -1);
@@ -1938,7 +1938,7 @@ BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, const BYTE *pbDa
PCRYPTPROV prov;
PCRYPTHASH hash;
- TRACE("(0x%lx, %d, %p, %08x)\n", hHash, dwParam, pbData, dwFlags);
+ TRACE("(0x%Ix, %ld, %p, %08lx)\n", hHash, dwParam, pbData, dwFlags);
if (!(hash = hash_from_handle(hHash)))
return FALSE;
@@ -1974,7 +1974,7 @@ BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, const BYTE *pbData,
PCRYPTPROV prov;
PCRYPTKEY key;
- TRACE("(0x%lx, %d, %p, %08x)\n", hKey, dwParam, pbData, dwFlags);
+ TRACE("(0x%Ix, %ld, %p, %08lx)\n", hKey, dwParam, pbData, dwFlags);
if (!(key = key_from_handle(hKey)))
return FALSE;
@@ -2005,7 +2005,7 @@ BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, const BYTE *pbData,
*/
BOOL WINAPI CryptSetProviderA (LPCSTR pszProvName, DWORD dwProvType)
{
- TRACE("(%s, %d)\n", pszProvName, dwProvType);
+ TRACE("(%s, %ld)\n", pszProvName, dwProvType);
return CryptSetProviderExA(pszProvName, dwProvType, NULL, CRYPT_USER_DEFAULT);
}
@@ -2016,7 +2016,7 @@ BOOL WINAPI CryptSetProviderA (LPCSTR pszProvName, DWORD dwProvType)
*/
BOOL WINAPI CryptSetProviderW (LPCWSTR pszProvName, DWORD dwProvType)
{
- TRACE("(%s, %d)\n", debugstr_w(pszProvName), dwProvType);
+ TRACE("(%s, %ld)\n", debugstr_w(pszProvName), dwProvType);
return CryptSetProviderExW(pszProvName, dwProvType, NULL, CRYPT_USER_DEFAULT);
}
@@ -2040,7 +2040,7 @@ BOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *p
HKEY hProvKey, hTypeKey;
PWSTR keyname;
- TRACE("(%s, %d, %p, %08x)\n", debugstr_w(pszProvName), dwProvType, pdwReserved, dwFlags);
+ TRACE("(%s, %ld, %p, %08lx)\n", debugstr_w(pszProvName), dwProvType, pdwReserved, dwFlags);
if (!pszProvName || pdwReserved)
{
@@ -2120,7 +2120,7 @@ BOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pd
BOOL ret = FALSE;
PWSTR str = NULL;
- TRACE("(%s, %d, %p, %08x)\n", pszProvName, dwProvType, pdwReserved, dwFlags);
+ TRACE("(%s, %ld, %p, %08lx)\n", pszProvName, dwProvType, pdwReserved, dwFlags);
if (CRYPT_ANSIToUnicode(pszProvName, &str, -1))
{
@@ -2149,7 +2149,7 @@ BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbDa
{
PCRYPTPROV prov;
- TRACE("(0x%lx, %d, %p, %08x)\n", hProv, dwParam, pbData, dwFlags);
+ TRACE("(0x%Ix, %ld, %p, %08lx)\n", hProv, dwParam, pbData, dwFlags);
if (!(prov = provider_from_handle(hProv)))
return FALSE;
@@ -2204,7 +2204,7 @@ BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, const BYTE *pbSignature, DW
PCRYPTKEY key;
PCRYPTPROV prov;
- TRACE("(0x%lx, %p, %d, 0x%lx, %s, %08x)\n", hHash, pbSignature,
+ TRACE("(0x%Ix, %p, %ld, 0x%Ix, %s, %08lx)\n", hHash, pbSignature,
dwSigLen, hPubKey, debugstr_w(sDescription), dwFlags);
if (!(hash = hash_from_handle(hHash)))
@@ -2236,7 +2236,7 @@ BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, const BYTE *pbSignature, DW
LPWSTR wsDescription;
BOOL result;
- TRACE("(0x%lx, %p, %d, 0x%lx, %s, %08x)\n", hHash, pbSignature,
+ TRACE("(0x%Ix, %p, %ld, 0x%Ix, %s, %08lx)\n", hHash, pbSignature,
dwSigLen, hPubKey, debugstr_a(sDescription), dwFlags);
CRYPT_ANSIToUnicode(sDescription, &wsDescription, -1);
@@ -2253,7 +2253,7 @@ BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, const BYTE *pbSignature, DW
*/
DWORD WINAPI OpenEncryptedFileRawA(LPCSTR filename, ULONG flags, PVOID *context)
{
- FIXME("(%s, %x, %p): stub\n", debugstr_a(filename), flags, context);
+ FIXME("(%s, %lx, %p): stub\n", debugstr_a(filename), flags, context);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -2272,7 +2272,7 @@ DWORD WINAPI OpenEncryptedFileRawA(LPCSTR filename, ULONG flags, PVOID *context)
*/
DWORD WINAPI OpenEncryptedFileRawW(LPCWSTR filename, ULONG flags, PVOID *context)
{
- FIXME("(%s, %x, %p): stub\n", debugstr_w(filename), flags, context);
+ FIXME("(%s, %lx, %p): stub\n", debugstr_w(filename), flags, context);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -2403,7 +2403,7 @@ static BOOL fill_random_buffer(void)
if ((status = NtQuerySystemInformation( SystemInterruptInformation, random_buf, len, NULL )))
{
- WARN( "failed to get random bytes %08x\n", status );
+ WARN( "failed to get random bytes %08lx\n", status );
return FALSE;
}
random_len = len;
@@ -2478,7 +2478,7 @@ BOOLEAN WINAPI SystemFunction036( void *buffer, ULONG len )
*/
NTSTATUS WINAPI SystemFunction040(PVOID memory, ULONG length, ULONG flags)
{
- FIXME("(%p, %x, %x): stub [RtlEncryptMemory]\n", memory, length, flags);
+ FIXME("(%p, %lx, %lx): stub [RtlEncryptMemory]\n", memory, length, flags);
return STATUS_SUCCESS;
}
@@ -2506,7 +2506,7 @@ NTSTATUS WINAPI SystemFunction040(PVOID memory, ULONG length, ULONG flags)
*/
NTSTATUS WINAPI SystemFunction041(PVOID memory, ULONG length, ULONG flags)
{
- FIXME("(%p, %x, %x): stub [RtlDecryptMemory]\n", memory, length, flags);
+ FIXME("(%p, %lx, %lx): stub [RtlDecryptMemory]\n", memory, length, flags);
return STATUS_SUCCESS;
}
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index 22e5a3f9d59..f7fbfc6d547 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -205,7 +205,7 @@ ULONG WINAPI EnableTraceEx( LPCGUID provider, LPCGUID source, TRACEHANDLE hSessi
UCHAR level, ULONGLONG anykeyword, ULONGLONG allkeyword, ULONG enableprop,
PEVENT_FILTER_DESCRIPTOR filterdesc )
{
- FIXME("(%s, %s, %s, %u, %u, %s, %s, %u, %p): stub\n", debugstr_guid(provider),
+ FIXME("(%s, %s, %s, %lu, %u, %s, %s, %lu, %p): stub\n", debugstr_guid(provider),
debugstr_guid(source), wine_dbgstr_longlong(hSession), enable, level,
wine_dbgstr_longlong(anykeyword), wine_dbgstr_longlong(allkeyword),
enableprop, filterdesc);
@@ -218,7 +218,7 @@ ULONG WINAPI EnableTraceEx( LPCGUID provider, LPCGUID source, TRACEHANDLE hSessi
*/
ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession )
{
- FIXME("(%d, 0x%x, %d, %s, %s): stub\n", enable, flag, level,
+ FIXME("(%ld, 0x%lx, %ld, %s, %s): stub\n", enable, flag, level,
debugstr_guid(guid), wine_dbgstr_longlong(hSession));
return ERROR_SUCCESS;
@@ -245,7 +245,7 @@ BOOL WINAPI GetEventLogInformation( HANDLE hEventLog, DWORD dwInfoLevel, LPVOID
{
EVENTLOG_FULL_INFORMATION *efi;
- FIXME("(%p, %d, %p, %d, %p) stub\n", hEventLog, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded);
+ FIXME("(%p, %ld, %p, %ld, %p) stub\n", hEventLog, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded);
if (dwInfoLevel != EVENTLOG_FULL_INFO)
{
@@ -506,7 +506,7 @@ HANDLE WINAPI OpenEventLogW( LPCWSTR uncname, LPCWSTR source )
BOOL WINAPI ReadEventLogA( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset,
LPVOID lpBuffer, DWORD nNumberOfBytesToRead, DWORD *pnBytesRead, DWORD *pnMinNumberOfBytesNeeded )
{
- FIXME("(%p,0x%08x,0x%08x,%p,0x%08x,%p,%p) stub\n", hEventLog, dwReadFlags,
+ FIXME("(%p,0x%08lx,0x%08lx,%p,0x%08lx,%p,%p) stub\n", hEventLog, dwReadFlags,
dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded);
SetLastError(ERROR_HANDLE_EOF);
@@ -521,7 +521,7 @@ BOOL WINAPI ReadEventLogA( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOf
BOOL WINAPI ReadEventLogW( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset,
LPVOID lpBuffer, DWORD nNumberOfBytesToRead, DWORD *pnBytesRead, DWORD *pnMinNumberOfBytesNeeded )
{
- FIXME("(%p,0x%08x,0x%08x,%p,0x%08x,%p,%p) stub\n", hEventLog, dwReadFlags,
+ FIXME("(%p,0x%08lx,0x%08lx,%p,0x%08lx,%p,%p) stub\n", hEventLog, dwReadFlags,
dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded);
SetLastError(ERROR_HANDLE_EOF);
@@ -602,7 +602,7 @@ BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD d
UINT i;
BOOL ret;
- FIXME("(%p,0x%04x,0x%04x,0x%08x,%p,0x%04x,0x%08x,%p,%p): stub\n", hEventLog,
+ FIXME("(%p,0x%04x,0x%04x,0x%08lx,%p,0x%04x,0x%08lx,%p,%p): stub\n", hEventLog,
wType, wCategory, dwEventID, lpUserSid, wNumStrings, dwDataSize, lpStrings, lpRawData);
if (wNumStrings == 0) return TRUE;
@@ -632,7 +632,7 @@ BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dw
{
UINT i;
- FIXME("(%p,0x%04x,0x%04x,0x%08x,%p,0x%04x,0x%08x,%p,%p): stub\n", hEventLog,
+ FIXME("(%p,0x%04x,0x%04x,0x%08lx,%p,0x%04x,0x%08lx,%p,%p): stub\n", hEventLog,
wType, wCategory, dwEventID, lpUserSid, wNumStrings, dwDataSize, lpStrings, lpRawData);
/* partial stub */
@@ -709,6 +709,6 @@ TRACEHANDLE WINAPI OpenTraceA( PEVENT_TRACE_LOGFILEA logfile )
ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray,
ULONG arraycount, PULONG guidcount)
{
- FIXME("%p %d %p: stub\n", propertiesarray, arraycount, guidcount);
+ FIXME("%p %ld %p: stub\n", propertiesarray, arraycount, guidcount);
return ERROR_INVALID_PARAMETER;
}
diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
index 7e6bfc74620..b63519c0299 100644
--- a/dlls/advapi32/lsa.c
+++ b/dlls/advapi32/lsa.c
@@ -54,7 +54,7 @@ static void dumpLsaAttributes(const LSA_OBJECT_ATTRIBUTES *oa)
{
if (oa)
{
- TRACE("\n\tlength=%u, rootdir=%p, objectname=%s\n\tattr=0x%08x, sid=%s qos=%p\n",
+ TRACE("\n\tlength=%lu, rootdir=%p, objectname=%s\n\tattr=0x%08lx, sid=%s qos=%p\n",
oa->Length, oa->RootDirectory,
oa->ObjectName?debugstr_w(oa->ObjectName->Buffer):"null",
oa->Attributes, debugstr_sid(oa->SecurityDescriptor),
@@ -172,7 +172,7 @@ NTSTATUS WINAPI LsaAddAccountRights(
PLSA_UNICODE_STRING rights,
ULONG count)
{
- FIXME("(%p,%p,%p,0x%08x) stub\n", policy, sid, rights, count);
+ FIXME("(%p,%p,%p,0x%08lx) stub\n", policy, sid, rights, count);
return STATUS_SUCCESS;
}
@@ -205,7 +205,7 @@ NTSTATUS WINAPI LsaCreateTrustedDomainEx(
ACCESS_MASK access,
PLSA_HANDLE domain)
{
- FIXME("(%p,%p,%p,0x%08x,%p) stub\n", policy, domain_info, auth_info,
+ FIXME("(%p,%p,%p,0x%08lx,%p) stub\n", policy, domain_info, auth_info,
access, domain);
return STATUS_SUCCESS;
}
@@ -247,7 +247,7 @@ NTSTATUS WINAPI LsaEnumerateAccounts(
ULONG maxlen,
PULONG count)
{
- FIXME("(%p,%p,%p,%d,%p) stub\n", policy, context, buffer, maxlen, count);
+ FIXME("(%p,%p,%p,%ld,%p) stub\n", policy, context, buffer, maxlen, count);
if (count) *count = 0;
return STATUS_NO_MORE_ENTRIES;
}
@@ -295,7 +295,7 @@ NTSTATUS WINAPI LsaEnumerateTrustedDomains(
IN ULONG PreferredMaximumLength,
OUT PULONG CountReturned)
{
- FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, EnumerationContext,
+ FIXME("(%p,%p,%p,0x%08lx,%p) stub\n", PolicyHandle, EnumerationContext,
Buffer, PreferredMaximumLength, CountReturned);
if (CountReturned) *CountReturned = 0;
@@ -313,7 +313,7 @@ NTSTATUS WINAPI LsaEnumerateTrustedDomainsEx(
ULONG length,
PULONG count)
{
- FIXME("(%p,%p,%p,0x%08x,%p) stub\n", policy, context, buffer, length, count);
+ FIXME("(%p,%p,%p,0x%08lx,%p) stub\n", policy, context, buffer, length, count);
if (count) *count = 0;
return STATUS_SUCCESS;
@@ -363,7 +363,7 @@ NTSTATUS WINAPI LsaLookupNames(
OUT PLSA_REFERENCED_DOMAIN_LIST* ReferencedDomains,
OUT PLSA_TRANSLATED_SID* Sids)
{
- FIXME("(%p,0x%08x,%p,%p,%p) stub\n", PolicyHandle, Count, Names,
+ FIXME("(%p,0x%08lx,%p,%p,%p) stub\n", PolicyHandle, Count, Names,
ReferencedDomains, Sids);
return STATUS_NONE_MAPPED;
@@ -447,7 +447,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count,
SID_NAME_USE use;
SID *sid;
- TRACE("(%p,0x%08x,0x%08x,%p,%p,%p)\n", policy, flags, count, names, domains, sids);
+ TRACE("(%p,0x%08lx,0x%08lx,%p,%p,%p)\n", policy, flags, count, names, domains, sids);
mapped = 0;
for (i = 0; i < count; i++)
@@ -467,7 +467,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count,
mapped++;
}
}
- TRACE("mapped %u out of %u\n", mapped, count);
+ TRACE("mapped %lu out of %lu\n", mapped, count);
size = sizeof(LSA_TRANSLATED_SID2) * count + sid_size_total;
if (!(*sids = heap_alloc(size))) return STATUS_NO_MEMORY;
@@ -553,7 +553,7 @@ NTSTATUS WINAPI LsaLookupSids(
SID_NAME_USE use;
WCHAR *strsid;
- TRACE("(%p, %u, %p, %p, %p)\n", PolicyHandle, Count, Sids, ReferencedDomains, Names);
+ TRACE("(%p, %lu, %p, %p, %p)\n", PolicyHandle, Count, Sids, ReferencedDomains, Names);
/* this length does not include actual string length yet */
name_fullsize = sizeof(LSA_TRANSLATED_NAME) * Count;
@@ -686,7 +686,7 @@ NTSTATUS WINAPI LsaLookupSids(
name_buffer += lstrlenW(name_buffer) + 1;
}
- TRACE("mapped %u out of %u\n", mapped, Count);
+ TRACE("mapped %lu out of %lu\n", mapped, Count);
if (mapped == Count) return STATUS_SUCCESS;
if (mapped) return STATUS_SOME_NOT_MAPPED;
@@ -734,7 +734,7 @@ NTSTATUS WINAPI LsaOpenPolicy(
IN ACCESS_MASK DesiredAccess,
IN OUT PLSA_HANDLE PolicyHandle)
{
- WARN("(%s,%p,0x%08x,%p) stub\n",
+ WARN("(%s,%p,0x%08lx,%p) stub\n",
SystemName?debugstr_w(SystemName->Buffer):"(null)",
ObjectAttributes, DesiredAccess, PolicyHandle);
@@ -756,7 +756,7 @@ NTSTATUS WINAPI LsaOpenTrustedDomainByName(
ACCESS_MASK access,
PLSA_HANDLE handle)
{
- FIXME("(%p,%p,0x%08x,%p) stub\n", policy, name, access, handle);
+ FIXME("(%p,%p,0x%08lx,%p) stub\n", policy, name, access, handle);
return STATUS_OBJECT_NAME_NOT_FOUND;
}
@@ -970,7 +970,7 @@ NTSTATUS WINAPI LsaRemoveAccountRights(
PLSA_UNICODE_STRING rights,
ULONG count)
{
- FIXME("(%p,%p,%d,%p,0x%08x) stub\n", policy, sid, all, rights, count);
+ FIXME("(%p,%p,%d,%p,0x%08lx) stub\n", policy, sid, all, rights, count);
return STATUS_SUCCESS;
}
@@ -1160,7 +1160,7 @@ NTSTATUS WINAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE handle, LSA_UNICODE_STR
BOOLEAN WINAPI AuditQuerySystemPolicy(const GUID* guids, ULONG count, AUDIT_POLICY_INFORMATION** policy)
{
- FIXME("(%p, %d, %p)\n", guids, count, policy);
+ FIXME("(%p, %ld, %p)\n", guids, count, policy);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index d3d0b19423f..730ca850c2b 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -94,7 +94,7 @@ LSTATUS WINAPI RegCreateKeyTransactedW( HKEY hkey, LPCWSTR name, DWORD reserved,
DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa,
PHKEY retkey, LPDWORD dispos, HANDLE transaction, PVOID reserved2 )
{
- FIXME( "(%p,%s,%u,%s,%u,%u,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_w(name), reserved,
+ FIXME( "(%p,%s,%lu,%s,%lu,%lu,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_w(name), reserved,
debugstr_w(class), options, access, sa, retkey, dispos, transaction, reserved2 );
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -107,7 +107,7 @@ LSTATUS WINAPI RegCreateKeyTransactedA( HKEY hkey, LPCSTR name, DWORD reserved,
DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa,
PHKEY retkey, LPDWORD dispos, HANDLE transaction, PVOID reserved2 )
{
- FIXME( "(%p,%s,%u,%s,%u,%u,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_a(name), reserved,
+ FIXME( "(%p,%s,%lu,%s,%lu,%lu,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_a(name), reserved,
debugstr_a(class), options, access, sa, retkey, dispos, transaction, reserved2 );
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -219,7 +219,7 @@ LSTATUS WINAPI RegQueryMultipleValuesA( HKEY hkey, PVALENTA val_list, DWORD num_
LPSTR bufptr = lpValueBuf;
*ldwTotsize = 0;
- TRACE("(%p,%p,%d,%p,%p=%d)\n", hkey, val_list, num_vals, lpValueBuf, ldwTotsize, *ldwTotsize);
+ TRACE("(%p,%p,%ld,%p,%p=%ld)\n", hkey, val_list, num_vals, lpValueBuf, ldwTotsize, *ldwTotsize);
for(i=0; i < num_vals; ++i)
{
@@ -265,7 +265,7 @@ LSTATUS WINAPI RegQueryMultipleValuesW( HKEY hkey, PVALENTW val_list, DWORD num_
LPSTR bufptr = (LPSTR)lpValueBuf;
*ldwTotsize = 0;
- TRACE("(%p,%p,%d,%p,%p=%d)\n", hkey, val_list, num_vals, lpValueBuf, ldwTotsize, *ldwTotsize);
+ TRACE("(%p,%p,%ld,%p,%p=%ld)\n", hkey, val_list, num_vals, lpValueBuf, ldwTotsize, *ldwTotsize);
for(i=0; i < num_vals; ++i)
{
@@ -360,7 +360,7 @@ LSTATUS WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name )
*/
LSTATUS WINAPI RegSetValueW( HKEY hkey, LPCWSTR subkey, DWORD type, LPCWSTR data, DWORD count )
{
- TRACE("(%p,%s,%d,%s,%d)\n", hkey, debugstr_w(subkey), type, debugstr_w(data), count );
+ TRACE("(%p,%s,%ld,%s,%ld)\n", hkey, debugstr_w(subkey), type, debugstr_w(data), count );
if (type != REG_SZ || !data) return ERROR_INVALID_PARAMETER;
@@ -374,7 +374,7 @@ LSTATUS WINAPI RegSetValueW( HKEY hkey, LPCWSTR subkey, DWORD type, LPCWSTR data
*/
LSTATUS WINAPI RegSetValueA( HKEY hkey, LPCSTR subkey, DWORD type, LPCSTR data, DWORD count )
{
- TRACE("(%p,%s,%d,%s,%d)\n", hkey, debugstr_a(subkey), type, debugstr_a(data), count );
+ TRACE("(%p,%s,%ld,%s,%ld)\n", hkey, debugstr_a(subkey), type, debugstr_a(data), count );
if (type != REG_SZ || !data) return ERROR_INVALID_PARAMETER;
@@ -403,7 +403,7 @@ LSTATUS WINAPI RegQueryValueW( HKEY hkey, LPCWSTR name, LPWSTR data, LPLONG coun
DWORD ret;
HKEY subkey = hkey;
- TRACE("(%p,%s,%p,%d)\n", hkey, debugstr_w(name), data, count ? *count : 0 );
+ TRACE("(%p,%s,%p,%ld)\n", hkey, debugstr_w(name), data, count ? *count : 0 );
if (name && name[0])
{
@@ -432,7 +432,7 @@ LSTATUS WINAPI RegQueryValueA( HKEY hkey, LPCSTR name, LPSTR data, LPLONG count
DWORD ret;
HKEY subkey = hkey;
- TRACE("(%p,%s,%p,%d)\n", hkey, debugstr_a(name), data, count ? *count : 0 );
+ TRACE("(%p,%s,%p,%ld)\n", hkey, debugstr_a(name), data, count ? *count : 0 );
if (name && name[0])
{
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 02787fc841c..e0f7b63aedb 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -128,33 +128,33 @@ const char * debugstr_sid(PSID sid)
case 0:
return wine_dbg_sprintf("S-%d-%d", psid->Revision, auth);
case 1:
- return wine_dbg_sprintf("S-%d-%d-%u", psid->Revision, auth,
+ return wine_dbg_sprintf("S-%d-%d-%lu", psid->Revision, auth,
psid->SubAuthority[0]);
case 2:
- return wine_dbg_sprintf("S-%d-%d-%u-%u", psid->Revision, auth,
+ return wine_dbg_sprintf("S-%d-%d-%lu-%lu", psid->Revision, auth,
psid->SubAuthority[0], psid->SubAuthority[1]);
case 3:
- return wine_dbg_sprintf("S-%d-%d-%u-%u-%u", psid->Revision, auth,
+ return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu", psid->Revision, auth,
psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2]);
case 4:
- return wine_dbg_sprintf("S-%d-%d-%u-%u-%u-%u", psid->Revision, auth,
+ return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu", psid->Revision, auth,
psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2],
psid->SubAuthority[3]);
case 5:
- return wine_dbg_sprintf("S-%d-%d-%u-%u-%u-%u-%u", psid->Revision, auth,
+ return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth,
psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2],
psid->SubAuthority[3], psid->SubAuthority[4]);
case 6:
- return wine_dbg_sprintf("S-%d-%d-%u-%u-%u-%u-%u-%u", psid->Revision, auth,
+ return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth,
psid->SubAuthority[3], psid->SubAuthority[1], psid->SubAuthority[2],
psid->SubAuthority[0], psid->SubAuthority[4], psid->SubAuthority[5]);
case 7:
- return wine_dbg_sprintf("S-%d-%d-%u-%u-%u-%u-%u-%u-%u", psid->Revision, auth,
+ return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth,
psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2],
psid->SubAuthority[3], psid->SubAuthority[4], psid->SubAuthority[5],
psid->SubAuthority[6]);
case 8:
- return wine_dbg_sprintf("S-%d-%d-%u-%u-%u-%u-%u-%u-%u-%u", psid->Revision, auth,
+ return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth,
psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2],
psid->SubAuthority[3], psid->SubAuthority[4], psid->SubAuthority[5],
psid->SubAuthority[6], psid->SubAuthority[7]);
@@ -315,7 +315,7 @@ DWORD WINAPI BuildSecurityDescriptorA(
IN OUT PULONG lpdwBufferLength,
OUT PSECURITY_DESCRIPTOR* pNewSD)
{
- FIXME("(%p,%p,%d,%p,%d,%p,%p,%p,%p) stub!\n",pOwner,pGroup,
+ FIXME("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p) stub!\n",pOwner,pGroup,
cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries,
pListofAuditEntries,pOldSD,lpdwBufferLength,pNewSD);
@@ -342,7 +342,7 @@ DWORD WINAPI BuildSecurityDescriptorW(
NTSTATUS status;
DWORD ret = ERROR_SUCCESS;
- TRACE("(%p,%p,%d,%p,%d,%p,%p,%p,%p)\n", pOwner, pGroup,
+ TRACE("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p)\n", pOwner, pGroup,
cCountOfAccessEntries, pListOfAccessEntries, cCountOfAuditEntries,
pListOfAuditEntries, pOldSD, lpdwBufferLength, pNewSD);
@@ -525,7 +525,7 @@ LookupPrivilegeValueW( LPCWSTR lpSystemName, LPCWSTR lpName, PLUID lpLuid )
continue;
lpLuid->LowPart = i;
lpLuid->HighPart = 0;
- TRACE( "%s -> %08x-%08x\n",debugstr_w( lpSystemName ),
+ TRACE( "%s -> %08lx-%08lx\n",debugstr_w( lpSystemName ),
lpLuid->HighPart, lpLuid->LowPart );
return TRUE;
}
@@ -833,7 +833,7 @@ LookupAccountSidW(
LPWSTR computer_name = NULL;
LPWSTR account_name = NULL;
- TRACE("(%s,sid=%s,%p,%p(%u),%p,%p(%u),%p)\n",
+ TRACE("(%s,sid=%s,%p,%p(%lu),%p,%p(%lu),%p)\n",
debugstr_w(system),debugstr_sid(sid),
account,accountSize,accountSize?*accountSize:0,
domain,domainSize,domainSize?*domainSize:0,
@@ -1023,7 +1023,7 @@ BOOL WINAPI SetFileSecurityA( LPCSTR lpFileName,
BOOL WINAPI
QueryWindows31FilesMigration( DWORD x1 )
{
- FIXME("(%d):stub\n",x1);
+ FIXME("(%ld):stub\n",x1);
return TRUE;
}
@@ -1040,7 +1040,7 @@ BOOL WINAPI
SynchronizeWindows31FilesAndWindowsNTRegistry( DWORD x1, DWORD x2, DWORD x3,
DWORD x4 )
{
- FIXME("(0x%08x,0x%08x,0x%08x,0x%08x):stub\n",x1,x2,x3,x4);
+ FIXME("(0x%08lx,0x%08lx,0x%08lx,0x%08lx):stub\n",x1,x2,x3,x4);
return TRUE;
}
@@ -1422,7 +1422,7 @@ BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR Subsystem, LPVOID HandleId, LPSTR O
PGENERIC_MAPPING GenericMapping, BOOL ObjectCreation, LPDWORD GrantedAccess,
LPBOOL AccessStatus, LPBOOL pfGenerateOnClose)
{
- FIXME("stub (%s,%p,%s,%s,%p,%08x,%p,%x,%p,%p,%p)\n", debugstr_a(Subsystem),
+ FIXME("stub (%s,%p,%s,%s,%p,%08lx,%p,%x,%p,%p,%p)\n", debugstr_a(Subsystem),
HandleId, debugstr_a(ObjectTypeName), debugstr_a(ObjectName),
SecurityDescriptor, DesiredAccess, GenericMapping,
ObjectCreation, GrantedAccess, AccessStatus, pfGenerateOnClose);
@@ -1441,7 +1441,7 @@ BOOL WINAPI ObjectOpenAuditAlarmA(LPCSTR SubsystemName, LPVOID HandleId, LPSTR O
DWORD GrantedAccess, PPRIVILEGE_SET Privileges, BOOL ObjectCreation, BOOL AccessGranted,
LPBOOL GenerateOnClose)
{
- FIXME("stub (%s,%p,%s,%s,%p,%p,0x%08x,0x%08x,%p,%x,%x,%p)\n", debugstr_a(SubsystemName),
+ FIXME("stub (%s,%p,%s,%s,%p,%p,0x%08lx,0x%08lx,%p,%x,%x,%p)\n", debugstr_a(SubsystemName),
HandleId, debugstr_a(ObjectTypeName), debugstr_a(ObjectName), pSecurityDescriptor,
ClientToken, DesiredAccess, GrantedAccess, Privileges, ObjectCreation, AccessGranted,
GenerateOnClose);
@@ -1452,7 +1452,7 @@ BOOL WINAPI ObjectOpenAuditAlarmA(LPCSTR SubsystemName, LPVOID HandleId, LPSTR O
BOOL WINAPI ObjectPrivilegeAuditAlarmA( LPCSTR SubsystemName, LPVOID HandleId, HANDLE ClientToken,
DWORD DesiredAccess, PPRIVILEGE_SET Privileges, BOOL AccessGranted)
{
- FIXME("stub (%s,%p,%p,0x%08x,%p,%x)\n", debugstr_a(SubsystemName), HandleId, ClientToken,
+ FIXME("stub (%s,%p,%p,0x%08lx,%p,%x)\n", debugstr_a(SubsystemName), HandleId, ClientToken,
DesiredAccess, Privileges, AccessGranted);
return TRUE;
@@ -1630,7 +1630,7 @@ VOID WINAPI BuildExplicitAccessWithNameA( PEXPLICIT_ACCESSA pExplicitAccess,
LPSTR pTrusteeName, DWORD AccessPermissions,
ACCESS_MODE AccessMode, DWORD Inheritance )
{
- TRACE("%p %s 0x%08x 0x%08x 0x%08x\n", pExplicitAccess, debugstr_a(pTrusteeName),
+ TRACE("%p %s 0x%08lx 0x%08x 0x%08lx\n", pExplicitAccess, debugstr_a(pTrusteeName),
AccessPermissions, AccessMode, Inheritance);
pExplicitAccess->grfAccessPermissions = AccessPermissions;
@@ -1651,7 +1651,7 @@ VOID WINAPI BuildExplicitAccessWithNameW( PEXPLICIT_ACCESSW pExplicitAccess,
LPWSTR pTrusteeName, DWORD AccessPermissions,
ACCESS_MODE AccessMode, DWORD Inheritance )
{
- TRACE("%p %s 0x%08x 0x%08x 0x%08x\n", pExplicitAccess, debugstr_w(pTrusteeName),
+ TRACE("%p %s 0x%08lx 0x%08x 0x%08lx\n", pExplicitAccess, debugstr_w(pTrusteeName),
AccessPermissions, AccessMode, Inheritance);
pExplicitAccess->grfAccessPermissions = AccessPermissions;
@@ -2085,7 +2085,7 @@ DWORD WINAPI SetEntriesInAclA( ULONG count, PEXPLICIT_ACCESSA pEntries,
EXPLICIT_ACCESSW *pEntriesW;
UINT alloc_index, free_index;
- TRACE("%d %p %p %p\n", count, pEntries, OldAcl, NewAcl);
+ TRACE("%ld %p %p %p\n", count, pEntries, OldAcl, NewAcl);
if (NewAcl)
*NewAcl = NULL;
@@ -2145,7 +2145,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries,
DWORD acl_size = sizeof(ACL);
NTSTATUS status;
- TRACE("%d %p %p %p\n", count, pEntries, OldAcl, NewAcl);
+ TRACE("%ld %p %p %p\n", count, pEntries, OldAcl, NewAcl);
if (NewAcl)
*NewAcl = NULL;
@@ -2162,7 +2162,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries,
{
ppsid[i] = (char *)&ppsid[count] + i * FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]);
- TRACE("[%d]:\n\tgrfAccessPermissions = 0x%x\n\tgrfAccessMode = %d\n\tgrfInheritance = 0x%x\n\t"
+ TRACE("[%ld]:\n\tgrfAccessPermissions = 0x%lx\n\tgrfAccessMode = %d\n\tgrfInheritance = 0x%lx\n\t"
"Trustee.pMultipleTrustee = %p\n\tMultipleTrusteeOperation = %d\n\tTrusteeForm = %d\n\t"
"Trustee.TrusteeType = %d\n\tptstrName = %p\n", i,
pEntries[i].grfAccessPermissions, pEntries[i].grfAccessMode, pEntries[i].grfInheritance,
@@ -2192,7 +2192,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries,
case REVOKE_ACCESS:
break;
default:
- WARN("bad access mode %d for trustee %d\n", pEntries[i].grfAccessMode, i);
+ WARN("bad access mode %d for trustee %ld\n", pEntries[i].grfAccessMode, i);
ret = ERROR_INVALID_PARAMETER;
goto exit;
}
@@ -2336,7 +2336,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries,
status = RtlAddAce(*NewAcl, ACL_REVISION, 1, (PACE_HEADER)old_ace_header, old_ace_header->AceSize);
if (status != STATUS_SUCCESS)
{
- WARN("RtlAddAce failed with error 0x%08x\n", status);
+ WARN("RtlAddAce failed with error 0x%08lx\n", status);
ret = RtlNtStatusToDosError(status);
break;
}
@@ -2358,7 +2358,7 @@ DWORD WINAPI SetNamedSecurityInfoA(LPSTR pObjectName,
LPWSTR wstr;
DWORD r;
- TRACE("%s %d %d %p %p %p %p\n", debugstr_a(pObjectName), ObjectType,
+ TRACE("%s %d %ld %p %p %p %p\n", debugstr_a(pObjectName), ObjectType,
SecurityInfo, psidOwner, psidGroup, pDacl, pSacl);
wstr = strdupAW(pObjectName);
@@ -2381,7 +2381,7 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName,
HANDLE handle;
DWORD err;
- TRACE( "%s %d %d %p %p %p %p\n", debugstr_w(pObjectName), ObjectType,
+ TRACE( "%s %d %ld %p %p %p %p\n", debugstr_w(pObjectName), ObjectType,
SecurityInfo, psidOwner, psidGroup, pDacl, pSacl);
if (!pObjectName) return ERROR_INVALID_PARAMETER;
@@ -2555,7 +2555,7 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA(
BOOL ret;
LPWSTR StringSecurityDescriptorW;
- TRACE("%s, %u, %p, %p\n", debugstr_a(StringSecurityDescriptor), StringSDRevision,
+ TRACE("%s, %lu, %p, %p\n", debugstr_a(StringSecurityDescriptor), StringSDRevision,
SecurityDescriptor, SecurityDescriptorSize);
if(!StringSecurityDescriptor)
@@ -2651,7 +2651,7 @@ BOOL WINAPI CreateProcessWithLogonW( LPCWSTR lpUsername, LPCWSTR lpDomain, LPCWS
LPCWSTR lpApplicationName, LPWSTR lpCommandLine, DWORD dwCreationFlags, LPVOID lpEnvironment,
LPCWSTR lpCurrentDirectory, LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation )
{
- FIXME("%s %s %s 0x%08x %s %s 0x%08x %p %s %p %p stub\n", debugstr_w(lpUsername), debugstr_w(lpDomain),
+ FIXME("%s %s %s 0x%08lx %s %s 0x%08lx %p %s %p %p stub\n", debugstr_w(lpUsername), debugstr_w(lpDomain),
debugstr_w(lpPassword), dwLogonFlags, debugstr_w(lpApplicationName),
debugstr_w(lpCommandLine), dwCreationFlags, lpEnvironment, debugstr_w(lpCurrentDirectory),
lpStartupInfo, lpProcessInformation);
@@ -2663,7 +2663,7 @@ BOOL WINAPI CreateProcessWithTokenW(HANDLE token, DWORD logon_flags, LPCWSTR app
DWORD creation_flags, void *environment, LPCWSTR current_directory, STARTUPINFOW *startup_info,
PROCESS_INFORMATION *process_information )
{
- FIXME("%p 0x%08x %s %s 0x%08x %p %s %p %p - semi-stub\n", token,
+ FIXME("%p 0x%08lx %s %s 0x%08lx %p %s %p %p - semi-stub\n", token,
logon_flags, debugstr_w(application_name), debugstr_w(command_line),
creation_flags, environment, debugstr_w(current_directory),
startup_info, process_information);
@@ -2684,7 +2684,7 @@ DWORD WINAPI GetNamedSecurityInfoA(LPSTR pObjectName,
LPWSTR wstr;
DWORD r;
- TRACE("%s %d %d %p %p %p %p %p\n", pObjectName, ObjectType, SecurityInfo,
+ TRACE("%s %d %ld %p %p %p %p %p\n", pObjectName, ObjectType, SecurityInfo,
ppsidOwner, ppsidGroup, ppDacl, ppSacl, ppSecurityDescriptor);
wstr = strdupAW(pObjectName);
@@ -2707,7 +2707,7 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type,
HANDLE handle;
DWORD err;
- TRACE( "%s %d %d %p %p %p %p %p\n", debugstr_w(name), type, info, owner,
+ TRACE( "%s %d %ld %p %p %p %p %p\n", debugstr_w(name), type, info, owner,
group, dacl, sacl, descriptor );
/* A NULL descriptor is allowed if any one of the other pointers is not NULL */
@@ -2768,7 +2768,7 @@ DWORD WINAPI GetNamedSecurityInfoExW( LPCWSTR object, SE_OBJECT_TYPE type,
SECURITY_INFORMATION info, LPCWSTR provider, LPCWSTR property,
PACTRL_ACCESSW* access_list, PACTRL_AUDITW* audit_list, LPWSTR* owner, LPWSTR* group )
{
- FIXME("(%s, %d, %d, %s, %s, %p, %p, %p, %p) stub\n", debugstr_w(object), type, info,
+ FIXME("(%s, %d, %ld, %s, %s, %p, %p, %p, %p) stub\n", debugstr_w(object), type, info,
debugstr_w(provider), debugstr_w(property), access_list, audit_list, owner, group);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -2780,7 +2780,7 @@ DWORD WINAPI GetNamedSecurityInfoExA( LPCSTR object, SE_OBJECT_TYPE type,
SECURITY_INFORMATION info, LPCSTR provider, LPCSTR property,
PACTRL_ACCESSA* access_list, PACTRL_AUDITA* audit_list, LPSTR* owner, LPSTR* group )
{
- FIXME("(%s, %d, %d, %s, %s, %p, %p, %p, %p) stub\n", debugstr_a(object), type, info,
+ FIXME("(%s, %d, %ld, %s, %s, %p, %p, %p, %p) stub\n", debugstr_a(object), type, info,
debugstr_a(provider), debugstr_a(property), access_list, audit_list, owner, group);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -2790,7 +2790,7 @@ DWORD WINAPI GetNamedSecurityInfoExA( LPCSTR object, SE_OBJECT_TYPE type,
*/
BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved)
{
- FIXME("(%s, %08x): stub\n", debugstr_w(lpFileName), dwReserved);
+ FIXME("(%s, %08lx): stub\n", debugstr_w(lpFileName), dwReserved);
return TRUE;
}
@@ -2799,7 +2799,7 @@ BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved)
*/
BOOL WINAPI DecryptFileA(LPCSTR lpFileName, DWORD dwReserved)
{
- FIXME("(%s, %08x): stub\n", debugstr_a(lpFileName), dwReserved);
+ FIXME("(%s, %08lx): stub\n", debugstr_a(lpFileName), dwReserved);
return TRUE;
}
@@ -3039,7 +3039,7 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType,
BOOL WINAPI SaferCreateLevel(DWORD ScopeId, DWORD LevelId, DWORD OpenFlags,
SAFER_LEVEL_HANDLE* LevelHandle, LPVOID lpReserved)
{
- FIXME("(%u, %x, %u, %p, %p) stub\n", ScopeId, LevelId, OpenFlags, LevelHandle, lpReserved);
+ FIXME("(%lu, %lx, %lu, %p, %p) stub\n", ScopeId, LevelId, OpenFlags, LevelHandle, lpReserved);
*LevelHandle = (SAFER_LEVEL_HANDLE)0xdeadbeef;
return TRUE;
@@ -3051,7 +3051,7 @@ BOOL WINAPI SaferCreateLevel(DWORD ScopeId, DWORD LevelId, DWORD OpenFlags,
BOOL WINAPI SaferComputeTokenFromLevel(SAFER_LEVEL_HANDLE handle, HANDLE token, PHANDLE access_token,
DWORD flags, LPVOID reserved)
{
- FIXME("(%p, %p, %p, %x, %p) stub\n", handle, token, access_token, flags, reserved);
+ FIXME("(%p, %p, %p, %lx, %p) stub\n", handle, token, access_token, flags, reserved);
*access_token = (flags & SAFER_TOKEN_NULL_IF_EQUAL) ? NULL : (HANDLE)0xdeadbeef;
return TRUE;
@@ -3075,7 +3075,7 @@ DWORD WINAPI TreeResetNamedSecurityInfoW( LPWSTR pObjectName,
BOOL KeepExplicit, FN_PROGRESS fnProgress,
PROG_INVOKE_SETTING ProgressInvokeSetting, PVOID Args)
{
- FIXME("(%s, %i, %i, %p, %p, %p, %p, %i, %p, %i, %p) stub\n",
+ FIXME("(%s, %i, %li, %p, %p, %p, %p, %i, %p, %i, %p) stub\n",
debugstr_w(pObjectName), ObjectType, SecurityInfo, pOwner, pGroup,
pDacl, pSacl, KeepExplicit, fnProgress, ProgressInvokeSetting, Args);
@@ -3088,7 +3088,7 @@ DWORD WINAPI TreeResetNamedSecurityInfoW( LPWSTR pObjectName,
BOOL WINAPI SaferGetPolicyInformation(DWORD scope, SAFER_POLICY_INFO_CLASS class, DWORD size,
PVOID buffer, PDWORD required, LPVOID lpReserved)
{
- FIXME("(%u %u %u %p %p %p) stub\n", scope, class, size, buffer, required, lpReserved);
+ FIXME("(%lu %u %lu %p %p %p) stub\n", scope, class, size, buffer, required, lpReserved);
return FALSE;
}
@@ -3098,7 +3098,7 @@ BOOL WINAPI SaferGetPolicyInformation(DWORD scope, SAFER_POLICY_INFO_CLASS class
BOOL WINAPI SaferIdentifyLevel(DWORD count, SAFER_CODE_PROPERTIES *properties, SAFER_LEVEL_HANDLE *handle,
void *reserved)
{
- FIXME("(%u %p %p %p) stub\n", count, properties, handle, reserved);
+ FIXME("(%lu %p %p %p) stub\n", count, properties, handle, reserved);
*handle = (SAFER_LEVEL_HANDLE)0xdeadbeef;
return TRUE;
}
@@ -3109,7 +3109,7 @@ BOOL WINAPI SaferIdentifyLevel(DWORD count, SAFER_CODE_PROPERTIES *properties, S
BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE handle, SAFER_OBJECT_INFO_CLASS infotype,
LPVOID buffer, DWORD size)
{
- FIXME("(%p %u %p %u) stub\n", handle, infotype, buffer, size);
+ FIXME("(%p %u %p %lu) stub\n", handle, infotype, buffer, size);
return FALSE;
}
diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index 8a1024ff803..c0fbf4904bc 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -64,7 +64,7 @@ EnumServicesStatusA( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST
DWORD sz, n;
char *p;
- TRACE("%p 0x%x 0x%x %p %u %p %p %p\n", hmngr, type, state, services, size, needed,
+ TRACE("%p 0x%lx 0x%lx %p %lu %p %p %p\n", hmngr, type, state, services, size, needed,
returned, resume_handle);
if (!hmngr)
@@ -128,7 +128,7 @@ EnumServicesStatusW( SC_HANDLE manager, DWORD type, DWORD state, ENUM_SERVICE_ST
DWORD alloc_size, count, i;
WCHAR *p;
- TRACE("%p 0x%x 0x%x %p %u %p %p %p\n", manager, type, state, status, size,
+ TRACE("%p 0x%lx 0x%lx %p %lu %p %p %p\n", manager, type, state, status, size,
ret_size, ret_count, resume_handle);
if (!manager)
@@ -225,7 +225,7 @@ EnumServicesStatusExA( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st
DWORD sz, n;
char *p;
- TRACE("%p %u 0x%x 0x%x %p %u %p %p %p %s\n", hmngr, level, type, state, buffer,
+ TRACE("%p %u 0x%lx 0x%lx %p %lu %p %p %p %s\n", hmngr, level, type, state, buffer,
size, needed, returned, resume_handle, debugstr_a(group));
sz = max( 2 * size, sizeof(*servicesW) );
@@ -333,7 +333,7 @@ BOOL WINAPI QueryServiceLockStatusA( SC_HANDLE hSCManager,
LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus,
DWORD cbBufSize, LPDWORD pcbBytesNeeded)
{
- FIXME("%p %p %08x %p\n", hSCManager, lpLockStatus, cbBufSize, pcbBytesNeeded);
+ FIXME("%p %p %08lx %p\n", hSCManager, lpLockStatus, cbBufSize, pcbBytesNeeded);
return FALSE;
}
@@ -345,7 +345,7 @@ BOOL WINAPI QueryServiceLockStatusW( SC_HANDLE hSCManager,
LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus,
DWORD cbBufSize, LPDWORD pcbBytesNeeded)
{
- FIXME("%p %p %08x %p\n", hSCManager, lpLockStatus, cbBufSize, pcbBytesNeeded);
+ FIXME("%p %p %08lx %p\n", hSCManager, lpLockStatus, cbBufSize, pcbBytesNeeded);
return FALSE;
}
@@ -405,7 +405,7 @@ BOOL WINAPI SetServiceBits( SERVICE_STATUS_HANDLE hServiceStatus,
BOOL bSetBitsOn,
BOOL bUpdateImmediately)
{
- FIXME("%p %08x %x %x\n", hServiceStatus, dwServiceBits,
+ FIXME("%p %08lx %x %x\n", hServiceStatus, dwServiceBits,
bSetBitsOn, bUpdateImmediately);
return TRUE;
}
@@ -417,7 +417,7 @@ BOOL WINAPI EnumDependentServicesA( SC_HANDLE hService, DWORD dwServiceState,
LPENUM_SERVICE_STATUSA lpServices, DWORD cbBufSize,
LPDWORD pcbBytesNeeded, LPDWORD lpServicesReturned )
{
- FIXME("%p 0x%08x %p 0x%08x %p %p - stub\n", hService, dwServiceState,
+ FIXME("%p 0x%08lx %p 0x%08lx %p %p - stub\n", hService, dwServiceState,
lpServices, cbBufSize, pcbBytesNeeded, lpServicesReturned);
*lpServicesReturned = 0;
diff --git a/dlls/advapi32/wmi.c b/dlls/advapi32/wmi.c
index 0215fbe97dd..d35bcbe8d65 100644
--- a/dlls/advapi32/wmi.c
+++ b/dlls/advapi32/wmi.c
@@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmi);
ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE handle, const char *name, ULONG method, ULONG inputsize,
void *inputbuffer, ULONG *outputsize, void *outputbuffer)
{
- FIXME(" %p %s %u %u %p %p %p: stub\n", handle, debugstr_a(name), method, inputsize, inputbuffer,
+ FIXME(" %p %s %lu %lu %p %p %p: stub\n", handle, debugstr_a(name), method, inputsize, inputbuffer,
outputsize, outputbuffer);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -52,7 +52,7 @@ ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE handle, const char *name, ULONG method,
ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE handle, const WCHAR *name, ULONG method, ULONG inputsize,
void *inputbuffer, ULONG *outputsize, void *outputbuffer)
{
- FIXME("%p %s %u %u %p %p %p: stub\n", handle, debugstr_w(name), method, inputsize, inputbuffer,
+ FIXME("%p %s %lu %lu %p %p %p: stub\n", handle, debugstr_w(name), method, inputsize, inputbuffer,
outputsize, outputbuffer);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -89,7 +89,7 @@ ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE handle, ULONG *count, MOFRESOUR
ULONG WMIAPI WmiNotificationRegistrationA(GUID *guid, BOOLEAN enable, void *info,
ULONG_PTR context, ULONG flags)
{
- FIXME("%s %u %p 0x%lx 0x%08x: stub\n", debugstr_guid(guid), enable, info, context, flags);
+ FIXME("%s %u %p 0x%Ix 0x%08lx: stub\n", debugstr_guid(guid), enable, info, context, flags);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -99,7 +99,7 @@ ULONG WMIAPI WmiNotificationRegistrationA(GUID *guid, BOOLEAN enable, void *info
ULONG WMIAPI WmiNotificationRegistrationW(GUID *guid, BOOLEAN enable, void *info,
ULONG_PTR context, ULONG flags)
{
- FIXME("%s %u %p 0x%lx 0x%08x: stub\n", debugstr_guid(guid), enable, info, context, flags);
+ FIXME("%s %u %p 0x%Ix 0x%08lx: stub\n", debugstr_guid(guid), enable, info, context, flags);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -108,7 +108,7 @@ ULONG WMIAPI WmiNotificationRegistrationW(GUID *guid, BOOLEAN enable, void *info
*/
ULONG WINAPI WmiOpenBlock(GUID *guid, ULONG access, WMIHANDLE *handle)
{
- FIXME("%s %u %p: stub\n", debugstr_guid(guid), access, handle);
+ FIXME("%s %lu %p: stub\n", debugstr_guid(guid), access, handle);
return ERROR_SUCCESS;
}
@@ -145,7 +145,7 @@ ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE handle, WMIGUIDINFORMATION *info)
ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE handle, const char *name, ULONG reserved,
ULONG size, void *buffer)
{
- FIXME("%p %s %u %u %p: stub\n", handle, debugstr_a(name), reserved, size, buffer);
+ FIXME("%p %s %lu %lu %p: stub\n", handle, debugstr_a(name), reserved, size, buffer);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -155,7 +155,7 @@ ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE handle, const char *name, ULONG res
ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG reserved,
ULONG size, void *buffer)
{
- FIXME("%p %s %u %u %p: stub\n", handle, debugstr_w(name), reserved, size, buffer);
+ FIXME("%p %s %lu %lu %p: stub\n", handle, debugstr_w(name), reserved, size, buffer);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -165,7 +165,7 @@ ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG re
ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE handle, const char *name, ULONG id, ULONG reserved,
ULONG size, void *buffer)
{
- FIXME("%p %s %u %u %u %p: stub\n", handle, debugstr_a(name), id, reserved, size, buffer);
+ FIXME("%p %s %lu %lu %lu %p: stub\n", handle, debugstr_a(name), id, reserved, size, buffer);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -175,6 +175,6 @@ ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE handle, const char *name, ULONG id, ULO
ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE handle, const WCHAR *name, ULONG id, ULONG reserved,
ULONG size, void *buffer)
{
- FIXME("%p %s %u %u %u %p: stub\n", handle, debugstr_w(name), id, reserved, size, buffer);
+ FIXME("%p %s %lu %lu %lu %p: stub\n", handle, debugstr_w(name), id, reserved, size, buffer);
return ERROR_CALL_NOT_IMPLEMENTED;
}
More information about the wine-devel
mailing list