October 2023 - Wine-commits

Alexandre Julliard : wow64: Only support Wow64 system directories for 32-bit platforms.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: c9a011a9cbeeebff37d420967c717f10c7a70657 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9a011a9cbeeebff37d420967c717f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 14:07:05 2023 +0100 wow64: Only support Wow64 system directories for 32-bit platforms. --- dlls/wow64/wow64_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index c063704859a..470738ea2bd 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -64,8 +64,6 @@ static inline const WCHAR *get_machine_wow64_dir( USHORT machine ) case IMAGE_FILE_MACHINE_TARGET_HOST: return L"\\??\\C:\\windows\\system32"; case IMAGE_FILE_MACHINE_I386: return L"\\??\\C:\\windows\\syswow64"; case IMAGE_FILE_MACHINE_ARMNT: return L"\\??\\C:\\windows\\sysarm32"; - case IMAGE_FILE_MACHINE_AMD64: return L"\\??\\C:\\windows\\sysx8664"; - case IMAGE_FILE_MACHINE_ARM64: return L"\\??\\C:\\windows\\sysarm64"; default: return NULL; } }

1 0

Alexandre Julliard : server: Only create Wow64 system directories for 32-bit platforms.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 663e93e61f9b2c39af97bb69a83ed201de98487e URL: https://gitlab.winehq.org/wine/wine/-/commit/663e93e61f9b2c39af97bb69a83ed2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 13:26:36 2023 +0100 server: Only create Wow64 system directories for 32-bit platforms. --- server/registry.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/registry.c b/server/registry.c index 629d67c832f..0128b8be9d8 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1990,8 +1990,6 @@ void init_registry(void) { case IMAGE_FILE_MACHINE_I386: mkdir( "drive_c/windows/syswow64", 0777 ); break; case IMAGE_FILE_MACHINE_ARMNT: mkdir( "drive_c/windows/sysarm32", 0777 ); break; - case IMAGE_FILE_MACHINE_AMD64: mkdir( "drive_c/windows/sysx8664", 0777 ); break; - case IMAGE_FILE_MACHINE_ARM64: mkdir( "drive_c/windows/sysarm64", 0777 ); break; } } }

1 0

Alexandre Julliard : winegcc: Use a temp file for the implicitly created import library.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 4819a850a0ee4ad1989bbd5c7207c5d952166d14 URL: https://gitlab.winehq.org/wine/wine/-/commit/4819a850a0ee4ad1989bbd5c7207c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 16:34:40 2023 +0100 winegcc: Use a temp file for the implicitly created import library. Otherwise clang creates a .lib file along with every dll. --- tools/winegcc/winegcc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b8eb5e4fc79..4924f608720 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -465,6 +465,8 @@ static struct strarray get_link_args( struct options *opts, const char *output_n if (opts->out_implib) strarray_add(&link_args, strmake("-Wl,-implib:%s", opts->out_implib)); + else + strarray_add(&link_args, strmake("-Wl,-implib:%s", make_temp_file( output_name, ".lib" ))); strarray_add( &link_args, strmake( "-Wl,-filealign:%s", opts->file_align ? opts->file_align : "0x1000" ));

1 0

Giovanni Mascellani : ci: Run cross tests on Windows.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: vkd3d Branch: master Commit: dbc5e7d07c45a0f0cde05f1088ddc003c3c99e7f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dbc5e7d07c45a0f0cde05f1088ddc… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 26 11:20:39 2023 +0200 ci: Run cross tests on Windows. A driver program is introduced to coordinate test running on Windows, similarly to what "make test" does on Linux and macOS. --- .gitignore | 1 + .gitlab-ci.yml | 2 + Makefile.am | 27 ++++++- gitlab/README | 10 ++- gitlab/build-crosstest | 5 +- gitlab/test.yml | 35 +++++++++ tests/driver.c | 204 +++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 278 insertions(+), 6 deletions(-)

1 0

