wine-devel

wine-devel@winehq.org

3 participants
84483 discussions

[PATCH v2 1/4] amstream: Factor out the common code of MediaStreamFilter seeking tests.
by Anton Baskanov 17 Nov '20

17 Nov '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/tests/amstream.c | 412 ++++++--------------------------- 1 file changed, 67 insertions(+), 345 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c5fd5abe620..9a4d5066714 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6227,7 +6227,8 @@ static void test_mediastreamfilter_support_seeking(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_mediastreamfilter_set_positions(void) +static void check_mediastreamfilter_seeking(void (*check)(IMediaSeeking *seeking, struct testfilter *source1, + struct testfilter *source2, struct testfilter *source3, HRESULT source2_hr, HRESULT expected_hr)) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); static const MSPID mspid1 = {0x88888888, 1}; @@ -6237,11 +6238,9 @@ static void test_mediastreamfilter_set_positions(void) struct testfilter source1; struct testfilter source2; struct testfilter source3; - LONGLONG current_position; IAMMediaStream *stream1; IAMMediaStream *stream2; IAMMediaStream *stream3; - LONGLONG stop_position; IMediaSeeking *seeking; IGraphBuilder *graph; IPin *pin1; @@ -6308,108 +6307,20 @@ static void test_mediastreamfilter_set_positions(void) hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); ok(hr == S_OK, "Got hr %#x.\n", hr); - current_position = 12345678; - stop_position = 87654321; - source1.current_position = 0xdeadbeefdeadbeefULL; - source1.stop_position = 0xdeadbeefdeadbeefULL; - source2.current_position = 0xdeadbeefdeadbeefULL; - source2.stop_position = 0xdeadbeefdeadbeefULL; - source3.current_position = 0xdeadbeefdeadbeefULL; - source3.stop_position = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, - &stop_position, AM_SEEKING_AbsolutePositioning); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(source1.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source1.current_position)); - ok(source1.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source1.stop_position)); - ok(source2.current_position == 12345678, "Got current position %s.\n", - wine_dbgstr_longlong(source2.current_position)); - ok(source2.stop_position == 87654321, "Got stop position %s.\n", - wine_dbgstr_longlong(source2.stop_position)); - ok(source3.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source3.current_position)); - ok(source3.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source3.stop_position)); - - source2.set_positions_hr = E_FAIL; - source1.current_position = 0xdeadbeefdeadbeefULL; - source1.stop_position = 0xdeadbeefdeadbeefULL; - source3.current_position = 0xdeadbeefdeadbeefULL; - source3.stop_position = 0xdeadbeefdeadbeefULL; - current_position = 12345678; - stop_position = 87654321; - hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, - &stop_position, AM_SEEKING_AbsolutePositioning); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); - ok(source1.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source1.current_position)); - ok(source1.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source1.stop_position)); - ok(source3.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source3.current_position)); - ok(source3.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source3.stop_position)); - - source2.set_positions_hr = E_NOTIMPL; - source1.current_position = 0xdeadbeefdeadbeefULL; - source1.stop_position = 0xdeadbeefdeadbeefULL; - source3.current_position = 0xdeadbeefdeadbeefULL; - source3.stop_position = 0xdeadbeefdeadbeefULL; - current_position = 12345678; - stop_position = 87654321; - hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, - &stop_position, AM_SEEKING_AbsolutePositioning); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(source1.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source1.current_position)); - ok(source1.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source1.stop_position)); - ok(source3.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source3.current_position)); - ok(source3.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source3.stop_position)); + check(seeking, &source1, &source2, &source3, S_OK, S_OK); + check(seeking, &source1, &source2, &source3, E_FAIL, E_FAIL); + check(seeking, &source1, &source2, &source3, E_NOTIMPL, E_NOTIMPL); source2.IMediaSeeking_iface.lpVtbl = NULL; - source1.current_position = 0xdeadbeefdeadbeefULL; - source1.stop_position = 0xdeadbeefdeadbeefULL; - source3.current_position = 0xdeadbeefdeadbeefULL; - source3.stop_position = 0xdeadbeefdeadbeefULL; - current_position = 12345678; - stop_position = 87654321; - hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, - &stop_position, AM_SEEKING_AbsolutePositioning); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(source1.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source1.current_position)); - ok(source1.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source1.stop_position)); - ok(source3.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source3.current_position)); - ok(source3.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source3.stop_position)); + + check(seeking, &source1, &source2, &source3, S_OK, E_NOTIMPL); + + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; IGraphBuilder_Disconnect(graph, pin2); IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); - source2.IMediaSeeking_iface.lpVtbl = NULL; - source1.current_position = 0xdeadbeefdeadbeefULL; - source1.stop_position = 0xdeadbeefdeadbeefULL; - source3.current_position = 0xdeadbeefdeadbeefULL; - source3.stop_position = 0xdeadbeefdeadbeefULL; - current_position = 12345678; - stop_position = 87654321; - hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, - &stop_position, AM_SEEKING_AbsolutePositioning); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(source1.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source1.current_position)); - ok(source1.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source1.stop_position)); - ok(source3.current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", - wine_dbgstr_longlong(source3.current_position)); - ok(source3.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", - wine_dbgstr_longlong(source3.stop_position)); + check(seeking, &source1, &source2, &source3, S_OK, E_NOTIMPL); IGraphBuilder_Disconnect(graph, pin2); IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); @@ -6434,262 +6345,75 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_mediastreamfilter_get_duration(void) +static void check_mediastreamfilter_set_positions(IMediaSeeking *seeking, struct testfilter *source1, + struct testfilter *source2, struct testfilter *source3, HRESULT source2_hr, HRESULT expected_hr) { - IAMMultiMediaStream *mmstream = create_ammultimediastream(); - static const MSPID mspid1 = {0x88888888, 1}; - static const MSPID mspid2 = {0x88888888, 2}; - static const MSPID mspid3 = {0x88888888, 3}; - struct testfilter source1, source2, source3; - IAMMediaStream *stream1, *stream2, *stream3; - IMediaStreamFilter *filter; - IPin *pin1, *pin2, *pin3; - IMediaSeeking *seeking; - IGraphBuilder *graph; - LONGLONG duration; + LONGLONG current_position = 12345678; + LONGLONG stop_position = 87654321; HRESULT hr; - ULONG ref; - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(graph != NULL, "Expected non-NULL graph.\n"); - testfilter_init(&source1); - testfilter_init(&source2); - testfilter_init(&source3); - source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - duration = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetDuration(seeking, &duration); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); - - source2.get_duration_hr = E_FAIL; - duration = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetDuration(seeking, &duration); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); - ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); - - source2.get_duration_hr = E_NOTIMPL; - duration = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetDuration(seeking, &duration); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); - - source2.IMediaSeeking_iface.lpVtbl = NULL; - duration = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetDuration(seeking, &duration); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + source2->set_positions_hr = source2_hr; + source1->current_position = 0xdeadbeefdeadbeefULL; + source1->stop_position = 0xdeadbeefdeadbeefULL; + source2->current_position = 0xdeadbeefdeadbeefULL; + source2->stop_position = 0xdeadbeefdeadbeefULL; + source3->current_position = 0xdeadbeefdeadbeefULL; + source3->stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_SetPositions(seeking, &current_position, AM_SEEKING_AbsolutePositioning, + &stop_position, AM_SEEKING_AbsolutePositioning); + ok(hr == expected_hr, "Got hr %#x.\n", hr); + ok(source1->current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", + wine_dbgstr_longlong(source1->current_position)); + ok(source1->stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(source1->stop_position)); + if (SUCCEEDED(expected_hr)) + { + ok(source2->current_position == 12345678, "Got current position %s.\n", + wine_dbgstr_longlong(source2->current_position)); + ok(source2->stop_position == 87654321, "Got stop position %s.\n", + wine_dbgstr_longlong(source2->stop_position)); + } + ok(source3->current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n", + wine_dbgstr_longlong(source3->current_position)); + ok(source3->stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", + wine_dbgstr_longlong(source3->stop_position)); +} - IGraphBuilder_Disconnect(graph, pin2); - IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); +static void check_mediastreamfilter_get_duration(IMediaSeeking *seeking, struct testfilter *source1, + struct testfilter *source2, struct testfilter *source3, HRESULT source2_hr, HRESULT expected_hr) +{ + LONGLONG duration = 0xdeadbeefdeadbeefULL; + HRESULT hr; - source2.IMediaSeeking_iface.lpVtbl = NULL; - duration = 0xdeadbeefdeadbeefULL; + source2->get_duration_hr = source2_hr; hr = IMediaSeeking_GetDuration(seeking, &duration); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); - - IGraphBuilder_Disconnect(graph, pin2); - IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); - IGraphBuilder_Disconnect(graph, pin3); - IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); - - ref = IAMMultiMediaStream_Release(mmstream); - ok(!ref, "Got outstanding refcount %d.\n", ref); - ref = IGraphBuilder_Release(graph); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IMediaSeeking_Release(seeking); - ref = IMediaStreamFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin1); - ref = IAMMediaStream_Release(stream1); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin2); - ref = IAMMediaStream_Release(stream2); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin3); - ref = IAMMediaStream_Release(stream3); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(hr == expected_hr, "Got hr %#x.\n", hr); + if (SUCCEEDED(expected_hr)) + ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + else + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); } -static void test_mediastreamfilter_get_stop_position(void) +static void check_mediastreamfilter_get_stop_position(IMediaSeeking *seeking, struct testfilter *source1, + struct testfilter *source2, struct testfilter *source3, HRESULT source2_hr, HRESULT expected_hr) { - IAMMultiMediaStream *mmstream = create_ammultimediastream(); - static const MSPID mspid1 = {0x88888888, 1}; - static const MSPID mspid2 = {0x88888888, 2}; - static const MSPID mspid3 = {0x88888888, 3}; - struct testfilter source1, source2, source3; - IAMMediaStream *stream1, *stream2, *stream3; - IMediaStreamFilter *filter; - IPin *pin1, *pin2, *pin3; - IMediaSeeking *seeking; - IGraphBuilder *graph; - LONGLONG stop; + LONGLONG stop = 0xdeadbeefdeadbeefULL; HRESULT hr; - ULONG ref; - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(graph != NULL, "Expected non-NULL graph.\n"); - testfilter_init(&source1); - testfilter_init(&source2); - testfilter_init(&source3); - source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; - hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - stop = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetStopPosition(seeking, &stop); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stop == 0x8000000000000000ULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); - - source2.get_stop_position_hr = E_FAIL; - stop = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetStopPosition(seeking, &stop); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); - ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); - - source2.get_stop_position_hr = E_NOTIMPL; - stop = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetStopPosition(seeking, &stop); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); - - source2.IMediaSeeking_iface.lpVtbl = NULL; - stop = 0xdeadbeefdeadbeefULL; + source2->get_stop_position_hr = source2_hr; hr = IMediaSeeking_GetStopPosition(seeking, &stop); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); - - IGraphBuilder_Disconnect(graph, pin2); - IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); - - source2.IMediaSeeking_iface.lpVtbl = NULL; - stop = 0xdeadbeefdeadbeefULL; - hr = IMediaSeeking_GetStopPosition(seeking, &stop); - ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); - ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); - - IGraphBuilder_Disconnect(graph, pin2); - IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); - IGraphBuilder_Disconnect(graph, pin3); - IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + ok(hr == expected_hr, "Got hr %#x.\n", hr); + if (SUCCEEDED(expected_hr)) + ok(stop == 0x8000000000000000ULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); + else + ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); +} - ref = IAMMultiMediaStream_Release(mmstream); - ok(!ref, "Got outstanding refcount %d.\n", ref); - ref = IGraphBuilder_Release(graph); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IMediaSeeking_Release(seeking); - ref = IMediaStreamFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin1); - ref = IAMMediaStream_Release(stream1); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin2); - ref = IAMMediaStream_Release(stream2); - ok(!ref, "Got outstanding refcount %d.\n", ref); - IPin_Release(pin3); - ref = IAMMediaStream_Release(stream3); - ok(!ref, "Got outstanding refcount %d.\n", ref); +static void test_mediastreamfilter_seeking(void) +{ + check_mediastreamfilter_seeking(check_mediastreamfilter_set_positions); + check_mediastreamfilter_seeking(check_mediastreamfilter_get_duration); + check_mediastreamfilter_seeking(check_mediastreamfilter_get_stop_position); } static void test_mediastreamfilter_get_current_stream_time(void) @@ -8886,9 +8610,7 @@ START_TEST(amstream) test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); - test_mediastreamfilter_set_positions(); - test_mediastreamfilter_get_duration(); - test_mediastreamfilter_get_stop_position(); + test_mediastreamfilter_seeking(); test_mediastreamfilter_get_current_stream_time(); test_mediastreamfilter_reference_time_to_stream_time(); test_mediastreamfilter_wait_until(); -- 2.17.1

