June 2023 - Wine-commits - list.winehq.org

Davide Beatrici : winealsa: Use mmdevapi's session_wrapper_create.
by Alexandre Julliard 06 Jun '23

06 Jun '23

Module: wine Branch: master Commit: ba630ab7526248f5276b9c125d41cb9ebb747786 URL: https://gitlab.winehq.org/wine/wine/-/commit/ba630ab7526248f5276b9c125d41cb… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 1 21:19:26 2023 +0200 winealsa: Use mmdevapi's session_wrapper_create. --- dlls/winealsa.drv/mmdevdrv.c | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8961f1a3c1d..1eee5a8faa9 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -76,7 +76,8 @@ extern const IAudioClock2Vtbl AudioClock2_Vtbl; extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; -static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); +extern struct audio_session_wrapper *session_wrapper_create( + struct audio_client *client) DECLSPEC_HIDDEN; void DECLSPEC_HIDDEN sessions_lock(void) { @@ -934,7 +935,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->IAudioStreamVolume_iface; }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ sessions_unlock(); return E_OUTOFMEMORY; @@ -945,7 +946,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->IAudioSessionControl2_iface; }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ sessions_unlock(); return E_OUTOFMEMORY; @@ -956,7 +957,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->IChannelAudioVolume_iface; }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ sessions_unlock(); return E_OUTOFMEMORY; @@ -1024,30 +1025,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = client_InitializeSharedAudioStream, }; -static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) -{ - AudioSessionWrapper *ret; - - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(AudioSessionWrapper)); - if(!ret) - return NULL; - - ret->IAudioSessionControl2_iface.lpVtbl = &AudioSessionControl2_Vtbl; - ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; - ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; - - ret->ref = 1; - - ret->client = client; - if(client){ - ret->session = client->session; - IAudioClient3_AddRef(&client->IAudioClient3_iface); - } - - return ret; -} - HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, AudioSessionWrapper **out) { @@ -1057,7 +1034,7 @@ HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device if(FAILED(hr)) return hr; - *out = AudioSessionWrapper_Create(NULL); + *out = session_wrapper_create(NULL); if(!*out) return E_OUTOFMEMORY;

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's session_wrapper_create.
by Alexandre Julliard 06 Jun '23

06 Jun '23

Module: wine Branch: master Commit: 883f1f3421a32bec902f9b572e935d74f626cc5f URL: https://gitlab.winehq.org/wine/wine/-/commit/883f1f3421a32bec902f9b572e935d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 1 21:19:33 2023 +0200 winecoreaudio: Use mmdevapi's session_wrapper_create. --- dlls/winecoreaudio.drv/mmdevdrv.c | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 67bf7b122a4..196f2897b39 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -70,7 +70,8 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); -static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); +extern struct audio_session_wrapper *session_wrapper_create( + struct audio_client *client) DECLSPEC_HIDDEN; void DECLSPEC_HIDDEN sessions_lock(void) { @@ -899,7 +900,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->IAudioStreamVolume_iface; }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ hr = E_OUTOFMEMORY; goto end; @@ -910,7 +911,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->IAudioSessionControl2_iface; }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ hr = E_OUTOFMEMORY; goto end; @@ -921,7 +922,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->IChannelAudioVolume_iface; }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ hr = E_OUTOFMEMORY; goto end; @@ -989,30 +990,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = client_InitializeSharedAudioStream, }; -static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) -{ - AudioSessionWrapper *ret; - - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(AudioSessionWrapper)); - if(!ret) - return NULL; - - ret->IAudioSessionControl2_iface.lpVtbl = &AudioSessionControl2_Vtbl; - ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; - ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; - - ret->ref = 1; - - ret->client = client; - if(client){ - ret->session = client->session; - IAudioClient3_AddRef(&client->IAudioClient3_iface); - } - - return ret; -} - HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, AudioSessionWrapper **out) { @@ -1022,7 +999,7 @@ HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device if(FAILED(hr)) return hr; - *out = AudioSessionWrapper_Create(NULL); + *out = session_wrapper_create(NULL); if(!*out) return E_OUTOFMEMORY;

