[PATCH v3 1/4] winmm/tests: Expect TIME_BYTES format for TIME_MS request.

Andrew Eikum aeikum at codeweavers.com
Thu Jan 21 14:41:33 CST 2021


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

On Wed, Jan 20, 2021 at 10:23:40PM +0900, Akihiro Sagawa wrote:
> In v3,
>   - keep existing tests.
>   - don't touch time_to_bytes() since it's also used in capture.c.
> 
> Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
> ---
>  dlls/winmm/tests/wave.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 

> diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
> index 819489e5566..079a497dd0b 100644
> --- a/dlls/winmm/tests/wave.c
> +++ b/dlls/winmm/tests/wave.c
> @@ -519,14 +519,11 @@ 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));
> -    if (mmtime.wType != TIME_MS && winetest_debug > 1)
> -        trace("waveOutGetPosition(%s): TIME_MS not supported, returned %s\n",
> -              dev_name(device), wave_time_format(mmtime.wType));
> +    todo_wine 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): returned %d ms, "
> -       "(%d bytes), should be %d (%d bytes)\n", dev_name(device),
> -       bytes_to_ms(returned, pwfx), returned,
> -       bytes_to_ms(bytes, pwfx), bytes);
> +    ok(returned == bytes, "waveOutGetPosition(%s): TIME_MS test failed\n",
> +       dev_name(device));
>  
>      mmtime.wType = TIME_SMPTE;
>      rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime));




More information about the wine-devel mailing list