November 2023 - Wine-Commits

Daniel Lehman : msxml3/tests: Remove unused test field.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 320f92759b169338e5efb7ea64564d2bd3a0a763 URL: https://gitlab.winehq.org/wine/wine/-/commit/320f92759b169338e5efb7ea64564d… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Nov 12 23:04:19 2023 -0800 msxml3/tests: Remove unused test field. --- dlls/msxml3/tests/domdoc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d7de144c84c..f8d80abeba2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13653,14 +13653,13 @@ todo_wine { typedef struct _namespace_as_attribute_t { const GUID *guid; const char *clsid; - const char *xmlns_uri; } namespace_as_attribute_t; static const namespace_as_attribute_t namespace_as_attribute_test_data[] = { - { &CLSID_DOMDocument, "CLSID_DOMDocument", "" }, - { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "" }, - { &CLSID_DOMDocument26, "CLSID_DOMDocument26", "" }, - { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "" }, + { &CLSID_DOMDocument, "CLSID_DOMDocument" }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2" }, + { &CLSID_DOMDocument26, "CLSID_DOMDocument26" }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30" }, { 0 } }; @@ -13788,7 +13787,7 @@ static void test_namespaces_as_attributes(void) { ok(hr == S_OK, "Failed to get namespace URI, hr %#lx.\n", hr); if (test->prefixes[i] && !strcmp(test->prefixes[i], "xmlns")) - ok(!lstrcmpW(str, _bstr_(entry->xmlns_uri)), "got %s\n", wine_dbgstr_w(str)); + ok(!SysStringLen(str), "got %s\n", wine_dbgstr_w(str)); else ok(!lstrcmpW(str, _bstr_(test->uris[i])), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str);

1 0