1 0

Davide Beatrici : wineoss: Use mmdevapi's session_wrapper_create.
by Alexandre Julliard 06 Jun '23

06 Jun '23

Module: wine Branch: master Commit: d94ac14e2a67882cc7ffd22cbf1a8611b828fee1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d94ac14e2a67882cc7ffd22cbf1a86… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 1 21:19:41 2023 +0200 wineoss: Use mmdevapi's session_wrapper_create. --- dlls/wineoss.drv/mmdevdrv.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c282fb88831..23a116f0c45 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -72,8 +72,6 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); -static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); - static const IAudioClient3Vtbl AudioClient3_Vtbl; extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; @@ -84,6 +82,9 @@ extern const IAudioClock2Vtbl AudioClock2_Vtbl; extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; +extern struct audio_session_wrapper *session_wrapper_create( + struct audio_client *client) DECLSPEC_HIDDEN; + void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -897,7 +898,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->IAudioStreamVolume_iface; }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ sessions_unlock(); return E_OUTOFMEMORY; @@ -908,7 +909,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->IAudioSessionControl2_iface; }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ sessions_unlock(); return E_OUTOFMEMORY; @@ -919,7 +920,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->IChannelAudioVolume_iface; }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ if(!This->session_wrapper){ - This->session_wrapper = AudioSessionWrapper_Create(This); + This->session_wrapper = session_wrapper_create(This); if(!This->session_wrapper){ sessions_unlock(); return E_OUTOFMEMORY; @@ -987,30 +988,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = client_InitializeSharedAudioStream, }; -static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) -{ - AudioSessionWrapper *ret; - - ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(AudioSessionWrapper)); - if(!ret) - return NULL; - - ret->IAudioSessionControl2_iface.lpVtbl = &AudioSessionControl2_Vtbl; - ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; - ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; - - ret->ref = 1; - - ret->client = client; - if(client){ - ret->session = client->session; - IAudioClient3_AddRef(&client->IAudioClient3_iface); - } - - return ret; -} - HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, AudioSessionWrapper **out) { @@ -1020,7 +997,7 @@ HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device if(FAILED(hr)) return hr; - *out = AudioSessionWrapper_Create(NULL); + *out = session_wrapper_create(NULL); if(!*out) return E_OUTOFMEMORY;

1 0

Davide Beatrici : winepulse: Lock sessions in AudioClient's GetService.
by Alexandre Julliard 06 Jun '23

06 Jun '23

Module: wine Branch: master Commit: aa9a69f86108c4d4aeaffdee186762df1e05feae URL: https://gitlab.winehq.org/wine/wine/-/commit/aa9a69f86108c4d4aeaffdee186762… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 6 10:03:17 2023 +0200 winepulse: Lock sessions in AudioClient's GetService. --- dlls/winepulse.drv/mmdevdrv.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 3cd0073a6ad..7b996b3b40e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1025,6 +1025,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, void **ppv) { ACImpl *This = impl_from_IAudioClient3(iface); + HRESULT hr; TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); @@ -1032,18 +1033,26 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; + sessions_lock(); + + if (!This->stream) { + hr = AUDCLNT_E_NOT_INITIALIZED; + goto exit; + } if (IsEqualIID(riid, &IID_IAudioRenderClient)) { - if (This->dataflow != eRender) - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; + if (This->dataflow != eRender) { + hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; + goto exit; + } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; } else if (IsEqualIID(riid, &IID_IAudioCaptureClient)) { - if (This->dataflow != eCapture) - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; + if (This->dataflow != eCapture) { + hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; + goto exit; + } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); *ppv = &This->IAudioCaptureClient_iface; @@ -1059,8 +1068,10 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, const BOOLEAN new_session = !This->session_wrapper; if (new_session) { This->session_wrapper = session_wrapper_create(This); - if (!This->session_wrapper) - return E_OUTOFMEMORY; + if (!This->session_wrapper) { + hr = E_OUTOFMEMORY; + goto exit; + } } if (IsEqualIID(riid, &IID_IAudioSessionControl)) @@ -1074,10 +1085,15 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, IUnknown_AddRef((IUnknown *)*ppv); } else { FIXME("stub %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + hr = E_NOINTERFACE; + goto exit; } - return S_OK; + hr = S_OK; +exit: + sessions_unlock(); + + return hr; } extern HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface,