2 9

[PATCH v2 1/3] include: Add xact2wb.h
by Vijay Kiran Kamuju 17 Nov '20

17 Nov '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH v2] vbscript: Support properties with parameters.
by Robert Wilhelm 17 Nov '20

17 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 22 ++++++++++++++++++ dlls/vbscript/vbdisp.c | 45 ++++++++++++++++++++++++++---------- 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a9f4c540fcb..8f1c1307794 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -454,7 +454,7 @@ ClassBody PropertyDecl : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 53f36b6e710..c36302c0c2f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1770,6 +1770,28 @@ class TestPropSyntax end property end class +Class TestPropParam + Public oDict + Public m_obj + Public Property Let Key(oldKey, newKey) + oDict =oldKey & newKey + End Property + Public Property Let three(uno,due,tre) + oDict =uno & due & tre + End Property + Public Property Let ten(a,b,c,d,e,f,g,h,i,j) + oDict =a & b & c & d & e & f & g & h & i & j + End Property +End Class + +Set x = new TestPropParam +x.key("old") = "new" +call ok(x.oDict = "oldnew","x.oDict = " & x.oDict & " expected oldnew") +x.three(1,2) = 3 +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +x.ten(1,2,3,4,5,6,7,8,9) = 0 +call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") + set x = new TestPropSyntax set x.prop = new TestPropSyntax set x.prop.prop = new TestPropSyntax diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 5f493d420bd..75b7badc5c7 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -78,7 +78,7 @@ HRESULT vbdisp_get_id(vbdisp_t *This, BSTR name, vbdisp_invoke_type_t invoke_typ return DISP_E_UNKNOWNNAME; } -static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD flags, VARIANT *v, BOOL *is_owned) +static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD flags, VARIANT *v, BOOL *is_owned, INT *index) { unsigned i; @@ -88,9 +88,11 @@ static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD fla } if(i == dp->cNamedArgs) { WARN("no value to set\n"); + *index=-1; return DISP_E_PARAMNOTOPTIONAL; } + *index = i; *v = dp->rgvarg[i]; if(V_VT(v) == (VT_VARIANT|VT_BYREF)) *v = *V_VARIANTREF(v); @@ -134,8 +136,9 @@ static HRESULT invoke_variant_prop(script_ctx_t *ctx, VARIANT *v, WORD flags, DI case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { VARIANT put_val; BOOL own_val; + INT index; - hres = get_propput_arg(ctx, dp, flags, &put_val, &own_val); + hres = get_propput_arg(ctx, dp, flags, &put_val, &own_val, &index); if(FAILED(hres)) return hres; @@ -197,28 +200,46 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { DISPPARAMS dp = {NULL, NULL, 1, 0}; BOOL needs_release; - VARIANT put_val; + VARIANT buf[6]; HRESULT hres; - - if(arg_cnt(params)) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + INT index,i,j; + + dp.cArgs = arg_cnt(params) + 1; + if(dp.cArgs > ARRAY_SIZE(buf)) { + dp.rgvarg = heap_alloc(dp.cArgs*sizeof(VARIANT)); + if(!dp.rgvarg) + return E_OUTOFMEMORY; + }else { + dp.rgvarg = buf; } - hres = get_propput_arg(This->desc->ctx, params, flags, &put_val, &needs_release); - if(FAILED(hres)) + hres = get_propput_arg(This->desc->ctx, params, flags, dp.rgvarg, &needs_release, &index); + if(FAILED(hres)) { + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; + } - dp.rgvarg = &put_val; - func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + func = This->desc->funcs[id].entries[V_VT(dp.rgvarg) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; if(!func) { FIXME("no letter/setter\n"); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return DISP_E_MEMBERNOTFOUND; } + for( i=1,j=0; i<dp.cArgs;i++,j++) { + if (j==index) { + j++; + } + dp.rgvarg[i]=params->rgvarg[j]; + } + hres = exec_script(This->desc->ctx, extern_caller, func, This, &dp, NULL); if(needs_release) - VariantClear(&put_val); + VariantClear(dp.rgvarg); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; } default: -- 2.26.2

