[PATCH 1/2] Add test for RedrawWindow with both validate and internal paint flags.

[Roman Pišl]

Signed-off-by: Roman Pišl 
---
 dlls/user32/tests/msg.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index f0e0d0fba76..689ad7161f5 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -140,7 +140,8 @@ typedef enum {
     hook=0x100,
     winevent_hook=0x200,
     kbd_hook=0x400,
-    winevent_hook_todo=0x800
+    winevent_hook_todo=0x800,
+    has_update=0x1000
 } msg_flags_t;

struct message {
@@ -2819,6 +2820,10 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
                 context, count, expected->message);
             if ((expected->flags & kbd_hook) != (actual->flags & kbd_hook)) dump++;

+        todo_wine_if(expected->flags & has_update)
+        ok_( file, line) (!(expected->flags & has_update) || (actual->flags & has_update),
+        "%s: %u: the msg 0x%04x should have update region\n", context, count, expected->message );
+
        expected++;
        actual++;
    }
@@ -8270,6 +8275,11 @@ static const struct message WmPaint[] = {
     { 0 }
 };

+static const struct message WmPaintUpdate[] = {
+    { WM_PAINT, sent|has_update },
+    { 0 }
+};
+
 static const struct message WmParentOnlyPaint[] = {
     { WM_PAINT, sent|parent },
     { 0 }
@@ -8585,6 +8595,13 @@ static void test_paint_messages(void)
     RedrawWindow( hwnd, NULL, hrgn, RDW_VALIDATE | RDW_NOERASE | RDW_UPDATENOW );
     ok_sequence( WmPaint, "Paint", FALSE );

+    flush_sequence();
+    SetRectRgn( hrgn, 0, 0, 100, 100 );
+    RedrawWindow( hwnd, NULL, hrgn, RDW_INVALIDATE | RDW_ERASE );
+    SetRectRgn( hrgn, 0, 0, 50, 50 );
+    RedrawWindow( hwnd, NULL, hrgn, RDW_VALIDATE | RDW_NOERASE | RDW_UPDATENOW | RDW_NOFRAME );
+    ok_sequence( WmPaint, "Paint", FALSE );
+
     flush_sequence();
     SetRectRgn( hrgn, -4, -4, -2, -2 );
     RedrawWindow( hwnd, NULL, hrgn, RDW_INVALIDATE | RDW_FRAME );
@@ -8629,6 +8646,16 @@ static void test_paint_messages(void)
     }
     ok_sequence( WmGetUpdateRect, "GetUpdateRect", FALSE );

+    /* RedrawWindow with both RDW_VALIDATE and RDW_INTERNALPAINT triggers WM_PAINT with non-empty update region */
+    flush_sequence();
+    InvalidateRect( hwnd, NULL, FALSE );
+    GetClientRect( hwnd, &rect );
+    SetRectRgn(hrgn, rect.left, rect.top, rect.right, rect.bottom );
+    check_update_rgn( hwnd, hrgn );
+    RedrawWindow( hwnd, &rect, NULL, RDW_VALIDATE | RDW_NOERASE | RDW_UPDATENOW | RDW_NOFRAME | RDW_INTERNALPAINT );
+    check_update_rgn( hwnd, 0 );
+    ok_sequence( WmPaintUpdate, "PaintUpdate", FALSE );
+
     DestroyWindow( hwnd );

/* now test with a child window */
@@ -9949,6 +9976,9 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message,
     msg.flags = sent|wparam|lparam;
     if (defwndproc_counter) msg.flags |= defwinproc;
     if (beginpaint_counter) msg.flags |= beginpaint;
+
+    if (message == WM_PAINT && GetUpdateRect(hwnd, NULL, FALSE)) msg.flags |= has_update;
+
     msg.wParam = wParam;
     msg.lParam = lParam;
     msg.descr = "MsgCheckProc";