Chris Robinson : mcicda: Partially handle Play notifications.
Alexandre Julliard
julliard at winehq.org
Fri Feb 27 10:02:49 CST 2009
Module: wine
Branch: master
Commit: 2a1582603fd17434264f3f94f1420c0beaef3f92
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1582603fd17434264f3f94f1420c0beaef3f92
Author: Chris Robinson <chris.kcat at gmail.com>
Date: Thu Feb 26 08:49:42 2009 -0800
mcicda: Partially handle Play notifications.
---
dlls/mcicda/mcicda.c | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c
index 384e8eb..79f3bae 100644
--- a/dlls/mcicda/mcicda.c
+++ b/dlls/mcicda/mcicda.c
@@ -141,6 +141,16 @@ static DWORD CALLBACK MCICDA_playLoop(void *ptr)
IDirectSoundBuffer_Stop(wmcda->dsBuf);
SetEvent(wmcda->stopEvent);
+ EnterCriticalSection(&wmcda->cs);
+ if (wmcda->hCallback) {
+ mciDriverNotify(wmcda->hCallback, wmcda->wNotifyDeviceID,
+ FAILED(hr) ? MCI_NOTIFY_FAILURE :
+ ((endPos!=lastPos) ? MCI_NOTIFY_ABORTED :
+ MCI_NOTIFY_SUCCESSFUL));
+ wmcda->hCallback = NULL;
+ }
+ LeaveCriticalSection(&wmcda->cs);
+
ExitThread(0);
return 0;
}
@@ -892,6 +902,14 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
IDirectSound_Release(wmcda->dsObj);
wmcda->dsObj = NULL;
}
+ else if(wmcda->hCallback) {
+ mciDriverNotify(wmcda->hCallback, wmcda->wNotifyDeviceID,
+ MCI_NOTIFY_ABORTED);
+ wmcda->hCallback = NULL;
+ }
+
+ if ((dwFlags&MCI_NOTIFY))
+ wmcda->hCallback = HWND_32(LOWORD(lpParms->dwCallback));
if (pDirectSoundCreate) {
WAVEFORMATEX format;
@@ -983,6 +1001,7 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
play.EndingF = end % CDFRAMES_PERSEC;
if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PLAY_AUDIO_MSF, &play, sizeof(play),
NULL, 0, &br, NULL)) {
+ wmcda->hCallback = NULL;
ret = MCIERR_HARDWARE;
} else if (dwFlags & MCI_NOTIFY) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
@@ -1023,6 +1042,11 @@ static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms
else if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_STOP_AUDIO, NULL, 0, NULL, 0, &br, NULL))
return MCIERR_HARDWARE;
+ if (wmcda->hCallback) {
+ mciDriverNotify(wmcda->hCallback, wmcda->wNotifyDeviceID, MCI_NOTIFY_ABORTED);
+ wmcda->hCallback = NULL;
+ }
+
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
@@ -1052,6 +1076,13 @@ static DWORD MCICDA_Pause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParm
else if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PAUSE_AUDIO, NULL, 0, NULL, 0, &br, NULL))
return MCIERR_HARDWARE;
+ EnterCriticalSection(&wmcda->cs);
+ if (wmcda->hCallback) {
+ mciDriverNotify(wmcda->hCallback, wmcda->wNotifyDeviceID, MCI_NOTIFY_SUPERSEDED);
+ wmcda->hCallback = NULL;
+ }
+ LeaveCriticalSection(&wmcda->cs);
+
if (lpParms && (dwFlags & MCI_NOTIFY)) {
TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
More information about the wine-cvs
mailing list