wine-commits May 2023

wine-commits@winehq.org

1 participants
775 discussions

Francois Gouget : iphlpapi/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: 0028d8f0a7f69914dfe36135834de1e19b88b5eb URL: https://gitlab.winehq.org/wine/wine/-/commit/0028d8f0a7f69914dfe36135834de1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 10 17:15:38 2023 +0200 iphlpapi/tests: Use win_skip() for missing APIs. A missing API is a todo in Wine. --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index b8fa82d2a56..5301a409126 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1932,7 +1932,7 @@ static void test_AllocateAndGetTcpExTableFromStack(void) if (!pAllocateAndGetTcpExTableFromStack) { - skip("AllocateAndGetTcpExTableFromStack not available\n"); + win_skip("AllocateAndGetTcpExTableFromStack not available\n"); return; }

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioCaptureClient.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: 652574f115dd97c767f816d5116b60c4a9e41d5b URL: https://gitlab.winehq.org/wine/wine/-/commit/652574f115dd97c767f816d5116b60… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat May 13 08:28:39 2023 +0200 wineoss: Use mmdevapi's AudioCaptureClient. --- dlls/wineoss.drv/mmdevdrv.c | 115 +------------------------------------------- 1 file changed, 1 insertion(+), 114 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 014592f26c5..323e96359c4 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -79,7 +79,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; -static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; +extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; extern const IAudioClockVtbl AudioClock_Vtbl; @@ -107,11 +107,6 @@ static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); } -static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioCaptureClient_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1170,114 +1165,6 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { AudioRenderClient_ReleaseBuffer }; -static HRESULT WINAPI AudioCaptureClient_QueryInterface( - IAudioCaptureClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioCaptureClient(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_IAudioCaptureClient)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->marshal, riid, ppv); - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, - BYTE **data, UINT32 *frames, DWORD *flags, UINT64 *devpos, - UINT64 *qpcpos) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct get_capture_buffer_params params; - - TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, - devpos, qpcpos); - - if(!data) - return E_POINTER; - - *data = NULL; - - if(!frames || !flags) - return E_POINTER; - - params.stream = This->stream; - params.data = data; - params.frames = frames; - params.flags = (UINT*)flags; - params.devpos = devpos; - params.qpcpos = qpcpos; - OSS_CALL(get_capture_buffer, &params); - - return params.result; -} - -static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( - IAudioCaptureClient *iface, UINT32 done) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct release_capture_buffer_params params; - - TRACE("(%p)->(%u)\n", This, done); - - params.stream = This->stream; - params.done = done; - OSS_CALL(release_capture_buffer, &params); - - return params.result; -} - -static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( - IAudioCaptureClient *iface, UINT32 *frames) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct get_next_packet_size_params params; - - TRACE("(%p)->(%p)\n", This, frames); - - if(!frames) - return E_POINTER; - - params.stream = This->stream; - params.frames = frames; - OSS_CALL(get_next_packet_size, &params); - - return params.result; -} - -static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = -{ - AudioCaptureClient_QueryInterface, - AudioCaptureClient_AddRef, - AudioCaptureClient_Release, - AudioCaptureClient_GetBuffer, - AudioCaptureClient_ReleaseBuffer, - AudioCaptureClient_GetNextPacketSize -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioCaptureClient.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: 1256c415bb3da107cc81679c925df2ef557b3d40 URL: https://gitlab.winehq.org/wine/wine/-/commit/1256c415bb3da107cc81679c925df2… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat May 13 08:28:28 2023 +0200 winecoreaudio: Use mmdevapi's AudioCaptureClient. --- dlls/winecoreaudio.drv/mmdevdrv.c | 113 +------------------------------------- 1 file changed, 1 insertion(+), 112 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 5acee9c7301..4c3fcbc5897 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -53,7 +53,7 @@ static const REFERENCE_TIME MinimumPeriod = 50000; static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; -static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; +extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; extern const IAudioClockVtbl AudioClock_Vtbl; @@ -95,11 +95,6 @@ static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); } -static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioCaptureClient_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1176,112 +1171,6 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { AudioRenderClient_ReleaseBuffer }; -static HRESULT WINAPI AudioCaptureClient_QueryInterface( - IAudioCaptureClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioCaptureClient(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_IAudioCaptureClient)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->marshal, riid, ppv); - - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, - BYTE **data, UINT32 *frames, DWORD *flags, UINT64 *devpos, - UINT64 *qpcpos) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct get_capture_buffer_params params; - - TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, - devpos, qpcpos); - - if(!data) - return E_POINTER; - - *data = NULL; - - if(!frames || !flags) - return E_POINTER; - - params.stream = This->stream; - params.data = data; - params.frames = frames; - params.flags = (UINT *)flags; - params.devpos = devpos; - params.qpcpos = qpcpos; - UNIX_CALL(get_capture_buffer, &params); - return params.result; -} - -static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( - IAudioCaptureClient *iface, UINT32 done) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct release_capture_buffer_params params; - - TRACE("(%p)->(%u)\n", This, done); - - params.stream = This->stream; - params.done = done; - UNIX_CALL(release_capture_buffer, &params); - return params.result; -} - -static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( - IAudioCaptureClient *iface, UINT32 *frames) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct get_next_packet_size_params params; - - TRACE("(%p)->(%p)\n", This, frames); - - if(!frames) - return E_POINTER; - - params.stream = This->stream; - params.frames = frames; - UNIX_CALL(get_next_packet_size, &params); - return params.result; -} - -static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = -{ - AudioCaptureClient_QueryInterface, - AudioCaptureClient_AddRef, - AudioCaptureClient_Release, - AudioCaptureClient_GetBuffer, - AudioCaptureClient_ReleaseBuffer, - AudioCaptureClient_GetNextPacketSize -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioCaptureClient.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: 2bff41cb339ca8f67b22c4e0e3d90d1b7634f8a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2bff41cb339ca8f67b22c4e0e3d90d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat May 13 08:28:09 2023 +0200 winealsa: Use mmdevapi's AudioCaptureClient. --- dlls/winealsa.drv/mmdevdrv.c | 119 +------------------------------------------ 1 file changed, 1 insertion(+), 118 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2a3ecd68b7a..c743d33c116 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -71,7 +71,7 @@ static const WCHAR guidW[] = {'g','u','i','d',0}; static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; -static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; +extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; extern const IAudioClockVtbl AudioClock_Vtbl; @@ -101,11 +101,6 @@ static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); } -static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioCaptureClient_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1215,118 +1210,6 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { AudioRenderClient_ReleaseBuffer }; -static HRESULT WINAPI AudioCaptureClient_QueryInterface( - IAudioCaptureClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioCaptureClient(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_IAudioCaptureClient)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->marshal, riid, ppv); - - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, - BYTE **data, UINT32 *frames, DWORD *flags, UINT64 *devpos, - UINT64 *qpcpos) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct get_capture_buffer_params params; - - TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, - devpos, qpcpos); - - if(!data) - return E_POINTER; - - *data = NULL; - - if(!frames || !flags) - return E_POINTER; - - params.stream = This->stream; - params.data = data; - params.frames = frames; - params.flags = (UINT*)flags; - params.devpos = devpos; - params.qpcpos = qpcpos; - - ALSA_CALL(get_capture_buffer, &params); - - return params.result; -} - -static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( - IAudioCaptureClient *iface, UINT32 done) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct release_capture_buffer_params params; - - TRACE("(%p)->(%u)\n", This, done); - - params.stream = This->stream; - params.done = done; - - ALSA_CALL(release_capture_buffer, &params); - - return params.result; -} - -static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( - IAudioCaptureClient *iface, UINT32 *frames) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct get_next_packet_size_params params; - - TRACE("(%p)->(%p)\n", This, frames); - - if(!frames) - return E_POINTER; - - params.stream = This->stream; - params.frames = frames; - - ALSA_CALL(get_next_packet_size, &params); - - return params.result; -} - -static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = -{ - AudioCaptureClient_QueryInterface, - AudioCaptureClient_AddRef, - AudioCaptureClient_Release, - AudioCaptureClient_GetBuffer, - AudioCaptureClient_ReleaseBuffer, - AudioCaptureClient_GetNextPacketSize -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0

