- Wine-Commits - list.winehq.org

Marc-Aurel Zent : ntdll: Reimplement set_native_thread_name() for macOS.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: c0bffa823d0af15668d9bf8810176a0d58bec4b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0bffa823d0af15668d9bf8810176a… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Thu Jan 11 10:46:10 2024 +0100 ntdll: Reimplement set_native_thread_name() for macOS. --- dlls/ntdll/unix/thread.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 5302304444d..52cb0f26e97 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1911,30 +1911,21 @@ static void set_native_thread_name( HANDLE handle, const UNICODE_STRING *name ) close( fd ); } #elif defined(__APPLE__) - /* pthread_setname_np() silently fails if the name is longer than 63 characters + null terminator */ - char nameA[64]; - NTSTATUS status; - int unix_pid, unix_tid, len, current_tid; + char nameA[MAXTHREADNAMESIZE]; + int len; + THREAD_BASIC_INFORMATION info; - SERVER_START_REQ( get_thread_times ) - { - req->handle = wine_server_obj_handle( handle ); - status = wine_server_call( req ); - if (status == STATUS_SUCCESS) - { - unix_pid = reply->unix_pid; - unix_tid = reply->unix_tid; - } - } - SERVER_END_REQ; - - if (status != STATUS_SUCCESS || unix_pid == -1 || unix_tid == -1) + if (NtQueryInformationThread( handle, ThreadBasicInformation, &info, sizeof(info), NULL )) return; - current_tid = mach_thread_self(); - mach_port_deallocate(mach_task_self(), current_tid); + if (HandleToULong( info.ClientId.UniqueProcess ) != GetCurrentProcessId()) + { + static int once; + if (!once++) FIXME("cross-process native thread naming not supported\n"); + return; + } - if (unix_tid != current_tid) + if (HandleToULong( info.ClientId.UniqueThread ) != GetCurrentThreadId()) { static int once; if (!once++) FIXME("setting other thread name not supported\n"); @@ -1943,7 +1934,7 @@ static void set_native_thread_name( HANDLE handle, const UNICODE_STRING *name ) len = ntdll_wcstoumbs( name->Buffer, name->Length / sizeof(WCHAR), nameA, sizeof(nameA) - 1, FALSE ); nameA[len] = '\0'; - pthread_setname_np(nameA); + pthread_setname_np( nameA ); #else static int once; if (!once++) FIXME("not implemented on this platform\n");

1 0

