Commit 7f1623bc authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

quartz: Do not print an incorrect state warning in MediaFilter_GetState() if a…

quartz: Do not print an incorrect state warning in MediaFilter_GetState() if a filter has been run asynchronously. This is a valid case in which the filter state may or may not match the graph state. Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 83ae1ff5
......@@ -5106,7 +5106,6 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F
{
struct filter_graph *graph = impl_from_IMediaFilter(iface);
DWORD end = GetTickCount() + timeout;
FILTER_STATE expect_state;
HRESULT hr;
TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state);
......@@ -5122,7 +5121,6 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F
EnterCriticalSection(&graph->cs);
*state = graph->state;
expect_state = graph->needs_async_run ? State_Paused : graph->state;
for (;;)
{
......@@ -5154,9 +5152,18 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F
else if (filter_state != graph->state && filter_state != State_Paused)
hr = E_FAIL;
if (filter_state != expect_state)
ERR("Filter %p reported incorrect state %u (expected %u).\n",
filter->filter, filter_state, expect_state);
if (graph->needs_async_run)
{
if (filter_state != State_Paused && filter_state != State_Running)
ERR("Filter %p reported incorrect state %u (expected %u or %u).\n",
filter->filter, filter_state, State_Paused, State_Running);
}
else
{
if (filter_state != graph->state)
ERR("Filter %p reported incorrect state %u (expected %u).\n",
filter->filter, filter_state, graph->state);
}
}
LeaveCriticalSection(&graph->cs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment