From defc192481a54a881081b1e1e571775d5e541484 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 20 Mar 2015 11:16:05 +0000 Subject: [PATCH] =?UTF-8?q?[WINMM]=20Apply=20Wine=20commit=206501113=20by?= =?UTF-8?q?=20J=C3=B6rg=20H=C3=B6hle:=20MCI=5FALL=5FDEVICE=5FID(MCIDEVICEI?= =?UTF-8?q?D)=20is=20not=20a=2016bit=20entity=20in=20MCI32.=20CORE-9246?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=66837 --- reactos/dll/win32/winmm/mci.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/winmm/mci.c b/reactos/dll/win32/winmm/mci.c index eda26b036cb..257d79e3aff 100644 --- a/reactos/dll/win32/winmm/mci.c +++ b/reactos/dll/win32/winmm/mci.c @@ -82,7 +82,7 @@ static inline LPWSTR str_dup_upper( LPCWSTR str ) /************************************************************************** * MCI_GetDriver [internal] */ -static LPWINE_MCIDRIVER MCI_GetDriver(UINT16 wDevID) +static LPWINE_MCIDRIVER MCI_GetDriver(UINT wDevID) { LPWINE_MCIDRIVER wmd = 0; @@ -1659,7 +1659,8 @@ static DWORD MCI_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) TRACE("(%04x, %08X, %p)\n", wDevID, dwParam, lpParms); - if (wDevID == MCI_ALL_DEVICE_ID) { + /* Every device must handle MCI_NOTIFY on its own. */ + if ((UINT16)wDevID == (UINT16)MCI_ALL_DEVICE_ID) { /* FIXME: shall I notify once after all is done, or for * each of the open drivers ? if the latest, which notif * to return when only one fails ? @@ -1885,7 +1886,7 @@ DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dw dwRet = MCI_Sound(wDevID, dwParam1, (LPMCI_SOUND_PARMSW)dwParam2); break; default: - if (wDevID == MCI_ALL_DEVICE_ID) { + if ((UINT16)wDevID == (UINT16)MCI_ALL_DEVICE_ID) { FIXME("unhandled MCI_ALL_DEVICE_ID\n"); dwRet = MCIERR_CANNOT_USE_ALL; } else {