Alexandre Julliard : kernel32: Move Wow64Get/SetThreadContext implementation to kernelbase.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: 908850602916a786692f19b4d1617541ca37b58b URL: https://gitlab.winehq.org/wine/wine/-/commit/908850602916a786692f19b4d16175… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 14:57:41 2024 +0100 kernel32: Move Wow64Get/SetThreadContext implementation to kernelbase. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/thread.c | 29 ----------------------------- dlls/kernelbase/kernelbase.spec | 3 +++ dlls/kernelbase/thread.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bb9c8fbfe0e..52ff3a7fa38 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1638,10 +1638,10 @@ @ stdcall WinExec(str long) @ stdcall -import Wow64DisableWow64FsRedirection(ptr) @ stdcall -import Wow64EnableWow64FsRedirection(long) -@ stdcall Wow64GetThreadContext(long ptr) +@ stdcall -import Wow64GetThreadContext(long ptr) @ stdcall Wow64GetThreadSelectorEntry(long long ptr) @ stdcall -import Wow64RevertWow64FsRedirection(ptr) -@ stdcall Wow64SetThreadContext(long ptr) +@ stdcall -import Wow64SetThreadContext(long ptr) # @ stub Wow64SuspendThread @ stdcall -import WriteConsoleA(long ptr long ptr ptr) @ stdcall -import WriteConsoleInputA(long ptr long ptr) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index a090c54aa28..7f1a3f5b2fb 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -72,35 +72,6 @@ void WINAPI FreeLibraryAndExitThread(HINSTANCE hLibModule, DWORD dwExitCode) } -/*********************************************************************** - * Wow64SetThreadContext [KERNEL32.@] - */ -BOOL WINAPI Wow64SetThreadContext( HANDLE handle, const WOW64_CONTEXT *context) -{ -#ifdef __i386__ - return set_ntstatus( NtSetContextThread( handle, (const CONTEXT *)context )); -#elif defined(__x86_64__) - return set_ntstatus( RtlWow64SetThreadContext( handle, context )); -#else - return set_ntstatus( STATUS_NOT_IMPLEMENTED ); -#endif -} - -/*********************************************************************** - * Wow64GetThreadContext [KERNEL32.@] - */ -BOOL WINAPI Wow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context) -{ -#ifdef __i386__ - return set_ntstatus( NtGetContextThread( handle, (CONTEXT *)context )); -#elif defined(__x86_64__) - return set_ntstatus( RtlWow64GetThreadContext( handle, context )); -#else - return set_ntstatus( STATUS_NOT_IMPLEMENTED ); -#endif -} - - /*********************************************************************** * Wow64GetThreadSelectorEntry [KERNEL32.@] */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ffb153a46ee..d3bd59a78e3 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1759,8 +1759,11 @@ @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall Wow64DisableWow64FsRedirection(ptr) @ stdcall Wow64EnableWow64FsRedirection(long) kernelbase_Wow64EnableWow64FsRedirection +@ stdcall Wow64GetThreadContext(long ptr) @ stdcall Wow64RevertWow64FsRedirection(ptr) +@ stdcall Wow64SetThreadContext(long ptr) # @ stub Wow64SetThreadDefaultGuestMachine +# @ stub Wow64SuspendThread # @ stub -arch=i386 Wow64Transition @ stdcall WriteConsoleA(long ptr long ptr ptr) @ stdcall WriteConsoleInputA(long ptr long ptr) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 8867029a854..12e1777262a 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -762,6 +762,36 @@ BOOL WINAPI DECLSPEC_HOTPATCH TlsSetValue( DWORD index, LPVOID value ) } +/*********************************************************************** + * Wow64GetThreadContext (kernelbase.@) + */ +BOOL WINAPI Wow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context) +{ +#ifdef __i386__ + return set_ntstatus( NtGetContextThread( handle, (CONTEXT *)context )); +#elif defined(__x86_64__) + return set_ntstatus( RtlWow64GetThreadContext( handle, context )); +#else + return set_ntstatus( STATUS_NOT_IMPLEMENTED ); +#endif +} + + +/*********************************************************************** + * Wow64SetThreadContext (kernelbase.@) + */ +BOOL WINAPI Wow64SetThreadContext( HANDLE handle, const WOW64_CONTEXT *context) +{ +#ifdef __i386__ + return set_ntstatus( NtSetContextThread( handle, (const CONTEXT *)context )); +#elif defined(__x86_64__) + return set_ntstatus( RtlWow64SetThreadContext( handle, context )); +#else + return set_ntstatus( STATUS_NOT_IMPLEMENTED ); +#endif +} + + /*********************************************************************** * Fibers ***********************************************************************/

1 0

Eric Pouech : server: Implement support for DUPLICATE_SAME_ATTRIBUTES in DuplicateHandle().
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: 1c7e1f1fc6b62c247ae6e3da226d3c976f323800 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c7e1f1fc6b62c247ae6e3da226d3c… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Nov 18 11:59:29 2023 +0100 server: Implement support for DUPLICATE_SAME_ATTRIBUTES in DuplicateHandle(). This flag is documented on MSDN in ZwDuplicateObject() but not in DuplicateHandle(). Yet functional on both. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 3 --- server/handle.c | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a7fef049c8e..ed291d071cc 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2560,7 +2560,6 @@ static void test_DuplicateHandle(void) 0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); ok(r, "DuplicateHandle error %lu\n", GetLastError()); r = GetHandleInformation(out, &info); - todo_wine ok(r && info == 0, "Unexpected info %lx\n", info); CloseHandle(out); @@ -2576,7 +2575,6 @@ static void test_DuplicateHandle(void) ok(r, "DuplicateHandle error %lu\n", GetLastError()); info = 0xdeabeef; r = GetHandleInformation(out, &info); - todo_wine ok(r && info == (HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE), "Unexpected info %lx\n", info); r = SetHandleInformation(out, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); ok(r, "SetHandleInformation error %lu\n", GetLastError()); @@ -2590,7 +2588,6 @@ static void test_DuplicateHandle(void) ok(r, "DuplicateHandle error %lu\n", GetLastError()); info = 0xdeabeef; r = GetHandleInformation(out, &info); - todo_wine ok(r && info == 0, "Unexpected info %lx\n", info); CloseHandle(out); } diff --git a/server/handle.c b/server/handle.c index 0595fdb403b..71cdd2e328c 100644 --- a/server/handle.c +++ b/server/handle.c @@ -566,7 +566,7 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str { obj_handle_t res; struct handle_entry *entry; - unsigned int src_access; + unsigned int src_access, src_flags; struct object *obj = get_handle_obj( src, src_handle, 0, NULL ); if (!obj) return 0; @@ -574,6 +574,7 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str src_access = entry->access; else /* pseudo-handle, give it full access */ src_access = obj->ops->map_access( obj, GENERIC_ALL ); + src_flags = (src_access & RESERVED_ALL) >> RESERVED_SHIFT; src_access &= ~RESERVED_ALL; if (options & DUPLICATE_SAME_ACCESS) @@ -611,6 +612,9 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str res = alloc_handle_entry( dst, obj, access, attr ); } + if (res && (options & DUPLICATE_SAME_ATTRIBUTES)) + set_handle_flags( dst, res, ~0u, src_flags ); + release_object( obj ); return res; }

