February 2022 - Wine-Commits

Eric Pouech : dsdmo: Enable compilation with long types.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 97e6f05caf723e4f642ece420418adca0e61b616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97e6f05caf723e4f642ece42… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:41:32 2022 +0100 dsdmo: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/Makefile.in | 1 - dlls/dsdmo/main.c | 44 ++++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index 38bd6a7ad0f..a3dd1ad11e9 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsdmo.dll IMPORTS = dmoguids strmiids uuid diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index fa39c28abd7..fe7cf1115a7 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -81,7 +81,7 @@ static ULONG WINAPI effect_inner_AddRef(IUnknown *iface) struct effect *effect = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&effect->refcount); - TRACE("%p increasing refcount to %u.\n", effect, refcount); + TRACE("%p increasing refcount to %lu.\n", effect, refcount); return refcount; } @@ -90,7 +90,7 @@ static ULONG WINAPI effect_inner_Release(IUnknown *iface) struct effect *effect = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&effect->refcount); - TRACE("%p decreasing refcount to %u.\n", effect, refcount); + TRACE("%p decreasing refcount to %lu.\n", effect, refcount); if (!refcount) { @@ -139,25 +139,25 @@ static HRESULT WINAPI effect_GetStreamCount(IMediaObject *iface, DWORD *input, D static HRESULT WINAPI effect_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p, stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p, stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI effect_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + FIXME("iface %p, index %lu, type_index %lu, type %p, stub!\n", iface, index, type_index, type); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type_index %u, type %p, stub!\n", iface, index, type_index, type); + FIXME("iface %p, index %lu, type_index %lu, type %p, stub!\n", iface, index, type_index, type); return E_NOTIMPL; } @@ -166,7 +166,7 @@ static HRESULT WINAPI effect_SetInputType(IMediaObject *iface, DWORD index, cons struct effect *effect = impl_from_IMediaObject(iface); const WAVEFORMATEX *format; - TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + TRACE("iface %p, index %lu, type %p, flags %#lx.\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) { @@ -227,7 +227,7 @@ static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, con struct effect *effect = impl_from_IMediaObject(iface); HRESULT hr; - TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + TRACE("iface %p, index %lu, type %p, flags %#lx.\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) return S_OK; @@ -251,38 +251,38 @@ static HRESULT WINAPI effect_SetOutputType(IMediaObject *iface, DWORD index, con static HRESULT WINAPI effect_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + FIXME("iface %p, index %lu, type %p, stub!\n", iface, index, type); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type %p, stub!\n", iface, index, type); + FIXME("iface %p, index %lu, type %p, stub!\n", iface, index, type); return E_NOTIMPL; } static HRESULT WINAPI effect_GetInputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *lookahead, DWORD *alignment) { - FIXME("iface %p, index %u, size %p, lookahead %p, alignment %p, stub!\n", iface, index, size, lookahead, alignment); + FIXME("iface %p, index %lu, size %p, lookahead %p, alignment %p, stub!\n", iface, index, size, lookahead, alignment); return E_NOTIMPL; } static HRESULT WINAPI effect_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment) { - FIXME("iface %p, index %u, size %p, alignment %p, stub!\n", iface, index, size, alignment); + FIXME("iface %p, index %lu, size %p, alignment %p, stub!\n", iface, index, size, alignment); return E_NOTIMPL; } static HRESULT WINAPI effect_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) { - FIXME("iface %p, index %u, latency %p, stub!\n", iface, index, latency); + FIXME("iface %p, index %lu, latency %p, stub!\n", iface, index, latency); return E_NOTIMPL; } static HRESULT WINAPI effect_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency) { - FIXME("iface %p, index %u, latency %s, stub!\n", iface, index, wine_dbgstr_longlong(latency)); + FIXME("iface %p, index %lu, latency %s, stub!\n", iface, index, wine_dbgstr_longlong(latency)); return E_NOTIMPL; } @@ -294,7 +294,7 @@ static HRESULT WINAPI effect_Flush(IMediaObject *iface) static HRESULT WINAPI effect_Discontinuity(IMediaObject *iface, DWORD index) { - FIXME("iface %p, index %u, stub!\n", iface, index); + FIXME("iface %p, index %lu, stub!\n", iface, index); return E_NOTIMPL; } @@ -312,14 +312,14 @@ static HRESULT WINAPI effect_FreeStreamingResources(IMediaObject *iface) static HRESULT WINAPI effect_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p, stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p, stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI effect_ProcessInput(IMediaObject *iface, DWORD index, IMediaBuffer *buffer, DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME timelength) { - FIXME("iface %p, index %u, buffer %p, flags %#x, timestamp %s, timelength %s, stub!\n", + FIXME("iface %p, index %lu, buffer %p, flags %#lx, timestamp %s, timelength %s, stub!\n", iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); return E_NOTIMPL; } @@ -327,13 +327,13 @@ static HRESULT WINAPI effect_ProcessInput(IMediaObject *iface, DWORD index, static HRESULT WINAPI effect_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { - FIXME("iface %p, flags %#x, count %u, buffers %p, status %p, stub!\n", iface, flags, count, buffers, status); + FIXME("iface %p, flags %#lx, count %lu, buffers %p, status %p, stub!\n", iface, flags, count, buffers, status); return E_NOTIMPL; } static HRESULT WINAPI effect_Lock(IMediaObject *iface, LONG lock) { - FIXME("iface %p, lock %d, stub!\n", iface, lock); + FIXME("iface %p, lock %ld, stub!\n", iface, lock); return E_NOTIMPL; } @@ -391,7 +391,7 @@ static ULONG WINAPI effect_inplace_Release(IMediaObjectInPlace *iface) static HRESULT WINAPI effect_inplace_Process(IMediaObjectInPlace *iface, ULONG size, BYTE *data, REFERENCE_TIME start, DWORD flags) { - FIXME("iface %p, size %u, data %p, start %s, flags %#x, stub!\n", + FIXME("iface %p, size %lu, data %p, start %s, flags %#lx, stub!\n", iface, size, data, wine_dbgstr_longlong(start), flags); return E_NOTIMPL; } @@ -599,7 +599,7 @@ static HRESULT WINAPI reverb_params_SetPreset(IDirectSoundFXI3DL2Reverb *iface, { struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); - FIXME("effect %p, preset %u, stub!\n", effect, preset); + FIXME("effect %p, preset %lu, stub!\n", effect, preset); return E_NOTIMPL; } @@ -617,7 +617,7 @@ static HRESULT WINAPI reverb_params_SetQuality(IDirectSoundFXI3DL2Reverb *iface, { struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); - FIXME("effect %p, quality %u, stub!\n", effect, quality); + FIXME("effect %p, quality %lu, stub!\n", effect, quality); return E_NOTIMPL; }

1 0

Eric Pouech : dpwsockx: Enable compilation with long types.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 0f6fa730deab801814603b6892e6babf5243fe5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f6fa730deab801814603b68… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:41:26 2022 +0100 dpwsockx: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpwsockx/Makefile.in | 1 - dlls/dpwsockx/dpwsockx_main.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in index 0a478358e74..18b5581a696 100644 --- a/dlls/dpwsockx/Makefile.in +++ b/dlls/dpwsockx/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dpwsockx.dll IMPORTS = dxguid ws2_32 diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c index 2c73c17be21..06ef63674f8 100644 --- a/dlls/dpwsockx/dpwsockx_main.c +++ b/dlls/dpwsockx/dpwsockx_main.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data ) { - FIXME( "(%p,%d,%p,%u) stub\n", + FIXME( "(%p,%ld,%p,%u) stub\n", data->lpMessage, data->dwMessageSize, data->lpISP, data->bReturnStatus ); return DPERR_UNSUPPORTED; @@ -40,7 +40,7 @@ static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data ) static HRESULT WINAPI DPWSCB_Reply( LPDPSP_REPLYDATA data ) { - FIXME( "(%p,%p,%d,%d,%p) stub\n", + FIXME( "(%p,%p,%ld,%ld,%p) stub\n", data->lpSPMessageHeader, data->lpMessage, data->dwMessageSize, data->idNameServer, data->lpISP ); return DPERR_UNSUPPORTED; @@ -48,7 +48,7 @@ static HRESULT WINAPI DPWSCB_Reply( LPDPSP_REPLYDATA data ) static HRESULT WINAPI DPWSCB_Send( LPDPSP_SENDDATA data ) { - FIXME( "(0x%08x,%d,%d,%p,%d,%u,%p) stub\n", + FIXME( "(0x%08lx,%ld,%ld,%p,%ld,%u,%p) stub\n", data->dwFlags, data->idPlayerTo, data->idPlayerFrom, data->lpMessage, data->dwMessageSize, data->bSystemMessage, data->lpISP ); @@ -57,7 +57,7 @@ static HRESULT WINAPI DPWSCB_Send( LPDPSP_SENDDATA data ) static HRESULT WINAPI DPWSCB_CreatePlayer( LPDPSP_CREATEPLAYERDATA data ) { - FIXME( "(%d,0x%08x,%p,%p) stub\n", + FIXME( "(%ld,0x%08lx,%p,%p) stub\n", data->idPlayer, data->dwFlags, data->lpSPMessageHeader, data->lpISP ); return DPERR_UNSUPPORTED; @@ -65,14 +65,14 @@ static HRESULT WINAPI DPWSCB_CreatePlayer( LPDPSP_CREATEPLAYERDATA data ) static HRESULT WINAPI DPWSCB_DeletePlayer( LPDPSP_DELETEPLAYERDATA data ) { - FIXME( "(%d,0x%08x,%p) stub\n", + FIXME( "(%ld,0x%08lx,%p) stub\n", data->idPlayer, data->dwFlags, data->lpISP ); return DPERR_UNSUPPORTED; } static HRESULT WINAPI DPWSCB_GetAddress( LPDPSP_GETADDRESSDATA data ) { - FIXME( "(%d,0x%08x,%p,%p,%p) stub\n", + FIXME( "(%ld,0x%08lx,%p,%p,%p) stub\n", data->idPlayer, data->dwFlags, data->lpAddress, data->lpdwAddressSize, data->lpISP ); return DPERR_UNSUPPORTED; @@ -80,7 +80,7 @@ static HRESULT WINAPI DPWSCB_GetAddress( LPDPSP_GETADDRESSDATA data ) static HRESULT WINAPI DPWSCB_GetCaps( LPDPSP_GETCAPSDATA data ) { - TRACE( "(%d,%p,0x%08x,%p)\n", + TRACE( "(%ld,%p,0x%08lx,%p)\n", data->idPlayer, data->lpCaps, data->dwFlags, data->lpISP ); data->lpCaps->dwFlags = ( DPCAPS_ASYNCSUPPORTED | @@ -110,7 +110,7 @@ static HRESULT WINAPI DPWSCB_GetCaps( LPDPSP_GETCAPSDATA data ) static HRESULT WINAPI DPWSCB_Open( LPDPSP_OPENDATA data ) { - FIXME( "(%u,%p,%p,%u,0x%08x,0x%08x) stub\n", + FIXME( "(%u,%p,%p,%u,0x%08lx,0x%08lx) stub\n", data->bCreate, data->lpSPMessageHeader, data->lpISP, data->bReturnStatus, data->dwOpenFlags, data->dwSessionFlags ); return DPERR_UNSUPPORTED; @@ -137,7 +137,7 @@ static HRESULT WINAPI DPWSCB_GetAddressChoices( LPDPSP_GETADDRESSCHOICESDATA dat static HRESULT WINAPI DPWSCB_SendEx( LPDPSP_SENDEXDATA data ) { - FIXME( "(%p,0x%08x,%d,%d,%p,%d,%d,%d,%d,%p,%p,%u) stub\n", + FIXME( "(%p,0x%08lx,%ld,%ld,%p,%ld,%ld,%ld,%ld,%p,%p,%u) stub\n", data->lpISP, data->dwFlags, data->idPlayerTo, data->idPlayerFrom, data->lpSendBuffers, data->cBuffers, data->dwMessageSize, data->dwPriority, data->dwTimeout, data->lpDPContext, @@ -147,7 +147,7 @@ static HRESULT WINAPI DPWSCB_SendEx( LPDPSP_SENDEXDATA data ) static HRESULT WINAPI DPWSCB_SendToGroupEx( LPDPSP_SENDTOGROUPEXDATA data ) { - FIXME( "(%p,0x%08x,%d,%d,%p,%d,%d,%d,%d,%p,%p) stub\n", + FIXME( "(%p,0x%08lx,%ld,%ld,%p,%ld,%ld,%ld,%ld,%p,%p) stub\n", data->lpISP, data->dwFlags, data->idGroupTo, data->idPlayerFrom, data->lpSendBuffers, data->cBuffers, data->dwMessageSize, data->dwPriority, data->dwTimeout, data->lpDPContext, @@ -157,7 +157,7 @@ static HRESULT WINAPI DPWSCB_SendToGroupEx( LPDPSP_SENDTOGROUPEXDATA data ) static HRESULT WINAPI DPWSCB_Cancel( LPDPSP_CANCELDATA data ) { - FIXME( "(%p,0x%08x,%p,%d,0x%08x,0x%08x) stub\n", + FIXME( "(%p,0x%08lx,%p,%ld,0x%08lx,0x%08lx) stub\n", data->lpISP, data->dwFlags, data->lprglpvSPMsgID, data->cSPMsgID, data->dwMinPriority, data->dwMaxPriority ); return DPERR_UNSUPPORTED; @@ -165,7 +165,7 @@ static HRESULT WINAPI DPWSCB_Cancel( LPDPSP_CANCELDATA data ) static HRESULT WINAPI DPWSCB_GetMessageQueue( LPDPSP_GETMESSAGEQUEUEDATA data ) { - FIXME( "(%p,0x%08x,%d,%d,%p,%p) stub\n", + FIXME( "(%p,0x%08lx,%ld,%ld,%p,%p) stub\n", data->lpISP, data->dwFlags, data->idFrom, data->idTo, data->lpdwNumMsgs, data->lpdwNumBytes ); return DPERR_UNSUPPORTED;

1 0

Eric Pouech : dpvoice: Enable compilation with long types.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 68925388cd689157e832f9fdc2df6a271f69f1fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=68925388cd689157e832f9fd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:41:19 2022 +0100 dpvoice: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpvoice/Makefile.in | 1 - dlls/dpvoice/client.c | 28 ++++++++++++++-------------- dlls/dpvoice/server.c | 18 +++++++++--------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in index a3d85b093c6..7767d141fa8 100644 --- a/dlls/dpvoice/Makefile.in +++ b/dlls/dpvoice/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dpvoice.dll IMPORTS = dxguid uuid diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index b611370659e..b84f27b0a22 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -74,7 +74,7 @@ static ULONG WINAPI dpvclient_AddRef(IDirectPlayVoiceClient *iface) IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -84,7 +84,7 @@ static ULONG WINAPI dpvclient_Release(IDirectPlayVoiceClient *iface) IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -97,7 +97,7 @@ static HRESULT WINAPI dpvclient_Initialize(IDirectPlayVoiceClient *iface,LPUNKNO void *pUserContext, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %p %p %d\n", This, pVoid, pMessageHandler, pUserContext,pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %p %p %p %ld\n", This, pVoid, pMessageHandler, pUserContext,pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } @@ -105,14 +105,14 @@ static HRESULT WINAPI dpvclient_Connect(IDirectPlayVoiceClient *iface, PDVSOUNDD PDVCLIENTCONFIG pdvClientConfig, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %d\n", This, pSoundDeviceConfig, pdvClientConfig, dwFlags); + FIXME("%p %p %p %ld\n", This, pSoundDeviceConfig, pdvClientConfig, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_Disconnect(IDirectPlayVoiceClient *iface, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d\n", This, dwFlags); + FIXME("%p %ld\n", This, dwFlags); return E_NOTIMPL; } @@ -148,7 +148,7 @@ static HRESULT WINAPI dpvclient_GetCompressionTypes(IDirectPlayVoiceClient *ifac DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + FIXME("%p %p %p %p %ld semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } @@ -156,7 +156,7 @@ static HRESULT WINAPI dpvclient_SetTransmitTargets(IDirectPlayVoiceClient *iface DWORD dwNumTargets, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d %d\n", This, pdvIDTargets, dwNumTargets, dwFlags); + FIXME("%p %p %ld %ld\n", This, pdvIDTargets, dwNumTargets, dwFlags); return E_NOTIMPL; } @@ -164,7 +164,7 @@ static HRESULT WINAPI dpvclient_GetTransmitTargets(IDirectPlayVoiceClient *iface DWORD *pdwNumTargets, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d\n", This, pdwNumTargets, dwFlags); + FIXME("%p %p %ld\n", This, pdwNumTargets, dwFlags); return E_NOTIMPL; } @@ -173,21 +173,21 @@ static HRESULT WINAPI dpvclient_Create3DSoundBuffer(IDirectPlayVoiceClient *ifac LPDIRECTSOUND3DBUFFER *lpUserBuffer) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d %p %d %d %p\n", This, dvID, lpdsSourceBuffer, dwPriority, dwFlags, lpUserBuffer); + FIXME("%p %ld %p %ld %ld %p\n", This, dvID, lpdsSourceBuffer, dwPriority, dwFlags, lpUserBuffer); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_Delete3DSoundBuffer(IDirectPlayVoiceClient *iface, DVID dvID, LPDIRECTSOUND3DBUFFER *lpUserBuffer) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d %p\n", This, dvID, lpUserBuffer); + FIXME("%p %ld %p\n", This, dvID, lpUserBuffer); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_SetNotifyMask(IDirectPlayVoiceClient *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d\n", This, pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %ld\n", This, pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } @@ -261,7 +261,7 @@ static ULONG WINAPI dpvtest_AddRef(IDirectPlayVoiceTest *iface) IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -271,7 +271,7 @@ static ULONG WINAPI dpvtest_Release(IDirectPlayVoiceTest *iface) IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -284,7 +284,7 @@ static HRESULT WINAPI dpvtest_CheckAudioSetup(IDirectPlayVoiceTest *iface, const HWND hwndParent, DWORD dwFlags) { IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); - FIXME("%p %s %s %p %d\n", This, debugstr_guid(pguidPlaybackDevice), + FIXME("%p %s %s %p %ld\n", This, debugstr_guid(pguidPlaybackDevice), debugstr_guid(pguidCaptureDevice), hwndParent, dwFlags); return E_NOTIMPL; } diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c index a476a2e585d..42fea27a192 100644 --- a/dlls/dpvoice/server.c +++ b/dlls/dpvoice/server.c @@ -100,7 +100,7 @@ static ULONG WINAPI dpvserver_AddRef(IDirectPlayVoiceServer *iface) IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -110,7 +110,7 @@ static ULONG WINAPI dpvserver_Release(IDirectPlayVoiceServer *iface) IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -123,21 +123,21 @@ static HRESULT WINAPI dpvserver_Initialize(IDirectPlayVoiceServer *iface, IUnkno void *pUserContext, DWORD *lpdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %p %p %p %d\n", This, lpVoid, pMessageHandler, pUserContext,lpdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %p %p %p %ld\n", This, lpVoid, pMessageHandler, pUserContext,lpdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_StartSession(IDirectPlayVoiceServer *iface, PDVSESSIONDESC pSessionDesc, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %d\n", This, pSessionDesc, dwFlags); + FIXME("%p %p %ld\n", This, pSessionDesc, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_StopSession(IDirectPlayVoiceServer *iface, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d\n", This, dwFlags); + FIXME("%p %ld\n", This, dwFlags); return E_NOTIMPL; } @@ -166,7 +166,7 @@ static HRESULT WINAPI dpvserver_GetCompressionTypes(IDirectPlayVoiceServer *ifac DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + FIXME("%p %p %p %p %ld semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } @@ -174,7 +174,7 @@ static HRESULT WINAPI dpvserver_SetTransmitTargets(IDirectPlayVoiceServer *iface DWORD dwNumTargets, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d %p %d %d\n", This, dvSource, pdvIDTargets, dwNumTargets, dwFlags); + FIXME("%p %ld %p %ld %ld\n", This, dvSource, pdvIDTargets, dwNumTargets, dwFlags); return E_NOTIMPL; } @@ -182,14 +182,14 @@ static HRESULT WINAPI dpvserver_GetTransmitTargets(IDirectPlayVoiceServer *iface DWORD *pdwNumTargets, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d %p %p %d\n", This, dvSource, pdvIDTargets, pdwNumTargets, dwFlags); + FIXME("%p %ld %p %p %ld\n", This, dvSource, pdvIDTargets, pdwNumTargets, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_SetNotifyMask(IDirectPlayVoiceServer *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %d\n", This, pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %ld\n", This, pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; }

1 0

Michael Stefaniuc : dmcompos/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: a49e82639b8bd0ec52198f5819d3ea7820bf2372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a49e82639b8bd0ec52198f58… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 9 23:34:05 2022 +0100 dmcompos/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/tests/Makefile.in | 1 - dlls/dmcompos/tests/dmcompos.c | 205 ++++++++++++++++++++-------------------- 2 files changed, 101 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a49e82639b8bd0ec5219…

1 0

Eric Pouech : dmstyle: Enable compilation with long types.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 73a05ffb99bf618449b968e099e9ce72fd45002f URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a05ffb99bf618449b968e0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 22:49:22 2022 +0100 dmstyle: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/Makefile.in | 1 - dlls/dmstyle/auditiontrack.c | 24 +++++++++--------- dlls/dmstyle/chordtrack.c | 52 +++++++++++++++++++------------------- dlls/dmstyle/commandtrack.c | 30 +++++++++++----------- dlls/dmstyle/dmobject.c | 20 +++++++-------- dlls/dmstyle/dmutils.c | 6 ++--- dlls/dmstyle/motiftrack.c | 24 +++++++++--------- dlls/dmstyle/mutetrack.c | 24 +++++++++--------- dlls/dmstyle/style.c | 60 ++++++++++++++++++++++---------------------- dlls/dmstyle/styletrack.c | 38 ++++++++++++++-------------- 10 files changed, 139 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73a05ffb99bf618449b9…

1 0

Nikolay Sivov : opcservices: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 119f6e7b2a49a189e5ca9edbe590e8c4cf1ce11d URL: https://source.winehq.org/git/wine.git/?a=commit;h=119f6e7b2a49a189e5ca9edb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:20:49 2022 +0300 opcservices: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 1 - dlls/opcservices/compress.c | 3 ++- dlls/opcservices/factory.c | 31 ++++++++++++++-------------- dlls/opcservices/package.c | 48 ++++++++++++++++++++++---------------------- dlls/opcservices/uri.c | 20 +++++++++--------- 5 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=119f6e7b2a49a189e5ca…

1 0

Nikolay Sivov : opcservices/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: ebe67a8f5b2f2ac601c9c08aa07729c99f59423f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebe67a8f5b2f2ac601c9c08a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 10 11:20:50 2022 +0300 opcservices/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/tests/Makefile.in | 1 - dlls/opcservices/tests/opcservices.c | 374 +++++++++++++++++------------------ 2 files changed, 187 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebe67a8f5b2f2ac601c9…

1 0

Eric Pouech : dmcompos: Enable compilation with long types.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 73b591c2748ef858e2294ee6d3a65d6ab31eddeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b591c2748ef858e2294ee6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 22:49:19 2022 +0100 dmcompos: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/Makefile.in | 1 - dlls/dmcompos/chordmap.c | 14 +++++++------- dlls/dmcompos/chordmaptrack.c | 24 ++++++++++++------------ dlls/dmcompos/composer.c | 8 ++++---- dlls/dmcompos/dmobject.c | 20 ++++++++++---------- dlls/dmcompos/signposttrack.c | 24 ++++++++++++------------ 6 files changed, 45 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73b591c2748ef858e229…

1 0

Francois Gouget : testbot/LibvirtTool: Avoid a race between shutdown.exe and TestAgentd.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: tools Branch: master Commit: 122e1af344c8d333b6d6414a3aba5687e3c13fce URL: https://source.winehq.org/git/tools.git/?a=commit;h=122e1af344c8d333b6d6414… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 10 19:51:55 2022 +0100 testbot/LibvirtTool: Avoid a race between shutdown.exe and TestAgentd. "shutdown.exe /p" waits for no process which may give it a slight edge in not getting stuck; but it also does not wait for TestAgentd to reply to the Run() RPC. "shutdown.exe /s" does not seem to have this problem (and supports /t if need be). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 4b84f9b..0cccd12 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -292,7 +292,7 @@ sub ShutDown() Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/p", "/d", "00:00"] : + ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] : ["/sbin/shutdown", "--poweroff", "now"]; Debug(Elapsed($Start), " Running @$Cmd\n"); my $PTA = GetPrivilegedTA($VM->GetAgent());

1 0

Francois Gouget : testbot/VMs: Set the default VM type to win64.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: tools Branch: master Commit: a9aa24938b78d0990a9ec13b218103f763ba2ea1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a9aa24938b78d0990a9ec13… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 10 02:11:55 2022 +0100 testbot/VMs: Set the default VM type to win64. This is only relevant when creating a new VM and the most commonly created VM type is 64-bit Windows VMs (for the various locales). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 0b11d81..596499a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -171,6 +171,7 @@ sub InitializeNew($$) my ($self, $Collection) = @_; $self->Status("off"); + $self->Type("win64"); $self->IdleSnapshot("base-live"); $self->SUPER::InitializeNew($Collection);

1 0