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

Nikolay Sivov : mf: Shutdown SAR sink on ShutdownObject().
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 693bdc63d40321dcb8ddd5a1fdedd717e7fcbb1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=693bdc63d40321dcb8ddd5a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 16:32:12 2020 +0300 mf: Shutdown SAR sink on ShutdownObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 8 +++++++- dlls/mf/tests/mf.c | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 86a0c2f36e..bb3eba7eee 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1569,7 +1569,13 @@ failed: static void sar_shutdown_object(void *user_context, IUnknown *obj) { - /* FIXME: shut down sink */ + IMFMediaSink *sink; + + if (SUCCEEDED(IUnknown_QueryInterface(obj, &IID_IMFMediaSink, (void **)&sink))) + { + IMFMediaSink_Shutdown(sink); + IMFMediaSink_Release(sink); + } } static void sar_free_private(void *user_context) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 62e70954f0..bf62f62f72 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3079,7 +3079,6 @@ todo_wine ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); hr = IMFMediaSink_GetCharacteristics(sink, &flags); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); IMFMediaSink_Release(sink);

1 0

Nikolay Sivov : mf: Merge sample grabber sink and stream instances.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: a0035b848ee01fe76178089adf0a8d9067c34a72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0035b848ee01fe76178089a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 16:32:13 2020 +0300 mf: Merge sample grabber sink and stream instances. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 371 ++++++++++++++++++++---------------------------- dlls/mf/tests/mf.c | 3 - 2 files changed, 156 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0035b848ee01fe76178…

1 0

Nikolay Sivov : mf: Release presentation clock on sample grabber shutdown.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: e49c550bdc76a0418f60a9adddb324a61743b8d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e49c550bdc76a0418f60a9ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 16:32:14 2020 +0300 mf: Release presentation clock on sample grabber shutdown. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 48 +++++++++++++++++++++++++++--------------------- dlls/mf/tests/mf.c | 5 +++-- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index bd5859d4f4..1919ce6220 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -956,6 +956,31 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkById(IMFMediaSink *iface, return hr; } +static void sample_grabber_set_presentation_clock(struct sample_grabber *grabber, IMFPresentationClock *clock) +{ + if (grabber->clock) + { + IMFPresentationClock_RemoveClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); + IMFPresentationClock_Release(grabber->clock); + if (grabber->timer) + { + IMFTimer_Release(grabber->timer); + grabber->timer = NULL; + } + } + grabber->clock = clock; + if (grabber->clock) + { + IMFPresentationClock_AddRef(grabber->clock); + IMFPresentationClock_AddClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); + if (FAILED(IMFPresentationClock_QueryInterface(grabber->clock, &IID_IMFTimer, (void **)&grabber->timer))) + { + WARN("Failed to get IMFTimer interface.\n"); + grabber->timer = NULL; + } + } +} + static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) { struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); @@ -968,27 +993,7 @@ static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *ifa if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(sample_grabber_get_callback(grabber), clock))) { - if (grabber->clock) - { - IMFPresentationClock_RemoveClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); - IMFPresentationClock_Release(grabber->clock); - if (grabber->timer) - { - IMFTimer_Release(grabber->timer); - grabber->timer = NULL; - } - } - grabber->clock = clock; - if (grabber->clock) - { - IMFPresentationClock_AddRef(grabber->clock); - IMFPresentationClock_AddClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); - if (FAILED(IMFPresentationClock_QueryInterface(grabber->clock, &IID_IMFTimer, (void **)&grabber->timer))) - { - WARN("Failed to get IMFTimer interface.\n"); - grabber->timer = NULL; - } - } + sample_grabber_set_presentation_clock(grabber, clock); } LeaveCriticalSection(&grabber->cs); @@ -1035,6 +1040,7 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) grabber->is_shut_down = TRUE; if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { + sample_grabber_set_presentation_clock(grabber, NULL); IMFMediaEventQueue_Shutdown(grabber->stream_event_queue); IMFMediaEventQueue_Shutdown(grabber->event_queue); } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 9e6b45e2f6..ae9f58a4bc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2102,8 +2102,6 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); IMFPresentationTimeSource_Release(time_source); - IMFPresentationClock_Release(clock); - hr = IMFMediaSink_GetCharacteristics(sink, &flags); ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); @@ -2221,8 +2219,10 @@ static void test_sample_grabber(void) hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); + EXPECT_REF(clock, 3); hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + EXPECT_REF(clock, 1); hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -2355,6 +2355,7 @@ static void test_sample_grabber(void) IMFActivate_Release(activate); IMFMediaType_Release(media_type); + IMFPresentationClock_Release(clock); hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Alex Henrie : kernelbase: Stub LoadAppInitDlls().
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 22cdc4e3da29578bdbf0d537e968217af87b720b URL: https://source.winehq.org/git/wine.git/?a=commit;h=22cdc4e3da29578bdbf0d537… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Apr 16 23:54:50 2020 -0600 kernelbase: Stub LoadAppInitDlls(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47061 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-appinit-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/loader.c | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec b/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec index 7ace09e92c..e8f2acefad 100644 --- a/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec +++ b/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec @@ -1 +1 @@ -@ stub LoadAppInitDlls +@ stdcall LoadAppInitDlls() kernel32.LoadAppInitDlls diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 01bfdd37f1..86575c2b99 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1044,7 +1044,7 @@ @ stdcall LZStart() @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection @ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) ntdll.TpCallbackLeaveCriticalSectionOnCompletion -# @ stub LoadAppInitDlls +@ stdcall -import LoadAppInitDlls() @ stdcall -import LoadLibraryA(str) @ stdcall -import LoadLibraryExA( str long long) @ stdcall -import LoadLibraryExW(wstr long long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 631e5c02c7..fe687c132c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -920,7 +920,7 @@ # @ stub LeaveCriticalPolicySectionInternal @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection @ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) ntdll.TpCallbackLeaveCriticalSectionOnCompletion -# @ stub LoadAppInitDlls +@ stdcall LoadAppInitDlls() # @ stub LoadEnclaveData @ stdcall LoadLibraryA(str) @ stdcall LoadLibraryExA( str long long) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 59b775b844..19aaabf726 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -544,6 +544,15 @@ HMODULE WINAPI /* DECLSPEC_HOTPATCH */ LoadPackagedLibrary( LPCWSTR name, DWORD } +/*********************************************************************** + * LoadAppInitDlls (kernelbase.@) + */ +void WINAPI LoadAppInitDlls(void) +{ + TRACE( "\n" ); +} + + /**************************************************************************** * RemoveDllDirectory (kernelbase.@) */

