Davide Beatrici : winecoreaudio: Use mmdevapi's AudioClient's GetDevicePeriod, GetMixFormat, IsFormatSupported.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cff4a813e363d2395e06ce0f5d19cb3364340330
URL:    https://gitlab.winehq.org/wine/wine/-/commit/cff4a813e363d2395e06ce0f5d19cb3...

Author: Davide Beatrici 
Date:   Thu Jun  8 01:50:44 2023 +0200

winecoreaudio: Use mmdevapi's AudioClient's GetDevicePeriod, GetMixFormat, IsFormatSupported.

---

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

diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index 793899148d4..2541f4dabce 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -696,86 +696,15 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface,
     return params.result;
 }

-static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface,
+extern HRESULT WINAPI client_IsFormatSupported(IAudioClient3 *iface,
         AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx,
-        WAVEFORMATEX **outpwfx)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct is_format_supported_params params;
-
-    TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx);
-    if(pwfx) dump_fmt(pwfx);
-
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.share = mode;
-    params.fmt_in = pwfx;
-    params.fmt_out = NULL;
-
-    if(outpwfx){
-        *outpwfx = NULL;
-        if(mode == AUDCLNT_SHAREMODE_SHARED)
-            params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out));
-    }
-    UNIX_CALL(is_format_supported, &params);
-
-    if(params.result == S_FALSE)
-        *outpwfx = &params.fmt_out->Format;
-    else
-        CoTaskMemFree(params.fmt_out);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface,
-        WAVEFORMATEX **pwfx)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_mix_format_params params;
-
-    TRACE("(%p)->(%p)\n", This, pwfx);
-
-    if(!pwfx)
-        return E_POINTER;
-    *pwfx = NULL;
-
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE));
-    if(!params.fmt)
-        return E_OUTOFMEMORY;
+        WAVEFORMATEX **outpwfx);

-    UNIX_CALL(get_mix_format, &params);
+extern HRESULT WINAPI client_GetMixFormat(IAudioClient3 *iface,
+        WAVEFORMATEX **pwfx);

-    if(SUCCEEDED(params.result)){
-        *pwfx = &params.fmt->Format;
-        dump_fmt(*pwfx);
-    }else
-        CoTaskMemFree(params.fmt);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface,
-        REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_device_period_params params;
-
-    TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
-
-    if (!defperiod && !minperiod)
-        return E_POINTER;
-
-    params.device     = This->device_name;
-    params.flow       = This->dataflow;
-    params.def_period = defperiod;
-    params.min_period = minperiod;
-
-    UNIX_CALL(get_device_period, &params);
-
-    return params.result;
-}
+extern HRESULT WINAPI client_GetDevicePeriod(IAudioClient3 *iface,
+        REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod);

extern HRESULT WINAPI client_Start(IAudioClient3 *iface);

@@ -819,9 +748,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_GetBufferSize,
     AudioClient_GetStreamLatency,
     AudioClient_GetCurrentPadding,
-    AudioClient_IsFormatSupported,
-    AudioClient_GetMixFormat,
-    AudioClient_GetDevicePeriod,
+    client_IsFormatSupported,
+    client_GetMixFormat,
+    client_GetDevicePeriod,
     client_Start,
     client_Stop,
     client_Reset,