[PATCH v3 3/4] winmm/tests: Strictly test returned time format of waveOutGetPostion().
Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/wave.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 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=84282 Your paranoid android. === w1064v1809 (32 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 1377 bytes, should be 13230 wave.c:511: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 1377 samples (1377 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:795: Test failed: missing WOM_DONE notification wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed === w1064 (32 bit report) === winmm: wave.c:795: Test failed: missing WOM_DONE notification wave.c:795: Test failed: missing WOM_DONE notification wave.c:795: Test failed: missing WOM_DONE notification wave.c:795: Test failed: missing WOM_DONE notification wave.c:795: Test failed: missing WOM_DONE notification wave.c:795: Test failed: missing WOM_DONE notification wave.c:795: Test failed: missing WOM_DONE notification wave.c:795: Test failed: missing WOM_DONE notification wave.c:795: Test failed: missing WOM_DONE notification wave.c:800: Test failed: (01) WHDR_DONE WHDR_PREPARED expected, got WHDR_INQUEUE WHDR_PREPARED wave.c:800: Test failed: (02) WHDR_DONE WHDR_PREPARED expected, got WHDR_INQUEUE WHDR_PREPARED wave.c:800: Test failed: (03) WHDR_DONE WHDR_PREPARED expected, got WHDR_INQUEUE WHDR_PREPARED wave.c:800: Test failed: (04) WHDR_DONE WHDR_PREPARED expected, got WHDR_INQUEUE WHDR_PREPARED 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.) 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: Timeout === w10pro64 (32 bit report) === winmm: wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed === w1064v1809 (64 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: 10752 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.) === 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 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.) wave.c:791: Test failed: waveOutWrite(WAVE_MAPPER, header[0]): 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:795: Test failed: missing WOM_DONE notification wave.c:501: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 1356 bytes, should be 22050 wave.c:511: Test failed: waveOutGetPosition(WAVE_MAPPER): returned 1356 samples (1356 bytes), should be 22050 (22050 bytes) wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed === 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:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed === w10pro64_ja (64 bit report) === winmm: wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed === w10pro64_zh_CN (64 bit report) === winmm: wave.c:523: Test failed: waveOutGetPosition(WAVE_MAPPER): TIME_MS test failed 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(²¥·ÅÃœÌåÊýŸÝʱ£¬ÎÞ·šÖŽÐÐÕâÏî²Ù×÷¡£ÇëÖØÖÞÃÉ豞£¬»òµÈµœÊýŸÝ²¥·ÅÍê±ÏÔÙÖŽÐС£) wave.c:811: Test failed: waveOutUnprepareHeader(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(²¥·ÅÃœÌåÊýŸÝʱ£¬ÎÞ·šÖŽÐÐÕâÏî²Ù×÷¡£ÇëÖØÖÞÃÉ豞£¬»òµÈµœÊýŸÝ²¥·ÅÍê±ÏÔÙÖŽÐС£) wave.c:811: Test failed: waveOutUnprepareHeader(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(²¥·ÅÃœÌåÊýŸÝʱ£¬ÎÞ·šÖŽÐÐÕâÏî²Ù×÷¡£ÇëÖØÖÞÃÉ豞£¬»òµÈµœÊýŸÝ²¥·ÅÍê±ÏÔÙÖŽÐС£) wave.c:811: Test failed: waveOutUnprepareHeader(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(²¥·ÅÃœÌåÊýŸÝʱ£¬ÎÞ·šÖŽÐÐÕâÏî²Ù×÷¡£ÇëÖØÖÞÃÉ豞£¬»òµÈµœÊýŸÝ²¥·ÅÍê±ÏÔÙÖŽÐС£) wave.c:811: Test failed: waveOutUnprepareHeader(WAVE_MAPPER): rc=WAVERR_STILLPLAYING(²¥·ÅÃœÌåÊýŸÝʱ£¬ÎÞ·šÖŽÐÐÕâÏî²Ù×÷¡£ÇëÖØÖÞÃÉ豞£¬»òµÈµœÊýŸÝ²¥·ÅÍê±ÏÔÙÖŽÐС£) wave.c:795: Test failed: missing WOM_DONE notification wave.c:795: Test failed: missing WOM_DONE notification
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Wed, Jan 20, 2021 at 10:23:44PM +0900, Akihiro Sagawa wrote:
Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/wave.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index cb18f3e0fa4..786e724c0f0 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -495,9 +495,8 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime) + 1); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - if (mmtime.wType != TIME_BYTES && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_BYTES not supported, returned %s\n", - dev_name(device),wave_time_format(mmtime.wType)); + 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 bytes, " "should be %d\n", dev_name(device), returned, bytes); @@ -506,9 +505,8 @@ 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_SAMPLES && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_SAMPLES not supported, " - "returned %s\n",dev_name(device),wave_time_format(mmtime.wType)); + ok(mmtime.wType == TIME_SAMPLES, "(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 samples " "(%d bytes), should be %d (%d bytes)\n", dev_name(device), @@ -529,9 +527,8 @@ 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_SMPTE && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_SMPTE 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): SMPTE test failed\n", dev_name(device)); @@ -540,9 +537,8 @@ 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_MIDI && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_MIDI not supported, returned %s\n", - dev_name(device),wave_time_format(mmtime.wType)); + 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): MIDI test failed\n", dev_name(device)); @@ -551,9 +547,8 @@ 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_TICKS && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_TICKS not supported, returned %s\n", - dev_name(device),wave_time_format(mmtime.wType)); + 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): TICKS test failed\n", dev_name(device));
participants (3)
-
Akihiro Sagawa -
Andrew Eikum -
Marvin