October 2023 - Wine-commits

Joel Holdsworth : ntdll: Add support for FILE_{RENAME,LINK}_IGNORE_READONLY_ATTRIBUTE.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: e916255216e708e7646f87ebc5a860039660a87f URL: https://gitlab.winehq.org/wine/wine/-/commit/e916255216e708e7646f87ebc5a860… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Aug 7 11:32:44 2023 +0100 ntdll: Add support for FILE_{RENAME,LINK}_IGNORE_READONLY_ATTRIBUTE. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 14 +++++++------- dlls/ntdll/unix/file.c | 4 ++-- server/fd.c | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index a00a425582c..4e1750a4751 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2259,10 +2259,10 @@ static void test_file_rename_information_ex(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformationEx ); - todo_wine ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); - todo_wine ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); + ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - todo_wine ok( fileDeleted, "file should not exist\n" ); + ok( fileDeleted, "file should not exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); @@ -3076,8 +3076,8 @@ static void test_file_link_information_ex(void) return; } - ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); - todo_wine ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); + todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -3110,8 +3110,8 @@ static void test_file_link_information_ex(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformationEx ); - todo_wine ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); - todo_wine ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); + ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index aa2ec9bae59..c6533710365 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4797,7 +4797,7 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, else flags = info->Flags; - if (flags & ~FILE_RENAME_REPLACE_IF_EXISTS) + if (flags & ~(FILE_RENAME_REPLACE_IF_EXISTS | FILE_RENAME_IGNORE_READONLY_ATTRIBUTE)) FIXME( "unsupported flags: %#x\n", flags ); name_str.Buffer = info->FileName; @@ -4844,7 +4844,7 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, else flags = info->Flags; - if (flags & ~FILE_LINK_REPLACE_IF_EXISTS) + if (flags & ~(FILE_LINK_REPLACE_IF_EXISTS | FILE_LINK_IGNORE_READONLY_ATTRIBUTE)) FIXME( "unsupported flags: %#x\n", flags ); name_str.Buffer = info->FileName; diff --git a/server/fd.c b/server/fd.c index 00c0e4ac847..8576882aaa9 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2601,7 +2601,8 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da } /* read-only files cannot be replaced */ - if (!(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + if (!(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)) && + !(flags & FILE_RENAME_IGNORE_READONLY_ATTRIBUTE)) { set_error( STATUS_ACCESS_DENIED ); goto failed;

1 0

Nikolay Sivov : d3d10/effect: Add support for shift instructions.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 41ab207c71cfaa82ef95c83b291654aba023a45c URL: https://gitlab.winehq.org/wine/wine/-/commit/41ab207c71cfaa82ef95c83b291654… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 5 00:20:47 2023 +0200 d3d10/effect: Add support for shift instructions. --- dlls/d3d10/effect.c | 43 ++++++++++ dlls/d3d10/tests/effect.c | 215 ++++++++++++++++++++++++++++++---------------- 2 files changed, 183 insertions(+), 75 deletions(-)

1 0

Piotr Caban : wineps: Add support for EMR_EXTCREATEPEN record playback.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: ad232b530a43743819d8a2b5a443ffa2e55d0566 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad232b530a43743819d8a2b5a443ff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 13:27:29 2023 +0200 wineps: Add support for EMR_EXTCREATEPEN record playback. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55606 --- dlls/wineps.drv/printproc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 74f43b6d27c..3de05eea3f5 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2309,6 +2309,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case OBJ_PEN: return PSDRV_SelectPen(data->ctx, obj, NULL) != NULL; case OBJ_BRUSH: return PSDRV_SelectBrush(data->ctx, obj, pattern) != NULL; case OBJ_FONT: return PSDRV_SelectFont(data->ctx, obj, &aa_flags) != NULL; + case OBJ_EXTPEN: return PSDRV_SelectPen(data->ctx, obj, NULL) != NULL; default: FIXME("unhandled object type %ld\n", GetObjectType(obj)); return 1; @@ -2843,6 +2844,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SELECTCLIPPATH: case EMR_EXTSELECTCLIPRGN: case EMR_EXTCREATEFONTINDIRECTW: + case EMR_EXTCREATEPEN: case EMR_SETLAYOUT: return PlayEnhMetaFileRecord(data->ctx->hdc, htable, rec, handle_count); default:

1 0

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

05 Oct '23

Module: wine Branch: master Commit: 0e90cbf98903b766378559491519328334bae3db URL: https://gitlab.winehq.org/wine/wine/-/commit/0e90cbf98903b76637855949151932… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Sep 27 00:30:50 2023 -0400 include: Add ISystemMediaTransportControls interface definition. --- include/windows.media.idl | 168 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/include/windows.media.idl b/include/windows.media.idl index 03d03a6389f..4896f66b45b 100644 --- a/include/windows.media.idl +++ b/include/windows.media.idl @@ -26,9 +26,24 @@ import "windows.foundation.idl"; namespace Windows.Media { typedef enum AudioProcessing AudioProcessing; + typedef enum MediaPlaybackStatus MediaPlaybackStatus; + typedef enum SoundLevel SoundLevel; + typedef enum SystemMediaTransportControlsButton SystemMediaTransportControlsButton; + typedef enum SystemMediaTransportControlsProperty SystemMediaTransportControlsProperty; interface IMediaControl; interface IMediaMarker; + interface ISystemMediaTransportControls; + interface ISystemMediaTransportControls2; + interface ISystemMediaTransportControlsButtonPressedEventArgs; + interface ISystemMediaTransportControlsDisplayUpdater; + interface ISystemMediaTransportControlsPropertyChangedEventArgs; + interface ISystemMediaTransportControlsStatics; + + runtimeclass SystemMediaTransportControls; + runtimeclass SystemMediaTransportControlsButtonPressedEventArgs; + runtimeclass SystemMediaTransportControlsDisplayUpdater; + runtimeclass SystemMediaTransportControlsPropertyChangedEventArgs; declare { @@ -36,6 +51,8 @@ namespace Windows.Media interface Windows.Foundation.Collections.IIterator<Windows.Media.IMediaMarker*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; interface Windows.Foundation.Collections.IVector<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.TypedEventHandler<Windows.Media.SystemMediaTransportControls*, Windows.Media.SystemMediaTransportControlsButtonPressedEventArgs*>; + interface Windows.Foundation.TypedEventHandler<Windows.Media.SystemMediaTransportControls*, Windows.Media.SystemMediaTransportControlsPropertyChangedEventArgs*>; } [ @@ -47,6 +64,53 @@ namespace Windows.Media Raw = 1, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum MediaPlaybackStatus + { + Closed = 0, + Changing = 1, + Stopped = 2, + Playing = 3, + Paused = 4, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum SoundLevel + { + Muted = 0, + Low = 1, + Full = 2, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum SystemMediaTransportControlsButton + { + Play = 0, + Pause = 1, + Stop = 2, + Record = 3, + FastForward = 4, + Rewind = 5, + Next = 6, + Previous = 7, + ChannelUp = 8, + ChannelDown = 9, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum SystemMediaTransportControlsProperty + { + SoundLevel = 0, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625) @@ -58,4 +122,108 @@ namespace Windows.Media [propget] HRESULT Text([out, retval] HSTRING *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SystemMediaTransportControls), + uuid(99fa3ff4-1742-42a6-902e-087d41f965ec) + ] + interface ISystemMediaTransportControls : IInspectable + { + [propget] HRESULT PlaybackStatus([out, retval] Windows.Media.MediaPlaybackStatus *value); + [propput] HRESULT PlaybackStatus([in] Windows.Media.MediaPlaybackStatus value); + [propget] HRESULT DisplayUpdater([out, retval] Windows.Media.SystemMediaTransportControlsDisplayUpdater **value); + [propget] HRESULT SoundLevel([out, retval] Windows.Media.SoundLevel *value); + [propget] HRESULT IsEnabled([out, retval] boolean *value); + [propput] HRESULT IsEnabled([in] boolean value); + [propget] HRESULT IsPlayEnabled([out, retval] boolean *value); + [propput] HRESULT IsPlayEnabled([in] boolean value); + [propget] HRESULT IsStopEnabled([out, retval] boolean *value); + [propput] HRESULT IsStopEnabled([in] boolean value); + [propget] HRESULT IsPauseEnabled([out, retval] boolean *value); + [propput] HRESULT IsPauseEnabled([in] boolean value); + [propget] HRESULT IsRecordEnabled([out, retval] boolean *value); + [propput] HRESULT IsRecordEnabled([in] boolean value); + [propget] HRESULT IsFastForwardEnabled([out, retval] boolean *value); + [propput] HRESULT IsFastForwardEnabled([in] boolean value); + [propget] HRESULT IsRewindEnabled([out, retval] boolean *value); + [propput] HRESULT IsRewindEnabled([in] boolean value); + [propget] HRESULT IsPreviousEnabled([out, retval] boolean *value); + [propput] HRESULT IsPreviousEnabled([in] boolean value); + [propget] HRESULT IsNextEnabled([out, retval] boolean *value); + [propput] HRESULT IsNextEnabled([in] boolean value); + [propget] HRESULT IsChannelUpEnabled([out, retval] boolean *value); + [propput] HRESULT IsChannelUpEnabled([in] boolean value); + [propget] HRESULT IsChannelDownEnabled([out, retval] boolean *value); + [propput] HRESULT IsChannelDownEnabled([in] boolean value); + [eventadd] HRESULT ButtonPressed( + [in] Windows.Foundation.TypedEventHandler<Windows.Media.SystemMediaTransportControls *, Windows.Media.SystemMediaTransportControlsButtonPressedEventArgs *> *handler, + [out, retval] EventRegistrationToken *token + ); + [eventremove] HRESULT ButtonPressed([in] EventRegistrationToken token); + [eventadd] HRESULT PropertyChanged( + [in] Windows.Foundation.TypedEventHandler<Windows.Media.SystemMediaTransportControls *, Windows.Media.SystemMediaTransportControlsPropertyChangedEventArgs *> *handler, + [out, retval] EventRegistrationToken *token + ); + [eventremove] HRESULT PropertyChanged([in] EventRegistrationToken token); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SystemMediaTransportControlsButtonPressedEventArgs), + uuid(b7f47116-a56f-4dc8-9e11-92031f4a87c2) + ] + interface ISystemMediaTransportControlsButtonPressedEventArgs : IInspectable + { + [propget] HRESULT Button([out, retval] Windows.Media.SystemMediaTransportControlsButton *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SystemMediaTransportControlsPropertyChangedEventArgs), + uuid(d0ca0936-339b-4cb3-8eeb-737607f56e08) + ] + interface ISystemMediaTransportControlsPropertyChangedEventArgs : IInspectable + { + [propget] HRESULT Property([out, retval] Windows.Media.SystemMediaTransportControlsProperty *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Media.ISystemMediaTransportControlsStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(mta) + ] + runtimeclass SystemMediaTransportControls + { + [default] interface Windows.Media.ISystemMediaTransportControls; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.ISystemMediaTransportControls2; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SystemMediaTransportControlsButtonPressedEventArgs + { + [default] interface Windows.Media.ISystemMediaTransportControlsButtonPressedEventArgs; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass SystemMediaTransportControlsDisplayUpdater + { + [default] interface Windows.Media.ISystemMediaTransportControlsDisplayUpdater; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SystemMediaTransportControlsPropertyChangedEventArgs + { + [default] interface Windows.Media.ISystemMediaTransportControlsPropertyChangedEventArgs; + } }