Giovanni Mascellani : ci: Run shader tests on Windows.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: vkd3d Branch: master Commit: f462d237c18616a6eaef63bfe7cf3a3f1a705410 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f462d237c18616a6eaef63bfe7cf3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Oct 18 12:40:57 2023 +0200 ci: Run shader tests on Windows. --- Makefile.am | 7 +++++-- tests/driver.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4e3a43bb..def1db6f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -580,8 +580,11 @@ endif tests/crosstests.txt: FORCE $(AM_V_GEN) for i in $(vkd3d_cross_tests) ; do echo $$i ; done > $@ -crosstest-lists: tests/crosstests.txt -CLEANFILES += tests/crosstests.txt +tests/shader_tests.txt: FORCE + $(AM_V_GEN) for i in $(vkd3d_shader_tests) ; do echo $$i ; done > $@ + +crosstest-lists: tests/crosstests.txt tests/shader_tests.txt +CLEANFILES += tests/crosstests.txt tests/shader_tests.txt FORCE: diff --git a/tests/driver.c b/tests/driver.c index f6da3405..553417ad 100644 --- a/tests/driver.c +++ b/tests/driver.c @@ -19,6 +19,7 @@ #include <stdio.h> #include <stdbool.h> #include <windows.h> +#include <shlobj.h> #define TIMEOUT_MS (10 * 1000) #define MAX_TIMEOUT_COUNT 3 @@ -32,16 +33,33 @@ enum program_result static enum program_result run_program(const char *cmdline, const char *log_filename) { + char cmdline2[1024], log_dirname[1024], *file_part; enum program_result ret = PROGRAM_RESULT_SUCCESS; HANDLE log = INVALID_HANDLE_VALUE; SECURITY_ATTRIBUTES attrs = {0}; PROCESS_INFORMATION info = {0}; DWORD exit_code, wait_result; STARTUPINFOA startup = {0}; - char cmdline2[1024]; + int res; strcpy(cmdline2, cmdline); + if (GetFullPathNameA(log_filename, sizeof(log_dirname), log_dirname, &file_part) == 0) + { + fprintf(stderr, "Cannot extract the directory name for path %s, last error %ld.\n", log_filename, GetLastError()); + ret = PROGRAM_RESULT_FAILURE; + goto out; + } + *file_part = '\0'; + + res = SHCreateDirectoryExA(NULL, log_dirname, NULL); + if (res != ERROR_SUCCESS && res != ERROR_ALREADY_EXISTS) + { + fprintf(stderr, "Cannot create log directory %s, error %d.\n", log_dirname, res); + ret = PROGRAM_RESULT_FAILURE; + goto out; + } + attrs.nLength = sizeof(attrs); attrs.bInheritHandle = TRUE; @@ -125,6 +143,38 @@ static bool run_tests_for_directory(const char *commit_dir) printf("Building %s\n", commit_dir); printf("---\n"); + sprintf(list_filename, "artifacts/%s/tests/shader_tests.txt", commit_dir); + list_file = fopen(list_filename, "r"); + + if (!list_file) + { + fprintf(stderr, "Cannot open list file %s, errno %d.\n", list_filename, errno); + ret = false; + } + else + { + while (fgets(line, sizeof(line), list_file) && timeout_count < MAX_TIMEOUT_COUNT) + { + size_t len = strlen(line); + + if (line[len - 1] == '\n') + line[--len] = '\0'; + + sprintf(cmdline, "artifacts/%s/tests/shader_runner.cross%s.exe %s", commit_dir, test_arch, line); + + /* Remove the .shader_test suffix. */ + line[len - 12] = '\0'; + sprintf(log_filename, "artifacts/%s/%s.log", commit_dir, line); + + ++test_count; + result = run_program(cmdline, log_filename); + success_count += result == PROGRAM_RESULT_SUCCESS; + timeout_count += result == PROGRAM_RESULT_TIMEOUT; + } + + fclose(list_file); + } + sprintf(list_filename, "artifacts/%s/tests/crosstests.txt", commit_dir); list_file = fopen(list_filename, "r");

1 0

Alex Henrie : winemenubuilder: Disallow desktop integration for internet shortcuts.
by Alexandre Julliard 30 Oct '23