2 2

[PATCH 2/2] windowscodecs: Fix allocation in tiff_decoder_get_metadata_blocks.
by Esme Povirk 17 Nov '20

17 Nov '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/libtiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 27f89679766..7f174bbd5dd 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -1127,7 +1127,7 @@ static HRESULT CDECL tiff_decoder_get_metadata_blocks(struct decoder *iface, result.options |= WICPersistOptionNoCacheStream|DECODER_BLOCK_FULL_STREAM|DECODER_BLOCK_READER_CLSID; result.reader_clsid = CLSID_WICIfdMetadataReader; - *blocks = malloc(sizeof(**blocks)); + *blocks = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(**blocks)); **blocks = result; return S_OK; -- 2.17.1

1 0

[PATCH 1/2] windowscodecs: Fix memory leak in common decoder.
by Esme Povirk 17 Nov '20

17 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50140 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/decoder.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index ad5127cd258..0e97135bc16 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -95,6 +95,7 @@ static ULONG WINAPI CommonDecoder_Release(IWICBitmapDecoder *iface) IStream_Release(This->stream); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); + decoder_destroy(This->decoder); HeapFree(GetProcessHeap(), 0, This); } -- 2.17.1

1 0

[PATCH] msvcrt: Save and restore rounding mode in fegetenv() / fesetenv().
by Paul Gofman 17 Nov '20

