Nikolay Sivov : evr/tests: Fix test crash on Windows 7.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ea53b3c22e60a17c595cd2c463d3092ec123422d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ea53b3c22e60a17c595cd2c463d3092ec123422d

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Jul 14 11:40:57 2020 +0300

evr/tests: Fix test crash on Windows 7.

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

---

 dlls/evr/tests/evr.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c
index 5e18494718..6a5d80df41 100644
--- 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);
     }