Paul Vriens : wintrust: Win64 printf format warning fixes.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Oct 4 14:33:28 CDT 2006
Module: wine
Branch: master
Commit: dcec67ba60e86e805264e4b1e20695276d195b71
URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcec67ba60e86e805264e4b1e20695276d195b71
Author: Paul Vriens <Paul.Vriens at xs4all.nl>
Date: Wed Oct 4 12:22:58 2006 +0200
wintrust: Win64 printf format warning fixes.
---
dlls/wintrust/Makefile.in | 1 -
dlls/wintrust/crypt.c | 16 ++++++++--------
dlls/wintrust/register.c | 2 +-
dlls/wintrust/wintrust_main.c | 4 ++--
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in
index 9f273bc..d547dc4 100644
--- a/dlls/wintrust/Makefile.in
+++ b/dlls/wintrust/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = wintrust.dll
IMPORTLIB = libwintrust.$(IMPLIBEXT)
IMPORTS = crypt32 user32 advapi32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
crypt.c \
diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c
index 87fff4f..1edf171 100644
--- a/dlls/wintrust/crypt.c
+++ b/dlls/wintrust/crypt.c
@@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust);
BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin,
const GUID *sysSystem, DWORD dwFlags )
{
- FIXME("%p %s %lx\n", catAdmin, debugstr_guid(sysSystem), dwFlags);
+ FIXME("%p %s %x\n", catAdmin, debugstr_guid(sysSystem), dwFlags);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@@ -59,7 +59,7 @@ BOOL WINAPI CryptCATAdminAcquireContext(
BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD* pcbHash,
BYTE* pbHash, DWORD dwFlags )
{
- FIXME("%p %p %p %lx\n", hFile, pcbHash, pbHash, dwFlags);
+ FIXME("%p %p %p %x\n", hFile, pcbHash, pbHash, dwFlags);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@@ -73,7 +73,7 @@ HCATINFO WINAPI CryptCATAdminEnumCatalog
DWORD dwFlags,
HCATINFO* phPrevCatInfo )
{
- FIXME("%p %p %ld %ld %p\n", hCatAdmin, pbHash, cbHash, dwFlags, phPrevCatInfo);
+ FIXME("%p %p %d %d %p\n", hCatAdmin, pbHash, cbHash, dwFlags, phPrevCatInfo);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return NULL;
}
@@ -94,7 +94,7 @@ HCATINFO WINAPI CryptCATAdminEnumCatalog
*/
BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags )
{
- FIXME("%p %lx\n", hCatAdmin, dwFlags);
+ FIXME("%p %x\n", hCatAdmin, dwFlags);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@@ -123,7 +123,7 @@ CRYPTCATMEMBER *WINAPI CryptCATEnumerate
HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV hProv,
DWORD dwPublicVersion, DWORD dwEncodingType)
{
- FIXME("(%s, %ld, %ld, %ld, %ld) stub\n", debugstr_w(pwszFileName), fdwOpenFlags,
+ FIXME("(%s, %d, %ld, %d, %d) stub\n", debugstr_w(pwszFileName), fdwOpenFlags,
hProv, dwPublicVersion, dwEncodingType);
return 0;
}
@@ -145,7 +145,7 @@ BOOL WINAPI CryptSIPCreateIndirectData(S
BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEncodingType,
DWORD dwIndex, DWORD* pcbSignedDataMsg, BYTE* pbSignedDataMsg)
{
- FIXME("(%p %p %ld %p %p) stub\n", pSubjectInfo, pdwEncodingType, dwIndex,
+ FIXME("(%p %p %d %p %p) stub\n", pSubjectInfo, pdwEncodingType, dwIndex,
pcbSignedDataMsg, pbSignedDataMsg);
return FALSE;
@@ -157,7 +157,7 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP
BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEncodingType,
DWORD* pdwIndex, DWORD cbSignedDataMsg, BYTE* pbSignedDataMsg)
{
- FIXME("(%p %ld %p %ld %p) stub\n", pSubjectInfo, pdwEncodingType, pdwIndex,
+ FIXME("(%p %d %p %d %p) stub\n", pSubjectInfo, pdwEncodingType, pdwIndex,
cbSignedDataMsg, pbSignedDataMsg);
return FALSE;
@@ -169,7 +169,7 @@ BOOL WINAPI CryptSIPPutSignedDataMsg(SIP
BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo,
DWORD dwIndex)
{
- FIXME("(%p %ld) stub\n", pSubjectInfo, dwIndex);
+ FIXME("(%p %d) stub\n", pSubjectInfo, dwIndex);
return FALSE;
}
diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c
index cc9b9b7..310c184 100644
--- a/dlls/wintrust/register.c
+++ b/dlls/wintrust/register.c
@@ -239,7 +239,7 @@ BOOL WINAPI WintrustAddActionID( GUID* p
LONG Res;
LONG WriteActionError = ERROR_SUCCESS;
- TRACE("%s %lx %p\n", debugstr_guid(pgActionID), fdwFlags, psProvInfo);
+ TRACE("%s %x %p\n", debugstr_guid(pgActionID), fdwFlags, psProvInfo);
/* Some sanity checks.
* We use the W2K3 last error as it makes more sense (W2K leaves the last error
diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c
index e3f9906..41c97d9 100644
--- a/dlls/wintrust/wintrust_main.c
+++ b/dlls/wintrust/wintrust_main.c
@@ -104,7 +104,7 @@ CRYPT_PROVIDER_SGNR * WINAPI WTHelperGet
CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSigner,
DWORD idxCounterSigner)
{
- FIXME("%p %ld %d %ld\n", pProvData, idxSigner, fCounterSigner,
+ FIXME("%p %d %d %d\n", pProvData, idxSigner, fCounterSigner,
idxCounterSigner);
return NULL;
}
@@ -143,6 +143,6 @@ void WINAPI WintrustGetRegPolicyFlags( D
*/
BOOL WINAPI WintrustSetRegPolicyFlags( DWORD dwPolicyFlags)
{
- FIXME("stub: %lx\n", dwPolicyFlags);
+ FIXME("stub: %x\n", dwPolicyFlags);
return TRUE;
}
More information about the wine-cvs
mailing list