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

Alexandre Julliard : ntdll: Reimplement allocation of the virtual heap without using a callback.
by Alexandre Julliard June 8, 2023

June 8, 2023

Module: wine Branch: master Commit: b0aaa2f869dbdf0346650efe6b7f6a0257899be6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0aaa2f869dbdf0346650efe6b7f6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 13:04:31 2023 +0200 ntdll: Reimplement allocation of the virtual heap without using a callback. --- dlls/ntdll/unix/virtual.c | 69 +++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 0de7619ff86..3597935fd00 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3013,34 +3013,37 @@ done: } -struct alloc_virtual_heap +/* allocate some space for the virtual heap, if possible from a reserved area */ +static void *alloc_virtual_heap( SIZE_T size ) { - void *base; - size_t size; -}; - -/* callback for mmap_enum_reserved_areas to allocate space for the virtual heap */ -static int alloc_virtual_heap( void *base, SIZE_T size, void *arg ) -{ - struct alloc_virtual_heap *alloc = arg; - void *end = (char *)base + size; + struct reserved_area *area; + void *ret; - if (is_beyond_limit( base, size, address_space_limit )) address_space_limit = (char *)base + size; - if (is_win64 && base < (void *)0x80000000) return 0; - if (preload_reserve_end >= end) - { - if (preload_reserve_start <= base) return 0; /* no space in that area */ - if (preload_reserve_start < end) end = preload_reserve_start; - } - else if (preload_reserve_end > base) + LIST_FOR_EACH_ENTRY_REV( area, &reserved_areas, struct reserved_area, entry ) { - if (preload_reserve_start <= base) base = preload_reserve_end; - else if ((char *)end - (char *)preload_reserve_end >= alloc->size) base = preload_reserve_end; - else end = preload_reserve_start; + void *base = area->base; + void *end = (char *)base + area->size; + + if (is_beyond_limit( base, area->size, address_space_limit )) address_space_limit = end; + if (is_win64 && base < (void *)0x80000000) break; + if (preload_reserve_end >= end) + { + if (preload_reserve_start <= base) continue; /* no space in that area */ + if (preload_reserve_start < end) end = preload_reserve_start; + } + else if (preload_reserve_end > base) + { + if (preload_reserve_start <= base) base = preload_reserve_end; + else if ((char *)end - (char *)preload_reserve_end >= size) base = preload_reserve_end; + else end = preload_reserve_start; + } + if ((char *)end - (char *)base < size) continue; + ret = anon_mmap_fixed( (char *)end - size, size, PROT_READ | PROT_WRITE, 0 ); + if (ret == MAP_FAILED) continue; + mmap_remove_reserved_area( ret, size ); + return ret; } - if ((char *)end - (char *)base < alloc->size) return 0; - alloc->base = anon_mmap_fixed( (char *)end - alloc->size, alloc->size, PROT_READ|PROT_WRITE, 0 ); - return (alloc->base != MAP_FAILED); + return anon_mmap_alloc( size, PROT_READ | PROT_WRITE ); } /*********************************************************************** @@ -3050,7 +3053,6 @@ void virtual_init(void) { const struct preload_info **preload_info = dlsym( RTLD_DEFAULT, "wine_main_preload_info" ); const char *preload = getenv( "WINEPRELOADRESERVE" ); - struct alloc_virtual_heap alloc_views; size_t size; int i; pthread_mutexattr_t attr; @@ -3082,20 +3084,15 @@ void virtual_init(void) /* try to find space in a reserved area for the views and pages protection table */ #ifdef _WIN64 pages_vprot_size = ((size_t)address_space_limit >> page_shift >> pages_vprot_shift) + 1; - alloc_views.size = 2 * view_block_size + pages_vprot_size * sizeof(*pages_vprot); + size = 2 * view_block_size + pages_vprot_size * sizeof(*pages_vprot); #else - alloc_views.size = 2 * view_block_size + (1U << (32 - page_shift)); + size = 2 * view_block_size + (1U << (32 - page_shift)); #endif - if (mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_views, 1 )) - mmap_remove_reserved_area( alloc_views.base, alloc_views.size ); - else - alloc_views.base = anon_mmap_alloc( alloc_views.size, PROT_READ | PROT_WRITE ); - - assert( alloc_views.base != MAP_FAILED ); - view_block_start = alloc_views.base; + view_block_start = alloc_virtual_heap( size ); + assert( view_block_start != MAP_FAILED ); view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); - free_ranges = (void *)((char *)alloc_views.base + view_block_size); - pages_vprot = (void *)((char *)alloc_views.base + 2 * view_block_size); + free_ranges = (void *)((char *)view_block_start + view_block_size); + pages_vprot = (void *)((char *)view_block_start + 2 * view_block_size); wine_rb_init( &views_tree, compare_view ); free_ranges[0].base = (void *)0;

