[PATCH v2 0/6] MR5773: mmdevapi: Fake success in a few IAudioSessionControl2 methods

[Fabian Maurer (＠DarkShadow44)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56763

--
  v2: mmdevapi: Implement IAudioSessionControl2 GetGroupingParam SetGroupingParam
      mmdevapi: Implement IAudioSessionControl2 GetIconPath / SetIconPath
      mmdevapi: Implement IAudioSessionControl2 GetDisplayName / SetDisplayName
      mmdevapi/tests: Add tests for IAudioSessionControl2 GetGroupingParam / SetGroupingParam
      mmdevapi/tests: Add tests for IAudioSessionControl2 GetIconPath / SetIconPath
      mmdevapi/tests: Add tests for IAudioSessionControl2 GetDisplayName / SetDisplayName

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

[PATCH v2 1/6] mmdevapi/tests: Add tests for IAudioSessionControl2 GetDisplayName / SetDisplayName

[Fabian Maurer]

From: Fabian Maurer

---
 dlls/mmdevapi/tests/render.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index a7da68ec3f1..4ec2b5e3f04 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -1453,6 +1453,7 @@ static void test_session(void)
     WAVEFORMATEX *pwfx;
     ULONG ref;
     HRESULT hr;
+    WCHAR *str;

hr = CoCreateGuid(&ses1_guid);
     ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr);
@@ -1575,6 +1576,40 @@ static void test_session(void)
     ok(hr == S_OK, "GetState failed: %08lx\n", hr);
     ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);

+    /* Test GetDisplayName / SetDisplayName */
+
+    hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, NULL);
+    todo_wine
+    ok(hr == E_POINTER, "GetDisplayName failed: %08lx\n", hr);
+
+    str = NULL;
+    hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, &str);
+    todo_wine
+    ok(hr == S_OK, "GetDisplayName failed: %08lx\n", hr);
+    todo_wine
+    ok(str && !wcscmp(str, L""), "Got %s\n", wine_dbgstr_w(str));
+    if (str)
+        CoTaskMemFree(str);
+
+    hr = IAudioSessionControl2_SetDisplayName(ses1_ctl2, NULL, NULL);
+    todo_wine
+    ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetDisplayName failed: %08lx\n", hr);
+
+    hr = IAudioSessionControl2_SetDisplayName(ses1_ctl2, L"WineDisplayName", NULL);
+    todo_wine
+    ok(hr == S_OK, "SetDisplayName failed: %08lx\n", hr);
+
+    str = NULL;
+    hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, &str);
+    todo_wine
+    ok(hr == S_OK, "GetDisplayName failed: %08lx\n", hr);
+    todo_wine
+    ok(str && !wcscmp(str, L"WineDisplayName"), "Got %s\n", wine_dbgstr_w(str));
+    if (str)
+        CoTaskMemFree(str);
+
+    /* Test capture */
+
     if(cap_ctl){
         hr = IAudioSessionControl2_GetState(cap_ctl, &state);
         ok(hr == S_OK, "GetState failed: %08lx\n", hr);

[PATCH v2 2/6] mmdevapi/tests: Add tests for IAudioSessionControl2 GetIconPath / SetIconPath

[Fabian Maurer]

From: Fabian Maurer

---
 dlls/mmdevapi/tests/render.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 4ec2b5e3f04..77028e9ef77 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -1608,6 +1608,38 @@ static void test_session(void)
     if (str)
         CoTaskMemFree(str);

+    /* Test GetIconPath / SetIconPath */
+
+    hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, NULL);
+    todo_wine
+    ok(hr == E_POINTER, "GetIconPath failed: %08lx\n", hr);
+
+    str = NULL;
+    hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, &str);
+    todo_wine
+    ok(hr == S_OK, "GetIconPath failed: %08lx\n", hr);
+    todo_wine
+    ok(str && !wcscmp(str, L""), "Got %s\n", wine_dbgstr_w(str));
+    if(str)
+        CoTaskMemFree(str);
+
+    hr = IAudioSessionControl2_SetIconPath(ses1_ctl2, NULL, NULL);
+    todo_wine
+    ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetIconPath failed: %08lx\n", hr);
+
+    hr = IAudioSessionControl2_SetIconPath(ses1_ctl2, L"WineIconPath", NULL);
+    todo_wine
+    ok(hr == S_OK, "SetIconPath failed: %08lx\n", hr);
+
+    str = NULL;
+    hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, &str);
+    todo_wine
+    ok(hr == S_OK, "GetIconPath failed: %08lx\n", hr);
+    todo_wine
+    ok(str && !wcscmp(str, L"WineIconPath"), "Got %s\n", wine_dbgstr_w(str));
+    if (str)
+        CoTaskMemFree(str);
+
     /* Test capture */

