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

Alexandre Julliard : ntdll: Reimplement allocation inside a reserved area without using a callback.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 47404fb36cc2db312fcf4b7fdddfdedbd75b78b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/47404fb36cc2db312fcf4b7fdddfde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 12:12:02 2023 +0200 ntdll: Reimplement allocation inside a reserved area without using a callback. And make the allocation limits more explicit. --- dlls/ntdll/unix/virtual.c | 118 +++++++++++++++++++++++++++++----------------- 1 file changed, 74 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index f3362a8b6ef..0de7619ff86 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1390,7 +1390,7 @@ static void *map_free_area( void *base, void *end, size_t size, int top_down, in * * Find a free area between views inside the specified range. * virtual_mutex must be held by caller. - * The range must be inside the preloader reserved range. + * The range must be inside a reserved area. */ static void *find_reserved_free_area( void *base, void *end, size_t size, int top_down, size_t align_mask ) { @@ -1831,52 +1831,88 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want } -struct alloc_area -{ - size_t size; - int top_down; - void *limit; - void *result; - size_t align_mask; -}; - /*********************************************************************** - * alloc_reserved_area_callback + * find_reserved_free_area_outside_preloader * - * Try to map some space inside a reserved area. Callback for mmap_enum_reserved_areas. + * Find a free area inside a reserved area, skipping the preloader reserved range. + * virtual_mutex must be held by caller. */ -static int alloc_reserved_area_callback( void *start, SIZE_T size, void *arg ) +static void *find_reserved_free_area_outside_preloader( void *start, void *end, size_t size, + int top_down, size_t align_mask ) { - struct alloc_area *alloc = arg; - void *end = (char *)start + size; - - if (start < address_space_start) start = address_space_start; - if (is_beyond_limit( start, size, alloc->limit )) end = alloc->limit; - if (start >= end) return 0; + void *ret; - /* make sure we don't touch the preloader reserved range */ - if (preload_reserve_end >= start) + if (preload_reserve_end >= end) + { + if (preload_reserve_start <= start) return NULL; /* no space in that area */ + if (preload_reserve_start < end) end = preload_reserve_start; + } + else if (preload_reserve_start <= start) { - if (preload_reserve_end >= end) + if (preload_reserve_end > start) start = preload_reserve_end; + } + else /* range is split in two by the preloader reservation, try both parts */ + { + if (top_down) { - if (preload_reserve_start <= start) return 0; /* no space in that area */ - if (preload_reserve_start < end) end = preload_reserve_start; + ret = find_reserved_free_area( preload_reserve_end, end, size, top_down, align_mask ); + if (ret) return ret; + end = preload_reserve_start; } - else if (preload_reserve_start <= start) start = preload_reserve_end; else { - /* range is split in two by the preloader reservation, try first part */ - if ((alloc->result = find_reserved_free_area( start, preload_reserve_start, alloc->size, - alloc->top_down, alloc->align_mask ))) - return 1; - /* then fall through to try second part */ + ret = find_reserved_free_area( start, preload_reserve_start, size, top_down, align_mask ); + if (ret) return ret; start = preload_reserve_end; } } - if ((alloc->result = find_reserved_free_area( start, end, alloc->size, alloc->top_down, alloc->align_mask ))) - return 1; + return find_reserved_free_area( start, end, size, top_down, align_mask ); +} - return 0; +/*********************************************************************** + * map_reserved_area + * + * Try to map some space inside a reserved area. + * virtual_mutex must be held by caller. + */ +static void *map_reserved_area( void *limit_low, void *limit_high, size_t size, int top_down, + int unix_prot, size_t align_mask ) +{ + void *ptr = NULL; + struct reserved_area *area = LIST_ENTRY( ptr, struct reserved_area, entry ); + + if (top_down) + { + LIST_FOR_EACH_ENTRY_REV( area, &reserved_areas, struct reserved_area, entry ) + { + void *start = area->base; + void *end = (char *)start + area->size; + + if (start >= limit_high) continue; + if (end <= limit_low) return NULL; + if (start < limit_low) start = limit_low; + if (end > limit_high) end = limit_high; + ptr = find_reserved_free_area_outside_preloader( start, end, size, top_down, align_mask ); + if (ptr) break; + } + } + else + { + LIST_FOR_EACH_ENTRY( area, &reserved_areas, struct reserved_area, entry ) + { + void *start = area->base; + void *end = (char *)start + area->size; + + if (start >= limit_high) return NULL; + if (end <= limit_low) continue; + if (start < limit_low) start = limit_low; + if (end > limit_high) end = limit_high; + ptr = find_reserved_free_area_outside_preloader( start, end, size, top_down, align_mask ); + if (ptr) break; + } + } + if (ptr && anon_mmap_fixed( ptr, size, unix_prot, 0 ) != ptr) ptr = NULL; + return ptr; } /*********************************************************************** @@ -1966,30 +2002,24 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, } else { - struct alloc_area alloc; + void *start = address_space_start; + void *end = user_space_limit; size_t view_size, unmap_size; if (!align_mask) align_mask = granularity_mask; view_size = size + align_mask + 1; - alloc.size = size; - alloc.top_down = top_down; - alloc.limit = limit ? min( (void *)(limit + 1), user_space_limit ) : user_space_limit; - alloc.align_mask = align_mask; + if (limit && (void *)limit < end) end = (char *)limit + 1; - if (mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) + if ((ptr = map_reserved_area( start, end, size, top_down, get_unix_prot(vprot), align_mask ))) { - ptr = alloc.result; TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); - if (anon_mmap_fixed( ptr, size, get_unix_prot(vprot), 0 ) != ptr) - return STATUS_INVALID_PARAMETER; goto done; } if (limit) { - if (!(ptr = map_free_area( address_space_start, alloc.limit, size, - top_down, get_unix_prot(vprot), align_mask ))) + if (!(ptr = map_free_area( start, end, size, top_down, get_unix_prot(vprot), align_mask ))) return STATUS_NO_MEMORY; TRACE( "got mem with map_free_area %p-%p\n", ptr, (char *)ptr + size ); goto done;

1 0

Davide Beatrici : winepulse: Move AudioClient's SetEventHandle, Reset, Stop into mmdevapi.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 13f3d59275c8fde8d2e1f2c6f37e382185c0124d URL: https://gitlab.winehq.org/wine/wine/-/commit/13f3d59275c8fde8d2e1f2c6f37e38… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 7 00:25:01 2023 +0200 winepulse: Move AudioClient's SetEventHandle, Reset, Stop into mmdevapi. --- dlls/mmdevapi/client.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 56 ++++++------------------------------------- 2 files changed, 62 insertions(+), 49 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index d2d4939bc73..e30e459c6c5 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -196,6 +196,61 @@ const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = capture_GetNextPacketSize }; +HRESULT WINAPI client_Stop(IAudioClient3 *iface) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + struct stop_params params; + + TRACE("(%p)\n", This); + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + params.stream = This->stream; + + WINE_UNIX_CALL(stop, &params); + + return params.result; +} + +HRESULT WINAPI client_Reset(IAudioClient3 *iface) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + struct reset_params params; + + TRACE("(%p)\n", This); + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + params.stream = This->stream; + + WINE_UNIX_CALL(reset, &params); + + return params.result; +} + +HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface, HANDLE event) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + struct set_event_handle_params params; + + TRACE("(%p)->(%p)\n", This, event); + + if (!event) + return E_INVALIDARG; + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + params.stream = This->stream; + params.event = event; + + WINE_UNIX_CALL(set_event_handle, &params); + + return params.result; +} + HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, void **ppv) { struct audio_client *This = impl_from_IAudioClient3(iface); diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 19d4bd41c7a..64b399f2a2b 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -972,54 +972,12 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return S_OK; } -static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct stop_params params; +extern HRESULT WINAPI client_Stop(IAudioClient3 *iface); - TRACE("(%p)\n", This); +extern HRESULT WINAPI client_Reset(IAudioClient3 *iface); - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - pulse_call(stop, &params); - return params.result; -} - -static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct reset_params params; - - TRACE("(%p)\n", This); - - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - pulse_call(reset, &params); - return params.result; -} - -static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, - HANDLE event) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct set_event_handle_params params; - - TRACE("(%p)->(%p)\n", This, event); - - if (!event) - return E_INVALIDARG; - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.event = event; - pulse_call(set_event_handle, &params); - return params.result; -} +extern HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface, + HANDLE event); extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, void **ppv); @@ -1058,9 +1016,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_GetMixFormat, AudioClient_GetDevicePeriod, AudioClient_Start, - AudioClient_Stop, - AudioClient_Reset, - AudioClient_SetEventHandle, + client_Stop, + client_Reset, + client_SetEventHandle, client_GetService, client_IsOffloadCapable, client_SetClientProperties,

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioClient's SetEventHandle, Reset, Stop.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: f626aa2ab321c14e307054c28b35e5a6c8c0ed0d URL: https://gitlab.winehq.org/wine/wine/-/commit/f626aa2ab321c14e307054c28b35e5… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 7 00:27:13 2023 +0200 winealsa: Use mmdevapi's AudioClient's SetEventHandle, Reset, Stop. --- dlls/winealsa.drv/mmdevdrv.c | 63 +++++--------------------------------------- 1 file changed, 7 insertions(+), 56 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b96eba1e0fe..7c2a3d2d9d3 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -839,61 +839,12 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return params.result; } -static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct stop_params params; - - TRACE("(%p)\n", This); - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - - ALSA_CALL(stop, &params); - - return params.result; -} - -static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct reset_params params; - - TRACE("(%p)\n", This); - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - - ALSA_CALL(reset, &params); - - return params.result; -} - -static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, - HANDLE event) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct set_event_handle_params params; +extern HRESULT WINAPI client_Stop(IAudioClient3 *iface); - TRACE("(%p)->(%p)\n", This, event); +extern HRESULT WINAPI client_Reset(IAudioClient3 *iface); - if(!event) - return E_INVALIDARG; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.event = event; - - ALSA_CALL(set_event_handle, &params); - - return params.result; -} +extern HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface, + HANDLE event); extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, void **ppv); @@ -932,9 +883,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_GetMixFormat, AudioClient_GetDevicePeriod, AudioClient_Start, - AudioClient_Stop, - AudioClient_Reset, - AudioClient_SetEventHandle, + client_Stop, + client_Reset, + client_SetEventHandle, client_GetService, client_IsOffloadCapable, client_SetClientProperties,

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioClient's SetEventHandle, Reset, Stop.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: cc3362ec6c593ed577f4b683108c89a49c30ccd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc3362ec6c593ed577f4b683108c89… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 7 00:28:20 2023 +0200 winecoreaudio: Use mmdevapi's AudioClient's SetEventHandle, Reset, Stop. --- dlls/winecoreaudio.drv/mmdevdrv.c | 57 +++++---------------------------------- 1 file changed, 7 insertions(+), 50 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index dcd712c7c7a..3c3d9b0b1ac 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -811,55 +811,12 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return S_OK; } -static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct stop_params params; - - TRACE("(%p)\n", This); - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - UNIX_CALL(stop, &params); - return params.result; -} - -static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct reset_params params; - - TRACE("(%p)\n", This); - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - UNIX_CALL(reset, &params); - return params.result; -} - -static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, - HANDLE event) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct set_event_handle_params params; +extern HRESULT WINAPI client_Stop(IAudioClient3 *iface); - TRACE("(%p)->(%p)\n", This, event); +extern HRESULT WINAPI client_Reset(IAudioClient3 *iface); - if(!event) - return E_INVALIDARG; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.event = event; - UNIX_CALL(set_event_handle, &params); - return params.result; -} +extern HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface, + HANDLE event); extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, void **ppv); @@ -898,9 +855,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_GetMixFormat, AudioClient_GetDevicePeriod, AudioClient_Start, - AudioClient_Stop, - AudioClient_Reset, - AudioClient_SetEventHandle, + client_Stop, + client_Reset, + client_SetEventHandle, client_GetService, client_IsOffloadCapable, client_SetClientProperties,

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioClient's SetEventHandle, Reset, Stop.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 45cab2737d3908a7e236c59602bcb83b1386c8c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/45cab2737d3908a7e236c59602bcb8… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 7 00:29:00 2023 +0200 wineoss: Use mmdevapi's AudioClient's SetEventHandle, Reset, Stop. --- dlls/wineoss.drv/mmdevdrv.c | 60 ++++++--------------------------------------- 1 file changed, 7 insertions(+), 53 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 188bf37aac9..4864c9bf86f 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -805,58 +805,12 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return params.result; } -static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct stop_params params; - - TRACE("(%p)\n", This); - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; +extern HRESULT WINAPI client_Stop(IAudioClient3 *iface); - params.stream = This->stream; - OSS_CALL(stop, &params); - - return params.result; -} - -static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct reset_params params; - - TRACE("(%p)\n", This); - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; +extern HRESULT WINAPI client_Reset(IAudioClient3 *iface); - params.stream = This->stream; - OSS_CALL(reset, &params); - - return params.result; -} - -static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, - HANDLE event) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct set_event_handle_params params; - - TRACE("(%p)->(%p)\n", This, event); - - if(!event) - return E_INVALIDARG; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.event = event; - OSS_CALL(set_event_handle, &params); - - return params.result; -} +extern HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface, + HANDLE event); extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, void **ppv); @@ -895,9 +849,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_GetMixFormat, AudioClient_GetDevicePeriod, AudioClient_Start, - AudioClient_Stop, - AudioClient_Reset, - AudioClient_SetEventHandle, + client_Stop, + client_Reset, + client_SetEventHandle, client_GetService, client_IsOffloadCapable, client_SetClientProperties,

1 0

Davide Beatrici : winepulse: Lock sessions in AudioClient's Start.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 71a6691978a1b56effbd45307c0e4d7ce1369fd7 URL: https://gitlab.winehq.org/wine/wine/-/commit/71a6691978a1b56effbd45307c0e4d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 7 10:33:05 2023 +0200 winepulse: Lock sessions in AudioClient's Start. --- dlls/winepulse.drv/mmdevdrv.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 64b399f2a2b..1b0966b9634 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -952,24 +952,28 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); struct start_params params; - HRESULT hr; TRACE("(%p)\n", This); - if (!This->stream) + sessions_lock(); + + if (!This->stream) { + sessions_unlock(); return AUDCLNT_E_NOT_INITIALIZED; + } params.stream = This->stream; + pulse_call(start, &params); - if (FAILED(hr = params.result)) - return hr; - if (!This->timer_thread) { + if (SUCCEEDED(params.result) && !This->timer_thread) { This->timer_thread = CreateThread(NULL, 0, pulse_timer_cb, This, 0, NULL); SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } - return S_OK; + sessions_unlock(); + + return params.result; } extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

1 0

Davide Beatrici : winecoreaudio: Lock sessions in AudioClient's Start.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 8b64db9902dffbfb2db293ba2ae61733b02fee38 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b64db9902dffbfb2db293ba2ae617… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 7 10:34:36 2023 +0200 winecoreaudio: Lock sessions in AudioClient's Start. --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 3c3d9b0b1ac..4de22fa1ec6 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -791,24 +791,28 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); struct start_params params; - HRESULT hr; TRACE("(%p)\n", This); - if(!This->stream) + sessions_lock(); + + if(!This->stream) { + sessions_unlock(); return AUDCLNT_E_NOT_INITIALIZED; + } params.stream = This->stream; + UNIX_CALL(start, &params); - if(FAILED(hr = params.result)) - return hr; - if(!This->timer_thread) { + if(SUCCEEDED(params.result) && !This->timer_thread) { This->timer_thread = CreateThread(NULL, 0, ca_timer_thread, This, 0, NULL); SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } - return S_OK; + sessions_unlock(); + + return params.result; } extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

1 0

Davide Beatrici : winepulse: Move AudioClient's Start into mmdevapi.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 1c53edf33c824fab52e6439e67f8d6e8c8a5b617 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c53edf33c824fab52e6439e67f8d6… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 7 10:39:43 2023 +0200 winepulse: Move AudioClient's Start into mmdevapi. --- dlls/mmdevapi/client.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 40 ++-------------------------------------- 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index e30e459c6c5..9755dd2d8ef 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -80,6 +80,20 @@ static inline struct audio_client *impl_from_IAudioStreamVolume(IAudioStreamVolu return CONTAINING_RECORD(iface, struct audio_client, IAudioStreamVolume_iface); } +static DWORD CALLBACK timer_loop_func(void *user) +{ + struct timer_loop_params params; + struct audio_client *This = user; + + SetThreadDescription(GetCurrentThread(), L"audio_client_timer"); + + params.stream = This->stream; + + WINE_UNIX_CALL(timer_loop, &params); + + return 0; +} + static HRESULT WINAPI capture_QueryInterface(IAudioCaptureClient *iface, REFIID riid, void **ppv) { struct audio_client *This = impl_from_IAudioCaptureClient(iface); @@ -196,6 +210,33 @@ const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = capture_GetNextPacketSize }; +HRESULT WINAPI client_Start(IAudioClient3 *iface) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + struct start_params params; + + TRACE("(%p)\n", This); + + sessions_lock(); + + if (!This->stream) { + sessions_unlock(); + return AUDCLNT_E_NOT_INITIALIZED; + } + + params.stream = This->stream; + WINE_UNIX_CALL(start, &params); + + if (SUCCEEDED(params.result) && !This->timer_thread) { + This->timer_thread = CreateThread(NULL, 0, timer_loop_func, This, 0, NULL); + SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); + } + + sessions_unlock(); + + return params.result; +} + HRESULT WINAPI client_Stop(IAudioClient3 *iface) { struct audio_client *This = impl_from_IAudioClient3(iface); diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 1b0966b9634..b8b0eff3116 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -275,16 +275,6 @@ static WCHAR *get_application_name(BOOL query_app_name) return wcsdup(name); } -static DWORD WINAPI pulse_timer_cb(void *user) -{ - struct timer_loop_params params; - ACImpl *This = user; - params.stream = This->stream; - SetThreadDescription(GetCurrentThread(), L"winepulse_timer_loop"); - pulse_call(timer_loop, &params); - return 0; -} - static void set_stream_volumes(ACImpl *This) { struct set_volumes_params params; @@ -948,33 +938,7 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, return params.result; } -static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct start_params params; - - TRACE("(%p)\n", This); - - sessions_lock(); - - if (!This->stream) { - sessions_unlock(); - return AUDCLNT_E_NOT_INITIALIZED; - } - - params.stream = This->stream; - - pulse_call(start, &params); - - if (SUCCEEDED(params.result) && !This->timer_thread) { - This->timer_thread = CreateThread(NULL, 0, pulse_timer_cb, This, 0, NULL); - SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); - } - - sessions_unlock(); - - return params.result; -} +extern HRESULT WINAPI client_Start(IAudioClient3 *iface); extern HRESULT WINAPI client_Stop(IAudioClient3 *iface); @@ -1019,7 +983,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_IsFormatSupported, AudioClient_GetMixFormat, AudioClient_GetDevicePeriod, - AudioClient_Start, + client_Start, client_Stop, client_Reset, client_SetEventHandle,

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioClient's Start.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 32683df5c3bd76b5cf8f0f22f4f9362035df7989 URL: https://gitlab.winehq.org/wine/wine/-/commit/32683df5c3bd76b5cf8f0f22f4f936… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 7 01:05:55 2023 +0200 winealsa: Use mmdevapi's AudioClient's Start. --- dlls/winealsa.drv/mmdevdrv.c | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7c2a3d2d9d3..142d31484e5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -135,20 +135,6 @@ static HRESULT alsa_stream_release(stream_handle stream, HANDLE timer_thread) return params.result; } -static DWORD WINAPI alsa_timer_thread(void *user) -{ - struct timer_loop_params params; - ACImpl *This = user; - - SetThreadDescription(GetCurrentThread(), L"winealsa_timer"); - - params.stream = This->stream; - - ALSA_CALL(timer_loop, &params); - - return 0; -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -811,33 +797,7 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, return params.result; } -static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct start_params params; - - TRACE("(%p)\n", This); - - sessions_lock(); - - if(!This->stream){ - sessions_unlock(); - return AUDCLNT_E_NOT_INITIALIZED; - } - - params.stream = This->stream; - - ALSA_CALL(start, &params); - - if(SUCCEEDED(params.result) && !This->timer_thread){ - This->timer_thread = CreateThread(NULL, 0, alsa_timer_thread, This, 0, NULL); - SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); - } - - sessions_unlock(); - - return params.result; -} +extern HRESULT WINAPI client_Start(IAudioClient3 *iface); extern HRESULT WINAPI client_Stop(IAudioClient3 *iface); @@ -882,7 +842,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_IsFormatSupported, AudioClient_GetMixFormat, AudioClient_GetDevicePeriod, - AudioClient_Start, + client_Start, client_Stop, client_Reset, client_SetEventHandle,

1 0

Alex Henrie : vbscript: Fix memory leak on error path in RegExp2_Execute (scan-build).
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 100131fa7e2932120e143c686316f49583921307 URL: https://gitlab.winehq.org/wine/wine/-/commit/100131fa7e2932120e143c686316f4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 6 23:44:59 2023 -0600 vbscript: Fix memory leak on error path in RegExp2_Execute (scan-build). --- dlls/vbscript/vbregexp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 6023b25c929..641798f97dd 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1320,9 +1320,9 @@ static HRESULT WINAPI RegExp2_Execute(IRegExp2 *iface, break; hres = add_match(match_collection, add); + IMatch2_Release(add); if(FAILED(hres)) break; - IMatch2_Release(add); if(!(This->flags & REG_GLOB)) break;

1 0