[RFC PATCH 4/4] comctl32/tests: Trace the string representation of window messages and not the numbers.
Florian Köberle
florian at fkoeberle.de
Sat Sep 11 05:07:07 CDT 2010
---
dlls/comctl32/tests/datetime.c | 3 +-
dlls/comctl32/tests/header.c | 5 ++-
dlls/comctl32/tests/listview.c | 7 ++--
dlls/comctl32/tests/monthcal.c | 3 +-
dlls/comctl32/tests/msg.h | 71 ++++++++++++++++++++-------------------
dlls/comctl32/tests/tab.c | 5 ++-
dlls/comctl32/tests/toolbar.c | 3 +-
dlls/comctl32/tests/trackbar.c | 5 ++-
dlls/comctl32/tests/treeview.c | 3 +-
dlls/comctl32/tests/updown.c | 7 ++--
10 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c
index 8b902ba..1e6ddab 100644
--- a/dlls/comctl32/tests/datetime.c
+++ b/dlls/comctl32/tests/datetime.c
@@ -21,6 +21,7 @@
#include <commctrl.h>
#include "wine/test.h"
+#include "wine/resolvewm.h"
#include "msg.h"
#define expect(EXPECTED, GOT) ok((GOT)==(EXPECTED), "Expected %d, got %ld\n", (EXPECTED), (GOT))
@@ -128,7 +129,7 @@ static LRESULT WINAPI datetime_subclass_proc(HWND hwnd, UINT message, WPARAM wPa
LRESULT ret;
struct message msg;
- trace("datetime: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("datetime: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c
index d9b4a73..d6167a9 100644
--- a/dlls/comctl32/tests/header.c
+++ b/dlls/comctl32/tests/header.c
@@ -24,6 +24,7 @@
#include <assert.h>
#include "wine/test.h"
+#include "wine/resolvewm.h"
#include "v6util.h"
#include "msg.h"
@@ -403,7 +404,7 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara
LRESULT ret;
struct message msg;
- trace("header: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("header: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
if (defwndproc_counter) msg.flags |= defwinproc;
@@ -434,7 +435,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 6ef82bb..4f2b735 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -25,6 +25,7 @@
#include <commctrl.h>
#include "wine/test.h"
+#include "wine/resolvewm.h"
#include "v6util.h"
#include "msg.h"
@@ -324,7 +325,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
add_message(sequences, PARENT_SEQ_INDEX, &msg);
add_message(sequences, COMBINED_SEQ_INDEX, &msg);
@@ -465,7 +466,7 @@ static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wPa
LRESULT ret;
struct message msg;
- trace("listview: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("listview: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
/* some debug output for style changing */
if ((message == WM_STYLECHANGING ||
@@ -543,7 +544,7 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara
LRESULT ret;
struct message msg;
- trace("header: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("header: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c
index 52e16c3..86cd7db 100644
--- a/dlls/comctl32/tests/monthcal.c
+++ b/dlls/comctl32/tests/monthcal.c
@@ -28,6 +28,7 @@
#include "commctrl.h"
#include "wine/test.h"
+#include "wine/resolvewm.h"
#include "v6util.h"
#include <assert.h>
#include <windows.h>
@@ -456,7 +457,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h
index 361ccdb..7e59664 100644
--- a/dlls/comctl32/tests/msg.h
+++ b/dlls/comctl32/tests/msg.h
@@ -21,6 +21,7 @@
#include <assert.h>
#include <windows.h>
#include "wine/test.h"
+#include "wine/resolvewm.h"
/* undocumented SWP flags - from SDK 3.1 */
#define SWP_NOCLIENTSIZE 0x0800
@@ -121,7 +122,7 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index,
while (expected->message && actual->message)
{
- trace_( file, line)("expected %04x - actual %04x\n", expected->message, actual->message);
+ trace_( file, line)("expected %s - actual %s\n", WMToString(expected->message), WMToString(actual->message));
if (expected->message == actual->message)
{
@@ -133,15 +134,15 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index,
{
failcount++;
ok_(file, line) (FALSE,
- "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n",
- context, expected->message, expected->wParam, actual->wParam);
+ "%s: in msg %s expecting wParam 0x%lx got 0x%lx\n",
+ context, WMToString(expected->message), expected->wParam, actual->wParam);
}
}
else
{
ok_(file, line) (expected->wParam == actual->wParam,
- "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n",
- context, expected->message, expected->wParam, actual->wParam);
+ "%s: in msg %s expecting wParam 0x%lx got 0x%lx\n",
+ context, WMToString(expected->message), expected->wParam, actual->wParam);
}
}
@@ -153,15 +154,15 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index,
{
failcount++;
ok_(file, line) (FALSE,
- "%s: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n",
- context, expected->message, expected->lParam, actual->lParam);
+ "%s: in msg %s expecting lParam 0x%lx got 0x%lx\n",
+ context, WMToString(expected->message), expected->lParam, actual->lParam);
}
}
else
{
ok_(file, line) (expected->lParam == actual->lParam,
- "%s: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n",
- context, expected->message, expected->lParam, actual->lParam);
+ "%s: in msg %s expecting lParam 0x%lx got 0x%lx\n",
+ context, WMToString(expected->message), expected->lParam, actual->lParam);
}
}
@@ -178,15 +179,15 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index,
{
failcount++;
ok_(file, line) (FALSE,
- "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n",
- context, expected->message, expected->id, actual->id);
+ "%s: in msg %s expecting id 0x%x got 0x%x\n",
+ context, WMToString(expected->message), expected->id, actual->id);
}
}
else
{
ok_(file, line) (expected->id == actual->id,
- "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n",
- context, expected->message, expected->id, actual->id);
+ "%s: in msg %s expecting id 0x%x got 0x%x\n",
+ context, WMToString(expected->message), expected->id, actual->id);
}
}
@@ -196,32 +197,32 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index,
{
failcount++;
ok_(file, line) (FALSE,
- "%s: the msg 0x%04x should %shave been sent by DefWindowProc\n",
- context, expected->message, (expected->flags & defwinproc) ? "" : "NOT ");
+ "%s: the msg %s should %shave been sent by DefWindowProc\n",
+ context, WMToString(expected->message), (expected->flags & defwinproc) ? "" : "NOT ");
}
}
else
{
ok_(file, line) ((expected->flags & defwinproc) == (actual->flags & defwinproc),
- "%s: the msg 0x%04x should %shave been sent by DefWindowProc\n",
- context, expected->message, (expected->flags & defwinproc) ? "" : "NOT ");
+ "%s: the msg %s should %shave been sent by DefWindowProc\n",
+ context, WMToString(expected->message), (expected->flags & defwinproc) ? "" : "NOT ");
}
ok_(file, line) ((expected->flags & beginpaint) == (actual->flags & beginpaint),
- "%s: the msg 0x%04x should %shave been sent by BeginPaint\n",
- context, expected->message, (expected->flags & beginpaint) ? "" : "NOT ");
+ "%s: the msg %s should %shave been sent by BeginPaint\n",
+ context, WMToString(expected->message), (expected->flags & beginpaint) ? "" : "NOT ");
ok_(file, line) ((expected->flags & (sent|posted)) == (actual->flags & (sent|posted)),
- "%s: the msg 0x%04x should have been %s\n",
- context, expected->message, (expected->flags & posted) ? "posted" : "sent");
+ "%s: the msg %s should have been %s\n",
+ context, WMToString(expected->message), (expected->flags & posted) ? "posted" : "sent");
ok_(file, line) ((expected->flags & parent) == (actual->flags & parent),
- "%s: the msg 0x%04x was expected in %s\n",
- context, expected->message, (expected->flags & parent) ? "parent" : "child");
+ "%s: the msg %s was expected in %s\n",
+ context, WMToString(expected->message), (expected->flags & parent) ? "parent" : "child");
ok_(file, line) ((expected->flags & hook) == (actual->flags & hook),
- "%s: the msg 0x%04x should have been sent by a hook\n",
- context, expected->message);
+ "%s: the msg %s should have been sent by a hook\n",
+ context, WMToString(expected->message));
ok_(file, line) ((expected->flags & winevent_hook) == (actual->flags & winevent_hook),
- "%s: the msg 0x%04x should have been sent by a winevent hook\n",
- context, expected->message);
+ "%s: the msg %s should have been sent by a winevent hook\n",
+ context, WMToString(expected->message));
expected++;
actual++;
}
@@ -232,8 +233,8 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index,
failcount++;
todo_wine
{
- ok_(file, line) (FALSE, "%s: the msg 0x%04x was expected, but got msg 0x%04x instead\n",
- context, expected->message, actual->message);
+ ok_(file, line) (FALSE, "%s: the msg %s was expected, but got msg %s instead\n",
+ context, WMToString(expected->message), WMToString(actual->message));
}
flush_sequence(seq, sequence_index);
@@ -241,8 +242,8 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index,
}
else
{
- ok_(file, line) (FALSE, "%s: the msg 0x%04x was expected, but got msg 0x%04x instead\n",
- context, expected->message, actual->message);
+ ok_(file, line) (FALSE, "%s: the msg %s was expected, but got msg %s instead\n",
+ context, WMToString(expected->message), WMToString(actual->message));
expected++;
actual++;
}
@@ -259,15 +260,15 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index,
if (expected->message || actual->message)
{
failcount++;
- ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %04x - actual %04x\n",
- context, expected->message, actual->message);
+ ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %s - actual %s\n",
+ context, WMToString(expected->message), WMToString(actual->message));
}
}
}
else if (expected->message || actual->message)
{
- ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %04x - actual %04x\n",
- context, expected->message, actual->message);
+ ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %s - actual %s\n",
+ context, WMToString(expected->message), WMToString(actual->message));
}
if(todo && !failcount) /* succeeded yet marked todo */
diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c
index 6774d51..2a630d5 100644
--- a/dlls/comctl32/tests/tab.c
+++ b/dlls/comctl32/tests/tab.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include "wine/test.h"
+#include "wine/resolvewm.h"
#include "msg.h"
#define DEFAULT_MIN_TAB_WIDTH 54
@@ -327,7 +328,7 @@ static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
@@ -390,7 +391,7 @@ static LRESULT WINAPI tabSubclassProcess(HWND hwnd, UINT message, WPARAM wParam,
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("tab: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("tab: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c
index 8311df5..e8e09ce 100644
--- a/dlls/comctl32/tests/toolbar.c
+++ b/dlls/comctl32/tests/toolbar.c
@@ -32,6 +32,7 @@
#include "resources.h"
#include "wine/test.h"
+#include "wine/resolvewm.h"
#include "msg.h"
@@ -138,7 +139,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam,
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08lx, %08lx\n", hWnd, message, wParam, lParam);
+ trace("parent: %p, %s, %08lx, %08lx\n", hWnd, WMToString(message), wParam, lParam);
add_message(sequences, PARENT_SEQ_INDEX, &msg);
}
diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c
index 68261d8..53891cd 100644
--- a/dlls/comctl32/tests/trackbar.c
+++ b/dlls/comctl32/tests/trackbar.c
@@ -23,6 +23,7 @@
#include <stdio.h>
#include "wine/test.h"
+#include "wine/resolvewm.h"
#include "msg.h"
#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got)
@@ -379,7 +380,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
@@ -430,7 +431,7 @@ static LRESULT WINAPI trackbar_subclass_proc(HWND hwnd, UINT message, WPARAM wPa
LRESULT ret;
struct message msg;
- trace("trackbar: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("trackbar: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c
index 5464975..d01394f 100644
--- a/dlls/comctl32/tests/treeview.c
+++ b/dlls/comctl32/tests/treeview.c
@@ -30,6 +30,7 @@
#include "commctrl.h"
#include "wine/test.h"
+#include "wine/resolvewm.h"
#include "v6util.h"
#include "msg.h"
@@ -856,7 +857,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam,
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08lx, %08lx\n", hWnd, message, wParam, lParam);
+ trace("parent: %p, %s, %08lx, %08lx\n", hWnd, WMToString(message), wParam, lParam);
add_message(sequences, PARENT_SEQ_INDEX, &msg);
}
diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c
index 859b3a0..720db03 100644
--- a/dlls/comctl32/tests/updown.c
+++ b/dlls/comctl32/tests/updown.c
@@ -50,6 +50,7 @@
#include <stdio.h>
#include "wine/test.h"
+#include "wine/resolvewm.h"
#include "msg.h"
#define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT))
@@ -180,7 +181,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
@@ -234,7 +235,7 @@ static LRESULT WINAPI edit_subclass_proc(HWND hwnd, UINT message, WPARAM wParam,
LRESULT ret;
struct message msg;
- trace("edit: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("edit: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
@@ -276,7 +277,7 @@ static LRESULT WINAPI updown_subclass_proc(HWND hwnd, UINT message, WPARAM wPara
LRESULT ret;
struct message msg;
- trace("updown: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
+ trace("updown: %p, %s, %08lx, %08lx\n", hwnd, WMToString(message), wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
--
1.7.0.4
More information about the wine-devel
mailing list