17 Nov '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 23 ++++++++++++++++++++--- dlls/msvcrt/math.c | 10 ++++++++-- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 52531ddad72..8663fc81ee8 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <float.h> #include <math.h> +#include <fenv.h> #include <limits.h> #include <wctype.h> @@ -183,6 +184,9 @@ static float (CDECL *p_wcstof)(const wchar_t*, wchar_t**); static double (CDECL *p_remainder)(double, double); static int* (CDECL *p_errno)(void); static int (CDECL *p_fegetenv)(fenv_t*); +static int (CDECL *p_fesetenv)(const fenv_t*); +static int (CDECL *p_fegetround)(void); +static int (CDECL *p_fesetround)(int); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); @@ -254,6 +258,10 @@ static BOOL init(void) p_free_locale = (void*)GetProcAddress(module, "_free_locale"); SET(p_wctype, "wctype"); SET(p_fegetenv, "fegetenv"); + SET(p_fesetenv, "fesetenv"); + SET(p_fegetround, "fegetround"); + SET(p_fesetround, "fesetround"); + SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); @@ -780,18 +788,27 @@ static void test_critical_section(void) call_func1(p_critical_section_dtor, &cs); } -static void test_fegetenv(void) +static void test_feenv(void) { + fenv_t env, env2; int ret; - fenv_t env; p__clearfp(); ret = p_fegetenv(&env); ok(!ret, "fegetenv returned %x\n", ret); + p_fesetround(FE_UPWARD); ok(env.control == (_EM_INEXACT|_EM_UNDERFLOW|_EM_OVERFLOW|_EM_ZERODIVIDE|_EM_INVALID), "env.control = %x\n", env.control); ok(!env.status, "env.status = %x\n", env.status); + ret = p_fegetenv(&env2); + ok(!ret, "fegetenv returned %x\n", ret); + ok(env2.control == (_EM_INEXACT|_EM_UNDERFLOW|_EM_OVERFLOW|_EM_ZERODIVIDE|_EM_INVALID | FE_UPWARD), + "env2.control = %x\n", env2.control); + ret = p_fesetenv(&env); + ok(!ret, "fesetenv returned %x\n", ret); + ret = p_fegetround(); + ok(ret == FE_TONEAREST, "Got unexpected round mode %#x.\n", ret); } static void test__wcreate_locale(void) @@ -1110,7 +1127,7 @@ START_TEST(msvcr120) test__strtof(); test_remainder(); test_critical_section(); - test_fegetenv(); + test_feenv(); test__wcreate_locale(); test__Condition_variable(); test_wctype(); diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8e8324b8fbe..96eac9190c6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2076,7 +2076,7 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask int CDECL MSVCRT_fegetenv(MSVCRT_fenv_t *env) { env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW | - MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID); + MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID | MSVCRT__RC_CHOP); env->status = _statusfp(); return 0; } @@ -2214,12 +2214,18 @@ int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) DWORD fpword; __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); - fpword &= ~0x1e80; + fpword &= ~0x7e80; if (env->control & MSVCRT__EM_INVALID) fpword |= 0x80; if (env->control & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; if (env->control & MSVCRT__EM_OVERFLOW) fpword |= 0x400; if (env->control & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; if (env->control & MSVCRT__EM_INEXACT) fpword |= 0x1000; + switch (env->control & MSVCRT__MCW_RC) + { + case MSVCRT__RC_CHOP: fpword |= 0x6000; break; + case MSVCRT__RC_UP: fpword |= 0x4000; break; + case MSVCRT__RC_DOWN: fpword |= 0x2000; break; + } __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); } -- 2.28.0