1 0

Mohamad Al-Jaf : windows.media.mediacontrol: Add stub DLL.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 8b329317b711182aa04be1951665eac7ed1aa1e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b329317b711182aa04be1951665ea… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Sep 13 02:06:37 2023 -0400 windows.media.mediacontrol: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.media.mediacontrol/Makefile.in | 8 ++ dlls/windows.media.mediacontrol/classes.idl | 23 ++++ dlls/windows.media.mediacontrol/main.c | 139 +++++++++++++++++++++ dlls/windows.media.mediacontrol/private.h | 38 ++++++ dlls/windows.media.mediacontrol/tests/Makefile.in | 5 + .../tests/mediacontrol.c | 86 +++++++++++++ .../windows.media.mediacontrol.spec | 11 ++ 9 files changed, 315 insertions(+)

1 0

Mohamad Al-Jaf : include: Add systemmediatransportcontrolsinterop.idl file.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 8b34decc7b65d23d2b38d58af887f1faa2e4266c URL: https://gitlab.winehq.org/wine/wine/-/commit/8b34decc7b65d23d2b38d58af887f1… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Sep 27 01:01:04 2023 -0400 include: Add systemmediatransportcontrolsinterop.idl file. --- include/Makefile.in | 1 + include/systemmediatransportcontrolsinterop.idl | 28 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7d7697bc015..987e45dffa9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -733,6 +733,7 @@ SOURCES = \ structuredquerycondition.idl \ svrapi.h \ synchapi.h \ + systemmediatransportcontrolsinterop.idl \ t2embapi.h \ tapi.h \ taskschd.idl \ diff --git a/include/systemmediatransportcontrolsinterop.idl b/include/systemmediatransportcontrolsinterop.idl new file mode 100644 index 00000000000..1679176be04 --- /dev/null +++ b/include/systemmediatransportcontrolsinterop.idl @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "inspectable.idl"; + +[ + object, + uuid(ddb0472d-c911-4a1f-86d9-dc3d71a95f5a) +] +interface ISystemMediaTransportControlsInterop : IInspectable +{ + HRESULT GetForWindow([in] HWND window, [in] REFIID riid, [out, retval, iid_is(riid)] void **control); +}

