[PATCH 0/4] MR2792: wine{alsa,coreaudio,oss,pulse}: Move AudioClock into mmdevapi.

[Davide Beatrici (＠davidebeatrici)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2792

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

[Davide Beatrici]

From: Davide Beatrici <git(a)davidebeatrici.dev>

---
 dlls/mmdevapi/client.c        | 162 ++++++++++++++++++++++++++++++++++
 dlls/winepulse.drv/mmdevdrv.c | 153 +-------------------------------
 2 files changed, 164 insertions(+), 151 deletions(-)

diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c
index 312bc462c3b..4f3dc12b537 100644
--- a/dlls/mmdevapi/client.c
+++ b/dlls/mmdevapi/client.c
@@ -48,11 +48,173 @@ void set_stream_volumes(struct audio_client *This)
     WINE_UNIX_CALL(set_volumes, ¶ms);
 }
 
+static inline struct audio_client *impl_from_IAudioClock(IAudioClock *iface)
+{
+    return CONTAINING_RECORD(iface, struct audio_client, IAudioClock_iface);
+}
+
+static inline struct audio_client *impl_from_IAudioClock2(IAudioClock2 *iface)
+{
+    return CONTAINING_RECORD(iface, struct audio_client, IAudioClock2_iface);
+}
+
 static inline struct audio_client *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface)
 {
     return CONTAINING_RECORD(iface, struct audio_client, IAudioStreamVolume_iface);
 }
 
+static HRESULT WINAPI clock_QueryInterface(IAudioClock *iface, REFIID riid, void **ppv)
+{
+    struct audio_client *This = impl_from_IAudioClock(iface);
+
+    TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
+
+    if (!ppv)
+        return E_POINTER;
+
+    if (IsEqualIID(riid, &IID_IUnknown) ||
+        IsEqualIID(riid, &IID_IAudioClock))
+        *ppv = iface;
+    else if (IsEqualIID(riid, &IID_IAudioClock2))
+        *ppv = &This->IAudioClock2_iface;
+    else if (IsEqualIID(riid, &IID_IMarshal)) {
+        return IUnknown_QueryInterface(This->marshal, riid, ppv);
+    } else {
+        *ppv = NULL;
+        return E_NOINTERFACE;
+    }
+
+    IUnknown_AddRef((IUnknown *)*ppv);
+
+    return S_OK;
+}
+
+static ULONG WINAPI clock_AddRef(IAudioClock *iface)
+{
+    struct audio_client *This = impl_from_IAudioClock(iface);
+    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
+}
+
+static ULONG WINAPI clock_Release(IAudioClock *iface)
+{
+    struct audio_client *This = impl_from_IAudioClock(iface);
+    return IAudioClient3_Release(&This->IAudioClient3_iface);
+}
+
+static HRESULT WINAPI clock_GetFrequency(IAudioClock *iface, UINT64 *freq)
+{
+    struct audio_client *This = impl_from_IAudioClock(iface);
+    struct get_frequency_params params;
+
+    TRACE("(%p)->(%p)\n", This, freq);
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream = This->stream;
+    params.freq   = freq;
+
+    WINE_UNIX_CALL(get_frequency, ¶ms);
+
+    return params.result;
+}
+
+static HRESULT WINAPI clock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime)
+{
+    struct audio_client *This = impl_from_IAudioClock(iface);
+    struct get_position_params params;
+
+    TRACE("(%p)->(%p, %p)\n", This, pos, qpctime);
+
+    if (!pos)
+        return E_POINTER;
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream  = This->stream;
+    params.device  = FALSE;
+    params.pos     = pos;
+    params.qpctime = qpctime;
+
+    WINE_UNIX_CALL(get_position, ¶ms);
+
+    return params.result;
+}
+
+static HRESULT WINAPI clock_GetCharacteristics(IAudioClock *iface, DWORD *chars)
+{
+    struct audio_client *This = impl_from_IAudioClock(iface);
+
+    TRACE("(%p)->(%p)\n", This, chars);
+
+    if (!chars)
+        return E_POINTER;
+
+    *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ;
+
+    return S_OK;
+}
+
+const IAudioClockVtbl AudioClock_Vtbl =
+{
+    clock_QueryInterface,
+    clock_AddRef,
+    clock_Release,
+    clock_GetFrequency,
+    clock_GetPosition,
+    clock_GetCharacteristics
+};
+
+static HRESULT WINAPI clock2_QueryInterface(IAudioClock2 *iface, REFIID riid, void **ppv)
+{
+    struct audio_client *This = impl_from_IAudioClock2(iface);
+    return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv);
+}
+
+static ULONG WINAPI clock2_AddRef(IAudioClock2 *iface)
+{
+    struct audio_client *This = impl_from_IAudioClock2(iface);
+    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
+}
+
+static ULONG WINAPI clock2_Release(IAudioClock2 *iface)
+{
+    struct audio_client *This = impl_from_IAudioClock2(iface);
+    return IAudioClient3_Release(&This->IAudioClient3_iface);
+}
+
+static HRESULT WINAPI clock2_GetDevicePosition(IAudioClock2 *iface, UINT64 *pos, UINT64 *qpctime)
+{
+    struct audio_client *This = impl_from_IAudioClock2(iface);
+    struct get_position_params params;
+
+    TRACE("(%p)->(%p, %p)\n", This, pos, qpctime);
+
+    if (!pos)
+        return E_POINTER;
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream  = This->stream;
+    params.device  = TRUE;
+    params.pos     = pos;
+    params.qpctime = qpctime;
+
+    WINE_UNIX_CALL(get_position, ¶ms);
+
+    return params.result;
+}
+
+const IAudioClock2Vtbl AudioClock2_Vtbl =
+{
+    clock2_QueryInterface,
+    clock2_AddRef,
+    clock2_Release,
+    clock2_GetDevicePosition
+};
+
 static HRESULT WINAPI streamvolume_QueryInterface(IAudioStreamVolume *iface, REFIID riid,
                                                   void **ppv)
 {
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 333848e4242..af112423591 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -130,8 +130,8 @@ static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
 extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
 extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl;
 extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl;
-static const IAudioClockVtbl AudioClock_Vtbl;
-static const IAudioClock2Vtbl AudioClock2_Vtbl;
+extern const IAudioClockVtbl AudioClock_Vtbl;
+extern const IAudioClock2Vtbl AudioClock2_Vtbl;
 extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl;
 
 static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
@@ -1542,155 +1542,6 @@ static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =
     AudioCaptureClient_GetNextPacketSize
 };
 
