February 2018 - Wine-Devel - list.winehq.org

Re: [PATCH v2 6/6] quartz/tests: Remove some unnecessary error-checking.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=36296 Your paranoid android. === wxppro (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w2003std (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === wvistau64 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w2008s64 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w7u (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w7pro64 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w8 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w864 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w1064 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === wvistau64 (64 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 The previous 1 run(s) terminated abnormally === w2008s64 (64 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w7pro64 (64 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w864 (64 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w1064 (64 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242

Feb. 28, 2018

Re: [PATCH v2 5/6] quartz/tests: Add more tests for IMediaSeeking.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=36295 Your paranoid android. === wxppro (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w2003std (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === wvistau64 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w2008s64 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w7u (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w7pro64 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w8 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w864 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w1064 (32 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === wvistau64 (64 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 The previous 1 run(s) terminated abnormally === w2008s64 (64 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w7pro64 (64 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 The previous 1 run(s) terminated abnormally === w864 (64 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242 === w1064 (64 bit filtergraph) === filtergraph.c:583: Test failed: got 0x40242

Feb. 28, 2018

Re: [PATCH 1/5] quartz/tests: Expand and separate state change tests.

by Alexandre Julliard

Zebediah Figura <z.figura12(a)gmail.com> writes: > On 28/02/18 13:35, Alexandre Julliard wrote: >> Zebediah Figura <z.figura12(a)gmail.com> writes: >> >>> Thanks. Unfortunately I can't reproduce this on my machine, so could you >>> please attach +quartz logs? >> > Thanks. I've added a patch to fix this on the filtergraph end. It works for me, thanks! -- Alexandre Julliard julliard(a)winehq.org

Feb. 28, 2018

Re: [PATCH v2 4/6] quartz/tests: Simply test_render_with_multithread().

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=36294 Your paranoid android. === wxppro (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w2003std (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === wvistau64 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w2008s64 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w7u (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w7pro64 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w8 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w864 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w1064 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === wvistau64 (64 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w2008s64 (64 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w7pro64 (64 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w864 (64 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w1064 (64 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242

Feb. 28, 2018

Re: [PATCH v2 3/6] quartz/tests: Expand and separate media event tests.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=36293 Your paranoid android. === wxppro (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w2003std (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === wvistau64 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w2008s64 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w7u (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w7pro64 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w8 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w864 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w1064 (32 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === wvistau64 (64 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w2008s64 (64 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w7pro64 (64 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w864 (64 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242 === w1064 (64 bit filtergraph) === filtergraph.c:577: Test failed: got 0x40242

Feb. 28, 2018

Re: [PATCH v2 2/6] quartz/tests: Expand and separate state change tests.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=36292 Your paranoid android. === wxppro (32 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === w2003std (32 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === wvistau64 (32 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === w2008s64 (32 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === w7u (32 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === w7pro64 (32 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === w8 (32 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === w864 (32 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === w1064 (32 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === wvistau64 (64 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === w2008s64 (64 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === w7pro64 (64 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === w864 (64 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242 === w1064 (64 bit filtergraph) === filtergraph.c:528: Test failed: got 0x40242

Feb. 28, 2018

Re: [PATCH v2 1/6] quartz: Always return VFW_E_CANNOT_CONNECT from Connect() if no filter was found.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=36291 Your paranoid android. === wxppro (32 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === w2003std (32 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === wvistau64 (32 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === w2008s64 (32 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === w7u (32 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === w7pro64 (32 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === w8 (32 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === w864 (32 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === w1064 (32 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === wvistau64 (64 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === w2008s64 (64 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === w7pro64 (64 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === w864 (64 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242 === w1064 (64 bit filtergraph) === filtergraph.c:516: Test failed: got 0x40242

Feb. 28, 2018

Re: [PATCH 1/5] quartz/tests: Expand and separate state change tests.

by Zebediah Figura

On 28/02/18 13:35, Alexandre Julliard wrote: > Zebediah Figura <z.figura12(a)gmail.com> writes: > >> Thanks. Unfortunately I can't reproduce this on my machine, so could you >> please attach +quartz logs? > > > > > > > Thanks. I've added a patch to fix this on the filtergraph end. Fixing the filter mapper unregistration will take a bit more work, but this should at least let the filtergraph tests pass.

Feb. 28, 2018

[PATCH v2 6/6] quartz/tests: Remove some unnecessary error-checking.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 60 +++-------------------------------------- 1 file changed, 3 insertions(+), 57 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 44d52dd..a9530a3 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1824,12 +1824,10 @@ static HRESULT get_connected_filter_name(TestFilterImpl *pFilter, char *FilterNa hr = IPin_ConnectedTo(pFilter->ppPins[0], &pin); ok(hr == S_OK, "IPin_ConnectedTo failed with %x\n", hr); - if (FAILED(hr)) return hr; hr = IPin_QueryPinInfo(pin, &pinInfo); ok(hr == S_OK, "IPin_QueryPinInfo failed with %x\n", hr); IPin_Release(pin); - if (FAILED(hr)) return hr; SetLastError(0xdeadbeef); hr = IBaseFilter_QueryFilterInfo(pinInfo.pFilter, &filterInfo); @@ -1840,7 +1838,6 @@ static HRESULT get_connected_filter_name(TestFilterImpl *pFilter, char *FilterNa } ok(hr == S_OK, "IBaseFilter_QueryFilterInfo failed with %x\n", hr); IBaseFilter_Release(pinInfo.pFilter); - if (FAILED(hr)) return hr; IFilterGraph_Release(filterInfo.pGraph); @@ -1940,28 +1937,23 @@ static void test_render_filter_priority(void) * on the order in which filters are added to the graph, thus indicating * no preference given to exact match. */ pgraph2 = create_graph(); - if (!pgraph2) return; hr = createtestfilter(&GUID_NULL, PinData1, &ptestfilter); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter->IBaseFilter_iface, wszFilterInstanceName1); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); hr = createtestfilter(&GUID_NULL, PinData2, &ptestfilter2); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName2); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); - ptestfilter2 = NULL; hr = createtestfilter(&GUID_NULL, PinData3, &ptestfilter2); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName3); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); @@ -1972,41 +1964,27 @@ static void test_render_filter_priority(void) hr = get_connected_filter_name(ptestfilter, ConnectedFilterName1); IFilterGraph2_Release(pgraph2); - pgraph2 = NULL; IBaseFilter_Release(&ptestfilter->IBaseFilter_iface); - ptestfilter = NULL; IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); - ptestfilter2 = NULL; - - if (hr == E_NOTIMPL) - { - win_skip("Needed functions are not implemented\n"); - return; - } pgraph2 = create_graph(); - if (!pgraph2) goto out; hr = createtestfilter(&GUID_NULL, PinData1, &ptestfilter); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter->IBaseFilter_iface, wszFilterInstanceName1); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); hr = createtestfilter(&GUID_NULL, PinData3, &ptestfilter2); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName3); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); - ptestfilter2 = NULL; hr = createtestfilter(&GUID_NULL, PinData2, &ptestfilter2); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName2); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); @@ -2022,49 +2000,39 @@ static void test_render_filter_priority(void) "expected connected filters to be different but got %s both times\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); - pgraph2 = NULL; IBaseFilter_Release(&ptestfilter->IBaseFilter_iface); - ptestfilter = NULL; IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); - ptestfilter2 = NULL; /* Test if any preference is given to existing renderer which renders the pin directly vs an existing renderer which renders the pin indirectly, through an additional middle filter, again trying different orders of creation. Native appears not to give a preference. */ pgraph2 = create_graph(); - if (!pgraph2) goto out; hr = createtestfilter(&GUID_NULL, PinData1, &ptestfilter); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter->IBaseFilter_iface, wszFilterInstanceName1); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); hr = createtestfilter(&GUID_NULL, PinData2, &ptestfilter2); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName2); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); - ptestfilter2 = NULL; hr = createtestfilter(&GUID_NULL, PinData4, &ptestfilter2); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName3); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); - ptestfilter2 = NULL; hr = createtestfilter(&GUID_NULL, PinData5, &ptestfilter2); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName4); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); @@ -2077,45 +2045,35 @@ static void test_render_filter_priority(void) "unexpected connected filter: %s\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); - pgraph2 = NULL; IBaseFilter_Release(&ptestfilter->IBaseFilter_iface); - ptestfilter = NULL; IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); - ptestfilter2 = NULL; pgraph2 = create_graph(); - if (!pgraph2) goto out; hr = createtestfilter(&GUID_NULL, PinData1, &ptestfilter); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter->IBaseFilter_iface, wszFilterInstanceName1); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); hr = createtestfilter(&GUID_NULL, PinData4, &ptestfilter2); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName3); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); - ptestfilter2 = NULL; hr = createtestfilter(&GUID_NULL, PinData5, &ptestfilter2); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName4); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); - ptestfilter2 = NULL; hr = createtestfilter(&GUID_NULL, PinData2, &ptestfilter2); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName2); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); @@ -2130,23 +2088,17 @@ static void test_render_filter_priority(void) "expected connected filters to be different but got %s both times\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); - pgraph2 = NULL; IBaseFilter_Release(&ptestfilter->IBaseFilter_iface); - ptestfilter = NULL; IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); - ptestfilter2 = NULL; /* Test if renderers are tried before non-renderers (intermediary filters). */ pgraph2 = create_graph(); - if (!pgraph2) goto out; hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&pMapper2); ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); - if (!pMapper2) goto out; hr = createtestfilter(&GUID_NULL, PinData1, &ptestfilter); ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter->IBaseFilter_iface, wszFilterInstanceName1); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); @@ -2156,17 +2108,14 @@ static void test_render_filter_priority(void) (IUnknown *)&Filter1ClassFactory.IClassFactory_iface, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie1); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = CoRegisterClassObject(Filter2ClassFactory.clsid, (IUnknown *)&Filter2ClassFactory.IClassFactory_iface, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie2); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); - if (FAILED(hr)) goto out; hr = CoRegisterClassObject(Filter3ClassFactory.clsid, (IUnknown *)&Filter3ClassFactory.IClassFactory_iface, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie3); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); - if (FAILED(hr)) goto out; rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; @@ -2233,12 +2182,9 @@ static void test_render_filter_priority(void) ok(hr == S_OK, "IFilterMapper2_UnregisterFilter failed with %x\n", hr); } - out: - - if (ptestfilter) IBaseFilter_Release(&ptestfilter->IBaseFilter_iface); - if (ptestfilter2) IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); - if (pgraph2) IFilterGraph2_Release(pgraph2); - if (pMapper2) IFilterMapper2_Release(pMapper2); + IBaseFilter_Release(&ptestfilter->IBaseFilter_iface); + IFilterGraph2_Release(pgraph2); + IFilterMapper2_Release(pMapper2); hr = CoRevokeClassObject(cookie1); ok(hr == S_OK, "CoRevokeClassObject failed with %08x\n", hr); -- 2.7.4

Feb. 28, 2018

[PATCH v2 5/6] quartz/tests: Add more tests for IMediaSeeking.

by Zebediah Figura

Also remove uninteresting IMediaControl test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 45d1845..44d52dd 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -284,12 +284,11 @@ static void test_basic_video(IFilterGraph2 *graph) IBasicVideo_Release(pbv); } -static void test_mediacontrol(IFilterGraph2 *graph) +static void test_media_seeking(IFilterGraph2 *graph) { IMediaSeeking *seeking; IMediaFilter *filter; - IMediaControl *control; - LONGLONG pos; + LONGLONG pos, stop, duration; GUID format; HRESULT hr; @@ -300,9 +299,6 @@ static void test_mediacontrol(IFilterGraph2 *graph) hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); ok(hr == S_OK, "QueryInterface(IMediaFilter) failed: %08x\n", hr); - hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - ok(hr == S_OK, "QueryInterface(IMediaControl) failed: %08x\n", hr); - format = GUID_NULL; hr = IMediaSeeking_GetTimeFormat(seeking, &format); ok(hr == S_OK, "GetTimeFormat failed: %#x\n", hr); @@ -327,21 +323,31 @@ static void test_mediacontrol(IFilterGraph2 *graph) ok(hr == S_OK, "GetCurrentPosition failed: %#x\n", hr); ok(pos == 0, "got %s\n", wine_dbgstr_longlong(pos)); + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == S_OK, "GetDuration failed: %#x\n", hr); + ok(duration > 0, "got %s\n", wine_dbgstr_longlong(duration)); + + hr = IMediaSeeking_GetStopPosition(seeking, &stop); + ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); + ok(stop == duration || stop == duration + 1, "expected %s, got %s\n", + wine_dbgstr_longlong(duration), wine_dbgstr_longlong(stop)); + hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_ReturnTime, NULL, AM_SEEKING_NoPositioning); ok(hr == S_OK, "SetPositions failed: %#x\n", hr); hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_NoPositioning, NULL, AM_SEEKING_ReturnTime); ok(hr == S_OK, "SetPositions failed: %#x\n", hr); + pos = 0; + hr = IMediaSeeking_SetPositions(seeking, &pos, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); + ok(hr == S_OK, "SetPositions failed: %08x\n", hr); + IMediaFilter_SetSyncSource(filter, NULL); pos = 0xdeadbeef; hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); - ok(hr == S_OK, "GetCurrentPosition failed: %#x\n", hr); - ok(pos == 0, "got %s\n", wine_dbgstr_longlong(pos)); + ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); + ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos)); + IFilterGraph2_SetDefaultSyncSource(graph); - hr = IMediaControl_GetState(control, 1000, NULL); - ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); - - IMediaControl_Release(control); IMediaSeeking_Release(seeking); IMediaFilter_Release(filter); } @@ -487,7 +493,7 @@ todo_wine static void rungraph(IFilterGraph2 *graph) { test_basic_video(graph); - test_mediacontrol(graph); + test_media_seeking(graph); test_state_change(graph); test_media_event(graph); } -- 2.7.4

Feb. 28, 2018