Alexandros Frantzis : winewayland.drv: Present cursors with the correct scale.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 9ddd0a5cb6b4f8a6ac16ed9d2becd8de21d81161 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ddd0a5cb6b4f8a6ac16ed9d2becd8… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Oct 26 14:41:41 2023 +0300 winewayland.drv: Present cursors with the correct scale. Take into account the window scale factor and use wp_viewport to instruct the compositor to present cursors with that scale. --- dlls/winewayland.drv/wayland_pointer.c | 48 +++++++++++++++++++++++++++++++--- dlls/winewayland.drv/waylanddrv.h | 1 + 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index 0951c0952e7..33fd14fa0c5 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -417,7 +417,7 @@ static BOOL get_icon_info(HICON handle, ICONINFOEXW *ret) return TRUE; } -static void wayland_pointer_update_cursor_buffer(HCURSOR hcursor) +static void wayland_pointer_update_cursor_buffer(HCURSOR hcursor, double scale) { struct wayland_cursor *cursor = &process_wayland.pointer.cursor; ICONINFOEXW info = {0}; @@ -469,6 +469,9 @@ static void wayland_pointer_update_cursor_buffer(HCURSOR hcursor) cursor->hotspot_y = cursor->shm_buffer->height / 2; } + cursor->hotspot_x = round(cursor->hotspot_x / scale); + cursor->hotspot_y = round(cursor->hotspot_y / scale); + return; clear_cursor: @@ -479,7 +482,7 @@ clear_cursor: } } -static void wayland_pointer_update_cursor_surface(void) +static void wayland_pointer_update_cursor_surface(double scale) { struct wayland_cursor *cursor = &process_wayland.pointer.cursor; @@ -496,12 +499,32 @@ static void wayland_pointer_update_cursor_surface(void) } } + if (!cursor->wp_viewport && process_wayland.wp_viewporter) + { + cursor->wp_viewport = + wp_viewporter_get_viewport(process_wayland.wp_viewporter, + cursor->wl_surface); + if (!cursor->wp_viewport) + WARN("Failed to create wp_viewport for cursor\n"); + } + /* Commit the cursor buffer to the cursor surface. */ wl_surface_attach(cursor->wl_surface, cursor->shm_buffer->wl_buffer, 0, 0); wl_surface_damage_buffer(cursor->wl_surface, 0, 0, cursor->shm_buffer->width, cursor->shm_buffer->height); + /* Setting only the viewport is enough, but some compositors don't + * support wp_viewport for cursor surfaces, so also set the buffer + * scale. Note that setting the viewport destination overrides + * the buffer scale, so it's fine to set both. */ + wl_surface_set_buffer_scale(cursor->wl_surface, round(scale)); + if (cursor->wp_viewport) + { + wp_viewport_set_destination(cursor->wp_viewport, + round(cursor->shm_buffer->width / scale), + round(cursor->shm_buffer->height / scale)); + } wl_surface_commit(cursor->wl_surface); return; @@ -512,6 +535,11 @@ clear_cursor: wayland_shm_buffer_unref(cursor->shm_buffer); cursor->shm_buffer = NULL; } + if (cursor->wp_viewport) + { + wp_viewport_destroy(cursor->wp_viewport); + cursor->wp_viewport = NULL; + } if (cursor->wl_surface) { wl_surface_destroy(cursor->wl_surface); @@ -522,12 +550,24 @@ clear_cursor: static void wayland_set_cursor(HWND hwnd, HCURSOR hcursor, BOOL use_hcursor) { struct wayland_pointer *pointer = &process_wayland.pointer; + struct wayland_surface *surface; + double scale; + + if ((surface = wayland_surface_lock_hwnd(hwnd))) + { + scale = surface->window.scale; + pthread_mutex_unlock(&surface->mutex); + } + else + { + scale = 1.0; + } pthread_mutex_lock(&pointer->mutex); if (pointer->focused_hwnd == hwnd) { - if (use_hcursor) wayland_pointer_update_cursor_buffer(hcursor); - wayland_pointer_update_cursor_surface(); + if (use_hcursor) wayland_pointer_update_cursor_buffer(hcursor, scale); + wayland_pointer_update_cursor_surface(scale); wl_pointer_set_cursor(pointer->wl_pointer, pointer->enter_serial, pointer->cursor.wl_surface, diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index dcc1ef3e57d..6bb30447f30 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -79,6 +79,7 @@ struct wayland_cursor { struct wayland_shm_buffer *shm_buffer; struct wl_surface *wl_surface; + struct wp_viewport *wp_viewport; int hotspot_x, hotspot_y; };

1 0

Alexandros Frantzis : winewayland.drv: Refactor cursor code to prepare for scaling support.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 80f3e7ecc0bf166c1bf68f8d7f39d890de08db4a URL: https://gitlab.winehq.org/wine/wine/-/commit/80f3e7ecc0bf166c1bf68f8d7f39d8… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Oct 26 14:23:22 2023 +0300 winewayland.drv: Refactor cursor code to prepare for scaling support. --- dlls/winewayland.drv/wayland_pointer.c | 49 ++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index 025793c15d6..0951c0952e7 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -90,6 +90,8 @@ static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer, __wine_send_input(hwnd, &input, NULL); } +static void wayland_set_cursor(HWND hwnd, HCURSOR hcursor, BOOL use_hcursor); + 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) @@ -107,14 +109,11 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer, pthread_mutex_lock(&pointer->mutex); pointer->focused_hwnd = hwnd; pointer->enter_serial = serial; + pthread_mutex_unlock(&pointer->mutex); + /* The cursor is undefined at every enter, so we set it again with * the latest information we have. */ - wl_pointer_set_cursor(pointer->wl_pointer, - pointer->enter_serial, - pointer->cursor.wl_surface, - pointer->cursor.hotspot_x, - pointer->cursor.hotspot_y); - pthread_mutex_unlock(&pointer->mutex); + wayland_set_cursor(hwnd, NULL, FALSE); /* Handle the enter as a motion, to account for cases where the * window first appears beneath the pointer and won't get a separate @@ -418,7 +417,7 @@ static BOOL get_icon_info(HICON handle, ICONINFOEXW *ret) return TRUE; } -static void wayland_pointer_update_cursor(HCURSOR hcursor) +static void wayland_pointer_update_cursor_buffer(HCURSOR hcursor) { struct wayland_cursor *cursor = &process_wayland.pointer.cursor; ICONINFOEXW info = {0}; @@ -470,6 +469,22 @@ static void wayland_pointer_update_cursor(HCURSOR hcursor) cursor->hotspot_y = cursor->shm_buffer->height / 2; } + return; + +clear_cursor: + if (cursor->shm_buffer) + { + wayland_shm_buffer_unref(cursor->shm_buffer); + cursor->shm_buffer = NULL; + } +} + +static void wayland_pointer_update_cursor_surface(void) +{ + struct wayland_cursor *cursor = &process_wayland.pointer.cursor; + + if (!cursor->shm_buffer) goto clear_cursor; + if (!cursor->wl_surface) { cursor->wl_surface = @@ -504,19 +519,15 @@ clear_cursor: } } -/*********************************************************************** - * WAYLAND_SetCursor - */ -void WAYLAND_SetCursor(HWND hwnd, HCURSOR hcursor) +static void wayland_set_cursor(HWND hwnd, HCURSOR hcursor, BOOL use_hcursor) { struct wayland_pointer *pointer = &process_wayland.pointer; - TRACE("hwnd=%p hcursor=%p\n", hwnd, hcursor); - pthread_mutex_lock(&pointer->mutex); if (pointer->focused_hwnd == hwnd) { - wayland_pointer_update_cursor(hcursor); + if (use_hcursor) wayland_pointer_update_cursor_buffer(hcursor); + wayland_pointer_update_cursor_surface(); wl_pointer_set_cursor(pointer->wl_pointer, pointer->enter_serial, pointer->cursor.wl_surface, @@ -526,3 +537,13 @@ void WAYLAND_SetCursor(HWND hwnd, HCURSOR hcursor) } pthread_mutex_unlock(&pointer->mutex); } + +/*********************************************************************** + * WAYLAND_SetCursor + */ +void WAYLAND_SetCursor(HWND hwnd, HCURSOR hcursor) +{ + TRACE("hwnd=%p hcursor=%p\n", hwnd, hcursor); + + wayland_set_cursor(hwnd, hcursor, TRUE); +}

1 0

Alexandros Frantzis : winewayland.drv: Prepare to handle different coordinate spaces.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 13578d60455b9200e9498172d96997cbd2ef2645 URL: https://gitlab.winehq.org/wine/wine/-/commit/13578d60455b9200e9498172d96997… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Oct 24 15:40:00 2023 +0300 winewayland.drv: Prepare to handle different coordinate spaces. Introduce and use functions to convert between the window logical and Wayland surface coordinate spaces. At the moment the two are the same but this will change with the introduction of scaling support. --- dlls/winewayland.drv/wayland_pointer.c | 36 ++++++++++++++++-------- dlls/winewayland.drv/wayland_surface.c | 51 +++++++++++++++++++++++++++------- dlls/winewayland.drv/waylanddrv.h | 6 ++++ dlls/winewayland.drv/window.c | 22 ++++++++++----- 4 files changed, 86 insertions(+), 29 deletions(-)

1 0

Rémi Bernon : windows.gaming.input: Fix inverted start / select gamepad buttons.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 79bb13332fa7aa4c19eabd4f68b1387ad4774000 URL: https://gitlab.winehq.org/wine/wine/-/commit/79bb13332fa7aa4c19eabd4f68b138… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 9 10:59:27 2023 +0100 windows.gaming.input: Fix inverted start / select gamepad buttons. --- dlls/windows.gaming.input/gamepad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index 112ec49a1d3..0d7cd690821 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -273,8 +273,8 @@ static HRESULT WINAPI gamepad_GetCurrentReading( IGamepad *iface, struct Gamepad if (state.buttons[3]) value->Buttons |= GamepadButtons_Y; if (state.buttons[4]) value->Buttons |= GamepadButtons_LeftShoulder; if (state.buttons[5]) value->Buttons |= GamepadButtons_RightShoulder; - if (state.buttons[6]) value->Buttons |= GamepadButtons_Menu; - if (state.buttons[7]) value->Buttons |= GamepadButtons_View; + if (state.buttons[6]) value->Buttons |= GamepadButtons_View; + if (state.buttons[7]) value->Buttons |= GamepadButtons_Menu; if (state.buttons[8]) value->Buttons |= GamepadButtons_LeftThumbstick; if (state.buttons[9]) value->Buttons |= GamepadButtons_RightThumbstick;

1 0

Rémi Bernon : winebus.sys: Ignore events on unsupported axes.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 7d74938b0c9253fc8bf05f5ef943f99f6bf7e1ae URL: https://gitlab.winehq.org/wine/wine/-/commit/7d74938b0c9253fc8bf05f5ef943f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 11 15:39:28 2023 +0100 winebus.sys: Ignore events on unsupported axes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55660 --- dlls/winebus.sys/bus_sdl.c | 69 ++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index cd6166a91a8..9b0e7226fa5 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -246,49 +246,50 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) return TRUE; } +static const USAGE_AND_PAGE absolute_axis_usages[] = +{ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, +}; +static const USAGE_AND_PAGE relative_axis_usages[] = +{ + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, +}; + static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) { const USAGE_AND_PAGE device_usage = {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_JOYSTICK}; - static const USAGE_AND_PAGE absolute_usages[] = - { - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, - }; - static const USAGE_AND_PAGE relative_usages[] = - { - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, - }; struct sdl_device *impl = impl_from_unix_device(iface); int i, button_count, axis_count, ball_count, hat_count; USAGE_AND_PAGE physical_usage; axis_count = pSDL_JoystickNumAxes(impl->sdl_joystick); if (options.split_controllers) axis_count = min(6, axis_count - impl->axis_offset); - if (axis_count > ARRAY_SIZE(absolute_usages)) + if (axis_count > ARRAY_SIZE(absolute_axis_usages)) { - FIXME("More than %zu absolute axes found, ignoring.\n", ARRAY_SIZE(absolute_usages)); - axis_count = ARRAY_SIZE(absolute_usages); + FIXME("More than %zu absolute axes found, ignoring.\n", ARRAY_SIZE(absolute_axis_usages)); + axis_count = ARRAY_SIZE(absolute_axis_usages); } ball_count = pSDL_JoystickNumBalls(impl->sdl_joystick); - if (ball_count > ARRAY_SIZE(relative_usages) / 2) + if (ball_count > ARRAY_SIZE(relative_axis_usages) / 2) { - FIXME("More than %zu relative axes found, ignoring.\n", ARRAY_SIZE(relative_usages)); - ball_count = ARRAY_SIZE(relative_usages) / 2; + FIXME("More than %zu relative axes found, ignoring.\n", ARRAY_SIZE(relative_axis_usages)); + ball_count = ARRAY_SIZE(relative_axis_usages) / 2; } if (impl->axis_offset == 0) @@ -337,15 +338,15 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) for (i = 0; i < axis_count; i++) { - if (!hid_device_add_axes(iface, 1, absolute_usages[i].UsagePage, - &absolute_usages[i].Usage, FALSE, -32768, 32767)) + if (!hid_device_add_axes(iface, 1, absolute_axis_usages[i].UsagePage, + &absolute_axis_usages[i].Usage, FALSE, -32768, 32767)) return STATUS_NO_MEMORY; } for (i = 0; i < ball_count; i++) { - if (!hid_device_add_axes(iface, 2, relative_usages[2 * i].UsagePage, - &relative_usages[2 * i].Usage, TRUE, INT32_MIN, INT32_MAX)) + if (!hid_device_add_axes(iface, 2, relative_axis_usages[2 * i].UsagePage, + &relative_axis_usages[2 * i].Usage, TRUE, INT32_MIN, INT32_MAX)) return STATUS_NO_MEMORY; } @@ -840,6 +841,7 @@ static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *e { SDL_JoyAxisEvent *ie = &event->jaxis; + if (ie->axis >= ARRAY_SIZE(absolute_axis_usages)) break; hid_device_set_abs_axis(iface, ie->axis, ie->value); bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); break; @@ -848,6 +850,7 @@ static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *e { SDL_JoyBallEvent *ie = &event->jball; + if (ie->ball >= ARRAY_SIZE(relative_axis_usages) / 2) break; hid_device_set_rel_axis(iface, 2 * ie->ball, ie->xrel); hid_device_set_rel_axis(iface, 2 * ie->ball + 1, ie->yrel); bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len);

1 0

Alexandros Frantzis : win32u: Respect per-monitor thread dpi awareness when getting window from point.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 07d3846d370e85b8f7a3c6b3e214702d43fd07f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/07d3846d370e85b8f7a3c6b3e21470… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Nov 14 10:19:30 2023 +0200 win32u: Respect per-monitor thread dpi awareness when getting window from point. --- dlls/win32u/window.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 4a57e0abde7..69dd8caba5d 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2229,8 +2229,10 @@ HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ) int i, res; HWND ret, *list; POINT win_pt; + int dpi; if (!hwnd) hwnd = get_desktop_window(); + if (!(dpi = get_thread_dpi())) dpi = get_win_monitor_dpi( hwnd ); *hittest = HTNOWHERE; @@ -2254,7 +2256,7 @@ HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ) *hittest = HTCLIENT; break; } - win_pt = map_dpi_point( pt, get_thread_dpi(), get_dpi_for_window( list[i] )); + win_pt = map_dpi_point( pt, dpi, get_dpi_for_window( list[i] )); res = send_message( list[i], WM_NCHITTEST, 0, MAKELPARAM( win_pt.x, win_pt.y )); if (res != HTTRANSPARENT) {

1 0

Alexandros Frantzis : winewayland.drv: Present surfaces with the correct scale.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 66ad0d0a45d3ac40235c009da76dc90c16eff2b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/66ad0d0a45d3ac40235c009da76dc9… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Sep 13 09:07:04 2023 +0300 winewayland.drv: Present surfaces with the correct scale. Take into account the window scale factor and use wp_viewport to instruct the compositor to present surfaces at that scale. --- dlls/winewayland.drv/Makefile.in | 1 + dlls/winewayland.drv/viewporter.xml | 180 +++++++++++++++++++++++++++++++++ dlls/winewayland.drv/wayland.c | 5 + dlls/winewayland.drv/wayland_surface.c | 43 +++++++- dlls/winewayland.drv/waylanddrv.h | 5 + dlls/winewayland.drv/window.c | 1 + 6 files changed, 231 insertions(+), 4 deletions(-)

1 0

Alexandre Julliard : ntdll: Don't use x86-64 assembly on ARM64EC.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 220a70bee268415925d1ae747611f48e51665e64 URL: https://gitlab.winehq.org/wine/wine/-/commit/220a70bee268415925d1ae747611f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 14 18:55:39 2023 +0100 ntdll: Don't use x86-64 assembly on ARM64EC. --- dlls/ntdll/loader.c | 6 +++--- dlls/ntdll/process.c | 6 +++++- dlls/ntdll/relay.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1a87f4d1f5e..93edc237405 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -304,7 +304,7 @@ __ASM_GLOBAL_FUNC(call_dll_entry_point, __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) -#elif defined(__x86_64__) +#elif defined(__x86_64__) && !defined(__arm64ec__) extern BOOL CDECL call_dll_entry_point( DLLENTRYPROC proc, void *module, UINT reason, void *reserved ); /* Some apps modify rbx in TLS entry point. */ __ASM_GLOBAL_FUNC(call_dll_entry_point, @@ -379,7 +379,7 @@ struct stub const char *name; const void* entry; }; -#elif defined(__aarch64__) +#elif defined(__aarch64__) || defined(__arm64ec__) struct stub { DWORD ldr_x0; /* ldr x0, $dll */ @@ -443,7 +443,7 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) stub->dll = dll; stub->name = name; stub->entry = stub_entry_point; -#elif defined(__aarch64__) +#elif defined(__aarch64__) || defined(__arm64ec__) stub->ldr_x0 = 0x580000a0; /* ldr x0, #20 ($dll) */ stub->ldr_x1 = 0x580000c1; /* ldr x1, #24 ($name) */ stub->mov_x2_lr = 0xaa1e03e2; /* mov x2, lr */ diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 3ca4195ab3d..f3b899a43f8 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -249,7 +249,11 @@ NTSTATUS WINAPI RtlWow64GetThreadSelectorEntry( HANDLE handle, THREAD_DESCRIPTOR if (RtlWow64GetThreadContext( handle, &context )) { /* hardcoded values */ -#ifdef __x86_64__ +#ifdef __arm64ec__ + context.SegCs = 0x33; + context.SegSs = 0x2b; + context.SegFs = 0x53; +#elif defined(__x86_64__) context.SegCs = 0x23; __asm__( "movw %%fs,%0" : "=m" (context.SegFs) ); __asm__( "movw %%ss,%0" : "=m" (context.SegSs) ); diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index adc8267ae1f..b6046bb661f 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); -#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) +#if (defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)) && !defined(__arm64ec__) struct relay_descr /* descriptor for a module */ {

1 0

Alexandros Frantzis : win32u: Assume thread dpi for rect in NtUserIsWindowRectFullScreen.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: a75e2b49ca3446045639e933202d71ecdf217095 URL: https://gitlab.winehq.org/wine/wine/-/commit/a75e2b49ca3446045639e933202d71… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Nov 14 10:11:15 2023 +0200 win32u: Assume thread dpi for rect in NtUserIsWindowRectFullScreen. Assume that the window rect passed NtUserIsWindowRectFullScreen is expressed in terms of thread dpi and convert monitor rects accordingly for proper matching. --- dlls/win32u/sysparams.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4f2a299dd16..b134c5af680 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2327,11 +2327,16 @@ static BOOL is_window_rect_full_screen( const RECT *rect ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { + RECT monrect; + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; - if (rect->left <= monitor->rc_monitor.left && rect->right >= monitor->rc_monitor.right && - rect->top <= monitor->rc_monitor.top && rect->bottom >= monitor->rc_monitor.bottom) + monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), + get_thread_dpi() ); + + if (rect->left <= monrect.left && rect->right >= monrect.right && + rect->top <= monrect.top && rect->bottom >= monrect.bottom) { ret = TRUE; break;

1 0