From 4751a509e807124cce0d955941c2021f9a28707e Mon Sep 17 00:00:00 2001 From: Robert Riggs Date: Thu, 10 Dec 1998 09:03:00 +0000 Subject: [PATCH] Accept MCI_OPEN and MCI_CLOSE messages in MCICDAUDIO_DriverProc32(). --- multimedia/mcicda.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/multimedia/mcicda.c b/multimedia/mcicda.c index 82c441a9175..7c3127da0d4 100644 --- a/multimedia/mcicda.c +++ b/multimedia/mcicda.c @@ -1100,7 +1100,9 @@ LONG MCICDAUDIO_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, case DRV_INSTALL: return DRVCNF_RESTART; case DRV_REMOVE: return DRVCNF_RESTART; - case MCI_OPEN_DRIVER: return CDAUDIO_mciOpen(dwDevID, dwParam1, (LPMCI_OPEN_PARMS32A)dwParam2); + case MCI_OPEN: + case MCI_OPEN_DRIVER: return CDAUDIO_mciOpen(dwDevID, dwParam1, (LPMCI_OPEN_PARMS32A)dwParam2); + case MCI_CLOSE: case MCI_CLOSE_DRIVER: return CDAUDIO_mciClose(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); case MCI_GETDEVCAPS: return CDAUDIO_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2); case MCI_INFO: return CDAUDIO_mciInfo(dwDevID, dwParam1, (LPMCI_INFO_PARMS16)dwParam2); @@ -1132,10 +1134,15 @@ LONG MCICDAUDIO_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, case MCI_PASTE: WARN(cdaudio, "Unsupported command=%s\n", MCI_CommandToString(wMsg)); break; +/* + * This is incorrect according to Microsoft... + * http://support.microsoft.com/support/kb/articles/q137/5/79.asp + * case MCI_OPEN: case MCI_CLOSE: FIXME(cdaudio, "Shouldn't receive a MCI_OPEN or CLOSE message\n"); break; + */ default: TRACE(cdaudio, "Sending msg=%s to default driver proc\n", MCI_CommandToString(wMsg)); return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2); -- 2.11.4.GIT