Davide Beatrici : winecoreaudio: Use mmdevapi's AudioClient2.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1d8e1716744f1428a587c3206e9caf9c29f47828
URL:    https://gitlab.winehq.org/wine/wine/-/commit/1d8e1716744f1428a587c3206e9caf9...

Author: Davide Beatrici <git(a)davidebeatrici.dev>
Date:   Thu May 25 10:23:30 2023 +0200

winecoreaudio: Use mmdevapi's AudioClient2.

---

 dlls/winecoreaudio.drv/mmdevdrv.c | 66 ++++++---------------------------------
 1 file changed, 9 insertions(+), 57 deletions(-)

diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index 66f7b658e24..67bf7b122a4 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -943,63 +943,15 @@ end:
     return hr;
 }
 
-static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient3 *iface,
-        AUDIO_STREAM_CATEGORY category, BOOL *offload_capable)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable);
-
-    if(!offload_capable)
-        return E_INVALIDARG;
-
-    *offload_capable = FALSE;
-
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface,
-        const AudioClientProperties *prop)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop;
-
-    TRACE("(%p)->(%p)\n", This, prop);
-
-    if(!legacy_prop)
-        return E_POINTER;
-
-    if(legacy_prop->cbSize == sizeof(AudioClientProperties)){
-        TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n",
-                legacy_prop->bIsOffload,
-                legacy_prop->eCategory,
-                prop->Options);
-    }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){
-        TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n",
-                legacy_prop->bIsOffload,
-                legacy_prop->eCategory);
-    }else{
-        WARN("Unsupported Size = %d\n", legacy_prop->cbSize);
-        return E_INVALIDARG;
-    }
-
-
-    if(legacy_prop->bIsOffload)
-        return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE;
+extern HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface,
+        AUDIO_STREAM_CATEGORY category, BOOL *offload_capable);
 
-    return S_OK;
-}
+extern HRESULT WINAPI client_SetClientProperties(IAudioClient3 *iface,
+        const AudioClientProperties *prop);
 
-static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface,
+extern HRESULT WINAPI client_GetBufferSizeLimits(IAudioClient3 *iface,
         const WAVEFORMATEX *format, BOOL event_driven, REFERENCE_TIME *min_duration,
-        REFERENCE_TIME *max_duration)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %u, %p, %p)\n", This, format, event_driven, min_duration, max_duration);
-
-    return E_NOTIMPL;
-}
+        REFERENCE_TIME *max_duration);
 
 extern HRESULT WINAPI client_GetSharedModeEnginePeriod(IAudioClient3 *iface,
         const WAVEFORMATEX *format, UINT32 *default_period_frames, UINT32 *unit_period_frames,
@@ -1029,9 +981,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_Reset,
     AudioClient_SetEventHandle,
     AudioClient_GetService,
-    AudioClient_IsOffloadCapable,
-    AudioClient_SetClientProperties,
-    AudioClient_GetBufferSizeLimits,
+    client_IsOffloadCapable,
+    client_SetClientProperties,
+    client_GetBufferSizeLimits,
     client_GetSharedModeEnginePeriod,
     client_GetCurrentSharedModeEnginePeriod,
     client_InitializeSharedAudioStream,