[PATCH 5/5] wine{alsa,coreaudio,oss,pulse}: Move test_connect handling into mmdevapi.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/mmdevapi/main.c                          | 46 ++++++++++++++++++-
 dlls/mmdevapi/mmdevapi.h                      |  5 +-
 dlls/winealsa.drv/mmdevdrv.c                  |  5 --
 dlls/winealsa.drv/winealsa.drv.spec           |  1 -
 dlls/winecoreaudio.drv/mmdevdrv.c             |  5 --
 dlls/winecoreaudio.drv/winecoreaudio.drv.spec |  1 -
 dlls/wineoss.drv/mmdevdrv.c                   | 11 -----
 dlls/wineoss.drv/wineoss.drv.spec             |  1 -
 dlls/winepulse.drv/mmdevdrv.c                 | 11 -----
 dlls/winepulse.drv/winepulse.drv.spec         |  1 -
 10 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c
index e67c8f8b10a..a148555ca22 100644
--- a/dlls/mmdevapi/main.c
+++ b/dlls/mmdevapi/main.c
@@ -18,6 +18,7 @@
  */

#include <stdarg.h>
+#include <wchar.h>

#include "ntstatus.h"
 #define COBJMACROS
@@ -50,6 +51,26 @@ DriverFuncs drvs;

const WCHAR drv_keyW[] = L"Software\Wine\Drivers";

+static char *get_test_connect_name(void)
+{
+    WCHAR path[MAX_PATH], *name;
+    size_t len;
+    char *str;
+
+    GetModuleFileNameW(NULL, path, ARRAY_SIZE(path));
+
+    name = wcsrchr(path, '\');
+    name = name ? name + 1 : path;
+
+    len = WideCharToMultiByte(CP_UTF8, 0, name, -1, NULL, 0, NULL, NULL);
+    if (!(str = malloc(len)))
+        return NULL;
+
+    WideCharToMultiByte(CP_UNIXCP, 0, name, -1, str, len, NULL, NULL);
+
+    return str;
+}
+
 static const char *get_priority_string(int prio)
 {
     switch(prio){
@@ -95,7 +116,6 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver)

#define LDFC(n) do { driver->p##n = (void*)GetProcAddress(driver->module, #n);\
         if(!driver->p##n) { goto fail; } } while(0)
-    LDFC(GetPriority);
     LDFC(GetEndpointIDs);
     LDFC(GetAudioEndpoint);
     LDFC(GetAudioSessionManager);
@@ -104,7 +124,29 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver)
     /* optional - do not fail if not found */
     driver->pGetPropValue = (void*)GetProcAddress(driver->module, "GetPropValue");

-    driver->priority = driver->pGetPriority();
+    {
+        struct test_connect_params params;
+        char *name = get_test_connect_name();
+        params.name = name;
+
+        status = __wine_unix_call(driver->module_unixlib, test_connect, &params);
+
+        free(name);
+
+        switch (status)
+        {
+            case STATUS_SUCCESS:
+                driver->priority = params.priority;
+                break;
+            case STATUS_NOT_IMPLEMENTED:
+                driver->priority = Priority_Neutral;
+                break;
+            default:
+                ERR("Unable to retrieve driver priority: %lx\n", status);
+                goto fail;
+        }
+    }
+
     lstrcpyW(driver->module_name, driver_module);

TRACE("Successfully loaded %s with priority %s\n",
diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h
index 410d958bf46..bfbcc4ad96c 100644
--- a/dlls/mmdevapi/mmdevapi.h
+++ b/dlls/mmdevapi/mmdevapi.h
@@ -28,13 +28,12 @@ typedef struct _DriverFuncs {
     HMODULE module;
     unixlib_handle_t module_unixlib;
     WCHAR module_name[64];
-    int priority;

-    /* Returns a "priority" value for the driver. Highest priority wins.
+    /* Highest priority wins.
      * If multiple drivers think they are valid, they will return a
      * priority value reflecting the likelihood that they are actually
      * valid. See enum _DriverPriority. */
-    int (WINAPI *pGetPriority)(void);
+    int priority;

/* ids gets an array of human-friendly endpoint names
      * keys gets an array of driver-specific stuff that is used
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index ea48143005b..fb81faf9d00 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -212,11 +212,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
     return TRUE;
 }

-int WINAPI AUDDRV_GetPriority(void)
-{
-    return Priority_Neutral;
-}
-
 static HRESULT alsa_stream_release(stream_handle stream, HANDLE timer_thread)
 {
     struct release_stream_params params;
diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec
index bd83ea2e765..d846ade8ce2 100644
--- a/dlls/winealsa.drv/winealsa.drv.spec
+++ b/dlls/winealsa.drv/winealsa.drv.spec
@@ -4,7 +4,6 @@
 @ stdcall -private modMessage(long long long long long) ALSA_modMessage

# MMDevAPI driver functions
-@ stdcall -private GetPriority() AUDDRV_GetPriority
 @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs
 @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint
 @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager
diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index 367f7ba0ab8..877c1f7c3bc 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -213,11 +213,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
     return TRUE;
 }

-int WINAPI AUDDRV_GetPriority(void)
-{
-    return Priority_Neutral;
-}
-
 static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name,
         GUID *guid)
 {
diff --git a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec
index 9d9f781cf4e..1dfbfb79eb9 100644
--- a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec
+++ b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec
@@ -4,7 +4,6 @@
 @ stdcall -private modMessage(long long long long long) CoreAudio_modMessage

# MMDevAPI driver functions
-@ stdcall -private GetPriority() AUDDRV_GetPriority
 @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs
 @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint
 @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 7411f87a4d7..6993fa88d0a 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -226,17 +226,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
     return TRUE;
 }

-int WINAPI AUDDRV_GetPriority(void)
-{
-    struct test_connect_params params;
-
-    params.name = NULL;
-
-    OSS_CALL(test_connect, &params);
-
-    return params.priority;
-}
-
 static HRESULT stream_release(stream_handle stream, HANDLE timer_thread)
 {
     struct release_stream_params params;
diff --git a/dlls/wineoss.drv/wineoss.drv.spec b/dlls/wineoss.drv/wineoss.drv.spec
index fe6cc518c33..a093649e982 100644
--- a/dlls/wineoss.drv/wineoss.drv.spec
+++ b/dlls/wineoss.drv/wineoss.drv.spec
@@ -5,7 +5,6 @@
 @ stdcall -private modMessage(long long long long long) OSS_modMessage

# MMDevAPI driver functions
-@ stdcall -private GetPriority() AUDDRV_GetPriority
 @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs
 @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint
 @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 99dbe24c82f..b8151956c14 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -478,17 +478,6 @@ end:
     return params.result;
 }

-int WINAPI AUDDRV_GetPriority(void)
-{
-    struct test_connect_params params;
-    char *name;
-
-    params.name = name = get_application_name(FALSE);
-    pulse_call(test_connect, &params);
-    free(name);
-    return params.priority;
-}
-
 static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_NAME_LEN], EDataFlow *flow)
 {
     struct device_cache *device;
diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec
index 7aeb1756ed1..b822fd08353 100644
--- a/dlls/winepulse.drv/winepulse.drv.spec
+++ b/dlls/winepulse.drv/winepulse.drv.spec
@@ -1,5 +1,4 @@
 # MMDevAPI driver functions
-@ stdcall -private GetPriority() AUDDRV_GetPriority
 @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs
 @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint
 @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager