Signed-off-by: Akihiro Sagawa sagawa.aki@gmail.com --- dlls/winmm/tests/wave.c | 12 ------------ dlls/winmm/tests/winmm_test.h | 1 - 2 files changed, 13 deletions(-)
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=84669
Your paranoid android.
=== w10pro64 (32 bit report) ===
winmm: mci: Timeout
=== w1064 (64 bit report) ===
winmm: mci.c:980: Test failed: 242ms is not in the expected 350-600ms range mci.c:987: Test failed: 242ms is not even in the expected 350-1000ms range
=== w1064_2qxl (64 bit report) ===
winmm: mci: Timeout
=== w10pro64 (64 bit report) ===
winmm: mci.c:980: Test failed: 272ms is not in the expected 350-600ms range mci.c:987: Test failed: 272ms is not even in the expected 350-1000ms range
=== w1064v1809 (64 bit report) ===
winmm: wave.c:1607: Test failed: header 1 callback missed wave.c:1610: Test failed: header 2 callback missed wave.c:1619: Test failed: after position: 10752 wave.c:1623: Test failed: waveOutClose failed: WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.)
Signed-off-by: Andrew Eikum aeikum@codeweavers.com
On Thu, Jan 28, 2021 at 09:42:20PM +0900, Akihiro Sagawa wrote:
Signed-off-by: Akihiro Sagawa sagawa.aki@gmail.com
dlls/winmm/tests/wave.c | 12 ------------ dlls/winmm/tests/winmm_test.h | 1 - 2 files changed, 13 deletions(-)
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8afb32d5c73..2f0c8443363 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -456,24 +456,12 @@ DWORD bytes_to_samples(DWORD bytes, LPWAVEFORMATEX pwfx) return bytes / pwfx->nBlockAlign; }
-DWORD bytes_to_ms(DWORD bytes, LPWAVEFORMATEX pwfx) -{
- return bytes_to_samples(bytes, pwfx) * 1000 / pwfx->nSamplesPerSec;
-}
DWORD time_to_bytes(LPMMTIME mmtime, LPWAVEFORMATEX pwfx) { if (mmtime->wType == TIME_BYTES) return mmtime->u.cb; else if (mmtime->wType == TIME_SAMPLES) return mmtime->u.sample * pwfx->nBlockAlign;
else if (mmtime->wType == TIME_MS)
return mmtime->u.ms * pwfx->nAvgBytesPerSec / 1000;
else if (mmtime->wType == TIME_SMPTE)
return ((mmtime->u.smpte.hour * 60 * 60) +
(mmtime->u.smpte.min * 60) +
(mmtime->u.smpte.sec)) * pwfx->nAvgBytesPerSec +
mmtime->u.smpte.frame * pwfx->nAvgBytesPerSec / 30;
trace("FIXME: time_to_bytes() type not supported\n"); return -1;
diff --git a/dlls/winmm/tests/winmm_test.h b/dlls/winmm/tests/winmm_test.h index d5fb70afbde..98b461309d7 100644 --- a/dlls/winmm/tests/winmm_test.h +++ b/dlls/winmm/tests/winmm_test.h @@ -76,5 +76,4 @@ extern const char* wave_out_error(MMRESULT); extern const char* get_format_str(WORD format); extern const char* wave_time_format(UINT type); extern DWORD bytes_to_samples(DWORD bytes, LPWAVEFORMATEX pwfx); -extern DWORD bytes_to_ms(DWORD bytes, LPWAVEFORMATEX pwfx); extern DWORD time_to_bytes(LPMMTIME mmtime, LPWAVEFORMATEX pwfx);