wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Mohamad Al-Jaf : include: Add IMusicDisplayProperties2 interface definition.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 8a91ff180e40caa5e8b82740732355fdb32927b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a91ff180e40caa5e8b82740732355… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 19:11:20 2023 -0400 include: Add IMusicDisplayProperties2 interface definition. --- include/windows.media.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/windows.media.idl b/include/windows.media.idl index b0e382a3a0e..35aa64a1937 100644 --- a/include/windows.media.idl +++ b/include/windows.media.idl @@ -160,6 +160,20 @@ namespace Windows.Media [propput] HRESULT Artist([in] HSTRING value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.MusicDisplayProperties), + uuid(00368462-97d3-44b9-b00f-008afcefaf18) + ] + interface IMusicDisplayProperties2 : IInspectable + { + [propget] HRESULT AlbumTitle([out, retval] HSTRING *value); + [propput] HRESULT AlbumTitle([in] HSTRING value); + [propget] HRESULT TrackNumber([out, retval] UINT32 *value); + [propput] HRESULT TrackNumber([in] UINT32 value); + [propget] HRESULT Genres([out, retval] Windows.Foundation.Collections.IVector<HSTRING> **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SystemMediaTransportControls),

1 0

Mohamad Al-Jaf : windows.media.mediacontrol: Implement IMusicDisplayProperties::get/put_Artist().
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 780a173f45aaab0f3b78d04122cbe6ec071c7c82 URL: https://gitlab.winehq.org/wine/wine/-/commit/780a173f45aaab0f3b78d04122cbe6… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 18:48:44 2023 -0400 windows.media.mediacontrol: Implement IMusicDisplayProperties::get/put_Artist(). Called by Roon. --- dlls/windows.media.mediacontrol/main.c | 13 +++++++++---- dlls/windows.media.mediacontrol/tests/mediacontrol.c | 10 +++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/windows.media.mediacontrol/main.c b/dlls/windows.media.mediacontrol/main.c index a09fbf50b46..0c66b569170 100644 --- a/dlls/windows.media.mediacontrol/main.c +++ b/dlls/windows.media.mediacontrol/main.c @@ -122,6 +122,7 @@ struct music_properties IMusicDisplayProperties IMusicDisplayProperties_iface; LONG ref; + HSTRING artist; HSTRING title; }; @@ -168,6 +169,7 @@ static ULONG WINAPI music_properties_Release( IMusicDisplayProperties *iface ) if (!ref) { + WindowsDeleteString( impl->artist ); WindowsDeleteString( impl->title ); free( impl ); } @@ -221,14 +223,17 @@ static HRESULT WINAPI music_properties_put_AlbumArtist( IMusicDisplayProperties static HRESULT WINAPI music_properties_get_Artist( IMusicDisplayProperties *iface, HSTRING *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct music_properties *impl = impl_from_IMusicDisplayProperties( iface ); + TRACE( "iface %p, value %p\n", iface, value ); + return WindowsDuplicateString( impl->artist, value ); } static HRESULT WINAPI music_properties_put_Artist( IMusicDisplayProperties *iface, HSTRING value ) { - FIXME( "iface %p, value %s stub!\n", iface, debugstr_hstring(value) ); - return E_NOTIMPL; + struct music_properties *impl = impl_from_IMusicDisplayProperties( iface ); + TRACE( "iface %p, value %p\n", iface, value ); + WindowsDeleteString( impl->artist ); + return WindowsDuplicateString( value, &impl->artist ); } static const IMusicDisplayPropertiesVtbl music_properties_vtbl = diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index 6311327b4f9..8b8d48c4e37 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -193,17 +193,17 @@ static void test_MediaControlStatics(void) WindowsDeleteString( ret_str ); hr = IMusicDisplayProperties_put_Artist( music_properties, NULL ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = WindowsCreateStringReference( L"The Wine Project", wcslen( L"The Wine Project" ), &header, &str ); ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IMusicDisplayProperties_put_Artist( music_properties, str ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IMusicDisplayProperties_get_Artist( music_properties, &ret_str ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = WindowsCompareStringOrdinal( str, ret_str, &res ); ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( !res, "got string %s.\n", debugstr_hstring( ret_str ) ); - todo_wine ok( str != ret_str, "got same HSTRINGs %p, %p.\n", str, ret_str ); + ok( !res, "got string %s.\n", debugstr_hstring( ret_str ) ); + ok( str != ret_str, "got same HSTRINGs %p, %p.\n", str, ret_str ); WindowsDeleteString( str ); WindowsDeleteString( ret_str );

1 0

Mohamad Al-Jaf : windows.media.mediacontrol/tests: Add IMusicDisplayProperties::get/put_Artist() tests.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: b7768065c1d2bebed8162fd542c430387b18e1e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7768065c1d2bebed8162fd542c430… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 18:46:16 2023 -0400 windows.media.mediacontrol/tests: Add IMusicDisplayProperties::get/put_Artist() tests. --- dlls/windows.media.mediacontrol/tests/mediacontrol.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index d2977ed97f4..6311327b4f9 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -192,6 +192,21 @@ static void test_MediaControlStatics(void) WindowsDeleteString( str ); WindowsDeleteString( ret_str ); + hr = IMusicDisplayProperties_put_Artist( music_properties, NULL ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = WindowsCreateStringReference( L"The Wine Project", wcslen( L"The Wine Project" ), &header, &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IMusicDisplayProperties_put_Artist( music_properties, str ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IMusicDisplayProperties_get_Artist( music_properties, &ret_str ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = WindowsCompareStringOrdinal( str, ret_str, &res ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( !res, "got string %s.\n", debugstr_hstring( ret_str ) ); + todo_wine ok( str != ret_str, "got same HSTRINGs %p, %p.\n", str, ret_str ); + WindowsDeleteString( str ); + WindowsDeleteString( ret_str ); + IMusicDisplayProperties_Release( music_properties ); ISystemMediaTransportControlsDisplayUpdater_Release( display_updater ); ISystemMediaTransportControls_Release( media_control_statics );

1 0

Mohamad Al-Jaf : windows.media.mediacontrol: Implement IMusicDisplayProperties::get/put_Title().
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: be0c5268f1c567f642a54c0d03009efd32032b8b URL: https://gitlab.winehq.org/wine/wine/-/commit/be0c5268f1c567f642a54c0d03009e… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 18:43:22 2023 -0400 windows.media.mediacontrol: Implement IMusicDisplayProperties::get/put_Title(). Called by Roon. --- dlls/windows.media.mediacontrol/main.c | 19 ++++++++++++++----- dlls/windows.media.mediacontrol/tests/mediacontrol.c | 10 +++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/windows.media.mediacontrol/main.c b/dlls/windows.media.mediacontrol/main.c index 15a206f5354..a09fbf50b46 100644 --- a/dlls/windows.media.mediacontrol/main.c +++ b/dlls/windows.media.mediacontrol/main.c @@ -121,6 +121,8 @@ struct music_properties { IMusicDisplayProperties IMusicDisplayProperties_iface; LONG ref; + + HSTRING title; }; static inline struct music_properties *impl_from_IMusicDisplayProperties( IMusicDisplayProperties *iface ) @@ -164,7 +166,11 @@ static ULONG WINAPI music_properties_Release( IMusicDisplayProperties *iface ) TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); - if (!ref) free( impl ); + if (!ref) + { + WindowsDeleteString( impl->title ); + free( impl ); + } return ref; } @@ -188,14 +194,17 @@ static HRESULT WINAPI music_properties_GetTrustLevel( IMusicDisplayProperties *i static HRESULT WINAPI music_properties_get_Title( IMusicDisplayProperties *iface, HSTRING *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct music_properties *impl = impl_from_IMusicDisplayProperties( iface ); + TRACE( "iface %p, value %p\n", iface, value ); + return WindowsDuplicateString( impl->title, value ); } static HRESULT WINAPI music_properties_put_Title( IMusicDisplayProperties *iface, HSTRING value ) { - FIXME( "iface %p, value %s stub!\n", iface, debugstr_hstring(value) ); - return E_NOTIMPL; + struct music_properties *impl = impl_from_IMusicDisplayProperties( iface ); + TRACE( "iface %p, value %p\n", iface, value ); + WindowsDeleteString( impl->title ); + return WindowsDuplicateString( value, &impl->title ); } static HRESULT WINAPI music_properties_get_AlbumArtist( IMusicDisplayProperties *iface, HSTRING *value ) diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index c787906b311..d2977ed97f4 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -178,17 +178,17 @@ static void test_MediaControlStatics(void) check_interface( music_properties, &IID_IAgileObject ); hr = IMusicDisplayProperties_put_Title( music_properties, NULL ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = WindowsCreateStringReference( L"Wine", wcslen( L"Wine" ), &header, &str ); ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IMusicDisplayProperties_put_Title( music_properties, str ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IMusicDisplayProperties_get_Title( music_properties, &ret_str ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = WindowsCompareStringOrdinal( str, ret_str, &res ); ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( !res, "got string %s.\n", debugstr_hstring( ret_str ) ); - todo_wine ok( str != ret_str, "got same HSTRINGs %p, %p.\n", str, ret_str ); + ok( !res, "got string %s.\n", debugstr_hstring( ret_str ) ); + ok( str != ret_str, "got same HSTRINGs %p, %p.\n", str, ret_str ); WindowsDeleteString( str ); WindowsDeleteString( ret_str );

1 0

Mohamad Al-Jaf : windows.media.mediacontrol/tests: Add IMusicDisplayProperties::get/put_Title() tests.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: ce59ba8c672d89c4ceca44a10966757b35dda51e URL: https://gitlab.winehq.org/wine/wine/-/commit/ce59ba8c672d89c4ceca44a1096675… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 18:37:28 2023 -0400 windows.media.mediacontrol/tests: Add IMusicDisplayProperties::get/put_Title() tests. --- dlls/windows.media.mediacontrol/tests/mediacontrol.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index d3c77cec3f7..c787906b311 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -65,10 +65,12 @@ static void test_MediaControlStatics(void) IMusicDisplayProperties *music_properties = NULL; MediaPlaybackType playback_type; IActivationFactory *factory; + HSTRING_HEADER header; + HSTRING str, ret_str; HWND window = NULL; BOOLEAN value; - HSTRING str; HRESULT hr; + INT32 res; LONG ref; hr = WindowsCreateString( media_control_statics_name, wcslen( media_control_statics_name ), &str ); @@ -175,6 +177,21 @@ static void test_MediaControlStatics(void) check_interface( music_properties, &IID_IInspectable ); check_interface( music_properties, &IID_IAgileObject ); + hr = IMusicDisplayProperties_put_Title( music_properties, NULL ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = WindowsCreateStringReference( L"Wine", wcslen( L"Wine" ), &header, &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IMusicDisplayProperties_put_Title( music_properties, str ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IMusicDisplayProperties_get_Title( music_properties, &ret_str ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = WindowsCompareStringOrdinal( str, ret_str, &res ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( !res, "got string %s.\n", debugstr_hstring( ret_str ) ); + todo_wine ok( str != ret_str, "got same HSTRINGs %p, %p.\n", str, ret_str ); + WindowsDeleteString( str ); + WindowsDeleteString( ret_str ); + IMusicDisplayProperties_Release( music_properties ); ISystemMediaTransportControlsDisplayUpdater_Release( display_updater ); ISystemMediaTransportControls_Release( media_control_statics );

1 0

Mohamad Al-Jaf : windows.media.mediacontrol: Implement ISystemMediaTransportControlsDisplayUpdater::get_MusicProperties().
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 3b1b35326067b65253d27ffc280eddd1d65a2654 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b1b35326067b65253d27ffc280edd… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 18:22:34 2023 -0400 windows.media.mediacontrol: Implement ISystemMediaTransportControlsDisplayUpdater::get_MusicProperties(). Called by Roon. --- dlls/windows.media.mediacontrol/main.c | 137 ++++++++++++++++++++- .../tests/mediacontrol.c | 9 ++ 2 files changed, 144 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media.mediacontrol/main.c b/dlls/windows.media.mediacontrol/main.c index 030dd367b86..15a206f5354 100644 --- a/dlls/windows.media.mediacontrol/main.c +++ b/dlls/windows.media.mediacontrol/main.c @@ -117,6 +117,129 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +struct music_properties +{ + IMusicDisplayProperties IMusicDisplayProperties_iface; + LONG ref; +}; + +static inline struct music_properties *impl_from_IMusicDisplayProperties( IMusicDisplayProperties *iface ) +{ + return CONTAINING_RECORD( iface, struct music_properties, IMusicDisplayProperties_iface ); +} + +static HRESULT WINAPI music_properties_QueryInterface( IMusicDisplayProperties *iface, REFIID iid, void **out ) +{ + struct music_properties *impl = impl_from_IMusicDisplayProperties( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IMusicDisplayProperties )) + { + *out = &impl->IMusicDisplayProperties_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI music_properties_AddRef( IMusicDisplayProperties *iface ) +{ + struct music_properties *impl = impl_from_IMusicDisplayProperties( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI music_properties_Release( IMusicDisplayProperties *iface ) +{ + struct music_properties *impl = impl_from_IMusicDisplayProperties( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) free( impl ); + return ref; +} + +static HRESULT WINAPI music_properties_GetIids( IMusicDisplayProperties *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI music_properties_GetRuntimeClassName( IMusicDisplayProperties *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI music_properties_GetTrustLevel( IMusicDisplayProperties *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI music_properties_get_Title( IMusicDisplayProperties *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI music_properties_put_Title( IMusicDisplayProperties *iface, HSTRING value ) +{ + FIXME( "iface %p, value %s stub!\n", iface, debugstr_hstring(value) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI music_properties_get_AlbumArtist( IMusicDisplayProperties *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI music_properties_put_AlbumArtist( IMusicDisplayProperties *iface, HSTRING value ) +{ + FIXME( "iface %p, value %s stub!\n", iface, debugstr_hstring(value) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI music_properties_get_Artist( IMusicDisplayProperties *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI music_properties_put_Artist( IMusicDisplayProperties *iface, HSTRING value ) +{ + FIXME( "iface %p, value %s stub!\n", iface, debugstr_hstring(value) ); + return E_NOTIMPL; +} + +static const IMusicDisplayPropertiesVtbl music_properties_vtbl = +{ + music_properties_QueryInterface, + music_properties_AddRef, + music_properties_Release, + /* IInspectable methods */ + music_properties_GetIids, + music_properties_GetRuntimeClassName, + music_properties_GetTrustLevel, + /* IMusicDisplayProperties methods */ + music_properties_get_Title, + music_properties_put_Title, + music_properties_get_AlbumArtist, + music_properties_put_AlbumArtist, + music_properties_get_Artist, + music_properties_put_Artist, +}; + struct display_updater { ISystemMediaTransportControlsDisplayUpdater ISystemMediaTransportControlsDisplayUpdater_iface; @@ -235,8 +358,18 @@ static HRESULT WINAPI display_updater_put_Thumbnail( ISystemMediaTransportContro static HRESULT WINAPI display_updater_get_MusicProperties( ISystemMediaTransportControlsDisplayUpdater *iface, IMusicDisplayProperties **value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct music_properties *impl; + + TRACE( "iface %p, value %p\n", iface, value ); + + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + + impl->IMusicDisplayProperties_iface.lpVtbl = &music_properties_vtbl; + impl->ref = 1; + + *value = &impl->IMusicDisplayProperties_iface; + TRACE( "created IMusicDisplayProperties %p.\n", *value ); + return S_OK; } static HRESULT WINAPI display_updater_get_VideoProperties( ISystemMediaTransportControlsDisplayUpdater *iface, __x_ABI_CWindows_CMedia_CIVideoDisplayProperties **value ) diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index 298fcabfdfa..d3c77cec3f7 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -62,6 +62,7 @@ static void test_MediaControlStatics(void) ISystemMediaTransportControlsInterop *media_control_interop_statics = NULL; ISystemMediaTransportControlsDisplayUpdater *display_updater = NULL; ISystemMediaTransportControls *media_control_statics = NULL; + IMusicDisplayProperties *music_properties = NULL; MediaPlaybackType playback_type; IActivationFactory *factory; HWND window = NULL; @@ -167,6 +168,14 @@ static void test_MediaControlStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); ok( playback_type == MediaPlaybackType_Music, "got playback_type %d.\n", playback_type ); + hr = ISystemMediaTransportControlsDisplayUpdater_get_MusicProperties( display_updater, &music_properties ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + check_interface( music_properties, &IID_IUnknown ); + check_interface( music_properties, &IID_IInspectable ); + check_interface( music_properties, &IID_IAgileObject ); + + IMusicDisplayProperties_Release( music_properties ); ISystemMediaTransportControlsDisplayUpdater_Release( display_updater ); ISystemMediaTransportControls_Release( media_control_statics ); done:

1 0

Mohamad Al-Jaf : include: Add IMusicDisplayProperties interface definition.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: c6fbe1400a1b85e1b41851780adc6e338062af55 URL: https://gitlab.winehq.org/wine/wine/-/commit/c6fbe1400a1b85e1b41851780adc6e… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 18:08:51 2023 -0400 include: Add IMusicDisplayProperties interface definition. --- dlls/windows.media.mediacontrol/main.c | 2 +- include/windows.media.idl | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.mediacontrol/main.c b/dlls/windows.media.mediacontrol/main.c index b294b21f05a..030dd367b86 100644 --- a/dlls/windows.media.mediacontrol/main.c +++ b/dlls/windows.media.mediacontrol/main.c @@ -233,7 +233,7 @@ static HRESULT WINAPI display_updater_put_Thumbnail( ISystemMediaTransportContro return E_NOTIMPL; } -static HRESULT WINAPI display_updater_get_MusicProperties( ISystemMediaTransportControlsDisplayUpdater *iface, __x_ABI_CWindows_CMedia_CIMusicDisplayProperties **value ) +static HRESULT WINAPI display_updater_get_MusicProperties( ISystemMediaTransportControlsDisplayUpdater *iface, IMusicDisplayProperties **value ) { FIXME( "iface %p, value %p stub!\n", iface, value ); return E_NOTIMPL; diff --git a/include/windows.media.idl b/include/windows.media.idl index 7c5b8ff41d1..b0e382a3a0e 100644 --- a/include/windows.media.idl +++ b/include/windows.media.idl @@ -145,6 +145,21 @@ namespace Windows.Media [propget] HRESULT Text([out, retval] HSTRING *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.MusicDisplayProperties), + uuid(6bbf0c59-d0a0-4d26-92a0-f978e1d18e7b) + ] + interface IMusicDisplayProperties : IInspectable + { + [propget] HRESULT Title([out, retval] HSTRING *value); + [propput] HRESULT Title([in] HSTRING value); + [propget] HRESULT AlbumArtist([out, retval] HSTRING *value); + [propput] HRESULT AlbumArtist([in] HSTRING value); + [propget] HRESULT Artist([out, retval] HSTRING *value); + [propput] HRESULT Artist([in] HSTRING value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SystemMediaTransportControls),

1 0

Mohamad Al-Jaf : windows.media.mediacontrol: Implement ISystemMediaTransportControlsDisplayUpdater::get/put_Type().
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 29ffed2090e44c203d1b177450774c1106babdea URL: https://gitlab.winehq.org/wine/wine/-/commit/29ffed2090e44c203d1b177450774c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 18:06:04 2023 -0400 windows.media.mediacontrol: Implement ISystemMediaTransportControlsDisplayUpdater::get/put_Type(). Called by Roon. --- dlls/windows.media.mediacontrol/main.c | 19 +++++++++++++++---- dlls/windows.media.mediacontrol/tests/mediacontrol.c | 12 ++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/windows.media.mediacontrol/main.c b/dlls/windows.media.mediacontrol/main.c index dc4af832e7b..b294b21f05a 100644 --- a/dlls/windows.media.mediacontrol/main.c +++ b/dlls/windows.media.mediacontrol/main.c @@ -121,6 +121,8 @@ struct display_updater { ISystemMediaTransportControlsDisplayUpdater ISystemMediaTransportControlsDisplayUpdater_iface; LONG ref; + + MediaPlaybackType playback_type; }; static inline struct display_updater *impl_from_ISystemMediaTransportControlsDisplayUpdater( ISystemMediaTransportControlsDisplayUpdater *iface ) @@ -188,14 +190,23 @@ static HRESULT WINAPI display_updater_GetTrustLevel( ISystemMediaTransportContro static HRESULT WINAPI display_updater_get_Type( ISystemMediaTransportControlsDisplayUpdater *iface, MediaPlaybackType *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct display_updater *impl = impl_from_ISystemMediaTransportControlsDisplayUpdater( iface ); + + TRACE( "iface %p, value %p\n", iface, value ); + + *value = impl->playback_type; + return S_OK; } static HRESULT WINAPI display_updater_put_Type( ISystemMediaTransportControlsDisplayUpdater *iface, MediaPlaybackType value ) { - FIXME( "iface %p, value %d stub!\n", iface, value ); - return E_NOTIMPL; + struct display_updater *impl = impl_from_ISystemMediaTransportControlsDisplayUpdater( iface ); + + TRACE( "iface %p, value %d\n", iface, value ); + + if (value < MediaPlaybackType_Unknown || value > MediaPlaybackType_Image) return E_INVALIDARG; + impl->playback_type = value; + return S_OK; } static HRESULT WINAPI display_updater_get_AppMediaId( ISystemMediaTransportControlsDisplayUpdater *iface, HSTRING *value ) diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index ce62c03dd3a..298fcabfdfa 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -156,16 +156,16 @@ static void test_MediaControlStatics(void) check_interface( display_updater, &IID_IAgileObject ); hr = ISystemMediaTransportControlsDisplayUpdater_put_Type( display_updater, -1 ); - todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); hr = ISystemMediaTransportControlsDisplayUpdater_put_Type( display_updater, 4 ); - todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); - hr = ISystemMediaTransportControlsDisplayUpdater_put_Type( display_updater, 1 ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControlsDisplayUpdater_put_Type( display_updater, MediaPlaybackType_Music ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); playback_type = -1; hr = ISystemMediaTransportControlsDisplayUpdater_get_Type( display_updater, &playback_type ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( playback_type == MediaPlaybackType_Music, "got playback_type %d.\n", playback_type ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( playback_type == MediaPlaybackType_Music, "got playback_type %d.\n", playback_type ); ISystemMediaTransportControlsDisplayUpdater_Release( display_updater ); ISystemMediaTransportControls_Release( media_control_statics );

1 0

Mohamad Al-Jaf : windows.media.mediacontrol/tests: Add ISystemMediaTransportControlsDisplayUpdater::get/put_Type() tests.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: c1ae95fbe02397f395965dc21e93dca7e326aa2b URL: https://gitlab.winehq.org/wine/wine/-/commit/c1ae95fbe02397f395965dc21e93dc… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 18:01:47 2023 -0400 windows.media.mediacontrol/tests: Add ISystemMediaTransportControlsDisplayUpdater::get/put_Type() tests. --- dlls/windows.media.mediacontrol/tests/mediacontrol.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index c237a44bdfb..ce62c03dd3a 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -62,6 +62,7 @@ static void test_MediaControlStatics(void) ISystemMediaTransportControlsInterop *media_control_interop_statics = NULL; ISystemMediaTransportControlsDisplayUpdater *display_updater = NULL; ISystemMediaTransportControls *media_control_statics = NULL; + MediaPlaybackType playback_type; IActivationFactory *factory; HWND window = NULL; BOOLEAN value; @@ -154,6 +155,18 @@ static void test_MediaControlStatics(void) check_interface( display_updater, &IID_IInspectable ); check_interface( display_updater, &IID_IAgileObject ); + hr = ISystemMediaTransportControlsDisplayUpdater_put_Type( display_updater, -1 ); + todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControlsDisplayUpdater_put_Type( display_updater, 4 ); + todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControlsDisplayUpdater_put_Type( display_updater, 1 ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + + playback_type = -1; + hr = ISystemMediaTransportControlsDisplayUpdater_get_Type( display_updater, &playback_type ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( playback_type == MediaPlaybackType_Music, "got playback_type %d.\n", playback_type ); + ISystemMediaTransportControlsDisplayUpdater_Release( display_updater ); ISystemMediaTransportControls_Release( media_control_statics ); done:

1 0

Mohamad Al-Jaf : windows.media.mediacontrol: Implement ISystemMediaTransportControls::get_DisplayUpdater().
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 072405348c27e240a36d8d2830629c62584920fd URL: https://gitlab.winehq.org/wine/wine/-/commit/072405348c27e240a36d8d2830629c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 17:53:21 2023 -0400 windows.media.mediacontrol: Implement ISystemMediaTransportControls::get_DisplayUpdater(). Called by Roon. --- dlls/windows.media.mediacontrol/main.c | 180 ++++++++++++++++++++- dlls/windows.media.mediacontrol/private.h | 2 + .../tests/mediacontrol.c | 11 +- 3 files changed, 190 insertions(+), 3 deletions(-) diff --git a/dlls/windows.media.mediacontrol/main.c b/dlls/windows.media.mediacontrol/main.c index d55c2ae6461..dc4af832e7b 100644 --- a/dlls/windows.media.mediacontrol/main.c +++ b/dlls/windows.media.mediacontrol/main.c @@ -117,6 +117,172 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +struct display_updater +{ + ISystemMediaTransportControlsDisplayUpdater ISystemMediaTransportControlsDisplayUpdater_iface; + LONG ref; +}; + +static inline struct display_updater *impl_from_ISystemMediaTransportControlsDisplayUpdater( ISystemMediaTransportControlsDisplayUpdater *iface ) +{ + return CONTAINING_RECORD( iface, struct display_updater, ISystemMediaTransportControlsDisplayUpdater_iface ); +} + +static HRESULT WINAPI display_updater_QueryInterface( ISystemMediaTransportControlsDisplayUpdater *iface, REFIID iid, void **out ) +{ + struct display_updater *impl = impl_from_ISystemMediaTransportControlsDisplayUpdater( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_ISystemMediaTransportControlsDisplayUpdater )) + { + *out = &impl->ISystemMediaTransportControlsDisplayUpdater_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI display_updater_AddRef( ISystemMediaTransportControlsDisplayUpdater *iface ) +{ + struct display_updater *impl = impl_from_ISystemMediaTransportControlsDisplayUpdater( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI display_updater_Release( ISystemMediaTransportControlsDisplayUpdater *iface ) +{ + struct display_updater *impl = impl_from_ISystemMediaTransportControlsDisplayUpdater( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) free( impl ); + return ref; +} + +static HRESULT WINAPI display_updater_GetIids( ISystemMediaTransportControlsDisplayUpdater *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_GetRuntimeClassName( ISystemMediaTransportControlsDisplayUpdater *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_GetTrustLevel( ISystemMediaTransportControlsDisplayUpdater *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_get_Type( ISystemMediaTransportControlsDisplayUpdater *iface, MediaPlaybackType *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_put_Type( ISystemMediaTransportControlsDisplayUpdater *iface, MediaPlaybackType value ) +{ + FIXME( "iface %p, value %d stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_get_AppMediaId( ISystemMediaTransportControlsDisplayUpdater *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_put_AppMediaId( ISystemMediaTransportControlsDisplayUpdater *iface, HSTRING value ) +{ + FIXME( "iface %p, value %s stub!\n", iface, debugstr_hstring( value ) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_get_Thumbnail( ISystemMediaTransportControlsDisplayUpdater *iface, __x_ABI_CWindows_CStorage_CStreams_CIRandomAccessStreamReference **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_put_Thumbnail( ISystemMediaTransportControlsDisplayUpdater *iface, __x_ABI_CWindows_CStorage_CStreams_CIRandomAccessStreamReference *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_get_MusicProperties( ISystemMediaTransportControlsDisplayUpdater *iface, __x_ABI_CWindows_CMedia_CIMusicDisplayProperties **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_get_VideoProperties( ISystemMediaTransportControlsDisplayUpdater *iface, __x_ABI_CWindows_CMedia_CIVideoDisplayProperties **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_get_ImageProperties( ISystemMediaTransportControlsDisplayUpdater *iface, __x_ABI_CWindows_CMedia_CIImageDisplayProperties **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_CopyFromFileAsync( ISystemMediaTransportControlsDisplayUpdater *iface, MediaPlaybackType type, IStorageFile *source, + IAsyncOperation_boolean **operation ) +{ + FIXME( "iface %p, type %d, source %p, operation %p stub!\n", iface, type, source, operation ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_ClearAll( ISystemMediaTransportControlsDisplayUpdater *iface ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI display_updater_Update( ISystemMediaTransportControlsDisplayUpdater *iface ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static const struct ISystemMediaTransportControlsDisplayUpdaterVtbl display_updater_vtbl = +{ + display_updater_QueryInterface, + display_updater_AddRef, + display_updater_Release, + /* IInspectable methods */ + display_updater_GetIids, + display_updater_GetRuntimeClassName, + display_updater_GetTrustLevel, + /* ISystemMediaTransportControlsDisplayUpdater methods */ + display_updater_get_Type, + display_updater_put_Type, + display_updater_get_AppMediaId, + display_updater_put_AppMediaId, + display_updater_get_Thumbnail, + display_updater_put_Thumbnail, + display_updater_get_MusicProperties, + display_updater_get_VideoProperties, + display_updater_get_ImageProperties, + display_updater_CopyFromFileAsync, + display_updater_ClearAll, + display_updater_Update, +}; + struct media_control { ISystemMediaTransportControls ISystemMediaTransportControls_iface; @@ -217,8 +383,18 @@ static HRESULT WINAPI media_control_put_PlaybackStatus( ISystemMediaTransportCon static HRESULT WINAPI media_control_get_DisplayUpdater( ISystemMediaTransportControls *iface, ISystemMediaTransportControlsDisplayUpdater **value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct display_updater *impl; + + FIXME( "iface %p, value %p semi-stub!\n", iface, value ); + + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + + impl->ISystemMediaTransportControlsDisplayUpdater_iface.lpVtbl = &display_updater_vtbl; + impl->ref = 1; + + *value = &impl->ISystemMediaTransportControlsDisplayUpdater_iface; + TRACE( "created ISystemMediaTransportControlsDisplayUpdater %p.\n", *value ); + return S_OK; } static HRESULT WINAPI media_control_get_SoundLevel( ISystemMediaTransportControls *iface, SoundLevel *value ) diff --git a/dlls/windows.media.mediacontrol/private.h b/dlls/windows.media.mediacontrol/private.h index b5f4e6f262e..4291ab42061 100644 --- a/dlls/windows.media.mediacontrol/private.h +++ b/dlls/windows.media.mediacontrol/private.h @@ -33,6 +33,8 @@ #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" #define WIDL_using_Windows_Media +#define WIDL_using_Windows_Storage +#define WIDL_using_Windows_Storage_Streams #include "windows.media.h" #include "systemmediatransportcontrolsinterop.h" diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index 275527333f8..c237a44bdfb 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -59,7 +59,8 @@ static void check_interface_GetForWindow( void *media_control_interop_statics, H static void test_MediaControlStatics(void) { static const WCHAR *media_control_statics_name = L"Windows.Media.SystemMediaTransportControls"; - ISystemMediaTransportControlsInterop *media_control_interop_statics; + ISystemMediaTransportControlsInterop *media_control_interop_statics = NULL; + ISystemMediaTransportControlsDisplayUpdater *display_updater = NULL; ISystemMediaTransportControls *media_control_statics = NULL; IActivationFactory *factory; HWND window = NULL; @@ -146,6 +147,14 @@ static void test_MediaControlStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); ok( value == FALSE, "got value %d.\n", value ); + hr = ISystemMediaTransportControls_get_DisplayUpdater( media_control_statics, &display_updater ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + check_interface( display_updater, &IID_IUnknown ); + check_interface( display_updater, &IID_IInspectable ); + check_interface( display_updater, &IID_IAgileObject ); + + ISystemMediaTransportControlsDisplayUpdater_Release( display_updater ); ISystemMediaTransportControls_Release( media_control_statics ); done: DestroyWindow( window );

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
71
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 October 2023