December 2021 - Wine-devel - list.winehq.org

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

27 Dec '21

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 27 Dec '21

27 Dec '21

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 27 Dec '21

27 Dec '21

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 27 Dec '21

27 Dec '21

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 27 Dec '21

27 Dec '21

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 26 Dec '21

26 Dec '21

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 26 Dec '21

26 Dec '21

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

[PATCH] kernel32/tests: Check return value of NtGetNlsSectionPtr in test_GetCPInfo (Coverity)
by Alex Henrie 26 Dec '21

26 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/tests/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1f30547df5b..d64a08666f8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4043,6 +4043,7 @@ static void test_GetCPInfo(void) ok( !status, "failed %x\n", status ); ok( size > 0x1000 && size <= 0x8000 , "wrong size %lx\n", size ); status = pNtGetNlsSectionPtr( 10, 0, NULL, &ptr2, &size ); + ok( !status, "failed %x\n", status ); ok( ptr != ptr2, "got same pointer\n" ); ret = UnmapViewOfFile( ptr ); ok( ret, "UnmapViewOfFile failed err %u\n", GetLastError() ); -- 2.34.1

1 0

[PATCH vkd3d v2 1/3] vkd3d-compiler: Print usage instructions only if --help is specified.
by Zebediah Figura 26 Dec '21

26 Dec '21

vkd3d-compiler is hardly the only program to print usage instructions on all invalid invocations, but it's rather annoying to have one's whole screen wiped due to a typo. It also makes it hard to notice the actual error messages printed on e.g. `vkd3d-compiler -x`. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4d7d628ca..4e56e8fa5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -209,6 +209,7 @@ struct options enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; bool preprocess_only; + bool print_help; bool print_version; bool print_source_types; bool print_target_types; @@ -446,6 +447,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->preprocess_only = true; break; + case 'h': + case OPTION_HELP: + options->print_help = true; + return true; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; @@ -623,9 +629,12 @@ int main(int argc, char **argv) int ret; if (!parse_command_line(argc, argv, &options)) + return 1; + + if (options.print_help) { print_usage(argv[0]); - return 1; + return 0; } if (options.print_version) -- 2.34.1

2 5

[PATCH vkd3d 1/3] vkd3d-compiler: Print usage instructions only if --help is specified.
by Zebediah Figura 26 Dec '21

26 Dec '21

vkd3d-compiler is hardly the only program to print usage instructions on all invalid invocations, but it's rather annoying to have one's whole screen wiped due to a typo. It also makes it hard to notice the actual error messages printed on e.g. `vkd3d-compiler -x`. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4d7d628ca..4e56e8fa5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -209,6 +209,7 @@ struct options enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; bool preprocess_only; + bool print_help; bool print_version; bool print_source_types; bool print_target_types; @@ -446,6 +447,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->preprocess_only = true; break; + case 'h': + case OPTION_HELP: + options->print_help = true; + return true; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; @@ -623,9 +629,12 @@ int main(int argc, char **argv) int ret; if (!parse_command_line(argc, argv, &options)) + return 1; + + if (options.print_help) { print_usage(argv[0]); - return 1; + return 0; } if (options.print_version) -- 2.34.1

2 5