Skip to content

W
wine-cw
Commit da24dff4 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

Make sure we won't get an overflow in check_position() even if we play

longer test tones.
parent 02a8ab2f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
dlls/winmm/tests/wave.c
View file @ da24dff4
...@@ -215,9 +215,11 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, LPWAVEFORMATE ...@@ -215,9 +215,11 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, LPWAVEFORMATE
{ {
MMTIME mmtime; MMTIME mmtime;
DWORD samples; DWORD samples;
double duration;
MMRESULT rc; MMRESULT rc;
samples=bytes*8/pwfx->wBitsPerSample/pwfx->nChannels; samples=bytes/(pwfx->wBitsPerSample/8*pwfx->nChannels);
duration=((double)samples)/pwfx->nSamplesPerSec;
mmtime.wType = TIME_BYTES; mmtime.wType = TIME_BYTES;
rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime));
...@@ -246,9 +248,9 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, LPWAVEFORMATE ...@@ -246,9 +248,9 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, LPWAVEFORMATE
ok(rc==MMSYSERR_NOERROR, ok(rc==MMSYSERR_NOERROR,
"waveOutGetPosition: device=%s rc=%s\n",dev_name(device),wave_out_error(rc)); "waveOutGetPosition: device=%s rc=%s\n",dev_name(device),wave_out_error(rc));
if (mmtime.wType == TIME_MS) if (mmtime.wType == TIME_MS)
ok(mmtime.u.ms==samples*1000/pwfx->nSamplesPerSec, ok(mmtime.u.ms==floor(duration*1000.0),
"waveOutGetPosition returned %ld ms, should be %ld\n", "waveOutGetPosition returned %ld ms, should be %ld\n",
mmtime.u.ms, samples*1000/pwfx->nSamplesPerSec); mmtime.u.ms, (long)floor(duration*1000.0));
else else
trace("TIME_MS not supported, returned %s\n",wave_time_format(mmtime.wType)); trace("TIME_MS not supported, returned %s\n",wave_time_format(mmtime.wType));
...@@ -258,7 +260,6 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, LPWAVEFORMATE ...@@ -258,7 +260,6 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, LPWAVEFORMATE
"waveOutGetPosition: device=%s rc=%s\n",dev_name(device),wave_out_error(rc)); "waveOutGetPosition: device=%s rc=%s\n",dev_name(device),wave_out_error(rc));
if (mmtime.wType == TIME_SMPTE) if (mmtime.wType == TIME_SMPTE)
{ {
double duration=((double)samples)/pwfx->nSamplesPerSec;
BYTE frames=ceil(fmod(duration*mmtime.u.smpte.fps, mmtime.u.smpte.fps)); BYTE frames=ceil(fmod(duration*mmtime.u.smpte.fps, mmtime.u.smpte.fps));
ok(mmtime.u.smpte.hour==(BYTE)(floor(duration/(60*60))) && ok(mmtime.u.smpte.hour==(BYTE)(floor(duration/(60*60))) &&
mmtime.u.smpte.min==(BYTE)(fmod(floor(duration/60), 60)) && mmtime.u.smpte.min==(BYTE)(fmod(floor(duration/60), 60)) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment