winmm: Get rid of TIME_MS format support in waveOutGetPosition().

SofTalk (Japanese text-to-speech software) depends on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50515Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winmm: Get rid of TIME_MS format support in waveOutGetPosition().
37f3a078 · Akihiro Sagawa · Alexandre Julliard · aa56ee08 · 37f3a078 · 37f3a078
Commit 37f3a078 authored Jan 20, 2021 by Akihiro Sagawa Committed by Alexandre Julliard Jan 21, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

wave.c dlls/winmm/tests/wave.c +1 -1

waveform.c dlls/winmm/waveform.c +0 -3

No files found.
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -519,7 +519,7 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes,
    rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime));
    ok(rc==MMSYSERR_NOERROR,
       "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc));
-    todo_wine ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n",
+    ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n",
       dev_name(device), wave_time_format(mmtime.wType));
    returned = time_to_bytes(&mmtime, pwfx);
    ok(returned == bytes, "waveOutGetPosition(%s): TIME_MS test failed\n",

--- a/dlls/winmm/waveform.c
+++ b/dlls/winmm/waveform.c
@@ -2038,9 +2038,6 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames,
    case TIME_SAMPLES:
        time->u.sample = played_frames;
        return MMSYSERR_NOERROR;
-    case TIME_MS:
-        time->u.ms = (UINT64)played_frames * 1000 / sample_rate;
-        return MMSYSERR_NOERROR;
    case TIME_SMPTE:
        time->u.smpte.fps = 30;
        played_frames += sample_rate / time->u.smpte.fps - 1; /* round up */