ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quartz/filtergraph: Correctly implement IMediaSeeking::GetStopPosition(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-10-19 10:48:23 -05:00 committed by Alexandre Julliard
parent 88c41a3999
commit a0043c1c5c
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/quartz/filtergraph.c
View File

@ -2466,24 +2466,43 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *p
return hr; return hr;
} }
static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *pStop) static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop)
{ {
IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface);
HRESULT hr = S_OK; HRESULT hr = E_NOTIMPL, filter_hr;
IMediaSeeking *seeking;
struct filter *filter;
LONGLONG filter_stop;
TRACE("(%p/%p)->(%p)\n", This, iface, pStop); TRACE("graph %p, stop %p.\n", graph, stop);
if (!pStop) if (!stop)
return E_POINTER; return E_POINTER;
EnterCriticalSection(&This->cs); *stop = 0;
if (This->stop_position < 0)
/* Stop position not set, use duration instead */
hr = IMediaSeeking_GetDuration(iface, pStop);
else
*pStop = This->stop_position;
LeaveCriticalSection(&This->cs);
EnterCriticalSection(&graph->cs);
LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry)
{
if (FAILED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&seeking)))
continue;
filter_hr = IMediaSeeking_GetStopPosition(seeking, &filter_stop);
IMediaSeeking_Release(seeking);
if (SUCCEEDED(filter_hr))
{
hr = S_OK;
*stop = max(*stop, filter_stop);
}
else if (filter_hr != E_NOTIMPL)
{
LeaveCriticalSection(&graph->cs);
return filter_hr;
}
}
LeaveCriticalSection(&graph->cs);
return hr; return hr;
} }

14
dlls/quartz/tests/filtergraph.c
View File

@ -3766,31 +3766,31 @@ static void test_graph_seeking(void)
filter2.seek_stop = 0x65432; filter2.seek_stop = 0x65432;
hr = IMediaSeeking_GetStopPosition(seeking, &time); hr = IMediaSeeking_GetStopPosition(seeking, &time);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time));
filter2.seek_stop = 0x54321; filter2.seek_stop = 0x54321;
filter1.seek_stop = 0x65432; filter1.seek_stop = 0x65432;
hr = IMediaSeeking_GetStopPosition(seeking, &time); hr = IMediaSeeking_GetStopPosition(seeking, &time);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time));
filter1.seek_hr = filter2.seek_hr = 0xbeef; filter1.seek_hr = filter2.seek_hr = 0xbeef;
hr = IMediaSeeking_GetStopPosition(seeking, &time); hr = IMediaSeeking_GetStopPosition(seeking, &time);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time));
filter1.seek_hr = E_NOTIMPL; filter1.seek_hr = E_NOTIMPL;
hr = IMediaSeeking_GetStopPosition(seeking, &time); hr = IMediaSeeking_GetStopPosition(seeking, &time);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine ok(time == 0x54321, "Got time %s.\n", wine_dbgstr_longlong(time)); ok(time == 0x54321, "Got time %s.\n", wine_dbgstr_longlong(time));
filter1.seek_hr = 0xdeadbeef; filter1.seek_hr = 0xdeadbeef;
hr = IMediaSeeking_GetStopPosition(seeking, &time); hr = IMediaSeeking_GetStopPosition(seeking, &time);
todo_wine ok(hr == 0xdeadbeef, "Got hr %#x.\n", hr); ok(hr == 0xdeadbeef, "Got hr %#x.\n", hr);
filter1.seek_hr = filter2.seek_hr = E_NOTIMPL; filter1.seek_hr = filter2.seek_hr = E_NOTIMPL;
hr = IMediaSeeking_GetStopPosition(seeking, &time); hr = IMediaSeeking_GetStopPosition(seeking, &time);
todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr);
filter1.seek_hr = filter2.seek_hr = S_OK; filter1.seek_hr = filter2.seek_hr = S_OK;
hr = IMediaSeeking_GetCurrentPosition(seeking, &time); hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
@ -3801,7 +3801,7 @@ static void test_graph_seeking(void)
hr = IMediaSeeking_GetPositions(seeking, &current, &stop); hr = IMediaSeeking_GetPositions(seeking, &current, &stop);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current)); ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current));
todo_wine ok(stop == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(stop)); ok(stop == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(stop));
current = 0x123; current = 0x123;
stop = 0x321; stop = 0x321;