-static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-
-    TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
-
-    if (!ppv)
-        return E_POINTER;
-    *ppv = NULL;
-
-    if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock))
-        *ppv = iface;
-    else if (IsEqualIID(riid, &IID_IAudioClock2))
-        *ppv = &This->IAudioClock2_iface;
-    if (*ppv) {
-        IUnknown_AddRef((IUnknown*)*ppv);
-        return S_OK;
-    }
-
-    if (IsEqualIID(riid, &IID_IMarshal))
-        return IUnknown_QueryInterface(This->marshal, riid, ppv);
-
-    WARN("Unknown interface %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
-}
-
-static ULONG WINAPI AudioClock_Release(IAudioClock *iface)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    return IAudioClient3_Release(&This->IAudioClient3_iface);
-}
-
-static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    struct get_frequency_params params;
-
-    TRACE("(%p)->(%p)\n", This, freq);
-
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.freq   = freq;
-    pulse_call(get_frequency, ¶ms);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos,
-        UINT64 *qpctime)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    struct get_position_params params;
-
-    TRACE("(%p)->(%p, %p)\n", This, pos, qpctime);
-
-    if (!pos)
-        return E_POINTER;
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream  = This->stream;
-    params.device  = FALSE;
-    params.pos     = pos;
-    params.qpctime = qpctime;
-    pulse_call(get_position, ¶ms);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface,
-        DWORD *chars)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-
-    TRACE("(%p)->(%p)\n", This, chars);
-
-    if (!chars)
-        return E_POINTER;
-
-    *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ;
-
-    return S_OK;
-}
-
-static const IAudioClockVtbl AudioClock_Vtbl =
-{
-    AudioClock_QueryInterface,
-    AudioClock_AddRef,
-    AudioClock_Release,
-    AudioClock_GetFrequency,
-    AudioClock_GetPosition,
-    AudioClock_GetCharacteristics
-};
-
-static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv);
-}
-
-static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
-}
-
-static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClient3_Release(&This->IAudioClient3_iface);
-}
-
-static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface,
-        UINT64 *pos, UINT64 *qpctime)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    struct get_position_params params;
-
-    TRACE("(%p)->(%p, %p)\n", This, pos, qpctime);
-
-    if (!pos)
-        return E_POINTER;
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream  = This->stream;
-    params.device  = TRUE;
-    params.pos     = pos;
-    params.qpctime = qpctime;
-    pulse_call(get_position, ¶ms);
-    return params.result;
-}
-
-static const IAudioClock2Vtbl AudioClock2_Vtbl =
-{
-    AudioClock2_QueryInterface,
-    AudioClock2_AddRef,
-    AudioClock2_Release,
-    AudioClock2_GetDevicePosition
-};
-
 static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
 {
     AudioSessionWrapper *ret;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2792

[PATCH 2/4] winealsa: Use mmdevapi's AudioClock.

[Davide Beatrici]

From: Davide Beatrici <git(a)davidebeatrici.dev>

---
 dlls/winealsa.drv/mmdevdrv.c | 148 +----------------------------------
 1 file changed, 2 insertions(+), 146 deletions(-)

diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index ec50c856e38..2a3ecd68b7a 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -74,8 +74,8 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
 static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
 extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
 extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl;
-static const IAudioClockVtbl AudioClock_Vtbl;
-static const IAudioClock2Vtbl AudioClock2_Vtbl;
+extern const IAudioClockVtbl AudioClock_Vtbl;
+extern const IAudioClock2Vtbl AudioClock2_Vtbl;
 extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl;
 extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl;
 
@@ -106,16 +106,6 @@ static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface)
     return CONTAINING_RECORD(iface, ACImpl, IAudioCaptureClient_iface);
 }
 
-static inline ACImpl *impl_from_IAudioClock(IAudioClock *iface)
-{
-    return CONTAINING_RECORD(iface, ACImpl, IAudioClock_iface);
-}
-
-static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface)
-{
-    return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface);
-}
-
 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
 {
     switch (reason)
@@ -1337,140 +1327,6 @@ static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =
     AudioCaptureClient_GetNextPacketSize
 };
 
