[PATCH v3 0/1] MR10452: comctl32/tests: Print id field of logged/expected messages on failure
Makes debugging of WM_NOTIFY message sequence errors much easier. -- v3: comctl32/tests: Print id field of logged/expected messages on failure https://gitlab.winehq.org/wine/wine/-/merge_requests/10452
From: Piotr Pawłowski <p@perkele.cc> --- dlls/comctl32/tests/msg.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 76bf5450b2f..8eb319f4889 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -115,8 +115,9 @@ 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, (int)expected->id, actual->message, actual->wParam, actual->lParam, (int)actual->id ); + if (expected->message == actual->message) { @@ -157,8 +158,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, (int)actual->id ); actual++; count++; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10452
On Fri Mar 27 13:07:41 2026 +0000, Nikolay Sivov wrote:
It's not always used for WM_NOTIFY codes. I don't see a problem in printing it in principle, but commit message needs to be more neutral, since it's not about WM_NOTIFY necessarily. Okay, changed.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10452#note_134078
Zhiyi Zhang (@zhiyi) commented about dlls/comctl32/tests/msg.h:
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, (int)expected->id, actual->message, actual->wParam, actual->lParam, (int)actual->id );
Why do you need to cast it to int? msg.h is copied and used in many other modules as well. Let's change them all at once. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10452#note_135900
participants (3)
-
Piotr Pawłowski -
Piotr Pawłowski (@DEATH) -
Zhiyi Zhang (@zhiyi)