Andrew Eikum : strmbase: Send EC_COMPLETE in IBaseFilter::Run() for unconnected renderers.
Alexandre Julliard
julliard at winehq.org
Mon Nov 1 16:38:03 CDT 2021
Module: wine
Branch: master
Commit: 6e11378df2f1cdbff984b7b8072e46a7738e74a2
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e11378df2f1cdbff984b7b8072e46a7738e74a2
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Sun Oct 31 19:04:08 2021 -0500
strmbase: Send EC_COMPLETE in IBaseFilter::Run() for unconnected renderers.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/evr/tests/evr.c | 6 +++---
dlls/qedit/tests/nullrenderer.c | 6 +++---
dlls/quartz/tests/videorenderer.c | 6 +++---
dlls/quartz/tests/vmr7.c | 6 +++---
dlls/quartz/tests/vmr9.c | 6 +++---
dlls/strmbase/renderer.c | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c
index 8bfeb987352..48115388993 100644
--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -508,7 +508,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Pause(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -520,7 +520,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -532,7 +532,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
IMediaControl_Release(control);
IMediaEvent_Release(eventsrc);
diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c
index b4003f43cf4..cfbf1d37c2f 100644
--- a/dlls/qedit/tests/nullrenderer.c
+++ b/dlls/qedit/tests/nullrenderer.c
@@ -969,7 +969,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Pause(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -981,7 +981,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -993,7 +993,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
IMediaControl_Release(control);
IMediaEvent_Release(eventsrc);
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index 0ce24884200..5625971426b 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -2897,7 +2897,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Pause(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -2909,7 +2909,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -2921,7 +2921,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
IMediaControl_Release(control);
IMediaEvent_Release(eventsrc);
diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c
index 1214d5dcbb7..efc876a845c 100644
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -3101,7 +3101,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Pause(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -3113,7 +3113,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -3125,7 +3125,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
IMediaControl_Release(control);
IMediaEvent_Release(eventsrc);
diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c
index 618669595cb..a0ccb4898a9 100644
--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -4202,7 +4202,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Pause(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -4214,7 +4214,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -4226,7 +4226,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
IMediaControl_Release(control);
IMediaEvent_Release(eventsrc);
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c
index a879917b169..da257555a19 100644
--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -252,7 +252,7 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI
if (filter->sink.pin.peer && filter->ops->renderer_start_stream)
filter->ops->renderer_start_stream(filter);
- if (filter->eos && graph
+ if ((filter->eos || !filter->sink.pin.peer) && graph
&& SUCCEEDED(IFilterGraph_QueryInterface(graph,
&IID_IMediaEventSink, (void **)&event_sink)))
{
More information about the wine-cvs
mailing list