February 2024 - Wine-commits

Louis Lenders : wbemprox: Add property 'ClassGuid' to Win32_PnPEntity.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: 988253a69bd0a48d027ba4e65ee735d9936d9144 URL: https://gitlab.winehq.org/wine/wine/-/commit/988253a69bd0a48d027ba4e65ee735… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Feb 6 09:05:13 2024 +0100 wbemprox: Add property 'ClassGuid' to Win32_PnPEntity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56291 --- dlls/wbemprox/builtin.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 38e6893792b..11bb2623f0d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -301,6 +301,7 @@ static const struct column col_physicalmemory[] = static const struct column col_pnpentity[] = { { L"Caption", CIM_STRING }, + { L"ClassGuid", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING }, @@ -755,6 +756,7 @@ struct record_physicalmemory struct record_pnpentity { const WCHAR *caption; + const WCHAR *class_guid; const WCHAR *device_id; const WCHAR *manufacturer; const WCHAR *name; @@ -3176,11 +3178,13 @@ static enum fill_status fill_pnpentity( struct table *table, const struct expr * idx = 0; while (SetupDiEnumDeviceInfo( device_info_set, idx++, &devinfo )) { - WCHAR device_id[MAX_PATH]; + WCHAR device_id[MAX_PATH], guid[GUID_SIZE]; if (SetupDiGetDeviceInstanceIdW( device_info_set, &devinfo, device_id, ARRAY_SIZE(device_id), NULL )) { + StringFromGUID2( &devinfo.ClassGuid, guid, ARRAY_SIZE(guid) ); rec->caption = L"Wine PnP Device"; + rec->class_guid = wcsdup( wcslwr(guid) ); rec->device_id = wcsdup( device_id ); rec->manufacturer = L"The Wine Project"; rec->name = L"Wine PnP Device";

1 0

Paul Gofman : explorer: Don't pop start menu on "minimize all windows" systray command.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: d66fe6206d950eeeabfcf408ae4d199a558150f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/d66fe6206d950eeeabfcf408ae4d19… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 8 21:05:35 2024 -0600 explorer: Don't pop start menu on "minimize all windows" systray command. --- dlls/user32/tests/win.c | 29 ++++++++++++++++++++++++++++- programs/explorer/systray.c | 12 +++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8dad718e357..26b1f0098dd 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1796,7 +1796,7 @@ static void test_shell_window(void) WaitForSingleObject(hthread, INFINITE); - DeleteObject(hthread); + CloseHandle(hthread); CloseDesktop(hdesk); } @@ -13033,6 +13033,32 @@ static void test_WM_NCCALCSIZE(void) DestroyWindow(hwnd); } +#define TRAY_MINIMIZE_ALL 419 + +static void test_shell_tray(void) +{ + HWND hwnd, traywnd; + + if (!(traywnd = FindWindowA( "Shell_TrayWnd", NULL ))) + { + skip( "Shell_TrayWnd not found, skipping tests.\n" ); + return; + } + + hwnd = CreateWindowW( L"static", L"parent", WS_OVERLAPPEDWINDOW|WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL ); + ok( !!hwnd, "failed, error %lu.\n", GetLastError() ); + flush_events( TRUE ); + + ok( !IsIconic( hwnd ), "window is minimized.\n" ); + + SendMessageA( traywnd, WM_COMMAND, TRAY_MINIMIZE_ALL, 0xdeadbeef ); + flush_events( TRUE ); + todo_wine ok( IsIconic( hwnd ), "window is not minimized.\n" ); + + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -13229,4 +13255,5 @@ START_TEST(win) test_topmost(); test_shell_window(); + test_shell_tray(); } diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 3b4e5bdc8ac..99a5a99490d 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); +#define TRAY_MINIMIZE_ALL 419 + struct notify_data /* platform-independent format for NOTIFYICONDATA */ { LONG hWnd; @@ -1060,7 +1062,15 @@ static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LP break; case WM_COMMAND: - if (HIWORD(wparam) == BN_CLICKED) click_taskbar_button( (HWND)lparam ); + if (HIWORD(wparam) == BN_CLICKED) + { + if (LOWORD(wparam) == TRAY_MINIMIZE_ALL) + { + FIXME( "Shell command %u is not supported.\n", LOWORD(wparam) ); + break; + } + click_taskbar_button( (HWND)lparam ); + } break; case WM_CONTEXTMENU:

1 0