2 2

[PATCH 3/3] kernel32: Import WriteFile from kernelbase.
by Jacek Caban 17 Nov '20

17 Nov '20

Console special-case is no longer needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 11 ----------- dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-)

2 1

[PATCH 2/3] server: Support writing directly on console handle.
by Jacek Caban 17 Nov '20

17 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 58 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 12 deletions(-)

1 0

[PATCH 1/3] kernelbase: Move Unicode conversion from WriteConsoleA to conhost.
by Jacek Caban 17 Nov '20

17 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 13 ++++--------- include/wine/condrv.h | 15 ++++++++------- programs/conhost/conhost.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 16 deletions(-)

1 0

[PATCH v3 1/4] quartz/tests: Pass an IMediaControl to some functions.
by Zebediah Figura 17 Nov '20

17 Nov '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/dsoundrender.c | 12 ++++----- dlls/quartz/tests/videorenderer.c | 43 ++++++++++--------------------- dlls/quartz/tests/vmr7.c | 27 +++++++------------ 3 files changed, 28 insertions(+), 54 deletions(-) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 9506abc7977..9aa9a796c9f 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -746,14 +746,11 @@ static HRESULT send_frame(IMemInputPin *sink) return ret; } -static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) +static void test_filter_state(IMemInputPin *input, IMediaControl *control) { - IMediaControl *control; OAFilterState state; HRESULT hr; - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - hr = send_frame(input); ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); @@ -833,8 +830,6 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) /* The DirectSound renderer will silently refuse to transition to running * if it hasn't finished pausing yet. Once it does it reports itself as * completely paused. */ - - IMediaControl_Release(control); } static void test_connect_pin(void) @@ -860,6 +855,7 @@ static void test_connect_pin(void) IBaseFilter *filter = create_dsound_render(); struct testfilter source; IMemAllocator *allocator; + IMediaControl *control; IFilterGraph2 *graph; IMemInputPin *input; AM_MEDIA_TYPE mt; @@ -872,6 +868,7 @@ static void test_connect_pin(void) CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); IFilterGraph2_AddFilter(graph, filter, L"sink"); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IBaseFilter_FindPin(filter, sink_id, &pin); @@ -913,7 +910,7 @@ static void test_connect_pin(void) hr = IMemInputPin_ReceiveCanBlock(input); ok(hr == S_OK, "Got hr %#x.\n", hr); - test_filter_state(input, graph); + test_filter_state(input, control); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -934,6 +931,7 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); IMemInputPin_Release(input); IPin_Release(pin); + IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(filter); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ed2639d2736..f84d553f2aa 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -823,17 +823,14 @@ static HRESULT join_thread_(int line, HANDLE thread) } #define join_thread(a) join_thread_(__LINE__, a) -static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) +static void test_filter_state(IMemInputPin *input, IMediaControl *control) { IMemAllocator *allocator; - IMediaControl *control; IMediaSample *sample; OAFilterState state; HANDLE thread; HRESULT hr; - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - thread = send_frame(input); hr = join_thread(thread); todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); @@ -961,18 +958,14 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) ok(hr == S_OK, "Got hr %#x.\n", hr); IMemAllocator_Release(allocator); - IMediaControl_Release(control); } -static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control) { - IMediaControl *control; OAFilterState state; HANDLE thread; HRESULT hr; - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -1022,20 +1015,16 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); - - IMediaControl_Release(control); } -static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input, IMediaControl *control) { - IMediaControl *control; IMediaSeeking *seeking; REFERENCE_TIME time; OAFilterState state; HANDLE thread; HRESULT hr; - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IBaseFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); hr = IMediaControl_Pause(control); @@ -1108,7 +1097,6 @@ static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input ok(hr == S_OK, "Got hr %#x.\n", hr); IMediaSeeking_Release(seeking); - IMediaControl_Release(control); } static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) @@ -1134,16 +1122,14 @@ static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) return ret; } -static void test_eos(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) { - IMediaControl *control; IMediaEvent *eventsrc; OAFilterState state; HRESULT hr; BOOL ret; - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + IMediaControl_QueryInterface(control, &IID_IMediaEvent, (void **)&eventsrc); hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -1246,15 +1232,13 @@ static void test_eos(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) ok(!ret, "Got unexpected EC_COMPLETE.\n"); IMediaEvent_Release(eventsrc); - IMediaControl_Release(control); } static void test_current_image(IBaseFilter *filter, IMemInputPin *input, - IFilterGraph2 *graph, const BITMAPINFOHEADER *expect_bih) + IMediaControl *control, const BITMAPINFOHEADER *expect_bih) { LONG buffer[(sizeof(BITMAPINFOHEADER) + 32 * 16 * 2) / 4]; const BITMAPINFOHEADER *bih = (BITMAPINFOHEADER *)buffer; - IMediaControl *control; OAFilterState state; IBasicVideo *video; unsigned int i; @@ -1262,7 +1246,6 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, HRESULT hr; LONG size; - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IBaseFilter_QueryInterface(filter, &IID_IBasicVideo, (void **)&video); hr = IBasicVideo_GetCurrentImage(video, NULL, NULL); @@ -1321,7 +1304,6 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, ok(hr == S_OK, "Got hr %#x.\n", hr); IBasicVideo_Release(video); - IMediaControl_Release(control); } static void test_connect_pin(void) @@ -1347,6 +1329,7 @@ static void test_connect_pin(void) IFilterGraph2 *graph = create_graph(); struct testfilter source; IMemAllocator *allocator; + IMediaControl *control; IMemInputPin *input; AM_MEDIA_TYPE mt; IPin *pin, *peer; @@ -1366,6 +1349,7 @@ static void test_connect_pin(void) IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IBaseFilter_FindPin(filter, L"In", &pin); @@ -1424,11 +1408,11 @@ static void test_connect_pin(void) hr = IMemInputPin_ReceiveCanBlock(input); ok(hr == S_OK, "Got hr %#x.\n", hr); - test_filter_state(input, graph); - test_flushing(pin, input, graph); - test_sample_time(filter, pin, input, graph); - test_eos(pin, input, graph); - test_current_image(filter, input, graph, &vih.bmiHeader); + test_filter_state(input, control); + test_flushing(pin, input, control); + test_sample_time(filter, pin, input, control); + test_eos(pin, input, control); + test_current_image(filter, input, control, &vih.bmiHeader); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1449,6 +1433,7 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); IMemInputPin_Release(input); IPin_Release(pin); + IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(filter); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 39592afce66..1101a98ab7d 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1022,17 +1022,14 @@ static HRESULT join_thread_(int line, HANDLE thread) } #define join_thread(a) join_thread_(__LINE__, a) -static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) +static void test_filter_state(IMemInputPin *input, IMediaControl *control) { IMemAllocator *allocator; - IMediaControl *control; IMediaSample *sample; OAFilterState state; HANDLE thread; HRESULT hr; - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - thread = send_frame(input); hr = join_thread(thread); ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); @@ -1163,19 +1160,15 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) ok(hr == S_OK, "Got hr %#x.\n", hr); IMemAllocator_Release(allocator); - IMediaControl_Release(control); } -static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control) { IMemAllocator *allocator; - IMediaControl *control; OAFilterState state; HANDLE thread; HRESULT hr; - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - hr = IMemInputPin_GetAllocator(input, &allocator); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemAllocator_Commit(allocator); @@ -1233,19 +1226,16 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); - - IMediaControl_Release(control); } static void test_current_image(IBaseFilter *filter, IMemInputPin *input, - IFilterGraph2 *graph, const BITMAPINFOHEADER *req_bih) + IMediaControl *control, const BITMAPINFOHEADER *req_bih) { LONG buffer[(sizeof(BITMAPINFOHEADER) + 32 * 16 * 4) / 4]; const BITMAPINFOHEADER *bih = (BITMAPINFOHEADER *)buffer; const DWORD *data = (DWORD *)((char *)buffer + sizeof(BITMAPINFOHEADER)); BITMAPINFOHEADER expect_bih = *req_bih; IMemAllocator *allocator; - IMediaControl *control; OAFilterState state; IBasicVideo *video; unsigned int i; @@ -1258,7 +1248,6 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, expect_bih.biBitCount = 32; expect_bih.biSizeImage = 32 * 16 * 4; - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IBaseFilter_QueryInterface(filter, &IID_IBasicVideo, (void **)&video); hr = IBasicVideo_GetCurrentImage(video, NULL, NULL); @@ -1337,7 +1326,6 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, ok(hr == S_OK, "Got hr %#x.\n", hr); IBasicVideo_Release(video); - IMediaControl_Release(control); } static void test_connect_pin(void) @@ -1363,6 +1351,7 @@ static void test_connect_pin(void) IFilterGraph2 *graph = create_graph(); struct testfilter source; IMemAllocator *allocator; + IMediaControl *control; IMemInputPin *input; AM_MEDIA_TYPE mt; IPin *pin, *peer; @@ -1382,6 +1371,7 @@ static void test_connect_pin(void) IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); @@ -1469,9 +1459,9 @@ static void test_connect_pin(void) hr = IMemInputPin_ReceiveCanBlock(input); ok(hr == S_OK, "Got hr %#x.\n", hr); - test_filter_state(input, graph); - test_flushing(pin, input, graph); - test_current_image(filter, input, graph, &vih.bmiHeader); + test_filter_state(input, control); + test_flushing(pin, input, control); + test_current_image(filter, input, control, &vih.bmiHeader); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1490,6 +1480,7 @@ static void test_connect_pin(void) IMemInputPin_Release(input); IPin_Release(pin); + IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(filter); -- 2.29.2

2 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel