[PATCH 1/3] qasf/tests: Fix a test failure with Windows 2003.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/qasf/tests/dmowrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c
index 50546ec2a8..6f6cb77e52 100644
--- a/dlls/qasf/tests/dmowrapper.c
+++ b/dlls/qasf/tests/dmowrapper.c
@@ -1707,7 +1707,7 @@ static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputP
     todo_wine ok(testsink2->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink2->got_eos);

hr = IMemInputPin_Receive(input, sample);
-    todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr);
+    todo_wine ok(hr == S_FALSE /* 2003 */ || hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr);

got_Flush = 0;
     ok(!testsink->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush);

[PATCH 2/3] quartz/tests: Fix test failures when we can't create a 3D device.

[Zebediah Figura]

It turns out my prior assumption was incorrect.

Signed-off-by: Zebediah Figura 
---
 dlls/quartz/tests/vmr9.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c
index 1194fd8d17..3e9fccedf1 100644
--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -2376,11 +2376,14 @@ static IDirect3DDevice9 *create_device(HWND window)
     d3d = Direct3DCreate9(D3D_SDK_VERSION);
     ok(!!d3d, "Failed to create a D3D object.\n");

-    /* We can expect this to succeed, or we couldn't have created the VMR. */
     hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window,
             D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device);
-    ok(hr == D3D_OK, "Failed to create a 3D device, hr %#x.\n", hr);
     IDirect3D9_Release(d3d);
+    if (FAILED(hr))
+    {
+        skip("Failed to create a 3D device, hr %#x.\n", hr);
+        return NULL;
+    }
     return device;
 }

@@ -2418,7 +2421,8 @@ static void test_allocate_surface_helper(void)
     AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE);
     window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0,
             rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL);
-    device = create_device(window);
+    if (!(device = create_device(window)))
+        goto out;

hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY));
     if (hr == E_NOINTERFACE)
@@ -2784,7 +2788,8 @@ static void test_renderless_formats(void)
     AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE);
     window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0,
             rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL);
-    device = create_device(window);
+    if (!(device = create_device(window)))
+        goto out;

hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY));
     if (hr == E_NOINTERFACE)

[PATCH 3/3] quartz/tests: Disable some tests that fail intermittently.

[Zebediah Figura]

The value of these tests is not worth having to repeatedly relax timings.

Signed-off-by: Zebediah Figura 
---
 dlls/quartz/tests/filtergraph.c | 58 +++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index f8b80dd23b..ba8271f829 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -3152,9 +3152,10 @@ static void test_filter_state(void)
     hr = IMediaControl_Run(control);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
     check_filter_state(graph, State_Running);
-    ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
-        "Expected time near %s, got %s.\n",
-        wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
+    if (winetest_interactive) /* Timing problems make this test too liable to fail. */
+        ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
+                "Expected time near %s, got %s.\n",
+                wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
     ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n",
         wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time));

@@ -3228,9 +3229,10 @@ static void test_filter_state(void)
     hr = IMediaFilter_Run(filter, 0);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
     check_filter_state(graph, State_Running);
-    ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
-        "Expected time near %s, got %s.\n",
-        wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
+    if (winetest_interactive) /* Timing problems make this test too liable to fail. */
+        ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
+                "Expected time near %s, got %s.\n",
+                wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
     ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n",
         wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time));

@@ -3242,9 +3244,10 @@ static void test_filter_state(void)
     hr = IMediaFilter_Run(filter, 0);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
     check_filter_state(graph, State_Running);
-    ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
-        "Expected time near %s, got %s.\n",
-        wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
+    if (winetest_interactive) /* Timing problems make this test too liable to fail. */
+        ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
+                "Expected time near %s, got %s.\n",
+                wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
     ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n",
         wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time));

@@ -3257,9 +3260,10 @@ static void test_filter_state(void)
     hr = IMediaFilter_Run(filter, 0);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
     check_filter_state(graph, State_Running);
-    ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
-        "Expected time near %s, got %s.\n",
-        wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
+    if (winetest_interactive) /* Timing problems make this test too liable to fail. */
+        ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
+                "Expected time near %s, got %s.\n",
+                wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
     ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n",
         wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time));

@@ -3996,13 +4000,15 @@ static void test_graph_seeking(void)

hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
-    ok(abs(time - 1234 * 10000) < 40 * 10000,
-            "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(time));
+    if (winetest_interactive) /* Timing problems make this test too liable to fail. */
+        ok(abs(time - 1234 * 10000) < 40 * 10000,
+                "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(time));
     current = stop = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, &current, &stop);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
-    ok(abs(current - 1234 * 10000) < 40 * 10000,
-            "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(current));
+    if (winetest_interactive) /* Timing problems make this test too liable to fail. */
+        ok(abs(current - 1234 * 10000) < 40 * 10000,
+                "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(current));
     ok(stop == 9000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));

/* This remains true even if NoFlush is specified. */
@@ -4017,13 +4023,15 @@ static void test_graph_seeking(void)

hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
-    ok(abs(time - 1334 * 10000) < 80 * 10000,
-            "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time));
+    if (winetest_interactive) /* Timing problems make this test too liable to fail. */
+        ok(abs(time - 1334 * 10000) < 80 * 10000,
+                "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time));
     current = stop = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, &current, &stop);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
-    ok(abs(current - 1334 * 10000) < 80 * 10000,
-            "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current));
+    if (winetest_interactive) /* Timing problems make this test too liable to fail. */
+        ok(abs(current - 1334 * 10000) < 80 * 10000,
+                "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current));
     ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));

hr = IMediaControl_Pause(control);
@@ -4035,13 +4043,15 @@ static void test_graph_seeking(void)

hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
-    ok(abs(time - 1334 * 10000) < 80 * 10000,
-            "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time));
+    if (winetest_interactive) /* Timing problems make this test too liable to fail. */
+        ok(abs(time - 1334 * 10000) < 80 * 10000,
+                "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time));
     current = stop = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, &current, &stop);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
-    ok(abs(current - 1334 * 10000) < 80 * 10000,
-            "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current));
+    if (winetest_interactive) /* Timing problems make this test too liable to fail. */
+        ok(abs(current - 1334 * 10000) < 80 * 10000,
+                "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current));
     ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));

hr = IMediaControl_Stop(control);

[Francois Gouget]

[...]
> @@ -1707,7 +1707,7 @@ static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputP
>      todo_wine ok(testsink2->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink2->got_eos);
>  hr = IMemInputPin_Receive(input, sample);
> - todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr);
> - todo_wine ok(hr == S_FALSE /* 2003 */ || hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr);

Should there be a broken() somewhere around here?

[Zebediah Figura]

On 3/21/20 8:55 PM, Francois Gouget wrote:
> [...]
> > @@ -1707,7 +1707,7 @@ static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputP
> >      todo_wine ok(testsink2->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink2->got_eos);
> >  hr = IMemInputPin_Receive(input, sample);
> > - todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr);
> > - todo_wine ok(hr == S_FALSE /* 2003 */ || hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr);
>
> Should there be a broken() somewhere around here?

The documentation doesn't specify, and at least some other filters
return S_FALSE here even in newer Windows, so it's not really clear to
me that either case should be considered broken. But I don't feel
strongly about it.