diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 48dd93df551bc8078aa5b4c29868242d7aa7933f..f87ad2e80a4637b71cc342796c10b0982f387e14 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -72,7 +72,7 @@ static BOOL load_driver(const WCHAR *name) } #define LDFC(n) do { drvs.p##n = (void*)GetProcAddress(drvs.module, #n);\ - if(!drvs.p##n) return FALSE; } while(0); + if(!drvs.p##n) { FreeLibrary(drvs.module); return FALSE; } } while(0); LDFC(GetEndpointIDs); LDFC(GetAudioEndpoint); #undef LDFC diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8957457489ae17270a58835298564a27ea05f251..1bbb23c5451267d54e815c21436e2543420a3561 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -140,6 +140,18 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + if(reason == DLL_PROCESS_ATTACH){ + g_timer_q = CreateTimerQueue(); + if(!g_timer_q) + return FALSE; + + } + + return TRUE; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, UINT *num, UINT *def_index) { @@ -175,12 +187,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(void *key, IMMDevice *dev, TRACE("%p %p %d %p\n", key, dev, dataflow, out); - if(!g_timer_q){ - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return E_FAIL; - } - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 10201e7c96341e00c254630520002e34d2b04bc6..c3606426baf79a6ec7df3768b12b21bf738053f7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -159,6 +159,17 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + if(reason == DLL_PROCESS_ATTACH){ + g_timer_q = CreateTimerQueue(); + if(!g_timer_q) + return FALSE; + } + + return TRUE; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, AudioDeviceID ***keys, UINT *num, UINT *def_index) { @@ -344,12 +355,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(AudioDeviceID *adevid, IMMDevice *dev, TRACE("%p %d %p\n", dev, dataflow, out); - if(!g_timer_q){ - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return E_FAIL; - } - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index d3f5435b199164eae4cde5188f331568c6557da9..278b1b3bf1390430b83651c76a371d818de1073a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -151,6 +151,17 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + if(reason == DLL_PROCESS_ATTACH){ + g_timer_q = CreateTimerQueue(); + if(!g_timer_q) + return FALSE; + } + + return TRUE; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, UINT *num, UINT *def_index) { @@ -268,12 +279,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(char *devnode, IMMDevice *dev, TRACE("%s %p %d %p\n", devnode, dev, dataflow, out); - if(!g_timer_q){ - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return E_UNEXPECTED; - } - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY;