December 2022 - Wine-Commits

Piotr Caban : shell32: Store NameSpace registry path in global variable.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: e5c47b6a79c8a212057eda08691893743a3036a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c47b6a79c8a212057eda08691893… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 15 21:40:27 2022 +0100 shell32: Store NameSpace registry path in global variable. --- dlls/shell32/cpanelfolder.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 122c3180dd4..9619128d8b0 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -66,6 +66,8 @@ typedef struct { int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ } ICPanelImpl; +static const WCHAR name_spaceW[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"; + static const IShellFolder2Vtbl vt_ShellFolder2; static const IPersistFolder2Vtbl vt_PersistFolder2; static const IShellExecuteHookWVtbl vt_ShellExecuteHookW; @@ -355,14 +357,14 @@ static int SHELL_RegisterRegistryCPanelApps(IEnumIDListImpl *list, HKEY hkey_roo return cnt; } -static int SHELL_RegisterCPanelFolders(IEnumIDListImpl *list, HKEY hkey_root, LPCSTR szRepPath) +static int SHELL_RegisterCPanelFolders(IEnumIDListImpl *list, HKEY hkey_root, const WCHAR *reg_path) { char name[MAX_PATH]; HKEY hkey; int cnt = 0; - if (RegOpenKeyA(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) + if (RegOpenKeyW(hkey_root, reg_path, &hkey) == ERROR_SUCCESS) { int idx = 0; for(;; ++idx) @@ -398,8 +400,7 @@ static BOOL CreateCPanelEnumList(IEnumIDListImpl *list, DWORD dwFlags) /* enumerate control panel folders */ if (dwFlags & SHCONTF_FOLDERS) - SHELL_RegisterCPanelFolders(list, HKEY_LOCAL_MACHINE, - "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); + SHELL_RegisterCPanelFolders(list, HKEY_LOCAL_MACHINE, name_spaceW); /* enumerate the control panel applets */ if (dwFlags & SHCONTF_NONFOLDERS)

1 0

