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

quartz: Correct return value handling in IMediaSeeking::GetDuration(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-11-21 15:25:02 -06:00 committed by Alexandre Julliard
parent ec4feafcc0
commit 627b6b29cd
2 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dlls/quartz/filtergraph.c
View File

@ -2237,36 +2237,45 @@ static HRESULT WINAPI MediaSeeking_SetTimeFormat(IMediaSeeking *iface, const GUI
return S_OK;
}
static HRESULT WINAPI FoundDuration(struct filter_graph *This, IMediaSeeking *seek, DWORD_PTR pduration)
static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *duration)
{
HRESULT hr;
LONGLONG duration = 0, *pdur = (LONGLONG*)pduration;
struct filter_graph *graph = impl_from_IMediaSeeking(iface);
HRESULT hr = E_NOTIMPL, filter_hr;
LONGLONG filter_duration;
struct filter *filter;
hr = IMediaSeeking_GetDuration(seek, &duration);
if (FAILED(hr))
return hr;
TRACE("graph %p, duration %p.\n", graph, duration);
if (*pdur < duration)
*pdur = duration;
return hr;
}
static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *pDuration)
{
struct filter_graph *This = impl_from_IMediaSeeking(iface);
HRESULT hr;
TRACE("(%p/%p)->(%p)\n", This, iface, pDuration);
if (!pDuration)
if (!duration)
return E_POINTER;
EnterCriticalSection(&This->cs);
*pDuration = 0;
hr = all_renderers_seek(This, FoundDuration, (DWORD_PTR)pDuration);
LeaveCriticalSection(&This->cs);
*duration = 0;
TRACE("--->%08x\n", hr);
EnterCriticalSection(&graph->cs);
LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry)
{
update_seeking(filter);
if (!filter->seeking)
continue;
filter_hr = IMediaSeeking_GetDuration(filter->seeking, &filter_duration);
if (SUCCEEDED(filter_hr))
{
hr = S_OK;
*duration = max(*duration, filter_duration);
}
else if (filter_hr != E_NOTIMPL)
{
LeaveCriticalSection(&graph->cs);
return filter_hr;
}
}
LeaveCriticalSection(&graph->cs);
TRACE("Returning hr %#x, duration %s (%s seconds).\n", hr,
wine_dbgstr_longlong(*duration), debugstr_time(*duration));
return hr;
}

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

@ -4401,13 +4401,13 @@ static void test_graph_seeking(void)
filter1.seek_hr = filter2.seek_hr = 0xbeef;
hr = IMediaSeeking_GetDuration(seeking, &time);
todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time));
filter1.seek_hr = E_NOTIMPL;
filter2.seek_hr = S_OK;
hr = IMediaSeeking_GetDuration(seeking, &time);
todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(time == 0x12345, "Got time %s.\n", wine_dbgstr_longlong(time));
filter1.seek_hr = 0xdeadbeef;