From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 20 Jan 2018 11:26:57 +0000 (+0100)
Subject: [MMDEVAPI_WINETEST] Sync with Wine 3.0. CORE-14225
X-Git-Tag: 0.4.9-dev~342
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=ae5f2352bc1d441bfea93a40baae910e29784ce4;ds=sidebyside

[MMDEVAPI_WINETEST] Sync with Wine 3.0. CORE-14225
---

diff --git a/modules/rostests/winetests/mmdevapi/capture.c b/modules/rostests/winetests/mmdevapi/capture.c
index 99da296e0ad..3cdfda1a371 100644
--- a/modules/rostests/winetests/mmdevapi/capture.c
+++ b/modules/rostests/winetests/mmdevapi/capture.c
@@ -556,8 +556,7 @@ static void test_audioclient(void)
     if (hr != S_OK)
     {
         skip("Cannot initialize %08x, remainder of tests is useless\n", hr);
-        CoTaskMemFree(pwfx);
-        return;
+        goto cleanup;
     }
 
     hr = IAudioClient_GetStreamLatency(ac, NULL);
@@ -592,6 +591,7 @@ static void test_audioclient(void)
 
     test_capture(ac, handle, pwfx);
 
+cleanup:
     IAudioClient_Release(ac);
     CloseHandle(handle);
     CoTaskMemFree(pwfx);
diff --git a/modules/rostests/winetests/mmdevapi/render.c b/modules/rostests/winetests/mmdevapi/render.c
index 040ec7f5875..8487fbbb926 100644
--- a/modules/rostests/winetests/mmdevapi/render.c
+++ b/modules/rostests/winetests/mmdevapi/render.c
@@ -320,11 +320,7 @@ static void test_audioclient(void)
     hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL);
     ok(hr == S_OK, "Valid Initialize returns %08x\n", hr);
     if (hr != S_OK)
-    {
-        IAudioClient_Release(ac);
-        CoTaskMemFree(pwfx);
-        return;
-    }
+        goto cleanup;
 
     hr = IAudioClient_GetStreamLatency(ac, NULL);
     ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08x\n", hr);
@@ -369,8 +365,8 @@ static void test_audioclient(void)
     hr = IAudioClient_Start(ac);
     ok(hr == AUDCLNT_E_NOT_STOPPED, "Start twice returns %08x\n", hr);
 
+cleanup:
     IAudioClient_Release(ac);
-
     CloseHandle(handle);
     CoTaskMemFree(pwfx);
 }
@@ -949,9 +945,8 @@ static void test_clock(int share)
     ok(gbsize == bufsize,
        "BufferSize %u at rate %u\n", gbsize, pwfx->nSamplesPerSec);
     else
-        todo_wine
-        ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024,
-           "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec);
+    ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024,
+       "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec);
 
     /* In shared mode, GetCurrentPadding decreases in multiples of
      * fragment size (i.e. updated only at period ticks), whereas