[PATCH v4 04/10] winecoreaudio: Implement function to (un)lock sessions.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winecoreaudio.drv/mmdevdrv.c | 61 +++++++++++++++++--------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index 21c2528cab1..9dff0bc6be7 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -75,6 +75,11 @@ static struct list g_sessions = LIST_INIT(g_sessions);

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);
@@ -452,9 +457,9 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface)
             UNIX_CALL(release_stream, &params);
             This->stream = 0;

-            EnterCriticalSection(&g_sessions_lock);
+            lock_sessions(TRUE);
             list_remove(&This->entry);
-            LeaveCriticalSection(&g_sessions_lock);
+            lock_sessions(FALSE);
         }
         HeapFree(GetProcessHeap(), 0, This->vols);
         IMMDevice_Release(This->parent);
@@ -641,10 +646,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;
     }

@@ -661,7 +666,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,

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

@@ -692,7 +697,7 @@ end:
         set_stream_volumes(This, -1);
     }

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

return params.result;
 }
@@ -934,7 +939,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
     if(!This->stream)
         return AUDCLNT_E_NOT_INITIALIZED;

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

if(IsEqualIID(riid, &IID_IAudioRenderClient)){
         if(This->dataflow != eRender){
@@ -998,7 +1003,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
     }

end:
-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);
     return hr;
 }

@@ -1492,7 +1497,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
     AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface);
     ULONG ref;

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

ref = InterlockedDecrement(&This->ref);
     TRACE("(%p) Refcount now %lu\n", This, ref);
@@ -1504,7 +1509,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
         HeapFree(GetProcessHeap(), 0, This);
     }

-    LeaveCriticalSection(&g_sessions_lock);
+    lock_sessions(FALSE);
     return ref;
 }

@@ -1520,11 +1525,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;
     }

@@ -1533,12 +1538,12 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface,
         UNIX_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;

@@ -1750,14 +1755,14 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume(
     if(context)
         FIXME("Notifications not supported yet\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, -1);

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

return S_OK;
 }
@@ -1790,14 +1795,14 @@ 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, -1);

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

return S_OK;
 }
@@ -1890,14 +1895,14 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume(
     if(index >= This->channel_count)
         return E_INVALIDARG;

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

This->vols[index] = level;

WARN("CoreAudio doesn't support per-channel volume control\n");
     set_stream_volumes(This, index);

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

return S_OK;
 }
@@ -1934,14 +1939,14 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes(
     if(count != This->channel_count)
         return E_INVALIDARG;

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

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

set_stream_volumes(This, -1);

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

return S_OK;
 }
@@ -1960,12 +1965,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;
 }
@@ -2051,7 +2056,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume(
     if(context)
         FIXME("Notifications not supported yet\n");

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

session->channel_vols[index] = level;

@@ -2059,7 +2064,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume(
     LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry)
         set_stream_volumes(client, index);

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

return S_OK;
 }
@@ -2104,7 +2109,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes(
     if(context)
         FIXME("Notifications not supported yet\n");

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

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

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

return S_OK;
 }