Alexandre Julliard : winebuild: Disable relay for non-standard fastcall parameters.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: cb86bb92d2c35ed0d42c5f5677d5068a52b49203 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb86bb92d2c35ed0d42c5f5677d506… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 17:07:28 2022 +0100 winebuild: Disable relay for non-standard fastcall parameters. --- tools/winebuild/parser.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 11b422bd435..141ed80eb26 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -309,16 +309,9 @@ static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) error( "A fastcall function must use the stdcall convention\n" ); return 0; } - if (!i || (odp->u.func.args[0] != ARG_PTR && odp->u.func.args[0] != ARG_LONG)) - { - error( "First argument of a fastcall function must be a pointer or integer\n" ); - return 0; - } - if (i > 1 && odp->u.func.args[1] != ARG_PTR && odp->u.func.args[1] != ARG_LONG) - { - error( "Second argument of a fastcall function must be a pointer or integer\n" ); - return 0; - } + if ((i && odp->u.func.args[0] != ARG_PTR && odp->u.func.args[0] != ARG_LONG) || + (i > 1 && odp->u.func.args[1] != ARG_PTR && odp->u.func.args[1] != ARG_LONG)) + odp->flags |= FLAG_NORELAY; /* no relay debug possible for non-standard fastcall args */ } if (odp->flags & FLAG_SYSCALL) {

1 0

Alexandre Julliard : winegcc: Check for Mingw-style .dll.a import libraries.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 3c235e053c7ca472b9169d0ef07b82c77843a549 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c235e053c7ca472b9169d0ef07b82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 15:49:00 2022 +0100 winegcc: Check for Mingw-style .dll.a import libraries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53918 --- tools/winegcc/utils.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index a93db878379..f79bfdf5877 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -138,7 +138,15 @@ static file_type guess_lib_type(struct target target, const char* dir, if ((*file = try_lib_path(dir, "", prefix, library, ".def", file_def))) return file_dll; } - else arch_dir = get_arch_dir( target ); + else + { + arch_dir = get_arch_dir( target ); + if (!strcmp( suffix, ".a" )) /* try Mingw-style .dll.a import lib */ + { + if ((*file = try_lib_path(dir, arch_dir, prefix, library, ".dll.a", file_arh))) + return file_arh; + } + } /* static archives */ if ((*file = try_lib_path(dir, arch_dir, prefix, library, suffix, file_arh)))

1 0

Alexandre Julliard : winebuild: Use new ELF tag ids also on 64-bit.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: df31d3c7fe6365f0fc4098487311e93e186b0417 URL: https://gitlab.winehq.org/wine/wine/-/commit/df31d3c7fe6365f0fc4098487311e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 10:36:44 2022 +0100 winebuild: Use new ELF tag ids also on 64-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53912 --- tools/winebuild/spec32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 97022996c95..0cf8d783633 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -1517,9 +1517,9 @@ static void fixup_elf64( const char *name, int fd, void *header, size_t header_s { switch (dyn[i].d_tag) { - case 25: dyn[i].d_tag = 0x60009990; break; /* DT_INIT_ARRAY */ - case 27: dyn[i].d_tag = 0x60009991; break; /* DT_INIT_ARRAYSZ */ - case 12: dyn[i].d_tag = 0x60009992; break; /* DT_INIT */ + case 25: dyn[i].d_tag = 0x60009994; break; /* DT_INIT_ARRAY */ + case 27: dyn[i].d_tag = 0x60009995; break; /* DT_INIT_ARRAYSZ */ + case 12: dyn[i].d_tag = 0x60009996; break; /* DT_INIT */ } } lseek( fd, phdr->p_offset, SEEK_SET );

1 0

Eric Pouech : kernel32/tests: Fix a debugger test failing on Windows.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 6e19585112fd358470e7cf62be18fd6a1a5e7605 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e19585112fd358470e7cf62be18fd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 15 17:36:32 2022 +0100 kernel32/tests: Fix a debugger test failing on Windows. Testing: kernel32:debugger, there's sometimes the following error: debugger.c:1760: Test failed: unexpected instruction pointer 778B2A0C Current test code has a workaround when this happens on last thread, but this is clearly not sufficient. Fix the test so that it grabs the thread context only in a place we're sure it's in stopped state at breakpoint instruction. (Current code likely catches cases where the thread is in bp signal handling). Rewrote the test to be in more logical order. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53143 --- dlls/kernel32/tests/debugger.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index abd59c93f88..1dc5bd5fb46 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -318,16 +318,6 @@ static void set_thread_context_(unsigned line, struct debugger_context *ctx, str ok_(__FILE__,line)(ret, "SetThreadContext failed: %lu\n", GetLastError()); } -static void fetch_process_context(struct debugger_context *ctx) -{ - struct debuggee_thread *thread; - - WINE_RB_FOR_EACH_ENTRY(thread, &ctx->threads, struct debuggee_thread, entry) - { - fetch_thread_context(thread); - } -} - #define WAIT_EVENT_TIMEOUT 20000 #define POLL_EVENT_TIMEOUT 200 @@ -1706,8 +1696,6 @@ static void test_debugger(const char *argv0) if (sizeof(loop_code) > 1) { - struct debuggee_thread *prev_thread; - memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, &loop_code, sizeof(loop_code)); ret = WriteProcessMemory(pi.hProcess, mem, buf, sizeof(buf), NULL); @@ -1735,9 +1723,6 @@ static void test_debugger(const char *argv0) expect_breakpoint_exception(&ctx, thread_proc + 1); exception_cnt = 1; - prev_thread = ctx.current_thread; - fetch_process_context(&ctx); - byte = 0xc3; /* ret */ ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); @@ -1746,6 +1731,10 @@ static void test_debugger(const char *argv0) { DEBUG_EVENT ev; + fetch_thread_context(ctx.current_thread); + ok(get_ip(&ctx.current_thread->ctx) == thread_proc + 2 + || broken(get_ip(&ctx.current_thread->ctx) == thread_proc), /* sometimes observed on win10 */ + "unexpected instruction pointer2 %p (%p)\n", get_ip(&ctx.current_thread->ctx), thread_proc); /* even when there are more pending events, they are not reported until current event is continued */ ret = WaitForDebugEvent(&ev, 10); ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%lu)\n", ret, GetLastError()); @@ -1757,18 +1746,9 @@ static void test_debugger(const char *argv0) ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == thread_proc + 1, "ExceptionAddress = %p\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress); - ok(get_ip(&prev_thread->ctx) == thread_proc + 2 - || broken(get_ip(&prev_thread->ctx) == thread_proc), /* sometimes observed on win10 */ - "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); - prev_thread = ctx.current_thread; exception_cnt++; } - /* for some reason sometimes on Windows one thread has a different address. this is always the thread - * with the last reported exception, so we simply skip the check for the last exception unless it's the only one. */ - if (exception_cnt == 1) - ok(get_ip(&prev_thread->ctx) == thread_proc + 2, "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); - trace("received %u exceptions\n", exception_cnt); for (;;)

1 0

Alexandre Julliard : d3d9/tests: Mark a few more message tests as flaky.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: d3fa1962a07fbb35c742caeb2586cdbf5858d0e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3fa1962a07fbb35c742caeb2586cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 18:38:29 2022 +0100 d3d9/tests: Mark a few more message tests as flaky. --- dlls/d3d9/tests/d3d9ex.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index d1ea5587f3a..41f930a2408 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3094,6 +3094,7 @@ static void test_wndproc(void) expect_messages = focus_loss_messages_filtered; windowposchanged_received = 0; SetForegroundWindow(GetDesktopWindow()); + flaky_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); flaky_if(i == 0 || i == 1) @@ -3112,8 +3113,10 @@ static void test_wndproc(void) syscommand_received = 0; expect_messages = sc_restore_messages; SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); + flaky_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + flaky ok(syscommand_received == 1, "Got unexpected number of WM_SYSCOMMAND messages: %ld.\n", syscommand_received); expect_messages = NULL; flush_events();

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: ed0e5d9fc6b918d81136ee81cfd0d16790c35dfa URL: https://gitlab.winehq.org/wine/wine/-/commit/ed0e5d9fc6b918d81136ee81cfd0d1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 15 12:32:51 2022 -0700 po: Update Catalan translation. --- po/ca.po | 162 ++++++++++++++++++--------------------------------------------- 1 file changed, 46 insertions(+), 116 deletions(-)

1 0

Fabian Maurer : urlmon: Pass correct parameter to realloc and simplify code (Coverity).
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 7a6eeb8c34d714241a65dc7c254e700eaf374c2e URL: https://gitlab.winehq.org/wine/wine/-/commit/7a6eeb8c34d714241a65dc7c254e70… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 11 20:29:58 2022 +0100 urlmon: Pass correct parameter to realloc and simplify code (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/urlmon/sec_mgr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index e6d1864b1e7..78e4c96fd60 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1276,13 +1276,12 @@ static LPDWORD build_zonemap_from_reg(void) if (used == allocated) { LPDWORD new_data; + allocated *= 2; new_data = realloc(data, allocated * sizeof(DWORD)); if (!new_data) goto cleanup; - memset(new_data + allocated, 0, allocated * sizeof(DWORD)); data = new_data; - allocated *= 2; } data[used] = wcstol(name, NULL, 10); }

1 0

Paul Gofman : bcrypt/tests: Test BCRYPT_PAD_NONE encryption result in test_rsa_encrypt().
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: a88cc503653c06b612429d98e4e6174278687b94 URL: https://gitlab.winehq.org/wine/wine/-/commit/a88cc503653c06b612429d98e4e617… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 14 20:13:03 2022 -0600 bcrypt/tests: Test BCRYPT_PAD_NONE encryption result in test_rsa_encrypt(). --- dlls/bcrypt/tests/bcrypt.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3bcdda0cf47..5d1a80f330b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2262,6 +2262,14 @@ static UCHAR rsaPublicBlobWithInvalidPublicExpSize[] = 0x87, 0x75, 0x33, 0x15, 0xb8, 0xde, 0x32, 0x30, 0xb4, 0x5e, 0xfd }; +static const UCHAR rsa_encrypted_no_padding[] = +{ + 0x4a, 0xc1, 0xfa, 0x4f, 0xe0, 0x3f, 0x36, 0x9a, 0x64, 0xbf, 0x2e, 0x00, 0xb4, 0xb5, 0x40, 0xbe, + 0x2d, 0x9a, 0x14, 0xf6, 0x8f, 0xa5, 0xc2, 0xe2, 0x20, 0xaf, 0x21, 0x79, 0xc6, 0x32, 0x7e, 0xea, + 0x73, 0x00, 0x01, 0xbb, 0x9a, 0x19, 0x73, 0x41, 0x96, 0xae, 0x88, 0x6e, 0x36, 0x56, 0xe9, 0x9c, + 0xac, 0x04, 0x82, 0xa8, 0x00, 0xdb, 0x4e, 0x29, 0x61, 0x7e, 0xaf, 0x64, 0xdb, 0xa2, 0x70, 0x0f, +}; + static void test_rsa_encrypt(void) { static UCHAR input[] = "Hello World!"; @@ -2287,7 +2295,15 @@ static void test_rsa_encrypt(void) /* Not finalized key */ ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, NULL, 0, &encrypted_size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %lx\n", ret); - BCryptFinalizeKeyPair(key, 0); + BCryptDestroyKey(key); + + /* Import a different public key first to make sure a public key from private key improted next + * overrides it. */ + ret = BCryptImportKeyPair(rsa, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + + ret = BCryptImportKeyPair(rsa, NULL, BCRYPT_RSAPRIVATE_BLOB, &key, rsaPrivateBlob, sizeof(rsaPrivateBlob), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); todo_wine { /* No padding */ @@ -2313,6 +2329,7 @@ static void test_rsa_encrypt(void) ret = BCryptEncrypt(key, input_no_padding, sizeof(input_no_padding), NULL, NULL, 0, encrypted_b, encrypted_size, &encrypted_size, BCRYPT_PAD_NONE); ok(ret == STATUS_SUCCESS, "got %lx\n", ret); ok(!memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs should be the same\n"); + ok(!memcmp(encrypted_b, rsa_encrypted_no_padding, encrypted_size), "Data mismatch.\n"); BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_NONE); decrypted = malloc(decrypted_size);

