[PATCH v5 0/4] MR8095: server: Update full window invalidate rect with window resize.

[Rémi Bernon (＠rbernon)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58210
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38975

Supersedes https://gitlab.winehq.org/wine/wine/-/merge_requests/8013

--
  v5: server: Update fill window invalidate rect with window resize.
      server: Pass NULL as child region if region is NULL.
      server: Get rid of unnecessary frame parameter.

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

[PATCH v5 1/4] user32/tests: Add tests for NULL invalidated rect with window resize.

[Paul Gofman]

From: Paul Gofman

---
 dlls/user32/tests/win.c | 137 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 166653f0d2c..dc7e7387cdf 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -126,6 +126,17 @@ static void flush_events( BOOL remove_messages )
     }
 }

+static void pump_messages(void)
+{
+    MSG msg;
+
+    while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE))
+    {
+        TranslateMessage(&msg);
+        DispatchMessageA(&msg);
+    }
+}
+
 /* check the values returned by the various parent/owner functions on a given window */
 static void check_parents( HWND hwnd, HWND ga_parent, HWND gwl_parent, HWND get_parent,
                            HWND gw_owner, HWND ga_root, HWND ga_root_owner )
@@ -10880,6 +10891,8 @@ static void test_update_region(void)
     const RECT rc = {15, 15, 40, 40};
     const POINT wnd_orig = {30, 20};
     const POINT child_orig = {10, 5};
+    RECT r, expect_rect;
+    BOOL bret;

