[PATCH v2 2/9] winealsa: Implement function to (un)lock sessions.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winealsa.drv/mmdevdrv.c | 81 +++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index c46ae41f48b..65d8cafd35d 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -81,6 +81,11 @@ static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl;

static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);

+static void lock_sessions(const BOOLEAN lock)
+{
+    lock ? EnterCriticalSection(&g_sessions_lock) : LeaveCriticalSection(&g_sessions_lock);
+}
+
 static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface)
 {
     return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface);
@@ -480,9 +485,9 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface)
         IMMDevice_Release(This->parent);
         IUnknown_Release(This->marshal);
         if(This->session){
-            EnterCriticalSection(&g_sessions_lock);
+            lock_sessions(TRUE);
             list_remove(&This->entry);
-            LeaveCriticalSection(&g_sessions_lock);
+            lock_sessions(FALSE);
         }
         HeapFree(GetProcessHeap(), 0, This->vols);
         if (This->stream)
@@ -666,10 +671,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
         }
     }

-    EnterCriticalSection(&g_sessions_lock);
+    lock_sessions(TRUE);

if(This->stream){
-        LeaveCriticalSection(&g_sessions_lock);
+        lock_sessions(FALSE);
         return AUDCLNT_E_ALREADY_INITIALIZED;
     }

@@ -688,7 +693,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,

ALSA_CALL(create_stream, &params);
     if(FAILED(params.result)){
-        LeaveCriticalSection(&g_sessions_lock);
+        lock_sessions(FALSE);
         return params.result;
     }

@@ -718,7 +723,7 @@ exit:
         set_stream_volumes(This);
     }

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);

return params.result;
 }
@@ -876,10 +881,10 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)

TRACE("(%p)\n", This);

-    EnterCriticalSection(&g_sessions_lock);
+    lock_sessions(TRUE);

if(!This->stream){
-        LeaveCriticalSection(&g_sessions_lock);
+        lock_sessions(FALSE);
         return AUDCLNT_E_NOT_INITIALIZED;
     }

@@ -892,7 +897,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
         SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
     }

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);

return params.result;
 }
@@ -964,23 +969,23 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
         return E_POINTER;
     *ppv = NULL;

-    EnterCriticalSection(&g_sessions_lock);
+    lock_sessions(TRUE);

if(!This->stream){
-        LeaveCriticalSection(&g_sessions_lock);
+        lock_sessions(FALSE);
         return AUDCLNT_E_NOT_INITIALIZED;
     }

if(IsEqualIID(riid, &IID_IAudioRenderClient)){
         if(This->dataflow != eRender){
-            LeaveCriticalSection(&g_sessions_lock);
+            lock_sessions(FALSE);
             return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
         }
         IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface);
         *ppv = &This->IAudioRenderClient_iface;
     }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){
         if(This->dataflow != eCapture){
-            LeaveCriticalSection(&g_sessions_lock);
+            lock_sessions(FALSE);
             return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
         }
         IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface);
@@ -995,7 +1000,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
         if(!This->session_wrapper){
             This->session_wrapper = AudioSessionWrapper_Create(This);
             if(!This->session_wrapper){
-                LeaveCriticalSection(&g_sessions_lock);
+                lock_sessions(FALSE);
                 return E_OUTOFMEMORY;
             }
         }else
@@ -1006,7 +1011,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
         if(!This->session_wrapper){
             This->session_wrapper = AudioSessionWrapper_Create(This);
             if(!This->session_wrapper){
-                LeaveCriticalSection(&g_sessions_lock);
+                lock_sessions(FALSE);
                 return E_OUTOFMEMORY;
             }
         }else
@@ -1017,7 +1022,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
         if(!This->session_wrapper){
             This->session_wrapper = AudioSessionWrapper_Create(This);
             if(!This->session_wrapper){
-                LeaveCriticalSection(&g_sessions_lock);
+                lock_sessions(FALSE);
                 return E_OUTOFMEMORY;
             }
         }else
@@ -1027,11 +1032,11 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
     }

if(*ppv){
-        LeaveCriticalSection(&g_sessions_lock);
+        lock_sessions(FALSE);
         return S_OK;
     }

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);

FIXME("stub %s\n", debugstr_guid(riid));
     return E_NOINTERFACE;
@@ -1545,9 +1550,9 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
     TRACE("(%p) Refcount now %lu\n", This, ref);
     if(!ref){
         if(This->client){
-            EnterCriticalSection(&g_sessions_lock);
+            lock_sessions(TRUE);
             This->client->session_wrapper = NULL;
-            LeaveCriticalSection(&g_sessions_lock);
+            lock_sessions(FALSE);
             AudioClient_Release(&This->client->IAudioClient3_iface);
         }
         HeapFree(GetProcessHeap(), 0, This);
@@ -1567,11 +1572,11 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface,
     if(!state)
         return NULL_PTR_ERR;

-    EnterCriticalSection(&g_sessions_lock);
+    lock_sessions(TRUE);

if(list_empty(&This->session->clients)){
         *state = AudioSessionStateExpired;
-        LeaveCriticalSection(&g_sessions_lock);
+        lock_sessions(FALSE);
         return S_OK;
     }

@@ -1580,12 +1585,12 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface,
         ALSA_CALL(is_started, &params);
         if(params.result == S_OK){
             *state = AudioSessionStateActive;
-            LeaveCriticalSection(&g_sessions_lock);
+            lock_sessions(FALSE);
             return S_OK;
         }
     }

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);

*state = AudioSessionStateInactive;

@@ -1799,14 +1804,14 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume(

TRACE("ALSA does not support volume control\n");

-    EnterCriticalSection(&g_sessions_lock);
+    lock_sessions(TRUE);

session->master_vol = level;

LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry)
         set_stream_volumes(client);

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);

return S_OK;
 }
@@ -1839,13 +1844,13 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface,
     if(context)
         FIXME("Notifications not supported yet\n");

-    EnterCriticalSection(&g_sessions_lock);
+    lock_sessions(TRUE);

session->mute = mute;
     LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry)
         set_stream_volumes(client);

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);

return S_OK;
 }
@@ -1940,12 +1945,12 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume(

TRACE("ALSA does not support volume control\n");

-    EnterCriticalSection(&g_sessions_lock);
+    lock_sessions(TRUE);

This->vols[index] = level;
     set_stream_volumes(This);

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);

return S_OK;
 }
@@ -1984,13 +1989,13 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes(

TRACE("ALSA does not support volume control\n");

-    EnterCriticalSection(&g_sessions_lock);
+    lock_sessions(TRUE);

for(i = 0; i < count; ++i)
         This->vols[i] = levels[i];
     set_stream_volumes(This);

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);

return S_OK;
 }
@@ -2009,12 +2014,12 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes(
     if(count != This->channel_count)
         return E_INVALIDARG;

-    EnterCriticalSection(&g_sessions_lock);
+    lock_sessions(TRUE);

for(i = 0; i < count; ++i)
         levels[i] = This->vols[i];

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);

return S_OK;
 }
@@ -2102,14 +2107,14 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume(

TRACE("ALSA does not support volume control\n");

-    EnterCriticalSection(&g_sessions_lock);
+    lock_sessions(TRUE);

session->channel_vols[index] = level;

LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry)
         set_stream_volumes(client);

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);

return S_OK;
 }
@@ -2156,7 +2161,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes(

TRACE("ALSA does not support volume control\n");

-    EnterCriticalSection(&g_sessions_lock);
+    lock_sessions(TRUE);

for(i = 0; i < count; ++i)
         session->channel_vols[i] = levels[i];
@@ -2164,7 +2169,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes(
     LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry)
         set_stream_volumes(client);

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);

return S_OK;
 }