March 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplat: Fix PRESENTATION_CURRENT_POSITION handling for system time source.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 56ab0d1fea8b624ee037cc4aa3f121818bd1d7c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56ab0d1fea8b624ee037cc4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:25 2020 +0300 mfplat: Fix PRESENTATION_CURRENT_POSITION handling for system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 22 ++++++++- dlls/mfplat/tests/mfplat.c | 109 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 129 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 889961b8d1..37ea744313 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8058,15 +8058,35 @@ static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *if LONGLONG start_offset) { struct system_time_source *source = impl_from_IMFClockStateSink(iface); + MFCLOCK_STATE state; HRESULT hr; TRACE("%p, %s, %s.\n", iface, debugstr_time(system_time), debugstr_time(start_offset)); EnterCriticalSection(&source->cs); + state = source->state; if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_START))) { system_time_source_apply_rate(source, &system_time); - source->start_offset = -system_time + start_offset; + if (start_offset == PRESENTATION_CURRENT_POSITION) + { + switch (state) + { + case MFCLOCK_STATE_RUNNING: + break; + case MFCLOCK_STATE_PAUSED: + source->start_offset -= system_time; + break; + default: + source->start_offset = -system_time; + break; + ; + } + } + else + { + source->start_offset = -system_time + start_offset; + } } LeaveCriticalSection(&source->cs); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 497c451f72..185bacdebe 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3127,7 +3127,6 @@ static void test_system_time_source(void) hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); ok(hr == S_OK, "Failed to get time %#x.\n", hr); ok(time == 0, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), wine_dbgstr_longlong(systime)); - IMFClockStateSink_Release(statesink); hr = IMFClockStateSink_OnClockStart(statesink, 10, 0); ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); @@ -3172,6 +3171,114 @@ static void test_system_time_source(void) ok(time == -6, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), wine_dbgstr_longlong(systime)); + IMFClockStateSink_Release(statesink); + IMFPresentationTimeSource_Release(time_source); + + /* PRESENTATION_CURRENT_POSITION */ + hr = MFCreateSystemTimeSource(&time_source); + ok(hr == S_OK, "Failed to create time source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&statesink); + ok(hr == S_OK, "Failed to get sink interface, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(!time && systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + /* INVALID -> RUNNING */ + hr = IMFClockStateSink_OnClockStart(statesink, 10, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime - 10, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + /* RUNNING -> RUNNING */ + hr = IMFClockStateSink_OnClockStart(statesink, 20, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime - 10, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 0, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime - 10, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 30, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + /* STOPPED -> RUNNING */ + hr = IMFClockStateSink_OnClockStop(statesink, 567); + ok(hr == S_OK, "Failed to stop source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(!time && systime != 0, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 30, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime - 30, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + /* PAUSED -> RUNNING */ + hr = IMFClockStateSink_OnClockPause(statesink, 8); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == (-30 + 8) && systime != 0, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 40, PRESENTATION_CURRENT_POSITION); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime + (-30 + 8 - 40), "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockPause(statesink, 7); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == (-30 + 8 - 40 + 7) && systime != 0, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 50, 7); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == systime + (-50 + 7), "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + IMFClockStateSink_Release(statesink); IMFPresentationTimeSource_Release(time_source); }

1 0

Nikolay Sivov : mfplat/tests: Link to MFHeap* functions directly.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: b2885d14d6ffa26247e45ba42355a23c9f3a97fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2885d14d6ffa26247e45ba4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:26 2020 +0300 mfplat/tests: Link to MFHeap* functions directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 185bacdebe..78d73b7580 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -76,8 +76,6 @@ static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *s static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); -static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); -static void (WINAPI *pMFHeapFree)(void *p); static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); static HRESULT (WINAPI *pMFAllocateSerialWorkQueue)(DWORD queue, DWORD *serial_queue); static HRESULT (WINAPI *pMFAddPeriodicCallback)(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); @@ -678,8 +676,6 @@ static void init_functions(void) X(MFCreateTransformActivate); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); - X(MFHeapAlloc); - X(MFHeapFree); X(MFPutWaitingWorkItem); X(MFRegisterLocalByteStreamHandler); X(MFRegisterLocalSchemeHandler); @@ -2483,16 +2479,10 @@ static void test_MFHeapAlloc(void) { void *res; - if (!pMFHeapAlloc) - { - win_skip("MFHeapAlloc() is not available.\n"); - return; - } - - res = pMFHeapAlloc(16, 0, NULL, 0, eAllocationTypeIgnore); + res = MFHeapAlloc(16, 0, NULL, 0, eAllocationTypeIgnore); ok(res != NULL, "MFHeapAlloc failed.\n"); - pMFHeapFree(res); + MFHeapFree(res); } static void test_scheduled_items(void)

1 0

Nikolay Sivov : mf: Set cancellation object directly (Coverity).
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: cb3517a1bf168e586fdc520f05f3842c2621b8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb3517a1bf168e586fdc520f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:27 2020 +0300 mf: Set cancellation object directly (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index ac80c51016..01fe17866c 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -760,17 +760,20 @@ static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *if hr = MFCreateAsyncResult(&context->IUnknown_iface, &handler->IMFAsyncCallback_iface, (IUnknown *)caller, &item); IUnknown_Release(&context->IUnknown_iface); - IMFAsyncResult_Release(caller); if (SUCCEEDED(hr)) { if (SUCCEEDED(hr = MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_IO, item))) { if (cancel_cookie) - IMFAsyncResult_GetState(item, cancel_cookie); + { + *cancel_cookie = (IUnknown *)caller; + IUnknown_AddRef(*cancel_cookie); + } } IMFAsyncResult_Release(item); } + IMFAsyncResult_Release(caller); return hr; }

1 0

Nikolay Sivov : mfplat: Add a warning for buffer method failure (Coverity).
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 910ec21b5ab9b7613e0a1cc8bda108033b5496d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=910ec21b5ab9b7613e0a1cc8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:28 2020 +0300 mfplat: Add a warning for buffer method failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 4bbb36b683..1a31299d24 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1211,7 +1211,8 @@ static HRESULT sample_copy_to_buffer(struct sample *sample, IMFMediaBuffer *buff } } - IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length); + if (FAILED(IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length))) + WARN("Failed to set buffer length.\n"); if (locked) IMFMediaBuffer_Unlock(buffer);

1 0

