Jörg Höhle : mciavi: Use MCIERR_UNSUPPORTED_FUNCTION, not 0 (NOERROR).
Alexandre Julliard
julliard at winehq.org
Fri Feb 12 10:17:44 CST 2010
Module: wine
Branch: master
Commit: 3e5c704e7a44328e9243e786bd6e37c17e790fa4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5c704e7a44328e9243e786bd6e37c17e790fa4
Author: Jörg Höhle <hoehle at users.sourceforge.net>
Date: Sat Nov 28 15:38:47 2009 +0100
mciavi: Use MCIERR_UNSUPPORTED_FUNCTION, not 0 (NOERROR).
---
dlls/mciavi32/mciavi.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c
index cfae27c..f6de683 100644
--- a/dlls/mciavi32/mciavi.c
+++ b/dlls/mciavi32/mciavi.c
@@ -397,6 +397,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
wma = MCIAVI_mciGetOpenDev(wDevID);
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
+ if (dwFlags & MCI_DGV_PLAY_REVERSE) return MCIERR_UNSUPPORTED_FUNCTION;
EnterCriticalSection(&wma->cs);
@@ -457,7 +458,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
/* signal the state change */
SetEvent(wma->ack_event);
- if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_DGV_PLAY_REVERSE|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN))
+ if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN))
FIXME("Unsupported flag %08x\n", dwFlags);
/* time is in microseconds, we should convert it to milliseconds */
@@ -719,9 +720,7 @@ static DWORD MCIAVI_mciLoad(UINT wDevID, DWORD dwFlags, LPMCI_DGV_LOAD_PARMSW lp
wma = MCIAVI_mciGetOpenDev(wDevID);
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
- MCIAVI_mciStop(wDevID, MCI_WAIT, NULL);
-
- return 0;
+ return MCIERR_UNSUPPORTED_FUNCTION; /* like w2k */
}
/******************************************************************************
@@ -797,6 +796,7 @@ static DWORD MCIAVI_mciCue(UINT wDevID, DWORD dwFlags, LPMCI_DGV_CUE_PARMS lpPar
wma = MCIAVI_mciGetOpenDev(wDevID);
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
+ if (dwFlags & MCI_DGV_CUE_INPUT) return MCIERR_UNSUPPORTED_FUNCTION;
return 0;
}
@@ -815,7 +815,7 @@ static DWORD MCIAVI_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P
wma = MCIAVI_mciGetOpenDev(wDevID);
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
- return 0;
+ return MCIERR_UNSUPPORTED_FUNCTION; /* like w2k */
}
/******************************************************************************
@@ -849,7 +849,7 @@ static DWORD MCIAVI_mciSetVideo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETVIDEO_P
wma = MCIAVI_mciGetOpenDev(wDevID);
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
- return 0;
+ return MCIERR_UNSUPPORTED_FUNCTION; /* like w2k */
}
/******************************************************************************
More information about the wine-cvs
mailing list