October 2023 - Wine-commits

Alex Henrie : iccvid: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: 53383beb3773c37cd47cc79d6bb3178e32e834af URL: https://gitlab.winehq.org/wine/wine/-/commit/53383beb3773c37cd47cc79d6bb317… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:30:54 2023 -0600 iccvid: Use debugstr_fourcc instead of debugstr_an. --- dlls/iccvid/iccvid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 4dc418c590b..cffc75be58e 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -750,7 +750,7 @@ static void ICCVID_dump_BITMAPINFO(const BITMAPINFO * bmi) bmi->bmiHeader.biBitCount, bmi->bmiHeader.biHeight, bmi->bmiHeader.biWidth, - debugstr_an( (const char *)&bmi->bmiHeader.biCompression, 4 ) ); + debugstr_fourcc(bmi->bmiHeader.biCompression)); } static inline int ICCVID_CheckMask(RGBQUAD bmiColors[3], COLORREF redMask, COLORREF blueMask, COLORREF greenMask)

1 0

Alex Henrie : d3d10: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: beb1805ca09ffa1daac5833a53b93f3cbd473588 URL: https://gitlab.winehq.org/wine/wine/-/commit/beb1805ca09ffa1daac5833a53b93f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:27:31 2023 -0600 d3d10: Use debugstr_fourcc instead of debugstr_an. --- dlls/d3d10/effect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cc08f1ac1f9..6e2b67bb700 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2853,7 +2853,7 @@ static HRESULT fxlvm_chunk_handler(const struct vkd3d_shader_dxbc_section_desc * size_t data_size = section->data.size; uint32_t tag = section->tag; - TRACE("Chunk tag: %s, size: %Iu.\n", debugstr_an((const char *)&tag, 4), data_size); + TRACE("Chunk tag: %s, size: %Iu.\n", debugstr_fourcc(tag), data_size); switch (tag) { @@ -2867,7 +2867,7 @@ static HRESULT fxlvm_chunk_handler(const struct vkd3d_shader_dxbc_section_desc * return parse_fx10_ctab(ctx, data, data_size); default: - FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); + FIXME("Unhandled chunk %s.\n", debugstr_fourcc(tag)); return S_OK; } } @@ -4325,12 +4325,12 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *effect, const void *data, SIZE_T section = &dxbc_desc.sections[i]; TRACE("Section %u: tag %s, data {%p, %#Ix}.\n", - i, debugstr_an((const char *)&section->tag, 4), + i, debugstr_fourcc(section->tag), section->data.code, section->data.size); if (section->tag != TAG_FX10) { - FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&section->tag, 4)); + FIXME("Unhandled chunk %s.\n", debugstr_fourcc(section->tag)); continue; }

1 0

