[ros-diffs] [akhaldi] 66837: [WINMM] Apply Wine commit 6501113 by Jörg Höhle: MCI_ALL_DEVICE_ID(MCIDEVICEID) is not a 16bit entity in MCI32. CORE-9246

Author: akhaldi
Date: Fri Mar 20 11:16:05 2015
New Revision: 66837

URL: http://svn.reactos.org/svn/reactos?rev=66837&view=rev
Log:
[WINMM] Apply Wine commit 6501113 by Jörg Höhle: MCI_ALL_DEVICE_ID(MCIDEVICEID) is not a
16bit entity in MCI32. CORE-9246

Modified:
    trunk/reactos/dll/win32/winmm/mci.c

Modified: trunk/reactos/dll/win32/winmm/mci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/winmm/mci.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/winmm/mci.c	[iso-8859-1] Fri Mar 20 11:16:05 2015
@@ -82,7 +82,7 @@
 /**************************************************************************
  * 				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 @@
 
     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 @@
         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 {