September 2023 - Wine-commits

Alexandre Julliard : win32u: Use the correct length for kernel object names in object attributes.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: d76f5b4ab9b3a298529bc6449dca7e47cd7c4c6e URL: https://gitlab.winehq.org/wine/wine/-/commit/d76f5b4ab9b3a298529bc6449dca7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 10:00:24 2023 +0200 win32u: Use the correct length for kernel object names in object attributes. --- dlls/win32u/sysparams.c | 3 ++- dlls/win32u/winstation.c | 3 ++- dlls/winex11.drv/x11drv_main.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index fed309ff3d8..5506abac7c6 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -450,7 +450,8 @@ static HANDLE get_display_device_init_mutex( void ) snprintf( buffer, ARRAY_SIZE(buffer), "\\Sessions\\%u\\BaseNamedObjects\\display_device_init", (int)NtCurrentTeb()->Peb->SessionId ); - name.Length = name.MaximumLength = asciiz_to_unicode( bufferW, buffer ); + name.MaximumLength = asciiz_to_unicode( bufferW, buffer ); + name.Length = name.MaximumLength - sizeof(WCHAR); InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL ); if (NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ) < 0) return 0; diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 5d1d5254ae1..b187b246941 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -554,7 +554,8 @@ static HANDLE get_winstations_dir_handle(void) sprintf( bufferA, "\\Sessions\\%u\\Windows\\WindowStations", (int)NtCurrentTeb()->Peb->SessionId ); str.Buffer = buffer; - str.Length = str.MaximumLength = asciiz_to_unicode( buffer, bufferA ) - sizeof(WCHAR); + str.MaximumLength = asciiz_to_unicode( buffer, bufferA ); + str.Length = str.MaximumLength - sizeof(WCHAR); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); status = NtOpenDirectoryObject( &dir, DIRECTORY_CREATE_OBJECT | DIRECTORY_TRAVERSE, &attr ); return status ? 0 : dir; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index c4d537d6ada..32a20e0e4f2 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -1008,7 +1008,8 @@ static HANDLE get_display_device_init_mutex(void) snprintf( buffer, ARRAY_SIZE(buffer), "\\Sessions\\%u\\BaseNamedObjects\\display_device_init", (int)NtCurrentTeb()->Peb->SessionId ); - name.Length = name.MaximumLength = asciiz_to_unicode( bufferW, buffer ); + name.MaximumLength = asciiz_to_unicode( bufferW, buffer ); + name.Length = name.MaximumLength - sizeof(WCHAR); InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL ); if (NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ) < 0) return 0;

1 0

