[PATCH 0/4] MR8097: server: Remove redundant `frame` parameter from redraw_window().

[Jinoh Kang (＠iamahuman)]

Related: !8095 and !8013.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8097

[PATCH 1/4] server: Add internal WINE_RDW_NESTED to indicate nested redraw_window() calls

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

---
 server/window.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/window.c b/server/window.c
index 914d376a44a..7dcce310959 100644
--- a/server/window.c
+++ b/server/window.c
@@ -1616,6 +1616,8 @@ static void validate_parents( struct window *child )
 }
 
 
+#define WINE_RDW_NESTED 0x80000000U
+
 /* add/subtract a region (in client coordinates) to the update region of the window */
 static void redraw_window( struct window *win, struct region *region, int frame, unsigned int flags )
 {
@@ -1688,7 +1690,7 @@ static void redraw_window( struct window *win, struct region *region, int frame,
             if (rect_in_region( child_rgn, &child->window_rect ))
             {
                 offset_region( child_rgn, -child->client_rect.left, -child->client_rect.top );
-                redraw_window( child, child_rgn, 1, flags );
+                redraw_window( child, child_rgn, 1, flags | WINE_RDW_NESTED );
             }
         }
         free_region( child_rgn );
@@ -2985,7 +2987,7 @@ DECL_HANDLER(redraw_window)
         }
     }
 
-    redraw_window( win, region, (flags & RDW_INVALIDATE) && (flags & RDW_FRAME), flags );
+    redraw_window( win, region, (flags & RDW_INVALIDATE) && (flags & RDW_FRAME), flags & ~WINE_RDW_NESTED );
     if (region) free_region( region );
 }
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8097

[PATCH 2/4] server: Assert that `frame` can be computed from flags in redraw_window().

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

---
 server/window.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/window.c b/server/window.c
index 7dcce310959..7fed5d955a0 100644
--- a/server/window.c
+++ b/server/window.c
@@ -1626,6 +1626,7 @@ static void redraw_window( struct window *win, struct region *region, int frame,
 
     if (flags & RDW_INVALIDATE)
     {
+        assert( frame == !!(flags & RDW_FRAME) );
         if (!(tmp = crop_region_to_win_rect( win, region, frame ))) return;
 
         if (!add_update_region( win, tmp )) return;
@@ -1641,6 +1642,7 @@ static void redraw_window( struct window *win, struct region *region, int frame,
         }
         else if (win->update_region)
         {
+            assert( frame == !!(flags & WINE_RDW_NESTED) );
             if ((tmp = crop_region_to_win_rect( win, region, frame )))
             {
                 if (!subtract_region( tmp, win->update_region, tmp ))
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8097

[PATCH 3/4] server: Recompute `frame` from flags in redraw_window().

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

---
 server/window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/window.c b/server/window.c
index 7fed5d955a0..a12c974db81 100644
--- a/server/window.c
+++ b/server/window.c
@@ -1626,7 +1626,7 @@ static void redraw_window( struct window *win, struct region *region, int frame,
 
     if (flags & RDW_INVALIDATE)
     {
-        assert( frame == !!(flags & RDW_FRAME) );
+        const int frame = !!(flags & RDW_FRAME);
         if (!(tmp = crop_region_to_win_rect( win, region, frame ))) return;
 
         if (!add_update_region( win, tmp )) return;
@@ -1642,7 +1642,7 @@ static void redraw_window( struct window *win, struct region *region, int frame,
         }
         else if (win->update_region)
         {
-            assert( frame == !!(flags & WINE_RDW_NESTED) );
+            const int frame = !!(flags & WINE_RDW_NESTED);
             if ((tmp = crop_region_to_win_rect( win, region, frame )))
             {
                 if (!subtract_region( tmp, win->update_region, tmp ))
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8097

[PATCH 4/4] server: Remove unused parameter `frame` from redraw_window().

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

---
 server/window.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/window.c b/server/window.c
index a12c974db81..79f7459f59e 100644
--- a/server/window.c
+++ b/server/window.c
@@ -1619,7 +1619,7 @@ static void validate_parents( struct window *child )
 #define WINE_RDW_NESTED 0x80000000U
 
 /* add/subtract a region (in client coordinates) to the update region of the window */
-static void redraw_window( struct window *win, struct region *region, int frame, unsigned int flags )
+static void redraw_window( struct window *win, struct region *region, unsigned int flags )
 {
     struct region *child_rgn, *tmp;
     struct window *child;
@@ -1692,7 +1692,7 @@ static void redraw_window( struct window *win, struct region *region, int frame,
             if (rect_in_region( child_rgn, &child->window_rect ))
             {
                 offset_region( child_rgn, -child->client_rect.left, -child->client_rect.top );
-                redraw_window( child, child_rgn, 1, flags | WINE_RDW_NESTED );
+                redraw_window( child, child_rgn, flags | WINE_RDW_NESTED );
             }
         }
         free_region( child_rgn );
@@ -1889,7 +1889,7 @@ static struct region *expose_window( struct window *win, const struct rectangle
             {
                 /* make it relative to parent */
                 offset_region( new_vis_rgn, old_window_rect->left, old_window_rect->top );
-                redraw_window( win->parent, new_vis_rgn, 0, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN );
+                redraw_window( win->parent, new_vis_rgn, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN );
             }
         }
     }
@@ -2060,7 +2060,7 @@ static void set_window_pos( struct window *win, struct window *previous,
     }
 
     if (exposed_rgn)
-        redraw_window( win, exposed_rgn, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN );
+        redraw_window( win, exposed_rgn, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN );
 
 done:
     if (old_vis_rgn) free_region( old_vis_rgn );
@@ -2085,7 +2085,7 @@ static void set_window_region( struct window *win, struct region *region, int re
     /* expose anything revealed by the change */
     if (old_vis_rgn && ((exposed_rgn = expose_window( win, &win->window_rect, old_vis_rgn, 0 ))))
     {
-        redraw_window( win, exposed_rgn, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN );
+        redraw_window( win, exposed_rgn, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN );
         free_region( exposed_rgn );
     }
 
@@ -2989,7 +2989,7 @@ DECL_HANDLER(redraw_window)
         }
     }
 
-    redraw_window( win, region, (flags & RDW_INVALIDATE) && (flags & RDW_FRAME), flags & ~WINE_RDW_NESTED );
+    redraw_window( win, region, flags & ~WINE_RDW_NESTED );
     if (region) free_region( region );
 }
 
@@ -3165,7 +3165,7 @@ DECL_HANDLER(set_window_layered_info)
         win->layered_flags = req->flags;
         win->is_layered    = 1;
         /* repaint since we know now it's not going to use UpdateLayeredWindow */
-        if (!was_layered) redraw_window( win, 0, 1, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_ERASE | RDW_FRAME );
+        if (!was_layered) redraw_window( win, 0, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_ERASE | RDW_FRAME );
     }
     else set_win32_error( ERROR_INVALID_WINDOW_HANDLE );
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8097

[Jinoh Kang (＠iamahuman)]

> user32:win win.c:11372 Test failed: Expected foreground window 014300B0, got 011D013E

This seem unrelated, the same as error !8010.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8097#note_104024

[Rémi Bernon]

Well I don't think this is worth four commits.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8097#note_104032