1 0

Daniel Lehman : msi: Release record instead of free.
by Alexandre Julliard June 8, 2023

June 8, 2023

Module: wine Branch: master Commit: 7b3690dd7399cd64123554c8a6fc7e35dcbebbe1 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b3690dd7399cd64123554c8a6fc7e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jun 7 20:10:18 2023 -0700 msi: Release record instead of free. ../dlls/msi/dialog.c:4476:11: warning: attempt to call free on non-heap object 'hdr' [-Wfree-nonheap-object] free( &rec->hdr ); ^ --- dlls/msi/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 91e7a567f55..1374f3b6274 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4473,7 +4473,7 @@ static UINT event_set_target_path( msi_dialog *dialog, const WCHAR *argument ) r = MSI_SetTargetPathW( dialog->package, argument, path ); free( path ); } - free( &rec->hdr ); + msiobj_release( &rec->hdr ); return r; }

1 0

Alex Henrie : msi: Fix memory leak on error path in MSI_ProcessMessage (scan-build).
by Alexandre Julliard June 8, 2023

June 8, 2023

Module: wine Branch: master Commit: d06b3fd5274b056c720e2fb42eb189052d99404d URL: https://gitlab.winehq.org/wine/wine/-/commit/d06b3fd5274b056c720e2fb42eb189… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 7 23:02:56 2023 -0600 msi: Fix memory leak on error path in MSI_ProcessMessage (scan-build). --- dlls/msi/package.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 9e34b7e6351..90293a10881 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1897,7 +1897,12 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC } template = malloc((wcslen(template_rec) + wcslen(template_prefix) + 1) * sizeof(WCHAR)); - if (!template) return ERROR_OUTOFMEMORY; + if (!template) + { + free(template_prefix); + free(template_rec); + return ERROR_OUTOFMEMORY; + } lstrcpyW(template, template_prefix); lstrcatW(template, template_rec);

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioClient's GetCurrentPadding, GetStreamLatency, GetBufferSize.
by Alexandre Julliard June 8, 2023

June 8, 2023

Module: wine Branch: master Commit: 786c3a0afc4cce90be053b1550ddc3b6a7b91226 URL: https://gitlab.winehq.org/wine/wine/-/commit/786c3a0afc4cce90be053b1550ddc3… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 8 02:01:22 2023 +0200 winecoreaudio: Use mmdevapi's AudioClient's GetCurrentPadding, GetStreamLatency, GetBufferSize. --- dlls/winecoreaudio.drv/mmdevdrv.c | 69 +++++---------------------------------- 1 file changed, 9 insertions(+), 60 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2541f4dabce..f268e9565b4 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -636,65 +636,14 @@ end: return params.result; } -static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, - UINT32 *frames) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_buffer_size_params params; - - TRACE("(%p)->(%p)\n", This, frames); - - if(!frames) - return E_POINTER; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.frames = frames; - UNIX_CALL(get_buffer_size, &params); - return params.result; -} - -static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, - REFERENCE_TIME *out) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_latency_params params; - - TRACE("(%p)->(%p)\n", This, out); - - if(!out) - return E_POINTER; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.latency = out; - UNIX_CALL(get_latency, &params); - return params.result; -} +extern HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, + UINT32 *frames); -static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, - UINT32 *numpad) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_current_padding_params params; +extern HRESULT WINAPI client_GetStreamLatency(IAudioClient3 *iface, + REFERENCE_TIME *out); - TRACE("(%p)->(%p)\n", This, numpad); - - if(!numpad) - return E_POINTER; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.padding = numpad; - UNIX_CALL(get_current_padding, &params); - return params.result; -} +extern HRESULT WINAPI client_GetCurrentPadding(IAudioClient3 *iface, + UINT32 *numpad); extern HRESULT WINAPI client_IsFormatSupported(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx, @@ -745,9 +694,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_AddRef, AudioClient_Release, AudioClient_Initialize, - AudioClient_GetBufferSize, - AudioClient_GetStreamLatency, - AudioClient_GetCurrentPadding, + client_GetBufferSize, + client_GetStreamLatency, + client_GetCurrentPadding, client_IsFormatSupported, client_GetMixFormat, client_GetDevicePeriod,

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioClient's GetCurrentPadding, GetStreamLatency, GetBufferSize.
by Alexandre Julliard June 8, 2023

