Module: wine Branch: master Commit: d49a6b773e76e4c399a18d295d51e0c3053f2b87 URL: https://gitlab.winehq.org/wine/wine/-/commit/d49a6b773e76e4c399a18d295d51e0c...
Author: Davide Beatrici git@davidebeatrici.dev Date: Sat Jun 17 09:43:39 2023 +0200
winealsa: Use mmdevapi's stream_release.
---
dlls/winealsa.drv/mmdevdrv.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 916e04ff047..d8596c9371c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -81,6 +81,8 @@ extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN;
+extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); + extern WCHAR *get_application_name(void);
void DECLSPEC_HIDDEN sessions_lock(void) @@ -127,18 +129,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; }
-static HRESULT alsa_stream_release(stream_handle stream, HANDLE timer_thread) -{ - struct release_stream_params params; - - params.stream = stream; - params.timer_thread = timer_thread; - - ALSA_CALL(release_stream, ¶ms); - - return params.result; -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -443,7 +433,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } HeapFree(GetProcessHeap(), 0, This->vols); if (This->stream) - alsa_stream_release(This->stream, This->timer_thread); + stream_release(This->stream, This->timer_thread); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -648,7 +638,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
exit: if(FAILED(params.result)){ - alsa_stream_release(stream, NULL); + stream_release(stream, NULL); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; }else{