From 0497aa649acb55348e291be7d841292c5cfebfb5 Mon Sep 17 00:00:00 2001 From: Bradley Baetz Date: Sat, 11 Dec 1999 23:04:55 +0000 Subject: [PATCH] The wavemap driver wasn't passing the callback type to the DriverCallback routine correctly. --- dlls/winmm/mmsystem.c | 2 ++ dlls/winmm/wavemap/wavemap.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index c3beba09e1c..ce2d1590143 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -620,6 +620,8 @@ BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT 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"); break; case DCB_WINDOW: TRACE("Window(%04lX) handle=%04X!\n", dwCallBack, hDev); diff --git a/dlls/winmm/wavemap/wavemap.c b/dlls/winmm/wavemap/wavemap.c index 0172752e0ae..59c25a2ac73 100644 --- a/dlls/winmm/wavemap/wavemap.c +++ b/dlls/winmm/wavemap/wavemap.c @@ -71,7 +71,7 @@ static void CALLBACK WAVEMAP_DstCallback(HDRVR hDev, UINT uMsg, DWORD dwInstance ERR("Unknown msg %u\n", uMsg); } - DriverCallback(wom->dwCallback, wom->dwFlags, hDev, uMsg, + DriverCallback(wom->dwCallback, HIWORD(wom->dwFlags), hDev, uMsg, wom->dwClientInstance, dwParam1, dwParam2); }