[PATCH v2 0/7] MR6519: win32u: Get rid of NtUserIsWindowRectFullScreen calls.
In preparation for per-monitor DPI awareness and display settings virtualization. -- v2: win32u: Remove now unused NtUserIsWindowRectFullScreen call. winex11: Use the new fullscreen flag instead of NtUserIsWindowRectFullScreen. winewayland: Use the new fullscreen flag instead of NtUserIsWindowRectFullScreen. win32u: Pass whether a window is fullscreen to drivers WindowPosChanged. win32u: Use get_window_rect directly in clip_fullscreen_window. win32u: Use is_window_rect_fullscreen directly in clip_fullscreen_window. win32u: Use get_virtual_screen_rect directly within the module. https://gitlab.winehq.org/wine/wine/-/merge_requests/6519
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/defwnd.c | 2 +- dlls/win32u/input.c | 4 ++-- dlls/win32u/window.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index c6103276cf9..5a615f6cf3f 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2972,7 +2972,7 @@ LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { static RECT virtual_rect = {INT_MIN,INT_MIN,INT_MAX,INT_MAX}; - RECT new_rect = NtUserGetVirtualScreenRect(), old_rect = virtual_rect; + RECT new_rect = get_virtual_screen_rect( 0 ), old_rect = virtual_rect; UINT context, flags = 0; if (EqualRect( &new_rect, &old_rect )) return TRUE; diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 8e27a841dd2..735de0ed86e 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2572,7 +2572,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) ctx = set_thread_dpi_awareness_context( NTUSER_DPI_PER_MONITOR_AWARE ); monitor_info = monitor_info_from_window( hwnd, MONITOR_DEFAULTTONEAREST ); - virtual_rect = NtUserGetVirtualScreenRect(); + virtual_rect = get_virtual_screen_rect( 0 ); set_thread_dpi_awareness_context( ctx ); if (!grab_fullscreen) @@ -2630,7 +2630,7 @@ BOOL get_clip_cursor( RECT *rect, UINT dpi ) BOOL process_wine_clipcursor( HWND hwnd, UINT flags, BOOL reset ) { struct user_thread_info *thread_info = get_user_thread_info(); - RECT rect, virtual_rect = NtUserGetVirtualScreenRect(); + RECT rect, virtual_rect = get_virtual_screen_rect( 0 ); BOOL was_clipping, empty = !!(flags & SET_CURSOR_NOCLIP); TRACE( "hwnd %p, flags %#x, reset %u\n", hwnd, flags, reset ); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 0e9963c670c..f5f6dd501d4 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1843,7 +1843,7 @@ static RECT get_visible_rect( HWND hwnd, BOOL shaped, UINT style, UINT ex_style, static BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rect ) { - RECT virtual_rect = NtUserGetVirtualScreenRect(); + RECT virtual_rect = get_virtual_screen_rect( 0 ); *surface_rect = *visible_rect; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6519
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/input.c | 2 +- dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u_private.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 735de0ed86e..0e1d47b939c 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2565,7 +2565,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) dpi = get_dpi_for_window( hwnd ); if (!NtUserGetWindowRect( hwnd, &rect, dpi )) return FALSE; - if (!NtUserIsWindowRectFullScreen( &rect, dpi )) return FALSE; + if (!is_window_rect_full_screen( &rect, dpi )) return FALSE; if (is_captured_by_system()) return FALSE; if (NtGetTickCount() - thread_info->clipping_reset < 1000) return FALSE; if (!reset && clipping_cursor && thread_info->clipping_cursor) return FALSE; /* already clipping */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 70e330e6017..86551cc4bfc 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2466,7 +2466,7 @@ RECT get_virtual_screen_rect( UINT dpi ) return rect; } -static BOOL is_window_rect_full_screen( const RECT *rect, UINT dpi ) +BOOL is_window_rect_full_screen( const RECT *rect, UINT dpi ) { struct monitor *monitor; BOOL ret = FALSE; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index aa411d8addb..e7a5791dc92 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -180,6 +180,7 @@ extern UINT set_thread_dpi_awareness_context( UINT context ); extern UINT get_thread_dpi_awareness_context(void); extern RECT get_virtual_screen_rect( UINT dpi ); extern BOOL is_exiting_thread( DWORD tid ); +extern BOOL is_window_rect_full_screen( const RECT *rect, UINT dpi ); extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ); extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ); extern HRGN map_dpi_region( HRGN region, UINT dpi_from, UINT dpi_to ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6519
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 0e1d47b939c..e6b2d106b18 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2564,7 +2564,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE; dpi = get_dpi_for_window( hwnd ); - if (!NtUserGetWindowRect( hwnd, &rect, dpi )) return FALSE; + if (!get_window_rect( hwnd, &rect, dpi )) return FALSE; if (!is_window_rect_full_screen( &rect, dpi )) return FALSE; if (is_captured_by_system()) return FALSE; if (NtGetTickCount() - thread_info->clipping_reset < 1000) return FALSE; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6519
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/driver.c | 4 ++-- dlls/win32u/window.c | 5 +++-- dlls/wineandroid.drv/android.h | 4 ++-- dlls/wineandroid.drv/window.c | 4 ++-- dlls/winemac.drv/macdrv.h | 4 ++-- dlls/winemac.drv/window.c | 4 ++-- dlls/winewayland.drv/waylanddrv.h | 4 ++-- dlls/winewayland.drv/window.c | 4 ++-- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 4 ++-- include/wine/gdi_driver.h | 2 +- 11 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 3e094264d15..995b3cab6d9 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -900,8 +900,8 @@ static void nulldrv_MoveWindowBits( HWND hwnd, const struct window_rects *new_re { } -static void nulldrv_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, const struct window_rects *new_rects, - struct window_surface *surface ) +static void nulldrv_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, BOOL fullscreen, + const struct window_rects *new_rects, struct window_surface *surface ) { } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index f5f6dd501d4..c325f9438d3 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1971,13 +1971,14 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, stru struct window_rects monitor_rects; WND *win; HWND surface_win = 0; - BOOL ret, is_layered, needs_update = FALSE; + BOOL ret, is_fullscreen, is_layered, needs_update = FALSE; struct window_rects old_rects; RECT extra_rects[3]; struct window_surface *old_surface; UINT monitor_dpi; is_layered = new_surface && new_surface->alpha_mask; + is_fullscreen = is_window_rect_full_screen( &new_rects->visible, get_thread_dpi() ); get_window_rects( hwnd, COORDS_SCREEN, &old_rects, get_thread_dpi() ); if (IsRectEmpty( &valid_rects[0] ) || is_layered) valid_rects = NULL; @@ -2103,7 +2104,7 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, stru } } - user_driver->pWindowPosChanged( hwnd, insert_after, swp_flags, &monitor_rects, get_driver_window_surface( new_surface, monitor_dpi ) ); + user_driver->pWindowPosChanged( hwnd, insert_after, swp_flags, is_fullscreen, &monitor_rects, get_driver_window_surface( new_surface, monitor_dpi ) ); } return ret; diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index c48b7c7b121..63884b012fe 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -97,8 +97,8 @@ extern UINT ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ); extern LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ); extern BOOL ANDROID_WindowPosChanging( HWND hwnd, UINT swp_flags, BOOL shaped, const struct window_rects *rects ); extern BOOL ANDROID_CreateWindowSurface( HWND hwnd, BOOL layered, const RECT *surface_rect, struct window_surface **surface ); -extern void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, const struct window_rects *new_rects, - struct window_surface *surface ); +extern void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, BOOL fullscreen, + const struct window_rects *new_rects, struct window_surface *surface ); /* unixlib interface */ diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 537aae456e7..b7726bcf5d7 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1060,8 +1060,8 @@ BOOL ANDROID_CreateWindowSurface( HWND hwnd, BOOL layered, const RECT *surface_r /*********************************************************************** * ANDROID_WindowPosChanged */ -void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, const struct window_rects *new_rects, - struct window_surface *surface ) +void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, BOOL fullscreen, + const struct window_rects *new_rects, struct window_surface *surface ) { struct android_win_data *data; UINT new_style = NtUserGetWindowLongW( hwnd, GWL_STYLE ); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index f9ada39d38a..d3c54d72542 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -156,8 +156,8 @@ extern void macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alph extern BOOL macdrv_GetWindowStyleMasks(HWND hwnd, UINT style, UINT ex_style, UINT *style_mask, UINT *ex_style_mask); extern BOOL macdrv_CreateWindowSurface(HWND hwnd, BOOL layered, const RECT *surface_rect, struct window_surface **surface); extern void macdrv_MoveWindowBits(HWND hwnd, const struct window_rects *new_rects, const RECT *valid_rects); -extern void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, const struct window_rects *new_rects, - struct window_surface *surface); +extern void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, BOOL fullscreen, + const struct window_rects *new_rects, struct window_surface *surface); extern void macdrv_DestroyCursorIcon(HCURSOR cursor); extern BOOL macdrv_GetCursorPos(LPPOINT pos); extern void macdrv_SetCapture(HWND hwnd, UINT flags); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 824475a9b34..f8235d93e24 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1817,8 +1817,8 @@ BOOL macdrv_GetWindowStyleMasks(HWND hwnd, UINT style, UINT ex_style, UINT *styl /*********************************************************************** * WindowPosChanged (MACDRV.@) */ -void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, const struct window_rects *new_rects, - struct window_surface *surface) +void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, BOOL fullscreen, + const struct window_rects *new_rects, struct window_surface *surface) { struct macdrv_thread_data *thread_data; struct macdrv_win_data *data; diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 9de42758aa1..8946c4aafbb 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -353,8 +353,8 @@ void WAYLAND_SetWindowText(HWND hwnd, LPCWSTR text); LRESULT WAYLAND_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam); UINT WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manager, void *param); LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp); -void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, const struct window_rects *new_rects, - struct window_surface *surface); +void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, BOOL fullscreen, + const struct window_rects *new_rects, struct window_surface *surface); BOOL WAYLAND_WindowPosChanging(HWND hwnd, UINT swp_flags, BOOL shaped, const struct window_rects *rects); BOOL WAYLAND_CreateWindowSurface(HWND hwnd, BOOL layered, const RECT *surface_rect, struct window_surface **surface); UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs); diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index d27a16456d2..d1be6b28d4c 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -435,8 +435,8 @@ BOOL WAYLAND_WindowPosChanging(HWND hwnd, UINT swp_flags, BOOL shaped, const str /*********************************************************************** * WAYLAND_WindowPosChanged */ -void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, const struct window_rects *new_rects, - struct window_surface *surface) +void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, BOOL fullscreen, + const struct window_rects *new_rects, struct window_surface *surface) { struct wayland_win_data *data; BOOL managed; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 24e926d229f..78f296fd7f3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2580,8 +2580,8 @@ BOOL X11DRV_GetWindowStyleMasks( HWND hwnd, UINT style, UINT ex_style, UINT *sty /*********************************************************************** * WindowPosChanged (X11DRV.@) */ -void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, const struct window_rects *new_rects, - struct window_surface *surface ) +void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, BOOL fullscreen, + const struct window_rects *new_rects, struct window_surface *surface ) { struct x11drv_thread_data *thread_data; struct x11drv_win_data *data; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a207db1c4a1..6d328778bb6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -247,8 +247,8 @@ extern BOOL X11DRV_WindowPosChanging( HWND hwnd, UINT swp_flags, BOOL shaped, co extern BOOL X11DRV_GetWindowStyleMasks( HWND hwnd, UINT style, UINT ex_style, UINT *style_mask, UINT *ex_style_mask ); extern BOOL X11DRV_CreateWindowSurface( HWND hwnd, BOOL layered, const RECT *surface_rect, struct window_surface **surface ); extern void X11DRV_MoveWindowBits( HWND hwnd, const struct window_rects *new_rects, const RECT *valid_rects ); -extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, const struct window_rects *new_rects, - struct window_surface *surface ); +extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, BOOL fullscreen, + const struct window_rects *new_rects, struct window_surface *surface ); extern BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ); extern void X11DRV_ThreadDetach(void); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index fee065af71b..a5ceae87022 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -389,7 +389,7 @@ struct user_driver_funcs BOOL (*pGetWindowStyleMasks)(HWND,UINT,UINT,UINT*,UINT*); BOOL (*pCreateWindowSurface)(HWND,BOOL,const RECT *,struct window_surface**); void (*pMoveWindowBits)(HWND,const struct window_rects *,const RECT *); - void (*pWindowPosChanged)(HWND,HWND,UINT,const struct window_rects*,struct window_surface*); + void (*pWindowPosChanged)(HWND,HWND,UINT,BOOL,const struct window_rects*,struct window_surface*); /* system parameters */ BOOL (*pSystemParametersInfo)(UINT,UINT,void*,UINT); /* vulkan support */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6519
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/window.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 8946c4aafbb..3dee8e432df 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -286,6 +286,7 @@ struct wayland_win_data struct wayland_client_surface *client_surface; /* window rects, relative to parent client area */ struct window_rects rects; + BOOL is_fullscreen; BOOL managed; }; diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index d1be6b28d4c..66e34d4f5bc 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -167,7 +167,7 @@ static void wayland_win_data_get_config(struct wayland_win_data *data, 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, get_win_monitor_dpi(data->hwnd))) + if (data->is_fullscreen) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) window_state |= WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED; @@ -451,6 +451,7 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, BOOL if (!(data = wayland_win_data_get(hwnd))) return; data->rects = *new_rects; + data->is_fullscreen = fullscreen; data->managed = managed; wayland_win_data_update_wayland_surface(data); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6519
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/event.c | 5 ++--- dlls/winex11.drv/window.c | 10 ++++++---- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 9271758090e..ea0fab4611e 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1031,7 +1031,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) struct x11drv_win_data *data; RECT rect; POINT pos; - UINT flags, dpi; + UINT flags; HWND parent; BOOL root_coords; int cx, cy, x = event->x, y = event->y; @@ -1053,7 +1053,6 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) /* Get geometry */ - dpi = get_win_monitor_dpi( data->hwnd ); parent = NtUserGetAncestor( hwnd, GA_PARENT ); root_coords = event->send_event; /* synthetic events are always in root coords */ @@ -1106,7 +1105,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) (int)(data->rects.window.bottom - data->rects.window.top), cx, cy ); style = NtUserGetWindowLongW( data->hwnd, GWL_STYLE ); - if ((style & WS_CAPTION) == WS_CAPTION || !NtUserIsWindowRectFullScreen( &data->rects.visible, dpi )) + if ((style & WS_CAPTION) == WS_CAPTION || !data->is_fullscreen) { read_net_wm_states( event->display, data ); if ((data->net_wm_state & (1 << NET_WM_STATE_MAXIMIZED))) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 78f296fd7f3..87eafc2e68d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -297,7 +297,7 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl { if (style & WS_THICKFRAME) return TRUE; /* Metacity needs the window to be resizable to make it fullscreen */ - return NtUserIsWindowRectFullScreen( &data->rects.visible, get_win_monitor_dpi( data->hwnd ) ); + return data->is_fullscreen; } /*********************************************************************** @@ -1103,7 +1103,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) style = NtUserGetWindowLongW( data->hwnd, GWL_STYLE ); if (style & WS_MINIMIZE) new_state |= data->net_wm_state & ((1 << NET_WM_STATE_FULLSCREEN)|(1 << NET_WM_STATE_MAXIMIZED)); - if (NtUserIsWindowRectFullScreen( &data->rects.visible, get_win_monitor_dpi( data->hwnd ) )) + if (data->is_fullscreen) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) new_state |= (1 << NET_WM_STATE_MAXIMIZED); @@ -2587,6 +2587,7 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, BOOL struct x11drv_win_data *data; UINT new_style = NtUserGetWindowLongW( hwnd, GWL_STYLE ); struct window_rects old_rects; + BOOL was_fullscreen; int event_type; if (!(data = get_win_data( hwnd ))) return; @@ -2594,7 +2595,9 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, BOOL thread_data = x11drv_thread_data(); old_rects = data->rects; + was_fullscreen = data->is_fullscreen; data->rects = *new_rects; + data->is_fullscreen = fullscreen; TRACE( "win %p/%lx new_rects %s style %08x flags %08x\n", hwnd, data->whole_window, debugstr_window_rects(new_rects), new_style, swp_flags ); @@ -2633,8 +2636,7 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, BOOL { release_win_data( data ); unmap_window( hwnd ); - if (NtUserIsWindowRectFullScreen( &old_rects.window, get_win_monitor_dpi( hwnd ) )) - NtUserClipCursor( NULL ); + if (was_fullscreen) NtUserClipCursor( NULL ); if (!(data = get_win_data( hwnd ))) return; } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6d328778bb6..edb47f550e7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -612,6 +612,7 @@ struct x11drv_win_data UINT skip_taskbar : 1; /* does window should be deleted from taskbar */ UINT add_taskbar : 1; /* does window should be added to taskbar regardless of style */ UINT net_wm_fullscreen_monitors_set : 1; /* is _NET_WM_FULLSCREEN_MONITORS set */ + UINT is_fullscreen : 1; /* is the window visible rect fullscreen */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6519
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 3 --- include/ntuser.h | 6 ------ 2 files changed, 9 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 86551cc4bfc..f07f0d53628 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -6673,9 +6673,6 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return adjust_window_rect( (RECT *)arg1, params->style, params->menu, params->ex_style, params->dpi ); } - case NtUserCallTwoParam_IsWindowRectFullScreen: - return is_window_rect_full_screen( (const RECT *)arg1, arg2 ); - /* temporary exports */ case NtUserAllocWinProc: return (UINT_PTR)alloc_winproc( (WNDPROC)arg1, arg2 ); diff --git a/include/ntuser.h b/include/ntuser.h index 0a364e9f700..e6f75ea9121 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1072,7 +1072,6 @@ enum NtUserCallTwoParam_SetIMECompositionWindowPos, NtUserCallTwoParam_UnhookWindowsHook, NtUserCallTwoParam_AdjustWindowRect, - NtUserCallTwoParam_IsWindowRectFullScreen, /* temporary exports */ NtUserAllocWinProc, }; @@ -1147,11 +1146,6 @@ static inline BOOL NtUserAdjustWindowRect( RECT *rect, DWORD style, BOOL menu, D return NtUserCallTwoParam( (ULONG_PTR)rect, (ULONG_PTR)¶ms, NtUserCallTwoParam_AdjustWindowRect ); } -static inline BOOL NtUserIsWindowRectFullScreen( const RECT *rect, UINT dpi ) -{ - return NtUserCallTwoParam( (UINT_PTR)rect, dpi, NtUserCallTwoParam_IsWindowRectFullScreen ); -} - /* NtUserCallHwnd codes, not compatible with Windows */ enum { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6519
v2: Fix mac build, not sure what went wrong with the linux one. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6519#note_82524
participants (1)
-
Rémi Bernon