-static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-
-    TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
-
-    if(!ppv)
-        return E_POINTER;
-    *ppv = NULL;
-
-    if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock))
-        *ppv = iface;
-    else if(IsEqualIID(riid, &IID_IAudioClock2))
-        *ppv = &This->IAudioClock2_iface;
-    if(*ppv){
-        IUnknown_AddRef((IUnknown*)*ppv);
-        return S_OK;
-    }
-
-    WARN("Unknown interface %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
-}
-
-static ULONG WINAPI AudioClock_Release(IAudioClock *iface)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    return IAudioClient3_Release(&This->IAudioClient3_iface);
-}
-
-static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    struct get_frequency_params params;
-
-    TRACE("(%p)->(%p)\n", This, freq);
-
-    params.stream = This->stream;
-    params.freq = freq;
-
-    ALSA_CALL(get_frequency, ¶ms);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos,
-        UINT64 *qpctime)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    struct get_position_params params;
-
-    TRACE("(%p)->(%p, %p)\n", This, pos, qpctime);
-
-    if(!pos)
-        return E_POINTER;
-
-    params.stream = This->stream;
-    params.device = FALSE;
-    params.pos = pos;
-    params.qpctime = qpctime;
-
-    ALSA_CALL(get_position, ¶ms);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface,
-        DWORD *chars)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-
-    TRACE("(%p)->(%p)\n", This, chars);
-
-    if(!chars)
-        return E_POINTER;
-
-    *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ;
-
-    return S_OK;
-}
-
-static const IAudioClockVtbl AudioClock_Vtbl =
-{
-    AudioClock_QueryInterface,
-    AudioClock_AddRef,
-    AudioClock_Release,
-    AudioClock_GetFrequency,
-    AudioClock_GetPosition,
-    AudioClock_GetCharacteristics
-};
-
-static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv);
-}
-
-static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
-}
-
-static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClient3_Release(&This->IAudioClient3_iface);
-}
-
-static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface,
-        UINT64 *pos, UINT64 *qpctime)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-
-    FIXME("(%p)->(%p, %p)\n", This, pos, qpctime);
-
-    return E_NOTIMPL;
-}
-
-static const IAudioClock2Vtbl AudioClock2_Vtbl =
-{
-    AudioClock2_QueryInterface,
-    AudioClock2_AddRef,
-    AudioClock2_Release,
-    AudioClock2_GetDevicePosition
-};
-
 static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
 {
     AudioSessionWrapper *ret;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2792

[PATCH 3/4] winecoreaudio: Use mmdevapi's AudioClock.

[Davide Beatrici]

From: Davide Beatrici <git(a)davidebeatrici.dev>

---
 dlls/winecoreaudio.drv/mmdevdrv.c | 143 +-----------------------------
 1 file changed, 2 insertions(+), 141 deletions(-)

diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index 7f7bb0ecfbb..5acee9c7301 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -56,8 +56,8 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
 static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
 extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
 extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl;
-static const IAudioClockVtbl AudioClock_Vtbl;
-static const IAudioClock2Vtbl AudioClock2_Vtbl;
+extern const IAudioClockVtbl AudioClock_Vtbl;
+extern const IAudioClock2Vtbl AudioClock2_Vtbl;
 extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl;
 extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl;
 
@@ -100,16 +100,6 @@ static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface)
     return CONTAINING_RECORD(iface, ACImpl, IAudioCaptureClient_iface);
 }
 
-static inline ACImpl *impl_from_IAudioClock(IAudioClock *iface)
-{
-    return CONTAINING_RECORD(iface, ACImpl, IAudioClock_iface);
-}
-
-static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface)
-{
-    return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface);
-}
-
 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
 {
     switch (reason)
@@ -1292,135 +1282,6 @@ static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =
     AudioCaptureClient_GetNextPacketSize
 };
 
-static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-
-    TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
-
-    if(!ppv)
-        return E_POINTER;
-    *ppv = NULL;
-
-    if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock))
-        *ppv = iface;
-    else if(IsEqualIID(riid, &IID_IAudioClock2))
-        *ppv = &This->IAudioClock2_iface;
-    if(*ppv){
-        IUnknown_AddRef((IUnknown*)*ppv);
-        return S_OK;
-    }
-
-    WARN("Unknown interface %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
-}
-
-static ULONG WINAPI AudioClock_Release(IAudioClock *iface)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    return IAudioClient3_Release(&This->IAudioClient3_iface);
-}
-
-static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    struct get_frequency_params params;
-
-    TRACE("(%p)->(%p)\n", This, freq);
-
-    params.stream = This->stream;
-    params.freq = freq;
-    UNIX_CALL(get_frequency, ¶ms);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos,
-        UINT64 *qpctime)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    struct get_position_params params;
-
-    TRACE("(%p)->(%p, %p)\n", This, pos, qpctime);
-
-    if(!pos)
-        return E_POINTER;
-
-    params.stream = This->stream;
-    params.pos = pos;
-    params.qpctime = qpctime;
-    UNIX_CALL(get_position, ¶ms);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface,
-        DWORD *chars)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-
-    TRACE("(%p)->(%p)\n", This, chars);
-
-    if(!chars)
-        return E_POINTER;
-
-    *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ;
-
-    return S_OK;
-}
-
-static const IAudioClockVtbl AudioClock_Vtbl =
-{
-    AudioClock_QueryInterface,
-    AudioClock_AddRef,
-    AudioClock_Release,
-    AudioClock_GetFrequency,
-    AudioClock_GetPosition,
-    AudioClock_GetCharacteristics
-};
-
-static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv);
-}
-
-static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
-}
-
-static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClient3_Release(&This->IAudioClient3_iface);
-}
-
-static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface,
-        UINT64 *pos, UINT64 *qpctime)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-
-    FIXME("(%p)->(%p, %p)\n", This, pos, qpctime);
-
-    return E_NOTIMPL;
-}
-
-static const IAudioClock2Vtbl AudioClock2_Vtbl =
-{
-    AudioClock2_QueryInterface,
-    AudioClock2_AddRef,
-    AudioClock2_Release,
-    AudioClock2_GetDevicePosition
-};
-
 static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
 {
     AudioSessionWrapper *ret;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2792

[PATCH 4/4] wineoss: Use mmdevapi's AudioClock.

[Davide Beatrici]

From: Davide Beatrici <git(a)davidebeatrici.dev>

---
 dlls/wineoss.drv/mmdevdrv.c | 151 +-----------------------------------
 1 file changed, 2 insertions(+), 149 deletions(-)

diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 1940750d484..014592f26c5 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -82,8 +82,8 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
 static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
 extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
 extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl;
-static const IAudioClockVtbl AudioClock_Vtbl;
-static const IAudioClock2Vtbl AudioClock2_Vtbl;
+extern const IAudioClockVtbl AudioClock_Vtbl;
+extern const IAudioClock2Vtbl AudioClock2_Vtbl;
 extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl;
 extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl;
 
@@ -112,21 +112,6 @@ static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface)
     return CONTAINING_RECORD(iface, ACImpl, IAudioCaptureClient_iface);
 }
 
-static inline ACImpl *impl_from_IAudioClock(IAudioClock *iface)
-{
-    return CONTAINING_RECORD(iface, ACImpl, IAudioClock_iface);
-}
-
-static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface)
-{
-    return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface);
-}
-
-static inline ACImpl *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface)
-{
-    return CONTAINING_RECORD(iface, ACImpl, IAudioStreamVolume_iface);
-}
-
 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
 {
     switch (reason)
@@ -1293,138 +1278,6 @@ static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =
     AudioCaptureClient_GetNextPacketSize
 };
 
