- Wine-Commits - list.winehq.org

Zhiyi Zhang : win32u: Return ERROR_ACCESS_DENIED for WH_JOURNALRECORD and WH_JOURNALPLAYBACK.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: e1259ff91a40d7d97fa730235e2b7737b229f708 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1259ff91a40d7d97fa730235e2b77… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 25 15:20:32 2023 -0500 win32u: Return ERROR_ACCESS_DENIED for WH_JOURNALRECORD and WH_JOURNALPLAYBACK. On > XP, settings WH_JOURNALRECORD or WH_JOURNALPLAYBACK hooks report ERROR_ACCESS_DENIED according to tests, even with administrator rights. PCSE_TERM depends on this to not crash. MSDN also says that journaling hooks APIs are unsupported starting in Windows 11. Reject journalling hooks unconditionally here because they have been broken for a long time. --- dlls/user32/tests/msg.c | 3 --- dlls/win32u/hook.c | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f95e1603e65..90abf9b83a1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12271,7 +12271,6 @@ static void test_set_hook(void) 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); @@ -12297,9 +12296,7 @@ static void test_set_hook(void) 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 diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index 3cd6b1ee1a2..e9b3ae7d70d 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -97,6 +97,11 @@ HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWO } else /* system-global hook */ { + if (id == WH_JOURNALRECORD || id == WH_JOURNALPLAYBACK) + { + RtlSetLastWin32Error( ERROR_ACCESS_DENIED ); + return 0; + } if (id == WH_KEYBOARD_LL || id == WH_MOUSE_LL) inst = 0; else if (!inst) {

1 0

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

Oct. 30, 2023

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

Brendan Shanks : localspl: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: c742e3f67bdf05b768f54aa617b6cfc3380fe019 URL: https://gitlab.winehq.org/wine/wine/-/commit/c742e3f67bdf05b768f54aa617b6cf… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Oct 23 14:52:51 2023 -0500 localspl: Ensure unixlib function tables and enum stay in sync. --- dlls/localspl/cups.c | 4 ++++ dlls/localspl/localspl_private.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/localspl/cups.c b/dlls/localspl/cups.c index b5c26cc2626..620dbc54068 100644 --- a/dlls/localspl/cups.c +++ b/dlls/localspl/cups.c @@ -517,6 +517,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = end_doc, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -569,4 +571,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = end_doc, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index daca09a510d..4717b0dcf6d 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -195,6 +195,7 @@ enum cups_funcs unix_start_doc, unix_write_doc, unix_end_doc, + unix_funcs_count }; #endif /* __WINE_LOCALSPL_PRIVATE__ */

1 0

Alexandre Julliard : user32: Enable a few more hook tests.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

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

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

Oct. 30, 2023

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

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

Oct. 30, 2023

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

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

Oct. 30, 2023

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

Alex Henrie : msscript: Use CRT allocation functions.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 8418962fa7c7720e6c7f48a9f4fccc0ff85b38bf URL: https://gitlab.winehq.org/wine/wine/-/commit/8418962fa7c7720e6c7f48a9f4fccc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 13:09:48 2023 -0600 msscript: Use CRT allocation functions. --- dlls/msscript.ocx/msscript.c | 61 ++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 402d0290fdc..82d411f51e8 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -30,7 +30,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msscript); @@ -280,7 +279,7 @@ static void clear_named_items(ScriptHost *host) list_remove(&item->entry); SysFreeString(item->name); IDispatch_Release(item->disp); - heap_free(item); + free(item); } } @@ -388,14 +387,14 @@ static HRESULT add_script_object(ScriptHost *host, BSTR name, IDispatch *object, if (host_get_named_item(host, name)) return E_INVALIDARG; - item = heap_alloc(sizeof(*item)); + item = malloc(sizeof(*item)); if (!item) return E_OUTOFMEMORY; item->name = SysAllocString(name); if (!item->name) { - heap_free(item); + free(item); return E_OUTOFMEMORY; } IDispatch_AddRef(item->disp = object); @@ -407,7 +406,7 @@ static HRESULT add_script_object(ScriptHost *host, BSTR name, IDispatch *object, list_remove(&item->entry); IDispatch_Release(item->disp); SysFreeString(item->name); - heap_free(item); + free(item); return hr; } @@ -498,7 +497,7 @@ static HRESULT run_procedure(ScriptModule *module, BSTR procedure_name, SAFEARRA dp.cArgs = args->rgsabound[0].cElements; dp.rgdispidNamedArgs = NULL; dp.cNamedArgs = 0; - dp.rgvarg = heap_alloc(dp.cArgs * sizeof(*dp.rgvarg)); + dp.rgvarg = malloc(dp.cArgs * sizeof(*dp.rgvarg)); if (!dp.rgvarg) return E_OUTOFMEMORY; hr = SafeArrayLock(args); @@ -522,7 +521,7 @@ static HRESULT run_procedure(ScriptModule *module, BSTR procedure_name, SAFEARRA IDispatchEx_Release(dispex); } } - heap_free(dp.rgvarg); + free(dp.rgvarg); return hr; } @@ -668,7 +667,7 @@ static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) if(!ref) { clear_named_items(This); - heap_free(This); + free(This); } return ref; @@ -908,7 +907,7 @@ static ULONG WINAPI ScriptProcedure_Release(IScriptProcedure *iface) { list_remove(&This->entry); SysFreeString(This->name); - heap_free(This); + free(This); } return ref; } @@ -1054,7 +1053,7 @@ static HRESULT get_script_procedure(ScriptProcedureCollection *procedures, IType } } - if (!(proc = heap_alloc(sizeof(*proc)))) + if (!(proc = malloc(sizeof(*proc)))) { hr = E_OUTOFMEMORY; SysFreeString(str); @@ -1115,7 +1114,7 @@ static ULONG WINAPI procedure_enum_Release(IEnumVARIANT *iface) if (!ref) { IScriptProcedureCollection_Release(&This->procedures->IScriptProcedureCollection_iface); - heap_free(This); + free(This); } return ref; @@ -1200,7 +1199,7 @@ static HRESULT WINAPI procedure_enum_Clone(IEnumVARIANT *iface, IEnumVARIANT **p if (!ppEnum) return E_POINTER; - if (!(clone = heap_alloc(sizeof(*clone)))) + if (!(clone = malloc(sizeof(*clone)))) return E_OUTOFMEMORY; *clone = *This; @@ -1267,7 +1266,7 @@ static ULONG WINAPI ScriptProcedureCollection_Release(IScriptProcedureCollection This->module->procedures = NULL; IScriptModule_Release(&This->module->IScriptModule_iface); - heap_free(This); + free(This); } return ref; } @@ -1359,7 +1358,7 @@ static HRESULT WINAPI ScriptProcedureCollection_get__NewEnum(IScriptProcedureCol count = attr->cFuncs; ITypeInfo_ReleaseTypeAttr(ti, attr); - if (!(proc_enum = heap_alloc(sizeof(*proc_enum)))) + if (!(proc_enum = malloc(sizeof(*proc_enum)))) return E_OUTOFMEMORY; proc_enum->IEnumVARIANT_iface.lpVtbl = &procedure_enum_vtbl; @@ -1572,7 +1571,7 @@ static ULONG WINAPI ScriptModule_Release(IScriptModule *iface) detach_module(This); SysFreeString(This->name); uncache_module_objects(This); - heap_free(This); + free(This); } return ref; @@ -1687,7 +1686,7 @@ static HRESULT WINAPI ScriptModule_get_Procedures(IScriptModule *iface, IScriptP ScriptProcedureCollection *procs; UINT i; - if (!(procs = heap_alloc(sizeof(*procs)))) + if (!(procs = malloc(sizeof(*procs)))) return E_OUTOFMEMORY; procs->IScriptProcedureCollection_iface.lpVtbl = &ScriptProcedureCollectionVtbl; @@ -1819,7 +1818,7 @@ static ULONG WINAPI module_enum_Release(IEnumVARIANT *iface) { IActiveScriptSite_Release(&This->host->IActiveScriptSite_iface); IScriptControl_Release(&This->control->IScriptControl_iface); - heap_free(This); + free(This); } return ref; @@ -1886,7 +1885,7 @@ static HRESULT WINAPI module_enum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEn if (!ppEnum) return E_POINTER; if (This->host != This->control->host) return E_FAIL; - if (!(clone = heap_alloc(sizeof(*clone)))) + if (!(clone = malloc(sizeof(*clone)))) return E_OUTOFMEMORY; *clone = *This; @@ -1912,13 +1911,13 @@ static ScriptModule *create_module(ScriptHost *host, BSTR name) { ScriptModule *module; - if (!(module = heap_alloc_zero(sizeof(*module)))) return NULL; + if (!(module = calloc(1, sizeof(*module)))) return NULL; module->IScriptModule_iface.lpVtbl = &ScriptModuleVtbl; module->ref = 1; if (name && !(module->name = SysAllocString(name))) { - heap_free(module); + free(module); return NULL; } module->host = host; @@ -1935,7 +1934,7 @@ static void release_modules(ScriptControl *control, BOOL force_detach) IScriptModule_Release(&control->modules[i]->IScriptModule_iface); } - heap_free(control->modules); + free(control->modules); } static ScriptModule *find_module(ScriptControl *control, BSTR name) @@ -2056,7 +2055,7 @@ static HRESULT WINAPI ScriptModuleCollection_get__NewEnum(IScriptModuleCollectio if (!ppenumContexts) return E_POINTER; if (!This->host) return E_FAIL; - if (!(module_enum = heap_alloc(sizeof(*module_enum)))) + if (!(module_enum = malloc(sizeof(*module_enum)))) return E_OUTOFMEMORY; module_enum->IEnumVARIANT_iface.lpVtbl = &module_enum_vtbl; @@ -2136,7 +2135,7 @@ static HRESULT WINAPI ScriptModuleCollection_Add(IScriptModuleCollection *iface, /* See if we need to grow the array */ if (is_power_of_2(host->module_count)) { - modules = heap_realloc(This->modules, host->module_count * 2 * sizeof(*This->modules)); + modules = realloc(This->modules, host->module_count * 2 * sizeof(*This->modules)); if (!modules) return E_OUTOFMEMORY; This->modules = modules; } @@ -2264,7 +2263,7 @@ static ULONG WINAPI ScriptError_Release(IScriptError *iface) if (!ref) { IScriptError_Clear(&This->IScriptError_iface); - heap_free(This); + free(This); } return ref; @@ -2498,7 +2497,7 @@ static HRESULT init_script_host(ScriptControl *control, const CLSID *clsid, Scri *ret = NULL; - host = heap_alloc(sizeof(*host)); + host = malloc(sizeof(*host)); if (!host) return E_OUTOFMEMORY; @@ -2631,7 +2630,7 @@ static ULONG WINAPI ScriptControl_Release(IScriptControl *iface) IActiveScriptSite_Release(&This->host->IActiveScriptSite_iface); } IScriptError_Release(&This->error->IScriptError_iface); - heap_free(This); + free(This); } return ref; @@ -2742,11 +2741,11 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan return hres; /* Alloc global module */ - This->modules = heap_alloc_zero(sizeof(*This->modules)); + This->modules = calloc(1, sizeof(*This->modules)); if (This->modules) { This->modules[0] = create_module(This->host, NULL); if (!This->modules[0]) { - heap_free(This->modules); + free(This->modules); This->modules = NULL; hres = E_OUTOFMEMORY; } @@ -3959,14 +3958,14 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - script_control = heap_alloc_zero(sizeof(*script_control)); + script_control = calloc(1, sizeof(*script_control)); if(!script_control) return E_OUTOFMEMORY; - script_control->error = heap_alloc_zero(sizeof(*script_control->error)); + script_control->error = calloc(1, sizeof(*script_control->error)); if(!script_control->error) { - heap_free(script_control); + free(script_control); return E_OUTOFMEMORY; }

1 0

Alex Henrie : find/tests: Use CRT allocation functions.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: a3c3283c177d11b83bb5da2eef3c12d4e8985785 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3c3283c177d11b83bb5da2eef3c12… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 13:08:40 2023 -0600 find/tests: Use CRT allocation functions. --- programs/find/tests/find.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index a85bda85bec..10fd8ad8ae3 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -19,7 +19,6 @@ #include <windows.h> #include <stdio.h> -#include "wine/heap.h" #include "wine/test.h" static void read_all_from_handle(HANDLE handle, BYTE **str, int *len) @@ -27,14 +26,14 @@ static void read_all_from_handle(HANDLE handle, BYTE **str, int *len) char buffer[4096]; DWORD bytes_read; DWORD length = 0; - BYTE *ret = heap_alloc_zero(1); + BYTE *ret = calloc(1, 1); for (;;) { BOOL success = ReadFile(handle, buffer, sizeof(buffer), &bytes_read, NULL); if (!success || !bytes_read) break; - ret = heap_realloc(ret, length + bytes_read); + ret = realloc(ret, length + bytes_read); memcpy((char *)ret + length, buffer, bytes_read); length += bytes_read; } @@ -64,8 +63,8 @@ static void check_find_output(const BYTE *child_output, int child_output_len, co } /* Format strings for debug printing */ - child_output_copy = heap_alloc_zero(child_output_len * 4 + 1); - out_expected_copy = heap_alloc_zero(out_expected_len * 4 + 1); + child_output_copy = calloc(1, child_output_len * 4 + 1); + out_expected_copy = calloc(1, out_expected_len * 4 + 1); for (i = 0, pos = 0; i < child_output_len; i++) { @@ -97,8 +96,8 @@ static void check_find_output(const BYTE *child_output, int child_output_len, co "####################\n", out_expected_copy, child_output_copy); - heap_free(child_output_copy); - heap_free(out_expected_copy); + free(child_output_copy); + free(out_expected_copy); } static void mangle_text(const BYTE *input, int input_len, BYTE *output, int output_max, int *output_len) { @@ -176,7 +175,7 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %ld\n", exitcode_expected, exitcode); - heap_free(child_output); + free(child_output); } static void run_find_file_(const WCHAR *commandline, const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) @@ -200,12 +199,12 @@ static void run_find_file_(const WCHAR *commandline, const BYTE *input, int inpu CharUpperA(path_temp_file); wsprintfA(header, "\r\n---------- %s\r\n", path_temp_file); header_len = lstrlenA(header); - out_expected_new = heap_alloc(header_len + out_expected_len); + out_expected_new = malloc(header_len + out_expected_len); memcpy(out_expected_new, header, header_len); memcpy(out_expected_new + header_len, out_expected, out_expected_len); run_find_stdin_(commandline_new, (BYTE*)"", 0, out_expected_new, header_len + out_expected_len, exitcode_expected, file, line); - heap_free(out_expected_new); + free(out_expected_new); DeleteFileA(path_temp_file); } @@ -223,14 +222,14 @@ static void run_find_str_(const char *commandline, const char *input, const char /* Turn commandline into WCHAR string */ len_commandlineW = MultiByteToWideChar(CP_UTF8, 0, commandline, -1, 0, 0); - commandlineW = heap_alloc(len_commandlineW * sizeof(WCHAR)); + commandlineW = malloc(len_commandlineW * sizeof(WCHAR)); MultiByteToWideChar(CP_UTF8, 0, commandline, -1, commandlineW, len_commandlineW); if (is_file) run_find_file_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); else run_find_stdin_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); - heap_free(commandlineW); + free(commandlineW); } #define run_find_stdin_unicode(input, out_expected, exitcode_expected) \

1 0

Alex Henrie : uxtheme/tests: Use CRT allocation functions.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: da42d96aa81e13688fdc9adccafca4a8ee9e53ab URL: https://gitlab.winehq.org/wine/wine/-/commit/da42d96aa81e13688fdc9adccafca4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 13:23:19 2023 -0600 uxtheme/tests: Use CRT allocation functions. --- dlls/uxtheme/tests/msg.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/tests/msg.h b/dlls/uxtheme/tests/msg.h index 37699a12213..f967c39d091 100644 --- a/dlls/uxtheme/tests/msg.h +++ b/dlls/uxtheme/tests/msg.h @@ -20,7 +20,6 @@ #include <assert.h> #include <windows.h> -#include "wine/heap.h" #include "wine/test.h" /* undocumented SWP flags - from SDK 3.1 */ @@ -69,13 +68,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index, if (!msg_seq->sequence) { msg_seq->size = 10; - msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (*msg_seq->sequence)); + msg_seq->sequence = malloc(msg_seq->size * sizeof(*msg_seq->sequence)); } if (msg_seq->count == msg_seq->size) { msg_seq->size *= 2; - msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (*msg_seq->sequence)); + msg_seq->sequence = realloc(msg_seq->sequence, msg_seq->size * sizeof(*msg_seq->sequence)); } assert(msg_seq->sequence); @@ -87,7 +86,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index, static inline void flush_sequence(struct msg_sequence **seg, int sequence_index) { struct msg_sequence *msg_seq = seg[sequence_index]; - heap_free(msg_seq->sequence); + free(msg_seq->sequence); msg_seq->sequence = NULL; msg_seq->count = msg_seq->size = 0; } @@ -405,5 +404,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = heap_alloc_zero(sizeof(*seq[i])); + seq[i] = calloc(1, sizeof(*seq[i])); }

1 0