Nikolay Sivov : mfreadwrite: Do not call async reader callback if source failed to start up.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: c362ce20efd7cc7ee88a8244089c3a7148e02b71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c362ce20efd7cc7ee88a8244… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 14:21:29 2020 +0300 mfreadwrite: Do not call async reader callback if source failed to start up. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 3b024fc80c..9a7c5e5fd7 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -895,7 +895,7 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m source_reader_release_response(response); } - return request_sample; + return !request_sample; } static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, DWORD index, DWORD *stream_index) @@ -984,8 +984,8 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb struct source_reader_async_command *command; struct stream_response *response; DWORD stream_index, stream_flags; - BOOL request_sample = FALSE; struct media_stream *stream; + BOOL report_sample = FALSE; IMFSample *sample = NULL; LONGLONG timestamp = 0; HRESULT hr, status; @@ -1008,10 +1008,8 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb if (SUCCEEDED(hr = source_reader_start_source(reader))) { - request_sample = source_reader_get_read_result(reader, stream, command->flags, &status, &stream_index, - &stream_flags, &timestamp, &sample); - - if (request_sample) + if (!(report_sample = source_reader_get_read_result(reader, stream, command->flags, &status, &stream_index, + &stream_flags, &timestamp, &sample))) { stream->requests++; source_reader_request_sample(reader, stream); @@ -1021,7 +1019,7 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb LeaveCriticalSection(&stream->cs); - if (!request_sample) + if (report_sample) IMFSourceReaderCallback_OnReadSample(reader->async_callback, status, stream_index, stream_flags, timestamp, sample); @@ -1532,7 +1530,6 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind unsigned int actual_index_tmp; struct media_stream *stream; LONGLONG timestamp_tmp; - BOOL request_sample; DWORD stream_index; HRESULT hr = S_OK; @@ -1563,10 +1560,8 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind if (SUCCEEDED(hr = source_reader_start_source(reader))) { - request_sample = source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, - timestamp, sample); - - if (request_sample) + if (!source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, + timestamp, sample)) { while (list_empty(&stream->responses) && stream->state != STREAM_STATE_EOS) {

1 0

Zebediah Figura : quartz/avidec: Use the strmbase_passthrough object directly.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: dd3fe639e34ddbd9ad3d74d360df3d6394785155 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd3fe639e34ddbd9ad3d74d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 28 12:02:03 2020 -0500 quartz/avidec: Use the strmbase_passthrough object directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 9756667906..8d38b89e99 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -43,7 +43,7 @@ typedef struct AVIDecImpl struct strmbase_source source; IQualityControl source_IQualityControl_iface; - IUnknown *seeking; + struct strmbase_passthrough passthrough; struct strmbase_sink sink; @@ -300,7 +300,7 @@ static HRESULT avi_decompressor_source_query_interface(struct strmbase_pin *ifac if (IsEqualGUID(iid, &IID_IQualityControl)) *out = &filter->source_IQualityControl_iface; else if (IsEqualGUID(iid, &IID_IMediaSeeking)) - return IUnknown_QueryInterface(filter->seeking, iid, out); + *out = &filter->passthrough.IMediaSeeking_iface; else return E_NOINTERFACE; @@ -548,10 +548,10 @@ static void avi_decompressor_destroy(struct strmbase_filter *iface) strmbase_sink_cleanup(&filter->sink); strmbase_source_cleanup(&filter->source); + strmbase_passthrough_cleanup(&filter->passthrough); filter->stream_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->stream_cs); - IUnknown_Release(filter->seeking); strmbase_filter_cleanup(&filter->filter); free(filter); @@ -603,8 +603,6 @@ static const struct strmbase_filter_ops filter_ops = HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) { AVIDecImpl *object; - ISeekingPassThru *passthrough; - HRESULT hr; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -618,21 +616,9 @@ HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); object->source_IQualityControl_iface.lpVtbl = &source_qc_vtbl; - - if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, - (IUnknown *)&object->source.pin.IPin_iface, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void **)&object->seeking))) - { - strmbase_sink_cleanup(&object->sink); - strmbase_source_cleanup(&object->source); - strmbase_filter_cleanup(&object->filter); - free(object); - return hr; - } - - IUnknown_QueryInterface(object->seeking, &IID_ISeekingPassThru, (void **)&passthrough); - ISeekingPassThru_Init(passthrough, FALSE, &object->sink.pin.IPin_iface); - ISeekingPassThru_Release(passthrough); + strmbase_passthrough_init(&object->passthrough, (IUnknown *)&object->source.pin.IPin_iface); + ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, + &object->sink.pin.IPin_iface); TRACE("Created AVI decompressor %p.\n", object); *out = &object->filter.IUnknown_inner;

1 0

