commit a311dff763536ae596bbaa7baedcb61b5d5b6081
author Jörg Höhle <hoehle@users.sourceforge.net> Tue Mar 09 22:07:22 2010 +0100
committer Alexandre Julliard <julliard@winehq.org> Wed May 19 11:17:26 2010 +0200
tree 94e59d61c3ccdb82fef43a39761e9a3c4421829b
parent e3869300b9d92592c6786f4ce8889ee34e95951a

winmm: A NULL CALLBACK_FUNCTION is acceptable since w2k.

dlls/winmm/driver.c

diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c
index 48152ab..23338d2 100644
--- a/dlls/winmm/driver.c
+++ b/dlls/winmm/driver.c
@@ -543,8 +543,6 @@
     switch (uFlags & DCB_TYPEMASK) {
     case DCB_NULL:
 	TRACE("Null !\n");
-	if (dwCallBack)
-	    WARN("uFlags=%04X has null DCB value, but dwCallBack=%08lX is not null !\n", uFlags, dwCallBack);
 	break;
     case DCB_WINDOW:
 	TRACE("Window(%04lX) handle=%p!\n", dwCallBack, hDev);
@@ -556,7 +554,8 @@
 	break;
     case DCB_FUNCTION:
 	TRACE("Function (32 bit) !\n");
-	((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2);
+	if (dwCallBack)
+	    ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2);
 	break;
     case DCB_EVENT:
 	TRACE("Event(%08lx) !\n", dwCallBack);