1 0

Eric Pouech : kernel32/tests: Test DUPLICATE_SAME_ATTRIBUTES flag in DuplicateHandle().
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: d68a0e650a71c1b332b7619c2d4f2acaf978727c URL: https://gitlab.winehq.org/wine/wine/-/commit/d68a0e650a71c1b332b7619c2d4f2a… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Nov 18 11:54:51 2023 +0100 kernel32/tests: Test DUPLICATE_SAME_ATTRIBUTES flag in DuplicateHandle(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 44 +++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 1 + 2 files changed, 45 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 5eaf6586a72..a7fef049c8e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2549,6 +2549,50 @@ static void test_DuplicateHandle(void) ok(r, "DuplicateHandle error %lu\n", GetLastError()); ok(f == out || broken(/* Win7 */ (((ULONG_PTR)f & 3) == 3) && (f != out)), "f != out\n"); CloseHandle(out); + + /* Test DUPLICATE_SAME_ATTRIBUTES */ + f = CreateFileA("NUL", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(f != INVALID_HANDLE_VALUE, "Failed to open NUL %lu\n", GetLastError()); + r = GetHandleInformation(f, &info); + ok(r && info == 0, "Unexpected info %lx\n", info); + + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); + ok(r, "DuplicateHandle error %lu\n", GetLastError()); + r = GetHandleInformation(out, &info); + todo_wine + ok(r && info == 0, "Unexpected info %lx\n", info); + CloseHandle(out); + + r = SetHandleInformation(f, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE, + HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE); + ok(r, "SetHandleInformation error %lu\n", GetLastError()); + info = 0xdeabeef; + r = GetHandleInformation(f, &info); + ok(r && info == (HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE), "Unexpected info %lx\n", info); + ok(r, "SetHandleInformation error %lu\n", GetLastError()); + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); + ok(r, "DuplicateHandle error %lu\n", GetLastError()); + info = 0xdeabeef; + r = GetHandleInformation(out, &info); + todo_wine + ok(r && info == (HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE), "Unexpected info %lx\n", info); + r = SetHandleInformation(out, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); + ok(r, "SetHandleInformation error %lu\n", GetLastError()); + CloseHandle(out); + r = SetHandleInformation(f, HANDLE_FLAG_INHERIT | HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); + ok(r, "SetHandleInformation error %lu\n", GetLastError()); + CloseHandle(f); + + r = DuplicateHandle(GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &out, + 0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); + ok(r, "DuplicateHandle error %lu\n", GetLastError()); + info = 0xdeabeef; + r = GetHandleInformation(out, &info); + todo_wine + ok(r && info == 0, "Unexpected info %lx\n", info); + CloseHandle(out); } #define test_completion(a, b, c, d, e) _test_completion(__LINE__, a, b, c, d, e) diff --git a/include/winnt.h b/include/winnt.h index 8c91ebc79b5..0e0d1cb5170 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5367,6 +5367,7 @@ typedef struct _QUOTA_LIMITS_EX { #define DUPLICATE_CLOSE_SOURCE 0x00000001 #define DUPLICATE_SAME_ACCESS 0x00000002 +#define DUPLICATE_SAME_ATTRIBUTES 0x00000004 #ifdef __WINESRC__ #define DUPLICATE_MAKE_GLOBAL 0x80000000 /* Not a Windows flag */ #endif

1 0

