wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Jacek Caban : dwrite/tests: Avoid implicit DWRITE_RENDERING_MODE to DWRITE_RENDERING_MODE1 casts.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 1ba498c5e6e4971e7a2ee8cf47a50af11a0f18ad URL: https://gitlab.winehq.org/wine/wine/-/commit/1ba498c5e6e4971e7a2ee8cf47a50a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 14:26:36 2023 +0200 dwrite/tests: Avoid implicit DWRITE_RENDERING_MODE to DWRITE_RENDERING_MODE1 casts. --- dlls/dwrite/tests/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 81008db6f23..e2b5b9163f1 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7058,7 +7058,8 @@ static void test_GetRecommendedRenderingMode(void) /* IDWriteFontFace3 - and another one */ if (fontface3) { DWRITE_GRID_FIT_MODE gridfit, expected_gridfit; - DWRITE_RENDERING_MODE1 mode1, expected1; + DWRITE_RENDERING_MODE1 mode1; + unsigned int expected1; gasp = get_gasp_flags(fontface, emsize, 1.0f); for (i = 0; i < ARRAY_SIZE(recmode_tests1); ++i)

1 0

Jacek Caban : dwrite: Use DWRITE_FONT_FEATURE_TAG for tags argument type in shape_get_typographic_features.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 2c98df50cb16ed77d90d6e2f8b2e132f16071697 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c98df50cb16ed77d90d6e2f8b2e13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 17 14:07:39 2023 +0200 dwrite: Use DWRITE_FONT_FEATURE_TAG for tags argument type in shape_get_typographic_features. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/shape.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index e87e747d295..7ad8e602cb0 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -829,7 +829,7 @@ extern HRESULT opentype_get_vertical_glyph_variants(struct dwrite_fontface *font extern HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; extern HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; extern HRESULT shape_get_typographic_features(struct scriptshaping_context *context, const unsigned int *scripts, - unsigned int max_tagcount, unsigned int *actual_tagcount, unsigned int *tags) DECLSPEC_HIDDEN; + unsigned int max_tagcount, unsigned int *actual_tagcount, DWRITE_FONT_FEATURE_TAG *tags) DECLSPEC_HIDDEN; extern HRESULT shape_check_typographic_feature(struct scriptshaping_context *context, const unsigned int *scripts, unsigned int tag, unsigned int glyph_count, const UINT16 *glyphs, UINT8 *feature_applies) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 9b2d8b3f1eb..33f7fb78953 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -373,7 +373,7 @@ static int __cdecl tag_array_sorting_compare(const void *a, const void *b) }; HRESULT shape_get_typographic_features(struct scriptshaping_context *context, const unsigned int *scripts, - unsigned int max_tagcount, unsigned int *actual_tagcount, unsigned int *tags) + unsigned int max_tagcount, unsigned int *actual_tagcount, DWRITE_FONT_FEATURE_TAG *tags) { unsigned int i, j, script_index, language_index; struct tag_array t = { 0 };

1 0

Piotr Caban : gdi32: Fix leak in GdiDeleteSpoolFileHandle.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 846784f03fe061367c14ef829e655974cb01c06d URL: https://gitlab.winehq.org/wine/wine/-/commit/846784f03fe061367c14ef829e6559… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 17 12:17:04 2023 +0200 gdi32: Fix leak in GdiDeleteSpoolFileHandle. --- dlls/gdi32/dc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c21bc99a6b6..5f79150cb93 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2766,6 +2766,7 @@ BOOL WINAPI GdiDeleteSpoolFileHandle( HANDLE h ) for (i = 0; i < sh->devmodes_no; i++) HeapFree( GetProcessHeap(), 0, sh->devmodes[i].devmode ); HeapFree( GetProcessHeap(), 0, sh->devmodes ); + HeapFree( GetProcessHeap(), 0, sh ); return TRUE; }

1 0

Fabian Maurer : mf/tests: Increase buffer to prevent stack corruption.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: df01ef80a05bd338fb5756740fdc00029e4e5619 URL: https://gitlab.winehq.org/wine/wine/-/commit/df01ef80a05bd338fb5756740fdc00… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Oct 16 23:51:59 2023 +0200 mf/tests: Increase buffer to prevent stack corruption. init_dmo_media_type_video uses head + extra bytes memory, and with MEDIASUBTYPE_RGB8 the extra bytes are already 1024. This leads to stack corruption. --- dlls/mf/tests/transform.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index c5ef1f5960a..e798601a8b5 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1450,7 +1450,7 @@ static void check_dmo_get_output_size_info_video_(int line, IMediaObject *dmo, { DWORD size, alignment, expected_size; DMO_MEDIA_TYPE *type; - char buffer[1024]; + char buffer[2048]; HRESULT hr; type = (void *)buffer; @@ -6071,7 +6071,7 @@ static void test_wmv_decoder_dmo_input_type(void) }; DMO_MEDIA_TYPE *good_input_type, *bad_input_type, type; - char buffer_good_input[1024], buffer_bad_input[1024]; + char buffer_good_input[2048], buffer_bad_input[2048]; const GUID *input_subtype = input_subtypes[0]; LONG width = 16, height = 16; VIDEOINFOHEADER *header; @@ -6326,7 +6326,7 @@ static void test_wmv_decoder_dmo_input_type(void) static void test_wmv_decoder_dmo_output_type(void) { - char buffer_good_output[1024], buffer_bad_output[1024], buffer_input[1024]; + char buffer_good_output[2048], buffer_bad_output[2048], buffer_input[2048]; DMO_MEDIA_TYPE *good_output_type, *bad_output_type, *input_type, type; const GUID* input_subtype = &MEDIASUBTYPE_WMV1; LONG width = 16, height = 16; @@ -6572,7 +6572,7 @@ static void test_wmv_decoder_media_object(void) IMediaObject *media_object; DMO_MEDIA_TYPE *type; const BYTE *wmv_data; - char buffer[1024]; + char buffer[2048]; HRESULT hr; ULONG ret;

1 0

Henri Verbeet : vkd3d-shader/spirv: Initialise "symbol.descriptor_array" in spirv_compiler_emit_combined_sampler_declarations().
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: vkd3d Branch: master Commit: 4e8ba62481d50b200a5b1a41f3a81af473d888bc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4e8ba62481d50b200a5b1a41f3a81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 15 17:48:32 2023 +0200 vkd3d-shader/spirv: Initialise "symbol.descriptor_array" in spirv_compiler_emit_combined_sampler_declarations(). Besides simply avoiding carrying around some uninitialised data, we check "symbol->descriptor_array" in spirv_compiler_prepare_image(), both for separate resources and for combined resource/sampler symbols. --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 90f1adeb..bd9e7a33 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5904,6 +5904,7 @@ static void spirv_compiler_emit_combined_sampler_declarations(struct spirv_compi current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX ? 0 : current->sampler_space, current->sampler_index); symbol.id = var_id; + symbol.descriptor_array = NULL; symbol.info.resource.range = *resource_range; symbol.info.resource.sampled_type = sampled_type; symbol.info.resource.type_id = image_type_id;

1 0

Henri Verbeet : tests: Specify argument types for dxcompiler_create().
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: vkd3d Branch: master Commit: 803e5183ccb06306129d986f367ccd15a3d25133 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/803e5183ccb06306129d986f367cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 16 16:00:46 2023 +0200 tests: Specify argument types for dxcompiler_create(). --- tests/shader_runner.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 423f42bd..9b9d1d9e 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1450,7 +1450,7 @@ out: #endif #if defined(SONAME_LIBDXCOMPILER) && !defined(VKD3D_CROSSTEST) -static IDxcCompiler3 *dxcompiler_create() +static IDxcCompiler3 *dxcompiler_create(void) { DxcCreateInstanceProc create_instance; IDxcCompiler3 *compiler; @@ -1475,7 +1475,7 @@ static IDxcCompiler3 *dxcompiler_create() return compiler; } #elif !defined(VKD3D_CROSSTEST) -static IDxcCompiler3 *dxcompiler_create() +static IDxcCompiler3 *dxcompiler_create(void) { return NULL; }

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

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/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: 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

← Newer
1
...
28
29
30
31
32
33
34
...
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