wine-commits August 2023

wine-commits@winehq.org

1 participants
667 discussions

Mohamad Al-Jaf : windows.devices.enumeration/tests: Add IDeviceInformationStatics::CreateWatcherAqsFilter() tests.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 8a31ad6b221bffd753e64c975e3df362961e8ad1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a31ad6b221bffd753e64c975e3df3… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Aug 1 23:42:35 2023 -0400 windows.devices.enumeration/tests: Add IDeviceInformationStatics::CreateWatcherAqsFilter() tests. --- dlls/windows.devices.enumeration/tests/devices.c | 41 ++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/windows.devices.enumeration/tests/devices.c b/dlls/windows.devices.enumeration/tests/devices.c index 833b8835842..ae76e5d754a 100644 --- a/dlls/windows.devices.enumeration/tests/devices.c +++ b/dlls/windows.devices.enumeration/tests/devices.c @@ -232,6 +232,47 @@ static void test_DeviceInformation( void ) goto skip_device_statics; } + IDeviceInformationStatics_CreateWatcherAqsFilter( device_info_statics, NULL, &device_watcher ); + ok( hr == S_OK, "got hr %#lx\n", hr ); + + check_interface( device_watcher, &IID_IUnknown, TRUE ); + check_interface( device_watcher, &IID_IInspectable, TRUE ); + check_interface( device_watcher, &IID_IAgileObject, TRUE ); + check_interface( device_watcher, &IID_IDeviceWatcher, TRUE ); + + hr = IDeviceWatcher_add_Added( + device_watcher, + (ITypedEventHandler_DeviceWatcher_DeviceInformation *)&added_handler.ITypedEventHandler_DeviceWatcher_IInspectable_iface, + &added_token ); + ok( hr == S_OK, "got hr %#lx\n", hr ); + hr = IDeviceWatcher_add_Stopped( + device_watcher, &stopped_handler.ITypedEventHandler_DeviceWatcher_IInspectable_iface, + &stopped_token ); + ok( hr == S_OK, "got hr %#lx\n", hr ); + + hr = IDeviceWatcher_get_Status( device_watcher, &status ); + todo_wine ok( hr == S_OK, "got hr %#lx\n", hr ); + todo_wine ok( status == DeviceWatcherStatus_Created, "got status %u\n", status ); + + hr = IDeviceWatcher_Start( device_watcher ); + ok( hr == S_OK, "got hr %#lx\n", hr ); + hr = IDeviceWatcher_get_Status( device_watcher, &status ); + todo_wine ok( hr == S_OK, "got hr %#lx\n", hr ); + todo_wine ok( status == DeviceWatcherStatus_Started, "got status %u\n", status ); + + ref = IDeviceWatcher_AddRef( device_watcher ); + ok( ref == 2, "got ref %lu\n", ref ); + hr = IDeviceWatcher_Stop( device_watcher ); + ok( hr == S_OK, "got hr %#lx\n", hr ); + ok( !WaitForSingleObject( stopped_handler.event, 1000 ), "wait for stopped_handler.event failed\n" ); + + hr = IDeviceWatcher_get_Status( device_watcher, &status ); + todo_wine ok( hr == S_OK, "got hr %#lx\n", hr ); + todo_wine ok( status == DeviceWatcherStatus_Stopped, "got status %u\n", status ); + ok( stopped_handler.invoked, "stopped_handler not invoked\n" ); + ok( stopped_handler.args == NULL, "stopped_handler not invoked\n" ); + + IDeviceWatcher_Release( device_watcher ); IDeviceInformationStatics_Release( device_info_statics ); skip_device_statics: IInspectable_Release( inspectable );

1 0

Mohamad Al-Jaf : windows.devices.enumeration: Implement IDeviceInformationStatics::CreateWatcherAqsFilter().
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 586cc5ee35dad88c94c656957ffa97c881342657 URL: https://gitlab.winehq.org/wine/wine/-/commit/586cc5ee35dad88c94c656957ffa97… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Aug 1 23:41:39 2023 -0400 windows.devices.enumeration: Implement IDeviceInformationStatics::CreateWatcherAqsFilter(). Needed by Lenovo Ready For Assistant. --- dlls/windows.devices.enumeration/main.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c index 0d392e1cf14..e1f8b5c5ae5 100644 --- a/dlls/windows.devices.enumeration/main.c +++ b/dlls/windows.devices.enumeration/main.c @@ -31,6 +31,7 @@ struct device_watcher LONG ref; struct list stopped_handlers; + HSTRING filter; }; static inline struct device_watcher *impl_from_IDeviceWatcher( IDeviceWatcher *iface ) @@ -75,6 +76,7 @@ static ULONG WINAPI device_watcher_Release( IDeviceWatcher *iface ) if (!ref) { typed_event_handlers_clear( &impl->stopped_handlers ); + WindowsDeleteString( impl->filter ); free( impl ); } @@ -374,8 +376,20 @@ static HRESULT WINAPI device_statics_CreateWatcherDeviceClass( IDeviceInformatio static HRESULT WINAPI device_statics_CreateWatcherAqsFilter( IDeviceInformationStatics *iface, HSTRING filter, IDeviceWatcher **watcher ) { - FIXME( "iface %p, filter %s, watcher %p stub!\n", iface, debugstr_hstring(filter), watcher ); - return E_NOTIMPL; + struct device_watcher *this; + + TRACE( "iface %p, filter %s, watcher %p\n", iface, debugstr_hstring(filter), watcher ); + + if (!(this = calloc( 1, sizeof(*this) ))) return E_OUTOFMEMORY; + + this->IDeviceWatcher_iface.lpVtbl = &device_watcher_vtbl; + this->ref = 1; + WindowsDuplicateString( filter, &this->filter ); + + list_init( &this->stopped_handlers ); + + *watcher = &this->IDeviceWatcher_iface; + return S_OK; } static HRESULT WINAPI device_statics_CreateWatcherAqsFilterAndAdditionalProperties( IDeviceInformationStatics *iface, HSTRING filter, @@ -448,6 +462,7 @@ static HRESULT WINAPI device_statics2_CreateWatcher( IDeviceInformationStatics2 this->IDeviceWatcher_iface.lpVtbl = &device_watcher_vtbl; this->ref = 1; + WindowsDuplicateString( filter, &this->filter ); list_init( &this->stopped_handlers );

