[PATCH 0/2] MR6226: mmdevapi: Implement control_GetSessionIdentifier / control_GetSessionInstanceIdentifier.
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mmdevapi/session.c | 28 +++++++++++++++++++++-- dlls/mmdevapi/tests/render.c | 43 ++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index 1388ddf4528..d602859ffe5 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -267,8 +267,32 @@ static HRESULT WINAPI control_UnregisterAudioSessionNotification(IAudioSessionCo static HRESULT WINAPI control_GetSessionIdentifier(IAudioSessionControl2 *iface, WCHAR **id) { struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface); - FIXME("(%p)->(%p) - stub\n", This, id); - return E_NOTIMPL; + WCHAR exe_path[MAX_PATH], session_guid[39], *dev_id; + DWORD len; + HRESULT hr; + + TRACE("(%p)->(%p).\n", This, id); + + if (!id) + return E_POINTER; + *id = NULL; + + len = ARRAY_SIZE(exe_path); + if (!QueryFullProcessImageNameW(GetCurrentProcess(), PROCESS_NAME_NATIVE, exe_path, &len)) + return E_FAIL; + if (!StringFromGUID2(&This->session->guid, session_guid, ARRAY_SIZE(session_guid))) + return E_FAIL; + if (FAILED(hr = IMMDevice_GetId(This->session->device, &dev_id))) + return hr; + + len = wcslen(dev_id) + 1 + wcslen(exe_path) + 2 + wcslen(session_guid) + 1; + if (!(*id = CoTaskMemAlloc(len * sizeof(WCHAR)))) { + CoTaskMemFree(dev_id); + return E_OUTOFMEMORY; + } + swprintf(*id, len, L"%s|%s%%b%s", dev_id, exe_path, session_guid); + CoTaskMemFree(dev_id); + return S_OK; } static HRESULT WINAPI control_GetSessionInstanceIdentifier(IAudioSessionControl2 *iface, WCHAR **id) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 59065c35456..b1272e88122 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -2134,6 +2134,43 @@ static void test_volume_dependence(void) IAudioClient_Release(ac); } +#define check_session_ids(a, b, c) check_session_ids_(__LINE__, a, b, c) +static void check_session_ids_(unsigned int line, IMMDevice *dev, const GUID *session_guid, IAudioSessionControl *ctl) +{ + WCHAR exe_path[MAX_PATH], expected[MAX_PATH + 512], *dev_id, *str; + IAudioSessionControl2 *ctl2; + WCHAR guidstr[39]; + HRESULT hr; + DWORD size; + BOOL bret; + int ret; + + if (FAILED(IAudioSessionControl_QueryInterface(ctl, &IID_IAudioSessionControl2, (void **)&ctl2))) + { + win_skip("IAudioSessionControl2 not available.\n"); + return; + } + + ret = StringFromGUID2(session_guid, guidstr, ARRAY_SIZE(guidstr)); + ok(ret == 39, "got %d.\n", ret); + + size = ARRAY_SIZE(exe_path); + bret = QueryFullProcessImageNameW(GetCurrentProcess(), PROCESS_NAME_NATIVE, exe_path, &size); + ok(bret, "got error %ld.\n", GetLastError()); + + hr = IMMDevice_GetId(dev, &dev_id); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IAudioSessionControl2_GetSessionIdentifier(ctl2, &str); + ok_(__FILE__, line)(hr == S_OK, "GetSessionIdentifier failed, hr %#lx.\n", hr); + wsprintfW(expected, L"%s|%s%%b%s", dev_id, exe_path, guidstr); + ok_(__FILE__, line)(!wcscmp(str, expected), "got %s, expected %s.\n", debugstr_w(str), debugstr_w(expected)); + CoTaskMemFree(str); + + CoTaskMemFree(dev_id); + IAudioSessionControl2_Release(ctl2); +} + static void test_session_creation(void) { IMMDevice *cap_dev; @@ -2223,9 +2260,15 @@ static void test_session_creation(void) hr = IAudioSessionControl_GetDisplayName(ctl, &name); ok(hr == S_OK, "got %#lx.\n", hr); if (!wcscmp(name, L"test_session1")) + { found_first = TRUE; + check_session_ids(dev, &session_guid, ctl); + } if (!wcscmp(name, L"test_session2")) + { found_second = TRUE; + check_session_ids(dev, &session_guid2, ctl); + } CoTaskMemFree(name); IAudioSessionControl_Release(ctl); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6226
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mmdevapi/session.c | 20 ++++++++++++++++++-- dlls/mmdevapi/tests/render.c | 6 ++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index d602859ffe5..9b97cef9df8 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -298,8 +298,24 @@ static HRESULT WINAPI control_GetSessionIdentifier(IAudioSessionControl2 *iface, static HRESULT WINAPI control_GetSessionInstanceIdentifier(IAudioSessionControl2 *iface, WCHAR **id) { struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface); - FIXME("(%p)->(%p) - stub\n", This, id); - return E_NOTIMPL; + WCHAR *session_id, pid[16]; + HRESULT hr; + DWORD len; + + TRACE("(%p)->(%p).\n", This, id); + + if (FAILED(hr = control_GetSessionIdentifier(iface, &session_id))) + return hr; + + swprintf(pid, ARRAY_SIZE(pid), L"%lu", GetCurrentProcessId()); + len = wcslen(session_id) + 4 + wcslen(pid) + 1; + if (!(*id = CoTaskMemAlloc(len * sizeof(WCHAR)))) { + CoTaskMemFree(session_id); + return E_OUTOFMEMORY; + } + swprintf(*id, len, L"%s|1%%b%s", session_id, pid); + CoTaskMemFree(session_id); + return S_OK; } static HRESULT WINAPI control_GetProcessId(IAudioSessionControl2 *iface, DWORD *pid) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index b1272e88122..9d6436e042b 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -2167,6 +2167,12 @@ static void check_session_ids_(unsigned int line, IMMDevice *dev, const GUID *se ok_(__FILE__, line)(!wcscmp(str, expected), "got %s, expected %s.\n", debugstr_w(str), debugstr_w(expected)); CoTaskMemFree(str); + hr = IAudioSessionControl2_GetSessionInstanceIdentifier(ctl2, &str); + ok_(__FILE__, line)(hr == S_OK, "GetSessionInstanceIdentifier failed, hr %#lx.\n", hr); + wsprintfW(expected, L"%s|%s%%b%s|1%%b%lu", dev_id, exe_path, guidstr, GetCurrentProcessId()); + ok_(__FILE__, line)(!wcscmp(str, expected), "got %s, expected %s.\n", debugstr_w(str), debugstr_w(expected)); + CoTaskMemFree(str); + CoTaskMemFree(dev_id); IAudioSessionControl2_Release(ctl2); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6226
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=147601 Your paranoid android. === w8 (32 bit report) === mmdevapi: render.c:1376: Test failed: GetBuffer large (20671) at iteration 2 === w8adm (32 bit report) === mmdevapi: render.c:1376: Test failed: GetBuffer large (20671) at iteration 6 === w1064v1507 (32 bit report) === mmdevapi: render.c:1376: Test failed: GetBuffer large (20671) at iteration 5 render.c:1376: Test failed: GetBuffer large (20671) at iteration 2 === w10pro64 (32 bit report) === mmdevapi: render.c:1376: Test failed: GetBuffer large (22500) at iteration 7 === w1064v1507 (64 bit report) === mmdevapi: render.c:1376: Test failed: GetBuffer large (20671) at iteration 3 === w1064_2qxl (64 bit report) === mmdevapi: render.c:1376: Test failed: GetBuffer large (22500) at iteration 6
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6226
participants (4)
-
Huw Davies (＠huw) -
Marvin -
Paul Gofman
-
Paul Gofman (＠gofman)