Alex Henrie : dwrite: Use the debugstr_fourcc function instead of reimplementing it.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: a23d21a902c5d870e12b1f2d173ad6b7af8a3bce URL: https://gitlab.winehq.org/wine/wine/-/commit/a23d21a902c5d870e12b1f2d173ad6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:29:57 2023 -0600 dwrite: Use the debugstr_fourcc function instead of reimplementing it. --- dlls/dwrite/analyzer.c | 6 +++--- dlls/dwrite/dwrite_private.h | 5 ----- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/layout.c | 2 +- dlls/dwrite/opentype.c | 2 +- dlls/dwrite/shape.c | 4 ++-- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3c8e25d8efe..7e64131d4de 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -208,7 +208,7 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last const char *debugstr_sa_script(UINT16 script) { - return script < Script_LastId ? debugstr_tag(dwritescripts_properties[script].props.isoScriptCode) : "undefined"; + return script < Script_LastId ? debugstr_fourcc(dwritescripts_properties[script].props.isoScriptCode) : "undefined"; } static const struct fallback_description @@ -1508,7 +1508,7 @@ static void analyzer_dump_user_features(DWRITE_TYPOGRAPHIC_FEATURES const **feat for (i = 0, start = 0; i < feature_ranges; start += feature_range_lengths[i++]) { TRACE("feature range [%u,%u)\n", start, start + feature_range_lengths[i]); for (j = 0; j < features[i]->featureCount; j++) - TRACE("feature %s, parameter %u\n", debugstr_tag(features[i]->features[j].nameTag), + TRACE("feature %s, parameter %u\n", debugstr_fourcc(features[i]->features[j].nameTag), features[i]->features[j].parameter); } } @@ -2188,7 +2188,7 @@ static HRESULT WINAPI dwritetextanalyzer2_CheckTypographicFeature(IDWriteTextAna struct dwrite_fontface *font_obj; HRESULT hr; - TRACE("%p, %p, %u, %s, %s, %u, %p, %p.\n", iface, fontface, sa.script, debugstr_w(locale), debugstr_tag(feature), + TRACE("%p, %p, %u, %s, %s, %u, %p, %p.\n", iface, fontface, sa.script, debugstr_w(locale), debugstr_fourcc(feature), glyph_count, glyphs, feature_applies); if (sa.script > Script_LastId) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7ad8e602cb0..7a819b03ec3 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -108,11 +108,6 @@ static inline BOOL dwrite_array_reserve(void **elements, size_t *capacity, size_ return TRUE; } -static inline const char *debugstr_tag(DWORD tag) -{ - return debugstr_an((char *)&tag, 4); -} - const char *debugstr_sa_script(UINT16) DECLSPEC_HIDDEN; static inline unsigned short get_table_entry_16(const unsigned short *table, WCHAR ch) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 59ed2a99a5d..6a3e49dcc58 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -674,7 +674,7 @@ const void* get_fontface_table(IDWriteFontFace5 *fontface, UINT32 tag, struct dw hr = IDWriteFontFace5_TryGetFontTable(fontface, tag, (const void **)&table->data, &table->size, &table->context, &table->exists); if (FAILED(hr) || !table->exists) { - TRACE("Font does not have %s table\n", debugstr_tag(tag)); + TRACE("Font does not have %s table\n", debugstr_fourcc(tag)); return NULL; } @@ -1050,7 +1050,7 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace5 *iface, UI struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); struct file_stream_desc stream_desc; - TRACE("%p, %s, %p, %p, %p, %p.\n", iface, debugstr_tag(table_tag), table_data, table_size, context, exists); + TRACE("%p, %s, %p, %p, %p, %p.\n", iface, debugstr_fourcc(table_tag), table_data, table_size, context, exists); stream_desc.stream = fontface->stream; stream_desc.face_type = fontface->type; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0d08ba99de6..157fc886a46 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5413,7 +5413,7 @@ static HRESULT WINAPI dwritetypography_AddFontFeature(IDWriteTypography *iface, { struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); - TRACE("%p, %s, %u.\n", iface, debugstr_tag(feature.nameTag), feature.parameter); + TRACE("%p, %s, %u.\n", iface, debugstr_fourcc(feature.nameTag), feature.parameter); if (!dwrite_array_reserve((void **)&typography->features, &typography->capacity, typography->count + 1, sizeof(*typography->features))) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index dfb410e2423..b32bfd8c5c3 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3140,7 +3140,7 @@ static unsigned int opentype_get_sbix_formats(IDWriteFontFace5 *fontface) ret |= DWRITE_GLYPH_IMAGE_FORMATS_TIFF; break; default: - FIXME("unexpected bitmap format %s\n", debugstr_tag(GET_BE_DWORD(glyph_data->graphic_type))); + FIXME("unexpected bitmap format %s\n", debugstr_fourcc(GET_BE_DWORD(glyph_data->graphic_type))); } } } diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 33f7fb78953..6dfd1b15176 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -272,8 +272,8 @@ HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigne if ((language = shape_select_language(cache, MS_GPOS_TAG, script_index, language, &language_index))) { - TRACE("script %s, language %s.\n", debugstr_tag(script), language != ~0u ? - debugstr_tag(language) : "deflangsys"); + TRACE("script %s, language %s.\n", debugstr_fourcc(script), language != ~0u ? + debugstr_fourcc(language) : "deflangsys"); opentype_layout_apply_gpos_features(context, script_index, language_index, &features); } }

1 0

Alex Henrie : d3dx9_36: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard 17 Oct '23

17 Oct '23

Module: wine Branch: master Commit: c7d9c4a8b6c21427fb0dd4d1a31b4dcba28d3cb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7d9c4a8b6c21427fb0dd4d1a31b4d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:29:15 2023 -0600 d3dx9_36: Use debugstr_fourcc instead of debugstr_an. --- dlls/d3dx9_36/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 39afe6740c0..419bd92884a 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -214,7 +214,7 @@ const struct pixel_format_desc *get_format_info(D3DFORMAT format) unsigned int i = 0; while(formats[i].format != format && formats[i].format != D3DFMT_UNKNOWN) i++; if (formats[i].format == D3DFMT_UNKNOWN) - FIXME("Unknown format %#x (as FOURCC %s).\n", format, debugstr_an((const char *)&format, 4)); + FIXME("Unknown format %s.\n", debugstr_fourcc(format)); return &formats[i]; }

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

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

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

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