if(cap_ctl){

[PATCH v2 3/6] mmdevapi/tests: Add tests for IAudioSessionControl2 GetGroupingParam / SetGroupingParam

[Fabian Maurer]

From: Fabian Maurer

---
 dlls/mmdevapi/tests/render.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 77028e9ef77..23ff0892dfe 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -1454,6 +1454,7 @@ static void test_session(void)
     ULONG ref;
     HRESULT hr;
     WCHAR *str;
+    GUID guid1 = GUID_NULL, guid2 = GUID_NULL;

hr = CoCreateGuid(&ses1_guid);
     ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr);
@@ -1640,6 +1641,35 @@ static void test_session(void)
     if (str)
         CoTaskMemFree(str);

+    /* Test GetGroupingParam / SetGroupingParam */
+
+    hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, NULL);
+    todo_wine
+    ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "GetGroupingParam failed: %08lx\n", hr);
+
+    hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, &guid1);
+    todo_wine
+    ok(hr == S_OK, "GetGroupingParam failed: %08lx\n", hr);
+    todo_wine
+    ok(!IsEqualGUID(&guid1, &guid2), "Expected non null GUID\n"); /* MSDN is wrong here, it is not GUID_NULL */
+
+    hr = IAudioSessionControl2_SetGroupingParam(ses1_ctl2, NULL, NULL);
+    todo_wine
+    ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetGroupingParam failed: %08lx\n", hr);
+
+    hr = CoCreateGuid(&guid2);
+    ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr);
+
+    hr = IAudioSessionControl2_SetGroupingParam(ses1_ctl2, &guid2, NULL);
+    todo_wine
+    ok(hr == S_OK, "SetGroupingParam failed: %08lx\n", hr);
+
+    hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, &guid1);
+    todo_wine
+    ok(hr == S_OK, "GetGroupingParam failed: %08lx\n", hr);
+    todo_wine
+    ok(IsEqualGUID(&guid1, &guid2), "Got %s\n", wine_dbgstr_guid(&guid1));
+
     /* Test capture */

if(cap_ctl){

[PATCH v2 4/6] mmdevapi: Implement IAudioSessionControl2 GetDisplayName / SetDisplayName

[Fabian Maurer]

From: Fabian Maurer

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56763
---
 dlls/mmdevapi/mmdevdrv.h     |  2 ++
 dlls/mmdevapi/session.c      | 37 +++++++++++++++++++++++++++++++-----
 dlls/mmdevapi/tests/render.c |  7 -------
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h
index 1f4d65e4436..115c5e32fcc 100644
--- a/dlls/mmdevapi/mmdevdrv.h
+++ b/dlls/mmdevapi/mmdevdrv.h
@@ -30,6 +30,8 @@ typedef struct audio_session {
     float *channel_vols;
     BOOL mute;

+    WCHAR *display_name;
+
     struct list entry;
 } AudioSession;

diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c
index 9a36adb5bf2..009c7aba74f 100644
--- a/dlls/mmdevapi/session.c
+++ b/dlls/mmdevapi/session.c
@@ -37,6 +37,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
 extern void sessions_lock(void);
 extern void sessions_unlock(void);

+WCHAR *duplicate_wstr(const WCHAR *str)
+{
+    int len = (lstrlenW(str) + 1) * sizeof(WCHAR);
+    WCHAR *ret = CoTaskMemAlloc(len);
+    memcpy(ret, str, len);
+    return ret;
+}
+
 extern void set_stream_volumes(struct audio_client *This);

static struct list sessions = LIST_INIT(sessions);
@@ -144,16 +152,33 @@ static HRESULT WINAPI control_GetState(IAudioSessionControl2 *iface, AudioSessio
 static HRESULT WINAPI control_GetDisplayName(IAudioSessionControl2 *iface, WCHAR **name)
 {
     struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface);
-    FIXME("(%p)->(%p) - stub\n", This, name);
-    return E_NOTIMPL;
+    struct audio_session *session = This->session;
+
+    TRACE("(%p)->(%p) - stub\n", This, name);
+
+    if (!name)
+        return E_POINTER;
+
+    *name = duplicate_wstr(session->display_name);
+
+    return S_OK;
 }

static HRESULT WINAPI control_SetDisplayName(IAudioSessionControl2 *iface, const WCHAR *name,
-                                         const GUID *session)
+                                         const GUID *session_guid)
 {
     struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface);
