[PATCH v2 2/2] user32/painting: Clear RDW_VALIDATE if both RDW_INTERNALPAINT and RDW_UPDATENOW are set in RedrawWindow.

[Roman Pišl]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48761
Signed-off-by: Roman Pišl <rpisl at seznam.cz>
---
 dlls/user32/painting.c  | 3 +++
 dlls/user32/tests/msg.c | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c
index 313c5fa1e6..2c8ffc903a 100644
--- a/dlls/user32/painting.c
+++ b/dlls/user32/painting.c
@@ -1246,6 +1246,9 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags )
         dump_rdw_flags(flags);
     }
 
+    if ((flags & (RDW_INTERNALPAINT | RDW_UPDATENOW)) == (RDW_INTERNALPAINT | RDW_UPDATENOW))
+        flags &= ~RDW_VALIDATE;
+
     /* process pending expose events before painting */
     if (flags & RDW_UPDATENOW) USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_PAINT, 0 );
 
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 2763857d8a..7c223daa44 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -2548,7 +2548,6 @@ 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);
-- 
2.20.1