October 2023 - Wine-commits

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 : 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 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_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_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 : 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: Add IMusicDisplayProperties2 stub interface.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 73db91c276be559df86f5708ee26414dcca7ec01 URL: https://gitlab.winehq.org/wine/wine/-/commit/73db91c276be559df86f5708ee2641… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 19:20:18 2023 -0400 windows.media.mediacontrol: Add IMusicDisplayProperties2 stub interface. --- dlls/windows.media.mediacontrol/main.c | 58 ++++++++++++++++++++++ .../tests/mediacontrol.c | 5 ++ 2 files changed, 63 insertions(+) diff --git a/dlls/windows.media.mediacontrol/main.c b/dlls/windows.media.mediacontrol/main.c index 0c66b569170..a8a2a42811c 100644 --- a/dlls/windows.media.mediacontrol/main.c +++ b/dlls/windows.media.mediacontrol/main.c @@ -120,6 +120,7 @@ static const struct IActivationFactoryVtbl factory_vtbl = struct music_properties { IMusicDisplayProperties IMusicDisplayProperties_iface; + IMusicDisplayProperties2 IMusicDisplayProperties2_iface; LONG ref; HSTRING artist; @@ -147,6 +148,13 @@ static HRESULT WINAPI music_properties_QueryInterface( IMusicDisplayProperties * return S_OK; } + if (IsEqualGUID( iid, &IID_IMusicDisplayProperties2 )) + { + *out = &impl->IMusicDisplayProperties2_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -254,6 +262,55 @@ static const IMusicDisplayPropertiesVtbl music_properties_vtbl = music_properties_put_Artist, }; +DEFINE_IINSPECTABLE( music_properties2, IMusicDisplayProperties2, struct music_properties, IMusicDisplayProperties_iface ) + +static HRESULT STDMETHODCALLTYPE music_properties2_get_AlbumTitle( IMusicDisplayProperties2 *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE music_properties2_put_AlbumTitle( IMusicDisplayProperties2 *iface, HSTRING value ) +{ + FIXME( "iface %p, value %s stub\n", iface, debugstr_hstring( value ) ); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE music_properties2_get_TrackNumber( IMusicDisplayProperties2 *iface, UINT32 *value ) +{ + FIXME( "iface %p, value %p stub\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE music_properties2_put_TrackNumber( IMusicDisplayProperties2 *iface, UINT32 value ) +{ + FIXME( "iface %p, value %u stub\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE music_properties2_get_Genres( IMusicDisplayProperties2 *iface, IVector_HSTRING **value ) +{ + FIXME( "iface %p, value %p stub\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IMusicDisplayProperties2Vtbl music_properties2_vtbl = +{ + music_properties2_QueryInterface, + music_properties2_AddRef, + music_properties2_Release, + /* IInspectable methods */ + music_properties2_GetIids, + music_properties2_GetRuntimeClassName, + music_properties2_GetTrustLevel, + /* IMusicDisplayProperties2 methods */ + music_properties2_get_AlbumTitle, + music_properties2_put_AlbumTitle, + music_properties2_get_TrackNumber, + music_properties2_put_TrackNumber, + music_properties2_get_Genres, +}; + struct display_updater { ISystemMediaTransportControlsDisplayUpdater ISystemMediaTransportControlsDisplayUpdater_iface; @@ -379,6 +436,7 @@ static HRESULT WINAPI display_updater_get_MusicProperties( ISystemMediaTransport if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; impl->IMusicDisplayProperties_iface.lpVtbl = &music_properties_vtbl; + impl->IMusicDisplayProperties2_iface.lpVtbl = &music_properties2_vtbl; impl->ref = 1; *value = &impl->IMusicDisplayProperties_iface; diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index 8b8d48c4e37..880d16ed87d 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; + IMusicDisplayProperties2 *music_properties2 = NULL; IMusicDisplayProperties *music_properties = NULL; MediaPlaybackType playback_type; IActivationFactory *factory; @@ -207,6 +208,10 @@ static void test_MediaControlStatics(void) WindowsDeleteString( str ); WindowsDeleteString( ret_str ); + hr = IMusicDisplayProperties_QueryInterface( music_properties, &IID_IMusicDisplayProperties2, (void **)&music_properties2 ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + IMusicDisplayProperties2_Release( music_properties2 ); IMusicDisplayProperties_Release( music_properties ); ISystemMediaTransportControlsDisplayUpdater_Release( display_updater ); ISystemMediaTransportControls_Release( media_control_statics );

1 0

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

17 Oct '23

