system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 04:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

win32u: Use the previous surface as default surface when compatible.

Browse source
This commit is contained in:
Rémi Bernon 2024-06-25 23:10:55 +02:00 committed by Alexandre Julliard
parent b09249fdc6
commit 63b0a187bd
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
dlls/win32u/window.c
View file

@ -1802,6 +1802,34 @@ static BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rect )
return TRUE;
}
static BOOL get_default_window_surface( HWND hwnd, const RECT *surface_rect, struct window_surface **surface )
{
struct window_surface *previous;
WND *win;
TRACE( "hwnd %p, surface_rect %s, surface %p\n", hwnd, wine_dbgstr_rect( surface_rect ), surface );
if (!(win = get_win_ptr( hwnd )) || win == WND_DESKTOP || win == WND_OTHER_PROCESS) return FALSE;
if ((previous = win->surface) && EqualRect( &previous->rect, surface_rect ))
{
window_surface_add_ref( (*surface = previous) );
TRACE( "trying to reuse previous surface %p\n", previous );
}
else if (!win->parent || win->parent == get_desktop_window())
{
*surface = &dummy_surface; /* provide a default surface for top-level windows */
window_surface_add_ref( *surface );
}
else
{
*surface = NULL; /* use parent surface for child windows */
TRACE( "using parent window surface\n" );
}
release_win_ptr( win );
return TRUE;
}
/***********************************************************************
* apply_window_pos
@ -1812,19 +1840,15 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags,
const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects )
{
WND *win;
HWND surface_win = 0, parent = NtUserGetAncestor( hwnd, GA_PARENT );
HWND surface_win = 0;
BOOL ret, needs_surface, needs_update = FALSE;
RECT surface_rect, visible_rect = *window_rect, old_visible_rect, old_window_rect, old_client_rect, extra_rects[3];
struct window_surface *old_surface, *new_surface = NULL;
struct window_surface *old_surface, *new_surface;
needs_surface = user_driver->pWindowPosChanging( hwnd, swp_flags, window_rect, client_rect, &visible_rect );
if (!get_surface_rect( &visible_rect, &surface_rect )) needs_surface = FALSE;
if (!parent || parent == get_desktop_window())
{
new_surface = &dummy_surface; /* provide a default surface for top-level windows */
window_surface_add_ref( new_surface );
}
if (!get_default_window_surface( hwnd, &surface_rect, &new_surface )) return FALSE;
if (!needs_surface || IsRectEmpty( &visible_rect )) needs_surface = FALSE; /* use default surface */
else needs_surface = !user_driver->pCreateWindowSurface( hwnd, swp_flags, &surface_rect, &new_surface );