Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:23:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=66837
This commit is contained in:
Amine Khaldi 2015-03-20 11:16:05 +00:00
parent 9428e523d2
commit defc192481
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/winmm/mci.c
View file

@ -82,7 +82,7 @@ static inline LPWSTR str_dup_upper( LPCWSTR str )
/************************************************************************** /**************************************************************************
* MCI_GetDriver [internal] * MCI_GetDriver [internal]
*/ */
static LPWINE_MCIDRIVER MCI_GetDriver(UINT16 wDevID) static LPWINE_MCIDRIVER MCI_GetDriver(UINT wDevID)
{ {
LPWINE_MCIDRIVER wmd = 0; 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); 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 /* FIXME: shall I notify once after all is done, or for
* each of the open drivers ? if the latest, which notif * each of the open drivers ? if the latest, which notif
* to return when only one fails ? * 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); dwRet = MCI_Sound(wDevID, dwParam1, (LPMCI_SOUND_PARMSW)dwParam2);
break; break;
default: default:
if (wDevID == MCI_ALL_DEVICE_ID) { if ((UINT16)wDevID == (UINT16)MCI_ALL_DEVICE_ID) {
FIXME("unhandled MCI_ALL_DEVICE_ID\n"); FIXME("unhandled MCI_ALL_DEVICE_ID\n");
dwRet = MCIERR_CANNOT_USE_ALL; dwRet = MCIERR_CANNOT_USE_ALL;
} else { } else {