1 0

Zebediah Figura : strmbase: Make the pin_get_media_type() callback optional.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 38f5f364629650cba3ee90f326c2bb4f1c0f19c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38f5f364629650cba3ee90f3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 20:29:33 2020 -0500 strmbase: Make the pin_get_media_type() callback optional. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 36 ++++++++++++++++++++++++++---------- dlls/strmbase/renderer.c | 1 - 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4676c9d82b..d9d25f7627 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -57,10 +57,13 @@ static HRESULT enum_media_types_create(struct strmbase_pin *pin, IEnumMediaTypes object->pin = pin; IPin_AddRef(&pin->IPin_iface); - while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK) + if (pin->ops->pin_get_media_type) { - FreeMediaType(&mt); - ++object->count; + while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK) + { + FreeMediaType(&mt); + ++object->count; + } } TRACE("Created enumerator %p.\n", object); @@ -121,6 +124,13 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, TRACE("enummt %p, count %u, mts %p, ret_count %p.\n", enummt, count, mts, ret_count); + if (!enummt->pin->ops->pin_get_media_type) + { + if (ret_count) + *ret_count = 0; + return count ? S_FALSE : S_OK; + } + for (i = 0; i < count; ++i) { if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) @@ -169,10 +179,13 @@ static HRESULT WINAPI enum_media_types_Reset(IEnumMediaTypes *iface) TRACE("enummt %p.\n", enummt); enummt->count = 0; - while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) + if (enummt->pin->ops->pin_get_media_type) { - FreeMediaType(&mt); - ++enummt->count; + while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) + { + FreeMediaType(&mt); + ++enummt->count; + } } enummt->index = 0; @@ -397,10 +410,13 @@ static HRESULT WINAPI pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_med TRACE("pin %p %s:%s, enum_media_types %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), enum_media_types); - if (FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt))) - return hr; - if (hr == S_OK) - FreeMediaType(&mt); + if (pin->ops->pin_get_media_type) + { + if (FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt))) + return hr; + if (hr == S_OK) + FreeMediaType(&mt); + } return enum_media_types_create(pin, enum_media_types); } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index fd999d3ae9..f1e74f6476 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -257,7 +257,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_query_interface = sink_query_interface, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = BaseRenderer_Receive, .sink_connect = sink_connect, .sink_disconnect = sink_disconnect,

1 0

Zebediah Figura : strmbase: Make the pin_query_accept() callback optional.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: a0251e33543df35d373eaf8b9d35cdbae91a9413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0251e33543df35d373eaf8b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 20:29:34 2020 -0500 strmbase: Make the pin_query_accept() callback optional. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index d9d25f7627..b5f8092e9e 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -391,6 +391,13 @@ static HRESULT WINAPI pin_QueryId(IPin *iface, WCHAR **id) return S_OK; } +static BOOL query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) +{ + if (pin->ops->pin_query_accept && pin->ops->pin_query_accept(pin, mt) != S_OK) + return FALSE; + return TRUE; +} + static HRESULT WINAPI pin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) { struct strmbase_pin *pin = impl_from_IPin(iface); @@ -398,7 +405,7 @@ static HRESULT WINAPI pin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) TRACE("pin %p %s:%s, mt %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), mt); strmbase_dump_media_type(mt); - return (pin->ops->pin_query_accept(pin, mt) == S_OK ? S_OK : S_FALSE); + return query_accept(pin, mt) ? S_OK : S_FALSE; } static HRESULT WINAPI pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) @@ -763,7 +770,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *This, TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); - if (This->pFuncsTable->base.pin_query_accept(&This->pin, pmt) != S_OK) + if (!query_accept(&This->pin, pmt)) return VFW_E_TYPE_NOT_ACCEPTED; This->pin.peer = pReceivePin; @@ -871,7 +878,7 @@ static HRESULT WINAPI sink_ReceiveConnection(IPin *iface, IPin *pReceivePin, con if (This->pin.peer) hr = VFW_E_ALREADY_CONNECTED; - if (SUCCEEDED(hr) && This->pin.ops->pin_query_accept(&This->pin, pmt) != S_OK) + if (SUCCEEDED(hr) && !query_accept(&This->pin, pmt)) hr = VFW_E_TYPE_NOT_ACCEPTED; /* FIXME: shouldn't we just map common errors onto * VFW_E_TYPE_NOT_ACCEPTED and pass the value on otherwise? */

1 0

Zebediah Figura : qcap/tests: Remove some no longer necessary callbacks.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: f88567ac15b1b5b39442f93f06933659bd8bb537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f88567ac15b1b5b39442f93f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 20:29:35 2020 -0500 qcap/tests: Remove some no longer necessary callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/capturegraph.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/qcap/tests/capturegraph.c b/dlls/qcap/tests/capturegraph.c index 49b4f8c6b9..c37ac51573 100644 --- a/dlls/qcap/tests/capturegraph.c +++ b/dlls/qcap/tests/capturegraph.c @@ -194,11 +194,6 @@ static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid return S_OK; } -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT testsource_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { struct testfilter *filter = impl_from_strmbase_filter(iface->filter); @@ -222,7 +217,6 @@ static HRESULT WINAPI testsource_DecideBufferSize(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { .base.pin_query_interface = testsource_query_interface, - .base.pin_query_accept = testsource_query_accept, .base.pin_get_media_type = testsource_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, @@ -264,7 +258,6 @@ static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, .base.pin_query_accept = testsink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, }; static void reset_interfaces(struct testfilter *filter)

1 0

Zebediah Figura : qcap: Add a stub file writer filter.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 191e60c0da2901c5e80dd2bae6f6b9275be08cea URL: https://source.winehq.org/git/wine.git/?a=commit;h=191e60c0da2901c5e80dd2ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 20:29:36 2020 -0500 qcap: Add a stub file writer filter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40820 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 1 + dlls/qcap/filewriter.c | 68 ++++++++++++++++ dlls/qcap/qcap_classes.idl | 6 ++ dlls/qcap/qcap_main.c | 3 + dlls/qcap/qcap_main.h | 1 + dlls/qcap/tests/Makefile.in | 1 + dlls/qcap/tests/filewriter.c | 186 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 266 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=191e60c0da2901c5e80d…

1 0

Zebediah Figura : qcap/filewriter: Add a stub sink pin.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 18502ed9c60a1836a27134070e0f1fb2ee80ea09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18502ed9c60a1836a2713407… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 20:29:37 2020 -0500 qcap/filewriter: Add a stub sink pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 34 ++++++++ dlls/qcap/tests/filewriter.c | 179 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 212 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 0b7c1109e5..2b1d219a08 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include "dshow.h" #include "qcap_main.h" #include "wine/debug.h" @@ -27,6 +28,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); struct file_writer { struct strmbase_filter filter; + + struct strmbase_sink sink; +}; + +static inline struct file_writer *impl_from_strmbase_pin(struct strmbase_pin *iface) +{ + return CONTAINING_RECORD(iface, struct file_writer, sink.pin); +} + +static HRESULT file_writer_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct file_writer *filter = impl_from_strmbase_pin(iface); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static const struct strmbase_sink_ops sink_ops = +{ + .base.pin_query_interface = file_writer_sink_query_interface, }; static inline struct file_writer *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -36,6 +62,10 @@ static inline struct file_writer *impl_from_strmbase_filter(struct strmbase_filt static struct strmbase_pin *file_writer_get_pin(struct strmbase_filter *iface, unsigned int index) { + struct file_writer *filter = impl_from_strmbase_filter(iface); + + if (!index) + return &filter->sink.pin; return NULL; } @@ -43,6 +73,7 @@ static void file_writer_destroy(struct strmbase_filter *iface) { struct file_writer *filter = impl_from_strmbase_filter(iface); + strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); heap_free(filter); } @@ -55,6 +86,7 @@ static struct strmbase_filter_ops filter_ops = HRESULT file_writer_create(IUnknown *outer, IUnknown **out) { + static const WCHAR sink_name[] = {'i','n',0}; struct file_writer *object; if (!(object = heap_alloc_zero(sizeof(*object)))) @@ -62,6 +94,8 @@ HRESULT file_writer_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_FileWriter, &filter_ops); + strmbase_sink_init(&object->sink, &object->filter, sink_name, &sink_ops, NULL); + TRACE("Created file writer %p.\n", object); *out = &object->filter.IUnknown_inner; return S_OK; diff --git a/dlls/qcap/tests/filewriter.c b/dlls/qcap/tests/filewriter.c index 9302b07468..8201a4d0c7 100644 --- a/dlls/qcap/tests/filewriter.c +++ b/dlls/qcap/tests/filewriter.c @@ -56,6 +56,8 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_file_writer(); + ULONG ref; + IPin *pin; todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); @@ -78,7 +80,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); - IBaseFilter_Release(filter); + IBaseFilter_FindPin(filter, L"in", &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got unexpected refcount %d.\n", ref); } static const GUID test_iid = {0x33333333}; @@ -175,12 +190,174 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_file_writer(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[2]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_find_pin(void) +{ + IBaseFilter *filter = create_file_writer(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, L"in", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_pin_info(void) +{ + IBaseFilter *filter = create_file_writer(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, L"in", &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"in"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!wcscmp(id, L"in"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(filewriter) { CoInitializeEx(NULL, COINIT_MULTITHREADED); test_interfaces(); test_aggregation(); + test_enum_pins(); + test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Anton Baskanov : amstream: Store parent as struct audio_stream in audio stream sample.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: e7f0917665531d016d9b17cec89d8b59d6723def URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7f0917665531d016d9b17ce… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 22 02:30:06 2020 +0700 amstream: Store parent as struct audio_stream in audio stream sample. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 4e34b2549e..90c177d177 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -27,10 +27,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static const WCHAR sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; +struct audio_stream +{ + IAMMediaStream IAMMediaStream_iface; + IAudioMediaStream IAudioMediaStream_iface; + IMemInputPin IMemInputPin_iface; + IPin IPin_iface; + LONG ref; + + IMultiMediaStream* parent; + MSPID purpose_id; + STREAM_TYPE stream_type; + CRITICAL_SECTION cs; + IMediaStreamFilter *filter; + + IPin *peer; + IMemAllocator *allocator; + AM_MEDIA_TYPE mt; + WAVEFORMATEX format; + FILTER_STATE state; +}; + typedef struct { IAudioStreamSample IAudioStreamSample_iface; LONG ref; - IMediaStream *parent; + struct audio_stream *parent; IAudioData *audio_data; } IAudioStreamSampleImpl; @@ -146,7 +167,7 @@ static const struct IAudioStreamSampleVtbl AudioStreamSample_Vtbl = IAudioStreamSampleImpl_GetAudioData }; -static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample) +static HRESULT audiostreamsample_create(struct audio_stream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample) { IAudioStreamSampleImpl *object; @@ -158,7 +179,7 @@ static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *a object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; object->ref = 1; - object->parent = (IMediaStream*)parent; + object->parent = parent; object->audio_data = audio_data; *audio_stream_sample = &object->IAudioStreamSample_iface; @@ -166,27 +187,6 @@ static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *a return S_OK; } -struct audio_stream -{ - IAMMediaStream IAMMediaStream_iface; - IAudioMediaStream IAudioMediaStream_iface; - IMemInputPin IMemInputPin_iface; - IPin IPin_iface; - LONG ref; - - IMultiMediaStream* parent; - MSPID purpose_id; - STREAM_TYPE stream_type; - CRITICAL_SECTION cs; - IMediaStreamFilter *filter; - - IPin *peer; - IMemAllocator *allocator; - AM_MEDIA_TYPE mt; - WAVEFORMATEX format; - FILTER_STATE state; -}; - static inline struct audio_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) { return CONTAINING_RECORD(iface, struct audio_stream, IAMMediaStream_iface); @@ -565,7 +565,7 @@ static HRESULT WINAPI audio_IAudioMediaStream_CreateSample(IAudioMediaStream *if if (!audio_data) return E_POINTER; - return audiostreamsample_create(iface, audio_data, sample); + return audiostreamsample_create(This, audio_data, sample); } static const struct IAudioMediaStreamVtbl audio_IAudioMediaStream_vtbl =

1 0