Francois Gouget : wineoss.drv: Give a name to the mmdevapi critical sections, make them static and delete them when unloading the dll.
Alexandre Julliard
julliard at winehq.org
Tue Nov 15 13:17:34 CST 2011
Module: wine
Branch: master
Commit: b6117b68699cc1abd1198e0c6ae29a7f4b4a9be7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6117b68699cc1abd1198e0c6ae29a7f4b4a9be7
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Tue Nov 15 14:39:45 2011 +0100
wineoss.drv: Give a name to the mmdevapi critical sections, make them static and delete them when unloading the dll.
---
dlls/wineoss.drv/mmdevdrv.c | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 24cd147..ac1b2a3 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -155,6 +155,13 @@ typedef struct _SessionMgr {
static HANDLE g_timer_q;
static CRITICAL_SECTION g_sessions_lock;
+static CRITICAL_SECTION_DEBUG g_sessions_lock_debug =
+{
+ 0, 0, &g_sessions_lock,
+ { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList },
+ 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") }
+};
+static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 };
static struct list g_sessions = LIST_INIT(g_sessions);
static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
@@ -223,14 +230,18 @@ static inline SessionMgr *impl_from_IAudioSessionManager2(IAudioSessionManager2
BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
{
- if(reason == DLL_PROCESS_ATTACH){
+ switch (reason)
+ {
+ case DLL_PROCESS_ATTACH:
g_timer_q = CreateTimerQueue();
if(!g_timer_q)
return FALSE;
+ break;
- InitializeCriticalSection(&g_sessions_lock);
+ case DLL_PROCESS_DETACH:
+ DeleteCriticalSection(&g_sessions_lock);
+ break;
}
-
return TRUE;
}
@@ -527,6 +538,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(char *devnode, IMMDevice *dev,
This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl;
InitializeCriticalSection(&This->lock);
+ This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ACImpl.lock");
This->parent = dev;
IMMDevice_AddRef(This->parent);
@@ -574,6 +586,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface)
if(!ref){
IAudioClient_Stop(iface);
IMMDevice_Release(This->parent);
+ This->lock.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&This->lock);
close(This->fd);
if(This->initted){
@@ -819,6 +832,7 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device,
list_add_head(&g_sessions, &ret->entry);
InitializeCriticalSection(&ret->lock);
+ ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock");
session_init_vols(ret, num_channels);
More information about the wine-cvs
mailing list