[PATCH 4/5] user32/tests: Distinguish between extra and missing messages.

[Esme Povirk]

From: Esme Povirk

This may not be very clever, but it should make the
output much more readable when sequences fail.
---
 dlls/user32/tests/msg.c | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 51046a99cf0..495e1ca0f1e 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -2692,6 +2692,17 @@ static BOOL messages_equal(const struct message *expected, const struct recvd_me
     return TRUE;
 }

+static BOOL sequence_contains_message(const struct message *expected, const struct recvd_message *actual)
+{
+    while (expected->message)
+    {
+        if (messages_equal(expected, actual, FALSE, __FILE__, __LINE__))
+            return TRUE;
+        expected++;
+    }
+    return FALSE;
+}
+
 static void dump_sequence(const struct message *expected, const char *context, const char *file, int line)
 {
     const struct recvd_message *actual = sequence;
@@ -2706,17 +2717,21 @@ static void dump_sequence(const struct message *expected, const char *context, c
                                 count, message_type_name(expected->flags), expected->message, actual->output );
         }

-        if (!messages_equal(expected, actual, FALSE, file, line) &&
-            can_skip_message(expected))
+        if (messages_equal(expected, actual, FALSE, file, line))
+        {
+            expected++;
+            actual++;
+            count++;
+        }
+        else if (can_skip_message(expected) || sequence_contains_message(expected, actual))
    {
             expected++;
+            count++;
         }
         else
         {
-            expected++;
             actual++;
         }
-        count++;
     }

/* optional trailing messages */
@@ -2843,6 +2858,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
             if ((expected->flags & parent) != (actual->flags & parent)) dump++;

expected++;
+            count++;
        actual++;
    }
    /*
@@ -2851,6 +2867,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
    else if (can_skip_message(expected))
         {
        expected++;
+            count++;
         }
    else if (todo)
    {
@@ -2859,13 +2876,17 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
             dump++;
             goto done;
         }
-        else
+        else if (sequence_contains_message(expected, actual))
         {
             dump++;
             expected++;
+            count++;
+        }
+        else
+        {
+            dump++;
             actual++;
         }
-        count++;

winetest_pop_context();
         winetest_push_context("%s: %u", context, count);