[RFC PATCH 3/4] comctl32: Trace the string representation of window messages and not the numbers.

[Florian Köberle]

---
 dlls/comctl32/animate.c    |    3 ++-
 dlls/comctl32/comboex.c    |   11 ++++++-----
 dlls/comctl32/header.c     |    3 ++-
 dlls/comctl32/hotkey.c     |    3 ++-
 dlls/comctl32/ipaddress.c  |    5 +++--
 dlls/comctl32/listview.c   |    7 ++++---
 dlls/comctl32/monthcal.c   |    7 ++++---
 dlls/comctl32/nativefont.c |    5 +++--
 dlls/comctl32/progress.c   |    3 ++-
 dlls/comctl32/propsheet.c  |    5 +++--
 dlls/comctl32/rebar.c      |    5 +++--
 dlls/comctl32/status.c     |    3 ++-
 dlls/comctl32/syslink.c    |    3 ++-
 dlls/comctl32/tab.c        |    3 ++-
 dlls/comctl32/toolbar.c    |    5 +++--
 dlls/comctl32/tooltips.c   |    3 ++-
 dlls/comctl32/trackbar.c   |    3 ++-
 dlls/comctl32/updown.c     |    9 +++++----
 18 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index a86ff85..34abff0 100644
--- a/dlls/comctl32/animate.c
+++ b/dlls/comctl32/animate.c
@@ -45,6 +45,7 @@
 #include "mmsystem.h"
 #include "comctl32.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(animate);

@@ -885,7 +886,7 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP
 {
     ANIMATE_INFO *infoPtr = (ANIMATE_INFO *)GetWindowLongPtrW(hWnd, 0);

-    TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hWnd, uMsg, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%lx lparam=%lx\n", hWnd, WMToString(uMsg), wParam, lParam);
     if (!infoPtr && (uMsg != WM_NCCREATE))
    return DefWindowProcW(hWnd, uMsg, wParam, lParam);
     switch (uMsg)
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 6e90751..4a490ff 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -41,6 +41,7 @@
 #include "comctl32.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(comboex);

@@ -1719,8 +1720,8 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
     RECT rect;
     LRESULT lret;

-    TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n",
-	  hwnd, uMsg, wParam, lParam, infoPtr);
+    TRACE("hwnd=%p msg=%s wparam=%lx lParam=%lx, info_ptr=%p\n",
+	  hwnd, WMToString(uMsg), wParam, lParam, infoPtr);

if (!infoPtr) return 0;

@@ -1913,8 +1914,8 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
     POINT pt;
     WCHAR edit_text[260];

-    TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n",
-	  hwnd, uMsg, wParam, lParam, infoPtr);
+    TRACE("hwnd=%p msg=%s wparam=%lx lParam=%lx, info_ptr=%p\n",
+	  hwnd, WMToString(uMsg), wParam, lParam, infoPtr);

if (!infoPtr) return 0;

@@ -2145,7 +2146,7 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);

-    TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%lx lParam=%lx\n", hwnd, WMToString(uMsg), wParam, lParam);

if (!infoPtr) {
    if (uMsg == WM_CREATE)
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 603d0a3..eff0564 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -43,6 +43,7 @@
 #include "tmschema.h"
 #include "uxtheme.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(header);

@@ -2024,7 +2025,7 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     HEADER_INFO *infoPtr = (HEADER_INFO *)GetWindowLongPtrW(hwnd, 0);

-    TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, msg, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%lx lParam=%lx\n", hwnd, WMToString(msg), wParam, lParam);
     if (!infoPtr && (msg != WM_CREATE))
    return DefWindowProcW (hwnd, msg, wParam, lParam);
     switch (msg) {
diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c
index a72b487..f066cc6 100644
--- a/dlls/comctl32/hotkey.c
+++ b/dlls/comctl32/hotkey.c
@@ -38,6 +38,7 @@
 #include "commctrl.h"
 #include "comctl32.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(hotkey);

@@ -465,7 +466,7 @@ static LRESULT WINAPI
 HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     HOTKEY_INFO *infoPtr = (HOTKEY_INFO *)GetWindowLongPtrW (hwnd, 0);
-    TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%lx lparam=%lx\n", hwnd, WMToString(uMsg), wParam, lParam);
     if (!infoPtr && (uMsg != WM_NCCREATE))
         return DefWindowProcW (hwnd, uMsg, wParam, lParam);
     switch (uMsg)
diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index 03b8d1c..9e23cb2 100644
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -47,6 +47,7 @@
 #include "comctl32.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(ipaddress);

@@ -484,7 +485,7 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     INT index, len = 0, startsel, endsel;
     IPPART_INFO *part;

-    TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+    TRACE("(hwnd=%p msg=%s wparam=0x%lx lparam=0x%lx)\n", hwnd, WMToString(uMsg), wParam, lParam);

if ( (index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) return 0;
     part = &infoPtr->Part[index];
@@ -563,7 +564,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     IPADDRESS_INFO *infoPtr = (IPADDRESS_INFO *)GetWindowLongPtrW (hwnd, 0);

-    TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+    TRACE("(hwnd=%p msg=%s wparam=0x%lx lparam=0x%lx)\n", hwnd, WMToString(uMsg), wParam, lParam);

if (!infoPtr && (uMsg != WM_CREATE))
         return DefWindowProcW (hwnd, uMsg, wParam, lParam);
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index ae8736a..ed1001b 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -165,6 +165,7 @@

#include "wine/debug.h"
 #include "wine/unicode.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(listview);

@@ -5749,8 +5750,8 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
     LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0);
     BOOL save = TRUE;

-    TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx, isW=%d)\n",
-	  hwnd, uMsg, wParam, lParam, isW);
+    TRACE("(hwnd=%p, uMsg=%s, wParam=%lx, lParam=%lx, isW=%d)\n",
+	  hwnd, WMToString(uMsg), wParam, lParam, isW);

