- Wine-Devel - list.winehq.org

[PATCH resend] adsldp: Fix memory leak on error path in search_ExecuteSearch (Coverity)
by Alex Henrie Feb. 2, 2022

Feb. 2, 2022

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/adsldp/adsldp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 8039065eff3..f564bc6f6cc 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1302,7 +1302,11 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props = NULL; else { - if (count && !names) return E_ADS_BAD_PARAMETER; + if (count && !names) + { + heap_free(ldap_ctx); + return E_ADS_BAD_PARAMETER; + } props = heap_alloc((count + 1) * sizeof(props[0])); if (!props) -- 2.35.1

2 10

[PATCH] evr/mixer: Remove incorrect trace.
by Nikolay Sivov Feb. 2, 2022

Feb. 2, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- It was added by mistake. dlls/evr/mixer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 89215b4dec0..0b957e7b6bd 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -957,8 +957,6 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &mixer->output.rt_formats[i].device, &video_desc, rt_format, MAX_MIXER_INPUT_SUBSTREAMS, &mixer->processor))) { - ERR("picked dxva device %s\n", debugstr_guid(&mixer->output.rt_formats[i].device)); - if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&mixer->aperture, sizeof(mixer->aperture), NULL))) { -- 2.34.1

1 0

[PATCH] dpnet: Fix long types warnings.
by Alistair Leslie-Hughes Feb. 2, 2022

Feb. 2, 2022

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)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; -- 2.34.1

1 0

[PATCH 00/14] Migration to long types
by Eric Pouech Feb. 2, 2022

Feb. 2, 2022

The first two patches are not per se migration patches. The first one adds -Wformat warnings for Wine's stdio APIs (printf & scanf families), while the second fixes HandleToU?Long to return long. The rest of the patches fixes int/long mismatch across some modules. A+ --- Eric Pouech (14): include/msvcrt: add attribute((format)) to printf and scanf -like APIs include/basestd.h: define HandleToU?Long return a long (as SDK does) programs/winedbg: use correct integral type dlls/dbgeng: use correct integral type dlls/devenum: use correct integral type dlls/dsound: use correct integral type dlls/dwrite: use correct integral type dlls/evr: use correct integral type dlls/gdi32: use correct integral type dlls/gdiplus: use correct integral type dlls/itss: use correct integral type dlls/joy.cpl: use correct integral type dlls/msxml3: use correct integral type dlls/ntdll: use correct integral type dlls/compobj.dll16/compobj.c | 2 +- dlls/crypt32/sip.c | 2 +- dlls/dbgeng/dbgeng.c | 5 +- dlls/devenum/mediacatenum.c | 3 +- dlls/dsound/mixer.c | 3 +- dlls/dwrite/font.c | 2 +- dlls/dwrite/main.c | 3 +- dlls/dwrite/opentype.c | 5 +- dlls/dwrite/shape.c | 4 +- dlls/evr/mixer.c | 5 +- dlls/evr/presenter.c | 8 +-- dlls/gdi32/dc.c | 8 +-- dlls/gdiplus/image.c | 21 ++++---- dlls/iphlpapi/iphlpapi_main.c | 2 +- dlls/iphlpapi/tests/iphlpapi.c | 4 +- dlls/itss/chm_lib.c | 6 +-- dlls/joy.cpl/main.c | 2 +- dlls/msdmo/tests/msdmo.c | 2 +- dlls/mshtml/main.c | 2 +- dlls/msxml3/httprequest.c | 2 +- dlls/msxml3/mxwriter.c | 2 +- dlls/ntdll/actctx.c | 2 +- dlls/ntdll/loader.c | 8 +-- dlls/ntdll/sync.c | 12 ++--- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/rpcrt4/rpcrt4_main.c | 4 +- dlls/shell32/classes.c | 2 +- dlls/shell32/debughlp.c | 2 +- dlls/shell32/shfldr.h | 2 +- dlls/shlwapi/ordinal.c | 2 +- dlls/typelib.dll16/typelib.c | 2 +- dlls/webservices/writer.c | 4 +- include/basetsd.h | 24 +++++++-- include/msvcrt/corecrt.h | 8 +++ include/msvcrt/crtdbg.h | 2 +- include/msvcrt/stdio.h | 90 ++++++++++++++++++++++------------ programs/winedbg/debugger.h | 2 +- programs/winetest/main.c | 2 +- 39 files changed, 164 insertions(+), 101 deletions(-)