-    FIXME("(%p)->(%p, %s) - stub\n", This, name, debugstr_guid(session));
-    return E_NOTIMPL;
+    struct audio_session *session = This->session;
+
+    TRACE("(%p)->(%p, %s) - stub\n", This, name, debugstr_guid(session_guid));
+    FIXME("Ignoring session_guid\n");
+
+    if (!name)
+        return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER);
+
+    session->display_name = duplicate_wstr(name);
+
+    return S_OK;
 }

static HRESULT WINAPI control_GetIconPath(IAudioSessionControl2 *iface, WCHAR **path)
@@ -586,6 +611,8 @@ static struct audio_session *session_create(const GUID *guid, IMMDevice *device,

ret->master_vol = 1.f;

+    ret->display_name = duplicate_wstr(L"");
+
     return ret;
 }

diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 23ff0892dfe..6d76bff8b22 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -1580,31 +1580,24 @@ static void test_session(void)
     /* Test GetDisplayName / SetDisplayName */

hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, NULL);
-    todo_wine
     ok(hr == E_POINTER, "GetDisplayName failed: %08lx\n", hr);

str = NULL;
     hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, &str);
-    todo_wine
     ok(hr == S_OK, "GetDisplayName failed: %08lx\n", hr);
-    todo_wine
     ok(str && !wcscmp(str, L""), "Got %s\n", wine_dbgstr_w(str));
     if (str)
         CoTaskMemFree(str);

hr = IAudioSessionControl2_SetDisplayName(ses1_ctl2, NULL, NULL);
-    todo_wine
     ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetDisplayName failed: %08lx\n", hr);

hr = IAudioSessionControl2_SetDisplayName(ses1_ctl2, L"WineDisplayName", NULL);
-    todo_wine
     ok(hr == S_OK, "SetDisplayName failed: %08lx\n", hr);

str = NULL;
     hr = IAudioSessionControl2_GetDisplayName(ses1_ctl2, &str);
-    todo_wine
     ok(hr == S_OK, "GetDisplayName failed: %08lx\n", hr);
-    todo_wine
     ok(str && !wcscmp(str, L"WineDisplayName"), "Got %s\n", wine_dbgstr_w(str));
     if (str)
         CoTaskMemFree(str);

[PATCH v2 5/6] mmdevapi: Implement IAudioSessionControl2 GetIconPath / SetIconPath

[Fabian Maurer]

From: Fabian Maurer

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56763
---
 dlls/mmdevapi/mmdevdrv.h     |  1 +
 dlls/mmdevapi/session.c      | 28 +++++++++++++++++++++++-----
 dlls/mmdevapi/tests/render.c |  7 -------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h
index 115c5e32fcc..d4060fa304f 100644
--- a/dlls/mmdevapi/mmdevdrv.h
+++ b/dlls/mmdevapi/mmdevdrv.h
@@ -31,6 +31,7 @@ typedef struct audio_session {
     BOOL mute;

WCHAR *display_name;
+    WCHAR *icon_path;

struct list entry;
 } AudioSession;
diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c
index 009c7aba74f..dd28c37a083 100644
--- a/dlls/mmdevapi/session.c
+++ b/dlls/mmdevapi/session.c
@@ -184,16 +184,33 @@ static HRESULT WINAPI control_SetDisplayName(IAudioSessionControl2 *iface, const
 static HRESULT WINAPI control_GetIconPath(IAudioSessionControl2 *iface, WCHAR **path)
 {
     struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface);
-    FIXME("(%p)->(%p) - stub\n", This, path);
-    return E_NOTIMPL;
+    struct audio_session *session = This->session;
+
+    TRACE("(%p)->(%p) - stub\n", This, path);
+
+    if (!path)
+        return E_POINTER;
+
+    *path = duplicate_wstr(session->icon_path);
+
+    return S_OK;
 }

static HRESULT WINAPI control_SetIconPath(IAudioSessionControl2 *iface, const WCHAR *path,
-                                      const GUID *session)
+                                      const GUID *session_guid)
 {
     struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface);
-    FIXME("(%p)->(%s, %s) - stub\n", This, debugstr_w(path), debugstr_guid(session));
-    return E_NOTIMPL;
+    struct audio_session *session = This->session;
+
+    TRACE("(%p)->(%s, %s) - stub\n", This, debugstr_w(path), debugstr_guid(session_guid));
+    FIXME("Ignoring session_guid\n");
+
+    if (!path)
+        return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER);
+
+    session->icon_path = duplicate_wstr(path);
+
+    return S_OK;
 }

static HRESULT WINAPI control_GetGroupingParam(IAudioSessionControl2 *iface, GUID *group)
@@ -612,6 +629,7 @@ static struct audio_session *session_create(const GUID *guid, IMMDevice *device,
     ret->master_vol = 1.f;

ret->display_name = duplicate_wstr(L"");
+    ret->icon_path = duplicate_wstr(L"");

return ret;
 }
diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 6d76bff8b22..64bb2799705 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -1605,31 +1605,24 @@ static void test_session(void)
     /* Test GetIconPath / SetIconPath */

hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, NULL);
-    todo_wine
     ok(hr == E_POINTER, "GetIconPath failed: %08lx\n", hr);

str = NULL;
     hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, &str);
-    todo_wine
     ok(hr == S_OK, "GetIconPath failed: %08lx\n", hr);
-    todo_wine
     ok(str && !wcscmp(str, L""), "Got %s\n", wine_dbgstr_w(str));
     if(str)
         CoTaskMemFree(str);

hr = IAudioSessionControl2_SetIconPath(ses1_ctl2, NULL, NULL);
-    todo_wine
     ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetIconPath failed: %08lx\n", hr);

hr = IAudioSessionControl2_SetIconPath(ses1_ctl2, L"WineIconPath", NULL);
-    todo_wine
     ok(hr == S_OK, "SetIconPath failed: %08lx\n", hr);

str = NULL;
     hr = IAudioSessionControl2_GetIconPath(ses1_ctl2, &str);
-    todo_wine
     ok(hr == S_OK, "GetIconPath failed: %08lx\n", hr);
-    todo_wine
     ok(str && !wcscmp(str, L"WineIconPath"), "Got %s\n", wine_dbgstr_w(str));
     if (str)
         CoTaskMemFree(str);

[PATCH v2 6/6] mmdevapi: Implement IAudioSessionControl2 GetGroupingParam SetGroupingParam

[Fabian Maurer]

From: Fabian Maurer

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56763
---
 dlls/mmdevapi/mmdevdrv.h     |  1 +
 dlls/mmdevapi/session.c      | 28 +++++++++++++++++++++++-----
 dlls/mmdevapi/tests/render.c |  7 -------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h
index d4060fa304f..42b01443ff0 100644
--- a/dlls/mmdevapi/mmdevdrv.h
+++ b/dlls/mmdevapi/mmdevdrv.h
@@ -32,6 +32,7 @@ typedef struct audio_session {

WCHAR *display_name;
     WCHAR *icon_path;
+    GUID grouping_param;

struct list entry;
 } AudioSession;
diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c
index dd28c37a083..46f0b5e5317 100644
--- a/dlls/mmdevapi/session.c
+++ b/dlls/mmdevapi/session.c
@@ -216,16 +216,33 @@ static HRESULT WINAPI control_SetIconPath(IAudioSessionControl2 *iface, const WC
 static HRESULT WINAPI control_GetGroupingParam(IAudioSessionControl2 *iface, GUID *group)
 {
     struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface);
-    FIXME("(%p)->(%p) - stub\n", This, group);
-    return E_NOTIMPL;
+    struct audio_session *session = This->session;
+
+    TRACE("(%p)->(%p) - stub\n", This, group);
+
+    if (!group)
+        return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER);
+
+    *group = session->grouping_param;
+
+    return S_OK;
 }

static HRESULT WINAPI control_SetGroupingParam(IAudioSessionControl2 *iface, const GUID *group,
-                                           const GUID *session)
+                                           const GUID *session_guid)
 {
     struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface);
-    FIXME("(%p)->(%s, %s) - stub\n", This, debugstr_guid(group), debugstr_guid(session));
-    return E_NOTIMPL;
+    struct audio_session *session = This->session;
+
+    TRACE("(%p)->(%s, %s) - stub\n", This, debugstr_guid(group), debugstr_guid(session_guid));
+    FIXME("Ignoring session_guid\n");
+
+    if (!group)
+        return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER);
+
+    session->grouping_param = *group;
+
+    return S_OK;
 }

static HRESULT WINAPI control_RegisterAudioSessionNotification(IAudioSessionControl2 *iface,
@@ -630,6 +647,7 @@ static struct audio_session *session_create(const GUID *guid, IMMDevice *device,

ret->display_name = duplicate_wstr(L"");
     ret->icon_path = duplicate_wstr(L"");
+    CoCreateGuid(&ret->grouping_param);

return ret;
 }
diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 64bb2799705..b8ef4b5a549 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -1630,30 +1630,23 @@ static void test_session(void)
     /* Test GetGroupingParam / SetGroupingParam */

hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, NULL);
-    todo_wine
     ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "GetGroupingParam failed: %08lx\n", hr);

hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, &guid1);
-    todo_wine
     ok(hr == S_OK, "GetGroupingParam failed: %08lx\n", hr);
-    todo_wine
     ok(!IsEqualGUID(&guid1, &guid2), "Expected non null GUID\n"); /* MSDN is wrong here, it is not GUID_NULL */

hr = IAudioSessionControl2_SetGroupingParam(ses1_ctl2, NULL, NULL);
-    todo_wine
     ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "SetGroupingParam failed: %08lx\n", hr);

hr = CoCreateGuid(&guid2);
     ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr);

hr = IAudioSessionControl2_SetGroupingParam(ses1_ctl2, &guid2, NULL);
-    todo_wine
     ok(hr == S_OK, "SetGroupingParam failed: %08lx\n", hr);

hr = IAudioSessionControl2_GetGroupingParam(ses1_ctl2, &guid1);
-    todo_wine
     ok(hr == S_OK, "GetGroupingParam failed: %08lx\n", hr);
-    todo_wine
     ok(IsEqualGUID(&guid1, &guid2), "Got %s\n", wine_dbgstr_guid(&guid1));

/* Test capture */

[PATCH v2 6/6] mmdevapi: Implement IAudioSessionControl2 GetGroupingParam SetGroupingParam

[Marvin]

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=146031

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 4

=== w1064_tsign (32 bit report) ===

mmdevapi:
render.c:1376: Test failed: GetBuffer large (22500) at iteration 2
render.c:1376: Test failed: GetBuffer large (22500) at iteration 4

=== w1064_tsign (64 bit report) ===

mmdevapi:
render.c:1376: Test failed: GetBuffer large (22500) at iteration 8

=== w10pro64 (64 bit report) ===

mmdevapi:
render.c:1376: Test failed: GetBuffer large (22500) at iteration 7

=== debian11b (64 bit WoW report) ===

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000007400DE, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032

[Fabian Maurer (＠DarkShadow44)]

On Mon Jun  3 23:49:33 2024 +0000, Huw Davies wrote:
> It doesn't seem like it would be too difficult to implement the setters
> and getters here (ignoring the event context params).

