Jörg Höhle : winmm: midiStreamPosition can select an alternative MMTIME format.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f1373d57c1e2c464c7c99e9fa85c24288e0127b3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f1373d57c1e2c464c7c99e9fa85c24288e0127b3

Author: Jörg Höhle <hoehle at users.sourceforge.net>
Date:   Sat Jan 30 10:07:59 2010 +0100

winmm: midiStreamPosition can select an alternative MMTIME format.

---

 dlls/winmm/winmm.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
index 1a1fdad..4a03209 100644
--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -1872,6 +1872,12 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm
 	ret = MMSYSERR_INVALPARAM;
     } else {
 	switch (lpMMT->wType) {
+	default:
+	    FIXME("Unsupported time type %x\n", lpMMT->wType);
+	case TIME_BYTES:
+	case TIME_SAMPLES:
+	    lpMMT->wType = TIME_MS;
+	    /* fall through to alternative format */
 	case TIME_MS:
 	    lpMMT->u.ms = lpMidiStrm->dwPositionMS;
 	    TRACE("=> %d ms\n", lpMMT->u.ms);
@@ -1880,11 +1886,6 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm
 	    lpMMT->u.ticks = lpMidiStrm->dwPulses;
 	    TRACE("=> %d ticks\n", lpMMT->u.ticks);
 	    break;
-	default:
-	    WARN("Unsupported time type %d\n", lpMMT->wType);
-	    lpMMT->wType = TIME_MS;
-	    ret = MMSYSERR_INVALPARAM;
-	    break;
 	}
     }
     return ret;