30 Oct '23

Module: wine Branch: master Commit: 0f88c7c31f7845e939bdf27f14f0385231282063 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f88c7c31f7845e939bdf27f14f038… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 15:14:32 2023 -0600 winemenubuilder: Disallow desktop integration for internet shortcuts. --- programs/winemenubuilder/winemenubuilder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 82fece62eb5..abc8edb2ce9 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1968,7 +1968,8 @@ static BOOL is_extension_banned(LPCWSTR extension) if (!wcsicmp(extension, L".bat") || !wcsicmp(extension, L".com") || !wcsicmp(extension, L".exe") || - !wcsicmp(extension, L".msi")) + !wcsicmp(extension, L".msi") || + !wcsicmp(extension, L".url")) return TRUE; return FALSE; }

1 0

Alexandre Julliard : server: Fix returned error when creating an existing symlink.
by Alexandre Julliard 30 Oct '23

30 Oct '23

Module: wine Branch: master Commit: afb16d3ee2cdbc5c7fc6119fa9c805ca0611baa6 URL: https://gitlab.winehq.org/wine/wine/-/commit/afb16d3ee2cdbc5c7fc6119fa9c805… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 30 13:32:46 2023 +0100 server: Fix returned error when creating an existing symlink. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55839 --- dlls/ntdll/tests/om.c | 20 ++++++++++++++++++-- server/symlink.c | 15 ++++++++++----- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index b612a0844a4..62659fc8cb4 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1408,9 +1408,15 @@ static void test_symboliclink(void) pNtClose(link); RtlInitUnicodeString(&str, L"\\"); + attr.Attributes = OBJ_OPENIF; status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr, &target); - todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, - "NtCreateSymbolicLinkObject should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, + "NtCreateSymbolicLinkObject should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status); + attr.Attributes = 0; + status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr, &target); + todo_wine + ok(status == STATUS_OBJECT_TYPE_MISMATCH, + "NtCreateSymbolicLinkObject should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08lx)\n", status); RtlInitUnicodeString( &target, L"->Somewhere"); @@ -1480,6 +1486,16 @@ static void test_symboliclink(void) ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); pNtClose(h); + attr.Attributes = OBJ_OPENIF; + status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target ); + ok(status == STATUS_SUCCESS || broken( status == STATUS_OBJECT_NAME_EXISTS ), /* <= win10 1507 */ + "Got unexpected status %#lx.\n", status); + pNtClose(h); + attr.Attributes = 0; + status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target ); + ok(status == STATUS_OBJECT_NAME_COLLISION, "Got unexpected status %#lx.\n", status); + pNtClose(h); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\om.c-test\\" ); status = NtCreateFile(&h, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, NULL, 0, diff --git a/server/symlink.c b/server/symlink.c index 27d48e2f994..dd28efd3a75 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -155,13 +155,18 @@ struct object *create_symlink( struct object *root, const struct unicode_str *na set_error( STATUS_INVALID_PARAMETER ); return NULL; } - if (!(symlink = create_named_object( root, &symlink_ops, name, attr, sd ))) return NULL; - if (get_error() != STATUS_OBJECT_NAME_EXISTS && !(symlink->target = memdup( target->str, target->len ))) + if (!(symlink = create_named_object( root, &symlink_ops, name, attr | OBJ_OPENLINK, sd ))) return NULL; + if (get_error() != STATUS_OBJECT_NAME_EXISTS) { - release_object( symlink ); - return NULL; + symlink->len = target->len; + if (!(symlink->target = memdup( target->str, target->len ))) + { + release_object( symlink ); + return NULL; + } } - symlink->len = target->len; + else clear_error(); + return &symlink->obj; }

1 0

Alexandre Julliard : user32: Enable a few more hook tests.
by Alexandre Julliard 30 Oct '23

30 Oct '23

