[PATCH v3 2/4] winmm: Get rid of TIME_MS format support in waveOutGetPosition().

[Andrew Eikum]

Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>

On Wed, Jan 20, 2021 at 10:23:42PM +0900, Akihiro Sagawa wrote:
> 
> SofTalk (Japanese text-to-speech software) depends on this.
> 
> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50515
> Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
> ---
>  dlls/winmm/tests/wave.c | 2 +-
>  dlls/winmm/waveform.c   | 3 ---
>  2 files changed, 1 insertion(+), 4 deletions(-)
> 

> diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
> index 079a497dd0b..cb18f3e0fa4 100644
> --- 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",
> diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c
> index 9d58b78c779..876b9d3d91d 100644
> --- 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 */