[PATCH 0/2] MR7239: user32/tests: Account for a couple of frequent failures.

[Esme Povirk (＠madewokherd)]

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

[PATCH 1/2] user32/tests: Move a todo into the message sequence.

[Esme Povirk]

From: Esme Povirk <esme(a)codeweavers.com>

This message sequence succeeds somewhat frequently, but not
always. Putting the todo into the sequence makes it possible to
account for that.
---
 dlls/user32/tests/msg.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 33962efc790..a4d36a90c03 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -575,9 +575,17 @@ static const struct message WmShowRestoreMaxOverlappedSeq[] = {
     { WM_GETTITLEBARINFOEX, sent|optional },
     { WM_NCPAINT, sent|beginpaint|optional },
     { WM_ERASEBKGND, sent|beginpaint|optional },
-    { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|msg_todo, 0, 0 },
+    { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 },
     { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */
     { WM_SYNCPAINT, sent|optional },
+    { WM_WINDOWPOSCHANGING, sent|optional|wine_only },
+    { WM_WINDOWPOSCHANGED, sent|optional|wine_only },
+    { WM_MOVE, sent|defwinproc|optional|wine_only },
+    { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional|wine_only, 0, 0 },
+    { WM_WINDOWPOSCHANGING, sent|optional|wine_only },
+    { WM_WINDOWPOSCHANGED, sent|optional|wine_only },
+    { WM_MOVE, sent|defwinproc|optional|wine_only },
+    { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional|wine_only, 0, 0 },
     { 0 }
 };
 /* ShowWindow(SW_RESTORE) for a not visible minimized overlapped window */
@@ -5615,7 +5623,7 @@ static void test_messages(void)
     {
         ShowWindow(hwnd, SW_RESTORE);
         flush_events();
-        ok_sequence(WmShowRestoreMaxOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", TRUE);
+        ok_sequence(WmShowRestoreMaxOverlappedSeq, "ShowWindow(SW_RESTORE):overlapped", FALSE);
         flush_sequence();
     }
 
-- 
GitLab


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

[PATCH 2/2] user32/tests: Account for Wine sometimes duplicating WM_PAINT.

[Esme Povirk]

From: Esme Povirk <esme(a)codeweavers.com>

---
 dlls/user32/tests/msg.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index a4d36a90c03..e65da599deb 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -640,6 +640,7 @@ static const struct message WmShowRestoreMinOverlappedSeq[] = {
     { WM_ACTIVATE, sent|wparam, 1 },
     { WM_GETTEXT, sent|optional },
     { WM_PAINT, sent|optional },
+    { WM_PAINT, sent|optional|wine_only },
     { WM_GETTITLEBARINFOEX, sent|optional },
     { WM_NCPAINT, sent|beginpaint|optional },
     { WM_ERASEBKGND, sent|beginpaint|optional },
-- 
GitLab

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

[PATCH 2/2] user32/tests: Account for Wine sometimes duplicating WM_PAINT.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=151185

Your paranoid android.


=== w7u_el (32 bit report) ===

user32:
msg.c:20471: Test failed: Restore minimized window: 28: the winevent_hook 0x800b was expected, but got msg 0x0083 instead

=== debian11 (32 bit de report) ===

user32:
msg.c:12737: Test failed: Got expected 0.
msg.c:12752: Test failed: Got expected 0.