Alexandre Julliard : wow64: Don't add MEM_RESERVE for invalid flags combinations.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: f41ac64a73d84c5b49ef733cd39aaf2be9d69ca5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f41ac64a73d84c5b49ef733cd39aaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 15:53:41 2023 +0200 wow64: Don't add MEM_RESERVE for invalid flags combinations. --- dlls/ntdll/tests/wow64.c | 14 ++++++++++++++ dlls/wow64/virtual.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 12ad7329816..07375f16082 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -407,6 +407,20 @@ static void test_cross_process_notifications( HANDLE process, void *ptr ) } ok( !entry, "not at end of list\n" ); + addr = NULL; + size = 0x321; + status = NtAllocateVirtualMemory( process, &addr, 0, &size, 0, PAGE_EXECUTE_READ ); + ok( status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemory failed %lx\n", status ); + entry = pop_from_work_list( &list->work_list ); + if (current_machine != IMAGE_FILE_MACHINE_ARM64) + { + entry = expect_cross_work_entry( list, entry, CrossProcessPreVirtualAlloc, addr, 0x321, + 0, PAGE_EXECUTE_READ, 0, 0xcccccccc ); + entry = expect_cross_work_entry( list, entry, CrossProcessPostVirtualAlloc, addr, 0x321, + 0, PAGE_EXECUTE_READ, status, 0xcccccccc ); + } + ok( !entry, "not at end of list\n" ); + addr = NULL; size = 0x4321; status = NtAllocateVirtualMemory( process, &addr, 0, &size, MEM_RESERVE, PAGE_EXECUTE_READWRITE ); diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index e497f60210e..412c79abb14 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -153,7 +153,7 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemory( UINT *args ) BOOL is_current = RtlIsCurrentProcess( process ); NTSTATUS status; - if (!addr) type |= MEM_RESERVE; + if (!addr && (type & MEM_COMMIT)) type |= MEM_RESERVE; if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualAlloc,

1 0

Alexandros Frantzis : winewayland.drv: Handle pointer motion events.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 0d250de0d966d82a2c02fd3901bf8f0f53a339ee URL: https://gitlab.winehq.org/wine/wine/-/commit/0d250de0d966d82a2c02fd3901bf8f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Aug 25 15:40:25 2023 +0300 winewayland.drv: Handle pointer motion events. Also emit a synthetic motion event on pointer entry, to handle cases where the compositor doesn't send an initial motion event itself. --- dlls/winewayland.drv/Makefile.in | 2 +- dlls/winewayland.drv/wayland_pointer.c | 46 ++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/Makefile.in b/dlls/winewayland.drv/Makefile.in index 6bc03187d61..e1019ad8348 100644 --- a/dlls/winewayland.drv/Makefile.in +++ b/dlls/winewayland.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = winewayland.drv UNIXLIB = winewayland.so UNIX_CFLAGS = $(WAYLAND_CLIENT_CFLAGS) -UNIX_LIBS = -lwin32u $(WAYLAND_CLIENT_LIBS) $(PTHREAD_LIBS) +UNIX_LIBS = -lwin32u $(WAYLAND_CLIENT_LIBS) $(PTHREAD_LIBS) -lm SOURCES = \ display.c \ diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index cb9091f0cf2..fdae963439a 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -24,14 +24,55 @@ #include "config.h" +#include <math.h> + #include "waylanddrv.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); +static HWND wayland_pointer_get_focused_hwnd(void) +{ + struct wayland_pointer *pointer = &process_wayland.pointer; + HWND hwnd; + + pthread_mutex_lock(&pointer->mutex); + hwnd = pointer->focused_hwnd; + pthread_mutex_unlock(&pointer->mutex); + + return hwnd; +} + static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer, uint32_t time, wl_fixed_t sx, wl_fixed_t sy) { + INPUT input = {0}; + RECT window_rect; + HWND hwnd; + int screen_x, screen_y; + + if (!(hwnd = wayland_pointer_get_focused_hwnd())) return; + if (!NtUserGetWindowRect(hwnd, &window_rect)) return; + + screen_x = round(wl_fixed_to_double(sx)) + window_rect.left; + screen_y = round(wl_fixed_to_double(sy)) + window_rect.top; + /* Sometimes, due to rounding, we may end up with pointer coordinates + * slightly outside the target window, so bring them within bounds. */ + if (screen_x >= window_rect.right) screen_x = window_rect.right - 1; + else if (screen_x < window_rect.left) screen_x = window_rect.left; + if (screen_y >= window_rect.bottom) screen_y = window_rect.bottom - 1; + else if (screen_y < window_rect.top) screen_y = window_rect.top; + + input.type = INPUT_MOUSE; + input.mi.dx = screen_x; + input.mi.dy = screen_y; + input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + + TRACE("hwnd=%p wayland_xy=%.2f,%.2f screen_xy=%d,%d\n", + hwnd, wl_fixed_to_double(sx), wl_fixed_to_double(sy), + screen_x, screen_y); + + __wine_send_input(hwnd, &input, NULL); } static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer, @@ -51,6 +92,11 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer, pthread_mutex_lock(&pointer->mutex); pointer->focused_hwnd = hwnd; pthread_mutex_unlock(&pointer->mutex); + + /* Handle the enter as a motion, to account for cases where the + * window first appears beneath the pointer and won't get a separate + * motion event. */ + pointer_handle_motion(data, wl_pointer, 0, sx, sy); } static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer,

1 0

Alexandros Frantzis : winewayland.drv: Handle pointer button and scroll events.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: b8b90e403d4813f5999c087d57e07a20ba99596b URL: https://gitlab.winehq.org/wine/wine/-/commit/b8b90e403d4813f5999c087d57e07a… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Aug 24 12:12:43 2023 +0300 winewayland.drv: Handle pointer button and scroll events. --- dlls/winewayland.drv/wayland_pointer.c | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index fdae963439a..222c35f6692 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -24,6 +24,8 @@ #include "config.h" +#include <linux/input.h> +#undef SW_MAX /* Also defined in winuser.rh */ #include <math.h> #include "waylanddrv.h" @@ -117,6 +119,26 @@ static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state) { + INPUT input = {0}; + HWND hwnd; + + if (!(hwnd = wayland_pointer_get_focused_hwnd())) return; + + input.type = INPUT_MOUSE; + + switch (button) + { + case BTN_LEFT: input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN; break; + case BTN_RIGHT: input.mi.dwFlags = MOUSEEVENTF_RIGHTDOWN; break; + case BTN_MIDDLE: input.mi.dwFlags = MOUSEEVENTF_MIDDLEDOWN; break; + default: break; + } + + if (state == WL_POINTER_BUTTON_STATE_RELEASED) input.mi.dwFlags <<= 1; + + TRACE("hwnd=%p button=%#x state=%u\n", hwnd, button, state); + + __wine_send_input(hwnd, &input, NULL); } static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer, @@ -141,6 +163,29 @@ static void pointer_handle_axis_stop(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_axis_discrete(void *data, struct wl_pointer *wl_pointer, uint32_t axis, int32_t discrete) { + INPUT input = {0}; + HWND hwnd; + + if (!(hwnd = wayland_pointer_get_focused_hwnd())) return; + + input.type = INPUT_MOUSE; + + switch (axis) + { + case WL_POINTER_AXIS_VERTICAL_SCROLL: + input.mi.dwFlags = MOUSEEVENTF_WHEEL; + input.mi.mouseData = -WHEEL_DELTA * discrete; + break; + case WL_POINTER_AXIS_HORIZONTAL_SCROLL: + input.mi.dwFlags = MOUSEEVENTF_HWHEEL; + input.mi.mouseData = WHEEL_DELTA * discrete; + break; + default: break; + } + + TRACE("hwnd=%p axis=%u discrete=%d\n", hwnd, axis, discrete); + + __wine_send_input(hwnd, &input, NULL); } static const struct wl_pointer_listener pointer_listener =

1 0

Alexandros Frantzis : winewayland.drv: Implement SetCursor using cursor bitmap data.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 1b987bfde68b75da3b718ba065826b01b5d6736e URL: https://gitlab.winehq.org/wine/wine/-/commit/1b987bfde68b75da3b718ba065826b… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Aug 25 15:12:18 2023 +0300 winewayland.drv: Implement SetCursor using cursor bitmap data. Set the cursor image used for Wayland surfaces by using the Windows cursor bitmap data. --- dlls/winewayland.drv/wayland_pointer.c | 286 +++++++++++++++++++++++++++++++++ dlls/winewayland.drv/wayland_surface.c | 3 + dlls/winewayland.drv/waylanddrv.h | 10 ++ dlls/winewayland.drv/waylanddrv_main.c | 1 + 4 files changed, 300 insertions(+)

1 0

Dmitry Timoshkov : user32: Listbox shouldn't send WM_COMMAND/LBN_DBLCLK notification if it has no items.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 0992d0978e3c3c617ce6768ed32b1ee5912084d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0992d0978e3c3c617ce6768ed32b1e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 16 19:31:26 2023 +0300 user32: Listbox shouldn't send WM_COMMAND/LBN_DBLCLK notification if it has no items. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/listbox.c | 2 +- dlls/user32/tests/msg.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index f6b5a3fb7db..0e925973e84 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -3113,7 +3113,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return LISTBOX_HandleLButtonDownCombo(descr, msg, wParam, (INT16)LOWORD(lParam), (INT16)HIWORD(lParam) ); - if (descr->style & LBS_NOTIFY) + if ((descr->style & LBS_NOTIFY) && descr->nb_items) SEND_NOTIFICATION( descr, LBN_DBLCLK ); return 0; case WM_MOUSEMOVE: diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5fc05ad80ff..6df3ebe284f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16543,6 +16543,12 @@ static const struct message wm_lb_addstring_sort_ownerdraw[] = { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 3 }, { 0 } }; +static const struct message wm_lb_dblclick_0[] = +{ + { WM_LBUTTONDBLCLK, sent|wparam|lparam, 0, MAKELPARAM(1,1) }, + { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, + { 0 } +}; #define check_lb_state(a1, a2, a3, a4, a5) check_lb_state_dbg(a1, a2, a3, a4, a5, __LINE__) @@ -16687,6 +16693,25 @@ static void test_listbox_messages(void) check_lb_state(listbox, 0, -1, 0, 0); flush_sequence(); + ret = SendMessageA(listbox, LB_DELETESTRING, 0, 0); + ok(ret == LB_ERR, "expected LB_ERR, got %Id\n", ret); + check_lb_state(listbox, 0, LB_ERR, 0, 0); + flush_sequence(); + + ret = SendMessageA(listbox, LB_RESETCONTENT, 0, 0); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + check_lb_state(listbox, 0, LB_ERR, 0, 0); + flush_sequence(); + + if (winetest_debug > 1) trace("clicking on item 0\n"); + ret = SendMessageA(listbox, WM_LBUTTONDBLCLK, 0, MAKELPARAM(1, 1)); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + ret = SendMessageA(listbox, WM_LBUTTONUP, 0, 0); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + ok_sequence(wm_lb_dblclick_0, "WM_LBUTTONDBLCLK 0", FALSE ); + check_lb_state(listbox, 0, LB_ERR, 0, 0); + flush_sequence(); + log_all_parent_messages--; DestroyWindow(listbox); @@ -16713,6 +16738,21 @@ static void test_listbox_messages(void) ok_sequence(wm_lb_addstring_sort_ownerdraw, "LB_ADDSTRING", FALSE); check_lb_state(listbox, 3, LB_ERR, 0, 0); + ret = SendMessageA(listbox, LB_RESETCONTENT, 0, 0); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + check_lb_state(listbox, 0, LB_ERR, 0, 0); + SetFocus(listbox); /* avoid focus messages */ + flush_sequence(); + + if (winetest_debug > 1) trace("clicking on item 0\n"); + ret = SendMessageA(listbox, WM_LBUTTONDBLCLK, 0, MAKELPARAM(1, 1)); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + ret = SendMessageA(listbox, WM_LBUTTONUP, 0, 0); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + ok_sequence(wm_lb_dblclick_0, "WM_LBUTTONDBLCLK 0", FALSE ); + check_lb_state(listbox, 0, LB_ERR, 0, 0); + flush_sequence(); + log_all_parent_messages--; DestroyWindow(listbox); @@ -16739,6 +16779,21 @@ static void test_listbox_messages(void) ok_sequence(wm_lb_addstring, "LB_ADDSTRING", FALSE); check_lb_state(listbox, 3, LB_ERR, 0, 0); + ret = SendMessageA(listbox, LB_RESETCONTENT, 0, 0); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + check_lb_state(listbox, 0, LB_ERR, 0, 0); + SetFocus(listbox); /* avoid focus messages */ + flush_sequence(); + + if (winetest_debug > 1) trace("clicking on item 0\n"); + ret = SendMessageA(listbox, WM_LBUTTONDBLCLK, 0, MAKELPARAM(1, 1)); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + ret = SendMessageA(listbox, WM_LBUTTONUP, 0, 0); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + ok_sequence(wm_lb_dblclick_0, "WM_LBUTTONDBLCLK 0", FALSE ); + check_lb_state(listbox, 0, LB_ERR, 0, 0); + flush_sequence(); + log_all_parent_messages--; DestroyWindow(listbox); @@ -16765,6 +16820,21 @@ static void test_listbox_messages(void) ok_sequence(wm_lb_addstring, "LB_ADDSTRING", FALSE); check_lb_state(listbox, 3, LB_ERR, 0, 0); + ret = SendMessageA(listbox, LB_RESETCONTENT, 0, 0); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + check_lb_state(listbox, 0, LB_ERR, 0, 0); + SetFocus(listbox); /* avoid focus messages */ + flush_sequence(); + + if (winetest_debug > 1) trace("clicking on item 0\n"); + ret = SendMessageA(listbox, WM_LBUTTONDBLCLK, 0, MAKELPARAM(1, 1)); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + ret = SendMessageA(listbox, WM_LBUTTONUP, 0, 0); + ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret); + ok_sequence(wm_lb_dblclick_0, "WM_LBUTTONDBLCLK 0", FALSE ); + check_lb_state(listbox, 0, LB_ERR, 0, 0); + flush_sequence(); + log_all_parent_messages--; DestroyWindow(listbox);

1 0

Alexandros Frantzis : winewayland.drv: Add initial stub for wl_pointer handling.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: a3709b93ca344a07b3e01f644b78e747db3c55c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3709b93ca344a07b3e01f644b78e7… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Aug 23 13:45:16 2023 +0300 winewayland.drv: Add initial stub for wl_pointer handling. Track the availability of a pointer device for a seat. For now we assume only a single seat and pointer. --- dlls/winewayland.drv/Makefile.in | 1 + dlls/winewayland.drv/wayland.c | 43 +++++++++++++++ dlls/winewayland.drv/wayland_pointer.c | 98 ++++++++++++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 9 ++++ 4 files changed, 151 insertions(+) diff --git a/dlls/winewayland.drv/Makefile.in b/dlls/winewayland.drv/Makefile.in index ef75c289b76..6bc03187d61 100644 --- a/dlls/winewayland.drv/Makefile.in +++ b/dlls/winewayland.drv/Makefile.in @@ -9,6 +9,7 @@ SOURCES = \ version.rc \ wayland.c \ wayland_output.c \ + wayland_pointer.c \ wayland_surface.c \ waylanddrv_main.c \ window.c \ diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index d35bd061b7e..6ea4a94551d 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -53,6 +53,29 @@ static const struct xdg_wm_base_listener xdg_wm_base_listener = xdg_wm_base_handle_ping }; +/********************************************************************** + * wl_seat handling + */ + +static void wl_seat_handle_capabilities(void *data, struct wl_seat *seat, + enum wl_seat_capability caps) +{ + if ((caps & WL_SEAT_CAPABILITY_POINTER) && !process_wayland.wl_pointer) + wayland_pointer_init(wl_seat_get_pointer(seat)); + else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && process_wayland.wl_pointer) + wayland_pointer_deinit(); +} + +static void wl_seat_handle_name(void *data, struct wl_seat *seat, const char *name) +{ +} + +static const struct wl_seat_listener seat_listener = +{ + wl_seat_handle_capabilities, + wl_seat_handle_name +}; + /********************************************************************** * Registry handling */ @@ -98,6 +121,17 @@ static void registry_handle_global(void *data, struct wl_registry *registry, { process_wayland.wl_shm = wl_registry_bind(registry, id, &wl_shm_interface, 1); } + else if (strcmp(interface, "wl_seat") == 0) + { + if (process_wayland.wl_seat) + { + WARN("Only a single seat is currently supported, ignoring additional seats.\n"); + return; + } + process_wayland.wl_seat = wl_registry_bind(registry, id, &wl_seat_interface, + version < 5 ? version : 5); + wl_seat_add_listener(process_wayland.wl_seat, &seat_listener, NULL); + } } static void registry_handle_global_remove(void *data, struct wl_registry *registry, @@ -116,6 +150,15 @@ static void registry_handle_global_remove(void *data, struct wl_registry *regist return; } } + + if (process_wayland.wl_seat && + wl_proxy_get_id((struct wl_proxy *)process_wayland.wl_seat) == id) + { + TRACE("removing seat\n"); + if (process_wayland.wl_pointer) wayland_pointer_deinit(); + wl_seat_release(process_wayland.wl_seat); + process_wayland.wl_seat = NULL; + } } static const struct wl_registry_listener registry_listener = { diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c new file mode 100644 index 00000000000..10dacfa03b0 --- /dev/null +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -0,0 +1,98 @@ +/* + * Wayland pointer handling + * + * Copyright (c) 2020 Alexandros Frantzis for Collabora Ltd + * + * 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 unix +#endif + +#include "config.h" + +#include "waylanddrv.h" + +static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer, + uint32_t time, wl_fixed_t sx, wl_fixed_t sy) +{ +} + +static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer, + uint32_t serial, struct wl_surface *wl_surface, + wl_fixed_t sx, wl_fixed_t sy) +{ +} + +static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer, + uint32_t serial, struct wl_surface *wl_surface) +{ +} + +static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, + uint32_t serial, uint32_t time, uint32_t button, + uint32_t state) +{ +} + +static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer, + uint32_t time, uint32_t axis, wl_fixed_t value) +{ +} + +static void pointer_handle_frame(void *data, struct wl_pointer *wl_pointer) +{ +} + +static void pointer_handle_axis_source(void *data, struct wl_pointer *wl_pointer, + uint32_t axis_source) +{ +} + +static void pointer_handle_axis_stop(void *data, struct wl_pointer *wl_pointer, + uint32_t time, uint32_t axis) +{ +} + +static void pointer_handle_axis_discrete(void *data, struct wl_pointer *wl_pointer, + uint32_t axis, int32_t discrete) +{ +} + +static const struct wl_pointer_listener pointer_listener = +{ + pointer_handle_enter, + pointer_handle_leave, + pointer_handle_motion, + pointer_handle_button, + pointer_handle_axis, + pointer_handle_frame, + pointer_handle_axis_source, + pointer_handle_axis_stop, + pointer_handle_axis_discrete +}; + +void wayland_pointer_init(struct wl_pointer *wl_pointer) +{ + process_wayland.wl_pointer = wl_pointer; + wl_pointer_add_listener(process_wayland.wl_pointer, &pointer_listener, NULL); +} + +void wayland_pointer_deinit(void) +{ + wl_pointer_release(process_wayland.wl_pointer); + process_wayland.wl_pointer = NULL; +} diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 0fd2a7a6c77..8932c2c9e8d 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -66,6 +66,8 @@ struct wayland struct wl_compositor *wl_compositor; struct xdg_wm_base *xdg_wm_base; struct wl_shm *wl_shm; + struct wl_seat *wl_seat; + struct wl_pointer *wl_pointer; struct wl_list output_list; /* Protects the output_list and the wayland_output.current states. */ pthread_mutex_t output_mutex; @@ -167,6 +169,13 @@ void wayland_window_surface_update_wayland_surface(struct window_surface *surfac struct wayland_surface *wayland_surface) DECLSPEC_HIDDEN; void wayland_window_flush(HWND hwnd) DECLSPEC_HIDDEN; +/********************************************************************** + * Wayland pointer + */ + +void wayland_pointer_init(struct wl_pointer *wl_pointer) DECLSPEC_HIDDEN; +void wayland_pointer_deinit(void) DECLSPEC_HIDDEN; + /********************************************************************** * Helpers */

1 0

Alexandros Frantzis : winewayland.drv: Handle pointer focus events.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 579d67e17defe047979b4f3e8c156f4cf6924768 URL: https://gitlab.winehq.org/wine/wine/-/commit/579d67e17defe047979b4f3e8c156f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Aug 24 11:27:42 2023 +0300 winewayland.drv: Handle pointer focus events. Handle wl_pointer enter/leave events and maintain information about the focused HWND. Since pointer information will be accessed by any UI capable thread, ensure proper proper locking is in place. --- dlls/winewayland.drv/wayland.c | 7 +++--- dlls/winewayland.drv/wayland_pointer.c | 43 ++++++++++++++++++++++++++++++---- dlls/winewayland.drv/wayland_surface.c | 6 +++++ dlls/winewayland.drv/waylanddrv.h | 9 ++++++- 4 files changed, 57 insertions(+), 8 deletions(-) diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index 6ea4a94551d..51e36b5ba60 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); struct wayland process_wayland = { + .pointer.mutex = PTHREAD_MUTEX_INITIALIZER, .output_list = {&process_wayland.output_list, &process_wayland.output_list}, .output_mutex = PTHREAD_MUTEX_INITIALIZER }; @@ -60,9 +61,9 @@ static const struct xdg_wm_base_listener xdg_wm_base_listener = static void wl_seat_handle_capabilities(void *data, struct wl_seat *seat, enum wl_seat_capability caps) { - if ((caps & WL_SEAT_CAPABILITY_POINTER) && !process_wayland.wl_pointer) + if ((caps & WL_SEAT_CAPABILITY_POINTER) && !process_wayland.pointer.wl_pointer) wayland_pointer_init(wl_seat_get_pointer(seat)); - else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && process_wayland.wl_pointer) + else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && process_wayland.pointer.wl_pointer) wayland_pointer_deinit(); } @@ -155,7 +156,7 @@ static void registry_handle_global_remove(void *data, struct wl_registry *regist wl_proxy_get_id((struct wl_proxy *)process_wayland.wl_seat) == id) { TRACE("removing seat\n"); - if (process_wayland.wl_pointer) wayland_pointer_deinit(); + if (process_wayland.pointer.wl_pointer) wayland_pointer_deinit(); wl_seat_release(process_wayland.wl_seat); process_wayland.wl_seat = NULL; } diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index 10dacfa03b0..cb9091f0cf2 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -25,6 +25,9 @@ #include "config.h" #include "waylanddrv.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer, uint32_t time, wl_fixed_t sx, wl_fixed_t sy) @@ -35,11 +38,33 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer, uint32_t serial, struct wl_surface *wl_surface, wl_fixed_t sx, wl_fixed_t sy) { + struct wayland_pointer *pointer = &process_wayland.pointer; + HWND hwnd; + + if (!wl_surface) return; + /* The wl_surface user data remains valid and immutable for the whole + * lifetime of the object, so it's safe to access without locking. */ + hwnd = wl_surface_get_user_data(wl_surface); + + TRACE("hwnd=%p\n", hwnd); + + pthread_mutex_lock(&pointer->mutex); + pointer->focused_hwnd = hwnd; + pthread_mutex_unlock(&pointer->mutex); } static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer, uint32_t serial, struct wl_surface *wl_surface) { + struct wayland_pointer *pointer = &process_wayland.pointer; + + if (!wl_surface) return; + + TRACE("hwnd=%p\n", wl_surface_get_user_data(wl_surface)); + + pthread_mutex_lock(&pointer->mutex); + pointer->focused_hwnd = NULL; + pthread_mutex_unlock(&pointer->mutex); } static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, @@ -87,12 +112,22 @@ static const struct wl_pointer_listener pointer_listener = void wayland_pointer_init(struct wl_pointer *wl_pointer) { - process_wayland.wl_pointer = wl_pointer; - wl_pointer_add_listener(process_wayland.wl_pointer, &pointer_listener, NULL); + struct wayland_pointer *pointer = &process_wayland.pointer; + + pthread_mutex_lock(&pointer->mutex); + pointer->wl_pointer = wl_pointer; + pointer->focused_hwnd = NULL; + pthread_mutex_unlock(&pointer->mutex); + wl_pointer_add_listener(pointer->wl_pointer, &pointer_listener, NULL); } void wayland_pointer_deinit(void) { - wl_pointer_release(process_wayland.wl_pointer); - process_wayland.wl_pointer = NULL; + struct wayland_pointer *pointer = &process_wayland.pointer; + + pthread_mutex_lock(&pointer->mutex); + wl_pointer_release(pointer->wl_pointer); + pointer->wl_pointer = NULL; + pointer->focused_hwnd = NULL; + pthread_mutex_unlock(&pointer->mutex); } diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index fbc49191d9e..bc42da72b1e 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -108,6 +108,7 @@ struct wayland_surface *wayland_surface_create(HWND hwnd) ERR("Failed to create wl_surface Wayland surface\n"); goto err; } + wl_surface_set_user_data(surface->wl_surface, hwnd); return surface; @@ -123,6 +124,11 @@ err: */ void wayland_surface_destroy(struct wayland_surface *surface) { + pthread_mutex_lock(&process_wayland.pointer.mutex); + if (process_wayland.pointer.focused_hwnd == surface->hwnd) + process_wayland.pointer.focused_hwnd = NULL; + pthread_mutex_unlock(&process_wayland.pointer.mutex); + pthread_mutex_lock(&xdg_data_mutex); pthread_mutex_lock(&surface->mutex); diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 8932c2c9e8d..e5c456d19e8 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -56,6 +56,13 @@ enum wayland_window_message WM_WAYLAND_INIT_DISPLAY_DEVICES = 0x80001000 }; +struct wayland_pointer +{ + struct wl_pointer *wl_pointer; + HWND focused_hwnd; + pthread_mutex_t mutex; +}; + struct wayland { BOOL initialized; @@ -67,7 +74,7 @@ struct wayland struct xdg_wm_base *xdg_wm_base; struct wl_shm *wl_shm; struct wl_seat *wl_seat; - struct wl_pointer *wl_pointer; + struct wayland_pointer pointer; struct wl_list output_list; /* Protects the output_list and the wayland_output.current states. */ pthread_mutex_t output_mutex;

1 0

Esme Povirk : user32/tests: Register test_hvredraw class in temp desktop.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: f9e4c0bc65577e2225b4a841e8ae9ed36fd5f812 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9e4c0bc65577e2225b4a841e8ae9e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Sep 9 12:22:31 2023 -0500 user32/tests: Register test_hvredraw class in temp desktop. Windows v1709 has a bug that breaks GetClassLong on a different desktop from where the class was registered. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55539 --- dlls/user32/tests/msg.c | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ddc6ca90cb2..5fc05ad80ff 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9593,7 +9593,7 @@ static void test_swp_paint_region_on_extend_zerosize(void) DeleteObject( hrgn_actual ); } -static void subtest_hvredraw(HWND hparent, const char *classname, DWORD style) +static void subtest_hvredraw(HWND hparent, UINT class_style, DWORD style) { static const struct movesize_test { int dx, dy, dw, dh; @@ -9613,12 +9613,19 @@ static void subtest_hvredraw(HWND hparent, const char *classname, DWORD style) const int x0 = 100, y0 = 100, w0 = 200, h0 = 200; size_t i; HWND hwnd; - UINT class_style; + WNDCLASSA cls = { + .style = class_style, + .lpfnWndProc = DefWindowProcA, + .hInstance = GetModuleHandleA(0), + .hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW), + .hbrBackground = GetStockObject(WHITE_BRUSH), + .lpszClassName = "TestHVRedrawClass" + }; - hwnd = CreateWindowExA( 0, classname, "Test window", style, x0, y0, w0, h0, hparent, 0, 0, NULL ); - ok(hwnd != NULL, "Failed to create the window\n"); + register_class(&cls); - class_style = GetClassLongA( hwnd, GCL_STYLE ); + hwnd = CreateWindowExA( 0, cls.lpszClassName, "Test window", style, x0, y0, w0, h0, hparent, 0, 0, NULL ); + ok(hwnd != NULL, "Failed to create the window\n"); ShowWindow( hwnd, SW_SHOW ); UpdateWindow( hwnd ); @@ -9631,8 +9638,8 @@ static void subtest_hvredraw(HWND hparent, const char *classname, DWORD style) RECT rect_old_vis, rect_new_vis; BOOL rgn_ok; - winetest_push_context( "%s %08lx SetWindowPos redraw #%Id (%d, %d, %d, %d)", - classname, style, i, test->dx, test->dy, test->dw, test->dh ); + winetest_push_context( "%x %08lx SetWindowPos redraw #%Id (%d, %d, %d, %d)", + class_style, style, i, test->dx, test->dy, test->dw, test->dh ); SetWindowPos( hwnd, HWND_TOP, x0, y0, w0, h0, SWP_NOACTIVATE ); @@ -9683,6 +9690,7 @@ static void subtest_hvredraw(HWND hparent, const char *classname, DWORD style) DeleteObject( hrgn_expect ); DeleteObject( hrgn_new_vis ); DeleteObject( hrgn_old_vis ); + UnregisterClassA( cls.lpszClassName, cls.hInstance ); } @@ -9690,18 +9698,18 @@ static void test_hvredraw(void) { HWND htoplevel; - subtest_hvredraw( NULL, "SimpleWindowClassWithHRedraw", WS_OVERLAPPEDWINDOW ); - subtest_hvredraw( NULL, "SimpleWindowClassWithVRedraw", WS_OVERLAPPEDWINDOW ); - subtest_hvredraw( NULL, "SimpleWindowClassWithHVRedraw", WS_OVERLAPPEDWINDOW ); + subtest_hvredraw( NULL, CS_HREDRAW, WS_OVERLAPPEDWINDOW ); + subtest_hvredraw( NULL, CS_VREDRAW, WS_OVERLAPPEDWINDOW ); + subtest_hvredraw( NULL, CS_HREDRAW|CS_VREDRAW, WS_OVERLAPPEDWINDOW ); htoplevel = CreateWindowExA( 0, "SimpleWindowClass", "Test toplevel", WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_VISIBLE, 100, 100, 400, 400, 0, 0, 0, NULL ); ok( htoplevel != 0, "Failed to create top-level window: %lu\n", GetLastError() ); - subtest_hvredraw( htoplevel, "SimpleWindowClassWithHRedraw", WS_CHILD | WS_BORDER ); - subtest_hvredraw( htoplevel, "SimpleWindowClassWithVRedraw", WS_CHILD | WS_BORDER ); - subtest_hvredraw( htoplevel, "SimpleWindowClassWithHVRedraw", WS_CHILD | WS_BORDER ); + subtest_hvredraw( htoplevel, CS_HREDRAW, WS_CHILD | WS_BORDER ); + subtest_hvredraw( htoplevel, CS_VREDRAW, WS_CHILD | WS_BORDER ); + subtest_hvredraw( htoplevel, CS_HREDRAW|CS_VREDRAW, WS_CHILD | WS_BORDER ); DestroyWindow( htoplevel ); } @@ -11206,21 +11214,6 @@ static void register_classes(void) cls.lpszClassName = "SimpleWindowClassWithParentDC"; register_class(&cls); - cls.lpfnWndProc = DefWindowProcA; - cls.style = CS_HREDRAW; - cls.lpszClassName = "SimpleWindowClassWithHRedraw"; - register_class(&cls); - - cls.lpfnWndProc = DefWindowProcA; - cls.style = CS_VREDRAW; - cls.lpszClassName = "SimpleWindowClassWithVRedraw"; - register_class(&cls); - - cls.lpfnWndProc = DefWindowProcA; - cls.style = CS_HREDRAW | CS_VREDRAW; - cls.lpszClassName = "SimpleWindowClassWithHVRedraw"; - register_class(&cls); - clsW.style = 0; clsW.lpfnWndProc = MsgCheckProcW; clsW.cbClsExtra = 0;

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for HTMLDOMAttribute.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 528fb917ce0892711759e63238836e5de0c20c8a URL: https://gitlab.winehq.org/wine/wine/-/commit/528fb917ce0892711759e63238836e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 11 14:57:06 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLDOMAttribute. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlattr.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 2631b935f0a..5e38215057c 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -38,28 +38,16 @@ static inline HTMLDOMAttribute *impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *i } static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface, - REFIID riid, void **ppv) + REFIID riid, void **ppv) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLDOMAttribute_iface; - }else if(IsEqualGUID(&IID_IHTMLDOMAttribute, riid)) { - *ppv = &This->IHTMLDOMAttribute_iface; - }else if(IsEqualGUID(&IID_IHTMLDOMAttribute2, riid)) { - *ppv = &This->IHTMLDOMAttribute2_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - WARN("%s not supported\n", debugstr_mshtml_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLDOMAttribute_AddRef(IHTMLDOMAttribute *iface) @@ -477,6 +465,18 @@ static inline HTMLDOMAttribute *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLDOMAttribute, dispex); } +static void *HTMLDOMAttribute_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLDOMAttribute *This = impl_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLDOMAttribute, riid)) + return &This->IHTMLDOMAttribute_iface; + if(IsEqualGUID(&IID_IHTMLDOMAttribute2, riid)) + return &This->IHTMLDOMAttribute2_iface; + + return NULL; +} + static void HTMLDOMAttribute_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLDOMAttribute *This = impl_from_DispatchEx(dispex); @@ -499,6 +499,7 @@ static void HTMLDOMAttribute_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLDOMAttribute_dispex_vtbl = { + .query_interface = HTMLDOMAttribute_query_interface, .destructor = HTMLDOMAttribute_destructor, .traverse = HTMLDOMAttribute_traverse, .unlink = HTMLDOMAttribute_unlink

1 0