Module: wine Branch: master Commit: e99cf458e1d3a3a7f7dbdf6b03271628e0155363 URL: https://gitlab.winehq.org/wine/wine/-/commit/e99cf458e1d3a3a7f7dbdf6b032716… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 19:26:35 2023 -0400 windows.media.mediacontrol/tests: Add IMusicDisplayProperties2::get/put_AlbumTitle() 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 880d16ed87d..c87372aaa02 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -211,6 +211,21 @@ static void test_MediaControlStatics(void) hr = IMusicDisplayProperties_QueryInterface( music_properties, &IID_IMusicDisplayProperties2, (void **)&music_properties2 ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IMusicDisplayProperties2_put_AlbumTitle( music_properties2, NULL ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = WindowsCreateStringReference( L"Wine Hits", wcslen( L"Wine Hits" ), &header, &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IMusicDisplayProperties2_put_AlbumTitle( music_properties2, str ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IMusicDisplayProperties2_get_AlbumTitle( music_properties2, &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 ); + IMusicDisplayProperties2_Release( music_properties2 ); IMusicDisplayProperties_Release( music_properties ); ISystemMediaTransportControlsDisplayUpdater_Release( display_updater );

1 0

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

17 Oct '23

Module: wine Branch: master Commit: 5861f8c55d73bdad0dc6830af80c693a7cbc925d URL: https://gitlab.winehq.org/wine/wine/-/commit/5861f8c55d73bdad0dc6830af80c69… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 19:29:24 2023 -0400 windows.media.mediacontrol: Implement IMusicDisplayProperties2::get/put_AlbumTitle(). Called by Roon. --- dlls/windows.media.mediacontrol/main.c | 12 ++++++++---- dlls/windows.media.mediacontrol/tests/mediacontrol.c | 10 +++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/windows.media.mediacontrol/main.c b/dlls/windows.media.mediacontrol/main.c index a8a2a42811c..7fa74f663f3 100644 --- a/dlls/windows.media.mediacontrol/main.c +++ b/dlls/windows.media.mediacontrol/main.c @@ -123,6 +123,7 @@ struct music_properties IMusicDisplayProperties2 IMusicDisplayProperties2_iface; LONG ref; + HSTRING album_title; HSTRING artist; HSTRING title; }; @@ -266,14 +267,17 @@ DEFINE_IINSPECTABLE( music_properties2, IMusicDisplayProperties2, struct music_p static HRESULT STDMETHODCALLTYPE music_properties2_get_AlbumTitle( IMusicDisplayProperties2 *iface, HSTRING *value ) { - FIXME( "iface %p, value %p stub\n", iface, value ); - return E_NOTIMPL; + struct music_properties *impl = impl_from_IMusicDisplayProperties2( iface ); + TRACE( "iface %p, value %p\n", iface, value ); + return WindowsDuplicateString( impl->album_title, value ); } static HRESULT STDMETHODCALLTYPE music_properties2_put_AlbumTitle( IMusicDisplayProperties2 *iface, HSTRING value ) { - FIXME( "iface %p, value %s stub\n", iface, debugstr_hstring( value ) ); - return E_NOTIMPL; + struct music_properties *impl = impl_from_IMusicDisplayProperties2( iface ); + TRACE( "iface %p, value %p\n", iface, value ); + WindowsDeleteString( impl->album_title ); + return WindowsDuplicateString( value, &impl->album_title ); } static HRESULT STDMETHODCALLTYPE music_properties2_get_TrackNumber( IMusicDisplayProperties2 *iface, UINT32 *value ) diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index c87372aaa02..194b541e6f7 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -212,17 +212,17 @@ static void test_MediaControlStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IMusicDisplayProperties2_put_AlbumTitle( music_properties2, 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 Hits", wcslen( L"Wine Hits" ), &header, &str ); ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IMusicDisplayProperties2_put_AlbumTitle( music_properties2, str ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IMusicDisplayProperties2_get_AlbumTitle( music_properties2, &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: Return success in ISystemMediaTransportControlsDisplayUpdater::Update().
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 911a0c608964edeccd7b3a1c1ab027ef5f4b0352 URL: https://gitlab.winehq.org/wine/wine/-/commit/911a0c608964edeccd7b3a1c1ab027… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 19:38:16 2023 -0400 windows.media.mediacontrol: Return success in ISystemMediaTransportControlsDisplayUpdater::Update(). Called by Roon. --- dlls/windows.media.mediacontrol/main.c | 2 +- dlls/windows.media.mediacontrol/tests/mediacontrol.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.mediacontrol/main.c b/dlls/windows.media.mediacontrol/main.c index 7fa74f663f3..18d7d3ce5f9 100644 --- a/dlls/windows.media.mediacontrol/main.c +++ b/dlls/windows.media.mediacontrol/main.c @@ -476,7 +476,7 @@ static HRESULT WINAPI display_updater_ClearAll( ISystemMediaTransportControlsDis static HRESULT WINAPI display_updater_Update( ISystemMediaTransportControlsDisplayUpdater *iface ) { FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; + return S_OK; } static const struct ISystemMediaTransportControlsDisplayUpdaterVtbl display_updater_vtbl = diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index 194b541e6f7..4adab552d9f 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -171,6 +171,9 @@ 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_Update( display_updater ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControlsDisplayUpdater_get_MusicProperties( display_updater, &music_properties ); ok( hr == S_OK, "got hr %#lx.\n", hr );

1 0