1 0

Davide Beatrici : winepulse: Move AudioClient's GetService into mmdevapi.
by Alexandre Julliard 06 Jun '23

06 Jun '23

Module: wine Branch: master Commit: a587a15bf363965d153263f2978ed48228eac298 URL: https://gitlab.winehq.org/wine/wine/-/commit/a587a15bf363965d153263f2978ed4… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 6 10:03:24 2023 +0200 winepulse: Move AudioClient's GetService into mmdevapi. --- dlls/mmdevapi/client.c | 77 ++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 78 ++----------------------------------------- 2 files changed, 80 insertions(+), 75 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 87bc3fef0e5..d2d4939bc73 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); extern void sessions_lock(void) DECLSPEC_HIDDEN; extern void sessions_unlock(void) DECLSPEC_HIDDEN; +extern struct audio_session_wrapper *session_wrapper_create(struct audio_client *client) DECLSPEC_HIDDEN; + void set_stream_volumes(struct audio_client *This) { struct set_volumes_params params; @@ -194,6 +196,81 @@ const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = capture_GetNextPacketSize }; +HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, void **ppv) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + HRESULT hr; + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + + sessions_lock(); + + if (!This->stream) { + hr = AUDCLNT_E_NOT_INITIALIZED; + goto exit; + } + + if (IsEqualIID(riid, &IID_IAudioRenderClient)) { + if (This->dataflow != eRender) { + hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; + goto exit; + } + + IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); + *ppv = &This->IAudioRenderClient_iface; + } else if (IsEqualIID(riid, &IID_IAudioCaptureClient)) { + if (This->dataflow != eCapture) { + hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; + goto exit; + } + + IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); + *ppv = &This->IAudioCaptureClient_iface; + } else if (IsEqualIID(riid, &IID_IAudioClock)) { + IAudioClock_AddRef(&This->IAudioClock_iface); + *ppv = &This->IAudioClock_iface; + } else if (IsEqualIID(riid, &IID_IAudioStreamVolume)) { + IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); + *ppv = &This->IAudioStreamVolume_iface; + } else if (IsEqualIID(riid, &IID_IAudioSessionControl) || + IsEqualIID(riid, &IID_IChannelAudioVolume) || + IsEqualIID(riid, &IID_ISimpleAudioVolume)) { + const BOOLEAN new_session = !This->session_wrapper; + if (new_session) { + This->session_wrapper = session_wrapper_create(This); + if (!This->session_wrapper) { + hr = E_OUTOFMEMORY; + goto exit; + } + } + + if (IsEqualIID(riid, &IID_IAudioSessionControl)) + *ppv = &This->session_wrapper->IAudioSessionControl2_iface; + else if (IsEqualIID(riid, &IID_IChannelAudioVolume)) + *ppv = &This->session_wrapper->IChannelAudioVolume_iface; + else if (IsEqualIID(riid, &IID_ISimpleAudioVolume)) + *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; + + if (!new_session) + IUnknown_AddRef((IUnknown *)*ppv); + } else { + FIXME("stub %s\n", debugstr_guid(riid)); + hr = E_NOINTERFACE; + goto exit; + } + + hr = S_OK; +exit: + sessions_unlock(); + + return hr; +} + HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface, AUDIO_STREAM_CATEGORY category, BOOL *offload_capable) { diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 7b996b3b40e..19d4bd41c7a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1021,80 +1021,8 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, return params.result; } -static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, - void **ppv) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr; - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - if (!ppv) - return E_POINTER; - *ppv = NULL; - - sessions_lock(); - - if (!This->stream) { - hr = AUDCLNT_E_NOT_INITIALIZED; - goto exit; - } - - if (IsEqualIID(riid, &IID_IAudioRenderClient)) { - if (This->dataflow != eRender) { - hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; - goto exit; - } - - IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); - *ppv = &This->IAudioRenderClient_iface; - } else if (IsEqualIID(riid, &IID_IAudioCaptureClient)) { - if (This->dataflow != eCapture) { - hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; - goto exit; - } - - IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); - *ppv = &This->IAudioCaptureClient_iface; - } else if (IsEqualIID(riid, &IID_IAudioClock)) { - IAudioClock_AddRef(&This->IAudioClock_iface); - *ppv = &This->IAudioClock_iface; - } else if (IsEqualIID(riid, &IID_IAudioStreamVolume)) { - IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); - *ppv = &This->IAudioStreamVolume_iface; - } else if (IsEqualIID(riid, &IID_IAudioSessionControl) || - IsEqualIID(riid, &IID_IChannelAudioVolume) || - IsEqualIID(riid, &IID_ISimpleAudioVolume)) { - const BOOLEAN new_session = !This->session_wrapper; - if (new_session) { - This->session_wrapper = session_wrapper_create(This); - if (!This->session_wrapper) { - hr = E_OUTOFMEMORY; - goto exit; - } - } - - if (IsEqualIID(riid, &IID_IAudioSessionControl)) - *ppv = &This->session_wrapper->IAudioSessionControl2_iface; - else if (IsEqualIID(riid, &IID_IChannelAudioVolume)) - *ppv = &This->session_wrapper->IChannelAudioVolume_iface; - else if (IsEqualIID(riid, &IID_ISimpleAudioVolume)) - *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; - - if (!new_session) - IUnknown_AddRef((IUnknown *)*ppv); - } else { - FIXME("stub %s\n", debugstr_guid(riid)); - hr = E_NOINTERFACE; - goto exit; - } - - hr = S_OK; -exit: - sessions_unlock(); - - return hr; -} +extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, + void **ppv); extern HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface, AUDIO_STREAM_CATEGORY category, BOOL *offload_capable); @@ -1133,7 +1061,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_Stop, AudioClient_Reset, AudioClient_SetEventHandle, - AudioClient_GetService, + client_GetService, client_IsOffloadCapable, client_SetClientProperties, client_GetBufferSizeLimits,

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioClient's GetService.
by Alexandre Julliard 06 Jun '23

