[PATCH 0/3] MR6193: mmdevapi: Implement IAudioSessionEnumerator.
Fixes Owl Observatory Demo failing to start. It looks like just a stub interface might be enough for the game to work but it probably won't hurt to implement the interface at once. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6193
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mmdevapi/audiosessionmanager.c | 101 +++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/audiosessionmanager.c b/dlls/mmdevapi/audiosessionmanager.c index 5486b3fa40c..99aa6ac4959 100644 --- a/dlls/mmdevapi/audiosessionmanager.c +++ b/dlls/mmdevapi/audiosessionmanager.c @@ -48,6 +48,101 @@ void sessions_unlock(void) LeaveCriticalSection(&g_sessions_lock); } +struct session_enum +{ + IAudioSessionEnumerator IAudioSessionEnumerator_iface; + LONG ref; +}; + +static struct session_enum *impl_from_IAudioSessionEnumerator(IAudioSessionEnumerator *iface) +{ + return CONTAINING_RECORD(iface, struct session_enum, IAudioSessionEnumerator_iface); +} + +static HRESULT WINAPI enumerator_QueryInterface(IAudioSessionEnumerator *iface, REFIID riid, void **ppv) +{ + struct session_enum *enumerator = impl_from_IAudioSessionEnumerator(iface); + + TRACE("(%p)->(%s, %p)\n", enumerator, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAudioSessionEnumerator)) + *ppv = &enumerator->IAudioSessionEnumerator_iface; + else { + WARN("Unknown iface %s.\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI enumerator_AddRef(IAudioSessionEnumerator *iface) +{ + struct session_enum *enumerator = impl_from_IAudioSessionEnumerator(iface); + ULONG ref = InterlockedIncrement(&enumerator->ref); + TRACE("(%p) new ref %lu\n", enumerator, ref); + return ref; +} + +static ULONG WINAPI enumerator_Release(IAudioSessionEnumerator *iface) +{ + struct session_enum *enumerator = impl_from_IAudioSessionEnumerator(iface); + ULONG ref = InterlockedDecrement(&enumerator->ref); + TRACE("(%p) new ref %lu\n", enumerator, ref); + + if (!ref) + free(enumerator); + + return ref; +} + +static HRESULT WINAPI enumerator_GetCount(IAudioSessionEnumerator *iface, int *count) +{ + FIXME("%p -> %p stub.\n", iface, count); + + if (!count) return E_POINTER; + + *count = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI enumerator_GetSession(IAudioSessionEnumerator *iface, int index, IAudioSessionControl **session) +{ + FIXME("%p -> %d %p stub.\n", iface, index, session); + + if (!session) return E_POINTER; + *session = NULL; + return E_NOTIMPL; +} + +static const IAudioSessionEnumeratorVtbl IAudioSessionEnumerator_vtbl = +{ + enumerator_QueryInterface, + enumerator_AddRef, + enumerator_Release, + enumerator_GetCount, + enumerator_GetSession, +}; + +static HRESULT create_session_enumerator(IAudioSessionEnumerator **ppv) +{ + struct session_enum *enumerator; + + if (!(enumerator = calloc(1, sizeof(*enumerator)))) + return E_OUTOFMEMORY; + + enumerator->IAudioSessionEnumerator_iface.lpVtbl = &IAudioSessionEnumerator_vtbl; + enumerator->ref = 1; + *ppv = &enumerator->IAudioSessionEnumerator_iface; + return S_OK; +} + static inline struct session_mgr *impl_from_IAudioSessionManager2(IAudioSessionManager2 *iface) { return CONTAINING_RECORD(iface, struct session_mgr, IAudioSessionManager2_iface); @@ -137,8 +232,10 @@ static HRESULT WINAPI ASM_GetSessionEnumerator(IAudioSessionManager2 *iface, IAudioSessionEnumerator **out) { struct session_mgr *This = impl_from_IAudioSessionManager2(iface); - FIXME("(%p)->(%p) - stub\n", This, out); - return E_NOTIMPL; + + TRACE("(%p)->(%p).\n", This, out); + + return create_session_enumerator(out); } static HRESULT WINAPI ASM_RegisterSessionNotification(IAudioSessionManager2 *iface, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6193
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mmdevapi/audiosessionmanager.c | 48 ++++++++++++++++++++++++----- dlls/mmdevapi/mmdevapi_private.h | 2 ++ dlls/mmdevapi/session.c | 23 ++++++++++++++ 3 files changed, 65 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/audiosessionmanager.c b/dlls/mmdevapi/audiosessionmanager.c index 99aa6ac4959..5c8d1e80cd0 100644 --- a/dlls/mmdevapi/audiosessionmanager.c +++ b/dlls/mmdevapi/audiosessionmanager.c @@ -51,6 +51,9 @@ void sessions_unlock(void) struct session_enum { IAudioSessionEnumerator IAudioSessionEnumerator_iface; + IMMDevice *device; + GUID *sessions; + int session_count; LONG ref; }; @@ -97,28 +100,46 @@ static ULONG WINAPI enumerator_Release(IAudioSessionEnumerator *iface) TRACE("(%p) new ref %lu\n", enumerator, ref); if (!ref) + { + IMMDevice_Release(enumerator->device); + free(enumerator->sessions); free(enumerator); + } return ref; } static HRESULT WINAPI enumerator_GetCount(IAudioSessionEnumerator *iface, int *count) { - FIXME("%p -> %p stub.\n", iface, count); + struct session_enum *enumerator = impl_from_IAudioSessionEnumerator(iface); - if (!count) return E_POINTER; + TRACE("%p -> %p.\n", iface, count); - *count = 0; - return E_NOTIMPL; + if (!count) return E_POINTER; + *count = enumerator->session_count; + return S_OK; } static HRESULT WINAPI enumerator_GetSession(IAudioSessionEnumerator *iface, int index, IAudioSessionControl **session) { - FIXME("%p -> %d %p stub.\n", iface, index, session); + struct session_enum *enumerator = impl_from_IAudioSessionEnumerator(iface); + struct audio_session_wrapper *session_wrapper; + HRESULT hr; + + TRACE("%p -> %d %p.\n", iface, index, session); if (!session) return E_POINTER; + if (index >= enumerator->session_count) + return E_FAIL; + *session = NULL; - return E_NOTIMPL; + sessions_lock(); + hr = get_audio_session_wrapper(&enumerator->sessions[index], enumerator->device, &session_wrapper); + sessions_unlock(); + if (FAILED(hr)) + return hr; + *session = (IAudioSessionControl *)&session_wrapper->IAudioSessionControl2_iface; + return S_OK; } static const IAudioSessionEnumeratorVtbl IAudioSessionEnumerator_vtbl = @@ -130,14 +151,25 @@ static const IAudioSessionEnumeratorVtbl IAudioSessionEnumerator_vtbl = enumerator_GetSession, }; -static HRESULT create_session_enumerator(IAudioSessionEnumerator **ppv) +static HRESULT create_session_enumerator(IMMDevice *device, IAudioSessionEnumerator **ppv) { struct session_enum *enumerator; + HRESULT hr; if (!(enumerator = calloc(1, sizeof(*enumerator)))) return E_OUTOFMEMORY; + sessions_lock(); + hr = get_audio_sessions(device, &enumerator->sessions, &enumerator->session_count); + sessions_lock(); + if (FAILED(hr)) + { + free(enumerator); + return hr; + } enumerator->IAudioSessionEnumerator_iface.lpVtbl = &IAudioSessionEnumerator_vtbl; + IMMDevice_AddRef(device); + enumerator->device = device; enumerator->ref = 1; *ppv = &enumerator->IAudioSessionEnumerator_iface; return S_OK; @@ -235,7 +267,7 @@ static HRESULT WINAPI ASM_GetSessionEnumerator(IAudioSessionManager2 *iface, TRACE("(%p)->(%p).\n", This, out); - return create_session_enumerator(out); + return create_session_enumerator(This->device, out); } static HRESULT WINAPI ASM_RegisterSessionNotification(IAudioSessionManager2 *iface, diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h index 5ef19ffc0d1..ab6e42eb1c5 100644 --- a/dlls/mmdevapi/mmdevapi_private.h +++ b/dlls/mmdevapi/mmdevapi_private.h @@ -80,3 +80,5 @@ extern HRESULT load_driver_devices(EDataFlow flow); extern void main_loop_stop(void); extern const WCHAR drv_keyW[]; + +extern HRESULT get_audio_sessions(IMMDevice *device, GUID **ret, int *ret_count); diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index d22619b03a1..1388ddf4528 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -728,3 +728,26 @@ HRESULT get_audio_session_wrapper(const GUID *guid, IMMDevice *device, return S_OK; } + +HRESULT get_audio_sessions(IMMDevice *device, GUID **ret, int *ret_count) +{ + struct audio_session *session; + + *ret_count = 0; + *ret = NULL; + LIST_FOR_EACH_ENTRY(session, &sessions, struct audio_session, entry) { + if (session->device == device) + ++*ret_count; + } + if (!*ret_count) + return S_OK; + + if (!(*ret = malloc(*ret_count * sizeof(**ret)))) + return E_OUTOFMEMORY; + *ret_count = 0; + LIST_FOR_EACH_ENTRY(session, &sessions, struct audio_session, entry) { + if (session->device == device) + (*ret)[(*ret_count)++] = session->guid; + } + return S_OK; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6193
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mmdevapi/tests/render.c | 77 +++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index b8ef4b5a549..59065c35456 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -2138,12 +2138,18 @@ static void test_session_creation(void) { IMMDevice *cap_dev; IAudioClient *ac; + IAudioSessionEnumerator *sess_enum, *sess_enum2; + IAudioSessionManager2 *sesm2; IAudioSessionManager *sesm; ISimpleAudioVolume *sav; - GUID session_guid; + GUID session_guid, session_guid2; + BOOL found_first, found_second; + IAudioSessionControl *ctl; float vol; HRESULT hr; WAVEFORMATEX *fmt; + int i, count; + WCHAR *name; CoCreateGuid(&session_guid); @@ -2159,9 +2165,78 @@ static void test_session_creation(void) hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.6f, NULL); ok(hr == S_OK, "SetMasterVolume failed: %08lx\n", hr); + hr = IAudioSessionManager_GetAudioSessionControl(sesm, &session_guid, 0, &ctl); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IAudioSessionControl_SetDisplayName(ctl, L"test_session1", NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + IAudioSessionControl_Release(ctl); + + hr = IAudioSessionManager_QueryInterface(sesm, &IID_IAudioSessionManager2, (void **)&sesm2); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IAudioSessionManager2_GetSessionEnumerator((void *)sesm2, &sess_enum); + ok(hr == S_OK, "got %#lx.\n", hr); + + /* create another session after getting the first enumerarot. */ + CoCreateGuid(&session_guid2); + hr = IAudioSessionManager_GetAudioSessionControl(sesm, &session_guid2, 0, &ctl); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IAudioSessionControl_SetDisplayName(ctl, L"test_session2", NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + IAudioSessionControl_Release(ctl); + + hr = IAudioSessionManager2_GetSessionEnumerator(sesm2, &sess_enum2); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(sess_enum != sess_enum2, "got the same interface.\n"); + + hr = IAudioSessionEnumerator_GetCount(sess_enum, &count); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(count, "got %d.\n", count); + found_first = found_second = FALSE; + for (i = 0; i < count; ++i) + { + hr = IAudioSessionEnumerator_GetSession(sess_enum, i, &ctl); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IAudioSessionControl_GetDisplayName(ctl, &name); + ok(hr == S_OK, "got %#lx.\n", hr); + if (!wcscmp(name, L"test_session1")) + found_first = TRUE; + if (!wcscmp(name, L"test_session2")) + found_second = TRUE; + CoTaskMemFree(name); + IAudioSessionControl_Release(ctl); + } + ok(found_first && !found_second, "got %d, %d.\n", found_first, found_second); + if (0) + { + /* random access violation on Win11. */ + IAudioSessionEnumerator_GetSession(sess_enum, count, &ctl); + } + + hr = IAudioSessionEnumerator_GetCount(sess_enum2, &count); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(count, "got %d.\n", count); + found_first = found_second = FALSE; + for (i = 0; i < count; ++i) + { + hr = IAudioSessionEnumerator_GetSession(sess_enum2, i, &ctl); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IAudioSessionControl_GetDisplayName(ctl, &name); + ok(hr == S_OK, "got %#lx.\n", hr); + if (!wcscmp(name, L"test_session1")) + found_first = TRUE; + if (!wcscmp(name, L"test_session2")) + found_second = TRUE; + CoTaskMemFree(name); + IAudioSessionControl_Release(ctl); + } + ok(found_first && found_second, "got %d, %d.\n", found_first, found_second); + IAudioSessionEnumerator_Release(sess_enum); + IAudioSessionEnumerator_Release(sess_enum2); + /* Release completely to show session persistence */ ISimpleAudioVolume_Release(sav); IAudioSessionManager_Release(sesm); + IAudioSessionManager2_Release(sesm2); /* test if we can create a capture audioclient in the session we just * created from a SessionManager derived from a render device */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6193
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=147491 Your paranoid android. === w1064v1507 (64 bit report) === mmdevapi: render.c:1376: Test failed: GetBuffer large (20671) at iteration 5 === w1064_adm (64 bit report) === mmdevapi: render.c:1376: Test failed: GetBuffer large (22500) at iteration 8 === debian11b (64 bit WoW report) === user32: input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000007100E0, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6193
participants (4)
-
Huw Davies (＠huw) -
Marvin -
Paul Gofman
-
Paul Gofman (＠gofman)