[PATCH v5 3/5] winepulse: Move process_attach and process_detach handling into mmdevapi.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/mmdevapi/main.c          | 18 +++++++++++++++---
 dlls/winepulse.drv/mmdevdrv.c |  4 +---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c
index b019d2e427c..d71b7948428 100644
--- a/dlls/mmdevapi/main.c
+++ b/dlls/mmdevapi/main.c
@@ -19,7 +19,9 @@

#include <stdarg.h>

+#include "ntstatus.h"
 #define COBJMACROS
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
@@ -87,6 +89,11 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver)
         goto fail;
     }

+    if ((status = __wine_unix_call(driver->module_unixlib, process_attach, NULL))) {
+        ERR("Unable to initialize library: %lx\n", status);
+        goto fail;
+    }
+
 #define LDFC(n) do { driver->p##n = (void*)GetProcAddress(driver->module, #n);\
         if(!driver->p##n) { goto fail; } } while(0)
     LDFC(GetPriority);
@@ -177,9 +184,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
             DisableThreadLibraryCalls(hinstDLL);
             break;
         case DLL_PROCESS_DETACH:
-            if(lpvReserved)
-                break;
-            MMDevEnum_Free();
+            if (drvs.module_unixlib) {
+                const NTSTATUS status = __wine_unix_call(drvs.module_unixlib, process_detach, NULL);
+                if (status)
+                    WARN("Unable to deinitialize library: %lx\n", status);
+            }
+
+            if (!lpvReserved)
+                MMDevEnum_Free();
             break;
     }

diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 5de9a941099..99dbe24c82f 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -87,14 +87,12 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
         DisableThreadLibraryCalls(dll);
         if (__wine_init_unix_call())
             return FALSE;
-        if (WINE_UNIX_CALL(process_attach, NULL))
-            return FALSE;
     } else if (reason == DLL_PROCESS_DETACH) {
         struct device_cache *device, *device_next;

LIST_FOR_EACH_ENTRY_SAFE(device, device_next, &g_devices_cache, struct device_cache, entry)
             free(device);
-        WINE_UNIX_CALL(process_detach, NULL);
+
         if (pulse_thread) {
             WaitForSingleObject(pulse_thread, INFINITE);
             CloseHandle(pulse_thread);