evr/tests: Fix test crash on Windows 7.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

evr/tests: Fix test crash on Windows 7.
ea53b3c2 · Nikolay Sivov · Alexandre Julliard · c6b43728 · ea53b3c2
Commit ea53b3c2 authored Jul 14, 2020 by Nikolay Sivov Committed by Alexandre Julliard Jul 14, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

evr.c dlls/evr/tests/evr.c +8 -5

No files found.
--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -1080,15 +1080,18 @@ todo_wine {
        ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

        hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs);
-        ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+        ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr);

-        /* Device manager wasn't set, sample get regular memory buffers. */
-        hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface);
-        ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr);
+        /* Device manager wasn't set, sample gets regular memory buffers. */
+        if (SUCCEEDED(hr))
+        {
+            hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface);
+            ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr);
+            IMFGetService_Release(gs);
+        }

        IMFMediaBuffer_Release(buffer);

-        IMFGetService_Release(gs);
        IMFSample_Release(sample);
    }