Jörg Höhle : winmm: Trace DriverCallback once upon entry.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e6a501bbd6286b05b37bf6183113b35f4a1e6c13
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e6a501bbd6286b05b37bf6183113b35f4a1e6c13

Author: Jörg Höhle <hoehle at users.sourceforge.net>
Date:   Tue Mar 29 20:51:15 2011 +0200

winmm: Trace DriverCallback once upon entry.

---

 dlls/winmm/driver.c |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c
index 23338d2..8620fe6 100644
--- a/dlls/winmm/driver.c
+++ b/dlls/winmm/driver.c
@@ -531,34 +531,44 @@ LRESULT WINAPI DefDriverProc(DWORD_PTR dwDriverIdentifier, HDRVR hDrv,
 }
 
 /**************************************************************************
+ *				DRIVER_getCallback		[internal]
+ */
+static const char* DRIVER_getCallback(DWORD uFlags)
+{
+    switch(uFlags & DCB_TYPEMASK) {
+    case DCB_NULL:     return "null";
+    case DCB_WINDOW:   return "window";
+    case DCB_TASK:     return "task";
+    case DCB_EVENT:    return "event";
+    case DCB_FUNCTION: return "32bit function";
+    default:           return "UNKNOWN";
+    }
+}
+
+/**************************************************************************
  * 				DriverCallback			[WINMM.@]
  */
 BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev,
 			   DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1,
 			   DWORD_PTR dwParam2)
 {
-    TRACE("(%08lX, %04X, %p, %04X, %08lX, %08lX, %08lX)\n",
-	  dwCallBack, uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2);
+    TRACE("(%08lX, %s %04X, %p, %04X, %08lX, %08lX, %08lX)\n",
+	  dwCallBack, DRIVER_getCallback(uFlags), uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2);
 
     switch (uFlags & DCB_TYPEMASK) {
     case DCB_NULL:
-	TRACE("Null !\n");
 	break;
     case DCB_WINDOW:
-	TRACE("Window(%04lX) handle=%p!\n", dwCallBack, hDev);
 	PostMessageA((HWND)dwCallBack, wMsg, (WPARAM)hDev, dwParam1);
 	break;
     case DCB_TASK: /* aka DCB_THREAD */
-	TRACE("Task(%04lx) !\n", dwCallBack);
 	PostThreadMessageA(dwCallBack, wMsg, (WPARAM)hDev, dwParam1);
 	break;
     case DCB_FUNCTION:
-	TRACE("Function (32 bit) !\n");
 	if (dwCallBack)
 	    ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2);
 	break;
     case DCB_EVENT:
-	TRACE("Event(%08lx) !\n", dwCallBack);
 	SetEvent((HANDLE)dwCallBack);
 	break;
 #if 0