May 2022 - Wine-commits - list.winehq.org

Anton Baskanov : quartz/tests: Add tests for MPEG audio decoder sample processing.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 23fb8a6b49304a0b8ccf5a10e5bbd603691ba7bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=23fb8a6b49304a0b8ccf5a10… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 5 17:24:35 2022 -0500 quartz/tests: Add tests for MPEG audio decoder sample processing. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegaudio.c | 75 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index a43adfbbd6d..b34f09e137f 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -794,6 +794,7 @@ struct testfilter struct strmbase_source source; struct strmbase_sink sink; const AM_MEDIA_TYPE *mt; + unsigned int got_sample; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -867,11 +868,27 @@ static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const A return S_OK; } +static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + LONG size; + + ++filter->got_sample; + + size = IMediaSample_GetSize(sample); + ok(size == 3072, "Got size %lu.\n", size); + size = IMediaSample_GetActualDataLength(sample); + ok(size == 768, "Got valid size %lu.\n", size); + + return S_OK; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, .base.pin_get_media_type = testsink_get_media_type, .sink_connect = testsink_connect, + .pfnReceive = testsink_Receive, }; static void testfilter_init(struct testfilter *filter) @@ -1040,6 +1057,62 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, IFilterGraph2_Disconnect(graph, &testsource->source.pin.IPin_iface); } +static void test_sample_processing(IMediaControl *control, IMemInputPin *input, struct testfilter *sink) +{ + IMemAllocator *allocator; + IMediaSample *sample; + HRESULT hr; + BYTE *data; + LONG size; + + hr = IMemInputPin_ReceiveCanBlock(input); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#lx.\n", hr); + + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + size = IMediaSample_GetSize(sample); + ok(size == 256, "Got size %ld.\n", size); + memset(data, 0, 48); + data[0] = 0xff; + data[1] = 0xff; + data[2] = 0x18; + data[3] = 0xc4; + hr = IMediaSample_SetActualDataLength(sample, 48); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_Receive(input, sample); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemInputPin_Receive(input, sample); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(sink->got_sample >= 1, "Got %u calls to Receive().\n", sink->got_sample); + sink->got_sample = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_Receive(input, sample); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#lx.\n", hr); + + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); +} + static void test_connect_pin(void) { IBaseFilter *filter = create_mpeg_audio_codec(); @@ -1233,6 +1306,8 @@ static void test_connect_pin(void) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); + test_sample_processing(control, meminput, &testsink); + hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IFilterGraph2_Disconnect(graph, source);

1 0

Anton Baskanov : winegstreamer: Implement Receive() for MPEG audio decoder sink.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 6eca6ad68644639ef54706363dcbb2d62962da8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eca6ad68644639ef5470636… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 5 17:24:36 2022 -0500 winegstreamer: Implement Receive() for MPEG audio decoder sink. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegaudio.c | 10 ++-- dlls/winegstreamer/quartz_transform.c | 86 +++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index b34f09e137f..105469edaf1 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -1095,19 +1095,19 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMemInputPin_Receive(input, sample); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMemInputPin_Receive(input, sample); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMemInputPin_Receive(input, sample); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(sink->got_sample >= 1, "Got %u calls to Receive().\n", sink->got_sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(sink->got_sample >= 1, "Got %u calls to Receive().\n", sink->got_sample); sink->got_sample = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMemInputPin_Receive(input, sample); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#lx.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#lx.\n", hr); IMediaSample_Release(sample); IMemAllocator_Release(allocator); diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index ab61e5eab94..5019cc6032b 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -20,6 +20,8 @@ #include "gst_private.h" +#include "mferror.h" + WINE_DEFAULT_DEBUG_CHANNEL(quartz); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -137,10 +139,94 @@ static HRESULT transform_sink_query_interface(struct strmbase_pin *pin, REFIID i return S_OK; } +static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSample *sample) +{ + struct transform *filter = impl_from_strmbase_filter(pin->pin.filter); + struct wg_sample input_wg_sample = {0}; + HRESULT hr; + + /* We do not expect pin connection state to change while the filter is + * running. This guarantee is necessary, since otherwise we would have to + * take the filter lock, and we can't take the filter lock from a streaming + * thread. */ + if (!filter->source.pMemInputPin) + { + WARN("Source is not connected, returning VFW_E_NOT_CONNECTED.\n"); + return VFW_E_NOT_CONNECTED; + } + + if (filter->filter.state == State_Stopped) + return VFW_E_WRONG_STATE; + + if (filter->sink.flushing) + return S_FALSE; + + input_wg_sample.max_size = IMediaSample_GetSize(sample); + input_wg_sample.size = IMediaSample_GetActualDataLength(sample); + + hr = IMediaSample_GetPointer(sample, &input_wg_sample.data); + if (FAILED(hr)) + return hr; + + hr = wg_transform_push_data(filter->transform, &input_wg_sample); + if (FAILED(hr)) + return hr; + + for (;;) + { + struct wg_sample output_wg_sample = {0}; + IMediaSample *output_sample; + + hr = IMemAllocator_GetBuffer(filter->source.pAllocator, &output_sample, NULL, NULL, 0); + if (FAILED(hr)) + return hr; + + output_wg_sample.max_size = IMediaSample_GetSize(output_sample); + + hr = IMediaSample_GetPointer(output_sample, &output_wg_sample.data); + if (FAILED(hr)) + { + IMediaSample_Release(output_sample); + return hr; + } + + hr = wg_transform_read_data(filter->transform, &output_wg_sample); + if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) + { + IMediaSample_Release(output_sample); + break; + } + if (FAILED(hr)) + { + IMediaSample_Release(output_sample); + return hr; + } + + hr = IMediaSample_SetActualDataLength(output_sample, output_wg_sample.size); + if (FAILED(hr)) + { + IMediaSample_Release(output_sample); + return hr; + } + + hr = IMemInputPin_Receive(filter->source.pMemInputPin, output_sample); + if (FAILED(hr)) + { + IMediaSample_Release(output_sample); + return hr; + } + + IMediaSample_Release(output_sample); + } + + return S_OK; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = transform_sink_query_accept, .base.pin_query_interface = transform_sink_query_interface, + .pfnReceive = transform_sink_receive, }; static HRESULT transform_source_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt)

1 0

Huw Davies : dllhost: Try to load the dll server's factory at the start.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 7dd952d5a90ac9f18d119cb03292ca0d1cbff72c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dd952d5a90ac9f18d119cb0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 6 10:35:10 2022 +0100 dllhost: Try to load the dll server's factory at the start. This lets dllhost quit early if the factory cannot be loaded. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dllhost/dllhost.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 83700826f8b..9e3455ee15a 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -34,6 +34,7 @@ struct factory IMarshal IMarshal_iface; CLSID clsid; LONG ref; + IClassFactory *dll_factory; }; static inline struct factory *impl_from_IClassFactory(IClassFactory *iface) @@ -90,7 +91,10 @@ static ULONG WINAPI factory_Release(IClassFactory *iface) TRACE("(%p)->%lu\n", iface, ref); if (!ref) + { + if (factory->dll_factory) IClassFactory_Release(factory->dll_factory); HeapFree(GetProcessHeap(), 0, factory); + } return ref; } @@ -166,18 +170,10 @@ static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) { struct factory *factory = impl_from_IMarshal(iface); - IUnknown *object; - HRESULT hr; TRACE("(%p,%s,%p,%08lx,%p,%08lx)\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); - hr = CoGetClassObject(&factory->clsid, CLSCTX_INPROC_SERVER, NULL, iid, (void **)&object); - if (hr == S_OK) - { - hr = CoMarshalInterface(stream, iid, object, dwDestContext, pvDestContext, mshlflags); - IUnknown_Release(object); - } - return hr; + return CoMarshalInterface(stream, iid, (IUnknown *)factory->dll_factory, dwDestContext, pvDestContext, mshlflags); } static HRESULT WINAPI marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, @@ -275,10 +271,13 @@ static HRESULT WINAPI surrogate_LoadDllServer(ISurrogate *iface, const CLSID *cl factory->IMarshal_iface.lpVtbl = &Marshal_Vtbl; factory->clsid = *clsid; factory->ref = 1; + factory->dll_factory = NULL; - hr = CoRegisterClassObject(clsid, (IUnknown *)&factory->IClassFactory_iface, - CLSCTX_LOCAL_SERVER, REGCLS_SURROGATE, &surrogate->cookie); - if (hr != S_OK) + hr = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void **)&factory->dll_factory); + if (SUCCEEDED(hr)) + hr = CoRegisterClassObject(clsid, (IUnknown *)&factory->IClassFactory_iface, + CLSCTX_LOCAL_SERVER, REGCLS_SURROGATE, &surrogate->cookie); + if (FAILED(hr)) IClassFactory_Release(&factory->IClassFactory_iface); else {

1 0

Eric Pouech : wineoss.drv: Use correct integral type.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: ed1b8cc19edd3c5f42063475859199110e661878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed1b8cc19edd3c5f42063475… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 6 16:10:11 2022 +0200 wineoss.drv: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/ossmidi.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9c1261ce05c..0a7c2011c63 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1315,7 +1315,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, params.stream = This->stream; params.data = data; params.frames = frames; - params.flags = flags; + params.flags = (UINT*)flags; params.devpos = devpos; params.qpcpos = qpcpos; OSS_CALL(get_capture_buffer, &params); diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 09eed8085c4..b6fde8175ae 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -396,8 +396,8 @@ static UINT midi_init(void) if (sinfo.capabilities & SYNTH_CAP_INPUT) FIXME("Synthesizer supports MIDI in. Not yet supported.\n"); - TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%lx\n", - i, sinfo.synth_type, sinfo.synth_subtype, (long)sinfo.capabilities); + TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%x\n", + i, sinfo.synth_type, sinfo.synth_subtype, sinfo.capabilities); } TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n", @@ -489,10 +489,10 @@ static UINT midi_init(void) } src->caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ - TRACE("OSS info: midi[%d] dev-type=%d capa=%lx\n" + TRACE("OSS info: midi[%d] dev-type=%d capa=%x\n" "\tMidiOut[%d] name='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" "\tMidiIn [%d] name='%s' support=%d\n", - i, minfo.dev_type, (long)minfo.capabilities, + i, minfo.dev_type, minfo.capabilities, synth_devs + i, wine_dbgstr_w(dest->caps.szPname), dest->caps.wTechnology, dest->caps.wVoices, dest->caps.wNotes, dest->caps.wChannelMask, dest->caps.dwSupport, i, wine_dbgstr_w(src->caps.szPname), src->caps.dwSupport);

