[PATCH 1/1] xaudio2/tests: Fix test failures with xaudio2_8 in test_submix().

[Paul Gofman]

From: Paul Gofman

---
 dlls/xaudio2_7/tests/xaudio2.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c
index 62f766a827a..a1de2959441 100644
--- a/dlls/xaudio2_7/tests/xaudio2.c
+++ b/dlls/xaudio2_7/tests/xaudio2.c
@@ -859,10 +859,18 @@ static void test_submix(IXAudio2 *xa)

hr = IXAudio2_CreateSubmixVoice(xa, &sub2, 2, 44100, 0, 0, NULL, NULL);
     ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr);
-
     send_desc.pOutputVoice = (IXAudio2Voice *)sub2;
     hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends);
-    ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr);
+    ok(hr == S_OK || (XAUDIO2_VER >= 8 && hr == XAUDIO2_E_INVALID_CALL), "CreateSubmixVoice failed: %08lx\n", hr);
+    if (hr == XAUDIO2_E_INVALID_CALL)
+    {
+        IXAudio2SubmixVoice_DestroyVoice(sub2);
+        hr = IXAudio2_CreateSubmixVoice(xa, &sub2, 2, 44100, 0, 1, NULL, NULL);
+        ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr);
+        send_desc.pOutputVoice = (IXAudio2Voice *)sub2;
+        hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends);
+        ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr);
+    }

IXAudio2SubmixVoice_DestroyVoice(sub2);
     /* The voice is not destroyed. */
@@ -873,7 +881,13 @@ static void test_submix(IXAudio2 *xa)

sends.SendCount = 0;
     hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends);
-    ok(hr == S_OK, "CreateSubmixVoice failed: %08lx\n", hr);
+    ok(hr == S_OK || (XAUDIO2_VER >= 8 && hr == XAUDIO2_E_INVALID_CALL), "SetOutputVoices failed: %08lx\n", hr);
+    if (hr == XAUDIO2_E_INVALID_CALL)
+    {
+        sends.pSends = NULL;
+        hr = IXAudio2SubmixVoice_SetOutputVoices(sub, &sends);
+        ok(hr == S_OK, "SetOutputVoices failed: %08lx\n", hr);
+    }

IXAudio2SubmixVoice_DestroyVoice(sub2);
     if (0)