Zebediah Figura : quartz/acmwrapper: Use the strmbase_passthrough object directly.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: f27030f1f682a0c003d8a9bdad31eed45c55e59a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f27030f1f682a0c003d8a9bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 28 12:02:04 2020 -0500 quartz/acmwrapper: Use the strmbase_passthrough object directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 7c511471ff..b116f98ef0 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -43,7 +43,7 @@ typedef struct ACMWrapperImpl struct strmbase_source source; IQualityControl source_IQualityControl_iface; IQualityControl *source_qc_sink; - IUnknown *seeking; + struct strmbase_passthrough passthrough; struct strmbase_sink sink; @@ -337,7 +337,7 @@ static HRESULT acm_wrapper_source_query_interface(struct strmbase_pin *iface, RE if (IsEqualGUID(iid, &IID_IQualityControl)) *out = &filter->source_IQualityControl_iface; else if (IsEqualGUID(iid, &IID_IMediaSeeking)) - return IUnknown_QueryInterface(filter->seeking, iid, out); + *out = &filter->passthrough.IMediaSeeking_iface; else return E_NOINTERFACE; @@ -486,11 +486,11 @@ static void acm_wrapper_destroy(struct strmbase_filter *iface) strmbase_sink_cleanup(&filter->sink); strmbase_source_cleanup(&filter->source); + strmbase_passthrough_cleanup(&filter->passthrough); filter->stream_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->stream_cs); FreeMediaType(&filter->mt); - IUnknown_Release(filter->seeking); strmbase_filter_cleanup(&filter->filter); free(filter); @@ -523,9 +523,7 @@ static const struct strmbase_filter_ops filter_ops = HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) { - ISeekingPassThru *passthrough; ACMWrapperImpl *object; - HRESULT hr; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -539,21 +537,9 @@ HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); object->source_IQualityControl_iface.lpVtbl = &source_qc_vtbl; - - if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, - (IUnknown *)&object->source.pin.IPin_iface, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void **)&object->seeking))) - { - strmbase_sink_cleanup(&object->sink); - strmbase_source_cleanup(&object->source); - strmbase_filter_cleanup(&object->filter); - free(object); - return hr; - } - - IUnknown_QueryInterface(object->seeking, &IID_ISeekingPassThru, (void **)&passthrough); - ISeekingPassThru_Init(passthrough, FALSE, &object->sink.pin.IPin_iface); - ISeekingPassThru_Release(passthrough); + strmbase_passthrough_init(&object->passthrough, (IUnknown *)&object->source.pin.IPin_iface); + ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, + &object->sink.pin.IPin_iface); object->lasttime_real = object->lasttime_sent = -1;

1 0

Zebediah Figura : qasf/dmowrapper: Use the strmbase_passthrough object directly.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: f55b78df5c99f6fa430b5f6343db7447426ed9b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f55b78df5c99f6fa430b5f63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 28 12:02:05 2020 -0500 qasf/dmowrapper: Use the strmbase_passthrough object directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/Makefile.in | 2 +- dlls/qasf/dmowrapper.c | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index c1d34a42da..dd02f5a344 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -1,5 +1,5 @@ MODULE = qasf.dll -IMPORTS = strmbase dmoguids strmiids uuid ole32 +IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index cba9023e13..e2d4063828 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -32,7 +32,7 @@ struct dmo_wrapper_source { struct strmbase_source pin; struct buffer buffer; - IUnknown *seeking; + struct strmbase_passthrough passthrough; }; struct dmo_wrapper @@ -405,10 +405,15 @@ static HRESULT dmo_wrapper_source_query_interface(struct strmbase_pin *iface, RE { struct dmo_wrapper_source *pin = impl_source_from_strmbase_pin(iface); - if (IsEqualGUID(iid, &IID_IMediaSeeking) || IsEqualGUID(iid, &IID_IMediaPosition)) - return IUnknown_QueryInterface(pin->seeking, iid, out); + if (IsEqualGUID(iid, &IID_IMediaPosition)) + *out = &pin->passthrough.IMediaPosition_iface; + else if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &pin->passthrough.IMediaSeeking_iface; + else + return E_NOINTERFACE; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static HRESULT dmo_wrapper_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) @@ -568,20 +573,13 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID for (i = 0; i < output_count; ++i) { - ISeekingPassThru *passthrough; - swprintf(id, ARRAY_SIZE(id), L"out%u", i); strmbase_source_init(&sources[i].pin, &filter->filter, id, &source_ops); sources[i].buffer.IMediaBuffer_iface.lpVtbl = &buffer_vtbl; - if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, - (IUnknown *)&sources[i].pin.pin.IPin_iface, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void **)&sources[i].seeking))) - ERR("Failed to create SeekingPassThru object, hr %#x.\n", hr); - - IUnknown_QueryInterface(sources[i].seeking, &IID_ISeekingPassThru, (void **)&passthrough); - ISeekingPassThru_Init(passthrough, FALSE, &sinks[0].pin.IPin_iface); - ISeekingPassThru_Release(passthrough); + strmbase_passthrough_init(&sources[i].passthrough, (IUnknown *)&sources[i].pin.pin.IPin_iface); + ISeekingPassThru_Init(&sources[i].passthrough.ISeekingPassThru_iface, + FALSE, &sinks[0].pin.IPin_iface); } EnterCriticalSection(&filter->filter.csFilter); @@ -630,7 +628,7 @@ static void dmo_wrapper_destroy(struct strmbase_filter *iface) strmbase_sink_cleanup(&filter->sinks[i]); for (i = 0; i < filter->source_count; ++i) { - IUnknown_Release(filter->sources[i].seeking); + strmbase_passthrough_cleanup(&filter->sources[i].passthrough); strmbase_source_cleanup(&filter->sources[i].pin); } free(filter->sinks);

