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

Francois Gouget : taskschd/tests: Fix the spelling of a test string.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 1017f0ae1b4da0f141a4d111666d695240db6ea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1017f0ae1b4da0f141a4d111666d69… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 16 03:06:08 2023 +0200 taskschd/tests: Fix the spelling of a test string. --- dlls/taskschd/tests/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 6db3a86ba8a..bf6e13be98b 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1380,7 +1380,7 @@ static void create_action(ITaskDefinition *taskdef) { static WCHAR task1_exe[] = L"task1.exe"; static WCHAR workdir[] = L"workdir"; - static WCHAR args[] = L"argumens"; + static WCHAR args[] = L"arguments"; static WCHAR comment[] = L"comment"; HRESULT hr; IActionCollection *actions;

1 0

Francois Gouget : uiautomationcore/tests: Fix the spelling of a win_skip() message.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 4c9e3051328ddb7ca6801e02612e0d0e5206cd1c URL: https://gitlab.winehq.org/wine/wine/-/commit/4c9e3051328ddb7ca6801e02612e0d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 15 20:57:18 2023 +0200 uiautomationcore/tests: Fix the spelling of a win_skip() message. --- dlls/uiautomationcore/tests/uiautomation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 35f2f18ffcf..8494f29212c 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -2975,7 +2975,7 @@ static void test_uia_prov_from_acc_ia2(void) CHECK_CALLED(Accessible2_get_accRole); CHECK_CALLED(Accessible2_QI_IAccIdentity); CHECK_CALLED(Accessible2_get_accParent); - win_skip("Win10v1909 doesn't support IAccessible2 interface comparsion, skipping tests.\n"); + win_skip("Win10v1909 doesn't support IAccessible2 interface comparison, skipping tests.\n"); return; } called_Accessible_get_accRole = expect_Accessible_get_accRole = 0; @@ -13188,7 +13188,7 @@ static void test_default_clientside_providers(void) UiaNodeRelease(node); /* - * Create a node repesenting an HWND that is a top-level window, but is + * Create a node representing an HWND that is a top-level window, but is * owned by another window. For top-level HWNDs, parent navigation will go * to the owner instead of the parent. */

1 0

Francois Gouget : dnsapi/tests: Ignore OPT records in the CNAME tests.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 477df6231a6175f10c0f37145f609932ed35ea2d URL: https://gitlab.winehq.org/wine/wine/-/commit/477df6231a6175f10c0f37145f6099… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 16 03:08:33 2023 +0200 dnsapi/tests: Ignore OPT records in the CNAME tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54848 --- dlls/dnsapi/tests/query.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index e4a821e1ce8..61b7ef093c3 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -110,7 +110,7 @@ static void test_DnsQuery(void) { ok(wcscmp(domain, ptr->pName), "did not expect a record for %s\n", wine_dbgstr_w(ptr->pName)); - ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA, + ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA || ptr->wType == DNS_TYPE_OPT, "unexpected record type %d\n", ptr->wType); ptr = ptr->pNext; } @@ -145,10 +145,13 @@ static void test_DnsQuery(void) while (ptr) { - ok(wcscmp(domain, ptr->pName), "did not expect a record for %s\n", - wine_dbgstr_w(ptr->pName)); - ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA, - "unexpected record type %d\n", ptr->wType); + if (ptr->wType != DNS_TYPE_OPT) + { + ok(wcscmp(domain, ptr->pName), "did not expect a record for %s\n", + wine_dbgstr_w(ptr->pName)); + ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA, + "unexpected record type %d\n", ptr->wType); + } ptr = ptr->pNext; } DnsRecordListFree(rec, DnsFreeRecordList);

1 0

Giovanni Mascellani : winegstreamer: Free the GStreamer buffer when freeing a WG parser stream.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 059f79be5dcf0ab55627cfd9a0a9f07bebc55790 URL: https://gitlab.winehq.org/wine/wine/-/commit/059f79be5dcf0ab55627cfd9a0a9f0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 10 14:42:53 2022 +0100 winegstreamer: Free the GStreamer buffer when freeing a WG parser stream. --- dlls/winegstreamer/wg_parser.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index e80d7501f2c..7776f7287df 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -815,6 +815,13 @@ static void free_stream(struct wg_parser_stream *stream) gst_object_unref(stream->their_src); gst_object_unref(stream->my_sink); + if (stream->buffer) + { + gst_buffer_unmap(stream->buffer, &stream->map_info); + gst_buffer_unref(stream->buffer); + stream->buffer = NULL; + } + pthread_cond_destroy(&stream->event_cond); pthread_cond_destroy(&stream->event_empty_cond);

1 0

Rémi Bernon : winegstreamer: Fix the CS cleanup in wg_sample_queue_destroy (Valgrind).
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 25cb216546d6bcf6cee7b1c89eafab826d89fdb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/25cb216546d6bcf6cee7b1c89eafab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 11 21:02:30 2023 +0200 winegstreamer: Fix the CS cleanup in wg_sample_queue_destroy (Valgrind). --- dlls/winegstreamer/wg_sample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index d4bb7a8b954..ea83440d9ad 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -298,7 +298,7 @@ void wg_sample_queue_destroy(struct wg_sample_queue *queue) wg_sample_queue_flush(queue, true); queue->cs.DebugInfo->Spare[0] = 0; - InitializeCriticalSection(&queue->cs); + DeleteCriticalSection(&queue->cs); free(queue); }

1 0

Rémi Bernon : dinput/tests: Add a zero-terminator for hardware ids (Valgrind).
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: cbbb88f2b4fd5d75eab9093aad07320b66e9f4a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbbb88f2b4fd5d75eab9093aad0732… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 16 14:12:19 2023 +0200 dinput/tests: Add a zero-terminator for hardware ids (Valgrind). --- dlls/dinput/tests/hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 87df44ac9a2..9a27f8e93ac 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -591,7 +591,7 @@ static BOOL find_hid_device_path( WCHAR *device_path ) BOOL bus_device_start(void) { - static const WCHAR bus_hardware_id[] = L"WINETEST\\BUS"; + static const WCHAR bus_hardware_ids[] = L"WINETEST\\BUS\0"; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; const WCHAR *service_name = L"winetest_bus"; WCHAR path[MAX_PATH], filename[MAX_PATH]; @@ -666,7 +666,7 @@ BOOL bus_device_start(void) ret = SetupDiCreateDeviceInfoW( set, L"root\\winetest\\0", &GUID_NULL, NULL, NULL, 0, &device ); ok( ret, "failed to create device, error %#lx\n", GetLastError() ); - ret = SetupDiSetDeviceRegistryPropertyW( set, &device, SPDRP_HARDWAREID, (const BYTE *)bus_hardware_id, sizeof(bus_hardware_id) ); + ret = SetupDiSetDeviceRegistryPropertyW( set, &device, SPDRP_HARDWAREID, (const BYTE *)bus_hardware_ids, sizeof(bus_hardware_ids) ); ok( ret, "failed to create set hardware ID, error %lu\n", GetLastError() ); ret = SetupDiCallClassInstaller( DIF_REGISTERDEVICE, set, &device ); @@ -677,7 +677,7 @@ BOOL bus_device_start(void) GetFullPathNameW( L"winetest.inf", ARRAY_SIZE(path), path, NULL ); - ret = UpdateDriverForPlugAndPlayDevicesW( NULL, bus_hardware_id, path, INSTALLFLAG_FORCE, &need_reboot ); + ret = UpdateDriverForPlugAndPlayDevicesW( NULL, bus_hardware_ids, path, INSTALLFLAG_FORCE, &need_reboot ); ok( ret, "failed to install device, error %lu\n", GetLastError() ); ok( !need_reboot, "expected no reboot necessary\n" );

1 0

Davide Beatrici : winepulse: Move AudioRenderClient into mmdevapi.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 4f5913e0c0aef66cff4a80a538de5270c01cf4da URL: https://gitlab.winehq.org/wine/wine/-/commit/4f5913e0c0aef66cff4a80a538de52… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 16 03:10:09 2023 +0200 winepulse: Move AudioRenderClient into mmdevapi. --- dlls/mmdevapi/client.c | 93 +++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 91 +----------------------------------------- 2 files changed, 94 insertions(+), 90 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 8c75c7d80a2..ea279da34a1 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -63,6 +63,11 @@ static inline struct audio_client *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, struct audio_client, IAudioClock2_iface); } +static inline struct audio_client *impl_from_IAudioRenderClient(IAudioRenderClient *iface) +{ + return CONTAINING_RECORD(iface, struct audio_client, IAudioRenderClient_iface); +} + static inline struct audio_client *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface) { return CONTAINING_RECORD(iface, struct audio_client, IAudioStreamVolume_iface); @@ -336,6 +341,94 @@ const IAudioClock2Vtbl AudioClock2_Vtbl = clock2_GetDevicePosition }; +static HRESULT WINAPI render_QueryInterface(IAudioRenderClient *iface, REFIID riid, void **ppv) +{ + struct audio_client *This = impl_from_IAudioRenderClient(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAudioRenderClient)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) { + return IUnknown_QueryInterface(This->marshal, riid, ppv); + } else { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI render_AddRef(IAudioRenderClient *iface) +{ + struct audio_client *This = impl_from_IAudioRenderClient(iface); + return IAudioClient3_AddRef(&This->IAudioClient3_iface); +} + +static ULONG WINAPI render_Release(IAudioRenderClient *iface) +{ + struct audio_client *This = impl_from_IAudioRenderClient(iface); + return IAudioClient3_Release(&This->IAudioClient3_iface); +} + +static HRESULT WINAPI render_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) +{ + struct audio_client *This = impl_from_IAudioRenderClient(iface); + struct get_render_buffer_params params; + + TRACE("(%p)->(%u, %p)\n", This, frames, data); + + if (!data) + return E_POINTER; + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + *data = NULL; + + params.stream = This->stream; + params.frames = frames; + params.data = data; + + WINE_UNIX_CALL(get_render_buffer, &params); + + return params.result; +} + +static HRESULT WINAPI render_ReleaseBuffer(IAudioRenderClient *iface, UINT32 written_frames, + DWORD flags) +{ + struct audio_client *This = impl_from_IAudioRenderClient(iface); + struct release_render_buffer_params params; + + TRACE("(%p)->(%u, %lx)\n", This, written_frames, flags); + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + params.stream = This->stream; + params.written_frames = written_frames; + params.flags = flags; + + WINE_UNIX_CALL(release_render_buffer, &params); + + return params.result; +} + +const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { + render_QueryInterface, + render_AddRef, + render_Release, + render_GetBuffer, + render_ReleaseBuffer +}; + static HRESULT WINAPI streamvolume_QueryInterface(IAudioStreamVolume *iface, REFIID riid, void **ppv) { diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 04a5fb81eb0..9ec0e3b7f46 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -125,7 +125,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) } static const IAudioClient3Vtbl AudioClient3_Vtbl; -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; +extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; @@ -141,11 +141,6 @@ static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); } -static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); -} - static void pulse_call(enum unix_funcs code, void *params) { NTSTATUS status; @@ -1332,90 +1327,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_InitializeSharedAudioStream, }; -static HRESULT WINAPI AudioRenderClient_QueryInterface( - IAudioRenderClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if (!ppv) - return E_POINTER; - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAudioRenderClient)) - *ppv = iface; - if (*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - if (IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->marshal, riid, ppv); - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, - UINT32 frames, BYTE **data) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct get_render_buffer_params params; - - TRACE("(%p)->(%u, %p)\n", This, frames, data); - - if (!data) - return E_POINTER; - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - *data = NULL; - - params.stream = This->stream; - params.frames = frames; - params.data = data; - pulse_call(get_render_buffer, &params); - return params.result; -} - -static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( - IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct release_render_buffer_params params; - - TRACE("(%p)->(%u, %lx)\n", This, written_frames, flags); - - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.written_frames = written_frames; - params.flags = flags; - pulse_call(release_render_buffer, &params); - return params.result; -} - -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { - AudioRenderClient_QueryInterface, - AudioRenderClient_AddRef, - AudioRenderClient_Release, - AudioRenderClient_GetBuffer, - AudioRenderClient_ReleaseBuffer -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioRenderClient.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 69b4dfbc7fbbe8a57f6349075c33914095dbd6a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/69b4dfbc7fbbe8a57f6349075c3391… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 16 03:12:28 2023 +0200 winealsa: Use mmdevapi's AudioRenderClient. --- dlls/winealsa.drv/mmdevdrv.c | 90 +------------------------------------------- 1 file changed, 1 insertion(+), 89 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c743d33c116..e556bf5d0c1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -70,7 +70,7 @@ static WCHAR drv_key_devicesW[256]; static const WCHAR guidW[] = {'g','u','i','d',0}; static const IAudioClient3Vtbl AudioClient3_Vtbl; -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; +extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; @@ -96,11 +96,6 @@ static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); } -static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1127,89 +1122,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_InitializeSharedAudioStream, }; -static HRESULT WINAPI AudioRenderClient_QueryInterface( - IAudioRenderClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAudioRenderClient)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->marshal, riid, ppv); - - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, - UINT32 frames, BYTE **data) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct get_render_buffer_params params; - - TRACE("(%p)->(%u, %p)\n", This, frames, data); - - if(!data) - return E_POINTER; - *data = NULL; - - params.stream = This->stream; - params.frames = frames; - params.data = data; - - ALSA_CALL(get_render_buffer, &params); - - return params.result; -} - -static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( - IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct release_render_buffer_params params; - - TRACE("(%p)->(%u, %lx)\n", This, written_frames, flags); - - params.stream = This->stream; - params.written_frames = written_frames; - params.flags = flags; - - ALSA_CALL(release_render_buffer, &params); - - return params.result; -} - -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { - AudioRenderClient_QueryInterface, - AudioRenderClient_AddRef, - AudioRenderClient_Release, - AudioRenderClient_GetBuffer, - AudioRenderClient_ReleaseBuffer -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioRenderClient.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 446a8f143a8318718769853ef62c3e0b05913917 URL: https://gitlab.winehq.org/wine/wine/-/commit/446a8f143a8318718769853ef62c3e… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 16 03:12:46 2023 +0200 winecoreaudio: Use mmdevapi's AudioRenderClient. --- dlls/winecoreaudio.drv/mmdevdrv.c | 86 +-------------------------------------- 1 file changed, 1 insertion(+), 85 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 4c3fcbc5897..756aab93f71 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -52,7 +52,7 @@ static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; static const IAudioClient3Vtbl AudioClient3_Vtbl; -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; +extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; @@ -90,11 +90,6 @@ static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); } -static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1092,85 +1087,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_InitializeSharedAudioStream, }; -static HRESULT WINAPI AudioRenderClient_QueryInterface( - IAudioRenderClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAudioRenderClient)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->marshal, riid, ppv); - - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, - UINT32 frames, BYTE **data) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct get_render_buffer_params params; - - TRACE("(%p)->(%u, %p)\n", This, frames, data); - - if(!data) - return E_POINTER; - *data = NULL; - - params.stream = This->stream; - params.frames = frames; - params.data = data; - UNIX_CALL(get_render_buffer, &params); - return params.result; -} - -static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( - IAudioRenderClient *iface, UINT32 frames, DWORD flags) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct release_render_buffer_params params; - - TRACE("(%p)->(%u, %lx)\n", This, frames, flags); - - params.stream = This->stream; - params.written_frames = frames; - params.flags = flags; - UNIX_CALL(release_render_buffer, &params); - return params.result; -} - -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { - AudioRenderClient_QueryInterface, - AudioRenderClient_AddRef, - AudioRenderClient_Release, - AudioRenderClient_GetBuffer, - AudioRenderClient_ReleaseBuffer -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioRenderClient.
by Alexandre Julliard 16 May '23

16 May '23

Module: wine Branch: master Commit: 7d7da2efb111fe7318a45891730be84b2b97a6f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d7da2efb111fe7318a45891730be8… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 16 03:13:06 2023 +0200 wineoss: Use mmdevapi's AudioRenderClient. --- dlls/wineoss.drv/mmdevdrv.c | 88 +-------------------------------------------- 1 file changed, 1 insertion(+), 87 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 323e96359c4..dac5790e384 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -78,7 +78,7 @@ static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); static const IAudioClient3Vtbl AudioClient3_Vtbl; -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; +extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; @@ -102,11 +102,6 @@ static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); } -static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1084,87 +1079,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_InitializeSharedAudioStream, }; -static HRESULT WINAPI AudioRenderClient_QueryInterface( - IAudioRenderClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAudioRenderClient)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->marshal, riid, ppv); - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, - UINT32 frames, BYTE **data) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct get_render_buffer_params params; - - TRACE("(%p)->(%u, %p)\n", This, frames, data); - - if(!data) - return E_POINTER; - - *data = NULL; - - params.stream = This->stream; - params.frames = frames; - params.data = data; - OSS_CALL(get_render_buffer, &params); - - return params.result; -} - -static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( - IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct release_render_buffer_params params; - - TRACE("(%p)->(%u, %lx)\n", This, written_frames, flags); - - params.stream = This->stream; - params.written_frames = written_frames; - params.flags = flags; - OSS_CALL(release_render_buffer, &params); - - return params.result; -} - -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { - AudioRenderClient_QueryInterface, - AudioRenderClient_AddRef, - AudioRenderClient_Release, - AudioRenderClient_GetBuffer, - AudioRenderClient_ReleaseBuffer -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0