From 6b9df950067981e759d7d6ca63ca788a43888963 Mon Sep 17 00:00:00 2001
From: Davide Beatrici <git@davidebeatrici.dev>
Date: Tue, 6 Jun 2023 09:41:49 +0200
Subject: [PATCH] winepulse: Move session_wrapper_create into mmdevapi.

---
 dlls/mmdevapi/session.c       | 28 ++++++++++++++++++++++++++++
 dlls/winepulse.drv/mmdevdrv.c | 31 ++++---------------------------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c
index 81cea5b3482..e0625b59993 100644
--- a/dlls/mmdevapi/session.c
+++ b/dlls/mmdevapi/session.c
@@ -1,4 +1,9 @@
 /*
+ * Copyright 2011-2012 Maarten Lankhorst
+ * Copyright 2010-2011 Maarten Lankhorst for CodeWeavers
+ * Copyright 2011 Andrew Eikum for CodeWeavers
+ * Copyright 2022 Huw Davies
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -545,3 +550,26 @@ const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl =
     simplevolume_SetMute,
     simplevolume_GetMute
 };
+
+struct audio_session_wrapper *session_wrapper_create(struct audio_client *client)
+{
+    struct audio_session_wrapper *ret;
+
+    ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct audio_session_wrapper));
+    if (!ret)
+        return NULL;
+
+    ret->IAudioSessionControl2_iface.lpVtbl = &AudioSessionControl2_Vtbl;
+    ret->IChannelAudioVolume_iface.lpVtbl   = &ChannelAudioVolume_Vtbl;
+    ret->ISimpleAudioVolume_iface.lpVtbl    = &SimpleAudioVolume_Vtbl;
+
+    ret->ref    = 1;
+    ret->client = client;
+
+    if (client) {
+        ret->session = client->session;
+        IAudioClient3_AddRef(&client->IAudioClient3_iface);
+    }
+
+    return ret;
+}
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index b4b6b256e8a..3cd0073a6ad 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -134,7 +134,8 @@ extern const IAudioClockVtbl AudioClock_Vtbl;
 extern const IAudioClock2Vtbl AudioClock2_Vtbl;
 extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl;
 
-static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
+extern struct audio_session_wrapper *session_wrapper_create(
+    struct audio_client *client) DECLSPEC_HIDDEN;
 
 static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface)
 {
@@ -1057,7 +1058,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
                IsEqualIID(riid, &IID_ISimpleAudioVolume)) {
         const BOOLEAN new_session = !This->session_wrapper;
         if (new_session) {
-            This->session_wrapper = AudioSessionWrapper_Create(This);
+            This->session_wrapper = session_wrapper_create(This);
             if (!This->session_wrapper)
                 return E_OUTOFMEMORY;
         }
@@ -1125,30 +1126,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     client_InitializeSharedAudioStream,
 };
 
-static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
-{
-    AudioSessionWrapper *ret;
-
-    ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
-            sizeof(AudioSessionWrapper));
-    if (!ret)
-        return NULL;
-
-    ret->IAudioSessionControl2_iface.lpVtbl = &AudioSessionControl2_Vtbl;
-    ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl;
-    ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl;
-
-    ret->ref = 1;
-
-    ret->client = client;
-    if (client) {
-        ret->session = client->session;
-        IAudioClient3_AddRef(&client->IAudioClient3_iface);
-    }
-
-    return ret;
-}
-
 HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device,
                                              AudioSessionWrapper **out)
 {
@@ -1158,7 +1135,7 @@ HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device
     if(FAILED(hr))
         return hr;
 
-    *out = AudioSessionWrapper_Create(NULL);
+    *out = session_wrapper_create(NULL);
     if(!*out)
         return E_OUTOFMEMORY;
 
-- 
2.11.4.GIT