1 0

Zebediah Figura : qedit/samplegrabber: Use the strmbase_passthrough object directly.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 9829385c3881b67bc2eb1ac32afa56c8d532b07e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9829385c3881b67bc2eb1ac3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 28 12:02:06 2020 -0500 qedit/samplegrabber: Use the strmbase_passthrough object directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 7e29154762..afb48bf84d 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -39,8 +39,7 @@ typedef struct _SG_Impl { ISampleGrabber ISampleGrabber_iface; struct strmbase_source source; - /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ - IUnknown *seekthru_unk; + struct strmbase_passthrough passthrough; struct strmbase_sink sink; AM_MEDIA_TYPE filter_mt; @@ -86,8 +85,6 @@ static void SampleGrabber_cleanup(SG_Impl *This) ISampleGrabberCB_Release(This->grabberIface); FreeMediaType(&This->filter_mt); CoTaskMemFree(This->bufferData); - if(This->seekthru_unk) - IUnknown_Release(This->seekthru_unk); } static struct strmbase_pin *sample_grabber_get_pin(struct strmbase_filter *iface, unsigned int index) @@ -108,6 +105,7 @@ static void sample_grabber_destroy(struct strmbase_filter *iface) SampleGrabber_cleanup(filter); strmbase_sink_cleanup(&filter->sink); strmbase_source_cleanup(&filter->source); + strmbase_passthrough_cleanup(&filter->passthrough); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); } @@ -550,10 +548,15 @@ static HRESULT sample_grabber_source_query_interface(struct strmbase_pin *iface, { SG_Impl *filter = impl_from_source_pin(iface); - if (IsEqualGUID(iid, &IID_IMediaPosition) || IsEqualGUID(iid, &IID_IMediaSeeking)) - return IUnknown_QueryInterface(filter->seekthru_unk, iid, out); + if (IsEqualGUID(iid, &IID_IMediaPosition)) + *out = &filter->passthrough.IMediaPosition_iface; + else if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &filter->passthrough.IMediaSeeking_iface; else return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static HRESULT sample_grabber_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) @@ -637,8 +640,6 @@ static const struct strmbase_source_ops source_ops = HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out) { SG_Impl* obj = NULL; - ISeekingPassThru *passthru; - HRESULT hr; obj = CoTaskMemAlloc(sizeof(SG_Impl)); if (NULL == obj) { @@ -652,7 +653,10 @@ HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out) obj->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; strmbase_sink_init(&obj->sink, &obj->filter, L"In", &sink_ops, NULL); + strmbase_source_init(&obj->source, &obj->filter, L"Out", &source_ops); + strmbase_passthrough_init(&obj->passthrough, (IUnknown *)&obj->source.pin.IPin_iface); + ISeekingPassThru_Init(&obj->passthrough.ISeekingPassThru_iface, FALSE, &obj->sink.pin.IPin_iface); obj->allocator = NULL; obj->grabberIface = NULL; @@ -661,14 +665,6 @@ HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out) obj->bufferLen = -1; obj->bufferData = NULL; - hr = CoCreateInstance(&CLSID_SeekingPassThru, &obj->filter.IUnknown_inner, - CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&obj->seekthru_unk); - if(hr) - return hr; - IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, &obj->sink.pin.IPin_iface); - ISeekingPassThru_Release(passthru); - *out = &obj->filter.IUnknown_inner; return S_OK; }