Module: wine Branch: master Commit: 6af8b704091473b28b838e6bbaaebb5f2b24c636 URL: https://gitlab.winehq.org/wine/wine/-/commit/6af8b704091473b28b838e6bbaaebb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 30 10:59:43 2023 +0100 user32: Enable a few more hook tests. --- dlls/user32/tests/msg.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 07df7d5cb86..e90999c091b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12233,27 +12233,25 @@ static void test_set_hook(void) ok(hhook != 0, "local hook does not require hModule set to 0\n"); UnhookWindowsHookEx(hhook); - if (0) - { - /* this test doesn't pass under Win9x: BUG! */ SetLastError(0xdeadbeef); hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, 0); ok(!hhook, "global hook requires hModule != 0\n"); ok(GetLastError() == ERROR_HOOK_NEEDS_HMOD, "unexpected error %ld\n", GetLastError()); - } + + SetLastError(0xdeadbeef); + hhook = SetWindowsHookExA(WH_JOURNALRECORD, cbt_hook_proc, 0, 0); + ok(!hhook, "global hook requires hModule != 0\n"); + todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected error %ld\n", GetLastError()); SetLastError(0xdeadbeef); hhook = SetWindowsHookExA(WH_CBT, 0, GetModuleHandleA(0), GetCurrentThreadId()); ok(!hhook, "SetWinEventHook with invalid proc should fail\n"); - ok(GetLastError() == ERROR_INVALID_FILTER_PROC || /* Win2k */ - GetLastError() == 0xdeadbeef, /* Win9x */ - "unexpected error %ld\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_FILTER_PROC, "unexpected error %ld\n", GetLastError()); SetLastError(0xdeadbeef); ok(!UnhookWindowsHookEx((HHOOK)0xdeadbeef), "UnhookWindowsHookEx succeeded\n"); - ok(GetLastError() == ERROR_INVALID_HOOK_HANDLE || /* Win2k */ - GetLastError() == 0xdeadbeef, /* Win9x */ - "unexpected error %ld\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HOOK_HANDLE, "unexpected error %ld\n", GetLastError()); if (!pSetWinEventHook || !pUnhookWinEvent) return; @@ -12262,22 +12260,15 @@ static void test_set_hook(void) hwinevent_hook = pSetWinEventHook(EVENT_MIN, EVENT_MAX, 0, win_event_proc, GetCurrentProcessId(), 0, WINEVENT_INCONTEXT); ok(!hwinevent_hook, "WINEVENT_INCONTEXT requires hModule != 0\n"); - ok(GetLastError() == ERROR_HOOK_NEEDS_HMOD || /* Win2k */ - GetLastError() == 0xdeadbeef, /* Win9x */ - "unexpected error %ld\n", GetLastError()); + ok(GetLastError() == ERROR_HOOK_NEEDS_HMOD, "unexpected error %ld\n", GetLastError()); /* even thread local incontext hooks require hmodule */ SetLastError(0xdeadbeef); hwinevent_hook = pSetWinEventHook(EVENT_MIN, EVENT_MAX, 0, win_event_proc, GetCurrentProcessId(), GetCurrentThreadId(), WINEVENT_INCONTEXT); ok(!hwinevent_hook, "WINEVENT_INCONTEXT requires hModule != 0\n"); - ok(GetLastError() == ERROR_HOOK_NEEDS_HMOD || /* Win2k */ - GetLastError() == 0xdeadbeef, /* Win9x */ - "unexpected error %ld\n", GetLastError()); + ok(GetLastError() == ERROR_HOOK_NEEDS_HMOD, "unexpected error %ld\n", GetLastError()); - if (0) - { - /* these 3 tests don't pass under Win9x */ SetLastError(0xdeadbeef); hwinevent_hook = pSetWinEventHook(1, 0, 0, win_event_proc, GetCurrentProcessId(), 0, WINEVENT_OUTOFCONTEXT); @@ -12294,8 +12285,8 @@ static void test_set_hook(void) hwinevent_hook = pSetWinEventHook(EVENT_MIN, EVENT_MAX, 0, win_event_proc, 0, 0xdeadbeef, WINEVENT_OUTOFCONTEXT); ok(!hwinevent_hook, "SetWinEventHook with invalid tid should fail\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_THREAD_ID, "unexpected error %ld\n", GetLastError()); - } SetLastError(0xdeadbeef); hwinevent_hook = pSetWinEventHook(0, 0, 0, win_event_proc, @@ -12319,9 +12310,7 @@ todo_wine { SetLastError(0xdeadbeef); ok(!pUnhookWinEvent((HWINEVENTHOOK)0xdeadbeef), "UnhookWinEvent succeeded\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE || /* Win2k */ - GetLastError() == 0xdeadbeef, /* Win9x */ - "unexpected error %ld\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "unexpected error %ld\n", GetLastError()); } static HWND hook_hwnd;

