[PATCH 09/12] winepulse: Move get_audio_session into mmdevapi.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/mmdevapi/audiosessionmanager.c |  6 -----
 dlls/mmdevapi/session.c             | 41 ++++++++++++++++++++++++++---
 dlls/winepulse.drv/mmdevdrv.c       | 38 ++------------------------
 3 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/dlls/mmdevapi/audiosessionmanager.c b/dlls/mmdevapi/audiosessionmanager.c
index abba0ad3a1d..74368ea2be3 100644
--- a/dlls/mmdevapi/audiosessionmanager.c
+++ b/dlls/mmdevapi/audiosessionmanager.c
@@ -45,12 +45,6 @@ void sessions_unlock(void)
     LeaveCriticalSection(&g_sessions_lock);
 }

-HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device, UINT channels,
-                          struct audio_session **out)
-{
-    return E_NOTIMPL;
-}
-
 static inline struct session_mgr *impl_from_IAudioSessionManager2(IAudioSessionManager2 *iface)
 {
     return CONTAINING_RECORD(iface, struct session_mgr, IAudioSessionManager2_iface);
diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c
index 32718739f03..d63b5368078 100644
--- a/dlls/mmdevapi/session.c
+++ b/dlls/mmdevapi/session.c
@@ -40,7 +40,7 @@ extern void sessions_unlock(void) DECLSPEC_HIDDEN;

extern void set_stream_volumes(struct audio_client *This) DECLSPEC_HIDDEN;

-struct list sessions = LIST_INIT(sessions);
+static struct list sessions = LIST_INIT(sessions);

static inline struct audio_session_wrapper *impl_from_IAudioSessionControl2(IAudioSessionControl2 *iface)
 {
@@ -553,7 +553,7 @@ const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl =
     simplevolume_GetMute
 };

-void session_init_vols(struct audio_session *session, UINT channels)
+static void session_init_vols(struct audio_session *session, UINT channels)
 {
     if (session->channel_count < channels) {
         UINT i;
@@ -574,7 +574,7 @@ void session_init_vols(struct audio_session *session, UINT channels)
     }
 }

-struct audio_session *session_create(const GUID *guid, IMMDevice *device, UINT channels)
+static struct audio_session *session_create(const GUID *guid, IMMDevice *device, UINT channels)
 {
     struct audio_session *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
                                           sizeof(struct audio_session));
@@ -618,3 +618,38 @@ struct audio_session_wrapper *session_wrapper_create(struct audio_client *client

return ret;
 }
+
+/* If channels == 0, then this will return or create a session with
+ * matching dataflow and GUID. Otherwise, channels must also match. */
+HRESULT get_audio_session(const GUID *guid, IMMDevice *device, UINT channels,
+                          struct audio_session **out)
+{
+    struct audio_session *session;
+    const GUID null_guid = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };
+
+    TRACE("(%s, %p, %u, %p)\n", debugstr_guid(guid), device, channels, out);
+
+    if (!guid || IsEqualGUID(guid, &null_guid)) {
+        if (!(*out = session_create(&null_guid, device, channels)))
+            return E_OUTOFMEMORY;
+
+        return S_OK;
+    }
+
+    *out = NULL;
+    LIST_FOR_EACH_ENTRY(session, &sessions, struct audio_session, entry) {
+        if (session->device == device &&
+            IsEqualGUID(guid, &session->guid)) {
+            session_init_vols(session, channels);
+            *out = session;
+            break;
+        }
+    }
+
+    if (!*out) {
+        if (!(*out = session_create(guid, device, channels)))
+            return E_OUTOFMEMORY;
+    }
+
+    return S_OK;
+}
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 34237ebbef3..69658c4cfd1 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -56,7 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse);

#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)

-extern struct list sessions = LIST_INIT(sessions);
 static struct list g_devices_cache = LIST_INIT(g_devices_cache);

struct device_cache {
@@ -399,43 +398,10 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
     return S_OK;
 }

-extern void session_init_vols(AudioSession *session, UINT channels);
-
-extern AudioSession *create_session(const GUID *guid, IMMDevice *device,
-        UINT num_channels);
 /* if channels == 0, then this will return or create a session with
  * matching dataflow and GUID. otherwise, channels must also match */
-HRESULT get_audio_session(const GUID *sessionguid,
-        IMMDevice *device, UINT channels, AudioSession **out)
-{
-    AudioSession *session;
-
-    if (!sessionguid || IsEqualGUID(sessionguid, &GUID_NULL)) {
-        *out = create_session(&GUID_NULL, device, channels);
-        if (!*out)
-            return E_OUTOFMEMORY;
-
-        return S_OK;
-    }
-
-    *out = NULL;
-    LIST_FOR_EACH_ENTRY(session, &sessions, AudioSession, entry) {
-        if (session->device == device &&
-            IsEqualGUID(sessionguid, &session->guid)) {
-            session_init_vols(session, channels);
-            *out = session;
-            break;
-        }
-    }
-
-    if (!*out) {
-        *out = create_session(sessionguid, device, channels);
-        if (!*out)
-            return E_OUTOFMEMORY;
-    }
-
-    return S_OK;
-}
+extern HRESULT get_audio_session(const GUID *sessionguid,
+        IMMDevice *device, UINT channels, AudioSession **out);

HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device,
                                              AudioSessionWrapper **out)