1 0

Zebediah Figura : strmbase: Return void from strmbase_renderer_init().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 0777941eaf31d780e59ba244eabf0d1f4cbf8eef URL: https://source.winehq.org/git/wine.git/?a=commit;h=0777941eaf31d780e59ba244… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 28 12:02:07 2020 -0500 strmbase: Return void from strmbase_renderer_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 9 ++------- dlls/quartz/dsoundrender.c | 8 ++------ dlls/quartz/videorenderer.c | 5 +---- dlls/quartz/vmr9.c | 4 +--- dlls/strmbase/renderer.c | 4 +--- include/wine/strmbase.h | 2 +- 6 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index cbebadfd18..9f29ab7828 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -64,20 +64,15 @@ static const struct strmbase_renderer_ops renderer_ops = HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) { - HRESULT hr; NullRendererImpl *pNullRenderer; *out = NULL; pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl)); - hr = strmbase_renderer_init(&pNullRenderer->renderer, outer, + strmbase_renderer_init(&pNullRenderer->renderer, outer, &CLSID_NullRenderer, L"In", &renderer_ops); - if (FAILED(hr)) - CoTaskMemFree(pNullRenderer); - else - *out = &pNullRenderer->renderer.filter.IUnknown_inner; - + *out = &pNullRenderer->renderer.filter.IUnknown_inner; return S_OK; } diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 64743b97ec..e4a39239e5 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -825,12 +825,8 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; memset(object, 0, sizeof(*object)); - if (FAILED(hr = strmbase_renderer_init(&object->renderer, outer, - &CLSID_DSoundRender, L"Audio Input pin (rendered)", &renderer_ops))) - { - CoTaskMemFree(object); - return hr; - } + strmbase_renderer_init(&object->renderer, outer, + &CLSID_DSoundRender, L"Audio Input pin (rendered)", &renderer_ops); if (FAILED(hr = system_clock_create(&object->renderer.filter.IUnknown_inner, &object->system_clock))) { diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 37227bfa21..9301e8d769 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -716,12 +716,9 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) pVideoRenderer->IOverlay_iface.lpVtbl = &overlay_vtbl; - hr = strmbase_renderer_init(&pVideoRenderer->renderer, outer, + strmbase_renderer_init(&pVideoRenderer->renderer, outer, &CLSID_VideoRenderer, L"In", &renderer_ops); - if (FAILED(hr)) - goto fail; - hr = video_window_init(&pVideoRenderer->baseControlWindow, &IVideoWindow_VTable, &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin, &renderer_BaseWindowFuncTable); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b2217547cd..c44607b3ef 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2326,9 +2326,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) pVMR->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; pVMR->IOverlay_iface.lpVtbl = &overlay_vtbl; - hr = strmbase_renderer_init(&pVMR->renderer, outer, clsid, L"VMR Input0", &renderer_ops); - if (FAILED(hr)) - goto fail; + strmbase_renderer_init(&pVMR->renderer, outer, clsid, L"VMR Input0", &renderer_ops); hr = video_window_init(&pVMR->baseControlWindow, &IVideoWindow_VTable, &pVMR->renderer.filter, &pVMR->renderer.sink.pin, &renderer_BaseWindowFuncTable); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 57e0d2041c..fd999d3ae9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -388,7 +388,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa return hr; } -HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, +void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops) { memset(filter, 0, sizeof(*filter)); @@ -408,6 +408,4 @@ HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown QualityControlImpl_Create(&filter->sink.pin, &filter->qcimpl); filter->qcimpl->IQualityControl_iface.lpVtbl = &Renderer_QualityControl_Vtbl; - - return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 732ba1be26..6789957e50 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -327,6 +327,6 @@ struct strmbase_renderer_ops HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample); -HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, +void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops); void strmbase_renderer_cleanup(struct strmbase_renderer *filter);

1 0