Davide Beatrici : winepulse: Move AudioCaptureClient into mmdevapi.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: cca12c50c41378ceed3152071e725482250f1913 URL: https://gitlab.winehq.org/wine/wine/-/commit/cca12c50c41378ceed3152071e7254… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat May 13 08:14:41 2023 +0200 winepulse: Move AudioCaptureClient into mmdevapi. --- dlls/mmdevapi/client.c | 121 +++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 128 +----------------------------------------- 2 files changed, 122 insertions(+), 127 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 4f3dc12b537..8c75c7d80a2 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -48,6 +48,11 @@ void set_stream_volumes(struct audio_client *This) WINE_UNIX_CALL(set_volumes, &params); } +static inline struct audio_client *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface) +{ + return CONTAINING_RECORD(iface, struct audio_client, IAudioCaptureClient_iface); +} + static inline struct audio_client *impl_from_IAudioClock(IAudioClock *iface) { return CONTAINING_RECORD(iface, struct audio_client, IAudioClock_iface); @@ -63,6 +68,122 @@ static inline struct audio_client *impl_from_IAudioStreamVolume(IAudioStreamVolu return CONTAINING_RECORD(iface, struct audio_client, IAudioStreamVolume_iface); } +static HRESULT WINAPI capture_QueryInterface(IAudioCaptureClient *iface, REFIID riid, void **ppv) +{ + struct audio_client *This = impl_from_IAudioCaptureClient(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAudioCaptureClient)) + *ppv = 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 capture_AddRef(IAudioCaptureClient *iface) +{ + struct audio_client *This = impl_from_IAudioCaptureClient(iface); + return IAudioClient3_AddRef(&This->IAudioClient3_iface); +} + +static ULONG WINAPI capture_Release(IAudioCaptureClient *iface) +{ + struct audio_client *This = impl_from_IAudioCaptureClient(iface); + return IAudioClient3_Release(&This->IAudioClient3_iface); +} + +static HRESULT WINAPI capture_GetBuffer(IAudioCaptureClient *iface, BYTE **data, UINT32 *frames, + DWORD *flags, UINT64 *devpos, UINT64 *qpcpos) +{ + struct audio_client *This = impl_from_IAudioCaptureClient(iface); + struct get_capture_buffer_params params; + + TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); + + if (!data) + return E_POINTER; + + *data = NULL; + + if (!frames || !flags) + return E_POINTER; + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + params.stream = This->stream; + params.data = data; + params.frames = frames; + params.flags = (UINT *)flags; + params.devpos = devpos; + params.qpcpos = qpcpos; + + WINE_UNIX_CALL(get_capture_buffer, &params); + + return params.result; +} + +static HRESULT WINAPI capture_ReleaseBuffer(IAudioCaptureClient *iface, UINT32 done) +{ + struct audio_client *This = impl_from_IAudioCaptureClient(iface); + struct release_capture_buffer_params params; + + TRACE("(%p)->(%u)\n", This, done); + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + params.stream = This->stream; + params.done = done; + + WINE_UNIX_CALL(release_capture_buffer, &params); + + return params.result; +} + +static HRESULT WINAPI capture_GetNextPacketSize(IAudioCaptureClient *iface, UINT32 *frames) +{ + struct audio_client *This = impl_from_IAudioCaptureClient(iface); + struct get_next_packet_size_params params; + + TRACE("(%p)->(%p)\n", This, frames); + + if (!frames) + return E_POINTER; + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + params.stream = This->stream; + params.frames = frames; + + WINE_UNIX_CALL(get_next_packet_size, &params); + + return params.result; +} + +const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = +{ + capture_QueryInterface, + capture_AddRef, + capture_Release, + capture_GetBuffer, + capture_ReleaseBuffer, + capture_GetNextPacketSize +}; + static HRESULT WINAPI clock_QueryInterface(IAudioClock *iface, REFIID riid, void **ppv) { struct audio_client *This = impl_from_IAudioClock(iface); diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index af112423591..04a5fb81eb0 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -126,7 +126,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; -static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; +extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; @@ -146,21 +146,6 @@ static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); } -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 void pulse_call(enum unix_funcs code, void *params) { NTSTATUS status; @@ -1431,117 +1416,6 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { AudioRenderClient_ReleaseBuffer }; -static HRESULT WINAPI AudioCaptureClient_QueryInterface( - IAudioCaptureClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioCaptureClient(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_IAudioCaptureClient)) - *ppv = 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 AudioCaptureClient_AddRef(IAudioCaptureClient *iface) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, - BYTE **data, UINT32 *frames, DWORD *flags, UINT64 *devpos, - UINT64 *qpcpos) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct get_capture_buffer_params params; - - TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, - devpos, qpcpos); - - if (!data) - return E_POINTER; - *data = NULL; - if (!frames || !flags) - return E_POINTER; - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.data = data; - params.frames = frames; - params.flags = (UINT*)flags; - params.devpos = devpos; - params.qpcpos = qpcpos; - pulse_call(get_capture_buffer, &params); - return params.result; -} - -static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( - IAudioCaptureClient *iface, UINT32 done) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct release_capture_buffer_params params; - - TRACE("(%p)->(%u)\n", This, done); - - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.done = done; - pulse_call(release_capture_buffer, &params); - return params.result; -} - -static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( - IAudioCaptureClient *iface, UINT32 *frames) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct get_next_packet_size_params params; - - TRACE("(%p)->(%p)\n", This, frames); - - if (!frames) - return E_POINTER; - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.frames = frames; - pulse_call(get_next_packet_size, &params); - return params.result; -} - -static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = -{ - AudioCaptureClient_QueryInterface, - AudioCaptureClient_AddRef, - AudioCaptureClient_Release, - AudioCaptureClient_GetBuffer, - AudioCaptureClient_ReleaseBuffer, - AudioCaptureClient_GetNextPacketSize -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0

