[PATCH v3 0/1] MR2342: Revert "server: Don't invalidate the newly exposed child region on the parent...
Revert "server: Don't invalidate the newly exposed child region on the parent if it doesn't clip children." This reverts commit 33617af8145b6fadfe41d48968a728ff57b3064b. Apparently, the aforementioned commit might cause the expose region to be incorrectly computed when a window transitions from invisible state to visible state. The commit also had caused regression in the following apps: - Wine regedit.exe (bug 54268) - Dn-FamiTracker (bug 52903) - Unity Assets Bundle Extractor (same cause behind bug 52903) It appears that the commit catalyzes discovery of hidden bugs in Wine's window repaint logic. It's also possible that the algorithm for computing the expose region is incomplete. For these reasons, revert this commit for now. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54268 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52903 -- v3: Revert "server: Don't invalidate the newly exposed child region on the parent if it doesn't clip children." https://gitlab.winehq.org/wine/wine/-/merge_requests/2342
From: Jinoh Kang <jinoh.kang.kr(a)gmail.com> This reverts commit 33617af8145b6fadfe41d48968a728ff57b3064b. Apparently, the aforementioned commit might cause the expose region to be incorrectly computed when a window transitions from invisible state to visible state. The commit also had caused regression in the following apps: - Wine regedit.exe (bug 54268) - Dn-FamiTracker (bug 52903) - Unity Assets Bundle Extractor (same cause behind bug 52903) It appears that the commit catalyzes discovery of hidden bugs in Wine's window repaint logic. It's also possible that the algorithm for computing the expose region is incomplete. For these reasons, revert this commit for now. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54268 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52903 --- dlls/user32/tests/msg.c | 4 ++++ server/window.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6faaa2c2f40..8813e56fb8f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9317,6 +9317,8 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare } else { + todo_wine_if( !EqualRect( &rect_old, &rect_new ) && + (extest->style & WS_CLIPCHILDREN) == 0 && !is_composited ) ok( !!rgn_ok, "Parent update region shall match expected region\n" ); } @@ -9378,6 +9380,8 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare } else { + todo_wine_if( !EqualRect( &rect_old, &rect_new ) && + (extest->style & WS_CLIPCHILDREN) == 0 && !is_composited ) ok( !!rgn_ok, "Child update region shall match expected region\n" ); } diff --git a/server/window.c b/server/window.c index f713ed224aa..5dbe1cd1eb2 100644 --- a/server/window.c +++ b/server/window.c @@ -1766,8 +1766,10 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ offset_region( new_vis_rgn, win->window_rect.left - old_window_rect->left, win->window_rect.top - old_window_rect->top ); - if (is_composited ? union_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) - : subtract_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) + if (is_composited ? union_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) : + (win->parent->style & WS_CLIPCHILDREN) ? + subtract_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) : + xor_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) { if (!is_region_empty( new_vis_rgn )) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2342
This merge request was closed by Jinoh Kang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2342
participants (2)
-
Jinoh Kang -
Jinoh Kang (＠iamahuman)