From: Davide Beatrici git@davidebeatrici.dev
--- dlls/winepulse.drv/mmdevdrv.c | 59 +++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 27 deletions(-)
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 7f1dbb765cf..fb0b3c46307 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -83,6 +83,11 @@ static CRITICAL_SECTION_DEBUG session_cs_debug = { }; static CRITICAL_SECTION session_cs = { &session_cs_debug, -1, 0, 0, 0, 0 };
+void lock_sessions(const BOOLEAN lock) +{ + lock ? EnterCriticalSection(&session_cs) : LeaveCriticalSection(&session_cs); +} + BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) { @@ -601,9 +606,9 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) if (This->stream) { pulse_release_stream(This->stream, This->timer_thread); This->stream = 0; - EnterCriticalSection(&session_cs); + lock_sessions(TRUE); list_remove(&This->entry); - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); } IUnknown_Release(This->marshal); IMMDevice_Release(This->parent); @@ -784,10 +789,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_INVALIDARG; }
- EnterCriticalSection(&session_cs); + lock_sessions(TRUE);
if (This->stream) { - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); return AUDCLNT_E_ALREADY_INITIALIZED; }
@@ -797,7 +802,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, if (!(pulse_thread = CreateThread(NULL, 0, pulse_mainloop_thread, event, 0, NULL))) { ERR("Failed to create mainloop thread.\n"); - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); CloseHandle(event); return E_FAIL; } @@ -820,14 +825,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, free(name); if (FAILED(hr = params.result)) { - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); return hr; }
if (!(This->vols = malloc(channel_count * sizeof(*This->vols)))) { pulse_release_stream(stream, NULL); - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); return E_OUTOFMEMORY; } for (i = 0; i < channel_count; i++) @@ -838,7 +843,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, { free(This->vols); This->vols = NULL; - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); pulse_release_stream(stream, NULL); return E_OUTOFMEMORY; } @@ -848,7 +853,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); set_stream_volumes(This);
- LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); return S_OK; }
@@ -1771,12 +1776,12 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if (count != This->channel_count) return E_INVALIDARG;
- EnterCriticalSection(&session_cs); + lock_sessions(TRUE); for (i = 0; i < count; ++i) This->vols[i] = levels[i];
set_stream_volumes(This); - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); return S_OK; }
@@ -1796,10 +1801,10 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if (count != This->channel_count) return E_INVALIDARG;
- EnterCriticalSection(&session_cs); + lock_sessions(TRUE); for (i = 0; i < count; ++i) levels[i] = This->vols[i]; - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); return S_OK; }
@@ -1818,10 +1823,10 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if (index >= This->channel_count) return E_INVALIDARG;
- EnterCriticalSection(&session_cs); + lock_sessions(TRUE); This->vols[index] = level; set_stream_volumes(This); - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); return S_OK; }
@@ -1840,9 +1845,9 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if (index >= This->channel_count) return E_INVALIDARG;
- EnterCriticalSection(&session_cs); + lock_sessions(TRUE); *level = This->vols[index]; - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); return S_OK; }
@@ -1940,7 +1945,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, if (!state) return NULL_PTR_ERR;
- EnterCriticalSection(&session_cs); + lock_sessions(TRUE); if (list_empty(&This->session->clients)) { *state = AudioSessionStateExpired; goto out; @@ -1961,7 +1966,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, *state = AudioSessionStateInactive;
out: - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); return S_OK; }
@@ -2172,11 +2177,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume(
TRACE("PulseAudio does not support session volume control\n");
- EnterCriticalSection(&session_cs); + lock_sessions(TRUE); session->master_vol = level; LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE);
return S_OK; } @@ -2209,11 +2214,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, if (context) FIXME("Notifications not supported yet\n");
- EnterCriticalSection(&session_cs); + lock_sessions(TRUE); session->mute = mute; LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE);
return S_OK; } @@ -2316,11 +2321,11 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume(
TRACE("PulseAudio does not support session volume control\n");
- EnterCriticalSection(&session_cs); + lock_sessions(TRUE); session->channel_vols[index] = level; LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE);
return S_OK; } @@ -2367,12 +2372,12 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes(
TRACE("PulseAudio does not support session volume control\n");
- EnterCriticalSection(&session_cs); + lock_sessions(TRUE); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&session_cs); + lock_sessions(FALSE); return S_OK; }