Alexandre Julliard : Wine release 8.8
by Alexandre Julliard 12 May '23

12 May '23

Module: website Branch: master Commit: df222e705893a9acd166708fc005aad790e3f8f4 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/df222e705893a9acd166708fc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 23:56:20 2023 +0200 Wine release 8.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023051201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023051201.xml b/news/en/2023051201.xml new file mode 100644 index 00000000..950c1a26 --- /dev/null +++ b/news/en/2023051201.xml @@ -0,0 +1,16 @@ +<news> +<date>May 12, 2023</date> +<title>Wine 8.8 Released</title> +<body> + The Wine development release 8.8 is now available. + <a href="{$root}/announce/8.8">What's new</a> in this release: +<ul> + <li>More work towards full PE support in the PostScript driver.</li> + <li>Initial support for loading ARM64EC modules.</li> + <li>More work on IME restructuration.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.8.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.8 : Alexandre Julliard : Release 8.8
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: refs/tags/wine-8.8 Tag: 4e7ec7c925dfe1f5cf8633a1832e9a3250f9c9e9 URL: https://gitlab.winehq.org/wine/wine/-/tags/4e7ec7c925dfe1f5cf8633a1832e9a32… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 23:53:46 2023 +0200 Release 8.8

1 0

Alexandre Julliard : Release 8.8.
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: 5662d85e0e95a2715ab3b81c25c89121fc8db34d URL: https://gitlab.winehq.org/wine/wine/-/commit/5662d85e0e95a2715ab3b81c25c891… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 23:48:10 2023 +0200 Release 8.8. --- ANNOUNCE | 658 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 351 insertions(+), 327 deletions(-)