1 0

Eric Pouech : wineoss.drv: Enable compilation with long types.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 7219e6ecb4218e6c122ff953d93660a653a47461 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7219e6ecb4218e6c122ff953… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 6 16:10:18 2022 +0200 wineoss.drv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/Makefile.in | 1 - dlls/wineoss.drv/midi.c | 8 ++++---- dlls/wineoss.drv/mmaux.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 38 +++++++++++++++++++------------------- dlls/wineoss.drv/oss.c | 2 +- dlls/wineoss.drv/ossmidi.c | 13 +++++++------ 6 files changed, 32 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7219e6ecb4218e6c122f…

1 0

Eric Pouech : winealsa.drv: Use correct integral types.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 17d5450d9914f711ecc1e349e30b89dbab541fd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17d5450d9914f711ecc1e349… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 6 16:28:46 2022 +0200 winealsa.drv: Use correct integral types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 4 ++-- dlls/winealsa.drv/mmdevdrv.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 8b6a87aa864..33b405a884c 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -637,7 +637,7 @@ static snd_pcm_format_t alsa_format(const WAVEFORMATEX *fmt) return format; } -static int alsa_channel_index(DWORD flag) +static int alsa_channel_index(UINT flag) { switch(flag){ case SPEAKER_FRONT_LEFT: @@ -702,7 +702,7 @@ static HRESULT map_channels(EDataFlow flow, const WAVEFORMATEX *fmt, int *alsa_c if(flow != eCapture && (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2) ){ WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - DWORD mask, flag = SPEAKER_FRONT_LEFT; + UINT mask, flag = SPEAKER_FRONT_LEFT; UINT i = 0; if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1a99f0ac26c..c2ccfe0000e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1363,7 +1363,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, params.stream = This->stream; params.data = data; params.frames = frames; - params.flags = flags; + params.flags = (UINT*)flags; params.devpos = devpos; params.qpcpos = qpcpos;

1 0

Eric Pouech : winealsa.drv: Enable compilation with long types.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 053b78b934c293fb4b16376c072f1911f56716e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=053b78b934c293fb4b16376c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 6 16:28:52 2022 +0200 winealsa.drv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/Makefile.in | 1 - dlls/winealsa.drv/alsa.c | 8 ++++---- dlls/winealsa.drv/alsamidi.c | 6 +++--- dlls/winealsa.drv/midi.c | 6 +++--- dlls/winealsa.drv/mmdevdrv.c | 40 ++++++++++++++++++++-------------------- 5 files changed, 30 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=053b78b934c293fb4b16…

1 0

Rémi Bernon : windows.gaming.input: Introduce a new type-pruning WineAsyncOperationCompletedHandler.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: d99ee0273bc90a92378e514755904fc7b875e9e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99ee0273bc90a92378e5147… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 11:21:05 2022 +0200 windows.gaming.input: Introduce a new type-pruning WineAsyncOperationCompletedHandler. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/async.c | 23 +++++++++++++---------- dlls/windows.gaming.input/provider.idl | 3 +++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index 91ecdeb9550..6afbca96831 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -19,6 +19,7 @@ */ #include "private.h" +#include "provider.h" #include "wine/debug.h" @@ -33,7 +34,6 @@ struct async_bool IAsyncInfo IAsyncInfo_iface; LONG ref; - IAsyncOperationCompletedHandler_boolean *handler; BOOLEAN result; async_operation_boolean_callback callback; @@ -41,6 +41,7 @@ struct async_bool IInspectable *invoker; CRITICAL_SECTION cs; + IWineAsyncOperationCompletedHandler *handler; AsyncStatus status; HRESULT hr; }; @@ -195,7 +196,7 @@ static ULONG WINAPI async_bool_Release( IAsyncOperation_boolean *iface ) if (!ref) { IAsyncInfo_Close( &impl->IAsyncInfo_iface ); - if (impl->handler && impl->handler != HANDLER_NOT_SET) IAsyncOperationCompletedHandler_boolean_Release( impl->handler ); + if (impl->handler && impl->handler != HANDLER_NOT_SET) IWineAsyncOperationCompletedHandler_Release( impl->handler ); IInspectable_Release( impl->invoker ); DeleteCriticalSection( &impl->cs ); free( impl ); @@ -223,8 +224,9 @@ static HRESULT WINAPI async_bool_GetTrustLevel( IAsyncOperation_boolean *iface, return E_NOTIMPL; } -static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, IAsyncOperationCompletedHandler_boolean *handler ) +static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, IAsyncOperationCompletedHandler_boolean *bool_handler ) { + IWineAsyncOperationCompletedHandler *handler = (IWineAsyncOperationCompletedHandler *)bool_handler; struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); HRESULT hr = S_OK; @@ -235,7 +237,7 @@ static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, else if (impl->handler != HANDLER_NOT_SET) hr = E_ILLEGAL_DELEGATE_ASSIGNMENT; else if ((impl->handler = handler)) { - IAsyncOperationCompletedHandler_boolean_AddRef( impl->handler ); + IWineAsyncOperationCompletedHandler_AddRef( impl->handler ); if (impl->status > Started) { @@ -244,8 +246,8 @@ static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, impl->handler = NULL; /* Prevent concurrent invoke. */ LeaveCriticalSection( &impl->cs ); - IAsyncOperationCompletedHandler_boolean_Invoke( handler, operation, status ); - IAsyncOperationCompletedHandler_boolean_Release( handler ); + IWineAsyncOperationCompletedHandler_Invoke( handler, (IInspectable *)operation, status ); + IWineAsyncOperationCompletedHandler_Release( handler ); return S_OK; } @@ -255,8 +257,9 @@ static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, return hr; } -static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, IAsyncOperationCompletedHandler_boolean **handler ) +static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, IAsyncOperationCompletedHandler_boolean **bool_handler ) { + IWineAsyncOperationCompletedHandler **handler = (IWineAsyncOperationCompletedHandler **)bool_handler; struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); HRESULT hr = S_OK; @@ -321,13 +324,13 @@ static void CALLBACK async_run_cb( TP_CALLBACK_INSTANCE *instance, void *data, T if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) { - IAsyncOperationCompletedHandler_boolean *handler = impl->handler; + IWineAsyncOperationCompletedHandler *handler = impl->handler; AsyncStatus status = impl->status; impl->handler = NULL; /* Prevent concurrent invoke. */ LeaveCriticalSection( &impl->cs ); - IAsyncOperationCompletedHandler_boolean_Invoke( handler, operation, status ); - IAsyncOperationCompletedHandler_boolean_Release( handler ); + IWineAsyncOperationCompletedHandler_Invoke( handler, (IInspectable *)operation, status ); + IWineAsyncOperationCompletedHandler_Release( handler ); } else LeaveCriticalSection( &impl->cs ); diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl index 60eaab34506..5f718cb167b 100644 --- a/dlls/windows.gaming.input/provider.idl +++ b/dlls/windows.gaming.input/provider.idl @@ -38,6 +38,9 @@ namespace Windows.Gaming.Input.Custom { interface IWineGameControllerProvider; runtimeclass WineGameControllerProvider; + /* type-pruning version of AsyncOperationCompletedHandler<T> */ + delegate HRESULT WineAsyncOperationCompletedHandler([in] IInspectable *async, [in] AsyncStatus status); + enum WineGameControllerType { Joystick = 0,

1 0

Rémi Bernon : windows.gaming.input: Use a PROPVARIANT as async operation result.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: b985fe636237d6f26d228f41cb9b18829abd971f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b985fe636237d6f26d228f41… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 11:22:16 2022 +0200 windows.gaming.input: Use a PROPVARIANT as async operation result. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/async.c | 22 +++++++++++++++------- dlls/windows.gaming.input/force_feedback.c | 15 +++++++++------ dlls/windows.gaming.input/private.h | 4 ++-- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index 6afbca96831..cce2729f06b 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -34,14 +34,13 @@ struct async_bool IAsyncInfo IAsyncInfo_iface; LONG ref; - BOOLEAN result; - - async_operation_boolean_callback callback; + async_operation_callback callback; TP_WORK *async_run_work; IInspectable *invoker; CRITICAL_SECTION cs; IWineAsyncOperationCompletedHandler *handler; + PROPVARIANT result; AsyncStatus status; HRESULT hr; }; @@ -197,6 +196,7 @@ static ULONG WINAPI async_bool_Release( IAsyncOperation_boolean *iface ) { IAsyncInfo_Close( &impl->IAsyncInfo_iface ); if (impl->handler && impl->handler != HANDLER_NOT_SET) IWineAsyncOperationCompletedHandler_Release( impl->handler ); + PropVariantClear( &impl->result ); IInspectable_Release( impl->invoker ); DeleteCriticalSection( &impl->cs ); free( impl ); @@ -276,19 +276,24 @@ static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, static HRESULT WINAPI async_bool_GetResults( IAsyncOperation_boolean *iface, BOOLEAN *results ) { struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); + PROPVARIANT result = {.vt = VT_BOOL}; HRESULT hr; TRACE( "iface %p, results %p.\n", iface, results ); EnterCriticalSection( &impl->cs ); if (impl->status != Completed && impl->status != Error) hr = E_ILLEGAL_METHOD_CALL; + else if (impl->result.vt != result.vt) hr = E_UNEXPECTED; else { - *results = impl->result; + PropVariantCopy( &result, &impl->result ); + if (impl->result.vt == VT_UNKNOWN) PropVariantClear( &impl->result ); hr = impl->hr; } LeaveCriticalSection( &impl->cs ); + *results = result.boolVal; + PropVariantClear( &result ); return hr; } @@ -312,14 +317,15 @@ static void CALLBACK async_run_cb( TP_CALLBACK_INSTANCE *instance, void *data, T { IAsyncOperation_boolean *operation = data; struct async_bool *impl = impl_from_IAsyncOperation_boolean( operation ); - BOOLEAN result = FALSE; + PROPVARIANT result; HRESULT hr; + PropVariantInit( &result ); hr = impl->callback( impl->invoker, &result ); EnterCriticalSection( &impl->cs ); if (impl->status != Closed) impl->status = FAILED(hr) ? Error : Completed; - impl->result = result; + PropVariantCopy( &impl->result, &result ); impl->hr = hr; if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) @@ -335,9 +341,10 @@ static void CALLBACK async_run_cb( TP_CALLBACK_INSTANCE *instance, void *data, T else LeaveCriticalSection( &impl->cs ); IAsyncOperation_boolean_Release( operation ); + PropVariantClear( &result ); } -HRESULT async_operation_boolean_create( IInspectable *invoker, async_operation_boolean_callback callback, +HRESULT async_operation_boolean_create( IInspectable *invoker, async_operation_callback callback, IAsyncOperation_boolean **out ) { struct async_bool *impl; @@ -351,6 +358,7 @@ HRESULT async_operation_boolean_create( IInspectable *invoker, async_operation_b impl->handler = HANDLER_NOT_SET; impl->callback = callback; impl->status = Started; + impl->result.vt = VT_BOOL; if (!(impl->async_run_work = CreateThreadpoolWork( async_run_cb, &impl->IAsyncOperation_boolean_iface, NULL ))) { diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 24810d1d787..667c6d8d81b 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -212,13 +212,14 @@ static HRESULT WINAPI motor_StopAllEffects( IForceFeedbackMotor *iface ) return IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_STOPALL ); } -static HRESULT WINAPI motor_try_disable_async( IInspectable *iface, BOOLEAN *result ) +static HRESULT WINAPI motor_try_disable_async( IInspectable *iface, PROPVARIANT *result ) { struct motor *impl = impl_from_IForceFeedbackMotor( (IForceFeedbackMotor *)iface ); HRESULT hr; hr = IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_SETACTUATORSOFF ); - *result = SUCCEEDED(hr); + result->vt = VT_BOOL; + result->boolVal = SUCCEEDED(hr); return hr; } @@ -229,13 +230,14 @@ static HRESULT WINAPI motor_TryDisableAsync( IForceFeedbackMotor *iface, IAsyncO return async_operation_boolean_create( (IInspectable *)iface, motor_try_disable_async, async_op ); } -static HRESULT WINAPI motor_try_enable_async( IInspectable *iface, BOOLEAN *result ) +static HRESULT WINAPI motor_try_enable_async( IInspectable *iface, PROPVARIANT *result ) { struct motor *impl = impl_from_IForceFeedbackMotor( (IForceFeedbackMotor *)iface ); HRESULT hr; hr = IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_SETACTUATORSON ); - *result = SUCCEEDED(hr); + result->vt = VT_BOOL; + result->boolVal = SUCCEEDED(hr); return hr; } @@ -246,13 +248,14 @@ static HRESULT WINAPI motor_TryEnableAsync( IForceFeedbackMotor *iface, IAsyncOp return async_operation_boolean_create( (IInspectable *)iface, motor_try_enable_async, async_op ); } -static HRESULT WINAPI motor_try_reset_async( IInspectable *iface, BOOLEAN *result ) +static HRESULT WINAPI motor_try_reset_async( IInspectable *iface, PROPVARIANT *result ) { struct motor *impl = impl_from_IForceFeedbackMotor( (IForceFeedbackMotor *)iface ); HRESULT hr; hr = IDirectInputDevice8_SendForceFeedbackCommand( impl->device, DISFFC_RESET ); - *result = SUCCEEDED(hr); + result->vt = VT_BOOL; + result->boolVal = SUCCEEDED(hr); return hr; } diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 2c25aca9027..63c9c262f7a 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -67,8 +67,8 @@ extern void event_handlers_notify( struct list *list, IInspectable *element ); extern HRESULT force_feedback_motor_create( IDirectInputDevice8W *device, IForceFeedbackMotor **out ); -typedef HRESULT (WINAPI *async_operation_boolean_callback)( IInspectable *invoker, BOOLEAN *result ); -extern HRESULT async_operation_boolean_create( IInspectable *invoker, async_operation_boolean_callback callback, +typedef HRESULT (WINAPI *async_operation_callback)( IInspectable *invoker, PROPVARIANT *result ); +extern HRESULT async_operation_boolean_create( IInspectable *invoker, async_operation_callback callback, IAsyncOperation_boolean **out ); #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \

1 0

Rémi Bernon : windows.gaming.input: Split IAsyncInfo interface to a separate struct.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: c30c0abd24e336fb9bad098fae82e674417626b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c30c0abd24e336fb9bad098f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 11:25:53 2022 +0200 windows.gaming.input: Split IAsyncInfo interface to a separate struct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/async.c | 350 ++++++++++++++++++++++----------- dlls/windows.gaming.input/provider.idl | 12 ++ 2 files changed, 246 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c30c0abd24e336fb9bad…

1 0