From a311dff763536ae596bbaa7baedcb61b5d5b6081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20H=C3=B6hle?= Date: Tue, 9 Mar 2010 22:07:22 +0100 Subject: [PATCH] winmm: A NULL CALLBACK_FUNCTION is acceptable since w2k. --- dlls/winmm/driver.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 48152abaf1..23338d2494 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -543,8 +543,6 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, 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 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, 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);