06 Jun '23

Module: wine Branch: master Commit: 09b243177195d6c70fc996ad875c827a51d5b95f URL: https://gitlab.winehq.org/wine/wine/-/commit/09b243177195d6c70fc996ad875c82… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu May 25 10:49:32 2023 +0200 winealsa: Use mmdevapi's AudioClient's GetService. --- dlls/winealsa.drv/mmdevdrv.c | 87 ++------------------------------------------ 1 file changed, 3 insertions(+), 84 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1eee5a8faa9..b96eba1e0fe 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -895,89 +895,8 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, return params.result; } -static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, - void **ppv) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - sessions_lock(); - - if(!This->stream){ - sessions_unlock(); - return AUDCLNT_E_NOT_INITIALIZED; - } - - if(IsEqualIID(riid, &IID_IAudioRenderClient)){ - if(This->dataflow != eRender){ - sessions_unlock(); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; - } - IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); - *ppv = &This->IAudioRenderClient_iface; - }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ - if(This->dataflow != eCapture){ - sessions_unlock(); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; - } - IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); - *ppv = &This->IAudioCaptureClient_iface; - }else if(IsEqualIID(riid, &IID_IAudioClock)){ - IAudioClock_AddRef(&This->IAudioClock_iface); - *ppv = &This->IAudioClock_iface; - }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){ - IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); - *ppv = &This->IAudioStreamVolume_iface; - }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); - - *ppv = &This->session_wrapper->IAudioSessionControl2_iface; - }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); - - *ppv = &This->session_wrapper->IChannelAudioVolume_iface; - }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - sessions_unlock(); - return E_OUTOFMEMORY; - } - }else - ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); - - *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; - } - - if(*ppv){ - sessions_unlock(); - return S_OK; - } - - sessions_unlock(); - - FIXME("stub %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} +extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, + void **ppv); extern HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface, AUDIO_STREAM_CATEGORY category, BOOL *offload_capable); @@ -1016,7 +935,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_Stop, AudioClient_Reset, AudioClient_SetEventHandle, - AudioClient_GetService, + client_GetService, client_IsOffloadCapable, client_SetClientProperties, client_GetBufferSizeLimits,

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioClient's GetService.
by Alexandre Julliard 06 Jun '23