Paul Gofman : explorer: Don't pop start menu on "undo minimize all windows" systray command.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: 5da459f1f2471365bc98078be1a3a1f84ef1a3dd URL: https://gitlab.winehq.org/wine/wine/-/commit/5da459f1f2471365bc98078be1a3a1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 6 10:04:09 2024 -0600 explorer: Don't pop start menu on "undo minimize all windows" systray command. --- dlls/user32/tests/win.c | 5 +++++ programs/explorer/systray.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 26b1f0098dd..1b03e64181a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -13034,6 +13034,7 @@ static void test_WM_NCCALCSIZE(void) } #define TRAY_MINIMIZE_ALL 419 +#define TRAY_MINIMIZE_ALL_UNDO 416 static void test_shell_tray(void) { @@ -13056,6 +13057,10 @@ static void test_shell_tray(void) flush_events( TRUE ); todo_wine ok( IsIconic( hwnd ), "window is not minimized.\n" ); + SendMessageA( traywnd, WM_COMMAND, TRAY_MINIMIZE_ALL_UNDO, 0xdeadbeef ); + flush_events( TRUE ); + ok( !IsIconic( hwnd ), "window is minimized.\n" ); + DestroyWindow(hwnd); } diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 99a5a99490d..43187db30b5 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); #define TRAY_MINIMIZE_ALL 419 +#define TRAY_MINIMIZE_ALL_UNDO 416 struct notify_data /* platform-independent format for NOTIFYICONDATA */ { @@ -1064,7 +1065,7 @@ static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LP case WM_COMMAND: if (HIWORD(wparam) == BN_CLICKED) { - if (LOWORD(wparam) == TRAY_MINIMIZE_ALL) + if (LOWORD(wparam) == TRAY_MINIMIZE_ALL || LOWORD(wparam) == TRAY_MINIMIZE_ALL_UNDO) { FIXME( "Shell command %u is not supported.\n", LOWORD(wparam) ); break;

1 0

Tim Clem : winebus.sys: Do not attempt to open keyboard and mouse HID devices on macOS.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: 3985b7c599cd0036eb4e2aef14e1cf7cbb7ffdb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3985b7c599cd0036eb4e2aef14e1cf… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Feb 6 09:40:07 2024 -0800 winebus.sys: Do not attempt to open keyboard and mouse HID devices on macOS. Doing so triggers a permissions prompt for input monitoring. Patch originally by Rémi Bernon. --- dlls/winebus.sys/bus_iohid.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 7c8c3cc3529..fdcd820e99e 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -276,6 +276,16 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * }; struct iohid_device *impl; CFStringRef str; + UINT usage_page, usage; + + usage_page = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsagePageKey))); + usage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsageKey))); + + if (usage_page == HID_USAGE_PAGE_GENERIC && (usage == HID_USAGE_GENERIC_MOUSE || usage == HID_USAGE_GENERIC_KEYBOARD)) + { + TRACE("Ignoring mouse / keyboard device\n"); + return; + } desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); desc.pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey)));

1 0

Paul Gofman : msvcrt: Adjust _gmtime64_s() accepted time limits.
by Alexandre Julliard 06 Feb '24

06 Feb '24

Module: wine Branch: master Commit: 16dafed08b2e4b483176c5ee286134544a4badf8 URL: https://gitlab.winehq.org/wine/wine/-/commit/16dafed08b2e4b483176c5ee286134… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Dec 8 19:10:07 2023 -0600 msvcrt: Adjust _gmtime64_s() accepted time limits. --- dlls/msvcr120/tests/msvcr120.c | 78 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/time.c | 77 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/time.c | 15 +++++++- dlls/ucrtbase/tests/misc.c | 75 ++++++++++++++++++++++++++++++++++++++++ include/msvcrt/time.h | 3 ++ 5 files changed, 247 insertions(+), 1 deletion(-)

1 0

Eric Pouech : kernel32/tests: Added tests about std handle flags inheritance.
by Alexandre Julliard 06 Feb '24

06 Feb '24

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 : kernel32/tests: Test DUPLICATE_SAME_ATTRIBUTES flag in DuplicateHandle().
by Alexandre Julliard 06 Feb '24

06 Feb '24

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 : server: Implement support for DUPLICATE_SAME_ATTRIBUTES in DuplicateHandle().
by Alexandre Julliard 06 Feb '24

06 Feb '24

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 : server: Preserve handle flags when inheriting a std handle.
by Alexandre Julliard 06 Feb '24

06 Feb '24

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

Gabriel Ivăncescu : mshtml: Implement `initMessageEvent` for MessageEvents.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: ae0e5ee901b8e7c7b19bda3ab3bdf3553166cc66 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae0e5ee901b8e7c7b19bda3ab3bdf3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 5 16:15:23 2024 +0200 mshtml: Implement `initMessageEvent` for MessageEvents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 48 +++++++++++++- dlls/mshtml/tests/documentmode.js | 29 +++++++++ dlls/mshtml/tests/events.c | 130 ++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/events.js | 1 + 4 files changed, 206 insertions(+), 2 deletions(-)

1 0