9 27

[RFC PATCH v2 0/5] Fix sock_recv reordering issue (#52401): unknown_status + wineserver call approach
by Jinoh Kang Feb. 2, 2022

Feb. 2, 2022

<preamble> This is my forth attempt to tackle the issue #52401 [1]: "Improper synchronization in sock_recv/sock_send leads to arbitrary reordering of completion of I/O requests", which was initially reported (outside Bugzilla) by Dongwan Kim [2]. Basically, the old process of sock_recv is: 1. Perform the I/O synchronously. 2. Report the result back to the server, or queue up the request in the server. 3. If blocking, wait for I/O to complete. The new process of sock_recv would be: 1. Queue up the request in the server. 2. Perform the I/O synchronously. 3. Report the result back to the server, 4. If blocking, wait for I/O to complete. Everything except the actual I/O requires communicating with wineserver. My goal here is to fix the issue without introducing extra calls to wineserver. (However, if it turns out that this goal is not of utmost significance, then this patch serie can be easily modified so that it issues separate server calls.) The previous approaches are listed here: - Add a new select type called SELECT_SIGNAL_WAIT_ASYNC [3]. Zebediah has pointed out [4] that it is not very elegant to (ab-)use the synchronization machinery for communicating the async result. - Use APC_ASYNC_IO to perform the synchronous I/O [5]. This ended up with a total of 11 patches, and turned out to be rather too complicated for a simple task. - Add a new wineserver call, and use "add_queue" hook to save a round trip to the server [6]. </preamble> Each of the above turned out to be either too intrusive, complicated, or hard to verify. Per suggestion by Zebediah [7], this is my (hopefully) last approach: keep the new wineserver call, but keep out the implicit STATUS_PENDING transition from "add_queue"; also, (re-)use the "unknown_status" field. Changelog: - v1 -> v2: fix async queue hang on synchronous failure [1] https://bugs.winehq.org/show_bug.cgi?id=52401 [2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html [3] https://www.winehq.org/pipermail/wine-devel/2022-January/204695.html [4] https://www.winehq.org/pipermail/wine-devel/2022-January/204710.html [5] https://www.winehq.org/pipermail/wine-devel/2022-January/205168.html [6] https://www.winehq.org/pipermail/wine-devel/2022-January/205193.html [7] https://www.winehq.org/pipermail/wine-devel/2022-January/205738.html Jinoh Kang (5): server: Allow calling async_handoff() with status code STATUS_ALERTED. server: Add a new server request "notify_async_direct_result." server: Attempt to complete I/O request immediately in recv_socket. ntdll: Don't call try_recv before server call in sock_recv. server: Replace redundant recv_socket status fields with force_async boolean field. dlls/ntdll/unix/socket.c | 37 ++++++------ dlls/ntdll/unix/sync.c | 22 +++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ws2_32/tests/sock.c | 8 +-- server/async.c | 106 ++++++++++++++++++++++++++++++--- server/protocol.def | 14 ++++- server/sock.c | 40 +++++++++---- 7 files changed, 185 insertions(+), 43 deletions(-) -- 2.34.1

3 12

[PATCH] ntdll: Only call wine exception handlers on the current stack.
by Rémi Bernon Feb. 2, 2022

Feb. 2, 2022

MK11 creates an alternate stack and sometimes throws an exception which gets incorrectly handled by a Wine exception handler, causing the game to crash. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7e77329363c..36985832e4a 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -463,7 +463,9 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex } } /* hack: call wine handlers registered in the tib list */ - else while ((ULONG64)teb_frame < context.Rsp) + else while ((ULONG64)teb_frame < context.Rsp && + (ULONG64)teb_frame >= (ULONG64)NtCurrentTeb()->Tib.StackLimit && + (ULONG64)teb_frame <= (ULONG64)NtCurrentTeb()->Tib.StackBase) { TRACE_(seh)( "found wine frame %p rsp %p handler %p\n", teb_frame, (void *)context.Rsp, teb_frame->Handler ); -- 2.34.1

6 16

[PATCH] scrrun/tests: Add some tests for DoOpenPipeStream().
by Nikolay Sivov Feb. 2, 2022

Feb. 2, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/filesystem.c | 7 +++ dlls/scrrun/scrrun.spec | 2 +- dlls/scrrun/tests/filesystem.c | 88 ++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2b2255e1dfc..d16ecb722dc 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -839,6 +839,13 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod return S_OK; } +HRESULT WINAPI DoOpenPipeStream(HANDLE pipe, IOMode mode, ITextStream **stream) +{ + FIXME("%p, %d, %p.\n", pipe, mode, stream); + + return E_NOTIMPL; +} + static HRESULT WINAPI drive_QueryInterface(IDrive *iface, REFIID riid, void **obj) { struct drive *This = impl_from_IDrive(iface); diff --git a/dlls/scrrun/scrrun.spec b/dlls/scrrun/scrrun.spec index e71b683c64c..2751b5f66de 100644 --- a/dlls/scrrun/scrrun.spec +++ b/dlls/scrrun/scrrun.spec @@ -3,4 +3,4 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ stub DoOpenPipeStream +@ stdcall DoOpenPipeStream(long long ptr) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index da1ca316382..24b52384aa5 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -35,6 +35,8 @@ static IFileSystem3 *fs3; +static HRESULT (WINAPI *pDoOpenPipeStream)(HANDLE pipe, DWORD mode, ITextStream **stream); + /* w2k and 2k3 error code. */ #define E_VAR_NOT_SET 0x800a005b @@ -2590,6 +2592,91 @@ static void test_MoveFile(void) SysFreeString(str); } +static void test_DoOpenPipeStream(void) +{ + static const char testdata[] = "test"; + ITextStream *stream_read, *stream_write; + SECURITY_ATTRIBUTES pipe_attr; + HANDLE piperead, pipewrite; + DWORD written; + HRESULT hr; + BSTR str; + BOOL ret; + + pDoOpenPipeStream = (void *)GetProcAddress(GetModuleHandleA("scrrun.dll"), "DoOpenPipeStream"); + + pipe_attr.nLength = sizeof(SECURITY_ATTRIBUTES); + pipe_attr.bInheritHandle = TRUE; + pipe_attr.lpSecurityDescriptor = NULL; + ret = CreatePipe(&piperead, &pipewrite, &pipe_attr, 0); + ok(ret, "Failed to create pipes.\n"); + + hr = pDoOpenPipeStream(piperead, ForReading, &stream_read); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(!!stream_read, "Unexpected stream pointer.\n"); + + ret = WriteFile(pipewrite, testdata, sizeof(testdata), &written, NULL); + ok(ret, "Failed to write to the pipe.\n"); + ok(written == sizeof(testdata), "Write to anonymous pipe wrote %d bytes.\n", written); + + hr = ITextStream_Read(stream_read, 4, &str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!wcscmp(str, L"test"), "Unexpected data read %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream_read); + } + + ret = CloseHandle(pipewrite); + ok(ret, "Unexpected return value.\n"); + /* Stream takes ownership. */ + ret = CloseHandle(piperead); + todo_wine + ok(!ret, "Unexpected return value.\n"); + + /* Streams on both ends. */ + ret = CreatePipe(&piperead, &pipewrite, &pipe_attr, 0); + ok(ret, "Failed to create pipes.\n"); + + stream_read = NULL; + hr = pDoOpenPipeStream(piperead, ForReading, &stream_read); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + stream_write = NULL; + hr = pDoOpenPipeStream(pipewrite, ForWriting, &stream_write); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + str = SysAllocString(L"data"); + hr = ITextStream_Write(stream_write, str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ITextStream_Write(stream_read, str); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#x.\n", hr); + + SysFreeString(str); + + hr = ITextStream_Read(stream_write, 1, &str); + ok(hr == CTL_E_BADFILEMODE, "Unexpected hr %#x.\n", hr); + + hr = ITextStream_Read(stream_read, 4, &str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!wcscmp(str, L"data"), "Unexpected data.\n"); + SysFreeString(str); + } + + if (stream_read) + ITextStream_Release(stream_read); + if (stream_write) + ITextStream_Release(stream_write); +} + START_TEST(filesystem) { HRESULT hr; @@ -2632,6 +2719,7 @@ START_TEST(filesystem) test_GetExtensionName(); test_GetSpecialFolder(); test_MoveFile(); + test_DoOpenPipeStream(); IFileSystem3_Release(fs3); -- 2.34.1

1 0

[PATCH 1/7] hnetcfg: Fix realloc handling in fw_app_put_ProcessImageFileName().
by Paul Gofman Feb. 2, 2022

Feb. 2, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/hnetcfg/apps.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index c5fe5e41f5e..f351e2482e8 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -269,7 +269,7 @@ static HRESULT WINAPI fw_app_put_ProcessImageFileName( fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); UNIVERSAL_NAME_INFOW *info; DWORD sz, longsz; - WCHAR *path; + WCHAR *path, *new_path; DWORD res; FIXME("%p, %s\n", This, debugstr_w(image)); @@ -303,11 +303,12 @@ static HRESULT WINAPI fw_app_put_ProcessImageFileName( longsz = GetLongPathNameW(path, path, sz); if (longsz > sz) { - if (!(path = realloc(path, longsz * sizeof(WCHAR)))) + if (!(new_path = realloc(path, longsz * sizeof(WCHAR)))) { free(path); return E_OUTOFMEMORY; } + path = new_path; GetLongPathNameW(path, path, longsz); } -- 2.34.1

1 6

[PATCH 00/17] Some more preparation for migration to long types.
by Eric Pouech Feb. 2, 2022

Feb. 2, 2022

The following series implements: - another fix for macros returning unsigned long (missed yesterday) - continuing fixing int*/long* mismatches - some cleanups for code using casts to long - some modifications for unixlib: to make it short, in Unixlib, a DWORD is a long on 32 bits compilation, and unsigned in 64bits compilations. This is make it hard in traces, scanf... without warnings. The idea here, which should be kept as a rule of thumb in (future) Unixlib code: keep the use of Wine traces and Windows types as low as possible. NB: there will me more fixes required for msvcrt*. A+ --- Eric Pouech (17): include/basetsd.h: Define PtrTo(Ul|L)ong to return a long (as SDK does). dlls/win32u: change NtGdiPolyPolyDraw parameter to ULONG dlls/jscript: use correct integral type dlls/msvcrt*: use correct integral type dlls/mshtml: use correct integral type dlls/ole32: use correct integral type dlls/oleaut32: use correct integral type dlls/oledb32: use correct integral type dlls/quartz: use correct integral type dlls/riched20: use correct integral type dlls/comdlg32: removed useless casts to long dlls/kernelbase: removed useless casts to long dlls/mciseq: removed useless casts to long dlls/windowscodec: removes useless casts to long dlls/bcrypt: in unixlib, don't use Windows long type dlls/kerberos: in unixlib, don't use Windows long type dlls/netapi32: in unixlib, don't use Windows long type dlls/bcrypt/bcrypt_internal.h | 22 +++++++++++----------- dlls/bcrypt/gnutls.c | 14 +++++++------- dlls/comdlg32/colordlg.c | 21 +++++++++------------ dlls/concrt140/details.c | 2 +- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/objects.c | 2 +- dlls/jscript/array.c | 24 ++++++++++++------------ dlls/jscript/engine.c | 8 ++++---- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 1 + dlls/jscript/jsregexp.c | 4 ++-- dlls/jscript/jsutils.c | 5 +++++ dlls/jscript/string.c | 2 +- dlls/jscript/vbarray.c | 17 +++++++++-------- dlls/kerberos/unixlib.c | 6 +++--- dlls/kerberos/unixlib.h | 4 ++-- dlls/kernelbase/debug.c | 4 ++-- dlls/mciseq/mcimidi.c | 8 +++----- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlevent.c | 16 ++++++++-------- dlls/mshtml/htmlinput.c | 4 ++-- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlwindow.c | 8 ++++---- dlls/mshtml/pluginhost.c | 6 +++--- dlls/mshtml/range.c | 2 +- dlls/mshtml/xmlhttprequest.c | 2 +- dlls/msvcp90/details.c | 2 +- dlls/netapi32/unixlib.c | 12 ++++++------ dlls/ole32/compobj.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/oledb32/convert.c | 2 +- dlls/oledb32/datainit.c | 2 +- dlls/quartz/systemclock.c | 5 +++-- dlls/riched20/caret.c | 8 ++++---- dlls/riched20/editor.c | 33 +++++++++++++++++++-------------- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 2 +- dlls/riched20/paint.c | 4 ++-- dlls/riched20/richole.c | 6 ++++-- dlls/riched20/writer.c | 2 +- dlls/win32u/font.c | 6 +++--- dlls/win32u/painting.c | 6 +++--- dlls/win32u/wrappers.c | 2 +- dlls/windowscodecs/ungif.c | 3 +-- include/basetsd.h | 32 ++++++++++++++++++++++---------- include/ntgdi.h | 2 +- 47 files changed, 176 insertions(+), 155 deletions(-)

6 32

[PATCH v2 2/2] riched20: Use correct integral type.
by Huw Davies Feb. 2, 2022

Feb. 2, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 8 ++++---- dlls/riched20/editor.c | 33 +++++++++++++++++++-------------- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 2 +- dlls/riched20/paint.c | 4 ++-- dlls/riched20/richole.c | 6 ++++-- dlls/riched20/writer.c | 2 +- 7 files changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ebc137ebf85..cc5ce90ea42 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -39,14 +39,14 @@ static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor, BOOL fin } -int ME_GetSelectionOfs(ME_TextEditor *editor, int *from, int *to) +int ME_GetSelectionOfs(ME_TextEditor *editor, LONG *from, LONG *to) { *from = ME_GetCursorOfs(&editor->pCursors[0]); *to = ME_GetCursorOfs(&editor->pCursors[1]); if (*from > *to) { - int tmp = *from; + LONG tmp = *from; *from = *to; *to = tmp; return 1; @@ -160,7 +160,7 @@ int set_selection_cursors(ME_TextEditor *editor, int from, int to) /* deselected and caret moved to end of the current selection */ if (from < 0) { - int start, end; + LONG start, end; ME_GetSelectionOfs(editor, &start, &end); if (start != end) { @@ -1353,7 +1353,7 @@ BOOL ME_IsSelection(ME_TextEditor *editor) void ME_DeleteSelection(ME_TextEditor *editor) { - int from, to; + LONG from, to; int nStartCursor = ME_GetSelectionOfs(editor, &from, &to); int nEndCursor = nStartCursor ^ 1; ME_DeleteTextAtCursor(editor, nStartCursor, to - from); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 429f023ebe4..ddf619870f1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1567,7 +1567,8 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre { RTF_Info parser; ME_Style *style; - int from, to, nUndoMode; + LONG from, to; + int nUndoMode; int nEventMask = editor->nEventMask; ME_InStream inStream; BOOL invalidRTF = FALSE; @@ -2087,7 +2088,7 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) if (ex->flags & GT_SELECTION) { - int from, to; + LONG from, to; int nStartCur = ME_GetSelectionOfs(editor, &from, &to); start = editor->pCursors[nStartCur]; nChars = to - from; @@ -2366,7 +2367,7 @@ HRESULT editor_copy_or_cut( ME_TextEditor *editor, BOOL cut, ME_Cursor *start, i static BOOL copy_or_cut( ME_TextEditor *editor, BOOL cut ) { HRESULT hr; - int offs, count; + LONG offs, count; int start_cursor = ME_GetSelectionOfs( editor, &offs, &count ); ME_Cursor *sel_start = &editor->pCursors[start_cursor]; @@ -2412,7 +2413,7 @@ static BOOL handle_enter(ME_TextEditor *editor) { ME_Cursor cursor = editor->pCursors[0]; ME_Paragraph *para = cursor.para; - int from, to; + LONG from, to; ME_Style *style, *eop_style; if (editor->props & TXTBIT_READONLY) @@ -2689,7 +2690,7 @@ static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags ) { ME_Cursor cursor = editor->pCursors[0]; ME_Paragraph *para = cursor.para; - int from, to; + LONG from, to; BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; ME_GetSelectionOfs(editor, &from, &to); if (wstr == '\t' && @@ -2845,7 +2846,8 @@ void editor_set_cursor( ME_TextEditor *editor, int x, int y ) else if (ME_IsSelection( editor )) { - int start, end, offset = ME_GetCursorOfs( &pos ); + LONG start, end; + int offset = ME_GetCursorOfs( &pos ); ME_GetSelectionOfs( editor, &start, &end ); if (start <= offset && end >= offset) cursor = cursor_arrow; @@ -3144,7 +3146,8 @@ void link_notify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) { - int from, to, nStartCursor; + LONG from, to; + int nStartCursor; ME_Style *style; nStartCursor = ME_GetSelectionOfs(editor, &from, &to); @@ -3279,10 +3282,10 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETSEL: { /* Note: wParam/lParam can be NULL */ - UINT from, to; - PUINT pfrom = wParam ? (PUINT)wParam : &from; - PUINT pto = lParam ? (PUINT)lParam : &to; - ME_GetSelectionOfs(editor, (int *)pfrom, (int *)pto); + LONG from, to; + LONG *pfrom = wParam ? (LONG *)wParam : &from; + LONG *pto = lParam ? (LONG *)lParam : &to; + ME_GetSelectionOfs(editor, pfrom, pto); if ((*pfrom|*pto) & 0xFFFF0000) return -1; return MAKELONG(*pfrom,*pto); @@ -3388,7 +3391,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, { LPWSTR wszText; SETTEXTEX *pStruct = (SETTEXTEX *)wParam; - int from, to, len; + LONG from, to; + int len; ME_Style *style; BOOL bRtf, bUnicode, bSelection, bUTF8; int oldModify = editor->nModifyStep; @@ -3545,7 +3549,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_CLEAR: { - int from, to; + LONG from, to; int nStartCursor = ME_GetSelectionOfs(editor, &from, &to); ME_InternalDeleteText(editor, &editor->pCursors[nStartCursor], to-from, FALSE); ME_CommitUndo(editor); @@ -3660,7 +3664,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return ME_GetTextEx(editor, (GETTEXTEX*)wParam, lParam); case EM_GETSELTEXT: { - int nFrom, nTo, nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo); + LONG nFrom, nTo; + int nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo); ME_Cursor *from = &editor->pCursors[nStartCur]; return get_text_range( editor, (WCHAR *)lParam, from, nTo - nFrom ); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8a46e942581..e0df63ae92d 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -182,7 +182,7 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BO BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl) DECLSPEC_HIDDEN; int ME_GetCursorOfs(const ME_Cursor *cursor) DECLSPEC_HIDDEN; -int ME_GetSelectionOfs(ME_TextEditor *editor, int *from, int *to) DECLSPEC_HIDDEN; +int ME_GetSelectionOfs(ME_TextEditor *editor, LONG *from, LONG *to) DECLSPEC_HIDDEN; int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) DECLSPEC_HIDDEN; BOOL ME_IsSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DeleteSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 22cfd74722c..889795de189 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -401,7 +401,7 @@ typedef struct tagME_TextEditor int nUndoLimit; ME_UndoMode nUndoMode; int nParagraphs; - int nLastSelStart, nLastSelEnd; + LONG nLastSelStart, nLastSelEnd; ME_Paragraph *last_sel_start_para, *last_sel_end_para; ME_FontCacheItem pFontCache[HFONT_CACHE_SIZE]; int nZoomNumerator, nZoomDenominator; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 6ab7e4de76b..245afff77dc 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -459,7 +459,7 @@ static void draw_run( ME_Context *c, int x, int y, ME_Cursor *cursor ) ME_Row *row; ME_Run *run = cursor->run; int runofs = run_char_ofs( run, cursor->nOffset ); - int nSelFrom, nSelTo; + LONG nSelFrom, nSelTo; if (run->nFlags & MERF_HIDDEN) return; @@ -1248,7 +1248,7 @@ ME_InvalidateSelection(ME_TextEditor *editor) { ME_Paragraph *sel_start, *sel_end; ME_Paragraph *repaint_start = NULL, *repaint_end = NULL; - int nStart, nEnd; + LONG nStart, nEnd; int len = ME_GetTextLength(editor); ME_GetSelectionOfs(editor, &nStart, &nEnd); diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 03572511ff7..47194096bdc 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1254,7 +1254,8 @@ IRichEditOle_fnGetClipboardData(IRichEditOle *iface, CHARRANGE *lpchrg, return E_INVALIDARG; if(!lpchrg) { - int nFrom, nTo, nStartCur = ME_GetSelectionOfs( services->editor, &nFrom, &nTo ); + LONG nFrom, nTo; + int nStartCur = ME_GetSelectionOfs( services->editor, &nFrom, &nTo ); start = services->editor->pCursors[nStartCur]; nChars = nTo - nFrom; } @@ -4661,7 +4662,8 @@ static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR str) { struct text_selection *This = impl_from_ITextSelection(me); ME_TextEditor *editor; - int len, to, from; + int len; + LONG to, from; TRACE("(%p)->(%s)\n", This, debugstr_w(str)); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index d6c687daab9..c4f79ce6f5b 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1198,7 +1198,7 @@ ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream) int nChars; if (dwFormat & SFF_SELECTION) { - int nStart, nTo; + LONG nStart, nTo; start = editor->pCursors[ME_GetSelectionOfs(editor, &nStart, &nTo)]; nChars = nTo - nStart; } else { -- 2.23.0

1 0