October 2023 - Wine-commits

Alexandros Frantzis : winewayland.drv: Handle application-initiated fullscreen state.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: ab3d6d985d8916b891a0e70558db95affef69161 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab3d6d985d8916b891a0e70558db95… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Sep 29 15:26:03 2023 +0300 winewayland.drv: Handle application-initiated fullscreen state. Detect when an window wants to become fullscreen and request the Wayland fullscreen state from the compositor. The fullscreen state for windows is inferred by their size and position relative to the monitor that contains their largest region. Since there is no explicit fullscreen state for windows, compositor initiated fullscreen requests may lead to a size change, but will not directly affect other aspects of the window state. --- dlls/winewayland.drv/wayland_surface.c | 10 ++++++ dlls/winewayland.drv/waylanddrv.h | 3 +- dlls/winewayland.drv/window.c | 65 +++++++++++++++++++++++++++------- 3 files changed, 64 insertions(+), 14 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 5bb8c959537..124d15821bf 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -97,6 +97,9 @@ static void xdg_toplevel_handle_configure(void *data, case XDG_TOPLEVEL_STATE_TILED_BOTTOM: config_state |= WAYLAND_SURFACE_CONFIG_STATE_TILED; break; + case XDG_TOPLEVEL_STATE_FULLSCREEN: + config_state |= WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN; + break; default: break; } @@ -338,6 +341,13 @@ static BOOL wayland_surface_configure_is_compatible(struct wayland_surface_confi return FALSE; } + /* The fullscreen state requires at most the configured size. */ + if ((conf->state & WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN) && + (width > conf->width || height > conf->height)) + { + return FALSE; + } + return TRUE; } diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 4b74b674ea6..e1dc58bdc80 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -61,7 +61,8 @@ enum wayland_surface_config_state { WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED = (1 << 0), WAYLAND_SURFACE_CONFIG_STATE_RESIZING = (1 << 1), - WAYLAND_SURFACE_CONFIG_STATE_TILED = (1 << 2) + WAYLAND_SURFACE_CONFIG_STATE_TILED = (1 << 2), + WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN = (1 << 3) }; struct wayland_cursor diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 8fcca9fbec2..2854279bd90 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -153,9 +153,28 @@ static void wayland_win_data_release(struct wayland_win_data *data) static void wayland_win_data_get_config(struct wayland_win_data *data, struct wayland_window_config *conf) { + enum wayland_surface_config_state window_state = 0; + DWORD style; + conf->rect = data->window_rect; - conf->state = (NtUserGetWindowLongW(data->hwnd, GWL_STYLE) & WS_MAXIMIZE) ? - WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED : 0; + style = NtUserGetWindowLongW(data->hwnd, GWL_STYLE); + + TRACE("window=%s style=%#lx\n", wine_dbgstr_rect(&conf->rect), (long)style); + + /* The fullscreen state is implied by the window position and style. */ + if (NtUserIsWindowRectFullScreen(&conf->rect)) + { + if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) + window_state |= WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED; + else if (!(style & WS_MINIMIZE)) + window_state |= WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN; + } + else if (style & WS_MAXIMIZE) + { + window_state |= WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED; + } + + conf->state = window_state; } static void wayland_win_data_update_wayland_surface(struct wayland_win_data *data) @@ -227,15 +246,28 @@ static void wayland_win_data_update_wayland_state(struct wayland_win_data *data) * window state to determine and update the Wayland state. */ if (!processing_config) { + /* First do all state unsettings, before setting new state. Some + * Wayland compositors misbehave if the order is reversed. */ + if (!(surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && + (surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED)) + { + xdg_toplevel_unset_maximized(surface->xdg_toplevel); + } + if (!(surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN) && + (surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN)) + { + xdg_toplevel_unset_fullscreen(surface->xdg_toplevel); + } + if ((surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && !(surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED)) { xdg_toplevel_set_maximized(surface->xdg_toplevel); } - else if (!(surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && - (surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED)) + if ((surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN) && + !(surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN)) { - xdg_toplevel_unset_maximized(surface->xdg_toplevel); + xdg_toplevel_set_fullscreen(surface->xdg_toplevel, NULL); } } else @@ -353,7 +385,7 @@ static void wayland_configure_window(HWND hwnd) { struct wayland_surface *surface; INT width, height; - UINT flags; + UINT flags = 0; uint32_t state; DWORD style; BOOL needs_enter_size_move = FALSE; @@ -394,6 +426,14 @@ static void wayland_configure_window(HWND hwnd) needs_exit_size_move = TRUE; } + /* Transitions between normal/max/fullscreen may entail a frame change. */ + if ((state ^ surface->current.state) & + (WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED | + WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN)) + { + flags |= SWP_FRAMECHANGED; + } + pthread_mutex_unlock(&surface->mutex); TRACE("processing=%dx%d,%#x\n", width, height, state); @@ -401,20 +441,19 @@ static void wayland_configure_window(HWND hwnd) if (needs_enter_size_move) send_message(hwnd, WM_ENTERSIZEMOVE, 0, 0); if (needs_exit_size_move) send_message(hwnd, WM_EXITSIZEMOVE, 0, 0); - flags = SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE; + flags |= SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE; if (width == 0 || height == 0) flags |= SWP_NOSIZE; style = NtUserGetWindowLongW(hwnd, GWL_STYLE); if (!(state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) != !(style & WS_MAXIMIZE)) - { NtUserSetWindowLong(hwnd, GWL_STYLE, style ^ WS_MAXIMIZE, FALSE); - flags |= SWP_FRAMECHANGED; - } - /* The Wayland maximized state is very strict about surface size, so don't - * let the application override it. The tiled state is not as strict, - * but it indicates a strong size preference, so try to respect it. */ + /* The Wayland maximized and fullscreen states are very strict about + * surface size, so don't let the application override it. The tiled state + * is not as strict, but it indicates a strong size preference, so try to + * respect it. */ if (state & (WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED | + WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN | WAYLAND_SURFACE_CONFIG_STATE_TILED)) { flags |= SWP_NOSENDCHANGING;

1 0

Alexandros Frantzis : winewayland.drv: Use surface geometry to satisfy state size constraints.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: dfcd2d8b70dd54aa1f43ecab0d02b63418952c17 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfcd2d8b70dd54aa1f43ecab0d02b6… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Sep 29 16:49:44 2023 +0300 winewayland.drv: Use surface geometry to satisfy state size constraints. The maximized and fullscreen states disallow surface contents that are larger than the configured size. However, if we have a larger surface, and only part of the surface contains useful client data, we can inform the compositor using xdg_surface_set_geometry, so that only the specified region is considered for compositor-side positioning and state constraints. We use the geometry to support the presentation of windows that insist on particular positions and sizes which may not match the compositor's requested size (e.g., fullscreen but may overshoot a few pixels outside the monitor boundary). --- dlls/winewayland.drv/wayland_surface.c | 92 +++++++++++++++++++++++++++++++--- 1 file changed, 85 insertions(+), 7 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 124d15821bf..b581cec1b46 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -334,21 +334,97 @@ static BOOL wayland_surface_configure_is_compatible(struct wayland_surface_confi /* We require the same state. */ if ((state & mask) != (conf->state & mask)) return FALSE; - /* The maximized state requires the configured size. */ + /* The maximized state requires the configured size. During surface + * reconfiguration we can use surface geometry to provide smaller areas + * from larger sizes, so only smaller sizes are incompatible. */ if ((conf->state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && - (width != conf->width || height != conf->height)) + (width < conf->width || height < conf->height)) { return FALSE; } - /* The fullscreen state requires at most the configured size. */ - if ((conf->state & WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN) && - (width > conf->width || height > conf->height)) + /* The fullscreen state requires a size smaller or equal to the configured + * size. If we have a larger size, we can use surface geometry during + * surface reconfiguration to provide the smaller size, so we are always + * compatible with a fullscreen state. */ + + return TRUE; +} + +/********************************************************************** + * wayland_surface_get_rect_in_monitor + * + * Gets the largest rectangle within a surface's window (in window coordinates) + * that is visible in a monitor. + */ +static void wayland_surface_get_rect_in_monitor(struct wayland_surface *surface, + RECT *rect) +{ + HMONITOR hmonitor; + MONITORINFO mi; + + mi.cbSize = sizeof(mi); + if (!(hmonitor = NtUserMonitorFromRect(&surface->window.rect, 0)) || + !NtUserGetMonitorInfo(hmonitor, (MONITORINFO *)&mi)) { - return FALSE; + SetRectEmpty(rect); + return; } - return TRUE; + intersect_rect(rect, &mi.rcMonitor, &surface->window.rect); + OffsetRect(rect, -surface->window.rect.left, -surface->window.rect.top); +} + +/********************************************************************** + * wayland_surface_reconfigure_geometry + * + * Sets the xdg_surface geometry + */ +static void wayland_surface_reconfigure_geometry(struct wayland_surface *surface) +{ + int width, height; + RECT rect; + + width = surface->window.rect.right - surface->window.rect.left; + height = surface->window.rect.bottom - surface->window.rect.top; + + /* If the window size is bigger than the current state accepts, use the + * largest visible (from Windows' perspective) subregion of the window. */ + if ((surface->current.state & (WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED | + WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN)) && + (width > surface->current.width || height > surface->current.height)) + { + wayland_surface_get_rect_in_monitor(surface, &rect); + + /* If the window rect in the monitor is smaller than required, + * fall back to an appropriately sized rect at the top-left. */ + if ((surface->current.state & WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED) && + (rect.right - rect.left < surface->current.width || + rect.bottom - rect.top < surface->current.height)) + { + SetRect(&rect, 0, 0, surface->current.width, surface->current.height); + } + else + { + rect.right = min(rect.right, rect.left + surface->current.width); + rect.bottom = min(rect.bottom, rect.top + surface->current.height); + } + TRACE("Window is too large for Wayland state, using subregion\n"); + } + else + { + SetRect(&rect, 0, 0, width, height); + } + + TRACE("hwnd=%p geometry=%s\n", surface->hwnd, wine_dbgstr_rect(&rect)); + + if (!IsRectEmpty(&rect)) + { + xdg_surface_set_window_geometry(surface->xdg_surface, + rect.left, rect.top, + rect.right - rect.left, + rect.bottom - rect.top); + } } /********************************************************************** @@ -403,6 +479,8 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) return FALSE; } + wayland_surface_reconfigure_geometry(surface); + return TRUE; }

1 0

Alexandros Frantzis : winewayland.drv: Rename wayland_surface_configure_is_compatible for consistency.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: 26c7dfb7e907e465cb3f28242fe852c2f9fa472a URL: https://gitlab.winehq.org/wine/wine/-/commit/26c7dfb7e907e465cb3f28242fe852… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Oct 2 10:54:26 2023 +0300 winewayland.drv: Rename wayland_surface_configure_is_compatible for consistency. Rename the function wayland_surface_configure_is_compatible to wayland_surface_config_is_compatible to match the associated struct name. --- dlls/winewayland.drv/wayland_surface.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index b581cec1b46..17d1fffc29b 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -319,14 +319,14 @@ void wayland_surface_attach_shm(struct wayland_surface *surface, } /********************************************************************** - * wayland_surface_configure_is_compatible + * wayland_surface_config_is_compatible * - * Checks whether a wayland_surface_configure object is compatible with the + * Checks whether a wayland_surface_config object is compatible with the * the provided arguments. */ -static BOOL wayland_surface_configure_is_compatible(struct wayland_surface_config *conf, - int width, int height, - enum wayland_surface_config_state state) +static BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf, + int width, int height, + enum wayland_surface_config_state state) { static enum wayland_surface_config_state mask = WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED; @@ -451,9 +451,9 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) /* Acknowledge any compatible processed config. */ if (surface->processing.serial && surface->processing.processed && - wayland_surface_configure_is_compatible(&surface->processing, - width, height, - window->state)) + wayland_surface_config_is_compatible(&surface->processing, + width, height, + window->state)) { surface->current = surface->processing; memset(&surface->processing, 0, sizeof(surface->processing)); @@ -463,18 +463,18 @@ BOOL wayland_surface_reconfigure(struct wayland_surface *surface) * config, use that, in order to draw windows that don't go through the * message loop (e.g., some splash screens). */ else if (!surface->current.serial && surface->requested.serial && - wayland_surface_configure_is_compatible(&surface->requested, - width, height, - window->state)) + wayland_surface_config_is_compatible(&surface->requested, + width, height, + window->state)) { surface->current = surface->requested; memset(&surface->requested, 0, sizeof(surface->requested)); xdg_surface_ack_configure(surface->xdg_surface, surface->current.serial); } else if (!surface->current.serial || - !wayland_surface_configure_is_compatible(&surface->current, - width, height, - window->state)) + !wayland_surface_config_is_compatible(&surface->current, + width, height, + window->state)) { return FALSE; }

1 0

Alexandros Frantzis : winewayland.drv: Avoid resizing fullscreen windows.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: 89c36c11fd44ec8a4921d05304afb83f907b47ae URL: https://gitlab.winehq.org/wine/wine/-/commit/89c36c11fd44ec8a4921d05304afb8… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Oct 10 12:04:12 2023 +0300 winewayland.drv: Avoid resizing fullscreen windows. If the window is already fullscreen and its size is compatible with what the compositor is requesting, don't force a resize, since some applications are very insistent on a particular fullscreen size (which may not match the monitor size). --- dlls/winewayland.drv/wayland_surface.c | 6 +++--- dlls/winewayland.drv/waylanddrv.h | 3 +++ dlls/winewayland.drv/window.c | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 17d1fffc29b..ae4812ebb08 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -324,9 +324,9 @@ void wayland_surface_attach_shm(struct wayland_surface *surface, * Checks whether a wayland_surface_config object is compatible with the * the provided arguments. */ -static BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf, - int width, int height, - enum wayland_surface_config_state state) +BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf, + int width, int height, + enum wayland_surface_config_state state) { static enum wayland_surface_config_state mask = WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED; diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index e1dc58bdc80..4bcd9e6706e 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -201,6 +201,9 @@ void wayland_surface_attach_shm(struct wayland_surface *surface, HRGN surface_damage_region) DECLSPEC_HIDDEN; struct wayland_surface *wayland_surface_lock_hwnd(HWND hwnd) DECLSPEC_HIDDEN; BOOL wayland_surface_reconfigure(struct wayland_surface *surface) DECLSPEC_HIDDEN; +BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf, + int width, int height, + enum wayland_surface_config_state state) DECLSPEC_HIDDEN; /********************************************************************** * Wayland SHM buffer diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 2854279bd90..57d2f15a06b 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -434,6 +434,21 @@ static void wayland_configure_window(HWND hwnd) flags |= SWP_FRAMECHANGED; } + /* If the window is already fullscreen and its size is compatible with what + * the compositor is requesting, don't force a resize, since some applications + * are very insistent on a particular fullscreen size (which may not match + * the monitor size). */ + if ((surface->window.state & WAYLAND_SURFACE_CONFIG_STATE_FULLSCREEN) && + wayland_surface_config_is_compatible(&surface->processing, + surface->window.rect.right - + surface->window.rect.left, + surface->window.rect.bottom - + surface->window.rect.top, + surface->window.state)) + { + flags |= SWP_NOSIZE; + } + pthread_mutex_unlock(&surface->mutex); TRACE("processing=%dx%d,%#x\n", width, height, state);

1 0

Rémi Bernon : winex11: Forcefully unmap the clipping window when it loses focus.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: b831dbfc3bae2775dda3603c8c42f9ecbc94f2ea URL: https://gitlab.winehq.org/wine/wine/-/commit/b831dbfc3bae2775dda3603c8c42f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 13 13:34:32 2023 +0200 winex11: Forcefully unmap the clipping window when it loses focus. Fixes cursor not being released when alt-tabbing out of an unresponsive foreground window. --- dlls/winex11.drv/event.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c3c8d9a4070..053c0e2ff47 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -843,7 +843,13 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) if (event->detail == NotifyPointer) { - if (!hwnd && event->window == x11drv_thread_data()->clip_window) NtUserClipCursor( NULL ); + if (!hwnd && event->window == x11drv_thread_data()->clip_window) + { + NtUserClipCursor( NULL ); + /* NtUserClipCursor will ask the foreground window to ungrab the cursor, but + * it might not be responsive, so unmap the clipping window ourselves too */ + XUnmapWindow( event->display, event->window ); + } return TRUE; } if (!hwnd) return FALSE;

1 0

Eric Pouech : winedbg: Set first LDT entry value as ntdll does.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: 91ba80df262b93b9a5edabd7cc0259fcbedf51d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/91ba80df262b93b9a5edabd7cc0259… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Oct 13 09:58:23 2023 +0200 winedbg: Set first LDT entry value as ntdll does. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/be_i386.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 503a182641d..9f22dd5f3d4 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -30,13 +30,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); #define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG) +static const unsigned first_ldt_entry = 32; + static ADDRESS_MODE get_selector_type(HANDLE hThread, const WOW64_CONTEXT *ctx, WORD sel) { LDT_ENTRY le; if (IS_VM86_MODE(ctx)) return AddrModeReal; /* null or system selector */ - if (!(sel & 4) || ((sel >> 3) < 17)) return AddrModeFlat; + if (!(sel & 4) || ((sel >> 3) < first_ldt_entry)) return AddrModeFlat; if (dbg_curr_process->process_io->get_selector(hThread, sel, &le)) return le.HighWord.Bits.Default_Big ? AddrMode1632 : AddrMode1616; /* selector doesn't exist */ @@ -52,7 +54,7 @@ static void* be_i386_linearize(HANDLE hThread, const ADDRESS64* addr) case AddrModeReal: return (void*)((DWORD_PTR)(LOWORD(addr->Segment) << 4) + (DWORD_PTR)addr->Offset); case AddrMode1632: - if (!(addr->Segment & 4) || ((addr->Segment >> 3) < 17)) + if (!(addr->Segment & 4) || ((addr->Segment >> 3) < first_ldt_entry)) return (void*)(DWORD_PTR)addr->Offset; /* fall through */ case AddrMode1616:

1 0

Eric Pouech : winedbg: Correctly read LDT entries for wow64 debuggee.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: 44ab1206617a48aeed01fc1349f8309021a8b818 URL: https://gitlab.winehq.org/wine/wine/-/commit/44ab1206617a48aeed01fc1349f830… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Oct 13 09:58:23 2023 +0200 winedbg: Correctly read LDT entries for wow64 debuggee. This mostly matters for Mac as segment CS is handled as a real LDT entry. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/be_i386.c | 7 ++++++- programs/winedbg/tgt_active.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 9f22dd5f3d4..1bac5f382b2 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -40,7 +40,12 @@ static ADDRESS_MODE get_selector_type(HANDLE hThread, const WOW64_CONTEXT *ctx, /* null or system selector */ if (!(sel & 4) || ((sel >> 3) < first_ldt_entry)) return AddrModeFlat; if (dbg_curr_process->process_io->get_selector(hThread, sel, &le)) - return le.HighWord.Bits.Default_Big ? AddrMode1632 : AddrMode1616; + { + ULONG base = (le.HighWord.Bits.BaseHi << 24) + (le.HighWord.Bits.BaseMid << 16) + le.BaseLow; + if (le.HighWord.Bits.Default_Big) + return base == 0 ? AddrModeFlat : AddrMode1632; + return AddrMode1616; + } /* selector doesn't exist */ return -1; } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 5ac9a4d1229..17578857133 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -1067,7 +1067,17 @@ static BOOL tgt_process_active_write(HANDLE hProcess, void* addr, static BOOL tgt_process_active_get_selector(HANDLE hThread, DWORD sel, LDT_ENTRY* le) { +#ifdef _WIN64 + THREAD_DESCRIPTOR_INFORMATION desc = { .Selector = sel }; + ULONG retlen; + + if (RtlWow64GetThreadSelectorEntry( hThread, &desc, sizeof(desc), &retlen )) + return FALSE; + *le = desc.Entry; + return TRUE; +#else return GetThreadSelectorEntry( hThread, sel, le ); +#endif } static struct be_process_io be_process_active_io =

1 0

Francois Gouget : user32/tests: Don't test GetWindowModuleFileName() on windows belonging to another process.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: e9f6ff8cd401c8e2cf3c12e155a8ea33c97abcd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9f6ff8cd401c8e2cf3c12e155a8ea… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 13 17:53:59 2023 +0200 user32/tests: Don't test GetWindowModuleFileName() on windows belonging to another process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55777 --- dlls/user32/tests/win.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cf5f0d932e8..2fd31be3314 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8777,27 +8777,12 @@ static void test_GetWindowModuleFileName(void) DestroyWindow(hwnd); - buf2[0] = 0; hwnd = (HWND)0xdeadbeef; SetLastError(0xdeadbeef); ret1 = pGetWindowModuleFileNameA(hwnd, buf1, sizeof(buf1)); ok(!ret1, "expected 0, got %u\n", ret1); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %lu\n", GetLastError()); - - hwnd = FindWindowA("Shell_TrayWnd", NULL); - ok(IsWindow(hwnd) || broken(!hwnd), "got invalid tray window %p\n", hwnd); - SetLastError(0xdeadbeef); - ret1 = pGetWindowModuleFileNameA(hwnd, buf1, sizeof(buf1)); - ok(!ret1, "expected 0, got %u\n", ret1); - ret1 = GetModuleFileNameA(0, buf1, sizeof(buf1)); - hwnd = GetDesktopWindow(); - ok(IsWindow(hwnd), "got invalid desktop window %p\n", hwnd); - SetLastError(0xdeadbeef); - ret2 = pGetWindowModuleFileNameA(hwnd, buf2, sizeof(buf2)); - ok(!ret2 || - ret1 == ret2, /* vista */ - "expected 0 or %u, got %u %s\n", ret1, ret2, buf2); } static void test_hwnd_message(void)

1 0

Francois Gouget : advapi32/tests: Better identify OpenEventLogA() failures.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: e6b5afcbd8c6e64dea8e3576b0ab26feb7972ee6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6b5afcbd8c6e64dea8e3576b0ab26… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 2 17:50:35 2023 +0100 advapi32/tests: Better identify OpenEventLogA() failures. --- dlls/advapi32/tests/eventlog.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 1a35efe1844..74a6be07b60 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -104,24 +104,24 @@ static void test_open_close(void) SetLastError(0xdeadbeef); handle = OpenEventLogA(NULL, NULL); - ok(handle == NULL, "Didn't expect a handle\n"); + ok(handle == NULL, "OpenEventLogA() succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); handle = OpenEventLogA("IDontExist", NULL); - ok(handle == NULL, "Didn't expect a handle\n"); + ok(handle == NULL, "OpenEventLogA(IDontExist,) succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); handle = OpenEventLogA("IDontExist", "deadbeef"); - ok(handle == NULL, "Didn't expect a handle\n"); + ok(handle == NULL, "OpenEventLogA(IDontExist,deadbeef) succeeded\n"); ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE || GetLastError() == RPC_S_INVALID_NET_ADDR, /* Some Vista and Win7 */ "Expected RPC_S_SERVER_UNAVAILABLE, got %ld\n", GetLastError()); /* This one opens the Application log */ handle = OpenEventLogA(NULL, "deadbeef"); - ok(handle != NULL, "Expected a handle : %ld\n", GetLastError()); + ok(handle != NULL, "OpenEventLogA(deadbeef) failed : %ld\n", GetLastError()); ret = CloseEventLog(handle); ok(ret, "Expected success : %ld\n", GetLastError()); /* Close a second time */ @@ -135,11 +135,11 @@ static void test_open_close(void) /* Empty servername should be read as local server */ handle = OpenEventLogA("", "Application"); - ok(handle != NULL, "Expected a handle : %ld\n", GetLastError()); + ok(handle != NULL, "OpenEventLogA('',Application) failed : %ld\n", GetLastError()); CloseEventLog(handle); handle = OpenEventLogA(NULL, "Application"); - ok(handle != NULL, "Expected a handle : %ld\n", GetLastError()); + ok(handle != NULL, "OpenEventLogA(Application) failed : %ld\n", GetLastError()); CloseEventLog(handle); } @@ -817,6 +817,7 @@ static void test_readwrite(void) Sleep(2000); handle = OpenEventLogA(NULL, eventlogname); + ok(handle != NULL, "OpenEventLogA(%s) failed : %ld\n", eventlogname, GetLastError()); count = 0xdeadbeef; GetNumberOfEventLogRecords(handle, &count); if (count != 0) @@ -920,6 +921,7 @@ static void test_readwrite(void) } handle = OpenEventLogA(NULL, eventlogname); + ok(handle != NULL, "OpenEventLogA(%s) failed : %ld\n", eventlogname, GetLastError()); count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); ok(ret, "Expected success : %ld\n", GetLastError()); @@ -955,7 +957,7 @@ static void test_readwrite(void) /* Read all events from our created eventlog, one by one */ handle = OpenEventLogA(NULL, eventlogname); - ok(handle != NULL, "Failed to open Event Log, got %ld\n", GetLastError()); + ok(handle != NULL, "OpenEventLogA(%s) failed : %ld\n", eventlogname, GetLastError()); i = 0; for (;;) { @@ -1056,7 +1058,7 @@ static void test_readwrite(void) /* Test clearing a real eventlog */ handle = OpenEventLogA(NULL, eventlogname); - ok(handle != NULL, "Failed to open Event Log, got %ld\n", GetLastError()); + ok(handle != NULL, "OpenEventLogA(%s) failed : %ld\n", eventlogname, GetLastError()); SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, NULL); @@ -1330,7 +1332,7 @@ static void test_eventlog_start(void) handle = OpenEventLogW(0, L"System"); if (!handle && (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { - win_skip( "Can't open event log\n" ); + win_skip( "Can't open System event log\n" ); return; } ok(handle != NULL, "OpenEventLogW(System) failed : %ld\n", GetLastError());

1 0

Francois Gouget : advapi32/tests: Add the read_write info to the failures context.
by Alexandre Julliard 13 Oct '23

13 Oct '23

Module: wine Branch: master Commit: e0c3530a741adec459e6701799a2c0c6631c27d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0c3530a741adec459e6701799a2c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 13 15:24:57 2023 +0200 advapi32/tests: Add the read_write info to the failures context. Otherwise it's impossible to know which iteration failed. --- dlls/advapi32/tests/eventlog.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 74a6be07b60..5e5e311bcbd 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -882,6 +882,8 @@ static void test_readwrite(void) DWORD oldest; BOOL run_sidtests = read_write[i].evt_sid & sidavailable; + winetest_push_context("%lu:%s", i, read_write[i].evt_src); + /* We don't need to use RegisterEventSource to report events */ if (i % 2) handle = OpenEventLogA(NULL, read_write[i].evt_src); @@ -918,6 +920,7 @@ static void test_readwrite(void) else ret = DeregisterEventSource(handle); ok(ret, "Expected success : %ld\n", GetLastError()); + winetest_pop_context(); } handle = OpenEventLogA(NULL, eventlogname); @@ -969,7 +972,9 @@ static void test_readwrite(void) char *ptr; BOOL run_sidtests = read_write[i].evt_sid & sidavailable; + winetest_push_context("%lu", i); buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); + SetLastError(0xdeadbeef); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); @@ -978,6 +983,7 @@ static void test_readwrite(void) { HeapFree(GetProcessHeap(), 0, buf); ok(GetLastError() == ERROR_HANDLE_EOF, "record %ld, got %ld\n", i, GetLastError()); + winetest_pop_context(); break; } @@ -1052,6 +1058,7 @@ static void test_readwrite(void) "Expected the closing DWORD to contain the length of the record\n"); HeapFree(GetProcessHeap(), 0, buf); + winetest_pop_context(); i++; } CloseEventLog(handle);

1 0