Signed-off-by: Akihiro Sagawa sagawa.aki@gmail.com --- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 10 ---------- 2 files changed, 1 insertion(+), 11 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=84283
Your paranoid android.
=== w1064v1809 (32 bit report) ===
winmm: wave.c:501: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 2273 bytes, should be 13230 wave.c:511: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 2273 samples (2273 bytes), should be 13230 (13230 bytes) wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed
=== w1064 (32 bit report) ===
winmm: wave.c:501: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 2238 bytes, should be 13230 wave.c:511: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 2238 samples (2238 bytes), should be 13230 (13230 bytes) wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed
=== w10pro64 (32 bit report) ===
winmm: wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed wave.c:1619: Test failed: header 1 callback missed wave.c:1622: Test failed: header 2 callback missed wave.c:1631: Test failed: after position: 10716 wave.c:1635: 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.)
=== w1064v1809 (64 bit report) ===
winmm: wave.c:501: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 2273 bytes, should be 13230 wave.c:511: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 2273 samples (2273 bytes), should be 13230 (13230 bytes) wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed
=== w1064 (64 bit report) ===
winmm: wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed wave.c:795: Test failed: missing WOM_DONE notification wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed
=== w1064_2qxl (64 bit report) ===
winmm: wave.c:800: Test failed: (00) WHDR_DONE WHDR_PREPARED expected, got WHDR_INQUEUE WHDR_PREPARED wave.c:501: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 2238 bytes, should be 13230 wave.c:511: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 2238 samples (2238 bytes), should be 13230 (13230 bytes) wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed wave.c:533: Test failed: waveOutGetPosition(WAVE_MAPPER): SMPTE test failed wave.c:543: Test failed: waveOutGetPosition(WAVE_MAPPER): MIDI test failed wave.c:553: Test failed: waveOutGetPosition(WAVE_MAPPER): TICKS test failed wave.c:811: Test failed: waveOutUnprepareHeader(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.) wave.c:816: Test failed: dwFlags(-1)=12 wave.c:820: Test failed: waveOutUnprepareHeader(-1): rc=WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.) wave.c:821: Test failed: dwFlags(-1)=13 wave.c:826: Test failed: dwFlags(-1)=13 wave.c:831: Test failed: dwFlags(-1)=13 wave.c:839: Test failed: waveOutClose(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.) wave.c:501: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 1356 bytes, should be 13230 wave.c:511: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 1356 samples (1356 bytes), should be 13230 (13230 bytes) wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed wave.c:800: Test failed: (00) WHDR_DONE WHDR_PREPARED expected, got WHDR_INQUEUE WHDR_PREPARED wave.c:501: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 1356 bytes, should be 13230 wave.c:511: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 1356 samples (1356 bytes), should be 13230 (13230 bytes) wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed wave.c:533: Test failed: waveOutGetPosition(WAVE_MAPPER): SMPTE test failed wave.c:543: Test failed: waveOutGetPosition(WAVE_MAPPER): MIDI test failed wave.c:553: Test failed: waveOutGetPosition(WAVE_MAPPER): TICKS test failed wave.c:811: Test failed: waveOutUnprepareHeader(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.) wave.c:816: Test failed: dwFlags(-1)=12 wave.c:820: Test failed: waveOutUnprepareHeader(-1): rc=WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.) wave.c:821: Test failed: dwFlags(-1)=13 wave.c:826: Test failed: dwFlags(-1)=13 wave.c:831: Test failed: dwFlags(-1)=13 wave.c:839: Test failed: waveOutClose(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.)
=== w10pro64_ar (64 bit report) ===
winmm: wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed
=== w10pro64_he (64 bit report) ===
winmm: wave.c:501: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 1136 bytes, should be 13230 wave.c:511: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 1136 samples (1136 bytes), should be 13230 (13230 bytes) wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed wave.c:795: Test failed: missing WOM_DONE notification wave.c:800: Test failed: (05) WHDR_DONE WHDR_PREPARED expected, got WHDR_INQUEUE WHDR_PREPARED wave.c:800: Test failed: (06) WHDR_DONE WHDR_PREPARED expected, got WHDR_INQUEUE WHDR_PREPARED wave.c:800: Test failed: (07) WHDR_DONE WHDR_PREPARED expected, got WHDR_INQUEUE WHDR_PREPARED wave.c:800: Test failed: (08) WHDR_DONE WHDR_PREPARED expected, got WHDR_INQUEUE WHDR_PREPARED wave.c:800: Test failed: (09) WHDR_DONE WHDR_PREPARED expected, got WHDR_INQUEUE WHDR_PREPARED wave.c:501: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 1356 bytes, should be 17640 wave.c:511: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 1356 samples (1356 bytes), should be 17640 (17640 bytes) wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed wave.c:811: Test failed: waveOutUnprepareHeader(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.) wave.c:811: Test failed: waveOutUnprepareHeader(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.) wave.c:811: Test failed: waveOutUnprepareHeader(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.) wave.c:811: Test failed: waveOutUnprepareHeader(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.) wave.c:811: Test failed: waveOutUnprepareHeader(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(Cannot perform this operation while media data is still playing. Reset the device, or wait until the data is finished playing.)
=== w10pro64_ja (64 bit report) ===
winmm: wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed wave.c:795: Test failed: missing WOM_DONE notification wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed
Signed-off-by: Andrew Eikum aeikum@codeweavers.com
On Wed, Jan 20, 2021 at 10:23:46PM +0900, Akihiro Sagawa wrote:
Signed-off-by: Akihiro Sagawa sagawa.aki@gmail.com
dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 786e724c0f0..8afb32d5c73 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -527,7 +527,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): SMPTE test failed\n",
diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 876b9d3d91d..37dfc919174 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2038,16 +2038,6 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, case TIME_SAMPLES: time->u.sample = played_frames; return MMSYSERR_NOERROR;
- case TIME_SMPTE:
time->u.smpte.fps = 30;played_frames += sample_rate / time->u.smpte.fps - 1; /* round up */time->u.smpte.frame = (played_frames % sample_rate) * time->u.smpte.fps / sample_rate;played_frames /= sample_rate; /* yields seconds */time->u.smpte.sec = played_frames % 60;played_frames /= 60;time->u.smpte.min = played_frames % 60;time->u.smpte.hour= played_frames / 60;return MMSYSERR_NOERROR;
-
Akihiro Sagawa -
Andrew Eikum -
Marvin