Eric Pouech : kernel32/tests: Added tests about std handle flags inheritance.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: da9210e0384ae67d61993524ee0469cc53ab34d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/da9210e0384ae67d61993524ee0469… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Nov 29 17:28:17 2023 +0100 kernel32/tests: Added tests about std handle flags inheritance. Adding support for protect-from-close handle flag to CreateProcess test infrastructure. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0e5bf82530b..5eaf6586a72 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -323,8 +323,9 @@ static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fm #define HATTR_NULL 0x08 /* NULL handle value */ #define HATTR_INVALID 0x04 /* INVALID_HANDLE_VALUE */ #define HATTR_TYPE 0x0c /* valid handle, with type set */ -#define HATTR_INHERIT 0x10 /* inheritance flag set */ -#define HATTR_UNTOUCHED 0x20 /* Identify fields untouched by GetStartupInfoW */ +#define HATTR_UNTOUCHED 0x10 /* Identify fields untouched by GetStartupInfoW */ +#define HATTR_INHERIT 0x20 /* inheritance flag set */ +#define HATTR_PROTECT 0x40 /* protect from close flag set */ #define HANDLE_UNTOUCHEDW (HANDLE)(DWORD_PTR)(0x5050505050505050ull) @@ -346,8 +347,13 @@ static unsigned encode_handle_attributes(HANDLE h) if (dw == FILE_TYPE_CHAR || dw == FILE_TYPE_DISK || dw == FILE_TYPE_PIPE) { DWORD info; - if (GetHandleInformation(h, &info) && (info & HANDLE_FLAG_INHERIT)) - result |= HATTR_INHERIT; + if (GetHandleInformation(h, &info)) + { + if (info & HANDLE_FLAG_INHERIT) + result |= HATTR_INHERIT; + if (info & HANDLE_FLAG_PROTECT_FROM_CLOSE) + result |= HATTR_PROTECT; + } } else dw = FILE_TYPE_UNKNOWN; @@ -3146,6 +3152,7 @@ static void copy_change_subsystem(const char* in, const char* out, DWORD subsyst #define ARG_STARTUPINFO 0x00000000 #define ARG_CP_INHERIT 0x40000000 #define ARG_HANDLE_INHERIT 0x20000000 +#define ARG_HANDLE_PROTECT 0x10000000 #define ARG_HANDLE_MASK (~0xff000000) static BOOL check_run_child(const char *exec, DWORD flags, BOOL cp_inherit, @@ -3217,6 +3224,13 @@ static BOOL build_startupinfo( STARTUPINFOA *startup, unsigned args, HANDLE hstd ok(0, "Unsupported handle type %x\n", args & ARG_HANDLE_MASK); return FALSE; } + if ((args & ARG_HANDLE_PROTECT) && needs_close) + { + ret = SetHandleInformation(hstd[0], HANDLE_FLAG_PROTECT_FROM_CLOSE, HANDLE_FLAG_PROTECT_FROM_CLOSE); + ok(ret, "Couldn't set inherit flag to hstd[0]\n"); + ret = SetHandleInformation(hstd[1], HANDLE_FLAG_PROTECT_FROM_CLOSE, HANDLE_FLAG_PROTECT_FROM_CLOSE); + ok(ret, "Couldn't set inherit flag to hstd[1]\n"); + } if (args & ARG_STD) { @@ -3261,6 +3275,14 @@ static void test_StdHandleInheritance(void) /* all others handles type behave as H_DISK */ {ARG_STARTUPINFO | ARG_HANDLE_INHERIT | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, {ARG_STD | ARG_HANDLE_INHERIT | H_DISK, HATTR_TYPE | HATTR_INHERIT | FILE_TYPE_DISK}, + + /* all others handles type behave as H_DISK */ + {ARG_STARTUPINFO | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, +/* 5*/ {ARG_STD | H_DISK, HATTR_TYPE | FILE_TYPE_DISK, .is_todo = 1}, + + /* all others handles type behave as H_DISK */ + {ARG_STARTUPINFO | ARG_HANDLE_PROTECT | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, + {ARG_STD | ARG_HANDLE_PROTECT | H_DISK, HATTR_TYPE | HATTR_PROTECT | FILE_TYPE_DISK, .is_todo = 1}, }, nothing_gui[] = { @@ -3372,7 +3394,9 @@ static void test_StdHandleInheritance(void) DeleteFileA(resfile); if (needs_close) { + SetHandleInformation(hstd[0], HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); CloseHandle(hstd[0]); + SetHandleInformation(hstd[1], HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); CloseHandle(hstd[1]); } winetest_pop_context();

1 0

Eric Pouech : server: Preserve handle flags when inheriting a std handle.
by Alexandre Julliard Feb. 6, 2024

Feb. 6, 2024

Module: wine Branch: master Commit: 626b2f1898f3780ae87fde65b370324f6a939965 URL: https://gitlab.winehq.org/wine/wine/-/commit/626b2f1898f3780ae87fde65b37032… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Nov 15 18:56:14 2023 +0100 server: Preserve handle flags when inheriting a std handle. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 4 ++-- server/process.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ed291d071cc..1ecf8a35f21 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3319,11 +3319,11 @@ static void test_StdHandleInheritance(void) /* all others handles type behave as H_DISK */ {ARG_STARTUPINFO | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, -/* 5*/ {ARG_STD | H_DISK, HATTR_TYPE | FILE_TYPE_DISK, .is_todo = 1}, +/* 5*/ {ARG_STD | H_DISK, HATTR_TYPE | FILE_TYPE_DISK}, /* all others handles type behave as H_DISK */ {ARG_STARTUPINFO | ARG_HANDLE_PROTECT | H_DISK, HATTR_NULL, .is_broken = HATTR_TYPE | FILE_TYPE_UNKNOWN}, - {ARG_STD | ARG_HANDLE_PROTECT | H_DISK, HATTR_TYPE | HATTR_PROTECT | FILE_TYPE_DISK, .is_todo = 1}, + {ARG_STD | ARG_HANDLE_PROTECT | H_DISK, HATTR_TYPE | HATTR_PROTECT | FILE_TYPE_DISK}, }, nothing_gui[] = { diff --git a/server/process.c b/server/process.c index a0d5ea64d97..e166aeae64e 100644 --- a/server/process.c +++ b/server/process.c @@ -1336,11 +1336,11 @@ DECL_HANDLER(new_process) if (!(req->flags & PROCESS_CREATE_FLAGS_INHERIT_HANDLES) && info->data->console != 1) { info->data->hstdin = duplicate_handle( parent, info->data->hstdin, process, - 0, OBJ_INHERIT, DUPLICATE_SAME_ACCESS ); + 0, 0, DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES ); info->data->hstdout = duplicate_handle( parent, info->data->hstdout, process, - 0, OBJ_INHERIT, DUPLICATE_SAME_ACCESS ); + 0, 0, DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES ); info->data->hstderr = duplicate_handle( parent, info->data->hstderr, process, - 0, OBJ_INHERIT, DUPLICATE_SAME_ACCESS ); + 0, 0, DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES ); /* some handles above may have been invalid; this is not an error */ if (get_error() == STATUS_INVALID_HANDLE || get_error() == STATUS_OBJECT_TYPE_MISMATCH) clear_error();

1 0

Esme Povirk : gdiplus/tests: Thoroughly test region combines.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 23f98e9663a1737c94f6bd6c7612baa8b4a47bc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/23f98e9663a1737c94f6bd6c7612ba… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Feb 5 20:24:09 2024 +0000 gdiplus/tests: Thoroughly test region combines. --- dlls/gdiplus/tests/region.c | 199 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 7920afd8ef4..1bcef8a35dd 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -2333,6 +2333,204 @@ static void test_GdipCreateRegionRgnData(void) ReleaseDC(0, hdc); } +static void test_incombinedregion(void) +{ + struct testrgn + { + const char* desc; + BOOL origin_in_region; + GpRegion *region; + }; + + struct testrgn test_regions[] = { + { "infinite region", TRUE }, + { "infinite region inverted", FALSE }, + { "empty region", FALSE }, + { "empty region inverted", TRUE }, + { "inside rectangle", TRUE }, + { "inside rectangle inverted", FALSE }, + { "outside rectangle", FALSE }, + { "outside rectangle inverted", TRUE }, + { "inside path", TRUE }, + { "inside path inverted", FALSE }, + { "outside path but in bounding rect", FALSE }, + { "outside path but in bounding rect inverted", TRUE }, + { "outside path", FALSE }, + { "outside path inverted", TRUE }, + }; + + GpStatus stat; + GpRectF rect; + const GpPointF inside_path_points[] = { { -1, -2 }, { 2, 1 }, { -1, 1 } }; + const GpPointF outside_path_bounding_points[] = { { -2, -1 }, { 1, 2 }, { -2, 2 } }; + const GpPointF outside_path_points[] = { { 5, 5 }, { 5, 10 }, { 10, 10 } }; + GpPath *path; + int i, j; + BOOL in_region; + + /* Prepare test regions: */ + + /* infinite */ + stat = GdipCreateRegion(&test_regions[0].region); + expect(Ok, stat); + + /* empty */ + stat = GdipCreateRegion(&test_regions[2].region); + expect(Ok, stat); + stat = GdipSetEmpty(test_regions[2].region); + expect(Ok, stat); + + /* inside rectangle */ + rect.X = -5; + rect.Y = -2; + rect.Width = 10; + rect.Height = 4; + stat = GdipCreateRegionRect(&rect, &test_regions[4].region); + expect(Ok, stat); + + /* outside rectangle */ + rect.X = -10; + rect.Y = -10; + rect.Width = 7; + rect.Height = 7; + stat = GdipCreateRegionRect(&rect, &test_regions[6].region); + expect(Ok, stat); + + /* inside path */ + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathPolygon(path, inside_path_points, ARRAY_SIZE(inside_path_points)); + expect(Ok, stat); + stat = GdipCreateRegion(&test_regions[8].region); + expect(Ok, stat); + stat = GdipCombineRegionPath(test_regions[8].region, path, CombineModeReplace); + expect(Ok, stat); + stat = GdipDeletePath(path); + expect(Ok, stat); + + /* outside path but in bounding rect */ + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathPolygon(path, outside_path_bounding_points, ARRAY_SIZE(outside_path_bounding_points)); + expect(Ok, stat); + stat = GdipCreateRegion(&test_regions[10].region); + expect(Ok, stat); + stat = GdipCombineRegionPath(test_regions[10].region, path, CombineModeReplace); + expect(Ok, stat); + stat = GdipDeletePath(path); + expect(Ok, stat); + + /* outside path */ + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathPolygon(path, outside_path_points, ARRAY_SIZE(outside_path_points)); + expect(Ok, stat); + stat = GdipCreateRegion(&test_regions[12].region); + expect(Ok, stat); + stat = GdipCombineRegionPath(test_regions[12].region, path, CombineModeReplace); + expect(Ok, stat); + stat = GdipDeletePath(path); + expect(Ok, stat); + + for (i = 1; i < ARRAY_SIZE(test_regions); i += 2) + { + winetest_push_context("%s", test_regions[i].desc); + stat = GdipCreateRegion(&test_regions[i].region); + expect(Ok, stat); + stat = GdipCombineRegionRegion(test_regions[i].region, test_regions[i-1].region, CombineModeExclude); + expect(Ok, stat); + winetest_pop_context(); + } + + /* Check regions individually */ + for (i = 0; i < ARRAY_SIZE(test_regions); i++) + { + winetest_push_context("%s", test_regions[i].desc); + stat = GdipIsVisibleRegionPoint(test_regions[i].region, 0, 0, NULL, &in_region); + expect(Ok, stat); + expect(test_regions[i].origin_in_region, in_region); + winetest_pop_context(); + } + + /* Check combined regions */ + for (i = 0; i < ARRAY_SIZE(test_regions); i++) + { + for (j = 0; j < ARRAY_SIZE(test_regions); j++) + { + GpRegion *region; + BOOL expected_result; + + winetest_push_context("%s + %s", test_regions[i].desc, test_regions[j].desc); + + stat = GdipCreateRegion(&region); + expect(Ok, stat); + + /* CombineModeIntersect */ + stat = GdipCombineRegionRegion(region, test_regions[i].region, CombineModeReplace); + expect(Ok, stat); + stat = GdipCombineRegionRegion(region, test_regions[j].region, CombineModeIntersect); + expect(Ok, stat); + + expected_result = test_regions[i].origin_in_region & test_regions[j].origin_in_region; + stat = GdipIsVisibleRegionPoint(region, 0, 0, NULL, &in_region); + expect(Ok, stat); + ok(expected_result == in_region, "CombineModeIntersect: expected %i, got %i\n", expected_result, in_region); + + /* CombineModeUnion */ + stat = GdipCombineRegionRegion(region, test_regions[i].region, CombineModeReplace); + expect(Ok, stat); + stat = GdipCombineRegionRegion(region, test_regions[j].region, CombineModeUnion); + expect(Ok, stat); + + expected_result = test_regions[i].origin_in_region | test_regions[j].origin_in_region; + stat = GdipIsVisibleRegionPoint(region, 0, 0, NULL, &in_region); + expect(Ok, stat); + ok(expected_result == in_region, "CombineModeUnion: expected %i, got %i\n", expected_result, in_region); + + /* CombineModeXor */ + stat = GdipCombineRegionRegion(region, test_regions[i].region, CombineModeReplace); + expect(Ok, stat); + stat = GdipCombineRegionRegion(region, test_regions[j].region, CombineModeXor); + expect(Ok, stat); + + expected_result = test_regions[i].origin_in_region ^ test_regions[j].origin_in_region; + stat = GdipIsVisibleRegionPoint(region, 0, 0, NULL, &in_region); + expect(Ok, stat); + ok(expected_result == in_region, "CombineModeXor: expected %i, got %i\n", expected_result, in_region); + + /* CombineModeExclude */ + stat = GdipCombineRegionRegion(region, test_regions[i].region, CombineModeReplace); + expect(Ok, stat); + stat = GdipCombineRegionRegion(region, test_regions[j].region, CombineModeExclude); + expect(Ok, stat); + + expected_result = test_regions[i].origin_in_region & !test_regions[j].origin_in_region; + stat = GdipIsVisibleRegionPoint(region, 0, 0, NULL, &in_region); + expect(Ok, stat); + ok(expected_result == in_region, "CombineModeExclude: expected %i, got %i\n", expected_result, in_region); + + /* CombineModeComplement */ + stat = GdipCombineRegionRegion(region, test_regions[i].region, CombineModeReplace); + expect(Ok, stat); + stat = GdipCombineRegionRegion(region, test_regions[j].region, CombineModeComplement); + expect(Ok, stat); + + expected_result = (!test_regions[i].origin_in_region) & test_regions[j].origin_in_region; + stat = GdipIsVisibleRegionPoint(region, 0, 0, NULL, &in_region); + expect(Ok, stat); + ok(expected_result == in_region, "CombineModeComplement: expected %i, got %i\n", expected_result, in_region); + + winetest_pop_context(); + } + } + + for (i = 0; i < ARRAY_SIZE(test_regions); i++) + { + stat = GdipDeleteRegion(test_regions[i].region); + expect(Ok, stat); + } +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2367,6 +2565,7 @@ START_TEST(region) test_isvisiblerect(); test_excludeinfinite(); test_GdipCreateRegionRgnData(); + test_incombinedregion(); GdiplusShutdown(gdiplusToken); }

1 0

Gabriel Ivăncescu : mshtml/tests: Test builtin function default value getter with custom IOleCommandTarget.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 681d34d7844d5839e735016e8c7ddc362a13e3c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/681d34d7844d5839e735016e8c7ddc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 5 16:15:23 2024 +0200 mshtml/tests: Test builtin function default value getter with custom IOleCommandTarget. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/script.c | 146 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 5c969e4a3d9..e6acf5ae5b1 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -147,8 +147,11 @@ DEFINE_EXPECT(external_success); DEFINE_EXPECT(QS_VariantConversion); DEFINE_EXPECT(QS_IActiveScriptSite); DEFINE_EXPECT(QS_GetCaller); +DEFINE_EXPECT(QS_IActiveScriptSite2); +DEFINE_EXPECT(QS_GetCaller2); DEFINE_EXPECT(ChangeType_bstr); DEFINE_EXPECT(ChangeType_dispatch); +DEFINE_EXPECT(cmdtarget_Exec); DEFINE_EXPECT(GetTypeInfo); #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" @@ -489,6 +492,8 @@ static IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { static IPropertyNotifySink PropertyNotifySink = { &PropertyNotifySinkVtbl }; +static IOleCommandTarget cmdtarget; + static HRESULT WINAPI VariantChangeType_QueryInterface(IVariantChangeType *iface, REFIID riid, void **ppv) { ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); @@ -595,6 +600,52 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { static IServiceProvider caller_sp = { &ServiceProviderVtbl }; +static HRESULT WINAPI ServiceProvider2_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ServiceProvider2_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI ServiceProvider2_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI ServiceProvider2_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(guidService, &IID_IActiveScriptSite)) { + CHECK_EXPECT(QS_IActiveScriptSite2); + ok(IsEqualGUID(riid, &IID_IOleCommandTarget), "unexpected riid %s\n", wine_dbgstr_guid(riid)); + *ppv = &cmdtarget; + return S_OK; + } + + if(IsEqualGUID(guidService, &SID_GetCaller)) { + CHECK_EXPECT(QS_GetCaller2); + ok(IsEqualGUID(riid, &IID_IServiceProvider), "unexpected riid %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return S_OK; + } + + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProvider2Vtbl = { + ServiceProvider2_QueryInterface, + ServiceProvider2_AddRef, + ServiceProvider2_Release, + ServiceProvider2_QueryService +}; + +static IServiceProvider caller_sp2 = { &ServiceProvider2Vtbl }; + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -1465,6 +1516,88 @@ static IDispatchExVtbl externalDispVtbl = { static IDispatchEx externalDisp = { &externalDispVtbl }; +static HRESULT WINAPI DispatchExStub_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static IDispatchExVtbl DispatchExStubVtbl = { + DispatchExStub_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx DispatchExStub = { &DispatchExStubVtbl }; + +static HRESULT WINAPI cmdtarget_QueryInterface(IOleCommandTarget *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleCommandTarget)) + *ppv = &cmdtarget; + else { + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + return S_OK; +} + +static ULONG WINAPI cmdtarget_AddRef(IOleCommandTarget *iface) +{ + return 2; +} + +static ULONG WINAPI cmdtarget_Release(IOleCommandTarget *iface) +{ + return 1; +} + +static HRESULT WINAPI cmdtarget_QueryStatus(IOleCommandTarget *iface, const GUID *pguidCmdGroup, + ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) +{ + ok(0, "unexpected call\n"); + return OLECMDERR_E_UNKNOWNGROUP; +} + +static HRESULT WINAPI cmdtarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, + DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + CHECK_EXPECT2(cmdtarget_Exec); + ok(pguidCmdGroup && IsEqualGUID(pguidCmdGroup, &CGID_ScriptSite), "pguidCmdGroup = %s\n", wine_dbgstr_guid(pguidCmdGroup)); + ok(nCmdID == CMDID_SCRIPTSITE_SECURITY_WINDOW, "nCmdID = %lu\n", nCmdID); + ok(!nCmdexecopt, "nCmdexecopt = %lu\n", nCmdexecopt); + ok(!pvaIn, "pvaIn != NULL\n"); + ok(pvaOut != NULL, "pvaOut = NULL\n"); + + /* Looks like native just uses this for some sort of hardcoded security check + * without actually using the IDispatchEx interface or QI? (for ACCESSDENIED) */ + V_VT(pvaOut) = VT_DISPATCH; + V_DISPATCH(pvaOut) = (IDispatch*)&DispatchExStub; + return S_OK; +} + +static const IOleCommandTargetVtbl cmdtarget_vtbl = { + cmdtarget_QueryInterface, + cmdtarget_AddRef, + cmdtarget_Release, + cmdtarget_QueryStatus, + cmdtarget_Exec +}; + +static IOleCommandTarget cmdtarget = { &cmdtarget_vtbl }; + static HRESULT QueryInterface(REFIID,void**); static HRESULT WINAPI DocHostUIHandler_QueryInterface(IDocHostUIHandler2 *iface, REFIID riid, void **ppv) @@ -2740,6 +2873,19 @@ static void test_func(IDispatchEx *obj) todo_wine CHECK_CALLED(QS_IActiveScriptSite); todo_wine CHECK_CALLED(QS_GetCaller); + SET_EXPECT(QS_IActiveScriptSite2); + SET_EXPECT(QS_GetCaller2); + SET_EXPECT(cmdtarget_Exec); + hres = dispex_propget(dispex, DISPID_VALUE, &var, &caller_sp2); + ok(hres == S_OK, "InvokeEx returned: %08lx, expected S_OK\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"\nfunction toString() {\n [native code]\n}\n"), + "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + todo_wine CHECK_CALLED(QS_IActiveScriptSite2); + todo_wine CHECK_CALLED(QS_GetCaller2); + todo_wine CHECK_CALLED(cmdtarget_Exec); + IDispatchEx_Release(dispex); }