1 0

Mohamad Al-Jaf : windows.media.mediacontrol: Add ISystemMediaTransportControlsInterop stub interface.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 99fdedb4b683ba2477eaee70561071ba37e47150 URL: https://gitlab.winehq.org/wine/wine/-/commit/99fdedb4b683ba2477eaee70561071… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 01:03:01 2023 -0400 windows.media.mediacontrol: Add ISystemMediaTransportControlsInterop stub interface. --- dlls/windows.media.mediacontrol/classes.idl | 1 + dlls/windows.media.mediacontrol/main.c | 30 +++++++++++++++++ dlls/windows.media.mediacontrol/private.h | 39 ++++++++++++++++++++++ .../tests/mediacontrol.c | 7 ++++ 4 files changed, 77 insertions(+) diff --git a/dlls/windows.media.mediacontrol/classes.idl b/dlls/windows.media.mediacontrol/classes.idl index 35f3e786399..b58facdc46a 100644 --- a/dlls/windows.media.mediacontrol/classes.idl +++ b/dlls/windows.media.mediacontrol/classes.idl @@ -20,4 +20,5 @@ #pragma makedep register +#include "systemmediatransportcontrolsinterop.idl" #include "windows.media.idl" diff --git a/dlls/windows.media.mediacontrol/main.c b/dlls/windows.media.mediacontrol/main.c index 506e068cf60..2bd5e02b7bc 100644 --- a/dlls/windows.media.mediacontrol/main.c +++ b/dlls/windows.media.mediacontrol/main.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mediacontrol); struct media_control_statics { IActivationFactory IActivationFactory_iface; + ISystemMediaTransportControlsInterop ISystemMediaTransportControlsInterop_iface; LONG ref; }; @@ -51,6 +52,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_ISystemMediaTransportControlsInterop )) + { + *out = &impl->ISystemMediaTransportControlsInterop_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -109,9 +117,31 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( media_control_statics, ISystemMediaTransportControlsInterop, struct media_control_statics, IActivationFactory_iface ) + +static HRESULT WINAPI media_control_statics_GetForWindow( ISystemMediaTransportControlsInterop *iface, HWND window, REFIID riid, void **control ) +{ + FIXME( "iface %p, window %p, riid %s, control %p stub!\n", iface, window, debugstr_guid( riid ), control ); + return E_NOTIMPL; +} + +static const struct ISystemMediaTransportControlsInteropVtbl media_control_statics_vtbl = +{ + media_control_statics_QueryInterface, + media_control_statics_AddRef, + media_control_statics_Release, + /* IInspectable methods */ + media_control_statics_GetIids, + media_control_statics_GetRuntimeClassName, + media_control_statics_GetTrustLevel, + /* ISystemMediaTransportControlsInterop methods */ + media_control_statics_GetForWindow, +}; + static struct media_control_statics media_control_statics = { {&factory_vtbl}, + {&media_control_statics_vtbl}, 1, }; diff --git a/dlls/windows.media.mediacontrol/private.h b/dlls/windows.media.mediacontrol/private.h index 676bc10fc87..b5f4e6f262e 100644 --- a/dlls/windows.media.mediacontrol/private.h +++ b/dlls/windows.media.mediacontrol/private.h @@ -34,5 +34,44 @@ #include "windows.foundation.h" #define WIDL_using_Windows_Media #include "windows.media.h" +#include "systemmediatransportcontrolsinterop.h" + +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) #endif diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index 70913ea3d00..cc7fcce052c 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -30,6 +30,7 @@ #include "windows.foundation.h" #define WIDL_using_Windows_Media #include "windows.media.h" +#include "systemmediatransportcontrolsinterop.h" #include "wine/test.h" @@ -48,6 +49,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_MediaControlStatics(void) { static const WCHAR *media_control_statics_name = L"Windows.Media.SystemMediaTransportControls"; + ISystemMediaTransportControlsInterop *media_control_interop_statics; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -69,6 +71,11 @@ static void test_MediaControlStatics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_ISystemMediaTransportControlsInterop, (void **)&media_control_interop_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = ISystemMediaTransportControlsInterop_Release( media_control_interop_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Mohamad Al-Jaf : windows.media.mediacontrol/tests: Add ISystemMediaTransportControlsInterop::GetForWindow() tests.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 478513819c3eb349723a41bcccfbdace9708fb89 URL: https://gitlab.winehq.org/wine/wine/-/commit/478513819c3eb349723a41bcccfbda… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 02:10:42 2023 -0400 windows.media.mediacontrol/tests: Add ISystemMediaTransportControlsInterop::GetForWindow() tests. --- dlls/windows.media.mediacontrol/tests/Makefile.in | 2 +- dlls/windows.media.mediacontrol/tests/mediacontrol.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.mediacontrol/tests/Makefile.in b/dlls/windows.media.mediacontrol/tests/Makefile.in index ab07a0ef546..b0bceb0ac75 100644 --- a/dlls/windows.media.mediacontrol/tests/Makefile.in +++ b/dlls/windows.media.mediacontrol/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windows.media.mediacontrol.dll -IMPORTS = combase +IMPORTS = combase user32 C_SRCS = \ mediacontrol.c diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index cc7fcce052c..6b0b2f9a15f 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -50,7 +50,9 @@ static void test_MediaControlStatics(void) { static const WCHAR *media_control_statics_name = L"Windows.Media.SystemMediaTransportControls"; ISystemMediaTransportControlsInterop *media_control_interop_statics; + ISystemMediaTransportControls *media_control_statics = NULL; IActivationFactory *factory; + HWND window = NULL; HSTRING str; HRESULT hr; LONG ref; @@ -74,6 +76,18 @@ static void test_MediaControlStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_ISystemMediaTransportControlsInterop, (void **)&media_control_interop_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControlsInterop_GetForWindow( media_control_interop_statics, NULL, &IID_ISystemMediaTransportControls, (void **)&media_control_statics ); + todo_wine ok( hr == E_POINTER || broken(hr == 0x80070578) /* Win8 */, "got hr %#lx.\n", hr ); + + window = CreateWindowExA( 0, "static", 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, 800, 600, NULL, NULL, GetModuleHandleA( NULL ), 0 ); + ok( window != NULL, "Failed to create a window\n" ); + hr = ISystemMediaTransportControlsInterop_GetForWindow( media_control_interop_statics, window, &IID_ISystemMediaTransportControlsInterop, (void **)&media_control_statics ); + todo_wine ok( hr == E_NOINTERFACE || broken(hr == 0x80070578) /* Win8 */, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControlsInterop_GetForWindow( media_control_interop_statics, window, &IID_ISystemMediaTransportControls, (void **)&media_control_statics ); + todo_wine ok( hr == S_OK || broken(hr == 0x80070578) /* Win8 */, "got hr %#lx.\n", hr ); + if (media_control_statics) ISystemMediaTransportControls_Release( media_control_statics ); + + DestroyWindow( window ); ref = ISystemMediaTransportControlsInterop_Release( media_control_interop_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Mohamad Al-Jaf : windows.media.mediacontrol: Implement ISystemMediaTransportControlsInterop::GetForWindow().
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 0471de64de625228036d2e9059d80d578fc2ef28 URL: https://gitlab.winehq.org/wine/wine/-/commit/0471de64de625228036d2e9059d80d… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 02:12:42 2023 -0400 windows.media.mediacontrol: Implement ISystemMediaTransportControlsInterop::GetForWindow(). --- dlls/windows.media.mediacontrol/main.c | 314 ++++++++++++++++++++- .../tests/mediacontrol.c | 26 +- 2 files changed, 334 insertions(+), 6 deletions(-)

