- Wine-Devel - list.winehq.org

[PATCH v3 2/2] server: Strip terminating '\0' from the registry key name.
by Dmitry Timoshkov Dec. 27, 2021

Dec. 27, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 18 +++++++++++++++++- server/registry.c | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 74d82b85be4..024d9026785 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -457,6 +457,14 @@ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtOpenKey( &key, KEY_READ, &attr ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win8 */, + "NtOpenKey failed: 0x%08x\n", status ); + if (!status) pNtClose( key ); + pRtlFreeUnicodeString( &str ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); @@ -631,13 +639,21 @@ static void test_NtCreateKey(void) status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - if (!status) pNtClose( subkey ); + pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); diff --git a/server/registry.c b/server/registry.c index 4ed3ee9896e..6d783efbfb2 100644 --- a/server/registry.c +++ b/server/registry.c @@ -479,6 +479,8 @@ static inline struct unicode_str *get_req_path( struct unicode_str *str, int ski str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); + while (str->len && !str->str[str->len / sizeof(WCHAR) - 1]) str->len -= sizeof(WCHAR); + if (skip_root && str->len >= sizeof(root_name) && !memicmp_strW( str->str, root_name, sizeof(root_name) )) { str->str += ARRAY_SIZE( root_name ); -- 2.34.1

1 0

[PATCH 2/2] dwrite: Add Segoe UI Symbol fallback ranges.
by Dmitry Timoshkov Dec. 27, 2021

Dec. 27, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/analyzer.c | 8 ++++++++ dlls/dwrite/tests/layout.c | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 13ccf8e4434..a169b8ef860 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -220,6 +220,13 @@ static const DWRITE_UNICODE_RANGE cjk_ranges[] = { 0x4e00, 0x9fff }, /* CJK Unified Ideographs */ }; +static const WCHAR *SegoeUI_Symbol_families[] = { L"Segoe UI Symbol" }; + +static const DWRITE_UNICODE_RANGE SegoeUI_Symbol_ranges[] = +{ + { 0x2196, 0x2bef }, +}; + struct fallback_mapping { DWRITE_UNICODE_RANGE *ranges; UINT32 ranges_count; @@ -236,6 +243,7 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { (WCHAR **)families, ARRAY_SIZE(families) } MAPPING_RANGE(cjk_ranges, cjk_families), + MAPPING_RANGE(SegoeUI_Symbol_ranges, SegoeUI_Symbol_families), #undef MAPPING_RANGE }; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c242155cce3..7bc53834ea3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6604,19 +6604,18 @@ todo_wine { hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, families[i], DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); -todo_wine_if(families[i] == NULL) ok(hr == S_OK, "%u: %s - got %#x\n", i, wine_dbgstr_w(families[i]), hr); if (hr != S_OK) continue; ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); get_font_name(font, name, ARRAY_SIZE(name)); -todo_wine +todo_wine_if(families[i] != NULL) ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); ok(hr == S_OK, "got %#x\n", hr); -todo_wine +todo_wine_if(families[i] != NULL) ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); IDWriteFont_Release(font); -- 2.34.1

1 0

[PATCH] mfplat/tests: Print an error if the first call to get_event fails in test_source_resolver (Coverity)
by Alex Henrie Dec. 27, 2021

Dec. 27, 2021

The test will still segfault if it fails, but at least there will be an indication as to why. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mfplat/tests/mfplat.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 21eab6d1172..d9f30867f7f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -686,6 +686,7 @@ static void test_source_resolver(void) GUID guid; float rate; UINT32 rotation; + BOOL ret; if (!pMFCreateSourceResolver) { @@ -889,12 +890,10 @@ todo_wine hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); - video_stream = NULL; - if (get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var)) - { - ok(var.vt == VT_UNKNOWN, "Unexpected value type.\n"); - video_stream = (IMFMediaStream *)var.punkVal; - } + ret = get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); + ok(ret, "Failed to get event.\n"); + ok(var.vt == VT_UNKNOWN, "Unexpected value type.\n"); + video_stream = (IMFMediaStream *)var.punkVal; sample_count = 10; @@ -912,7 +911,6 @@ todo_wine LONGLONG duration, time; DWORD buffer_count; IMFSample *sample; - BOOL ret; ret = get_event((IMFMediaEventGenerator *)video_stream, MEMediaSample, &var); ok(ret, "Sample %u not received.\n", i + 1); -- 2.34.1

2 2

[PATCH] comctl32/tests: Use GetLocaleInfoA when the buffer size is in bytes (Coverity)
by Alex Henrie Dec. 27, 2021

Dec. 27, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Alternatively, we could keep using GetLocaleInfoW here and divide sizeof(reading_layout) by sizeof(WCHAR). --- dlls/comctl32/tests/propsheet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index b4696112500..4621d2c8c38 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -56,7 +56,7 @@ static HTHEME (WINAPI *pOpenThemeData)(HWND, LPCWSTR); static void detect_locale(void) { DWORD reading_layout; - rtl = GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, + rtl = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IREADINGLAYOUT | LOCALE_RETURN_NUMBER, (void *)&reading_layout, sizeof(reading_layout)) && reading_layout == 1; } -- 2.34.1

3 3

[PATCH] advapi32/tests: Accept a variable number of x's in some RegEnumValue name overflow tests
by Alex Henrie Dec. 27, 2021

Dec. 27, 2021

Fixes intermittent testbot failures. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I sent this patch through the testbot several times to make sure that it makes the tests pass consistently. --- dlls/advapi32/tests/registry.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index ecddfe647c2..054529b54ba 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -545,7 +545,7 @@ static void test_enum_value(void) data_count = 20; type = 1234; strcpy( value, "xxxxxxxxxx" ); - strcpy( data, "xxxxxxxxxx" ); + memset( data, 'x', sizeof(data) ); res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 3, "val_count set to %d\n", val_count ); @@ -555,15 +555,16 @@ static void test_enum_value(void) /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */ ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), - "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || + broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + "data set to '%s' instead of 'foobar' or x's, data_count=%u\n", data, data_count ); /* overflow empty name */ val_count = 0; data_count = 20; type = 1234; strcpy( value, "xxxxxxxxxx" ); - strcpy( data, "xxxxxxxxxx" ); + memset( data, 'x', sizeof(data) ); res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 0, "val_count set to %d\n", val_count ); @@ -572,8 +573,9 @@ static void test_enum_value(void) ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ - ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || broken( !strcmp( data, "xxxxxxxx" ) && data_count > 7 ), - "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || + broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + "data set to '%s' instead of 'foobar' or x's, data_count=%u\n", data, data_count ); /* overflow data */ val_count = 20; -- 2.34.1

1 0

[PATCH] advapi32/tests: Fix memory leaks in test_performance_keys (Coverity)
by Alex Henrie Dec. 27, 2021

Dec. 27, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/tests/registry.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index ca371f73d65..ecddfe647c2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3675,7 +3675,7 @@ static void test_performance_keys(void) LARGE_INTEGER perftime1, perftime2, systime1, systime2, freq; WCHAR sysname[MAX_COMPUTERNAME_LENGTH + 1]; unsigned int buffer_size = 1024 * 1024; - void *buffer, *bufferW; + void *buffer, *bufferW = NULL; PERF_DATA_BLOCK *data; union { @@ -3804,7 +3804,7 @@ static void test_performance_keys(void) ok(!ret, "got %u\n", ret); ok(size > 0, "got size %u\n", size); - bufferW = malloc(size); + bufferW = realloc(bufferW, size); type = 0xdeadbeef; ret = RegQueryValueExW(keys[i], L"cOuNtEr", NULL, &type, bufferW, &size); @@ -3843,7 +3843,7 @@ static void test_performance_keys(void) ok(!ret, "got %u\n", ret); ok(size > 0, "got size %u\n", size); - bufferW = malloc(size); + bufferW = realloc(bufferW, size); type = 0xdeadbeef; ret = RegQueryValueExW(keys[i], L"hElP", NULL, &type, bufferW, &size); @@ -3922,6 +3922,7 @@ static void test_performance_keys(void) todo_wine ok(ret == ERROR_NO_MORE_ITEMS, "got %u\n", ret); free(buffer); + free(bufferW); } static void test_perflib_key(void) -- 2.34.1

1 0

[PATCH] comctl32/tests: Mark smaller propsheet buffer as broken
by Alex Henrie Dec. 27, 2021

Dec. 27, 2021

Fixes another testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/comctl32/tests/propsheet.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 4621d2c8c38..affd21da825 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -92,8 +92,11 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) size = SizeofResource(module, hrsrc); ok(size != 0, "Failed to get size of propsheet dialog resource\n"); buffer_size = HeapSize(GetProcessHeap(), 0, (void *)lparam); - /* Hebrew Windows 10 allocates 2 * size + 8, all others allocate 2 * size */ - ok(buffer_size >= 2 * size, "Unexpected template buffer size %u, resource size %u\n", + /* Hebrew Windows 10 allocates 2 * size + 8, + * Arabic Windows 10 allocates 2 * size - 32, + * all others allocate exactly 2 * size */ + ok(buffer_size >= 2 * size || broken(buffer_size == 2 * size - 32), + "Unexpected template buffer size %u, resource size %u\n", buffer_size, size); break; } -- 2.34.1

1 0

Wine staging 7.0-rc3 release
by Alistair Leslie-Hughes Dec. 27, 2021

Dec. 27, 2021

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.0-rc3 (552 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] kernel32/tests: Remove unused variable size from test_process_info (Coverity)
by Alex Henrie Dec. 26, 2021

Dec. 26, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/tests/process.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 6251ee05f94..a558597a404 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3770,7 +3770,7 @@ static void test_process_info(HANDLE hproc) sizeof(PROCESS_JOB_MEMORY_INFO) /* ProcessJobMemoryInformation */, #endif }; - ULONG i, status, ret_len, size; + ULONG i, status, ret_len; BOOL is_current = hproc == GetCurrentProcess(); if (!pNtQueryInformationProcess) @@ -3781,8 +3781,6 @@ static void test_process_info(HANDLE hproc) for (i = 0; i < MaxProcessInfoClass; i++) { - size = info_size[i]; - if (!size) size = sizeof(buf); ret_len = 0; status = pNtQueryInformationProcess(hproc, i, buf, info_size[i], &ret_len); if (status == STATUS_NOT_IMPLEMENTED) continue; -- 2.34.1

2 1

[PATCH] kernel32/tests: Ensure auto_value.data is initialized in test_ExitCode (Coverity)
by Alex Henrie Dec. 26, 2021

Dec. 26, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 0955025a650..8b82aaecb9e 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -752,7 +752,11 @@ static void test_ExitCode(void) ok(0, "could not open the AeDebug key: %d\n", ret); return; } - else debugger_value.data = NULL; + else + { + auto_value.data = NULL; + debugger_value.data = NULL; + } if (debugger_value.data && debugger_value.type == REG_SZ && strstr((char*)debugger_value.data, "winedbg --auto")) -- 2.34.1

2 1