1 0

Zebediah Figura : qcap/audiorecord: Partially implement QueryAccept().
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: d53fdd0eb0537d0481dcbc6a710e8e09e07294f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d53fdd0eb0537d0481dcbc6a710e8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 15:16:36 2023 -0500 qcap/audiorecord: Partially implement QueryAccept(). --- dlls/qcap/audiorecord.c | 12 ++++++++++++ dlls/qcap/tests/audiorecord.c | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index ffd8e059b7b..d97d7fef19a 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -50,6 +50,17 @@ static HRESULT audio_record_source_query_interface(struct strmbase_pin *iface, R return S_OK; } +static HRESULT audio_record_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio)) + return S_FALSE; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx)) + return S_FALSE; + + return S_OK; +} + static const struct { unsigned int rate; @@ -129,6 +140,7 @@ static HRESULT WINAPI audio_record_source_DecideBufferSize(struct strmbase_sourc static const struct strmbase_source_ops source_ops = { .base.pin_get_media_type = audio_record_source_get_media_type, + .base.pin_query_accept = audio_record_source_query_accept, .base.pin_query_interface = audio_record_source_query_interface, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index c64a8a83b2e..0438b970ff1 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -443,18 +443,18 @@ static void test_media_types(IBaseFilter *filter) init_pcm_mt(&mt, &format, 1, 44100, 8); mt.majortype = MEDIATYPE_Stream; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); mt.majortype = GUID_NULL; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); init_pcm_mt(&mt, &format, 1, 44100, 8); mt.formattype = FORMAT_None; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); mt.formattype = GUID_NULL; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); init_pcm_mt(&mt, &format, 1, 44100, 8); format.wFormatTag = 0xdead;

1 0

Zebediah Figura : qcap/audiorecord: Implement IAMStreamConfig::GetStreamCaps().
by Alexandre Julliard 12 May '23

12 May '23

