Skip to content

W
wine-cw
Commit ca90b902 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard
Browse files
Options

dpnet: Fix long types printf warnings.

Signed-off-by: 's avatarAlistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent eb59527f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 55 deletions
dlls/dpnet/Makefile.in
View file @ ca90b902
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dpnet.dll
IMPORTLIB = dpnet
IMPORTS = dxguid uuid ole32 advapi32 ws2_32
......
dlls/dpnet/address.c
View file @ ca90b902
......@@ -91,7 +91,7 @@ static ULONG WINAPI IDirectPlay8AddressImpl_AddRef(IDirectPlay8Address *iface)
IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%u\n", This, ref);
TRACE("(%p) ref=%lu\n", This, ref);
return ref;
}
......@@ -101,7 +101,7 @@ static ULONG WINAPI IDirectPlay8AddressImpl_Release(IDirectPlay8Address *iface)
IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%u\n", This, ref);
TRACE("(%p) ref=%lu\n", This, ref);
if (!ref)
{
......@@ -222,7 +222,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(IDirectPlay8Address *ifa
{
IDirectPlay8Address_Release(dup);
dup = NULL;
ERR("Failed to copy component: %s - 0x%08x\n", debugstr_w(entry->name), hr);
ERR("Failed to copy component: %s - 0x%08lx\n", debugstr_w(entry->name), hr);
break;
}
}
......@@ -290,14 +290,14 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface
position += swprintf(&buffer[position], ARRAY_SIZE(buffer) - position, L"%s=%s", entry->name, entry->data.string);
break;
case DPNA_DATATYPE_DWORD:
position += swprintf(&buffer[position], ARRAY_SIZE(buffer) - position, L"%s=%d", entry->name, entry->data.value);
position += swprintf(&buffer[position], ARRAY_SIZE(buffer) - position, L"%s=%ld", entry->name, entry->data.value);
break;
case DPNA_DATATYPE_STRING_ANSI:
position += swprintf(&buffer[position], ARRAY_SIZE(buffer) - position, L"%s=%hs", entry->name, entry->data.ansi);
break;
case DPNA_DATATYPE_BINARY:
default:
FIXME("Unsupported type %d\n", entry->type);
FIXME("Unsupported type %ld\n", entry->type);
}
}
buffer[position] = 0;
......@@ -472,7 +472,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(IDirectPlay8Ad
struct component *entry;
int namesize;
TRACE("(%p)->(%u %p %p %p %p %p)\n", This, dwComponentID, pwszName, pdwNameLen, pvBuffer, pdwBufferSize, pdwDataType);
TRACE("(%p)->(%lu %p %p %p %p %p)\n", This, dwComponentID, pwszName, pdwNameLen, pvBuffer, pdwBufferSize, pdwDataType);
if(!pdwNameLen || !pdwBufferSize || !pdwDataType)
{
......@@ -542,7 +542,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address *
BOOL found = FALSE;
DWORD i;
TRACE("(%p, %s, %p, %u, %x)\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType);
TRACE("(%p, %s, %p, %lu, %lx)\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType);
if (NULL == lpvData)
return DPNERR_INVALIDPOINTER;
......@@ -625,24 +625,24 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address *
{
case DPNA_DATATYPE_DWORD:
entry->data.value = *(DWORD*)lpvData;
TRACE("(%p, %u): DWORD Type -> %u\n", lpvData, dwDataSize, *(const DWORD*) lpvData);
TRACE("(%p, %lu): DWORD Type -> %lu\n", lpvData, dwDataSize, *(const DWORD*) lpvData);
break;
case DPNA_DATATYPE_GUID:
entry->data.guid = *(GUID*)lpvData;
TRACE("(%p, %u): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid(lpvData));
TRACE("(%p, %lu): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid(lpvData));
break;
case DPNA_DATATYPE_STRING:
entry->data.string = heap_strdupW((WCHAR*)lpvData);
TRACE("(%p, %u): STRING Type -> %s\n", lpvData, dwDataSize, debugstr_w((WCHAR*)lpvData));
TRACE("(%p, %lu): STRING Type -> %s\n", lpvData, dwDataSize, debugstr_w((WCHAR*)lpvData));
break;
case DPNA_DATATYPE_STRING_ANSI:
entry->data.ansi = heap_strdupA((CHAR*)lpvData);
TRACE("(%p, %u): ANSI STRING Type -> %s\n", lpvData, dwDataSize, (const CHAR*) lpvData);
TRACE("(%p, %lu): ANSI STRING Type -> %s\n", lpvData, dwDataSize, (const CHAR*) lpvData);
break;
case DPNA_DATATYPE_BINARY:
entry->data.binary = heap_alloc(dwDataSize);
memcpy(entry->data.binary, lpvData, dwDataSize);
TRACE("(%p, %u): BINARY Type\n", lpvData, dwDataSize);
TRACE("(%p, %lu): BINARY Type\n", lpvData, dwDataSize);
break;
}
......
dlls/dpnet/dpnet_main.c
View file @ ca90b902
......@@ -48,7 +48,7 @@ static BOOL WINAPI winsock_startup(INIT_ONCE *once, void *param, void **context)
if(res == ERROR_SUCCESS)
winsock_loaded = TRUE;
else
ERR("WSAStartup failed: %u\n", res);
ERR("WSAStartup failed: %lu\n", res);
return TRUE;
}
......@@ -61,7 +61,7 @@ void init_winsock(void)
/* At process attach */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved);
TRACE("%p,%lx,%p\n", hInstDLL, fdwReason, lpvReserved);
switch(fdwReason)
{
......
dlls/dpnet/lobbiedapp.c
View file @ ca90b902
......@@ -59,7 +59,7 @@ static ULONG WINAPI IDirectPlay8LobbiedApplicationImpl_AddRef(IDirectPlay8Lobbie
IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface);
ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(ref before=%u)\n", This, refCount - 1);
TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1);
return refCount;
}
......@@ -69,7 +69,7 @@ static ULONG WINAPI IDirectPlay8LobbiedApplicationImpl_Release(IDirectPlay8Lobbi
IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface);
ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(ref before=%u)\n", This, refCount + 1);
TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1);
if (!refCount) {
HeapFree(GetProcessHeap(), 0, This);
......@@ -85,7 +85,7 @@ static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Initialize(IDirectPlay8
{
IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface);
TRACE("(%p)->(%p %p %p %x)\n", This, pvUserContext, pfn, pdpnhConnection, dwFlags);
TRACE("(%p)->(%p %p %p %lx)\n", This, pvUserContext, pfn, pdpnhConnection, dwFlags);
if(!pfn)
return DPNERR_INVALIDPOINTER;
......
dlls/dpnet/threadpool.c
View file @ ca90b902
......@@ -84,7 +84,7 @@ static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_Initialize(IDirectPlay8ThreadPo
{
IDirectPlay8ThreadPoolImpl *This = impl_from_IDirectPlay8ThreadPool(iface);
TRACE("(%p)->(%p,%p,%x)\n", This, pvUserContext, pfn, dwFlags);
TRACE("(%p)->(%p,%p,%lx)\n", This, pvUserContext, pfn, dwFlags);
if(!pfn)
return DPNERR_INVALIDPARAM;
......@@ -104,7 +104,7 @@ static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_Close(IDirectPlay8ThreadPool *i
{
IDirectPlay8ThreadPoolImpl *This = impl_from_IDirectPlay8ThreadPool(iface);
FIXME("(%p)->(%x)\n", This, dwFlags);
FIXME("(%p)->(%lx)\n", This, dwFlags);
if(!threadpool_msghandler)
return DPNERR_UNINITIALIZED;
......@@ -117,7 +117,7 @@ static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_Close(IDirectPlay8ThreadPool *i
static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_GetThreadCount(IDirectPlay8ThreadPool *iface,
const DWORD dwProcessorNum, DWORD * const pdwNumThreads, const DWORD dwFlags)
{
FIXME("(%p)->(%x,%p,%x): stub\n", iface, dwProcessorNum, pdwNumThreads, dwFlags);
FIXME("(%p)->(%lx,%p,%lx): stub\n", iface, dwProcessorNum, pdwNumThreads, dwFlags);
*pdwNumThreads = 0;
return DPN_OK;
}
......@@ -125,7 +125,7 @@ static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_GetThreadCount(IDirectPlay8Thre
static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_SetThreadCount(IDirectPlay8ThreadPool *iface,
const DWORD dwProcessorNum, const DWORD dwNumThreads, const DWORD dwFlags)
{
FIXME("(%p)->(%x,%x,%x): stub\n", iface, dwProcessorNum, dwNumThreads, dwFlags);
FIXME("(%p)->(%lx,%lx,%lx): stub\n", iface, dwProcessorNum, dwNumThreads, dwFlags);
return DPN_OK;
}
......@@ -135,7 +135,7 @@ static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_DoWork(IDirectPlay8ThreadPool *
static BOOL Run = FALSE;
if(!Run)
FIXME("(%p)->(%x,%x): stub\n", iface, dwAllowedTimeSlice, dwFlags);
FIXME("(%p)->(%lx,%lx): stub\n", iface, dwAllowedTimeSlice, dwFlags);
Run = TRUE;
......
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