-static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-
-    TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
-
-    if(!ppv)
-        return E_POINTER;
-    *ppv = NULL;
-
-    if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock))
-        *ppv = iface;
-    else if(IsEqualIID(riid, &IID_IAudioClock2))
-        *ppv = &This->IAudioClock2_iface;
-    if(*ppv){
-        IUnknown_AddRef((IUnknown*)*ppv);
-        return S_OK;
-    }
-
-    WARN("Unknown interface %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
-}
-
-static ULONG WINAPI AudioClock_Release(IAudioClock *iface)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    return IAudioClient3_Release(&This->IAudioClient3_iface);
-}
-
-static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    struct get_frequency_params params;
-
-    TRACE("(%p)->(%p)\n", This, freq);
-
-    params.stream = This->stream;
-    params.freq = freq;
-    OSS_CALL(get_frequency, ¶ms);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos,
-        UINT64 *qpctime)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-    struct get_position_params params;
-
-    TRACE("(%p)->(%p, %p)\n", This, pos, qpctime);
-
-    if(!pos)
-        return E_POINTER;
-
-    params.stream = This->stream;
-    params.device = FALSE;
-    params.pos = pos;
-    params.qpctime = qpctime;
-    OSS_CALL(get_position, ¶ms);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface,
-        DWORD *chars)
-{
-    ACImpl *This = impl_from_IAudioClock(iface);
-
-    TRACE("(%p)->(%p)\n", This, chars);
-
-    if(!chars)
-        return E_POINTER;
-
-    *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ;
-
-    return S_OK;
-}
-
-static const IAudioClockVtbl AudioClock_Vtbl =
-{
-    AudioClock_QueryInterface,
-    AudioClock_AddRef,
-    AudioClock_Release,
-    AudioClock_GetFrequency,
-    AudioClock_GetPosition,
-    AudioClock_GetCharacteristics
-};
-
-static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv);
-}
-
-static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClient3_AddRef(&This->IAudioClient3_iface);
-}
-
-static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-    return IAudioClient3_Release(&This->IAudioClient3_iface);
-}
-
-static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface,
-        UINT64 *pos, UINT64 *qpctime)
-{
-    ACImpl *This = impl_from_IAudioClock2(iface);
-
-    FIXME("(%p)->(%p, %p)\n", This, pos, qpctime);
-
-    return E_NOTIMPL;
-}
-
-static const IAudioClock2Vtbl AudioClock2_Vtbl =
-{
-    AudioClock2_QueryInterface,
-    AudioClock2_AddRef,
-    AudioClock2_Release,
-    AudioClock2_GetDevicePosition
-};
-
 static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
 {
     AudioSessionWrapper *ret;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2792

[Davide Beatrici (＠davidebeatrici)]

Davide Beatrici (@davidebeatrici) commented about dlls/wineoss.drv/mmdevdrv.c:
> }
>
> -static inline ACImpl *impl_from_IAudioClock(IAudioClock *iface)
> -{
> -    return CONTAINING_RECORD(iface, ACImpl, IAudioClock_iface);
> -}
> -
> -static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface)
> -{
> -    return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface);
> -}
> -
> -static inline ACImpl *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface)
> -{
> -    return CONTAINING_RECORD(iface, ACImpl, IAudioStreamVolume_iface);
> -}
> Missed this in !2764.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2792#note_32511

[Davide Beatrici (＠davidebeatrici)]

I wonder why `IAudioClock` is not merged into `IAudioClock2` just like `IAudioClient(2)` and `IAudioClient3`.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2792#note_32513

[Huw Davies (＠huw)]

On Thu May 11 10:52:39 2023 +0000, Davide Beatrici wrote:
> I wonder why `IAudioClock` is not merged into `IAudioClock2` just like
> `IAudioClient(2)` and `IAudioClient3`.
> `IAudioClock2` doesn't inherit `IAudioClock`.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2792#note_32523

[Huw Davies (＠huw)]

Huw Davies (@huw) commented about dlls/winealsa.drv/mmdevdrv.c:
> -
> -static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface)
> -{
> -    ACImpl *This = impl_from_IAudioClock2(iface);
> -    return IAudioClient3_Release(&This->IAudioClient3_iface);
> -}
> -
> -static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface,
> -        UINT64 *pos, UINT64 *qpctime)
> -{
> -    ACImpl *This = impl_from_IAudioClock2(iface);
> -
> -    FIXME("(%p)->(%p, %p)\n", This, pos, qpctime);
> -
> -    return E_NOTIMPL;
> -}
> This is going to change the behaviour of `GetDevicePosition()` (for this and for the other non-pulse drivers).
> You likely want to modify the unixlibs in these cases to 'return' `E_NOTIMPL`.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2792#note_32524

[Davide Beatrici (＠davidebeatrici)]

On Thu May 11 10:52:39 2023 +0000, Huw Davies wrote:
> `IAudioClock2` doesn't inherit `IAudioClock`.
> That's what I thought, unfortunate...

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2792#note_32535