[PATCH v3 0/2] MR2314: user32/tests: Do not stop checking the message list when skipping an optional or unsupported message.

[Zebediah Figura (＠zfigura)]

This was either added by accident, or in an attempt to stop checking the message
list once we hit a winevent hook todo [and accidentally given too wide of a
scope]. However, the same commit also uses a global counter to ensure that only
one winevent todo is printed, so we don't need to break here anyway.

Fixes: a72bffe768c9fe462010d7e40e20226322fb82c7

--
  v3: user32/tests: Do not stop checking the message list when skipping an optional or unsupported message.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2314

[PATCH v3 1/2] user32/tests: Do not dump the message sequence when a todo succeeds on Windows.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

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

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 6faaa2c2f40..303d6dbf012 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -2914,7 +2914,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
                               context, count, expected->message, actual->message);
         }
     }
-    if( todo && !failcount) /* succeeded yet marked todo */
+    if (todo && !failcount && !strcmp(winetest_platform, "wine")) /* succeeded yet marked todo */
         todo_wine {
             dump++;
             ok_( file, line)( TRUE, "%s: marked \"todo_wine\" but succeeds\n", context);
-- 
GitLab


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

[PATCH v3 2/2] user32/tests: Do not stop checking the message list when skipping an optional or unsupported message.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

This was either added by accident, or in an attempt to stop checking the message
list once we hit a winevent hook todo [and accidentally given too wide of a
scope]. However, the same commit also uses a global counter to ensure that only
one winevent todo is printed, so we don't need to break in the first hunk
anyway.

For trailing winevent todos, there is no global counter, so instead move the
goto inside the if block.

Fixes: a72bffe768c9fe462010d7e40e20226322fb82c7

The test marked todo here was broken by 33617af8145b6fadfe41d48968a728ff57b3064b, which was hidden due to the above commit.
---
 dlls/user32/tests/msg.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 303d6dbf012..624d86899b3 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -2853,7 +2853,6 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
                 }
             }
 	    expected++;
-            goto done;
         }
 	else if (todo)
 	{
@@ -2888,9 +2887,9 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
                 ok_( file, line) (FALSE, "%s: %u: the msg sequence is not complete: expected 0x%04x - actual 0x%04x\n",
                                 context, count, expected->message, actual->message);
             }
+            goto done;
         }
 	expected++;
-        goto done;
     }
 
     if (todo)
@@ -5794,7 +5793,7 @@ static void test_messages(void)
     test_WM_SETREDRAW(hchild);
 
     ShowWindow(hchild, SW_SHOW);
-    ok_sequence(WmShowChildSeq, "ShowWindow(SW_SHOW):child", FALSE);
+    ok_sequence(WmShowChildSeq, "ShowWindow(SW_SHOW):child", TRUE);
 
     /* check parent messages too */
     log_all_parent_messages++;
-- 
GitLab

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