June 8, 2023

Module: wine Branch: master Commit: 2cbaa59a26a16e81d241281d5bf0301c84a668f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/2cbaa59a26a16e81d241281d5bf030… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 8 02:01:37 2023 +0200 wineoss: Use mmdevapi's AudioClient's GetCurrentPadding, GetStreamLatency, GetBufferSize. --- dlls/wineoss.drv/mmdevdrv.c | 75 ++++++--------------------------------------- 1 file changed, 9 insertions(+), 66 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index dc76574c979..12f10fd4377 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -620,71 +620,14 @@ exit: return params.result; } -static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, - UINT32 *frames) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_buffer_size_params params; - - TRACE("(%p)->(%p)\n", This, frames); - - if(!frames) - return E_POINTER; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.frames = frames; - - OSS_CALL(get_buffer_size, &params); - TRACE("buffer size: %u\n", *frames); - - return params.result; -} - -static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, - REFERENCE_TIME *latency) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_latency_params params; - - TRACE("(%p)->(%p)\n", This, latency); - - if(!latency) - return E_POINTER; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; +extern HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, + UINT32 *frames); - params.stream = This->stream; - params.latency = latency; - OSS_CALL(get_latency, &params); - - return params.result; -} - -static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, - UINT32 *numpad) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_current_padding_params params; +extern HRESULT WINAPI client_GetStreamLatency(IAudioClient3 *iface, + REFERENCE_TIME *latency); - TRACE("(%p)->(%p)\n", This, numpad); - - if(!numpad) - return E_POINTER; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.padding = numpad; - OSS_CALL(get_current_padding, &params); - TRACE("padding: %u\n", *numpad); - - return params.result; -} +extern HRESULT WINAPI client_GetCurrentPadding(IAudioClient3 *iface, + UINT32 *numpad); extern HRESULT WINAPI client_IsFormatSupported(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt, @@ -735,9 +678,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_AddRef, AudioClient_Release, AudioClient_Initialize, - AudioClient_GetBufferSize, - AudioClient_GetStreamLatency, - AudioClient_GetCurrentPadding, + client_GetBufferSize, + client_GetStreamLatency, + client_GetCurrentPadding, client_IsFormatSupported, client_GetMixFormat, client_GetDevicePeriod,

1 0

Alex Henrie : winhttp: Fix double free on error path in queue_task (scan-build).
by Alexandre Julliard June 8, 2023

June 8, 2023

Module: wine Branch: master Commit: b630718149866ac7056588dc931793d54ae28eb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b630718149866ac7056588dc931793… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 7 22:20:46 2023 -0600 winhttp: Fix double free on error path in queue_task (scan-build). queue_task cannot free the struct because it doesn't know whether the struct contains pointers to other dynamically allocated memory that also needs to be freed (as is the case with struct send_request). --- dlls/winhttp/request.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 07d0ff19b7c..cf091244002 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -218,7 +218,6 @@ static DWORD queue_task( struct queue *queue, TASK_CALLBACK task, struct task_he if (!callback_running) { release_object( obj ); - free( task_hdr ); ERR( "Submiting threadpool callback failed, err %lu.\n", GetLastError() ); return ERROR_OUTOFMEMORY; }

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioClient's GetDevicePeriod, GetMixFormat, IsFormatSupported.
by Alexandre Julliard June 8, 2023

June 8, 2023

Module: wine Branch: master Commit: cff4a813e363d2395e06ce0f5d19cb3364340330 URL: https://gitlab.winehq.org/wine/wine/-/commit/cff4a813e363d2395e06ce0f5d19cb… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 8 01:50:44 2023 +0200 winecoreaudio: Use mmdevapi's AudioClient's GetDevicePeriod, GetMixFormat, IsFormatSupported. --- dlls/winecoreaudio.drv/mmdevdrv.c | 89 ++++----------------------------------- 1 file changed, 9 insertions(+), 80 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 793899148d4..2541f4dabce 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -696,86 +696,15 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, return params.result; } -static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, +extern HRESULT WINAPI client_IsFormatSupported(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx, - WAVEFORMATEX **outpwfx) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct is_format_supported_params params; - - TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx); - if(pwfx) dump_fmt(pwfx); - - params.device = This->device_name; - params.flow = This->dataflow; - params.share = mode; - params.fmt_in = pwfx; - params.fmt_out = NULL; - - if(outpwfx){ - *outpwfx = NULL; - if(mode == AUDCLNT_SHAREMODE_SHARED) - params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out)); - } - UNIX_CALL(is_format_supported, &params); - - if(params.result == S_FALSE) - *outpwfx = &params.fmt_out->Format; - else - CoTaskMemFree(params.fmt_out); - - return params.result; -} - -static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, - WAVEFORMATEX **pwfx) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_mix_format_params params; - - TRACE("(%p)->(%p)\n", This, pwfx); - - if(!pwfx) - return E_POINTER; - *pwfx = NULL; - - params.device = This->device_name; - params.flow = This->dataflow; - params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); - if(!params.fmt) - return E_OUTOFMEMORY; + WAVEFORMATEX **outpwfx); - UNIX_CALL(get_mix_format, &params); +extern HRESULT WINAPI client_GetMixFormat(IAudioClient3 *iface, + WAVEFORMATEX **pwfx); - if(SUCCEEDED(params.result)){ - *pwfx = &params.fmt->Format; - dump_fmt(*pwfx); - }else - CoTaskMemFree(params.fmt); - - return params.result; -} - -static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, - REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_device_period_params params; - - TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); - - if (!defperiod && !minperiod) - return E_POINTER; - - params.device = This->device_name; - params.flow = This->dataflow; - params.def_period = defperiod; - params.min_period = minperiod; - - UNIX_CALL(get_device_period, &params); - - return params.result; -} +extern HRESULT WINAPI client_GetDevicePeriod(IAudioClient3 *iface, + REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod); extern HRESULT WINAPI client_Start(IAudioClient3 *iface); @@ -819,9 +748,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_GetBufferSize, AudioClient_GetStreamLatency, AudioClient_GetCurrentPadding, - AudioClient_IsFormatSupported, - AudioClient_GetMixFormat, - AudioClient_GetDevicePeriod, + client_IsFormatSupported, + client_GetMixFormat, + client_GetDevicePeriod, client_Start, client_Stop, client_Reset,

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioClient's GetDevicePeriod, GetMixFormat, IsFormatSupported.
by Alexandre Julliard June 8, 2023

June 8, 2023

Module: wine Branch: master Commit: be356451fc64439abfcc5a2db9f466b1d0c28824 URL: https://gitlab.winehq.org/wine/wine/-/commit/be356451fc64439abfcc5a2db9f466… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 8 01:50:57 2023 +0200 wineoss: Use mmdevapi's AudioClient's GetDevicePeriod, GetMixFormat, IsFormatSupported. --- dlls/wineoss.drv/mmdevdrv.c | 89 +++++---------------------------------------- 1 file changed, 9 insertions(+), 80 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index a25b03676f2..dc76574c979 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -686,86 +686,15 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, return params.result; } -static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, +extern HRESULT WINAPI client_IsFormatSupported(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt, - WAVEFORMATEX **out) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct is_format_supported_params params; - - TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); - if(fmt) dump_fmt(fmt); - - params.device = This->device_name; - params.flow = This->dataflow; - params.share = mode; - params.fmt_in = fmt; - params.fmt_out = NULL; - - if(out){ - *out = NULL; - if(mode == AUDCLNT_SHAREMODE_SHARED) - params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out)); - } - OSS_CALL(is_format_supported, &params); - - if(params.result == S_FALSE) - *out = &params.fmt_out->Format; - else - CoTaskMemFree(params.fmt_out); - - return params.result; -} - -static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, - WAVEFORMATEX **pwfx) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_mix_format_params params; - - TRACE("(%p)->(%p)\n", This, pwfx); - - if(!pwfx) - return E_POINTER; - *pwfx = NULL; - - params.device = This->device_name; - params.flow = This->dataflow; - params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); - if(!params.fmt) - return E_OUTOFMEMORY; + WAVEFORMATEX **out); - OSS_CALL(get_mix_format, &params); +extern HRESULT WINAPI client_GetMixFormat(IAudioClient3 *iface, + WAVEFORMATEX **pwfx); - if(SUCCEEDED(params.result)){ - *pwfx = &params.fmt->Format; - dump_fmt(*pwfx); - } else - CoTaskMemFree(params.fmt); - - return params.result; -} - -static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, - REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_device_period_params params; - - TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); - - if (!defperiod && !minperiod) - return E_POINTER; - - params.device = This->device_name; - params.flow = This->dataflow; - params.def_period = defperiod; - params.min_period = minperiod; - - OSS_CALL(get_device_period, &params); - - return params.result; -} +extern HRESULT WINAPI client_GetDevicePeriod(IAudioClient3 *iface, + REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod); extern HRESULT WINAPI client_Start(IAudioClient3 *iface); @@ -809,9 +738,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_GetBufferSize, AudioClient_GetStreamLatency, AudioClient_GetCurrentPadding, - AudioClient_IsFormatSupported, - AudioClient_GetMixFormat, - AudioClient_GetDevicePeriod, + client_IsFormatSupported, + client_GetMixFormat, + client_GetDevicePeriod, client_Start, client_Stop, client_Reset,

1 0

Davide Beatrici : winepulse: Move AudioClient's GetCurrentPadding, GetStreamLatency, GetBufferSize into mmdevapi.
by Alexandre Julliard June 8, 2023

June 8, 2023

Module: wine Branch: master Commit: 182ae5b19b8a2711b0f79124408b3cf4f6a5fa3a URL: https://gitlab.winehq.org/wine/wine/-/commit/182ae5b19b8a2711b0f79124408b3c… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 8 02:00:29 2023 +0200 winepulse: Move AudioClient's GetCurrentPadding, GetStreamLatency, GetBufferSize into mmdevapi. --- dlls/mmdevapi/client.c | 63 +++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 66 ++++++------------------------------------- 2 files changed, 72 insertions(+), 57 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 78873234eec..03bfbabd536 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -244,6 +244,69 @@ const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = capture_GetNextPacketSize }; +HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, UINT32 *out) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + struct get_buffer_size_params params; + + TRACE("(%p)->(%p)\n", This, out); + + if (!out) + return E_POINTER; + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + params.stream = This->stream; + params.frames = out; + + WINE_UNIX_CALL(get_buffer_size, &params); + + return params.result; +} + +HRESULT WINAPI client_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *latency) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + struct get_latency_params params; + + TRACE("(%p)->(%p)\n", This, latency); + + if (!latency) + return E_POINTER; + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + params.stream = This->stream; + params.latency = latency; + + WINE_UNIX_CALL(get_latency, &params); + + return params.result; +} + +HRESULT WINAPI client_GetCurrentPadding(IAudioClient3 *iface, UINT32 *out) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + struct get_current_padding_params params; + + TRACE("(%p)->(%p)\n", This, out); + + if (!out) + return E_POINTER; + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + params.stream = This->stream; + params.padding = out; + + WINE_UNIX_CALL(get_current_padding, &params); + + return params.result; +} + HRESULT WINAPI client_IsFormatSupported(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt, WAVEFORMATEX **out) { diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index f6663c8d467..12e36fae827 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -796,62 +796,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return S_OK; } -static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, - UINT32 *out) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_buffer_size_params params; - - TRACE("(%p)->(%p)\n", This, out); - - if (!out) - return E_POINTER; - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.frames = out; - pulse_call(get_buffer_size, &params); - return params.result; -} - -static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, - REFERENCE_TIME *latency) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_latency_params params; - - TRACE("(%p)->(%p)\n", This, latency); +extern HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, + UINT32 *out); - if (!latency) - return E_POINTER; - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.latency = latency; - pulse_call(get_latency, &params); - return params.result; -} - -static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, - UINT32 *out) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_current_padding_params params; - - TRACE("(%p)->(%p)\n", This, out); - - if (!out) - return E_POINTER; - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; +extern HRESULT WINAPI client_GetStreamLatency(IAudioClient3 *iface, + REFERENCE_TIME *latency); - params.stream = This->stream; - params.padding = out; - pulse_call(get_current_padding, &params); - return params.result; -} +extern HRESULT WINAPI client_GetCurrentPadding(IAudioClient3 *iface, + UINT32 *out); extern HRESULT WINAPI client_IsFormatSupported(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt, @@ -902,9 +854,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_AddRef, AudioClient_Release, AudioClient_Initialize, - AudioClient_GetBufferSize, - AudioClient_GetStreamLatency, - AudioClient_GetCurrentPadding, + client_GetBufferSize, + client_GetStreamLatency, + client_GetCurrentPadding, client_IsFormatSupported, client_GetMixFormat, client_GetDevicePeriod,

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioClient's GetCurrentPadding, GetStreamLatency, GetBufferSize.
by Alexandre Julliard June 8, 2023

June 8, 2023

Module: wine Branch: master Commit: 896855c519dc38274147582540e053dcde05d88d URL: https://gitlab.winehq.org/wine/wine/-/commit/896855c519dc38274147582540e053… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 8 02:01:01 2023 +0200 winealsa: Use mmdevapi's AudioClient's GetCurrentPadding, GetStreamLatency, GetBufferSize. --- dlls/winealsa.drv/mmdevdrv.c | 77 ++++++-------------------------------------- 1 file changed, 9 insertions(+), 68 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 4f06d5b5f2d..7c7096d584a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -648,73 +648,14 @@ exit: return params.result; } -static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, - UINT32 *out) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_buffer_size_params params; - - TRACE("(%p)->(%p)\n", This, out); - - if(!out) - return E_POINTER; +extern HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, + UINT32 *out); - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; +extern HRESULT WINAPI client_GetStreamLatency(IAudioClient3 *iface, + REFERENCE_TIME *latency); - params.stream = This->stream; - params.frames = out; - - ALSA_CALL(get_buffer_size, &params); - - return params.result; -} - -static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, - REFERENCE_TIME *latency) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_latency_params params; - - TRACE("(%p)->(%p)\n", This, latency); - - if(!latency) - return E_POINTER; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.latency = latency; - - ALSA_CALL(get_latency, &params); - - return params.result; -} - -static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, - UINT32 *out) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - struct get_current_padding_params params; - - TRACE("(%p)->(%p)\n", This, out); - - if(!out) - return E_POINTER; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.padding = out; - - ALSA_CALL(get_current_padding, &params); - - TRACE("pad: %u\n", *out); - - return params.result; -} +extern HRESULT WINAPI client_GetCurrentPadding(IAudioClient3 *iface, + UINT32 *out); extern HRESULT WINAPI client_IsFormatSupported(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt, @@ -765,9 +706,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_AddRef, AudioClient_Release, AudioClient_Initialize, - AudioClient_GetBufferSize, - AudioClient_GetStreamLatency, - AudioClient_GetCurrentPadding, + client_GetBufferSize, + client_GetStreamLatency, + client_GetCurrentPadding, client_IsFormatSupported, client_GetMixFormat, client_GetDevicePeriod,

1 0