June 2024 - Wine-Commits - list.winehq.org

Alex Henrie : ntdll: Replace the whole string when using RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard June 14, 2024

June 14, 2024

Module: wine Branch: master Commit: 54c3f962148c6ead2ec04b776c08fade390148f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/54c3f962148c6ead2ec04b776c08fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 13 22:48:49 2024 -0600 ntdll: Replace the whole string when using RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 7 ++++++- dlls/ntdll/tests/reg.c | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 044bf32f460..3cbd055f367 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -311,7 +311,12 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (str->Buffer == NULL) RtlCreateUnicodeString(str, (WCHAR*)(((CHAR*)pInfo) + pInfo->DataOffset)); else - RtlAppendUnicodeToString(str, (WCHAR*)(((CHAR*)pInfo) + pInfo->DataOffset)); + { + if (str->MaximumLength < len) + return STATUS_BUFFER_TOO_SMALL; + memcpy(str->Buffer, (char*)pInfo + pInfo->DataOffset, len); + str->Length = len - sizeof(WCHAR); + } break; case REG_MULTI_SZ: diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index b6763e6e1d2..14227db755c 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2673,6 +2673,11 @@ static struct query_reg_values_test query_reg_values_tests[] = {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, STATUS_SUCCESS, 0, 0, REG_SZ, L"C:" }, + { + {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"WindowsDrive", + &query_reg_values_direct_str }}, + STATUS_SUCCESS, 0, 0, REG_SZ, L"%SYSTEMDRIVE%" + }, /* DIRECT on a multi-string crashes on Windows without NOEXPAND */ /* { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"CapitalsOfEurope", &query_reg_values_direct_str }},

1 0

Danyil Blyschak : opcservices: Suppress unnecessary zlib deflate warnings.
by Alexandre Julliard June 14, 2024

June 14, 2024

Module: wine Branch: master Commit: 333eea8331b19b9b9276bfeefe6c8ffbd5a8844f URL: https://gitlab.winehq.org/wine/wine/-/commit/333eea8331b19b9b9276bfeefe6c8f… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Thu Jun 13 12:40:23 2024 -0500 opcservices: Suppress unnecessary zlib deflate warnings. Zlib documents that negative return values for this function are errors and positive ones are special but normal events. --- dlls/opcservices/compress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c index 186469a782c..841c674c26c 100644 --- a/dlls/opcservices/compress.c +++ b/dlls/opcservices/compress.c @@ -257,7 +257,7 @@ static void compress_write_content(struct zip_archive *archive, IStream *content z_str.avail_out = sizeof(archive->output_buffer); z_str.next_out = archive->output_buffer; - if ((ret = deflate(&z_str, flush))) + if ((ret = deflate(&z_str, flush)) < 0) WARN("Failed to deflate, ret %d.\n", ret); have = sizeof(archive->output_buffer) - z_str.avail_out; compress_write(archive, archive->output_buffer, have);

1 0

Alex Henrie : ntdll: Set the string size when using RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard June 14, 2024

June 14, 2024

Module: wine Branch: master Commit: eb59c213fb504fa0a3a166ea0d73eec68f77b7a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb59c213fb504fa0a3a166ea0d73ee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 13 22:48:48 2024 -0600 ntdll: Set the string size when using RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 1 + dlls/ntdll/tests/reg.c | 29 +++++++++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 271abb03768..df8763835ad 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -266,6 +266,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (str->MaximumLength < default_size) return STATUS_BUFFER_TOO_SMALL; memcpy(str->Buffer, pQuery->DefaultData, default_size); + str->Length = default_size - sizeof(WCHAR); return STATUS_SUCCESS; } else if (pQuery->QueryRoutine) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index eda20c35e9f..d569f1f4d19 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2662,12 +2662,12 @@ static struct query_reg_values_test query_reg_values_tests[] = /* DIRECT doesn't call the query routine and reads directly into a buffer */ { {{ query_routine, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, - STATUS_INVALID_PARAMETER, 0 + STATUS_INVALID_PARAMETER, 0, 0, REG_NONE, NULL, -1 }, { {{ query_routine, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"Some default" }}, - STATUS_INVALID_PARAMETER, 0 + STATUS_INVALID_PARAMETER, 0, 0, REG_NONE, NULL, -1 }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, @@ -2681,7 +2681,7 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope", &query_reg_values_direct_str }}, - STATUS_SUCCESS, 0, 0, REG_SZ, L"Brussels\0Paris\0Madrid", sizeof(L"Brussels\0Paris\0Madrid") + STATUS_SUCCESS, 0, WINE_TODO_DATA, REG_SZ, L"Brussels\0Paris\0Madrid\0", sizeof(L"Brussels\0Paris\0Madrid\0") }, /* DIRECT with a null buffer crashes on Windows */ /* { @@ -2744,7 +2744,7 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_EXPAND_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }}, - STATUS_SUCCESS, 0, WINE_TODO_DATA, REG_EXPAND_SZ, L"C:" + STATUS_SUCCESS, 0, WINE_TODO_SIZE | WINE_TODO_DATA, REG_EXPAND_SZ, L"C:" }, /* DIRECT with a multi-string default value crashes on Windows */ /* { @@ -2764,12 +2764,12 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_SZ }}, - STATUS_DATA_OVERRUN, 0, WINE_TODO_RET + STATUS_DATA_OVERRUN, 0, WINE_TODO_RET | WINE_TODO_SIZE, REG_NONE, NULL, -1 }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_NONE, (WCHAR*)L"Some default" }}, - STATUS_SUCCESS, 0 + STATUS_SUCCESS, 0, WINE_TODO_SIZE, REG_NONE, NULL, -1 }, /* REQUIRED fails if the value doesn't exist and there is no default */ { @@ -2830,7 +2830,9 @@ static void test_RtlQueryRegistryValues(void) } query_routine_calls = 0; - wcscpy(query_reg_values_direct_str.Buffer, L"###"); + query_reg_values_direct_str.Length = query_reg_values_direct_str.MaximumLength - sizeof(WCHAR); + memset(query_reg_values_direct_str.Buffer, 0x23, query_reg_values_direct_str.Length); + query_reg_values_direct_str.Buffer[query_reg_values_direct_str.Length] = 0; status = pRtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, winetestpath.Buffer, test->query_table, test, NULL); @@ -2857,11 +2859,18 @@ static void test_RtlQueryRegistryValues(void) expected_size = test->expected_data_size; } + if (!expected_size && expected_data) + expected_size = (wcslen(expected_data) + 1) * sizeof(WCHAR); + else if (expected_size == -1) + expected_size = query_reg_values_direct_str.MaximumLength; + + todo_wine_if(test->flags & WINE_TODO_SIZE) + ok(query_reg_values_direct_str.Length + sizeof(WCHAR) == expected_size, + "Expected size %lu, got %Iu\n", expected_size, + query_reg_values_direct_str.Length + sizeof(WCHAR)); + if (expected_data) { - if (!expected_size) - expected_size = (wcslen(expected_data) + 1) * sizeof(WCHAR); - todo_wine_if(test->flags & WINE_TODO_DATA) ok(!memcmp(query_reg_values_direct_str.Buffer, expected_data, expected_size), "Expected data %s, got %s\n", debugstr_w(expected_data),

1 0

Alex Henrie : ntdll: Only allow string default values with RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard June 14, 2024

June 14, 2024

Module: wine Branch: master Commit: 4db02f76190a52acd12af745829dbb35582440cb URL: https://gitlab.winehq.org/wine/wine/-/commit/4db02f76190a52acd12af745829dbb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 13 22:48:49 2024 -0600 ntdll: Only allow string default values with RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 16 ++++++++++++---- dlls/ntdll/tests/reg.c | 27 ++++++++++++++++++++------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index df8763835ad..044bf32f460 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -263,10 +263,18 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, { if (pQuery->QueryRoutine) return STATUS_INVALID_PARAMETER; - if (str->MaximumLength < default_size) - return STATUS_BUFFER_TOO_SMALL; - memcpy(str->Buffer, pQuery->DefaultData, default_size); - str->Length = default_size - sizeof(WCHAR); + + if (pQuery->DefaultType == REG_SZ || pQuery->DefaultType == REG_EXPAND_SZ || + pQuery->DefaultType == REG_MULTI_SZ || pQuery->DefaultType == REG_LINK) + { + if (!pQuery->DefaultData) + return STATUS_DATA_OVERRUN; + if (str->MaximumLength < default_size) + return STATUS_BUFFER_TOO_SMALL; + memcpy(str->Buffer, pQuery->DefaultData, default_size); + str->Length = default_size - sizeof(WCHAR); + } + return STATUS_SUCCESS; } else if (pQuery->QueryRoutine) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index d569f1f4d19..b6763e6e1d2 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2601,7 +2601,7 @@ static NTSTATUS WINAPI query_routine(const WCHAR *value_name, ULONG value_type, expected_size = 0; } - if (!expected_size && expected_data) + if (!expected_size && expected_data && (expected_type == REG_SZ || expected_type == REG_EXPAND_SZ)) expected_size = (wcslen(expected_data) + 1) * sizeof(WCHAR); todo_wine_if(test->flags & WINE_TODO_TYPE) @@ -2611,11 +2611,11 @@ static NTSTATUS WINAPI query_routine(const WCHAR *value_name, ULONG value_type, ok(value_data_size == expected_size, "Expected size %lu, got %lu\n", expected_size, value_data_size); todo_wine_if(test->flags & WINE_TODO_DATA && !(test->flags & SPLIT_MULTI && query_routine_calls == 0)) - if (expected_data) + if (expected_data == query->DefaultData || expected_data == NULL) + ok(value_data == expected_data, "Expected data %p, got %p\n", expected_data, value_data); + else ok(!memcmp(value_data, expected_data, value_data_size), "Expected data %s, got %s\n", debugstr_w(expected_data), debugstr_w(value_data)); - else - ok(!value_data, "Expected null data\n"); } query_routine_calls++; @@ -2731,6 +2731,10 @@ static struct query_reg_values_test query_reg_values_tests[] = {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_MULTI_SZ, (WCHAR*)L"Brussels\0Paris\0Madrid\0" }}, STATUS_SUCCESS, 3, EXPECT_DEFAULT_DATA | SPLIT_MULTI | WINE_TODO_CALLS | WINE_TODO_TYPE | WINE_TODO_SIZE }, + { + {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_DWORD, (WCHAR*)0xdeadbeef }}, + STATUS_SUCCESS, 1, EXPECT_DEFAULT_DATA + }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"Some default", 4 * sizeof(WCHAR) }}, @@ -2764,12 +2768,18 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_SZ }}, - STATUS_DATA_OVERRUN, 0, WINE_TODO_RET | WINE_TODO_SIZE, REG_NONE, NULL, -1 + STATUS_DATA_OVERRUN, 0, 0, REG_NONE, NULL, -1 }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_NONE, (WCHAR*)L"Some default" }}, - STATUS_SUCCESS, 0, WINE_TODO_SIZE, REG_NONE, NULL, -1 + STATUS_SUCCESS, 0, 0, REG_NONE, NULL, -1 + }, + /* DIRECT additionally requires the default value to be a string */ + { + {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", + &query_reg_values_direct_str, REG_DWORD, (WCHAR*)0xdeadbeef }}, + STATUS_SUCCESS, 0, 0, REG_NONE, NULL, -1 }, /* REQUIRED fails if the value doesn't exist and there is no default */ { @@ -2820,6 +2830,7 @@ static void test_RtlQueryRegistryValues(void) RTL_QUERY_REGISTRY_TABLE *query; const WCHAR *expected_data; ULONG expected_size; + ULONG expected_type; winetest_push_context("%u/%Iu", i, ARRAY_SIZE(query_reg_values_tests) - 1); @@ -2850,16 +2861,18 @@ static void test_RtlQueryRegistryValues(void) { if (test->flags & EXPECT_DEFAULT_DATA) { + expected_type = query->DefaultType; expected_data = query->DefaultData; expected_size = query->DefaultLength; } else { + expected_type = test->expected_type; expected_data = test->expected_data; expected_size = test->expected_data_size; } - if (!expected_size && expected_data) + if (!expected_size && expected_data && (expected_type == REG_SZ || expected_type == REG_EXPAND_SZ)) expected_size = (wcslen(expected_data) + 1) * sizeof(WCHAR); else if (expected_size == -1) expected_size = query_reg_values_direct_str.MaximumLength;

1 0

Alex Henrie : ntdll: Don't accept a query routine when using RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard June 14, 2024

June 14, 2024

Module: wine Branch: master Commit: 54991feaaec71e79255e2b2ba18f89bbbbbb323d URL: https://gitlab.winehq.org/wine/wine/-/commit/54991feaaec71e79255e2b2ba18f89… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 13 22:48:48 2024 -0600 ntdll: Don't accept a query routine when using RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 5 +++++ dlls/ntdll/tests/reg.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 9be75649cc3..271abb03768 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -261,6 +261,8 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (pQuery->Flags & RTL_QUERY_REGISTRY_DIRECT) { + if (pQuery->QueryRoutine) + return STATUS_INVALID_PARAMETER; if (str->MaximumLength < default_size) return STATUS_BUFFER_TOO_SMALL; memcpy(str->Buffer, pQuery->DefaultData, default_size); @@ -277,6 +279,9 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (pQuery->Flags & RTL_QUERY_REGISTRY_DIRECT) { + if (pQuery->QueryRoutine) + return STATUS_INVALID_PARAMETER; + switch(pInfo->Type) { case REG_EXPAND_SZ: diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 9449cd2f904..eda20c35e9f 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2662,7 +2662,12 @@ static struct query_reg_values_test query_reg_values_tests[] = /* DIRECT doesn't call the query routine and reads directly into a buffer */ { {{ query_routine, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, - STATUS_INVALID_PARAMETER, 0, WINE_TODO_RET | WINE_TODO_NAME | WINE_TODO_TYPE | WINE_TODO_SIZE | WINE_TODO_DATA + STATUS_INVALID_PARAMETER, 0 + }, + { + {{ query_routine, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", + &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"Some default" }}, + STATUS_INVALID_PARAMETER, 0 }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }},

1 0

Danyil Blyschak : opcservices: Provide memory allocator functions to zlib.
by Alexandre Julliard June 14, 2024

June 14, 2024

Module: wine Branch: master Commit: 6b01563bd06988de4c384f29f77430b3c31ad494 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b01563bd06988de4c384f29f77430… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Thu Jun 13 12:31:56 2024 -0500 opcservices: Provide memory allocator functions to zlib. --- dlls/opcservices/compress.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c index 37a90716a74..186469a782c 100644 --- a/dlls/opcservices/compress.c +++ b/dlls/opcservices/compress.c @@ -184,6 +184,16 @@ void compress_finalize_archive(struct zip_archive *archive) free(archive); } +static void *zalloc(void *opaque, unsigned int items, unsigned int size) +{ + return malloc(items * size); +} + +static void zfree(void *opaque, void *ptr) +{ + free(ptr); +} + static void compress_write_content(struct zip_archive *archive, IStream *content, OPC_COMPRESSION_OPTIONS options, struct data_descriptor *data_desc) { @@ -220,6 +230,8 @@ static void compress_write_content(struct zip_archive *archive, IStream *content } memset(&z_str, 0, sizeof(z_str)); + z_str.zalloc = zalloc; + z_str.zfree = zfree; deflateInit2(&z_str, level, Z_DEFLATED, -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY); do

1 0

Fabian Maurer : mmdevapi: Implement IAudioSessionControl2 GetGroupingParam SetGroupingParam.
by Alexandre Julliard June 14, 2024

June 14, 2024

Module: wine Branch: master Commit: 75babad433a8df4c8401d9de7ec386780f2f0472 URL: https://gitlab.winehq.org/wine/wine/-/commit/75babad433a8df4c8401d9de7ec386… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 4 01:40:47 2024 +0200 mmdevapi: Implement IAudioSessionControl2 GetGroupingParam SetGroupingParam. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56763 --- dlls/mmdevapi/mmdevdrv.h | 1 + dlls/mmdevapi/session.c | 29 ++++++++++++++++++++++++----- dlls/mmdevapi/tests/render.c | 7 ------- 3 files changed, 25 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 3620205ca20..d22619b03a1 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -219,16 +219,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 *event_context) { 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(event_context)); + FIXME("Ignoring event_context\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, @@ -631,6 +648,8 @@ static struct audio_session *session_create(const GUID *guid, IMMDevice *device, ret->master_vol = 1.f; + 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 */

1 0

Fabian Maurer : mmdevapi: Implement IAudioSessionControl2 GetIconPath / SetIconPath.
by Alexandre Julliard June 14, 2024

June 14, 2024

Module: wine Branch: master Commit: 0d4d778b5647c7700dd2aed9d0f5f9289319fd5f URL: https://gitlab.winehq.org/wine/wine/-/commit/0d4d778b5647c7700dd2aed9d0f5f9… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 4 01:36:21 2024 +0200 mmdevapi: Implement IAudioSessionControl2 GetIconPath / SetIconPath. 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 d4948e3b141..3620205ca20 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -186,16 +186,34 @@ 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 *event_context) { 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(event_context)); + FIXME("Ignoring event_context\n"); + + if (!path) + return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + + free(session->icon_path); + session->icon_path = wcsdup(path); + + return S_OK; } static HRESULT WINAPI control_GetGroupingParam(IAudioSessionControl2 *iface, GUID *group) 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);

1 0

Fabian Maurer : mmdevapi: Implement IAudioSessionControl2 GetDisplayName / SetDisplayName.
by Alexandre Julliard June 14, 2024

June 14, 2024

Module: wine Branch: master Commit: b23608ea7d1786ef2572ea87668ddf643716ff21 URL: https://gitlab.winehq.org/wine/wine/-/commit/b23608ea7d1786ef2572ea87668ddf… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 4 01:44:42 2024 +0200 mmdevapi: Implement IAudioSessionControl2 GetDisplayName / SetDisplayName. 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..d4948e3b141 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -37,6 +37,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); extern void sessions_lock(void); extern void sessions_unlock(void); +static WCHAR *duplicate_wstr(const WCHAR *str) +{ + const WCHAR *source = str ? str : L""; + int len = (wcslen(source) + 1) * sizeof(WCHAR); + WCHAR *ret = CoTaskMemAlloc(len); + memcpy(ret, source, len); + return ret; +} + extern void set_stream_volumes(struct audio_client *This); static struct list sessions = LIST_INIT(sessions); @@ -144,16 +153,34 @@ 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 *event_context) { 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(event_context)); + FIXME("Ignoring event_context\n"); + + if (!name) + return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + + free(session->display_name); + session->display_name = wcsdup(name); + + return S_OK; } static HRESULT WINAPI control_GetIconPath(IAudioSessionControl2 *iface, WCHAR **path) 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);

1 0

Fabian Maurer : mmdevapi/tests: Add tests for IAudioSessionControl2 GetGroupingParam / SetGroupingParam.
by Alexandre Julliard June 14, 2024

June 14, 2024

Module: wine Branch: master Commit: ae7cb868cf759362e024671c9176363959352a77 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae7cb868cf759362e024671c917636… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jun 4 01:03:39 2024 +0200 mmdevapi/tests: Add tests for IAudioSessionControl2 GetGroupingParam / SetGroupingParam. --- 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){

1 0