06 Jun '23

Module: wine Branch: master Commit: adfc7cef9c3b149d3d0b3e927cae603ce7120f34 URL: https://gitlab.winehq.org/wine/wine/-/commit/adfc7cef9c3b149d3d0b3e927cae60… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu May 25 10:52:14 2023 +0200 winecoreaudio: Use mmdevapi's AudioClient's GetService. --- dlls/winecoreaudio.drv/mmdevdrv.c | 86 ++------------------------------------- 1 file changed, 3 insertions(+), 83 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 196f2897b39..dcd712c7c7a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -861,88 +861,8 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, return params.result; } -static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, - void **ppv) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr; - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - sessions_lock(); - - if(IsEqualIID(riid, &IID_IAudioRenderClient)){ - if(This->dataflow != eRender){ - hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; - goto end; - } - IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); - *ppv = &This->IAudioRenderClient_iface; - }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ - if(This->dataflow != eCapture){ - hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; - goto end; - } - IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); - *ppv = &This->IAudioCaptureClient_iface; - }else if(IsEqualIID(riid, &IID_IAudioClock)){ - IAudioClock_AddRef(&This->IAudioClock_iface); - *ppv = &This->IAudioClock_iface; - }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){ - IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); - *ppv = &This->IAudioStreamVolume_iface; - }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - hr = E_OUTOFMEMORY; - goto end; - } - }else - IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); - - *ppv = &This->session_wrapper->IAudioSessionControl2_iface; - }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - hr = E_OUTOFMEMORY; - goto end; - } - }else - IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); - - *ppv = &This->session_wrapper->IChannelAudioVolume_iface; - }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ - if(!This->session_wrapper){ - This->session_wrapper = session_wrapper_create(This); - if(!This->session_wrapper){ - hr = E_OUTOFMEMORY; - goto end; - } - }else - ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); - - *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; - } - - if(*ppv) hr = S_OK; - else{ - FIXME("stub %s\n", debugstr_guid(riid)); - hr = E_NOINTERFACE; - } - -end: - sessions_unlock(); - return hr; -} +extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, + void **ppv); extern HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface, AUDIO_STREAM_CATEGORY category, BOOL *offload_capable); @@ -981,7 +901,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_Stop, AudioClient_Reset, AudioClient_SetEventHandle, - AudioClient_GetService, + client_GetService, client_IsOffloadCapable, client_SetClientProperties, client_GetBufferSizeLimits,

1 0

Rémi Bernon : evr/tests: Test IMFVideoDisplayControl_GetCurrentImage orientation.
by Alexandre Julliard 06 Jun '23

06 Jun '23

Module: wine Branch: master Commit: df91b31428ab22fe26c82729d80ef064b5bc8dfc URL: https://gitlab.winehq.org/wine/wine/-/commit/df91b31428ab22fe26c82729d80ef0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 25 23:49:31 2023 +0200 evr/tests: Test IMFVideoDisplayControl_GetCurrentImage orientation. --- dlls/evr/tests/Makefile.in | 2 + dlls/evr/tests/evr.c | 269 ++++++++++++++++++++++++++++++++++++- dlls/evr/tests/nv12frame.bmp | Bin 0 -> 50742 bytes dlls/evr/tests/resource.rc | 33 +++++ dlls/evr/tests/rgb32frame-flip.bmp | Bin 0 -> 36918 bytes dlls/evr/tests/rgb32frame.bmp | Bin 0 -> 36918 bytes 6 files changed, 299 insertions(+), 5 deletions(-)

1 0

Rémi Bernon : evr: Respect RGB format stride in GetCurrentImage.
by Alexandre Julliard 06 Jun '23