1 0

Paul Gofman : bcrypt: Return correct error from key_asymmetric_encrypt() if key is missing.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 6f455e10afaf95f64008f45cdb5b794308275504 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f455e10afaf95f64008f45cdb5b79… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Dec 15 09:25:40 2022 -0600 bcrypt: Return correct error from key_asymmetric_encrypt() if key is missing. --- dlls/bcrypt/gnutls.c | 2 ++ dlls/bcrypt/tests/bcrypt.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index bb79e885652..a67030a3ae0 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2205,6 +2205,8 @@ static NTSTATUS key_asymmetric_encrypt( void *args ) NTSTATUS status = STATUS_SUCCESS; int ret; + if (!key_data(params->key)->a.pubkey) return STATUS_INVALID_HANDLE; + d.data = params->input; d.size = params->input_len; if ((ret = pgnutls_pubkey_encrypt_data(key_data(params->key)->a.pubkey, 0, &d, &e))) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 39cdd015c90..3bcdda0cf47 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2284,12 +2284,12 @@ static void test_rsa_encrypt(void) ret = BCryptGenerateKeyPair(rsa, &key, 512, 0); ok(ret == STATUS_SUCCESS, "got %lx\n", ret); - todo_wine { /* Not finalized key */ ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, NULL, 0, &encrypted_size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %lx\n", ret); BCryptFinalizeKeyPair(key, 0); + todo_wine { /* No padding */ memset(input_no_padding, 0, sizeof(input_no_padding)); strcpy((char *)input_no_padding, "Hello World");

1 0