1 0

Zhiyi Zhang : user32/tests: Add more parameter checks for SetWindowsHookExA().
by Alexandre Julliard 30 Oct '23

30 Oct '23

Module: wine Branch: master Commit: d2284bb6df581ae17c44b8d5d824f9ebfb8e0d67 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2284bb6df581ae17c44b8d5d824f9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 25 10:45:48 2023 -0500 user32/tests: Add more parameter checks for SetWindowsHookExA(). --- dlls/user32/tests/Makefile.in | 9 +++-- dlls/user32/tests/msg.c | 82 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/testdll.c | 32 +++++++++++++++++ dlls/user32/tests/testdll.spec | 1 + 4 files changed, 121 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 33c7f13f12d..bff53de7713 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,7 +1,9 @@ TESTDLL = user32.dll IMPORTS = user32 gdi32 advapi32 hid imm32 setupapi -C_SRCS = \ +testdll_IMPORTS = user32 + +SOURCES = \ broadcast.c \ class.c \ clipboard.c \ @@ -18,13 +20,14 @@ C_SRCS = \ monitor.c \ msg.c \ resource.c \ + resource.rc \ scroll.c \ static.c \ sysparams.c \ + testdll.c \ + testdll.spec \ text.c \ uitools.c \ win.c \ winstation.c \ wsprintf.c - -RC_SRCS = resource.rc diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e90999c091b..57b856faaaa 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12223,11 +12223,41 @@ skip_mouse_ll_hook_test: ok(DestroyWindow(hwnd), "failed to destroy window\n"); } +static char *get_test_dll_path(void) +{ + static const char *dll_name = "testdll.dll"; + static char path[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathA(ARRAY_SIZE(path), path); + strcat(path, dll_name); + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s: %lu.\n", debugstr_a(path), GetLastError()); + + res = FindResourceA(NULL, dll_name, "TESTDLL"); + ok(!!res, "Failed to load resource: %lu\n", GetLastError()); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource(GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource\n"); + CloseHandle(file); + + return path; +} + static void test_set_hook(void) { + LRESULT (CALLBACK *p_dummy_hook_proc)(int code, WPARAM wp, LPARAM lp); + HMODULE test_dll_module; + char *test_dll_path; + DWORD error; BOOL ret; HHOOK hhook; HWINEVENTHOOK hwinevent_hook; + int i; hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, GetModuleHandleA(0), GetCurrentThreadId()); ok(hhook != 0, "local hook does not require hModule set to 0\n"); @@ -12253,6 +12283,58 @@ static void test_set_hook(void) ok(!UnhookWindowsHookEx((HHOOK)0xdeadbeef), "UnhookWindowsHookEx succeeded\n"); ok(GetLastError() == ERROR_INVALID_HOOK_HANDLE, "unexpected error %ld\n", GetLastError()); + test_dll_path = get_test_dll_path(); + test_dll_module = LoadLibraryA(test_dll_path); + p_dummy_hook_proc = (void *)GetProcAddress(test_dll_module, "dummy_hook_proc"); + for (i = WH_MIN; i <= WH_MAX; i++) + { + winetest_push_context("ID %d", i); + + /* Test that setting hooks should succeed for hook procs in a library. But for WH_JOURNALRECORD + * and WH_JOURNALPLAYBACK, ERROR_ACCESS_DENIED is returned, even with administrator rights */ + SetLastError(0xdeadbeef); + hhook = SetWindowsHookExA(i, p_dummy_hook_proc, test_dll_module, 0); + error = GetLastError(); + if (i == WH_JOURNALRECORD || i == WH_JOURNALPLAYBACK) + { + todo_wine + ok(!hhook, "SetWinEventHook succeeded.\n"); + todo_wine + ok(error == ERROR_ACCESS_DENIED, "Got unexpected error %ld.\n", GetLastError()); + } + else + { + ok(!!hhook, "SetWinEventHook failed.\n"); + ok(error == NO_ERROR, "Got unexpected error %ld.\n", GetLastError()); + } + if (hhook) + UnhookWindowsHookEx(hhook); + + /* Test settings global hooks with a thread ID */ + SetLastError(0xdeadbeef); + hhook = SetWindowsHookExA(i, p_dummy_hook_proc, test_dll_module, GetCurrentThreadId()); + error = GetLastError(); + if (i == WH_JOURNALRECORD || i == WH_JOURNALPLAYBACK || i == WH_SYSMSGFILTER + || i == WH_KEYBOARD_LL || i == WH_MOUSE_LL) + { + ok(!hhook, "SetWinEventHook succeeded.\n"); + todo_wine + ok(error == ERROR_GLOBAL_ONLY_HOOK, "Got unexpected error %ld.\n", GetLastError()); + } + else + { + ok(!!hhook, "SetWinEventHook failed.\n"); + ok(error == NO_ERROR, "Got unexpected error %ld.\n", GetLastError()); + } + if (hhook) + UnhookWindowsHookEx(hhook); + + winetest_pop_context(); + } + FreeLibrary(test_dll_module); + ret = DeleteFileA(test_dll_path); + ok(ret, "Failed to remove the test dll, error %ld.\n", GetLastError()); + if (!pSetWinEventHook || !pUnhookWinEvent) return; /* even process local incontext hooks require hmodule */ diff --git a/dlls/user32/tests/testdll.c b/dlls/user32/tests/testdll.c new file mode 100644 index 00000000000..52ca93fc340 --- /dev/null +++ b/dlls/user32/tests/testdll.c @@ -0,0 +1,32 @@ +/* + * Copyright 2023 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep testdll +#endif + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + +LRESULT CALLBACK dummy_hook_proc(int code, WPARAM wp, LPARAM lp) +{ + return CallNextHookEx(0, code, wp, lp); +} diff --git a/dlls/user32/tests/testdll.spec b/dlls/user32/tests/testdll.spec new file mode 100644 index 00000000000..80834cbc21a --- /dev/null +++ b/dlls/user32/tests/testdll.spec @@ -0,0 +1 @@ +@ stdcall dummy_hook_proc(long ptr ptr)

1 0

Zhiyi Zhang : win32u: Return ERROR_GLOBAL_ONLY_HOOK when a thread ID is specified for global hooks.
by Alexandre Julliard 30 Oct '23

30 Oct '23

Module: wine Branch: master Commit: 6dfeab55bd847e4668b0ce2058fa7049f6a233f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6dfeab55bd847e4668b0ce2058fa70… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 25 14:48:14 2023 -0500 win32u: Return ERROR_GLOBAL_ONLY_HOOK when a thread ID is specified for global hooks. --- dlls/user32/tests/msg.c | 1 - dlls/win32u/hook.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 57b856faaaa..f95e1603e65 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12318,7 +12318,6 @@ static void test_set_hook(void) || i == WH_KEYBOARD_LL || i == WH_MOUSE_LL) { ok(!hhook, "SetWinEventHook succeeded.\n"); - todo_wine ok(error == ERROR_GLOBAL_ONLY_HOOK, "Got unexpected error %ld.\n", GetLastError()); } else diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index 062f10c4702..3cd6b1ee1a2 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -91,7 +91,7 @@ HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWO id == WH_SYSMSGFILTER) { /* these can only be global */ - RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); + RtlSetLastWin32Error( ERROR_GLOBAL_ONLY_HOOK ); return 0; } }

1 0