1 0

Gabriel Ivăncescu : mshtml: Expose the IHTMLEventObj5 props to scripts.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 330d8cd99833868291c343fb5c4f252b3295459c URL: https://gitlab.winehq.org/wine/wine/-/commit/330d8cd99833868291c343fb5c4f25… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 5 16:15:23 2024 +0200 mshtml: Expose the IHTMLEventObj5 props to scripts. It's mostly implemented, and issession isn't even exposed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/events.html | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b86b7513477..1ae3a0de384 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2065,6 +2065,7 @@ static const dispex_static_data_vtbl_t HTMLEventObj_dispex_vtbl = { }; static const tid_t HTMLEventObj_iface_tids[] = { + IHTMLEventObj5_tid, IHTMLEventObj_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index db37375c089..9609fb5edcb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -208,6 +208,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLElementCollection) \ XIID(IHTMLEmbedElement) \ XIID(IHTMLEventObj) \ + XIID(IHTMLEventObj5) \ XIID(IHTMLFiltersCollection) \ XIID(IHTMLFormElement) \ XIID(IHTMLFrameBase) \ diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 6f9b3dacbbc..76473277e3c 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -284,7 +284,12 @@ function test_attach_in_attach() { } function test_event_obj_props(e) { - var i, props; + var i, props = [ + "altKey", "button", "cancelBubble", "clientX", "clientY", "ctrlKey", "data", "fromElement", "keyCode", "offsetX", "offsetY", + "origin", "qualifier", "reason", "returnValue", "screenX", "screenY", "shiftKey", "source", "srcElement", "srcFilter", + "toElement", "type", "url", "x", "y" ]; + for(i = 0; i < props.length; i++) + ok(props[i] in e, props[i] + " not in event obj"); props = [ "imeCompositionChange", "imeNotifyCommand", "imeNotifyData", "imeRequest", "imeRequestData", "issession", "keyboardLayout" ]; for(i = 0; i < props.length; i++)

1 0

Jacek Caban : include: Add RtlRestoreContext declaration.
by Alexandre Julliard Feb. 5, 2024

Feb. 5, 2024

Module: wine Branch: master Commit: 3c19b29ce60821f379b7b8cbdc0c8cc65a50ae24 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c19b29ce60821f379b7b8cbdc0c8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 14:20:22 2024 +0100 include: Add RtlRestoreContext declaration. --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index e1de2f29ecd..8c91ebc79b5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2060,6 +2060,7 @@ typedef void (CALLBACK *PTERMINATION_HANDLER)(BOOLEAN,DWORD64); #endif /* __aarch64__ */ NTSYSAPI void NTAPI RtlRaiseException(struct _EXCEPTION_RECORD*); +NTSYSAPI void CDECL RtlRestoreContext(CONTEXT*,struct _EXCEPTION_RECORD*); NTSYSAPI void NTAPI RtlUnwind(void*,void*,struct _EXCEPTION_RECORD*,void*); #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)

1 0