Jörg Höhle : mciwave: Return on error in Seek.
Alexandre Julliard
julliard at winehq.org
Tue Nov 10 09:39:15 CST 2009
Module: wine
Branch: master
Commit: c75d1cba15e704c6c8739a6ebaf49cb95f1bdcb6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75d1cba15e704c6c8739a6ebaf49cb95f1bdcb6
Author: Jörg Höhle <hoehle at users.sourceforge.net>
Date: Sat Nov 7 08:34:16 2009 +0100
mciwave: Return on error in Seek.
---
dlls/mciwave/mciwave.c | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c
index e7afab7..b8f394e 100644
--- a/dlls/mciwave/mciwave.c
+++ b/dlls/mciwave/mciwave.c
@@ -1202,37 +1202,33 @@ static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PAR
*/
static DWORD WAVE_mciSeek(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
{
- DWORD ret = 0;
WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID);
TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms);
- if (lpParms == NULL) {
- ret = MCIERR_NULL_PARAMETER_BLOCK;
- } else if (wmw == NULL) {
- ret = MCIERR_INVALID_DEVICE_ID;
+ if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
+ if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID;
+
+ WAVE_mciStop(wDevID, MCI_WAIT, 0);
+
+ if (dwFlags & MCI_SEEK_TO_START) {
+ wmw->dwPosition = 0;
+ } else if (dwFlags & MCI_SEEK_TO_END) {
+ wmw->dwPosition = wmw->ckWaveData.cksize;
+ } else if (dwFlags & MCI_TO) {
+ wmw->dwPosition = WAVE_ConvertTimeFormatToByte(wmw, lpParms->dwTo);
} else {
- WAVE_mciStop(wDevID, MCI_WAIT, 0);
-
- if (dwFlags & MCI_SEEK_TO_START) {
- wmw->dwPosition = 0;
- } else if (dwFlags & MCI_SEEK_TO_END) {
- wmw->dwPosition = wmw->ckWaveData.cksize;
- } else if (dwFlags & MCI_TO) {
- wmw->dwPosition = WAVE_ConvertTimeFormatToByte(wmw, lpParms->dwTo);
- } else {
- WARN("dwFlag doesn't tell where to seek to...\n");
- return MCIERR_MISSING_PARAMETER;
- }
+ WARN("dwFlag doesn't tell where to seek to...\n");
+ return MCIERR_MISSING_PARAMETER;
+ }
- TRACE("Seeking to position=%u bytes\n", wmw->dwPosition);
+ TRACE("Seeking to position=%u bytes\n", wmw->dwPosition);
- if (dwFlags & MCI_NOTIFY) {
- mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
- wmw->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL);
- }
+ if (dwFlags & MCI_NOTIFY) {
+ mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)),
+ wmw->openParms.wDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
- return ret;
+ return MMSYSERR_NOERROR;
}
/**************************************************************************
More information about the wine-cvs
mailing list