Module: wine Branch: master Commit: c752b56110ae3cee63dbfb8fc2c563c73cd4ce47 URL: https://gitlab.winehq.org/wine/wine/-/commit/c752b56110ae3cee63dbfb8fc2c563… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 12:30:23 2023 -0500 qcap/audiorecord: Implement IAMStreamConfig::GetStreamCaps(). Needed by the Microsoft Silverlight configuration tool. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36230 --- dlls/qcap/audiorecord.c | 46 ++++++++++++++++++++++++++++++++++++++----- dlls/qcap/tests/audiorecord.c | 26 +++++++++++++----------- 2 files changed, 55 insertions(+), 17 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 7107f22851b..ffd8e059b7b 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -174,15 +174,51 @@ static HRESULT WINAPI stream_config_GetFormat(IAMStreamConfig *iface, AM_MEDIA_T static HRESULT WINAPI stream_config_GetNumberOfCapabilities(IAMStreamConfig *iface, int *count, int *size) { - FIXME("iface %p, count %p, size %p, stub!\n", iface, count, size); - return E_NOTIMPL; + struct audio_record *filter = impl_from_IAMStreamConfig(iface); + + TRACE("filter %p, count %p, size %p.\n", filter, count, size); + + *count = ARRAY_SIZE(audio_formats); + *size = sizeof(AUDIO_STREAM_CONFIG_CAPS); + return S_OK; } static HRESULT WINAPI stream_config_GetStreamCaps(IAMStreamConfig *iface, - int index, AM_MEDIA_TYPE **mt, BYTE *caps) + int index, AM_MEDIA_TYPE **ret_mt, BYTE *caps) { - FIXME("iface %p, index %d, mt %p, caps %p, stub!\n", iface, index, mt, caps); - return E_NOTIMPL; + struct audio_record *filter = impl_from_IAMStreamConfig(iface); + AUDIO_STREAM_CONFIG_CAPS *audio_caps = (void *)caps; + AM_MEDIA_TYPE *mt; + HRESULT hr; + + TRACE("filter %p, index %d, ret_mt %p, caps %p.\n", filter, index, ret_mt, caps); + + if (index >= ARRAY_SIZE(audio_formats)) + return S_FALSE; + + if (!(mt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) + return E_OUTOFMEMORY; + + if ((hr = fill_media_type(index, mt)) != S_OK) + { + CoTaskMemFree(mt); + return hr; + } + + *ret_mt = mt; + + audio_caps->guid = MEDIATYPE_Audio; + audio_caps->MinimumChannels = 1; + audio_caps->MaximumChannels = 2; + audio_caps->ChannelsGranularity = 1; + audio_caps->MinimumBitsPerSample = 8; + audio_caps->MaximumBitsPerSample = 16; + audio_caps->BitsPerSampleGranularity = 8; + audio_caps->MinimumSampleFrequency = 11025; + audio_caps->MaximumSampleFrequency = 44100; + audio_caps->SampleFrequencyGranularity = 11025; + + return S_OK; } static const IAMStreamConfigVtbl stream_config_vtbl = diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index 6d06a5417bd..c64a8a83b2e 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -482,9 +482,9 @@ static void test_stream_config(IBaseFilter *filter) count = size = 0xdeadbeef; hr = IAMStreamConfig_GetNumberOfCapabilities(config, &count, &size); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(count && count != 0xdeadbeef, "Got count %d.\n", count); - todo_wine ok(size == sizeof(AUDIO_STREAM_CONFIG_CAPS), "Got size %d.\n", size); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count && count != 0xdeadbeef, "Got count %d.\n", count); + ok(size == sizeof(AUDIO_STREAM_CONFIG_CAPS), "Got size %d.\n", size); hr = IPin_EnumMediaTypes(source, &enummt); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -518,9 +518,9 @@ static void test_stream_config(IBaseFilter *filter) } hr = IAMStreamConfig_GetStreamCaps(config, count, &mt, (BYTE *)&caps); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumMediaTypes_Next(enummt, 1, &mt2, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumMediaTypes_Release(enummt); @@ -551,19 +551,21 @@ static void test_stream_config(IBaseFilter *filter) winetest_push_context("Caps %u", i); hr = IAMStreamConfig_GetStreamCaps(config, i, &mt, (BYTE *)&caps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IAMStreamConfig_SetFormat(config, mt); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IAMStreamConfig_GetFormat(config, &mt2); todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) { - hr = IAMStreamConfig_SetFormat(config, mt); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - - hr = IAMStreamConfig_GetFormat(config, &mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); DeleteMediaType(mt2); - - DeleteMediaType(mt); } + + DeleteMediaType(mt); + winetest_pop_context(); }

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2023