[PATCH v5 0/1] MR10452: comctl32/tests: Print id field of logged/expected messages on failure

[Piotr Pawłowski (＠DEATH)]

Makes debugging of WM_NOTIFY message sequence errors much easier.

--
  v5: comctl32/tests: Print id field of logged/expected messages on failure
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10452

[PATCH v5 1/1] comctl32/tests: Print id field of logged/expected messages on failure

[Piotr Pawłowski]

From: Piotr Pawłowski <[e-mail]>

---
 dlls/comctl32/tests/msg.h | 8 ++++----
 dlls/uxtheme/tests/msg.h  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h
index 76bf5450b2f..a9c150e5da8 100644
--- a/dlls/comctl32/tests/msg.h
+++ b/dlls/comctl32/tests/msg.h
@@ -115,8 +115,8 @@ static void dump_sequence( struct msg_sequence **seq, int sequence_index,
     trace_(file, line)("Failed sequence %s:\n", context );
     while (expected->message && actual->message)
     {
-        trace_(file, line)( "  %u: expected: %04x - actual: %04x wp %08Ix lp %08Ix\n",
-                            count, expected->message, actual->message, actual->wParam, actual->lParam );
+        trace_(file, line)( "  %u: expected: %04x id %u - actual: %04x wp %08Ix lp %08Ix id %u\n",
+                            count, expected->message, expected->id, actual->message, actual->wParam, actual->lParam, actual->id );
 
 	if (expected->message == actual->message)
 	{
@@ -157,8 +157,8 @@ static void dump_sequence( struct msg_sequence **seq, int sequence_index,
 
     while (actual->message)
     {
-        trace_(file, line)( "  %u: expected: nothing - actual: %04x wp %08Ix lp %08Ix\n",
-                            count, actual->message, actual->wParam, actual->lParam );
+        trace_(file, line)( "  %u: expected: nothing - actual: %04x wp %08Ix lp %08Ix id %u\n",
+                            count, actual->message, actual->wParam, actual->lParam, actual->id );
         actual++;
         count++;
     }
diff --git a/dlls/uxtheme/tests/msg.h b/dlls/uxtheme/tests/msg.h
index f967c39d091..8e2b3f70e5f 100644
--- a/dlls/uxtheme/tests/msg.h
+++ b/dlls/uxtheme/tests/msg.h
@@ -113,8 +113,8 @@ static void dump_sequence( struct msg_sequence **seq, int sequence_index,
     trace_(file, line)("Failed sequence %s:\n", context );
     while (expected->message && actual->message)
     {
-        trace_(file, line)( "  %u: expected: %04x - actual: %04x wp %08Ix lp %08Ix\n",
-                            count, expected->message, actual->message, actual->wParam, actual->lParam );
+        trace_(file, line)( "  %u: expected: %04x id %i - actual: %04x wp %08Ix lp %08Ix id %i\n",
+                            count, expected->message, expected->id, actual->message, actual->wParam, actual->lParam, actual->id );
 
         if (expected->message == actual->message)
         {
@@ -154,8 +154,8 @@ static void dump_sequence( struct msg_sequence **seq, int sequence_index,
 
     while (actual->message)
     {
-        trace_(file, line)( "  %u: expected: nothing - actual: %04x wp %08Ix lp %08Ix\n",
-                            count, actual->message, actual->wParam, actual->lParam );
+        trace_(file, line)( "  %u: expected: nothing - actual: %04x wp %08Ix lp %08Ix id %i\n",
+                            count, actual->message, actual->wParam, actual->lParam, actual->id );
         actual++;
         count++;
     }
-- 
GitLab

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

[Piotr Pawłowski (＠DEATH)]

On Tue Apr 21 20:37:49 2026 +0000, Piotr Pawłowski wrote:
> changed this line in [version 4 of the diff](/wine/wine/-/merge_requests/10452/diffs?diff_id=262116&start_sha=bb80e612871a98aab98ef3edf7ac65de24e32fa4#8eb2e990b048ad78ea99969ff309ba4a3de98a1b_119_119)
> Amended.

Unfortunately msg.h in different DLLs aren't 1:1 same, and only one in uxtheme has matching dump_sequence().

How do I format commit name, since it changes both comctl32/tests and uxtheme/tests ?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10452#note_137262

[Zhiyi Zhang (＠zhiyi)]

> How do I format commit name, since it changes both comctl32/tests and uxtheme/tests ?

You can create separate commits.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10452#note_137295

[Alfred Agrell (＠Alcaro)]

On Wed Apr 22 00:49:58 2026 +0000, Zhiyi Zhang wrote:
> > How do I format commit name, since it changes both comctl32/tests and
> > uxtheme/tests ?
> > You can create separate commits.
> > I've seen a few MRs titled 'kernel32, ntdll: Do something'. I think that'd be appropriate for commits too, if a refactoring needs to touch multiple modules at once.

But in this case, splitting it makes more sense. We like our commits quite fine grained.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10452#note_137297