switch (uMsg)
     {
@@ -11021,7 +11022,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0);

-  TRACE("(hwnd=%p uMsg=%x wParam=%lx lParam=%lx)\n", hwnd, uMsg, wParam, lParam);
+  TRACE("(hwnd=%p uMsg=%s wParam=%lx lParam=%lx)\n", hwnd, WMToString(uMsg), wParam, lParam);

if (!infoPtr && (uMsg != WM_NCCREATE))
     return DefWindowProcW(hwnd, uMsg, wParam, lParam);
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index 1cc64db..1c88e37 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -57,6 +57,7 @@
 #include "tmschema.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(monthcal);

@@ -1878,8 +1879,8 @@ static LRESULT CALLBACK EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
 {
     MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0);

-    TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx)\n",
-	  hwnd, uMsg, wParam, lParam);
+    TRACE("(hwnd=%p, msg=%s, wParam=%lx, lParam=%lx)\n",
+	  hwnd, WMToString(uMsg), wParam, lParam);

switch (uMsg)
     {
@@ -2616,7 +2617,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0);

-  TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+  TRACE("hwnd=%p msg=%s wparam=%lx lparam=%lx\n", hwnd, WMToString(uMsg), wParam, lParam);

if (!infoPtr && (uMsg != WM_CREATE))
     return DefWindowProcW(hwnd, uMsg, wParam, lParam);
diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c
index 2e11a9e..d2bf357 100644
--- a/dlls/comctl32/nativefont.c
+++ b/dlls/comctl32/nativefont.c
@@ -36,6 +36,7 @@
 #include "commctrl.h"
 #include "comctl32.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(nativefont);

@@ -76,8 +77,8 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     NATIVEFONT_INFO *infoPtr = NATIVEFONT_GetInfoPtr(hwnd);

-    TRACE("hwnd=%p msg=%04x wparam=%08lx lparam=%08lx\n",
-	  hwnd, uMsg, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%08lx lparam=%08lx\n",
+	  hwnd, WMToString(uMsg), wParam, lParam);

if (!infoPtr && (uMsg != WM_CREATE))
    return DefWindowProcW( hwnd, uMsg, wParam, lParam );
diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index c44b816..df0e793 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -51,6 +51,7 @@
 #include "uxtheme.h"
 #include "tmschema.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(progress);

@@ -539,7 +540,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
     static const WCHAR themeClass[] = {'P','r','o','g','r','e','s','s',0};
     HTHEME theme;

