[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-cvs
Subject:    =?UTF-8?Q?Zebediah_Figura_=3A_quartz/tests=3A_Skip_the_IVideoWindow_tests?= =?UTF-8?Q?_if_connecting
From:       Alexandre Julliard <julliard () winehq ! org>
Date:       2019-12-30 21:59:43
Message-ID: E1im34h-0003oJ-R3 () winehq ! org
[Download RAW message or body]

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

Author: Zebediah Figura <z.figura12@gmail.com>
Date:   Fri Dec 27 11:50:33 2019 -0600

quartz/tests: Skip the IVideoWindow tests if connecting returns E_FAIL.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

---

 dlls/quartz/tests/vmr9.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c
index 241394277b..7d9cb22ec2 100644
--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -2180,7 +2180,13 @@ static void test_video_window(void)
     testfilter_init(&source);
     IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL);
     IFilterGraph2_AddFilter(graph, filter, NULL);
+    IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control);
     hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt);
+    if (hr == E_FAIL)
+    {
+        skip("Got E_FAIL when connecting.\n");
+        goto out;
+    }
     ok(hr == S_OK, "Got hr %#x.\n", hr);
 
     hr = IMemInputPin_GetAllocator(input, &allocator);
@@ -2215,8 +2221,6 @@ static void test_video_window(void)
     hr = IVideoWindow_GetMaxIdealImageSize(window, &width, &height);
     todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr);
 
-    IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control);
-
     hr = IMediaControl_Pause(control);
     ok(hr == S_FALSE, "Got hr %#x.\n", hr);
 
@@ -2237,6 +2241,7 @@ static void test_video_window(void)
     hr = IMediaControl_Stop(control);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
 
+out:
     IMediaControl_Release(control);
     IFilterGraph2_Release(graph);
     IVideoWindow_Release(window);


[prev in list] [next in list] [prev in thread] [next in thread]