Zebediah Figura : quartz: Don't stop the filter in IFilterGraph::RemoveFilter().
Alexandre Julliard
julliard at winehq.org
Mon Nov 16 15:28:56 CST 2020
Module: wine
Branch: master
Commit: d19aac6edb9e65f9280f8ae51082e5a0b75c0257
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d19aac6edb9e65f9280f8ae51082e5a0b75c0257
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Sun Nov 15 11:04:34 2020 -0600
quartz: Don't stop the filter in IFilterGraph::RemoveFilter().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/filtergraph.c | 5 -----
dlls/quartz/tests/filtergraph.c | 6 ++----
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index b7f15695a6d..872b355cd35 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -720,11 +720,6 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte
}
TRACE("Removing filter %s.\n", debugstr_w(entry->name));
- IBaseFilter_GetState(pFilter, 0, &state);
- if (state == State_Running)
- IBaseFilter_Pause(pFilter);
- if (state != State_Stopped)
- IBaseFilter_Stop(pFilter);
hr = IBaseFilter_EnumPins(pFilter, &penumpins);
if (SUCCEEDED(hr)) {
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 2e1a8b7ad66..b0f287e7fe2 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -3721,14 +3721,12 @@ todo_wine
hr = IFilterGraph2_RemoveFilter(graph, &dummy.IBaseFilter_iface);
ok(hr == S_OK, "Got hr %#x.\n", hr);
- todo_wine ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state);
+ ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state);
hr = IFilterGraph2_AddFilter(graph, &dummy.IBaseFilter_iface, L"dummy");
ok(hr == S_OK, "Got hr %#x.\n", hr);
- todo_wine ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state);
+ ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state);
- if (dummy.state == State_Stopped)
- dummy.expect_stop_prev = State_Stopped;
hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
check_filter_state(graph, State_Stopped);
More information about the wine-cvs
mailing list