Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com --- dlls/dpnet/Makefile.in | 1 - dlls/dpnet/address.c | 24 ++++++------- dlls/dpnet/client.c | 64 +++++++++++++++++------------------ dlls/dpnet/dpnet_main.c | 4 +-- dlls/dpnet/lobbiedapp.c | 6 ++-- dlls/dpnet/peer.c | 74 ++++++++++++++++++++--------------------- dlls/dpnet/server.c | 68 ++++++++++++++++++------------------- dlls/dpnet/threadpool.c | 10 +++--- 8 files changed, 125 insertions(+), 126 deletions(-)
diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 15277d61b3f..541e104c64a 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dpnet.dll IMPORTLIB = dpnet IMPORTS = dxguid uuid ole32 advapi32 ws2_32 diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index d7e802f8106..dbb5f83f453 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -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; }
diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index b9f55c35b29..4af8daf6d3e 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectPlay8ClientImpl_AddRef(IDirectPlay8Client *iface) IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref);
return ref; } @@ -83,7 +83,7 @@ static ULONG WINAPI IDirectPlay8ClientImpl_Release(IDirectPlay8Client *iface) IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref);
if (!ref) { @@ -101,7 +101,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_Initialize(IDirectPlay8Client *ifac { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(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; @@ -121,11 +121,11 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_EnumServiceProviders(IDirectPlay8Cl PDWORD const pcReturned, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - TRACE("(%p)->(%s,%s,%p,%p,%p,%x)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + TRACE("(%p)->(%s,%s,%p,%p,%p,%lx)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags);
if(dwFlags) - FIXME("Unhandled flags %x\n", dwFlags); + FIXME("Unhandled flags %lx\n", dwFlags);
if(pguidApplication) FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); @@ -142,7 +142,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_EnumHosts(IDirectPlay8Client *iface { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface);
- FIXME("(%p):(%p,%p,%p,%p,%u,%u,%u,%u,%p,%p,%x)\n", This, pApplicationDesc, pAddrHost, pDeviceInfo, pUserEnumData, + FIXME("(%p):(%p,%p,%p,%p,%lu,%lu,%lu,%lu,%p,%p,%lx)\n", This, pApplicationDesc, pAddrHost, pDeviceInfo, pUserEnumData, dwUserEnumDataSize, dwEnumCount, dwRetryInterval, dwTimeOut, pvUserContext, pAsyncHandle, dwFlags);
if(!This->msghandler) @@ -161,7 +161,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_CancelAsyncOperation(IDirectPlay8Cl const DPNHANDLE hAsyncHandle, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%u,%x): Stub\n", This, hAsyncHandle, dwFlags); + FIXME("(%p):(%lu,%lx): Stub\n", This, hAsyncHandle, dwFlags); return DPN_OK; }
@@ -173,7 +173,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_Connect(IDirectPlay8Client *iface, DPNHANDLE * const phAsyncHandle, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags); return DPN_OK; }
@@ -182,7 +182,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_Send(IDirectPlay8Client *iface, void * const pvAsyncContext, DPNHANDLE * const phAsyncHandle, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p):(%p,%p,%lx): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags); return DPN_OK; }
@@ -190,7 +190,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_GetSendQueueInfo(IDirectPlay8Client DWORD * const pdwNumMsgs, DWORD * const pdwNumBytes, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); + FIXME("(%p):(%lx): Stub\n", This, dwFlags); return DPN_OK; }
@@ -198,7 +198,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_GetApplicationDesc(IDirectPlay8Clie DPN_APPLICATION_DESC * const pAppDescBuffer, DWORD * const pcbDataSize, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); + FIXME("(%p):(%lx): Stub\n", This, dwFlags); return DPN_OK; }
@@ -207,7 +207,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetClientInfo(IDirectPlay8Client *i DPNHANDLE * const phAsyncHandle, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%p,%p,%x): Semi-stub.\n", This, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p):(%p,%p,%lx): Semi-stub.\n", This, pvAsyncContext, phAsyncHandle, dwFlags);
if(!pdpnPlayerInfo) return E_POINTER; @@ -256,7 +256,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_GetServerInfo(IDirectPlay8Client *i DPN_PLAYER_INFO * const pdpnPlayerInfo, DWORD * const pdwSize, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); + FIXME("(%p):(%lx): Stub\n", This, dwFlags); return DPN_OK; }
@@ -264,14 +264,14 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_GetServerAddress(IDirectPlay8Client IDirectPlay8Address ** const pAddress, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); + FIXME("(%p):(%lx): Stub\n", This, dwFlags); return DPN_OK; }
static HRESULT WINAPI IDirectPlay8ClientImpl_Close(IDirectPlay8Client *iface, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); + FIXME("(%p):(%lx): Stub\n", This, dwFlags);
This->msghandler = NULL;
@@ -282,7 +282,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_ReturnBuffer(IDirectPlay8Client *if const DPNHANDLE hBufferHandle, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); + FIXME("(%p):(%lx): Stub\n", This, dwFlags); return DPN_OK; }
@@ -290,7 +290,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_GetCaps(IDirectPlay8Client *iface, DPN_CAPS * const pdpCaps, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); + FIXME("(%p):(%lx): Stub\n", This, dwFlags); return DPN_OK; }
@@ -298,7 +298,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetCaps(IDirectPlay8Client *iface, const DPN_CAPS * const pdpCaps, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); + FIXME("(%p):(%lx): Stub\n", This, dwFlags); return DPN_OK; }
@@ -307,7 +307,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(IDirectPlay8Client *iface { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface);
- TRACE("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + TRACE("(%p)->(%p,%p,%lx): stub\n", iface, pguidSP, pdpspCaps, dwFlags);
if(!This->msghandler || pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) return DPNERR_INVALIDPARAM; @@ -323,7 +323,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(IDirectPlay8Client *iface { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface);
- TRACE("(%p)->(%p,%p,%x)\n", This, pguidSP, pdpspCaps, dwFlags); + TRACE("(%p)->(%p,%p,%lx)\n", This, pguidSP, pdpspCaps, dwFlags);
if(!This->msghandler) return DPNERR_UNINITIALIZED; @@ -342,7 +342,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_GetConnectionInfo(IDirectPlay8Clien DPN_CONNECTION_INFO * const pdpConnectionInfo, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); + FIXME("(%p):(%lx): Stub\n", This, dwFlags); return DPN_OK; }
@@ -351,7 +351,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_RegisterLobby(IDirectPlay8Client *i struct IDirectPlay8LobbiedApplication * const pIDP8LobbiedApplication, const DWORD dwFlags) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); + FIXME("(%p):(%lx): Stub\n", This, dwFlags); return DPN_OK; }
@@ -434,7 +434,7 @@ static ULONG WINAPI lobbyclient_AddRef(IDirectPlay8LobbyClient *iface) IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref);
return ref; } @@ -444,7 +444,7 @@ static ULONG WINAPI lobbyclient_Release(IDirectPlay8LobbyClient *iface) IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref);
if (!ref) { @@ -459,7 +459,7 @@ static HRESULT WINAPI lobbyclient_Initialize(IDirectPlay8LobbyClient *iface, voi { IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface);
- TRACE("(%p):(%p,%p,%x)\n", This, context, msghandler, flags); + TRACE("(%p):(%p,%p,%lx)\n", This, context, msghandler, flags);
if(!msghandler) return E_POINTER; @@ -478,7 +478,7 @@ static HRESULT WINAPI lobbyclient_EnumLocalPrograms(IDirectPlay8LobbyClient *ifa { IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface);
- FIXME("(%p)->(%p %p %p %p 0x%08x)\n", This, guidapplication, enumdata, enumDataSize, items, flags); + FIXME("(%p)->(%p %p %p %p 0x%08lx)\n", This, guidapplication, enumdata, enumDataSize, items, flags);
if(enumDataSize) *enumDataSize = 0; @@ -492,7 +492,7 @@ static HRESULT WINAPI lobbyclient_ConnectApplication(IDirectPlay8LobbyClient *if { IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface);
- FIXME("(%p)->(%p %p %p %u 0x%08x)\n", This, connectioninfo, connectioncontext, application, timeout, flags); + FIXME("(%p)->(%p %p %p %lu 0x%08lx)\n", This, connectioninfo, connectioncontext, application, timeout, flags);
return E_NOTIMPL; } @@ -501,7 +501,7 @@ static HRESULT WINAPI lobbyclient_Send(IDirectPlay8LobbyClient *iface, DPNHANDLE { IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface);
- FIXME("(%p)->(%u %p %u 0x%08x)\n", This, connection, buffer, buffersize, flags); + FIXME("(%p)->(%lu %p %lu 0x%08lx)\n", This, connection, buffer, buffersize, flags);
return E_NOTIMPL; } @@ -510,7 +510,7 @@ static HRESULT WINAPI lobbyclient_ReleaseApplication(IDirectPlay8LobbyClient *if { IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface);
- FIXME("(%p)->(%u 0x%08x)\n", This, connection, flags); + FIXME("(%p)->(%lu 0x%08lx)\n", This, connection, flags);
return E_NOTIMPL; } @@ -519,7 +519,7 @@ static HRESULT WINAPI lobbyclient_Close(IDirectPlay8LobbyClient *iface, DWORD fl { IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface);
- FIXME("(%p)->(0x%08x)\n", This, flags); + FIXME("(%p)->(0x%08lx)\n", This, flags);
return E_NOTIMPL; } @@ -528,7 +528,7 @@ static HRESULT WINAPI lobbyclient_GetConnectionSettings(IDirectPlay8LobbyClient { IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface);
- FIXME("(%p)->(%u %p %p 0x%08x)\n", This, connection, sessioninfo, infosize, flags); + FIXME("(%p)->(%lu %p %p 0x%08lx)\n", This, connection, sessioninfo, infosize, flags);
return E_NOTIMPL; } @@ -537,7 +537,7 @@ static HRESULT WINAPI lobbyclient_SetConnectionSettings(IDirectPlay8LobbyClient { IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface);
- FIXME("(%p)->(%u %p 0x%08x)\n", This, connection, sessioninfo, flags); + FIXME("(%p)->(%lu %p 0x%08lx)\n", This, connection, sessioninfo, flags);
return E_NOTIMPL; } diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 1ba3d20f6e5..6776e13b524 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -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) { diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index 71beb2de2cf..bbc7c55639c 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -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; diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index bd143e83176..bbcda6a72c2 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -78,7 +78,7 @@ static ULONG WINAPI IDirectPlay8PeerImpl_AddRef(IDirectPlay8Peer *iface) IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); ULONG RefCount = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, RefCount); + TRACE("(%p) ref=%ld\n", This, RefCount);
return RefCount; } @@ -88,7 +88,7 @@ static ULONG WINAPI IDirectPlay8PeerImpl_Release(IDirectPlay8Peer *iface) IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); ULONG RefCount = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, RefCount); + TRACE("(%p) ref=%ld\n", This, RefCount);
if(!RefCount) { @@ -108,7 +108,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, { IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface);
- TRACE("(%p)->(%p,%p,%x): stub\n", iface, pvUserContext, pfn, dwFlags); + TRACE("(%p)->(%p,%p,%lx): stub\n", iface, pvUserContext, pfn, dwFlags);
if(!pfn) return DPNERR_INVALIDPARAM; @@ -228,11 +228,11 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, DWORD * const pcbEnumData, DWORD * const pcReturned, const DWORD dwFlags) { - TRACE("(%p)->(%s,%s,%p,%p,%p,%x)\n", iface, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + TRACE("(%p)->(%s,%s,%p,%p,%p,%lx)\n", iface, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags);
if(dwFlags) - FIXME("Unhandled flags %x\n", dwFlags); + FIXME("Unhandled flags %lx\n", dwFlags);
if(pguidApplication) FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); @@ -243,7 +243,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer static HRESULT WINAPI IDirectPlay8PeerImpl_CancelAsyncOperation(IDirectPlay8Peer *iface, const DPNHANDLE hAsyncHandle, const DWORD dwFlags) { - FIXME("(%p)->(%x,%x): stub\n", iface, hAsyncHandle, dwFlags); + FIXME("(%p)->(%lx,%lx): stub\n", iface, hAsyncHandle, dwFlags);
return DPNERR_GENERIC; } @@ -255,7 +255,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Connect(IDirectPlay8Peer *iface, const DWORD dwUserConnectDataSize, void * const pvPlayerContext, void * const pvAsyncContext, DPNHANDLE * const phAsyncHandle, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%p,%p,%p,%p,%x,%p,%p,%p,%x): stub\n", iface, pdnAppDesc, pHostAddr, pDeviceInfo, pdnSecurity, pdnCredentials, pvUserConnectData, dwUserConnectDataSize, pvPlayerContext, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%p,%p,%p,%p,%p,%p,%lx,%p,%p,%p,%lx): stub\n", iface, pdnAppDesc, pHostAddr, pDeviceInfo, pdnSecurity, pdnCredentials, pvUserConnectData, dwUserConnectDataSize, pvPlayerContext, pvAsyncContext, phAsyncHandle, dwFlags);
return DPNERR_GENERIC; } @@ -264,7 +264,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SendTo(IDirectPlay8Peer *iface, const const DPN_BUFFER_DESC *pBufferDesc, const DWORD cBufferDesc, const DWORD dwTimeOut, void * const pvAsyncContext, DPNHANDLE * const phAsyncHandle, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%x,%x,%p,%p,%x): stub\n", iface, dpnId, pBufferDesc, cBufferDesc, dwTimeOut, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%lx,%p,%lx,%lx,%p,%p,%lx): stub\n", iface, dpnId, pBufferDesc, cBufferDesc, dwTimeOut, pvAsyncContext, phAsyncHandle, dwFlags);
return DPNERR_GENERIC; } @@ -272,7 +272,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SendTo(IDirectPlay8Peer *iface, const static HRESULT WINAPI IDirectPlay8PeerImpl_GetSendQueueInfo(IDirectPlay8Peer *iface, const DPNID dpnid, DWORD * const pdwNumMsgs, DWORD * const pdwNumBytes, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%p,%x): stub\n", iface, dpnid, pdwNumMsgs, pdwNumBytes, dwFlags); + FIXME("(%p)->(%lx,%p,%p,%lx): stub\n", iface, dpnid, pdwNumMsgs, pdwNumBytes, dwFlags);
return DPNERR_GENERIC; } @@ -283,7 +283,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Host(IDirectPlay8Peer *iface, const DPN_SECURITY_CREDENTIALS * const pdpCredentials, void * const pvPlayerContext, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%x,%p,%p,%p,%x): stub\n", iface, pdnAppDesc, prgpDeviceInfo, cDeviceInfo, pdpSecurity, pdpCredentials, pvPlayerContext, dwFlags); + FIXME("(%p)->(%p,%p,%lx,%p,%p,%p,%lx): stub\n", iface, pdnAppDesc, prgpDeviceInfo, cDeviceInfo, pdpSecurity, pdpCredentials, pvPlayerContext, dwFlags);
return DPNERR_GENERIC; } @@ -291,7 +291,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Host(IDirectPlay8Peer *iface, static HRESULT WINAPI IDirectPlay8PeerImpl_GetApplicationDesc(IDirectPlay8Peer *iface, DPN_APPLICATION_DESC * const pAppDescBuffer, DWORD * const pcbDataSize, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%x): stub\n", iface, pAppDescBuffer, pcbDataSize, dwFlags); + FIXME("(%p)->(%p,%p,%lx): stub\n", iface, pAppDescBuffer, pcbDataSize, dwFlags);
return DPNERR_GENERIC; } @@ -299,7 +299,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetApplicationDesc(IDirectPlay8Peer * static HRESULT WINAPI IDirectPlay8PeerImpl_SetApplicationDesc(IDirectPlay8Peer *iface, const DPN_APPLICATION_DESC * const pad, const DWORD dwFlags) { - FIXME("(%p)->(%p,%x): stub\n", iface, pad, dwFlags); + FIXME("(%p)->(%p,%lx): stub\n", iface, pad, dwFlags);
return DPNERR_GENERIC; } @@ -308,7 +308,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_CreateGroup(IDirectPlay8Peer *iface, const DPN_GROUP_INFO * const pdpnGroupInfo, void * const pvGroupContext, void * const pvAsyncContext, DPNHANDLE * const phAsyncHandle, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%p,%p,%x): stub\n", iface, pdpnGroupInfo, pvGroupContext, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%p,%p,%p,%p,%lx): stub\n", iface, pdpnGroupInfo, pvGroupContext, pvAsyncContext, phAsyncHandle, dwFlags);
return DPNERR_GENERIC; } @@ -317,7 +317,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_DestroyGroup(IDirectPlay8Peer *iface, const DPNID idGroup, void * const pvAsyncContext, DPNHANDLE * const phAsyncHandle, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%p,%x): stub\n", iface, idGroup, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%lx,%p,%p,%lx): stub\n", iface, idGroup, pvAsyncContext, phAsyncHandle, dwFlags);
return DPNERR_GENERIC; } @@ -326,7 +326,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_AddPlayerToGroup(IDirectPlay8Peer *if const DPNID idGroup, const DPNID idClient, void * const pvAsyncContext, DPNHANDLE * const phAsyncHandle, const DWORD dwFlags) { - FIXME("(%p)->(%x,%x,%p,%p,%x): stub\n", iface, idGroup, idClient, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%lx,%lx,%p,%p,%lx): stub\n", iface, idGroup, idClient, pvAsyncContext, phAsyncHandle, dwFlags);
return DPNERR_GENERIC; } @@ -335,7 +335,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_RemovePlayerFromGroup(IDirectPlay8Pee const DPNID idGroup, const DPNID idClient, void * const pvAsyncContext, DPNHANDLE * const phAsyncHandle, const DWORD dwFlags) { - FIXME("(%p)->(%x,%x,%p,%p,%x): stub\n", iface, idGroup, idClient, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%lx,%lx,%p,%p,%lx): stub\n", iface, idGroup, idClient, pvAsyncContext, phAsyncHandle, dwFlags);
return DPNERR_GENERIC; } @@ -344,7 +344,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetGroupInfo(IDirectPlay8Peer *iface, DPN_GROUP_INFO * const pdpnGroupInfo, void * const pvAsyncContext, DPNHANDLE * const phAsyncHandle, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%p,%p,%x): stub\n", iface, dpnid, pdpnGroupInfo, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%lx,%p,%p,%p,%lx): stub\n", iface, dpnid, pdpnGroupInfo, pvAsyncContext, phAsyncHandle, dwFlags);
return DPNERR_GENERIC; } @@ -352,7 +352,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetGroupInfo(IDirectPlay8Peer *iface, static HRESULT WINAPI IDirectPlay8PeerImpl_GetGroupInfo(IDirectPlay8Peer *iface, const DPNID dpnid, DPN_GROUP_INFO * const pdpnGroupInfo, DWORD * const pdwSize, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%p,%x): stub\n", iface, dpnid, pdpnGroupInfo, pdwSize, dwFlags); + FIXME("(%p)->(%lx,%p,%p,%lx): stub\n", iface, dpnid, pdpnGroupInfo, pdwSize, dwFlags);
return DPNERR_GENERIC; } @@ -360,7 +360,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetGroupInfo(IDirectPlay8Peer *iface, static HRESULT WINAPI IDirectPlay8PeerImpl_EnumPlayersAndGroups(IDirectPlay8Peer *iface, DPNID * const prgdpnid, DWORD * const pcdpnid, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%x): stub\n", iface, prgdpnid, pcdpnid, dwFlags); + FIXME("(%p)->(%p,%p,%lx): stub\n", iface, prgdpnid, pcdpnid, dwFlags);
return DPNERR_GENERIC; } @@ -368,7 +368,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_EnumPlayersAndGroups(IDirectPlay8Peer static HRESULT WINAPI IDirectPlay8PeerImpl_EnumGroupMembers(IDirectPlay8Peer *iface, const DPNID dpnid, DPNID * const prgdpnid, DWORD * const pcdpnid, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%p,%x): stub\n", iface, dpnid, prgdpnid, pcdpnid, dwFlags); + FIXME("(%p)->(%lx,%p,%p,%lx): stub\n", iface, dpnid, prgdpnid, pcdpnid, dwFlags);
return DPNERR_GENERIC; } @@ -379,7 +379,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetPeerInfo(IDirectPlay8Peer *iface, { IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface);
- FIXME("(%p)->(%p,%p,%p,%x) Semi-stub.\n", This, pdpnPlayerInfo, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%p,%p,%p,%lx) Semi-stub.\n", This, pdpnPlayerInfo, pvAsyncContext, phAsyncHandle, dwFlags);
if(!pdpnPlayerInfo) return E_POINTER; @@ -418,7 +418,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetPeerInfo(IDirectPlay8Peer *iface, static HRESULT WINAPI IDirectPlay8PeerImpl_GetPeerInfo(IDirectPlay8Peer *iface, const DPNID dpnid, DPN_PLAYER_INFO * const pdpnPlayerInfo, DWORD * const pdwSize, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%p,%x): stub\n", iface, dpnid, pdpnPlayerInfo, pdwSize, dwFlags); + FIXME("(%p)->(%lx,%p,%p,%lx): stub\n", iface, dpnid, pdpnPlayerInfo, pdwSize, dwFlags);
return DPNERR_GENERIC; } @@ -426,7 +426,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetPeerInfo(IDirectPlay8Peer *iface, static HRESULT WINAPI IDirectPlay8PeerImpl_GetPeerAddress(IDirectPlay8Peer *iface, const DPNID dpnid, IDirectPlay8Address ** const pAddress, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%x): stub\n", iface, dpnid, pAddress, dwFlags); + FIXME("(%p)->(%lx,%p,%lx): stub\n", iface, dpnid, pAddress, dwFlags);
return DPNERR_GENERIC; } @@ -434,14 +434,14 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetPeerAddress(IDirectPlay8Peer *ifac static HRESULT WINAPI IDirectPlay8PeerImpl_GetLocalHostAddresses(IDirectPlay8Peer *iface, IDirectPlay8Address ** const prgpAddress, DWORD * const pcAddress, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%x): stub\n", iface, prgpAddress, pcAddress, dwFlags); + FIXME("(%p)->(%p,%p,%lx): stub\n", iface, prgpAddress, pcAddress, dwFlags);
return DPNERR_GENERIC; }
static HRESULT WINAPI IDirectPlay8PeerImpl_Close(IDirectPlay8Peer *iface, const DWORD dwFlags) { - FIXME("(%p)->(%x): stub\n", iface, dwFlags); + FIXME("(%p)->(%lx): stub\n", iface, dwFlags);
return DPN_OK; } @@ -454,7 +454,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_EnumHosts(IDirectPlay8Peer *iface, { IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface);
- FIXME("(%p)->(%p,%p,%p,%p,%x,%x,%x,%x,%p,%p,%x): stub\n", + FIXME("(%p)->(%p,%p,%p,%p,%lx,%lx,%lx,%lx,%p,%p,%lx): stub\n", This, pApplicationDesc, pAddrHost, pDeviceInfo, pUserEnumData, dwUserEnumDataSize, dwEnumCount, dwRetryInterval, dwTimeOut, pvUserContext, pAsyncHandle, dwFlags);
@@ -473,7 +473,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_EnumHosts(IDirectPlay8Peer *iface, static HRESULT WINAPI IDirectPlay8PeerImpl_DestroyPeer(IDirectPlay8Peer *iface, const DPNID dpnidClient, const void * const pvDestroyData, const DWORD dwDestroyDataSize, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%x,%x): stub\n", iface, dpnidClient, pvDestroyData, dwDestroyDataSize, dwFlags); + FIXME("(%p)->(%lx,%p,%lx,%lx): stub\n", iface, dpnidClient, pvDestroyData, dwDestroyDataSize, dwFlags);
return DPNERR_GENERIC; } @@ -481,7 +481,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_DestroyPeer(IDirectPlay8Peer *iface, static HRESULT WINAPI IDirectPlay8PeerImpl_ReturnBuffer(IDirectPlay8Peer *iface, const DPNHANDLE hBufferHandle, const DWORD dwFlags) { - FIXME("(%p)->(%x,%x): stub\n", iface, hBufferHandle, dwFlags); + FIXME("(%p)->(%lx,%lx): stub\n", iface, hBufferHandle, dwFlags);
return DPNERR_GENERIC; } @@ -489,7 +489,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_ReturnBuffer(IDirectPlay8Peer *iface, static HRESULT WINAPI IDirectPlay8PeerImpl_GetPlayerContext(IDirectPlay8Peer *iface, const DPNID dpnid, void ** const ppvPlayerContext, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%x): stub\n", iface, dpnid, ppvPlayerContext, dwFlags); + FIXME("(%p)->(%lx,%p,%lx): stub\n", iface, dpnid, ppvPlayerContext, dwFlags);
return DPNERR_GENERIC; } @@ -497,7 +497,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetPlayerContext(IDirectPlay8Peer *if static HRESULT WINAPI IDirectPlay8PeerImpl_GetGroupContext(IDirectPlay8Peer *iface, const DPNID dpnid, void ** const ppvGroupContext, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%x): stub\n", iface, dpnid, ppvGroupContext, dwFlags); + FIXME("(%p)->(%lx,%p,%lx): stub\n", iface, dpnid, ppvGroupContext, dwFlags);
return DPNERR_GENERIC; } @@ -505,7 +505,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetGroupContext(IDirectPlay8Peer *ifa static HRESULT WINAPI IDirectPlay8PeerImpl_GetCaps(IDirectPlay8Peer *iface, DPN_CAPS * const pdpCaps, const DWORD dwFlags) { - FIXME("(%p)->(%p,%x): stub\n", iface, pdpCaps, dwFlags); + FIXME("(%p)->(%p,%lx): stub\n", iface, pdpCaps, dwFlags);
return DPNERR_GENERIC; } @@ -513,7 +513,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetCaps(IDirectPlay8Peer *iface, DPN_ static HRESULT WINAPI IDirectPlay8PeerImpl_SetCaps(IDirectPlay8Peer *iface, const DPN_CAPS * const pdpCaps, const DWORD dwFlags) { - FIXME("(%p)->(%p,%x): stub\n", iface, pdpCaps, dwFlags); + FIXME("(%p)->(%p,%lx): stub\n", iface, pdpCaps, dwFlags);
return DPNERR_GENERIC; } @@ -523,7 +523,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetSPCaps(IDirectPlay8Peer *iface, co { IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface);
- TRACE("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + TRACE("(%p)->(%p,%p,%lx): stub\n", iface, pguidSP, pdpspCaps, dwFlags);
if(!This->msghandler || pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) return DPNERR_INVALIDPARAM; @@ -539,7 +539,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, co { IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface);
- TRACE("(%p)->(%p,%p,%x)\n", This, pguidSP, pdpspCaps, dwFlags); + TRACE("(%p)->(%p,%p,%lx)\n", This, pguidSP, pdpspCaps, dwFlags);
if(!This->msghandler) return DPNERR_UNINITIALIZED; @@ -557,7 +557,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, co static HRESULT WINAPI IDirectPlay8PeerImpl_GetConnectionInfo(IDirectPlay8Peer *iface, const DPNID dpnid, DPN_CONNECTION_INFO * const pdpConnectionInfo, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%x): stub\n", iface, dpnid, pdpConnectionInfo, dwFlags); + FIXME("(%p)->(%lx,%p,%lx): stub\n", iface, dpnid, pdpConnectionInfo, dwFlags);
return DPNERR_GENERIC; } @@ -565,7 +565,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_GetConnectionInfo(IDirectPlay8Peer *i static HRESULT WINAPI IDirectPlay8PeerImpl_RegisterLobby(IDirectPlay8Peer *iface, const DPNHANDLE dpnHandle, struct IDirectPlay8LobbiedApplication * const pIDP8LobbiedApplication, const DWORD dwFlags) { - FIXME("(%p)->(%x,%p,%x): stub\n", iface, dpnHandle, pIDP8LobbiedApplication, dwFlags); + FIXME("(%p)->(%lx,%p,%lx): stub\n", iface, dpnHandle, pIDP8LobbiedApplication, dwFlags);
return DPNERR_GENERIC; } @@ -573,7 +573,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_RegisterLobby(IDirectPlay8Peer *iface static HRESULT WINAPI IDirectPlay8PeerImpl_TerminateSession(IDirectPlay8Peer *iface, void * const pvTerminateData, const DWORD dwTerminateDataSize, const DWORD dwFlags) { - FIXME("(%p)->(%p,%x,%x): stub\n", iface, pvTerminateData, dwTerminateDataSize, dwFlags); + FIXME("(%p)->(%p,%lx,%lx): stub\n", iface, pvTerminateData, dwTerminateDataSize, dwFlags);
return DPNERR_GENERIC; } diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 26dd76388b1..8a8ed04642d 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -81,7 +81,7 @@ static ULONG WINAPI IDirectPlay8ServerImpl_AddRef(IDirectPlay8Server *iface) IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -91,7 +91,7 @@ static ULONG WINAPI IDirectPlay8ServerImpl_Release(IDirectPlay8Server *iface) IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { @@ -107,7 +107,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_Initialize(IDirectPlay8Server *ifac PFNDPNMESSAGEHANDLER pfn, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - TRACE("(%p)->(%p %p %d)\n", This, pvUserContext, pfn, dwFlags); + TRACE("(%p)->(%p %p %ld)\n", This, pvUserContext, pfn, dwFlags);
if(!pfn) return DPNERR_INVALIDPARAM; @@ -126,14 +126,14 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_EnumServiceProviders(IDirectPlay8Se PDWORD pcReturned, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - TRACE("(%p)->(%s %s %p %p %p %d)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + TRACE("(%p)->(%s %s %p %p %p %ld)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags);
if(!This->msghandler) return DPNERR_UNINITIALIZED;
if(dwFlags) - FIXME("Unhandled flags %x\n", dwFlags); + FIXME("Unhandled flags %lx\n", dwFlags);
if(pguidApplication) FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); @@ -144,7 +144,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_EnumServiceProviders(IDirectPlay8Se static HRESULT WINAPI IDirectPlay8ServerImpl_CancelAsyncOperation(IDirectPlay8Server *iface, DPNHANDLE hAsyncHandle, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %d)\n", This, hAsyncHandle, dwFlags); + FIXME("(%p)->(%ld %ld)\n", This, hAsyncHandle, dwFlags); return E_NOTIMPL; }
@@ -152,7 +152,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_GetSendQueueInfo(IDirectPlay8Server DWORD *pdwNumBytes, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %p %d)\n", This, dpnid, pdwNumMsgs, pdwNumBytes, dwFlags); + FIXME("(%p)->(%ld %p %p %ld)\n", This, dpnid, pdwNumMsgs, pdwNumBytes, dwFlags); return E_NOTIMPL; }
@@ -160,7 +160,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_GetApplicationDesc(IDirectPlay8Serv DWORD *pcbDataSize, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %p %d)\n", This, pAppDescBuffer, pcbDataSize, dwFlags); + FIXME("(%p)->(%p %p %ld)\n", This, pAppDescBuffer, pcbDataSize, dwFlags); return E_NOTIMPL; }
@@ -169,7 +169,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface);
- FIXME("(%p)->(%p %p %p %x) Semi-stub\n", This, pdpnPlayerInfo, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%p %p %p %lx) Semi-stub\n", This, pdpnPlayerInfo, pvAsyncContext, phAsyncHandle, dwFlags);
if(!pdpnPlayerInfo) return E_POINTER; @@ -222,7 +222,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_GetClientInfo(IDirectPlay8Server *i DWORD *pdwSize, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %p %d)\n", This, dpnid, pdpnPlayerInfo, pdwSize, dwFlags); + FIXME("(%p)->(%ld %p %p %ld)\n", This, dpnid, pdpnPlayerInfo, pdwSize, dwFlags); return E_NOTIMPL; }
@@ -230,7 +230,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_GetClientAddress(IDirectPlay8Server DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %d)\n", This, dpnid, pAddress, dwFlags); + FIXME("(%p)->(%ld %p %ld)\n", This, dpnid, pAddress, dwFlags); return E_NOTIMPL; }
@@ -238,14 +238,14 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_GetLocalHostAddresses(IDirectPlay8S DWORD *pcAddress, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %p %d)\n", This, prgpAddress, pcAddress, dwFlags); + FIXME("(%p)->(%p %p %ld)\n", This, prgpAddress, pcAddress, dwFlags); return E_NOTIMPL; }
static HRESULT WINAPI IDirectPlay8ServerImpl_SetApplicationDesc(IDirectPlay8Server *iface, const DPN_APPLICATION_DESC *pad, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %d)\n", This, pad, dwFlags); + FIXME("(%p)->(%p %ld)\n", This, pad, dwFlags); return E_NOTIMPL; }
@@ -254,7 +254,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_Host(IDirectPlay8Server *iface, con const DPN_SECURITY_CREDENTIALS *pdnCredentials, void *pvPlayerContext, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %p %d %p %p %p %d)\n", This, pdnAppDesc, prgpDeviceInfo, cDeviceInfo, pdnSecurity, pdnCredentials, + FIXME("(%p)->(%p %p %ld %p %p %p %ld)\n", This, pdnAppDesc, prgpDeviceInfo, cDeviceInfo, pdnSecurity, pdnCredentials, pvPlayerContext, dwFlags); return E_NOTIMPL; } @@ -263,7 +263,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SendTo(IDirectPlay8Server *iface, D DWORD cBufferDesc, DWORD dwTimeOut, void *pvAsyncContext, DPNHANDLE *phAsyncHandle, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %d %d %p %p %d)\n", This, dpnid, prgBufferDesc, cBufferDesc, dwTimeOut, pvAsyncContext, phAsyncHandle, + FIXME("(%p)->(%ld %p %ld %ld %p %p %ld)\n", This, dpnid, prgBufferDesc, cBufferDesc, dwTimeOut, pvAsyncContext, phAsyncHandle, dwFlags); return E_NOTIMPL; } @@ -272,7 +272,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_CreateGroup(IDirectPlay8Server *ifa void *pvGroupContext, void *pvAsyncContext, DPNHANDLE *phAsyncHandle, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %p %p %p %d)\n", This, pdpnGroupInfo, pvGroupContext, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%p %p %p %p %ld)\n", This, pdpnGroupInfo, pvGroupContext, pvAsyncContext, phAsyncHandle, dwFlags); return E_NOTIMPL; }
@@ -280,7 +280,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_DestroyGroup(IDirectPlay8Server *if DPNHANDLE *phAsyncHandle, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %p %d)\n", This, idGroup, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%ld %p %p %ld)\n", This, idGroup, pvAsyncContext, phAsyncHandle, dwFlags); return E_NOTIMPL; }
@@ -288,7 +288,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_AddPlayerToGroup(IDirectPlay8Server PVOID pvAsyncContext, DPNHANDLE *phAsyncHandle, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %d %p %p %d)\n", This, idGroup, idClient, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%ld %ld %p %p %ld)\n", This, idGroup, idClient, pvAsyncContext, phAsyncHandle, dwFlags); return E_NOTIMPL; }
@@ -296,7 +296,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_RemovePlayerFromGroup(IDirectPlay8S PVOID pvAsyncContext, DPNHANDLE *phAsyncHandle, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %d %p %p %d)\n", This, idGroup, idClient, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%ld %ld %p %p %ld)\n", This, idGroup, idClient, pvAsyncContext, phAsyncHandle, dwFlags); return E_NOTIMPL; }
@@ -304,7 +304,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetGroupInfo(IDirectPlay8Server *if PVOID pvAsyncContext, DPNHANDLE *phAsyncHandle, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %p %p %d)\n", This, dpnid, pdpnGroupInfo, pvAsyncContext, phAsyncHandle, dwFlags); + FIXME("(%p)->(%ld %p %p %p %ld)\n", This, dpnid, pdpnGroupInfo, pvAsyncContext, phAsyncHandle, dwFlags); return E_NOTIMPL; }
@@ -312,28 +312,28 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_GetGroupInfo(IDirectPlay8Server *if DWORD *pdwSize, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %p %d)\n", This, dpnid, pdpnGroupInfo, pdwSize, dwFlags); + FIXME("(%p)->(%ld %p %p %ld)\n", This, dpnid, pdpnGroupInfo, pdwSize, dwFlags); return E_NOTIMPL; }
static HRESULT WINAPI IDirectPlay8ServerImpl_EnumPlayersAndGroups(IDirectPlay8Server *iface, DPNID *prgdpnid, DWORD *pcdpnid, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %p %d)\n", This, prgdpnid, pcdpnid, dwFlags); + FIXME("(%p)->(%p %p %ld)\n", This, prgdpnid, pcdpnid, dwFlags); return E_NOTIMPL; }
static HRESULT WINAPI IDirectPlay8ServerImpl_EnumGroupMembers(IDirectPlay8Server *iface, DPNID dpnid, DPNID *prgdpnid, DWORD *pcdpnid, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %p %d)\n", This, dpnid, prgdpnid, pcdpnid, dwFlags); + FIXME("(%p)->(%ld %p %p %ld)\n", This, dpnid, prgdpnid, pcdpnid, dwFlags); return E_NOTIMPL; }
static HRESULT WINAPI IDirectPlay8ServerImpl_Close(IDirectPlay8Server *iface, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d)\n", This, dwFlags); + FIXME("(%p)->(%ld)\n", This, dwFlags); return E_NOTIMPL; }
@@ -341,56 +341,56 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_DestroyClient(IDirectPlay8Server *i DWORD dwDestroyDataSize, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %d %d)\n", This, dpnidClient, pvDestroyData, dwDestroyDataSize, dwFlags); + FIXME("(%p)->(%ld %p %ld %ld)\n", This, dpnidClient, pvDestroyData, dwDestroyDataSize, dwFlags); return E_NOTIMPL; }
static HRESULT WINAPI IDirectPlay8ServerImpl_ReturnBuffer(IDirectPlay8Server *iface, DPNHANDLE hBufferHandle, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %d)\n", This, hBufferHandle, dwFlags); + FIXME("(%p)->(%ld %ld)\n", This, hBufferHandle, dwFlags); return E_NOTIMPL; }
static HRESULT WINAPI IDirectPlay8ServerImpl_GetPlayerContext(IDirectPlay8Server *iface, DPNID dpnid, PVOID *ppvPlayerContext, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %d)\n", This, dpnid, ppvPlayerContext, dwFlags); + FIXME("(%p)->(%ld %p %ld)\n", This, dpnid, ppvPlayerContext, dwFlags); return E_NOTIMPL; }
static HRESULT WINAPI IDirectPlay8ServerImpl_GetGroupContext(IDirectPlay8Server *iface, DPNID dpnid, PVOID *ppvGroupContext, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %d)\n", This, dpnid, ppvGroupContext, dwFlags); + FIXME("(%p)->(%ld %p %ld)\n", This, dpnid, ppvGroupContext, dwFlags); return E_NOTIMPL; }
static HRESULT WINAPI IDirectPlay8ServerImpl_GetCaps(IDirectPlay8Server *iface, DPN_CAPS *pdpCaps, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %d)\n", This, pdpCaps, dwFlags); + FIXME("(%p)->(%p %ld)\n", This, pdpCaps, dwFlags); return E_NOTIMPL; }
static HRESULT WINAPI IDirectPlay8ServerImpl_SetCaps(IDirectPlay8Server *iface, const DPN_CAPS *pdpCaps, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %d)\n", This, pdpCaps, dwFlags); + FIXME("(%p)->(%p %ld)\n", This, pdpCaps, dwFlags); return E_NOTIMPL; }
static HRESULT WINAPI IDirectPlay8ServerImpl_SetSPCaps(IDirectPlay8Server *iface, const GUID *pguidSP, const DPN_SP_CAPS *pdpspCaps, DWORD dwFlags ) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %p %d)\n", This, pguidSP, pdpspCaps, dwFlags); + FIXME("(%p)->(%p %p %ld)\n", This, pguidSP, pdpspCaps, dwFlags); return E_NOTIMPL; }
static HRESULT WINAPI IDirectPlay8ServerImpl_GetSPCaps(IDirectPlay8Server *iface, const GUID *pguidSP, DPN_SP_CAPS *pdpspCaps, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %p %d)\n", This, pguidSP, pdpspCaps, dwFlags); + FIXME("(%p)->(%p %p %ld)\n", This, pguidSP, pdpspCaps, dwFlags); return E_NOTIMPL; }
@@ -398,7 +398,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_GetConnectionInfo(IDirectPlay8Serve DPN_CONNECTION_INFO *pdpConnectionInfo, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %d)\n", This, dpnid, pdpConnectionInfo, dwFlags); + FIXME("(%p)->(%ld %p %ld)\n", This, dpnid, pdpConnectionInfo, dwFlags); return E_NOTIMPL; }
@@ -406,7 +406,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_RegisterLobby(IDirectPlay8Server *i struct IDirectPlay8LobbiedApplication *pIDP8LobbiedApplication, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%d %p %d)\n", This, dpnHandle, pIDP8LobbiedApplication, dwFlags); + FIXME("(%p)->(%ld %p %ld)\n", This, dpnHandle, pIDP8LobbiedApplication, dwFlags); return E_NOTIMPL; }
diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 37dda49e84d..5e081f3fd2e 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -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;