ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mciseq: Refactor use of mciGetDriverData.

This commit is contained in:
Jörg Höhle 2010-12-15 22:47:45 +01:00 committed by Alexandre Julliard
parent 39fa94324d
commit 3ae829d11b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/mciseq/mcimidi.c
View File

@ -196,11 +196,11 @@ static DWORD MIDI_drvClose(DWORD dwDevID)
/************************************************************************** /**************************************************************************
* MIDI_mciGetOpenDev [internal] * MIDI_mciGetOpenDev [internal]
*/ */
static WINE_MCIMIDI* MIDI_mciGetOpenDev(UINT wDevID) static WINE_MCIMIDI* MIDI_mciGetOpenDev(MCIDEVICEID wDevID, UINT wMsg)
{ {
WINE_MCIMIDI* wmm = (WINE_MCIMIDI*)mciGetDriverData(wDevID); WINE_MCIMIDI* wmm = (WINE_MCIMIDI*)mciGetDriverData(wDevID);
if (wmm == NULL || wmm->nUseCount == 0) { if (wmm == NULL || ((wmm->nUseCount == 0) ^ (wMsg == MCI_OPEN_DRIVER))) {
WARN("Invalid wDevID=%u\n", wDevID); WARN("Invalid wDevID=%u\n", wDevID);
return 0; return 0;
} }
@ -1600,8 +1600,7 @@ LRESULT CALLBACK MCIMIDI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
} }
wmm = (wMsg == MCI_OPEN_DRIVER) ? wmm = MIDI_mciGetOpenDev(dwDevID, wMsg);
(WINE_MCIMIDI*)mciGetDriverData(dwDevID) : MIDI_mciGetOpenDev(dwDevID);
if (wmm == NULL) return MCIERR_INVALID_DEVICE_ID; if (wmm == NULL) return MCIERR_INVALID_DEVICE_ID;
switch (wMsg) { switch (wMsg) {