- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Relocate dynamic base modules when mapping them.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: ec3de128257a8ceb0637fae9d9fd2b067bb0e0d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec3de128257a8ceb0637fae9d9fd2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 5 10:43:02 2023 +0200 ntdll: Relocate dynamic base modules when mapping them. --- dlls/kernel32/tests/loader.c | 4 ++-- dlls/ntdll/unix/virtual.c | 25 ++++++++++++++++++++++++- server/mapping.c | 3 ++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index c250fc5d52d..ec6f2d5c6a7 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2379,7 +2379,7 @@ static void test_import_resolution(void) offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, GetCurrentProcess(), (void **)&mod, 0, 0, &offset, &size, 1 /* ViewShare */, 0, PAGE_READONLY ); - todo_wine_if (test < 6) + todo_wine_if (test == 5) ok( status == (test == 6 ? STATUS_IMAGE_NOT_AT_BASE : STATUS_SUCCESS), "NtMapViewOfSection failed %lx\n", status ); ok( mod != (void *)nt.OptionalHeader.ImageBase, "loaded at image base %p\n", mod ); @@ -2392,7 +2392,7 @@ static void test_import_resolution(void) "tls relocated %p / %p\n", (void *)ptr->tls.StartAddressOfRawData, (char *)nt.OptionalHeader.ImageBase + DATA_RVA( data.tls_data )); } - else todo_wine + else todo_wine_if (test == 5) { ok( (void *)pnt->OptionalHeader.ImageBase == mod, "not at base %p / %p\n", (void *)pnt->OptionalHeader.ImageBase, mod ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index c017b45fc1e..855aa9cd1eb 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2687,7 +2687,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena IMAGE_NT_HEADERS *nt; IMAGE_SECTION_HEADER sections[96]; IMAGE_SECTION_HEADER *sec; - IMAGE_DATA_DIRECTORY *imports; + IMAGE_DATA_DIRECTORY *imports, *relocs; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; off_t pos; @@ -2695,6 +2695,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena char *header_end; char *ptr = view->base; SIZE_T header_size, total_size = view->size; + INT_PTR delta; TRACE_(module)( "mapping PE file %s at %p-%p\n", debugstr_w(filename), ptr, ptr + total_size ); @@ -2848,6 +2849,28 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena #endif if (machine && machine != nt->FileHeader.Machine) return STATUS_NOT_SUPPORTED; + /* relocate to dynamic base */ + + if (image_info->map_addr && (delta = image_info->map_addr - image_info->base)) + { + TRACE_(module)( "relocating %s dynamic base %lx -> %lx mapped at %p\n", debugstr_w(filename), + (ULONG_PTR)image_info->base, (ULONG_PTR)image_info->map_addr, ptr ); + + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + ((IMAGE_NT_HEADERS64 *)nt)->OptionalHeader.ImageBase = image_info->map_addr; + else + ((IMAGE_NT_HEADERS32 *)nt)->OptionalHeader.ImageBase = image_info->map_addr; + + if ((relocs = get_data_dir( nt, total_size, IMAGE_DIRECTORY_ENTRY_BASERELOC ))) + { + IMAGE_BASE_RELOCATION *rel = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress); + IMAGE_BASE_RELOCATION *end = (IMAGE_BASE_RELOCATION *)((char *)rel + relocs->Size); + + while (rel && rel < end - 1 && rel->SizeOfBlock && rel->VirtualAddress < total_size) + rel = process_relocation_block( ptr + rel->VirtualAddress, rel, delta ); + } + } + /* set the image protections */ set_vprot( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ ); diff --git a/server/mapping.c b/server/mapping.c index 41585b35924..c570bcf8f94 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1407,7 +1407,8 @@ DECL_HANDLER(map_image_view) view->image.entry_point = req->entry; add_process_view( current, view ); - if (view->base != mapping->image.base) set_error( STATUS_IMAGE_NOT_AT_BASE ); + if (view->base != (mapping->image.map_addr ? mapping->image.map_addr : mapping->image.base)) + set_error( STATUS_IMAGE_NOT_AT_BASE ); if (view->image.machine != current->process->machine) { /* on 32-bit, the native 64-bit machine is allowed */

1 0

Alexandre Julliard : winegcc: Enable dynamic base by default.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: 0d3ff192aaad8b65eb25ea426442760ebc4e35d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d3ff192aaad8b65eb25ea42644276… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 27 13:32:49 2023 +0200 winegcc: Enable dynamic base by default. --- tools/winegcc/winegcc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 968e472227e..b8eb5e4fc79 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -409,6 +409,8 @@ static struct strarray get_link_args( struct options *opts, const char *output_n strarray_add( &flags, "-Wl,--exclude-all-symbols" ); strarray_add( &flags, "-Wl,--nxcompat" ); + strarray_add( &flags, "-Wl,--dynamicbase" ); + strarray_add( &flags, "-Wl,--disable-auto-image-base" ); if (opts->image_base) strarray_add( &flags, strmake("-Wl,--image-base,%s", opts->image_base ));

1 0

Alexandre Julliard : server: Assign a system-wide mapping address for dynamic base modules.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: efd03f40e6e315d89cd1d09c48180aae82033f9f URL: https://gitlab.winehq.org/wine/wine/-/commit/efd03f40e6e315d89cd1d09c48180a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 5 10:41:47 2023 +0200 server: Assign a system-wide mapping address for dynamic base modules. --- dlls/ntdll/unix/virtual.c | 27 +++++++++-- include/wine/server_protocol.h | 19 +++++++- server/fd.c | 21 +++++++++ server/file.h | 4 ++ server/main.c | 1 + server/mapping.c | 105 +++++++++++++++++++++++++++++++++++++++-- server/protocol.def | 9 ++++ server/request.h | 8 +++- server/trace.c | 13 +++++ tools/make_requests | 2 +- 10 files changed, 200 insertions(+), 9 deletions(-)

1 0

Alexandre Julliard : server: Set the dynamically relocated flag when relocations are present.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: 4847c1d8e4745ccd63e1db06fe1a693e8a591326 URL: https://gitlab.winehq.org/wine/wine/-/commit/4847c1d8e4745ccd63e1db06fe1a69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 5 11:45:15 2023 +0200 server: Set the dynamically relocated flag when relocations are present. --- dlls/kernel32/tests/loader.c | 8 ++++++++ server/mapping.c | 21 ++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 0e86a0577b1..c250fc5d52d 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2153,6 +2153,7 @@ static void test_import_resolution(void) } data, *ptr; IMAGE_NT_HEADERS nt, *pnt; IMAGE_SECTION_HEADER section; + SECTION_IMAGE_INFORMATION image; int test, tls_index_save, nb_rel; #if defined(__i386__) static const UCHAR tls_init_code[] = { @@ -2192,6 +2193,7 @@ static void test_import_resolution(void) #else #define ADD_RELOC(field) data.rel.type_off[nb_rel++] = (IMAGE_REL_BASED_HIGHLOW << 12) + offsetof( struct imports, field ) #endif + winetest_push_context( "%u", test ); nt = nt_header_template; nt.FileHeader.NumberOfSections = 1; nt.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); @@ -2363,6 +2365,11 @@ static void test_import_resolution(void) ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %lu\n", GetLastError() ); break; } + status = pNtQuerySection( mapping, SectionImageInformation, &image, sizeof(image), &size ); + ok( !status, "NtQuerySection failed %lx\n", status ); + ok( test == 6 ? !image.ImageDynamicallyRelocated : image.ImageDynamicallyRelocated, + "image flags %x\n", image.ImageFlags); + ok( !image.ImageContainsCode, "contains code %x\n", image.ImageContainsCode); ok( mapping != 0, "CreateFileMappingA failed err %lu\n", GetLastError() ); /* make sure that the address is not available */ tmp = VirtualAlloc( (void *)nt.OptionalHeader.ImageBase, 0x10000, @@ -2399,6 +2406,7 @@ static void test_import_resolution(void) break; } DeleteFileA( dll_name ); + winetest_pop_context(); #undef DATA_RVA } } diff --git a/server/mapping.c b/server/mapping.c index 2d0a0b783e2..a6adf4dfbe2 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -695,7 +695,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s } opt; } nt; off_t pos; - int size; + int size, has_relocs; size_t mz_size, clr_va = 0, clr_size = 0; unsigned int i; @@ -757,10 +757,15 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.header_size = nt.opt.hdr32.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr32.CheckSum; mapping->image.image_flags = 0; + + has_relocs = (nt.opt.hdr32.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_BASERELOC && + nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress && + nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size && + !(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)); if (nt.opt.hdr32.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; else if ((nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && - mapping->image.contains_code && !(clr_va && clr_size)) + (has_relocs || mapping->image.contains_code) && !(clr_va && clr_size)) mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; break; @@ -800,10 +805,20 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.header_size = nt.opt.hdr64.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr64.CheckSum; mapping->image.image_flags = 0; + + has_relocs = (nt.opt.hdr64.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_BASERELOC && + nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress && + nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size && + !(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)); if (nt.opt.hdr64.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; + else if (nt.opt.hdr64.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_BASERELOC && + nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress && + nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size && + !(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)) + mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; else if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && - mapping->image.contains_code && !(clr_va && clr_size)) + (has_relocs || mapping->image.contains_code) && !(clr_va && clr_size)) mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; break;

1 0

Mohamad Al-Jaf : windows.media.mediacontrol: Implement some ISystemMediaTransportControls properties.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

Module: wine Branch: master Commit: 84418169124606b1c8acdfead03595b83139b25a URL: https://gitlab.winehq.org/wine/wine/-/commit/84418169124606b1c8acdfead03595… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 02:53:23 2023 -0400 windows.media.mediacontrol: Implement some ISystemMediaTransportControls properties. Called by Roon. --- dlls/windows.media.mediacontrol/main.c | 103 ++++++++++++++++----- .../tests/mediacontrol.c | 36 +++---- 2 files changed, 97 insertions(+), 42 deletions(-)

1 0

Mohamad Al-Jaf : windows.media.mediacontrol: Implement ISystemMediaTransportControlsInterop::GetForWindow().
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

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 ISystemMediaTransportControlsInterop::GetForWindow() tests.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

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/tests: Add some ISystemMediaTransportControls properties tests.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

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

Mohamad Al-Jaf : windows.media.mediacontrol: Add ISystemMediaTransportControlsInterop stub interface.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

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 : include: Add systemmediatransportcontrolsinterop.idl file.
by Alexandre Julliard Oct. 5, 2023

Oct. 5, 2023

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