06 Jun '23

Module: wine Branch: master Commit: 486531ca8a8d0dc3aff2804c574928a37c96664c URL: https://gitlab.winehq.org/wine/wine/-/commit/486531ca8a8d0dc3aff2804c574928… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 11:13:49 2023 +0200 evr: Respect RGB format stride in GetCurrentImage. --- dlls/evr/presenter.c | 3 ++- dlls/evr/tests/evr.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index d8bdbee3915..06592f8766e 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1531,7 +1531,8 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon { if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(readback, &mapped_rect, NULL, D3DLOCK_READONLY))) { - memcpy(*dib, mapped_rect.pBits, *dib_size); + hr = MFCopyImage(stride < 0 ? *dib + *dib_size + stride : *dib, stride, + mapped_rect.pBits, mapped_rect.Pitch, abs(stride), surface_desc.Height); IDirect3DSurface9_UnlockRect(readback); } } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 161d910971f..8842a858b83 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -3466,8 +3466,7 @@ static void test_presenter_orientation(const GUID *subtype) SetRect(&rect, 0, 0, header.biWidth, header.biHeight); diff = check_rgb32_data(L"rgb32frame-flip.bmp", data, header.biSizeImage, &rect); - todo_wine - ok(diff <= 3, "Unexpected %lu%% diff\n", diff); + ok(diff <= 5, "Unexpected %lu%% diff\n", diff); CoTaskMemFree(data); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_ENDSTREAMING, 0);

1 0

Billy Laws : configure: Stash host LDFLAGS when configuring cross-compilers.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: c29336fa781a7cf34379c1e38dea7a7cd04f92af URL: https://gitlab.winehq.org/wine/wine/-/commit/c29336fa781a7cf34379c1e38dea7a… Author: Billy Laws <blaws05(a)gmail.com> Date: Sat Jun 3 21:35:45 2023 +0100 configure: Stash host LDFLAGS when configuring cross-compilers. --- configure | 6 +++++- configure.ac | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4cab5e67e43..000776267b1 100755 --- a/configure +++ b/configure @@ -10591,11 +10591,13 @@ fi saved_CC=$CC saved_CFLAGS=$CFLAGS + saved_LDFLAGS=$LDFLAGS CFLAGS=${CROSSCFLAGS:-"-g -O2"} + LDFLAGS=$CROSSLDFLAGS eval CC=\$${wine_arch}_CC eval ${wine_arch}_CFLAGS=\$CFLAGS - eval ${wine_arch}_LDFLAGS=\$CROSSLDFLAGS + eval ${wine_arch}_LDFLAGS=\$LDFLAGS eval "${wine_arch}_EXTRACFLAGS=\"-D__WINE_PE_BUILD -Wall\"" target="" @@ -10699,6 +10701,7 @@ fi then CC=$saved_CC CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS continue fi as_fn_append PE_ARCHS " $wine_arch" @@ -11672,6 +11675,7 @@ fi } CC=$saved_CC CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS done if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x diff --git a/configure.ac b/configure.ac index 3af0aa5fa98..2b4c09069ac 100644 --- a/configure.ac +++ b/configure.ac @@ -842,11 +842,13 @@ do saved_CC=$CC saved_CFLAGS=$CFLAGS + saved_LDFLAGS=$LDFLAGS CFLAGS=${CROSSCFLAGS:-"-g -O2"} + LDFLAGS=$CROSSLDFLAGS AS_VAR_COPY([CC],[${wine_arch}_CC]) AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS]) - AS_VAR_COPY([${wine_arch}_LDFLAGS],[CROSSLDFLAGS]) + AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS]) AS_VAR_SET([${wine_arch}_EXTRACFLAGS],["-D__WINE_PE_BUILD -Wall"]) target="" @@ -892,6 +894,7 @@ do then CC=$saved_CC CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS continue fi AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"]) @@ -982,6 +985,7 @@ do CC=$saved_CC CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS done if test $HOST_ARCH = aarch64 -a "x$PE_ARCHS" = x

1 0