parent = CreateWindowExA(0, "MainWindowClass", NULL,
                 WS_VISIBLE | WS_CLIPCHILDREN,
@@ -10937,7 +10950,131 @@ static void test_update_region(void)

DeleteObject(rgn1);
     DeleteObject(rgn2);
+
+    pump_messages();
+    /* Test that NULL invalidated region means current full client rect and not the one at the moment of
+     * invalidation. */
+    ValidateRect(parent, NULL);
+    GetUpdateRect(parent, &r, FALSE);
+    SetRect(&expect_rect, 0, 0, 0, 0);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    InvalidateRect(parent, NULL, FALSE);
+    SetRect(&r, 0, 0, 10, 10);
+    /* Adding a rectangle to NULL one still keeps that as full window. */
+    InvalidateRect(parent, &r, FALSE);
+    GetUpdateRect(parent, &r, FALSE);
+    GetClientRect(parent, &expect_rect);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    SetWindowPos(parent, NULL, 0, 0, 350, 200, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    GetUpdateRect(parent, &r, FALSE);
+    GetClientRect(parent, &expect_rect);
+    todo_wine ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    ValidateRect(parent, NULL);
+
+    SetWindowPos(parent, NULL, 0, 0, 300, 150, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    GetUpdateRect(parent, &r, FALSE);
+    SetRect(&expect_rect, 0, 0, 0, 0);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    RedrawWindow(parent, NULL, 0, RDW_INVALIDATE | RDW_FRAME);
+    RedrawWindow(parent, NULL, 0, RDW_INVALIDATE);
+    GetUpdateRect(parent, &r, FALSE);
+    GetClientRect(parent, &expect_rect);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    SetWindowPos(parent, NULL, 0, 0, 350, 200, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    GetUpdateRect(parent, &r, FALSE);
+    GetClientRect(parent, &expect_rect);
+    todo_wine ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    pump_messages();
+    RedrawWindow(parent, NULL, 0, RDW_VALIDATE | RDW_FRAME | RDW_ALLCHILDREN);
+
+    ValidateRect(hwnd, NULL);
+    SetRect(&expect_rect, 0, 0, 0, 0);
+    GetUpdateRect(hwnd, &r, FALSE);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    GetClientRect(hwnd, &expect_rect);
+    RedrawWindow(parent, NULL, 0, RDW_INVALIDATE | RDW_ALLCHILDREN);
+    GetUpdateRect(hwnd, &r, FALSE);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    SetWindowPos(hwnd, NULL, 0, 0, 205, 105, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    SetWindowPos(hwnd, NULL, 0, 0, 210, 110, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    GetUpdateRect(hwnd, &r, FALSE);
+    GetClientRect(hwnd, &expect_rect);
+    todo_wine ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    ValidateRect(hwnd, NULL);
+    ValidateRect(parent, NULL);
+    SetWindowPos(hwnd, NULL, 0, 0, 200, 100, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+
+    SetRect(&expect_rect, 0, 0, 0, 0);
+    GetUpdateRect(hwnd, &r, FALSE);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    GetClientRect(hwnd, &expect_rect);
+    InvalidateRect(hwnd, NULL, FALSE);
+    GetUpdateRect(hwnd, &r, FALSE);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    SetWindowPos(hwnd, NULL, 0, 0, 210, 110, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    GetUpdateRect(hwnd, &r, FALSE);
+    GetClientRect(hwnd, &expect_rect);
+    todo_wine ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    ValidateRect(hwnd, NULL);
+    ValidateRect(parent, NULL);
+    SetWindowPos(hwnd, NULL, 0, 0, 200, 100, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+
+    SetRect(&expect_rect, 0, 0, 0, 0);
+    GetUpdateRect(hwnd, &r, FALSE);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    GetClientRect(hwnd, &expect_rect);
+    InvalidateRect(hwnd, NULL, FALSE);
+    GetUpdateRect(hwnd, &r, FALSE);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    /* Child window bottom is outside parent window. Invalidated area is still new child window extents
+     * coordinates cropped to visible part. */
+    SetWindowPos(hwnd, NULL, 0, 150, 210, 100, SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    GetClientRect(hwnd, &expect_rect);
+    GetClientRect(parent, &r);
+    expect_rect.bottom = r.bottom - 150;
+    GetUpdateRect(hwnd, &r, FALSE);
+    todo_wine ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    ValidateRect(hwnd, NULL);
+    ValidateRect(parent, NULL);
+    SetWindowPos(hwnd, NULL, 0, 0, 200, 100, SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+
+    SetWindowPos(parent, NULL, 0, 0, 300, 150, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    GetUpdateRect(parent, &r, FALSE);
+    SetRect(&expect_rect, 0, 0, 0, 0);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+
+    GetClientRect(parent, &r);
+    InvalidateRect(parent, &r, FALSE);
+    expect_rect = r;
+    GetUpdateRect(parent, &r, FALSE);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    SetWindowPos(parent, NULL, 0, 0, 350, 200, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    GetUpdateRect(parent, &r, FALSE);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    GetClientRect(parent, &r);
+    ok(!EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+
+    ValidateRect(parent, NULL);
+    SetWindowPos(parent, NULL, 0, 0, 300, 150, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    GetUpdateRect(parent, &r, FALSE);
+    SetRect(&expect_rect, 0, 0, 0, 0);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    InvalidateRect(parent, NULL, FALSE);
+    SetRect(&r, 0, 0, 0, 0);
+    /* Subtracting empty rectangle from update region turns 'full client rect' into the specific coordinates
+     * region (unlike adding rectangle). */
+    bret = ValidateRect(parent, &r);
+    ok(bret, "got error %lu.\n", GetLastError());
+    GetClientRect(parent, &expect_rect);
+    GetUpdateRect(parent, &r, FALSE);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    SetWindowPos(parent, NULL, 0, 0, 350, 200, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    GetUpdateRect(parent, &r, FALSE);
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+
+    ValidateRect(parent, NULL);
     DestroyWindow(parent);
+    pump_messages();
 }

static void test_window_without_child_style(void)

[PATCH v5 2/4] server: Get rid of unnecessary frame parameter.

[Rémi Bernon]

From: Rémi Bernon

---
 server/window.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/server/window.c b/server/window.c
index 914d376a44a..375bf613dc3 100644
--- a/server/window.c
+++ b/server/window.c
@@ -1617,14 +1617,14 @@ static void validate_parents( struct window *child )

/* 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;

if (flags & RDW_INVALIDATE)
     {
-        if (!(tmp = crop_region_to_win_rect( win, region, frame ))) return;
+        if (!(tmp = crop_region_to_win_rect( win, region, (flags & RDW_FRAME) ))) return;

if (!add_update_region( win, tmp )) return;

@@ -1639,7 +1639,7 @@ static void redraw_window( struct window *win, struct region *region, int frame,
         }
         else if (win->update_region)
         {
-            if ((tmp = crop_region_to_win_rect( win, region, frame )))
+            if ((tmp = crop_region_to_win_rect( win, region, (flags & RDW_FRAME) )))
             {
                 if (!subtract_region( tmp, win->update_region, tmp ))
                 {
@@ -1676,8 +1676,6 @@ static void redraw_window( struct window *win, struct region *region, int frame,
     offset_region( tmp, win->window_rect.left - win->client_rect.left,
                    win->window_rect.top - win->client_rect.top );

-    if (flags & RDW_INVALIDATE) flags |= RDW_FRAME | RDW_ERASE;
-
     LIST_FOR_EACH_ENTRY( child, &win->children, struct window, entry )
     {
         if (!(child->style & WS_VISIBLE)) continue;
@@ -1688,7 +1686,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, flags | RDW_FRAME | RDW_ERASE );
             }
         }
         free_region( child_rgn );
@@ -1885,7 +1883,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 );
             }
         }
     }
@@ -2056,7 +2054,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 );
@@ -2081,7 +2079,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 );
     }

@@ -2985,7 +2983,10 @@ DECL_HANDLER(redraw_window)
         }
     }

-    redraw_window( win, region, (flags & RDW_INVALIDATE) && (flags & RDW_FRAME), flags );
+    /* clear the RDW_FRAME flag if not meaningful, redraw_window reuses it for its internal purposes */
+    if (!(flags & RDW_INVALIDATE)) flags &= ~RDW_FRAME;
+
+    redraw_window( win, region, flags );
     if (region) free_region( region );
 }

@@ -3161,7 +3162,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 );
 }

[PATCH v5 3/4] server: Pass NULL as child region if region is NULL.

[Rémi Bernon]

From: Rémi Bernon

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

diff --git a/server/window.c b/server/window.c
index 375bf613dc3..6c042a9ab2c 100644
--- a/server/window.c
+++ b/server/window.c
@@ -1686,7 +1686,7 @@ static void redraw_window( struct window *win, struct region *region, unsigned i
             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, flags | RDW_FRAME | RDW_ERASE );
+                redraw_window( child, region ? child_rgn : NULL, flags | RDW_FRAME | RDW_ERASE );
             }
         }
         free_region( child_rgn );

[PATCH v5 4/4] server: Update fill window invalidate rect with window resize.

[Paul Gofman]

From: Paul Gofman

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58210
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38975
---
 dlls/user32/tests/win.c | 10 +++++-----
 server/window.c         |  9 ++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index dc7e7387cdf..fc1b79d0628 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -10968,7 +10968,7 @@ static void test_update_region(void)
     SetWindowPos(parent, NULL, 0, 0, 350, 200, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
     GetUpdateRect(parent, &r, FALSE);
     GetClientRect(parent, &expect_rect);
-    todo_wine ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
     ValidateRect(parent, NULL);

SetWindowPos(parent, NULL, 0, 0, 300, 150, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
@@ -10983,7 +10983,7 @@ static void test_update_region(void)
     SetWindowPos(parent, NULL, 0, 0, 350, 200, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
     GetUpdateRect(parent, &r, FALSE);
     GetClientRect(parent, &expect_rect);
-    todo_wine ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
     pump_messages();
     RedrawWindow(parent, NULL, 0, RDW_VALIDATE | RDW_FRAME | RDW_ALLCHILDREN);

@@ -10999,7 +10999,7 @@ static void test_update_region(void)
     SetWindowPos(hwnd, NULL, 0, 0, 210, 110, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
     GetUpdateRect(hwnd, &r, FALSE);
     GetClientRect(hwnd, &expect_rect);
-    todo_wine ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
     ValidateRect(hwnd, NULL);
     ValidateRect(parent, NULL);
     SetWindowPos(hwnd, NULL, 0, 0, 200, 100, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
@@ -11014,7 +11014,7 @@ static void test_update_region(void)
     SetWindowPos(hwnd, NULL, 0, 0, 210, 110, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
     GetUpdateRect(hwnd, &r, FALSE);
     GetClientRect(hwnd, &expect_rect);
-    todo_wine ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
     ValidateRect(hwnd, NULL);
     ValidateRect(parent, NULL);
     SetWindowPos(hwnd, NULL, 0, 0, 200, 100, SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
@@ -11033,7 +11033,7 @@ static void test_update_region(void)
     GetClientRect(parent, &r);
     expect_rect.bottom = r.bottom - 150;
     GetUpdateRect(hwnd, &r, FALSE);
-    todo_wine ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
+    ok(EqualRect(&r, &expect_rect), "got %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&expect_rect));
     ValidateRect(hwnd, NULL);
     ValidateRect(parent, NULL);
     SetWindowPos(hwnd, NULL, 0, 0, 200, 100, SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
diff --git a/server/window.c b/server/window.c
index 6c042a9ab2c..d4a0843e59c 100644
--- a/server/window.c
+++ b/server/window.c
@@ -134,6 +134,7 @@ static const struct object_ops window_ops =
 #define PAINT_NONCLIENT          0x0040  /* needs WM_NCPAINT */
 #define PAINT_DELAYED_ERASE      0x0080  /* still needs erase after WM_ERASEBKGND */
 #define PAINT_PIXEL_FORMAT_CHILD 0x0100  /* at least one child has a custom pixel format */
+#define PAINT_INVALIDATED        0x0200  /* window has been fully invalidated */

/* growable array of user handles */
 struct user_handle_array
@@ -1466,7 +1467,7 @@ static void set_update_region( struct window *win, struct region *region )
             inc_window_paint_count( win, -1 );
             free_region( win->update_region );
         }
-        win->paint_flags &= ~(PAINT_ERASE | PAINT_DELAYED_ERASE | PAINT_NONCLIENT);
+        win->paint_flags &= ~(PAINT_ERASE | PAINT_DELAYED_ERASE | PAINT_NONCLIENT | PAINT_INVALIDATED);
         win->update_region = NULL;
         if (region) free_region( region );
     }
@@ -1628,6 +1629,7 @@ static void redraw_window( struct window *win, struct region *region, unsigned i

if (!add_update_region( win, tmp )) return;

+        if (!region)           win->paint_flags |= PAINT_INVALIDATED;
         if (flags & RDW_FRAME) win->paint_flags |= PAINT_NONCLIENT;
         if (flags & RDW_ERASE) win->paint_flags |= PAINT_ERASE;
     }
@@ -1651,6 +1653,7 @@ static void redraw_window( struct window *win, struct region *region, unsigned i
             if (flags & RDW_NOFRAME) validate_non_client( win );
             if (flags & RDW_NOERASE) win->paint_flags &= ~(PAINT_ERASE | PAINT_DELAYED_ERASE);
         }
+        win->paint_flags &= ~PAINT_INVALIDATED;
     }

if ((flags & RDW_INTERNALPAINT) && !(win->paint_flags & PAINT_INTERNAL))
@@ -1960,6 +1963,10 @@ static void set_window_pos( struct window *win, struct window *previous,

if (win->update_region)
     {
+        int frame = win->paint_flags & PAINT_NONCLIENT;
+        if ((win->paint_flags & PAINT_INVALIDATED) && get_window_visible_rect( win, &rect, frame ))
+            set_region_rect( win->update_region, &rect );
+
         if (get_window_visible_rect( win, &rect, 1 ))
         {
             struct region *tmp = create_empty_region();

[Rémi Bernon (＠rbernon)]

On Tue May 20 15:01:18 2025 +0000, Jinoh Kang wrote:
> `RDW_FRAME` means nothing when `RDW_INVALIDATE` is not set[^1],
> overloading it is arguably a flag abuse. Meanwhile, there is nothing
> weird about `frame == 1 && flags & RDW_NOFRAME` since `frame` is just an
> internal variable and does not have such meaning attached.
> (That would also break the `RDW_VALIDATE | RDW_FRAME |
> RDW_NOFRAME`-with-region case, since `RDW_FRAME` is no longer being
> ignored which results in more flickers in NC area. But that's a weird
> flag combination and I guess we're not testing for it anyway, so could
> be a bit theoretical case as long as no apps actually do that.)
> If this patch is a must for this serie then I don't have strong
> objection, but this nevertheless comes as a
> maintainability/inconsistency issue since now the reader has to keep
> track of what `RDW_VALIDATE | RDW_FRAME` means in which context
> (externally it means nothing, internally it means "validating child
> window including its frame").
> [^1]: https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-redra...

The patch isn't necessary but I was aiming at reducing the number of parameters overall in a MR that added two more, and I though it would be better to remove one seemingly independent parameter that actually isn't.

I don't think having to track down 6 different calls sites to figure under which condition that additional parameter can be set to a 1/0 constant, based on seemingly arbitrary decision as it is hardcoded in most of them, is easier to maintain than taking the information where it actually comes from (the RDW_FRAME flag), with yes, a local abuse of flag to carry a local information through a recursive call.

[Jinoh Kang (＠iamahuman)]

On Tue May 20 15:24:05 2025 +0000, Rémi Bernon wrote:
> The patch isn't necessary but I was aiming at reducing the number of
> parameters overall in a MR that added two more, and I though it would be
> better to remove one seemingly independent parameter that actually isn't.
> I don't think having to track down 6 different calls sites to figure
> under which condition that additional parameter can be set to a 1/0
> constant, based on seemingly arbitrary decision as it is hardcoded in
> most of them, is easier to maintain than taking the information where it
> actually comes from (the RDW_FRAME flag), with yes, a local abuse of
> flag to carry a local information through a recursive call.

I see. Maybe we could add `WINE_RDW_*` flags instead if more parameters are a concern?