1 0

Mohamad Al-Jaf : windows.devices.enumeration: Add IDeviceInformationStatics stub interface.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: cf7048d63c2b6490503cfe81232a223938e09f26 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf7048d63c2b6490503cfe81232a22… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Aug 1 23:11:44 2023 -0400 windows.devices.enumeration: Add IDeviceInformationStatics stub interface. --- dlls/windows.devices.enumeration/main.c | 101 +++++++++++++++++++++++ dlls/windows.devices.enumeration/tests/devices.c | 14 +++- 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c index c87240df2db..0d392e1cf14 100644 --- a/dlls/windows.devices.enumeration/main.c +++ b/dlls/windows.devices.enumeration/main.c @@ -220,6 +220,7 @@ static const struct IDeviceWatcherVtbl device_watcher_vtbl = struct device_information_statics { IActivationFactory IActivationFactory_iface; + IDeviceInformationStatics IDeviceInformationStatics_iface; IDeviceInformationStatics2 IDeviceInformationStatics2_iface; LONG ref; }; @@ -243,6 +244,12 @@ static HRESULT WINAPI activation_factory_QueryInterface( IActivationFactory *ifa return S_OK; } + if (IsEqualGUID( iid, &IID_IDeviceInformationStatics )) + { + IInspectable_AddRef( (*out = &impl->IDeviceInformationStatics_iface) ); + return S_OK; + } + if (IsEqualGUID( iid, &IID_IDeviceInformationStatics2 )) { IInspectable_AddRef( (*out = &impl->IDeviceInformationStatics2_iface) ); @@ -307,6 +314,99 @@ static const struct IActivationFactoryVtbl activation_factory_vtbl = activation_factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( device_statics, IDeviceInformationStatics, struct device_information_statics, IActivationFactory_iface ); + +static HRESULT WINAPI device_statics_CreateFromIdAsync( IDeviceInformationStatics *iface, HSTRING id, + IAsyncOperation_DeviceInformation **op ) +{ + FIXME( "iface %p, id %s, op %p stub!\n", iface, debugstr_hstring(id), op ); + return E_NOTIMPL; +} + +static HRESULT WINAPI device_statics_CreateFromIdAsyncAdditionalProperties( IDeviceInformationStatics *iface, HSTRING id, + IIterable_HSTRING *additional_properties, + IAsyncOperation_DeviceInformation **op ) +{ + FIXME( "iface %p, id %s, additional_properties %p, op %p stub!\n", iface, debugstr_hstring(id), additional_properties, op ); + return E_NOTIMPL; +} + +static HRESULT WINAPI device_statics_FindAllAsync( IDeviceInformationStatics *iface, + IAsyncOperation_DeviceInformationCollection **op ) +{ + FIXME( "iface %p, op %p stub!\n", iface, op ); + return E_NOTIMPL; +} + +static HRESULT WINAPI device_statics_FindAllAsyncDeviceClass( IDeviceInformationStatics *iface, DeviceClass class, + IAsyncOperation_DeviceInformationCollection **op ) +{ + FIXME( "iface %p, class %d, op %p stub!\n", iface, class, op ); + return E_NOTIMPL; +} + +static HRESULT WINAPI device_statics_FindAllAsyncAqsFilter( IDeviceInformationStatics *iface, HSTRING filter, + IAsyncOperation_DeviceInformationCollection **op ) +{ + FIXME( "iface %p, aqs %p, op %p stub!\n", iface, debugstr_hstring(filter), op ); + return E_NOTIMPL; +} + +static HRESULT WINAPI device_statics_FindAllAsyncAqsFilterAndAdditionalProperties( IDeviceInformationStatics *iface, HSTRING filter, + IIterable_HSTRING *additional_properties, + IAsyncOperation_DeviceInformationCollection **op ) +{ + FIXME( "iface %p, aqs %p, additional_properties %p, op %p stub!\n", iface, debugstr_hstring(filter), additional_properties, op ); + return E_NOTIMPL; +} + +static HRESULT WINAPI device_statics_CreateWatcher( IDeviceInformationStatics *iface, IDeviceWatcher **watcher ) +{ + FIXME( "iface %p, watcher %p stub!\n", iface, watcher ); + return E_NOTIMPL; +} + +static HRESULT WINAPI device_statics_CreateWatcherDeviceClass( IDeviceInformationStatics *iface, DeviceClass class, IDeviceWatcher **watcher ) +{ + FIXME( "iface %p, class %d, watcher %p stub!\n", iface, class, watcher ); + return E_NOTIMPL; +} + +static HRESULT WINAPI device_statics_CreateWatcherAqsFilter( IDeviceInformationStatics *iface, HSTRING filter, IDeviceWatcher **watcher ) +{ + FIXME( "iface %p, filter %s, watcher %p stub!\n", iface, debugstr_hstring(filter), watcher ); + return E_NOTIMPL; +} + +static HRESULT WINAPI device_statics_CreateWatcherAqsFilterAndAdditionalProperties( IDeviceInformationStatics *iface, HSTRING filter, + IIterable_HSTRING *additional_properties, IDeviceWatcher **watcher ) +{ + FIXME( "iface %p, aqs %p, additional_properties %p, watcher %p stub!\n", iface, debugstr_hstring(filter), additional_properties, watcher ); + return E_NOTIMPL; +} + +static const struct IDeviceInformationStaticsVtbl device_statics_vtbl = +{ + device_statics_QueryInterface, + device_statics_AddRef, + device_statics_Release, + /* IInspectable methods */ + device_statics_GetIids, + device_statics_GetRuntimeClassName, + device_statics_GetTrustLevel, + /* IDeviceInformationStatics methods */ + device_statics_CreateFromIdAsync, + device_statics_CreateFromIdAsyncAdditionalProperties, + device_statics_FindAllAsync, + device_statics_FindAllAsyncDeviceClass, + device_statics_FindAllAsyncAqsFilter, + device_statics_FindAllAsyncAqsFilterAndAdditionalProperties, + device_statics_CreateWatcher, + device_statics_CreateWatcherDeviceClass, + device_statics_CreateWatcherAqsFilter, + device_statics_CreateWatcherAqsFilterAndAdditionalProperties, +}; + DEFINE_IINSPECTABLE( device_statics2, IDeviceInformationStatics2, struct device_information_statics, IActivationFactory_iface ); static HRESULT WINAPI device_statics2_GetAqsFilterFromDeviceClass( IDeviceInformationStatics2 *iface, DeviceClass device_class, @@ -374,6 +474,7 @@ static const struct IDeviceInformationStatics2Vtbl device_statics2_vtbl = static struct device_information_statics device_information_statics = { {&activation_factory_vtbl}, + {&device_statics_vtbl}, {&device_statics2_vtbl}, 1 }; diff --git a/dlls/windows.devices.enumeration/tests/devices.c b/dlls/windows.devices.enumeration/tests/devices.c index c65312ea800..833b8835842 100644 --- a/dlls/windows.devices.enumeration/tests/devices.c +++ b/dlls/windows.devices.enumeration/tests/devices.c @@ -144,6 +144,7 @@ static void test_DeviceInformation( void ) IInspectable *inspectable, *inspectable2; IActivationFactory *factory; IDeviceInformationStatics2 *device_info_statics2; + IDeviceInformationStatics *device_info_statics; IDeviceWatcher *device_watcher; DeviceWatcherStatus status = 0xdeadbeef; ULONG ref; @@ -174,7 +175,7 @@ static void test_DeviceInformation( void ) if (FAILED( hr )) { win_skip( "IDeviceInformationStatics2 not supported.\n" ); - goto skip_device_statics2; + goto skip_device_statics; } hr = IDeviceInformationStatics2_QueryInterface( device_info_statics2, &IID_IInspectable, (void **)&inspectable2 ); @@ -223,7 +224,16 @@ static void test_DeviceInformation( void ) IInspectable_Release( inspectable2 ); IDeviceInformationStatics2_Release( device_info_statics2 ); -skip_device_statics2: + hr = IActivationFactory_QueryInterface( factory, &IID_IDeviceInformationStatics, (void **)&device_info_statics ); + ok( hr == S_OK || broken( hr == E_NOINTERFACE ), "got hr %#lx\n", hr ); + if (FAILED( hr )) + { + win_skip( "IDeviceInformationStatics not supported.\n" ); + goto skip_device_statics; + } + + IDeviceInformationStatics_Release( device_info_statics ); +skip_device_statics: IInspectable_Release( inspectable ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %lu\n", ref );

1 0

Mohamad Al-Jaf : include: Add IDeviceInformationStatics interface definition.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: ebb0a399a5c005fc3569d44ff1ee572aee83d8f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebb0a399a5c005fc3569d44ff1ee57… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Aug 1 23:11:21 2023 -0400 include: Add IDeviceInformationStatics interface definition. --- include/windows.devices.enumeration.idl | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/windows.devices.enumeration.idl b/include/windows.devices.enumeration.idl index a88cb69edac..4f15ac811bc 100644 --- a/include/windows.devices.enumeration.idl +++ b/include/windows.devices.enumeration.idl @@ -192,6 +192,44 @@ namespace Windows.Devices.Enumeration { [propget] HRESULT Panel([out, retval] Windows.Devices.Enumeration.Panel *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Enumeration.DeviceInformation), + uuid(c17f100e-3a46-4a78-8013-769dc9b97390) + ] + interface IDeviceInformationStatics : IInspectable + { + [overload("CreateFromIdAsync")] + HRESULT CreateFromIdAsync([in] HSTRING id, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformation *> **op); + [overload("CreateFromIdAsync")] + HRESULT CreateFromIdAsyncAdditionalProperties([in] HSTRING id, + [in] Windows.Foundation.Collections.IIterable<HSTRING> *additional_properties, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformation *> **op); + [overload("FindAllAsync")] + HRESULT FindAllAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformationCollection *> **op); + [overload("FindAllAsync"), default_overload] + HRESULT FindAllAsyncDeviceClass([in] Windows.Devices.Enumeration.DeviceClass device_class, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformationCollection *> **op); + [overload("FindAllAsync")] + HRESULT FindAllAsyncAqsFilter([in] HSTRING filter, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformationCollection *> **op); + [overload("FindAllAsync")] + HRESULT FindAllAsyncAqsFilterAndAdditionalProperties([in] HSTRING filter, + [in] Windows.Foundation.Collections.IIterable<HSTRING> *additional_properties, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Devices.Enumeration.DeviceInformationCollection *> **op); + [overload("CreateWatcher")] + HRESULT CreateWatcher([out, retval] Windows.Devices.Enumeration.DeviceWatcher **watcher); + [overload("CreateWatcher"), default_overload] + HRESULT CreateWatcherDeviceClass([in] Windows.Devices.Enumeration.DeviceClass device_class, + [out, retval] Windows.Devices.Enumeration.DeviceWatcher **watcher); + [overload("CreateWatcher")] + HRESULT CreateWatcherAqsFilter([in] HSTRING filter, [out, retval] Windows.Devices.Enumeration.DeviceWatcher **watcher); + [overload("CreateWatcher")] + HRESULT CreateWatcherAqsFilterAndAdditionalProperties([in] HSTRING filter, + [in] Windows.Foundation.Collections.IIterable<HSTRING> *additional_properties, [out, retval] Windows.Devices.Enumeration.DeviceWatcher **watcher); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Devices.Enumeration.DeviceInformation),

1 0

Gabriel Ivăncescu : mshtml: Skip windows with no URI when deciding whether to send storage events.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: db53e46bad3196a662976ea4c9c34a251aad10d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/db53e46bad3196a662976ea4c9c34a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 10 19:10:23 2023 +0300 mshtml: Skip windows with no URI when deciding whether to send storage events. They're not going to match anyway. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index cad2b2dbd32..2cf32580b2a 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -282,6 +282,8 @@ static HRESULT send_storage_event_impl(struct send_storage_event_ctx *ctx, HTMLI origin = storage->session_storage->origin; origin_len = ctx->skip_window ? wcslen(origin) : storage->session_storage->origin_len; bstr = NULL; + }else if(!window->base.outer_window->uri) { + return S_OK; }else { hres = IUri_GetHost(window->base.outer_window->uri, &bstr); if(hres != S_OK) {

1 0

Ziqing Hui : winegstreamer: Add async command handling to media sink.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 1946c2dcf077381cc0adb58c1a6726176359e1a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/1946c2dcf077381cc0adb58c1a6726… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 26 11:34:15 2023 +0800 winegstreamer: Add async command handling to media sink. --- dlls/winegstreamer/media_sink.c | 276 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 265 insertions(+), 11 deletions(-)

1 0

Ziqing Hui : winegstreamer: Add IMFClockStateSink stubs to media sink.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 21729200a85c0ada889326b6b0f4bcd9828a737c URL: https://gitlab.winehq.org/wine/wine/-/commit/21729200a85c0ada889326b6b0f4bc… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 26 11:00:53 2023 +0800 winegstreamer: Add IMFClockStateSink stubs to media sink. --- dlls/winegstreamer/media_sink.c | 76 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 85463e6aab2..039b2cb9578 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -44,6 +44,7 @@ struct media_sink { IMFFinalizableMediaSink IMFFinalizableMediaSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; + IMFClockStateSink IMFClockStateSink_iface; LONG refcount; CRITICAL_SECTION cs; bool shutdown; @@ -74,6 +75,11 @@ static struct media_sink *impl_from_IMFMediaEventGenerator(IMFMediaEventGenerato return CONTAINING_RECORD(iface, struct media_sink, IMFMediaEventGenerator_iface); } +static struct media_sink *impl_from_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct media_sink, IMFClockStateSink_iface); +} + static HRESULT WINAPI stream_sink_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { struct stream_sink *stream_sink = impl_from_IMFStreamSink(iface); @@ -387,6 +393,10 @@ static HRESULT WINAPI media_sink_QueryInterface(IMFFinalizableMediaSink *iface, { *obj = &media_sink->IMFMediaEventGenerator_iface; } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *obj = &media_sink->IMFClockStateSink_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -646,6 +656,71 @@ static const IMFMediaEventGeneratorVtbl media_sink_event_vtbl = media_sink_event_QueueEvent, }; +static HRESULT WINAPI media_sink_clock_sink_QueryInterface(IMFClockStateSink *iface, REFIID riid, void **obj) +{ + struct media_sink *media_sink = impl_from_IMFClockStateSink(iface); + return IMFFinalizableMediaSink_QueryInterface(&media_sink->IMFFinalizableMediaSink_iface, riid, obj); +} + +static ULONG WINAPI media_sink_clock_sink_AddRef(IMFClockStateSink *iface) +{ + struct media_sink *media_sink = impl_from_IMFClockStateSink(iface); + return IMFFinalizableMediaSink_AddRef(&media_sink->IMFFinalizableMediaSink_iface); +} + +static ULONG WINAPI media_sink_clock_sink_Release(IMFClockStateSink *iface) +{ + struct media_sink *media_sink = impl_from_IMFClockStateSink(iface); + return IMFFinalizableMediaSink_Release(&media_sink->IMFFinalizableMediaSink_iface); +} + +static HRESULT WINAPI media_sink_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) +{ + FIXME("iface %p, systime %s, offset %s stub!\n", iface, debugstr_time(systime), debugstr_time(offset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_sink_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("iface %p, systime %s stub!\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_sink_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("%p, %s stub!\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_sink_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) +{ + FIXME("iface %p, systime %s stub!\n", iface, debugstr_time(systime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_sink_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) +{ + FIXME("iface %p, systime %s, rate %f stub!\n", iface, debugstr_time(systime), rate); + + return E_NOTIMPL; +} + +static const IMFClockStateSinkVtbl media_sink_clock_sink_vtbl = +{ + media_sink_clock_sink_QueryInterface, + media_sink_clock_sink_AddRef, + media_sink_clock_sink_Release, + media_sink_clock_sink_OnClockStart, + media_sink_clock_sink_OnClockStop, + media_sink_clock_sink_OnClockPause, + media_sink_clock_sink_OnClockRestart, + media_sink_clock_sink_OnClockSetRate, +}; + static HRESULT media_sink_create(IMFByteStream *bytestream, struct media_sink **out) { struct media_sink *media_sink; @@ -667,6 +742,7 @@ static HRESULT media_sink_create(IMFByteStream *bytestream, struct media_sink ** media_sink->IMFFinalizableMediaSink_iface.lpVtbl = &media_sink_vtbl; media_sink->IMFMediaEventGenerator_iface.lpVtbl = &media_sink_event_vtbl; + media_sink->IMFClockStateSink_iface.lpVtbl = &media_sink_clock_sink_vtbl; media_sink->refcount = 1; InitializeCriticalSection(&media_sink->cs); media_sink->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs");

1 0

Ziqing Hui : winegstreamer: Implement IMFMediaEventGenerator for media sink.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 5b36d392c21b2610cb63d289bac35aa6ad3c931d URL: https://gitlab.winehq.org/wine/wine/-/commit/5b36d392c21b2610cb63d289bac35a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 26 10:02:18 2023 +0800 winegstreamer: Implement IMFMediaEventGenerator for media sink. --- dlls/winegstreamer/media_sink.c | 100 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 45916267ab3..85463e6aab2 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -43,11 +43,13 @@ struct stream_sink struct media_sink { IMFFinalizableMediaSink IMFFinalizableMediaSink_iface; + IMFMediaEventGenerator IMFMediaEventGenerator_iface; LONG refcount; CRITICAL_SECTION cs; bool shutdown; IMFByteStream *bytestream; + IMFMediaEventQueue *event_queue; struct list stream_sinks; }; @@ -67,6 +69,11 @@ static struct media_sink *impl_from_IMFFinalizableMediaSink(IMFFinalizableMediaS return CONTAINING_RECORD(iface, struct media_sink, IMFFinalizableMediaSink_iface); } +static struct media_sink *impl_from_IMFMediaEventGenerator(IMFMediaEventGenerator *iface) +{ + return CONTAINING_RECORD(iface, struct media_sink, IMFMediaEventGenerator_iface); +} + static HRESULT WINAPI stream_sink_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { struct stream_sink *stream_sink = impl_from_IMFStreamSink(iface); @@ -186,9 +193,13 @@ static HRESULT WINAPI stream_sink_GetIdentifier(IMFStreamSink *iface, DWORD *ide static HRESULT WINAPI stream_sink_GetMediaTypeHandler(IMFStreamSink *iface, IMFMediaTypeHandler **handler) { - FIXME("iface %p, handler %p stub!\n", iface, handler); + struct stream_sink *stream_sink = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("iface %p, handler %p.\n", iface, handler); + + IMFMediaTypeHandler_AddRef((*handler = &stream_sink->IMFMediaTypeHandler_iface)); + + return S_OK; } static HRESULT WINAPI stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) @@ -362,6 +373,8 @@ static struct stream_sink *media_sink_get_stream_sink_by_id(struct media_sink *m static HRESULT WINAPI media_sink_QueryInterface(IMFFinalizableMediaSink *iface, REFIID riid, void **obj) { + struct media_sink *media_sink = impl_from_IMFFinalizableMediaSink(iface); + TRACE("iface %p, riid %s, obj %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFFinalizableMediaSink) || @@ -370,6 +383,10 @@ static HRESULT WINAPI media_sink_QueryInterface(IMFFinalizableMediaSink *iface, { *obj = iface; } + else if (IsEqualGUID(riid, &IID_IMFMediaEventGenerator)) + { + *obj = &media_sink->IMFMediaEventGenerator_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -400,6 +417,7 @@ static ULONG WINAPI media_sink_Release(IMFFinalizableMediaSink *iface) if (!refcount) { IMFFinalizableMediaSink_Shutdown(iface); + IMFMediaEventQueue_Release(media_sink->event_queue); IMFByteStream_Release(media_sink->bytestream); media_sink->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&media_sink->cs); @@ -517,6 +535,7 @@ static HRESULT WINAPI media_sink_Shutdown(IMFFinalizableMediaSink *iface) IMFStreamSink_Release(&stream_sink->IMFStreamSink_iface); } + IMFMediaEventQueue_Shutdown(media_sink->event_queue); IMFByteStream_Close(media_sink->bytestream); media_sink->shutdown = TRUE; @@ -558,9 +577,79 @@ static const IMFFinalizableMediaSinkVtbl media_sink_vtbl = media_sink_EndFinalize, }; +static HRESULT WINAPI media_sink_event_QueryInterface(IMFMediaEventGenerator *iface, REFIID riid, void **obj) +{ + struct media_sink *media_sink = impl_from_IMFMediaEventGenerator(iface); + return IMFFinalizableMediaSink_QueryInterface(&media_sink->IMFFinalizableMediaSink_iface, riid, obj); +} + +static ULONG WINAPI media_sink_event_AddRef(IMFMediaEventGenerator *iface) +{ + struct media_sink *media_sink = impl_from_IMFMediaEventGenerator(iface); + return IMFFinalizableMediaSink_AddRef(&media_sink->IMFFinalizableMediaSink_iface); +} + +static ULONG WINAPI media_sink_event_Release(IMFMediaEventGenerator *iface) +{ + struct media_sink *media_sink = impl_from_IMFMediaEventGenerator(iface); + return IMFFinalizableMediaSink_Release(&media_sink->IMFFinalizableMediaSink_iface); +} + +static HRESULT WINAPI media_sink_event_GetEvent(IMFMediaEventGenerator *iface, DWORD flags, IMFMediaEvent **event) +{ + struct media_sink *media_sink = impl_from_IMFMediaEventGenerator(iface); + + TRACE("iface %p, flags %#lx, event %p.\n", iface, flags, event); + + return IMFMediaEventQueue_GetEvent(media_sink->event_queue, flags, event); +} + +static HRESULT WINAPI media_sink_event_BeginGetEvent(IMFMediaEventGenerator *iface, IMFAsyncCallback *callback, + IUnknown *state) +{ + struct media_sink *media_sink = impl_from_IMFMediaEventGenerator(iface); + + TRACE("iface %p, callback %p, state %p.\n", iface, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(media_sink->event_queue, callback, state); +} + +static HRESULT WINAPI media_sink_event_EndGetEvent(IMFMediaEventGenerator *iface, IMFAsyncResult *result, + IMFMediaEvent **event) +{ + struct media_sink *media_sink = impl_from_IMFMediaEventGenerator(iface); + + TRACE("iface %p, result %p, event %p.\n", iface, result, event); + + return IMFMediaEventQueue_EndGetEvent(media_sink->event_queue, result, event); +} + +static HRESULT WINAPI media_sink_event_QueueEvent(IMFMediaEventGenerator *iface, MediaEventType event_type, + REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) +{ + struct media_sink *media_sink = impl_from_IMFMediaEventGenerator(iface); + + TRACE("iface %p, event_type %lu, ext_type %s, hr %#lx, value %p.\n", + iface, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(media_sink->event_queue, event_type, ext_type, hr, value); +} + +static const IMFMediaEventGeneratorVtbl media_sink_event_vtbl = +{ + media_sink_event_QueryInterface, + media_sink_event_AddRef, + media_sink_event_Release, + media_sink_event_GetEvent, + media_sink_event_BeginGetEvent, + media_sink_event_EndGetEvent, + media_sink_event_QueueEvent, +}; + static HRESULT media_sink_create(IMFByteStream *bytestream, struct media_sink **out) { struct media_sink *media_sink; + HRESULT hr; TRACE("bytestream %p, out %p.\n", bytestream, out); @@ -570,7 +659,14 @@ static HRESULT media_sink_create(IMFByteStream *bytestream, struct media_sink ** if (!(media_sink = calloc(1, sizeof(*media_sink)))) return E_OUTOFMEMORY; + if (FAILED(hr = MFCreateEventQueue(&media_sink->event_queue))) + { + free(media_sink); + return hr; + } + media_sink->IMFFinalizableMediaSink_iface.lpVtbl = &media_sink_vtbl; + media_sink->IMFMediaEventGenerator_iface.lpVtbl = &media_sink_event_vtbl; media_sink->refcount = 1; InitializeCriticalSection(&media_sink->cs); media_sink->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs");

1 0

Ziqing Hui : winegstreamer: Add IMFMediaTypeHandler stubs to stream sink.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: bc9c106135a436b1aebc07074ead8d62d664f48a URL: https://gitlab.winehq.org/wine/wine/-/commit/bc9c106135a436b1aebc07074ead8d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Aug 9 11:55:27 2023 +0800 winegstreamer: Add IMFMediaTypeHandler stubs to stream sink. --- dlls/winegstreamer/media_sink.c | 95 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 350caf49e4c..45916267ab3 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); struct stream_sink { IMFStreamSink IMFStreamSink_iface; + IMFMediaTypeHandler IMFMediaTypeHandler_iface; LONG refcount; DWORD id; @@ -56,6 +57,11 @@ static struct stream_sink *impl_from_IMFStreamSink(IMFStreamSink *iface) return CONTAINING_RECORD(iface, struct stream_sink, IMFStreamSink_iface); } +static struct stream_sink *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct stream_sink, IMFMediaTypeHandler_iface); +} + static struct media_sink *impl_from_IMFFinalizableMediaSink(IMFFinalizableMediaSink *iface) { return CONTAINING_RECORD(iface, struct media_sink, IMFFinalizableMediaSink_iface); @@ -73,6 +79,10 @@ static HRESULT WINAPI stream_sink_QueryInterface(IMFStreamSink *iface, REFIID ri { *obj = &stream_sink->IMFStreamSink_iface; } + else if (IsEqualIID(riid, &IID_IMFMediaTypeHandler)) + { + *obj = &stream_sink->IMFMediaTypeHandler_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -221,6 +231,90 @@ static const IMFStreamSinkVtbl stream_sink_vtbl = stream_sink_Flush, }; +static HRESULT WINAPI stream_sink_type_handler_QueryInterface(IMFMediaTypeHandler *iface, REFIID riid, void **obj) +{ + struct stream_sink *stream_sink = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_QueryInterface(&stream_sink->IMFStreamSink_iface, riid, obj); +} + +static ULONG WINAPI stream_sink_type_handler_AddRef(IMFMediaTypeHandler *iface) +{ + struct stream_sink *stream_sink = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_AddRef(&stream_sink->IMFStreamSink_iface); +} + +static ULONG WINAPI stream_sink_type_handler_Release(IMFMediaTypeHandler *iface) +{ + struct stream_sink *stream_sink = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_Release(&stream_sink->IMFStreamSink_iface); +} + +static HRESULT WINAPI stream_sink_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, + IMFMediaType *in_type, IMFMediaType **out_type) +{ + FIXME("iface %p, in_type %p, out_type %p.\n", iface, in_type, out_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_sink_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) +{ + FIXME("iface %p, count %p.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_sink_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, + IMFMediaType **type) +{ + FIXME("iface %p, index %lu, type %p.\n", iface, index, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_sink_type_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type) +{ + FIXME("iface %p, type %p.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_sink_type_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **type) +{ + struct stream_sink *stream_sink = impl_from_IMFMediaTypeHandler(iface); + + TRACE("iface %p, type %p.\n", iface, type); + + if (!type) + return E_POINTER; + if (!stream_sink->type) + return MF_E_NOT_INITIALIZED; + + IMFMediaType_AddRef((*type = stream_sink->type)); + + return S_OK; +} + +static HRESULT WINAPI stream_sink_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) +{ + FIXME("iface %p, type %p.\n", iface, type); + + return E_NOTIMPL; +} + +static const IMFMediaTypeHandlerVtbl stream_sink_type_handler_vtbl = +{ + stream_sink_type_handler_QueryInterface, + stream_sink_type_handler_AddRef, + stream_sink_type_handler_Release, + stream_sink_type_handler_IsMediaTypeSupported, + stream_sink_type_handler_GetMediaTypeCount, + stream_sink_type_handler_GetMediaTypeByIndex, + stream_sink_type_handler_SetCurrentMediaType, + stream_sink_type_handler_GetCurrentMediaType, + stream_sink_type_handler_GetMajorType, +}; + static HRESULT stream_sink_create(DWORD stream_sink_id, IMFMediaType *media_type, struct media_sink *media_sink, struct stream_sink **out) { @@ -240,6 +334,7 @@ static HRESULT stream_sink_create(DWORD stream_sink_id, IMFMediaType *media_type } stream_sink->IMFStreamSink_iface.lpVtbl = &stream_sink_vtbl; + stream_sink->IMFMediaTypeHandler_iface.lpVtbl = &stream_sink_type_handler_vtbl; stream_sink->refcount = 1; stream_sink->id = stream_sink_id; if (media_type)

1 0

Ziqing Hui : winegstreamer: Implement IMFMediaEventGenerator for stream sink.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: f8ecc08148800b348eba44836ebd38a108888645 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8ecc08148800b348eba44836ebd38… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 10 10:28:53 2023 +0800 winegstreamer: Implement IMFMediaEventGenerator for stream sink. --- dlls/winegstreamer/media_sink.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 02a5d6d8869..350caf49e4c 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -34,6 +34,7 @@ struct stream_sink IMFMediaType *type; IMFFinalizableMediaSink *media_sink; + IMFMediaEventQueue *event_queue; struct list entry; }; @@ -101,6 +102,7 @@ static ULONG WINAPI stream_sink_Release(IMFStreamSink *iface) if (!refcount) { + IMFMediaEventQueue_Release(stream_sink->event_queue); IMFFinalizableMediaSink_Release(stream_sink->media_sink); if (stream_sink->type) IMFMediaType_Release(stream_sink->type); @@ -112,34 +114,42 @@ static ULONG WINAPI stream_sink_Release(IMFStreamSink *iface) static HRESULT WINAPI stream_sink_GetEvent(IMFStreamSink *iface, DWORD flags, IMFMediaEvent **event) { - FIXME("iface %p, flags %#lx, event %p.\n", iface, flags, event); + struct stream_sink *stream_sink = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("iface %p, flags %#lx, event %p.\n", iface, flags, event); + + return IMFMediaEventQueue_GetEvent(stream_sink->event_queue, flags, event); } static HRESULT WINAPI stream_sink_BeginGetEvent(IMFStreamSink *iface, IMFAsyncCallback *callback, IUnknown *state) { - FIXME("iface %p, callback %p, state %p.\n", iface, callback, state); + struct stream_sink *stream_sink = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("iface %p, callback %p, state %p.\n", iface, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(stream_sink->event_queue, callback, state); } static HRESULT WINAPI stream_sink_EndGetEvent(IMFStreamSink *iface, IMFAsyncResult *result, IMFMediaEvent **event) { - FIXME("iface %p, result %p, event %p.\n", iface, result, event); + struct stream_sink *stream_sink = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("iface %p, result %p, event %p.\n", iface, result, event); + + return IMFMediaEventQueue_EndGetEvent(stream_sink->event_queue, result, event); } static HRESULT WINAPI stream_sink_QueueEvent(IMFStreamSink *iface, MediaEventType event_type, REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) { - FIXME("iface %p, event_type %lu, ext_type %s, hr %#lx, value %p.\n", + struct stream_sink *stream_sink = impl_from_IMFStreamSink(iface); + + TRACE("iface %p, event_type %lu, ext_type %s, hr %#lx, value %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); - return E_NOTIMPL; + return IMFMediaEventQueue_QueueEventParamVar(stream_sink->event_queue, event_type, ext_type, hr, value); } static HRESULT WINAPI stream_sink_GetMediaSink(IMFStreamSink *iface, IMFMediaSink **ret) @@ -215,6 +225,7 @@ static HRESULT stream_sink_create(DWORD stream_sink_id, IMFMediaType *media_type struct stream_sink **out) { struct stream_sink *stream_sink; + HRESULT hr; TRACE("stream_sink_id %#lx, media_type %p, media_sink %p, out %p.\n", stream_sink_id, media_type, media_sink, out); @@ -222,6 +233,12 @@ static HRESULT stream_sink_create(DWORD stream_sink_id, IMFMediaType *media_type if (!(stream_sink = calloc(1, sizeof(*stream_sink)))) return E_OUTOFMEMORY; + if (FAILED(hr = MFCreateEventQueue(&stream_sink->event_queue))) + { + free(stream_sink); + return hr; + } + stream_sink->IMFStreamSink_iface.lpVtbl = &stream_sink_vtbl; stream_sink->refcount = 1; stream_sink->id = stream_sink_id; @@ -401,6 +418,7 @@ static HRESULT WINAPI media_sink_Shutdown(IMFFinalizableMediaSink *iface) LIST_FOR_EACH_ENTRY_SAFE(stream_sink, next, &media_sink->stream_sinks, struct stream_sink, entry) { list_remove(&stream_sink->entry); + IMFMediaEventQueue_Shutdown(stream_sink->event_queue); IMFStreamSink_Release(&stream_sink->IMFStreamSink_iface); }

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
67
Older →

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-commits August 2023