[PATCH v2 1/4] winepulse: Move AudioClient3 into mmdevapi.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/mmdevapi/client.c        | 38 +++++++++++++++++++++++++++++++++
 dlls/winepulse.drv/mmdevdrv.c | 40 ++++++++---------------------------
 2 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c
index ea279da34a1..6e706e455fd 100644
--- a/dlls/mmdevapi/client.c
+++ b/dlls/mmdevapi/client.c
@@ -53,6 +53,11 @@ static inline struct audio_client *impl_from_IAudioCaptureClient(IAudioCaptureCl
     return CONTAINING_RECORD(iface, struct audio_client, IAudioCaptureClient_iface);
 }

+static inline struct audio_client *impl_from_IAudioClient3(IAudioClient3 *iface)
+{
+    return CONTAINING_RECORD(iface, struct audio_client, IAudioClient3_iface);
+}
+
 static inline struct audio_client *impl_from_IAudioClock(IAudioClock *iface)
 {
     return CONTAINING_RECORD(iface, struct audio_client, IAudioClock_iface);
@@ -341,6 +346,39 @@ const IAudioClock2Vtbl AudioClock2_Vtbl =
     clock2_GetDevicePosition
 };

+HRESULT WINAPI client_GetSharedModeEnginePeriod(IAudioClient3 *iface,
+                                                const WAVEFORMATEX *format,
+                                                UINT32 *default_period_frames,
+                                                UINT32 *unit_period_frames,
+                                                UINT32 *min_period_frames,
+                                                UINT32 *max_period_frames)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    FIXME("(%p)->(%p, %p, %p, %p, %p) - stub\n", This, format, default_period_frames,
+                                                 unit_period_frames, min_period_frames,
+                                                 max_period_frames);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface,
+                                                       WAVEFORMATEX **cur_format,
+                                                       UINT32 *cur_period_frames)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    FIXME("(%p)->(%p, %p) - stub\n", This, cur_format, cur_period_frames);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, DWORD flags,
+                                                  UINT32 period_frames,
+                                                  const WAVEFORMATEX *format,
+                                                  const GUID *session_guid)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    FIXME("(%p)->(0x%lx, %u, %p, %s) - stub\n", This, flags, period_frames, format, debugstr_guid(session_guid));
+    return E_NOTIMPL;
+}
+
 static HRESULT WINAPI render_QueryInterface(IAudioRenderClient *iface, REFIID riid, void **ppv)
 {
     struct audio_client *This = impl_from_IAudioRenderClient(iface);
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 110f23e1319..99be7ccb43e 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -1129,38 +1129,16 @@ static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface,
     return E_NOTIMPL;
 }

-static HRESULT WINAPI AudioClient_GetSharedModeEnginePeriod(IAudioClient3 *iface,
+extern HRESULT WINAPI client_GetSharedModeEnginePeriod(IAudioClient3 *iface,
         const WAVEFORMATEX *format, UINT32 *default_period_frames, UINT32 *unit_period_frames,
-        UINT32 *min_period_frames, UINT32 *max_period_frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %p, %p, %p, %p)\n", This, format, default_period_frames, unit_period_frames,
-            min_period_frames, max_period_frames);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface,
-        WAVEFORMATEX **cur_format, UINT32 *cur_period_frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
+        UINT32 *min_period_frames, UINT32 *max_period_frames);

-    FIXME("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames);
+extern HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface,
+        WAVEFORMATEX **cur_format, UINT32 *cur_period_frames);

-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *iface,
+extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface,
         DWORD flags, UINT32 period_frames, const WAVEFORMATEX *format,
-        const GUID *session_guid)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid));
-
-    return E_NOTIMPL;
-}
+        const GUID *session_guid);

static const IAudioClient3Vtbl AudioClient3_Vtbl =
 {
@@ -1182,9 +1160,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_IsOffloadCapable,
     AudioClient_SetClientProperties,
     AudioClient_GetBufferSizeLimits,
-    AudioClient_GetSharedModeEnginePeriod,
-    AudioClient_GetCurrentSharedModeEnginePeriod,
-    AudioClient_InitializeSharedAudioStream,
+    client_GetSharedModeEnginePeriod,
+    client_GetCurrentSharedModeEnginePeriod,
+    client_InitializeSharedAudioStream,
 };

static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)