[PATCH 0/2] MR1267: winecoreaudio: DllMain() fixes.

[PATCH 1/2] winecoreaudio: Disable thread DllMain() calls.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/winecoreaudio.drv/mmdevdrv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index 5d8a9654a3a..ae2b88d6b79 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -198,6 +198,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
     switch (reason)
     {
     case DLL_PROCESS_ATTACH:
+        DisableThreadLibraryCalls(dll);
         if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs,
                                 &coreaudio_handle, sizeof(coreaudio_handle), NULL))
             return FALSE;

[PATCH 2/2] winecoreaudio: Clean up the timer queue handle in DllMain().

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/winecoreaudio.drv/mmdevdrv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index ae2b88d6b79..6715ab72e88 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -210,6 +210,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
     case DLL_PROCESS_DETACH:
         if (reserved) break;
         DeleteCriticalSection(&g_sessions_lock);
+        CloseHandle(g_timer_q);
         break;
     }
     return TRUE;

[PATCH 0/2] MR1267: winecoreaudio: DllMain() fixes. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.