Sure, pushed a new patchset. Also added a bunch of tests.

[Huw Davies (＠huw)]

Huw Davies (@huw) commented about dlls/mmdevapi/session.c:
> extern void sessions_lock(void);
>  extern void sessions_unlock(void);
>
> +WCHAR *duplicate_wstr(const WCHAR *str)

`static`

[Huw Davies (＠huw)]

Huw Davies (@huw) commented about dlls/mmdevapi/session.c:
> extern void sessions_lock(void);
>  extern void sessions_unlock(void);
>
> +WCHAR *duplicate_wstr(const WCHAR *str)
> +{
> - int len = (lstrlenW(str) + 1) * sizeof(WCHAR);

Let's use `wcslen()`.

[Huw Davies (＠huw)]

Huw Davies (@huw) commented about dlls/mmdevapi/session.c:
> - return E_NOTIMPL;
> - struct audio_session *session = This->session;
> -
> - TRACE("(%p)->(%p) - stub\n", This, name);
> -
> - if (!name)
> -
>    return E_POINTER;
> -
> - *name = duplicate_wstr(session->display_name);
> -
> - return S_OK;
>
> }
>
> static HRESULT WINAPI control_SetDisplayName(IAudioSessionControl2 *iface, const WCHAR *name,
> -
>                                     const GUID *session)
> -
>                                     const GUID *session_guid)

Could we rename the last param to `event_context`? - I'm not sure why they were named `session` in the first place.

[Huw Davies (＠huw)]

Huw Davies (@huw) commented about dlls/mmdevapi/session.c:
> static HRESULT WINAPI control_SetDisplayName(IAudioSessionControl2 *iface, const WCHAR *name,
> -
>                                     const GUID *session)
> -
>                                     const GUID *session_guid)
>
> {
>      struct audio_session_wrapper *This = impl_from_IAudioSessionControl2(iface);
> - FIXME("(%p)->(%p, %s) - stub\n", This, name, debugstr_guid(session));
> - return E_NOTIMPL;
> - struct audio_session *session = This->session;
> -
> - TRACE("(%p)->(%p, %s) - stub\n", This, name, debugstr_guid(session_guid));
> - FIXME("Ignoring session_guid\n");
> -
> - if (!name)
> -
>    return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER);
> -
> - session->display_name = duplicate_wstr(name);

You should free any existing `display_name`.  I'd also use `wcsdup()` here and use `duplicate_wstr()` only in the getter.

[Huw Davies (＠huw)]

Huw Davies (@huw) commented about dlls/mmdevapi/session.c:
>  ret->master_vol = 1.f;
>
> - ret->display_name = duplicate_wstr(L"");

I think it would be better, especially given that we never free the sessions, to init this with `NULL` and fix up `duplicate_wstr()` to allocate an empty string in the case that the src is `NULL`.

[Nikolay Sivov (＠nsivov)]

We can use wcsdup() as well, and already do for some strings in mmdevapi.

[Huw Davies (＠huw)]

> We can use wcsdup() as well, and already do for some strings in mmdevapi.

Yes, I mentioned that :wink:

[Nikolay Sivov (＠nsivov)]

On Tue Jun  4 10:18:41 2024 +0000, Huw Davies wrote:
> > We can use wcsdup() as well, and already do for some strings in mmdevapi.
>
> Yes, I mentioned that :wink:

Ah, sorry, missed it.

[Fabian Maurer (＠DarkShadow44)]

On Tue Jun  4 08:04:42 2024 +0000, Huw Davies wrote:
> You should free any existing `display_name`.  I'd also use `wcsdup()`
> here and use `duplicate_wstr()` only in the getter.

Is wcsdup compatible with CoTaskMemFree? I thought that you have to need to use CoTaskMemAlloc when you later want CoTaskMemFree (like MSDN says).

[Fabian Maurer (＠DarkShadow44)]

On Tue Jun  4 08:04:42 2024 +0000, Huw Davies wrote:
> Could we rename the last param to `event_context`? - I'm not sure why
> they were named `session` in the first place.

Sure, updated