dpnet: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Sun Oct 8 16:50:09 CDT 2006
---
dlls/dpnet/Makefile.in | 1 -
dlls/dpnet/address.c | 14 +++++++-------
dlls/dpnet/client.c | 42 +++++++++++++++++++++---------------------
dlls/dpnet/dpnet_main.c | 2 +-
4 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in
index 84a4f3c..17929ea 100644
--- a/dlls/dpnet/Makefile.in
+++ b/dlls/dpnet/Makefile.in
@@ -6,7 +6,6 @@ MODULE = dpnet.dll
IMPORTLIB = libdpnet.$(IMPLIBEXT)
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = -ldxguid -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
address.c \
diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c
index 7bb0818..01708bd 100644
--- a/dlls/dpnet/address.c
+++ b/dlls/dpnet/address.c
@@ -57,7 +57,7 @@ static ULONG WINAPI IDirectPlay8AddressI
IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1);
+ TRACE("(%p)->(ref before=%u)\n", This, refCount - 1);
return refCount;
}
@@ -66,7 +66,7 @@ static ULONG WINAPI IDirectPlay8AddressI
IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1);
+ TRACE("(%p)->(ref before=%u)\n", This, refCount + 1);
if (!refCount) {
HeapFree(GetProcessHeap(), 0, This);
@@ -172,23 +172,23 @@ static HRESULT WINAPI IDirectPlay8Addres
static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(PDIRECTPLAY8ADDRESS iface, CONST WCHAR* CONST pwszName,
CONST void* CONST lpvData, CONST DWORD dwDataSize, CONST DWORD dwDataType) {
IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface;
- TRACE("(%p, %s, %p, %lu, %lx): stub\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType);
+ TRACE("(%p, %s, %p, %u, %x): stub\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType);
if (NULL == lpvData) return DPNERR_INVALIDPOINTER;
switch (dwDataType) {
case DPNA_DATATYPE_DWORD:
if (sizeof(DWORD) != dwDataSize) return DPNERR_INVALIDPARAM;
- TRACE("(%p, %lu): DWORD Type -> %lu\n", lpvData, dwDataSize, *(const DWORD*) lpvData);
+ TRACE("(%p, %u): DWORD Type -> %u\n", lpvData, dwDataSize, *(const DWORD*) lpvData);
break;
case DPNA_DATATYPE_GUID:
if (sizeof(GUID) != dwDataSize) return DPNERR_INVALIDPARAM;
- TRACE("(%p, %lu): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid((const GUID*) lpvData));
+ TRACE("(%p, %u): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid((const GUID*) lpvData));
break;
case DPNA_DATATYPE_STRING:
- TRACE("(%p, %lu): STRING Type -> %s\n", lpvData, dwDataSize, (const CHAR*) lpvData);
+ TRACE("(%p, %u): STRING Type -> %s\n", lpvData, dwDataSize, (const CHAR*) lpvData);
break;
case DPNA_DATATYPE_BINARY:
- TRACE("(%p, %lu): BINARY Type\n", lpvData, dwDataSize);
+ TRACE("(%p, %u): BINARY Type\n", lpvData, dwDataSize);
break;
}
diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c
index f67bcd1..c630715 100644
--- a/dlls/dpnet/client.c
+++ b/dlls/dpnet/client.c
@@ -57,7 +57,7 @@ static ULONG WINAPI IDirectPlay8ClientIm
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1);
+ TRACE("(%p)->(ref before=%u)\n", This, refCount - 1);
return refCount;
}
@@ -66,7 +66,7 @@ static ULONG WINAPI IDirectPlay8ClientIm
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1);
+ TRACE("(%p)->(ref before=%u)\n", This, refCount + 1);
if (!refCount) {
HeapFree(GetProcessHeap(), 0, This);
@@ -78,7 +78,7 @@ static ULONG WINAPI IDirectPlay8ClientIm
static HRESULT WINAPI IDirectPlay8ClientImpl_Initialize(PDIRECTPLAY8CLIENT iface, PVOID CONST pvUserContext, CONST PFNDPNMESSAGEHANDLER pfn, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvUserContext, pfn, dwFlags);
+ FIXME("(%p):(%p,%p,%x): Stub\n", This, pvUserContext, pfn, dwFlags);
return DPN_OK;
}
@@ -90,7 +90,7 @@ static HRESULT WINAPI IDirectPlay8Client
PDWORD CONST pcReturned,
CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
@@ -106,13 +106,13 @@ static HRESULT WINAPI IDirectPlay8Client
CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
/*FIXME("(%p):(%p,%p,%p,%p,%lu,%lu,%lu,%lu): Stub\n", This, pApplicationDesc, pAddrHost, pDeviceInfo, pUserEnumData, dwUserEnumDataSize, dwEnumCount, dwRetryInterval, dwTimeOut);*/
- FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvUserContext, pAsyncHandle, dwFlags);
+ FIXME("(%p):(%p,%p,%x): Stub\n", This, pvUserContext, pAsyncHandle, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_CancelAsyncOperation(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE hAsyncHandle, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lu,%lx): Stub\n", This, hAsyncHandle, dwFlags);
+ FIXME("(%p):(%u,%x): Stub\n", This, hAsyncHandle, dwFlags);
return DPN_OK;
}
@@ -128,7 +128,7 @@ static HRESULT WINAPI IDirectPlay8Client
DPNHANDLE * CONST phAsyncHandle,
CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags);
+ FIXME("(%p):(%p,%p,%x): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags);
return DPN_OK;
}
@@ -140,19 +140,19 @@ static HRESULT WINAPI IDirectPlay8Client
DPNHANDLE * CONST phAsyncHandle,
CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags);
+ FIXME("(%p):(%p,%p,%x): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_GetSendQueueInfo(PDIRECTPLAY8CLIENT iface, DWORD * CONST pdwNumMsgs, DWORD * CONST pdwNumBytes, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_GetApplicationDesc(PDIRECTPLAY8CLIENT iface, DPN_APPLICATION_DESC * CONST pAppDescBuffer, DWORD * CONST pcbDataSize, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
@@ -162,67 +162,67 @@ static HRESULT WINAPI IDirectPlay8Client
DPNHANDLE * CONST phAsyncHandle,
CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags);
+ FIXME("(%p):(%p,%p,%x): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_GetServerInfo(PDIRECTPLAY8CLIENT iface, DPN_PLAYER_INFO * CONST pdpnPlayerInfo, DWORD * CONST pdwSize, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_GetServerAddress(PDIRECTPLAY8CLIENT iface, IDirectPlay8Address ** CONST pAddress, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_Close(PDIRECTPLAY8CLIENT iface, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_ReturnBuffer(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE hBufferHandle, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_GetCaps(PDIRECTPLAY8CLIENT iface, DPN_CAPS * CONST pdpCaps, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_SetCaps(PDIRECTPLAY8CLIENT iface, CONST DPN_CAPS * CONST pdpCaps, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(PDIRECTPLAY8CLIENT iface, CONST GUID * CONST pguidSP, CONST DPN_SP_CAPS * CONST pdpspCaps, CONST DWORD dwFlags ) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(PDIRECTPLAY8CLIENT iface, CONST GUID * CONST pguidSP, DPN_SP_CAPS * CONST pdpspCaps, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_GetConnectionInfo(PDIRECTPLAY8CLIENT iface, DPN_CONNECTION_INFO * CONST pdpConnectionInfo, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
static HRESULT WINAPI IDirectPlay8ClientImpl_RegisterLobby(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE dpnHandle, struct IDirectPlay8LobbiedApplication * CONST pIDP8LobbiedApplication, CONST DWORD dwFlags) {
IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface;
- FIXME("(%p):(%lx): Stub\n", This, dwFlags);
+ FIXME("(%p):(%x): Stub\n", This, dwFlags);
return DPN_OK;
}
diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c
index 030941d..36bfc71 100644
--- a/dlls/dpnet/dpnet_main.c
+++ b/dlls/dpnet/dpnet_main.c
@@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet);
/* At process attach */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
- TRACE("%p,%lx,%p\n", hInstDLL, fdwReason, lpvReserved);
+ TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved);
if (fdwReason == DLL_PROCESS_ATTACH) {
DisableThreadLibraryCalls(hInstDLL);
}
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061008/12544194/attachment-0001.pgp
More information about the wine-patches
mailing list