[PATCH v2 0/2] MR4089: mmdevapi/tests: Don't initialize the audio client twice.

[Hans Leidekker (＠hans)]

--
  v2: mmdevapi/tests: Relax a capture test.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4089

[PATCH v2 1/2] mmdevapi/tests: Don't initialize the audio client twice.

[Hans Leidekker]

From: Hans Leidekker <hans(a)codeweavers.com>

It leaves the client in a bad state, causing test failures on recent Windows versions.
---
 dlls/mmdevapi/tests/capture.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c
index f3b426a7f9a..660e74de3de 100644
--- a/dlls/mmdevapi/tests/capture.c
+++ b/dlls/mmdevapi/tests/capture.c
@@ -531,9 +531,6 @@ static void test_audioclient(void)
     trace("Returned latency: %u.%04u ms\n",
           (UINT)(t1/10000), (UINT)(t1 % 10000));
 
-    hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL);
-    ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08lx\n", hr);
-
     hr = IAudioClient_SetEventHandle(ac, NULL);
     ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08lx\n", hr);
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/4089

[PATCH v2 2/2] mmdevapi/tests: Relax a capture test.

[Hans Leidekker]

From: Hans Leidekker <hans(a)codeweavers.com>

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

diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c
index 660e74de3de..08ab730ef1a 100644
--- a/dlls/mmdevapi/tests/capture.c
+++ b/dlls/mmdevapi/tests/capture.c
@@ -283,7 +283,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx)
             /* Native's position is one period further than what we read.
              * Perhaps that's precisely the meaning of DATA_DISCONTINUITY:
              * signal when the position jump left a gap. */
-            ok(pos == sum + frames, "Position %u last %u frames %u\n", (UINT)pos, sum, frames);
+            ok(pos >= sum + frames, "Position %u last %u frames %u\n", (UINT)pos, sum, frames);
             sum = pos;
         }else{ /* win10 */
             ok(pos == sum, "Position %u last %u frames %u\n", (UINT)pos, sum, frames);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4089

[Hans Leidekker (＠hans)]

Huw, you have already approved this MR but since you seemed to agree with relaxing the capture test we talked about I added the commit here.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4089#note_48651