-    TRACE("hwnd=%p msg=%04x wparam=%lx lParam=%lx\n", hwnd, message, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%lx lParam=%lx\n", hwnd, WMToString(message), wParam, lParam);

infoPtr = (PROGRESS_INFO *)GetWindowLongPtrW(hwnd, 0);

diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 3e313ba..e2c9613 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -68,6 +68,7 @@
 #include "uxtheme.h"

#include "wine/debug.h"
+#include "wine/resolvewm.h"
 #include "wine/unicode.h"

/******************************************************************************
@@ -3384,8 +3385,8 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam)
 static INT_PTR CALLBACK
 PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-  TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n",
-	hwnd, uMsg, wParam, lParam);
+  TRACE("hwnd=%p msg=%s wparam=%lx lparam=%lx\n",
+	hwnd, WMToString(uMsg), wParam, lParam);

switch (uMsg)
   {
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 8ecfee3..a60a0af 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -94,6 +94,7 @@
 #include "uxtheme.h"
 #include "tmschema.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(rebar);

@@ -3478,8 +3479,8 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);

-    TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n",
-	  hwnd, uMsg, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%lx lparam=%lx\n",
+	  hwnd, WMToString(uMsg), wParam, lParam);
     if (!infoPtr && (uMsg != WM_NCCREATE))
         return DefWindowProcW (hwnd, uMsg, wParam, lParam);
     switch (uMsg)
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index 1b69ef2..824f70a 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -54,6 +54,7 @@
 #include "uxtheme.h"
 #include "tmschema.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(statusbar);

@@ -1193,7 +1194,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
     INT nPart = ((INT) wParam) & 0x00ff;
     LRESULT res;

-    TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%lx lparam=%lx\n", hwnd, WMToString(msg), wParam, lParam);
     if (!infoPtr && msg != WM_CREATE)
         return DefWindowProcW (hwnd, msg, wParam, lParam);

diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c
index 9340fc6..55bce51 100644
--- a/dlls/comctl32/syslink.c
+++ b/dlls/comctl32/syslink.c
@@ -38,6 +38,7 @@
 #include "comctl32.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(syslink);

@@ -1559,7 +1560,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message,
 {
     SYSLINK_INFO *infoPtr;

-    TRACE("hwnd=%p msg=%04x wparam=%lx lParam=%lx\n", hwnd, message, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%lx lParam=%lx\n", hwnd, WMToString(message), wParam, lParam);

infoPtr = (SYSLINK_INFO *)GetWindowLongPtrW(hwnd, 0);

diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index 8807a11..ff0f06d 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -66,6 +66,7 @@
 #include "tmschema.h"
 #include "wine/debug.h"
 #include <math.h>
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(tab);

@@ -3333,7 +3334,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);

-    TRACE("hwnd=%p msg=%x wParam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wParam=%lx lParam=%lx\n", hwnd, WMToString(uMsg), wParam, lParam);
     if (!infoPtr && (uMsg != WM_CREATE))
       return DefWindowProcW (hwnd, uMsg, wParam, lParam);

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 9b41732..b9a0945 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -83,6 +83,7 @@
 #include "uxtheme.h"
 #include "tmschema.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(toolbar);

@@ -6400,8 +6401,8 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongPtrW(hwnd, 0);

-    TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n",
-	  hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%lx lparam=%lx\n",
+	  hwnd, WMToString(uMsg), wParam, lParam);

if (!infoPtr && (uMsg != WM_NCCREATE))
    return DefWindowProcW( hwnd, uMsg, wParam, lParam );
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index 688d3b5..1c9f877 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -103,6 +103,7 @@
 #include "commctrl.h"
 #include "comctl32.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(tooltips);

@@ -2158,7 +2159,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);

-    TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%lx lParam=%lx\n", hwnd, WMToString(uMsg), wParam, lParam);
     if (!infoPtr && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE))
         return DefWindowProcW (hwnd, uMsg, wParam, lParam);
     switch (uMsg)
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index c924b53..340c7ab 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -44,6 +44,7 @@
 #include "uxtheme.h"
 #include "tmschema.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

#include "comctl32.h"

@@ -1736,7 +1737,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     TRACKBAR_INFO *infoPtr = (TRACKBAR_INFO *)GetWindowLongPtrW (hwnd, 0);

-    TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%lx lparam=%lx\n", hwnd, WMToString(uMsg), wParam, lParam);

if (!infoPtr && (uMsg != WM_CREATE))
         return DefWindowProcW (hwnd, uMsg, wParam, lParam);
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c
index 75653e1..a13b1e2 100644
--- a/dlls/comctl32/updown.c
+++ b/dlls/comctl32/updown.c
@@ -44,6 +44,7 @@
 #include "tmschema.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
+#include "wine/resolvewm.h"

WINE_DEFAULT_DEBUG_CHANNEL(updown);

@@ -530,8 +531,8 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
 {
     UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr((HWND)ref_data);

-    TRACE("hwnd=%p, uMsg=%04x, wParam=%08lx, lParam=%08lx\n",
-          hwnd, uMsg, wParam, lParam);
+    TRACE("hwnd=%p, msg=%s, wParam=%08lx, lParam=%08lx\n",
+          hwnd, WMToString(uMsg), wParam, lParam);

switch(uMsg)
     {
@@ -826,7 +827,7 @@ static void UPDOWN_HandleMouseEvent (UPDOWN_INFO *infoPtr, UINT msg, INT x, INT
             break;

default:
-	    ERR("Impossible case (msg=%x)!\n", msg);
+	    ERR("Impossible case (msg=%s)!\n", WMToString(msg));
     }

}
@@ -840,7 +841,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
     static const WCHAR themeClass[] = {'S','p','i','n',0};
     HTHEME theme;

-    TRACE("hwnd=%p msg=%04x wparam=%08lx lparam=%08lx\n", hwnd, message, wParam, lParam);
+    TRACE("hwnd=%p msg=%s wparam=%08lx lparam=%08lx\n", hwnd, WMToString(message), wParam, lParam);

if (!infoPtr && (message != WM_CREATE))
         return DefWindowProcW (hwnd, message, wParam, lParam);