1 0

Mohamad Al-Jaf : windows.media.mediacontrol/tests: Add some ISystemMediaTransportControls properties tests.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 1435688b68803fb0ee096444152aa9282b566a51 URL: https://gitlab.winehq.org/wine/wine/-/commit/1435688b68803fb0ee096444152aa9… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 02:51:37 2023 -0400 windows.media.mediacontrol/tests: Add some ISystemMediaTransportControls properties tests. --- .../tests/mediacontrol.c | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index b97340f2bff..45695fe5432 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -63,6 +63,7 @@ static void test_MediaControlStatics(void) ISystemMediaTransportControls *media_control_statics = NULL; IActivationFactory *factory; HWND window = NULL; + BOOLEAN value; HSTRING str; HRESULT hr; LONG ref; @@ -102,6 +103,49 @@ static void test_MediaControlStatics(void) ok( hr == S_OK || broken(hr == 0x80070578) /* Win8 */, "got hr %#lx.\n", hr ); if (!media_control_statics) goto done; + hr = ISystemMediaTransportControls_put_PlaybackStatus( media_control_statics, -1 ); + todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControls_put_PlaybackStatus( media_control_statics, 5 ); + todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControls_put_PlaybackStatus( media_control_statics, MediaPlaybackStatus_Closed ); + todo_wine ok( hr == S_OK || broken(hr == S_FALSE) /* Win10 1507,1607 */, "got hr %#lx.\n", hr ); + + hr = ISystemMediaTransportControls_put_IsPlayEnabled( media_control_statics, FALSE ); + todo_wine ok( hr == S_OK || broken(hr == S_FALSE) /* Win10 1507,1607 */, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControls_put_IsPauseEnabled( media_control_statics, FALSE ); + todo_wine ok( hr == S_OK || broken(hr == S_FALSE) /* Win10 1507,1607 */, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControls_put_IsPreviousEnabled( media_control_statics, FALSE ); + todo_wine ok( hr == S_OK || broken(hr == S_FALSE) /* Win10 1507,1607 */, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControls_put_IsNextEnabled( media_control_statics, FALSE ); + todo_wine ok( hr == S_OK || broken(hr == S_FALSE) /* Win10 1507,1607 */, "got hr %#lx.\n", hr ); + hr = ISystemMediaTransportControls_put_IsEnabled( media_control_statics, FALSE ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + + value = TRUE; + hr = ISystemMediaTransportControls_get_IsPlayEnabled( media_control_statics, &value ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( value == FALSE, "got value %d.\n", value ); + + value = TRUE; + hr = ISystemMediaTransportControls_get_IsPauseEnabled( media_control_statics, &value ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( value == FALSE, "got value %d.\n", value ); + + value = TRUE; + hr = ISystemMediaTransportControls_get_IsPreviousEnabled( media_control_statics, &value ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( value == FALSE, "got value %d.\n", value ); + + value = TRUE; + hr = ISystemMediaTransportControls_get_IsNextEnabled( media_control_statics, &value ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( value == FALSE, "got value %d.\n", value ); + + value = TRUE; + hr = ISystemMediaTransportControls_get_IsEnabled( media_control_statics, &value ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( value == FALSE, "got value %d.\n", value ); + ref = ISystemMediaTransportControls_Release( media_control_statics ); ok( ref == 1 || broken(ref == 3) /* Win10 1507 */ || broken(ref == 2) /* Win10 1607 */, "got ref %ld.\n", ref ); done:

1 0