[PATCH 0/4] MR689: mmdevapi/tests: Assorted fail messages fixes.

[PATCH 1/4] mmdevapi/tests: Fix fail messages referencing GetChannelCount() instead of GetChannelVolume().

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/mmdevapi/tests/capture.c | 20 ++++++++++----------
 dlls/mmdevapi/tests/render.c  | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c
index 5fbb62e4403..74a55f1fb94 100644
--- a/dlls/mmdevapi/tests/capture.c
+++ b/dlls/mmdevapi/tests/capture.c
@@ -582,16 +582,16 @@ static void test_streamvolume(void)
     ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);

hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL);
-    ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol);
-    ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL);
-    ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol);
-    ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+    ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
     ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);

hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f);
@@ -607,7 +607,7 @@ static void test_streamvolume(void)
     ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);

hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol);
-    ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+    ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
     ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);

hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL);
@@ -681,16 +681,16 @@ static void test_channelvolume(void)
     ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);

hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL);
-    ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol);
-    ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL);
-    ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol);
-    ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+    ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
     ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);

hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL);
@@ -706,7 +706,7 @@ static void test_channelvolume(void)
     ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);

hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol);
-    ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+    ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
     ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);

hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL);
diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 4e19b91c5f5..65e5b1161e0 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -1641,16 +1641,16 @@ static void test_streamvolume(void)
     ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);

hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL);
-    ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol);
-    ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL);
-    ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol);
-    ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+    ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
     ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);

hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f);
@@ -1666,7 +1666,7 @@ static void test_streamvolume(void)
     ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);

hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol);
-    ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+    ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
     ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);

hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL);
@@ -1745,16 +1745,16 @@ static void test_channelvolume(void)
     ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);

hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL);
-    ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol);
-    ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL);
-    ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr);
+    ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr);

hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol);
-    ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+    ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
     ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);

hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL);
@@ -1770,7 +1770,7 @@ static void test_channelvolume(void)
     ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);

hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol);
-    ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+    ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr);
     ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);

hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL);

[PATCH 1/4] mmdevapi/tests: Fix fail messages referencing GetChannelCount() instead of GetChannelVolume().

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=121690

Your paranoid android.

=== w8 (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 7
render.c:1340: Test failed: GetBuffer large (20671) at iteration 8

=== w8adm (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 8

=== w1064 (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (22500) at iteration 7

=== w1064v1507 (64 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 8

=== w1064 (64 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (22500) at iteration 7

[PATCH 2/4] mmdevapi/tests: Distinguish GetChannelCount() calls in test_volume_dependence() fail messages.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/mmdevapi/tests/capture.c | 4 ++--
 dlls/mmdevapi/tests/render.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c
index 74a55f1fb94..9d3d13dcaae 100644
--- a/dlls/mmdevapi/tests/capture.c
+++ b/dlls/mmdevapi/tests/capture.c
@@ -915,11 +915,11 @@ static void test_volume_dependence(void)
         ok(vol == 1.f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol);

hr = IChannelAudioVolume_GetChannelCount(cav2, &nch);
-        ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+        ok(hr == S_OK, "CAV_GetChannelCount failed: %08lx\n", hr);
         ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch);

hr = IAudioStreamVolume_GetChannelCount(asv2, &nch);
-        ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+        ok(hr == S_OK, "ASV_GetChannelCount failed: %08lx\n", hr);
         ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch);

IAudioStreamVolume_Release(asv2);
diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 65e5b1161e0..0fc8aa5bc3e 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -1996,11 +1996,11 @@ static void test_volume_dependence(void)
         ok(vol == 1.f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol);

hr = IChannelAudioVolume_GetChannelCount(cav2, &nch);
-        ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+        ok(hr == S_OK, "CAV_GetChannelCount failed: %08lx\n", hr);
         ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch);

hr = IAudioStreamVolume_GetChannelCount(asv2, &nch);
-        ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr);
+        ok(hr == S_OK, "ASV_GetChannelCount failed: %08lx\n", hr);
         ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch);

IAudioStreamVolume_Release(asv2);

[PATCH 2/4] mmdevapi/tests: Distinguish GetChannelCount() calls in test_volume_dependence() fail messages.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=121691

Your paranoid android.

=== w8adm (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 6

=== w1064v1507 (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 7
render.c:1340: Test failed: GetBuffer large (20671) at iteration 3

=== w1064 (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (22500) at iteration 5

=== w10pro64 (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (22500) at iteration 6

=== w864 (64 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 8

=== w1064v1507 (64 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 5

=== w1064 (64 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (22500) at iteration 6
render.c:1340: Test failed: GetBuffer large (22500) at iteration 3

[PATCH 3/4] mmdevapi/tests: Fix typos in spatial audio fail messages.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/mmdevapi/tests/spatialaudio.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/mmdevapi/tests/spatialaudio.c b/dlls/mmdevapi/tests/spatialaudio.c
index 2f55b12f68e..a382b57e7a2 100644
--- a/dlls/mmdevapi/tests/spatialaudio.c
+++ b/dlls/mmdevapi/tests/spatialaudio.c
@@ -240,7 +240,7 @@ static void test_audio_object_activation(void)
     hr = ISpatialAudioObject_IsActive(sao1, &is_active);
     todo_wine ok(hr == S_OK, "Failed to check if spatial audio object is active: 0x%08lx\n", hr);
     if (hr == S_OK)
-        ok(is_active, "Expected spaital audio object to be active\n");
+        ok(is_active, "Expected spatial audio object to be active\n");

hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao2);
     ok(hr == SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE, "Expected audio object to be already active: 0x%08lx\n", hr);
@@ -315,7 +315,7 @@ static void test_audio_object_buffers(void)
     ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr);

hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count);
-    ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr);
+    ok(hr == S_OK, "Failed to begin updating audio objects: 0x%08lx\n", hr);
     ok(dyn_object_count == 0, "Unexpected dynamic objects\n");
     ok(frame_count <= max_frame_count, "Got unexpected frame count %u.\n", frame_count);

@@ -345,7 +345,7 @@ static void test_audio_object_buffers(void)
         ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx, j %u.\n", hr, j);

hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count);
-        ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr);
+        ok(hr == S_OK, "Failed to begin updating audio objects: 0x%08lx\n", hr);
         ok(dyn_object_count == 0, "Unexpected dynamic objects\n");
         ok(frame_count <= max_frame_count, "Got unexpected frame_count %u.\n", frame_count);

@@ -388,7 +388,7 @@ static void test_audio_object_buffers(void)
     ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx\n", hr);

hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count);
-    ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr);
+    ok(hr == S_OK, "Failed to begin updating audio objects: 0x%08lx\n", hr);
     ok(dyn_object_count == 0, "Unexpected dynamic objects\n");

/* one more iteration but not with every object */
@@ -416,7 +416,7 @@ static void test_audio_object_buffers(void)
     todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08lx\n", hr);

hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count);
-    ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr);
+    ok(hr == S_OK, "Failed to begin updating audio objects: 0x%08lx\n", hr);
     ok(dyn_object_count == 0, "Unexpected dynamic objects\n");

/* expect the object that was not updated last cycle to be invalidated */

[PATCH 4/4] mmdevapi/tests: Fix fail message referencing "Start" instead of "Stop" in test_session().

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/mmdevapi/tests/render.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 0fc8aa5bc3e..ac714980c6f 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -1529,7 +1529,7 @@ static void test_session(void)
     }

hr = IAudioClient_Stop(ses1_ac1);
-    ok(hr == S_OK, "Start failed: %08lx\n", hr);
+    ok(hr == S_OK, "Stop failed: %08lx\n", hr);

hr = IAudioSessionControl2_GetState(ses1_ctl, &state);
     ok(hr == S_OK, "GetState failed: %08lx\n", hr);

[PATCH 4/4] mmdevapi/tests: Fix fail message referencing "Start" instead of "Stop" in test_session().

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=121693

Your paranoid android.

=== w8 (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 5
render.c:1340: Test failed: GetBuffer large (20671) at iteration 1
render.c:1340: Test failed: GetBuffer large (20671) at iteration 2

=== w8adm (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 2

=== w864 (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 8
render.c:1340: Test failed: GetBuffer large (20671) at iteration 3

=== w1064v1507 (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 3
render.c:1340: Test failed: GetBuffer large (20671) at iteration 3

=== w1064 (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (22500) at iteration 6

=== w10pro64 (32 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (22500) at iteration 7
render.c:1340: Test failed: GetBuffer large (22500) at iteration 4

=== w1064v1507 (64 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (20671) at iteration 3

=== w1064 (64 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (22500) at iteration 6

=== w1064_2qxl (64 bit report) ===

mmdevapi:
render.c:1340: Test failed: GetBuffer large (22500) at iteration 8

[PATCH 0/4] MR689: mmdevapi/tests: Assorted fail messages fixes. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.