- Wine-Commits - list.winehq.org

Rémi Bernon : mfreadwrite/tests: Test source reader exposed transforms and types.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: f5daee4a2fb50760347cbeeed5fe39049841aef1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5daee4a2fb50760347cbeeed5fe39… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 18:05:44 2024 +0100 mfreadwrite/tests: Test source reader exposed transforms and types. --- dlls/mfreadwrite/tests/Makefile.in | 2 +- dlls/mfreadwrite/tests/mfplat.c | 385 +++++++++++++++++++++++++++++++++++++ 2 files changed, 386 insertions(+), 1 deletion(-)

1 0

Rémi Bernon : mfreadwrite/tests: Test source reader transforms with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: 3c644480377a4aac6bcc0b23b79f726366346c7a URL: https://gitlab.winehq.org/wine/wine/-/commit/3c644480377a4aac6bcc0b23b79f72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 1 09:37:30 2024 +0100 mfreadwrite/tests: Test source reader transforms with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING. --- dlls/mfreadwrite/tests/mfplat.c | 202 ++++++++++++++++++++++++++++++++++------ 1 file changed, 173 insertions(+), 29 deletions(-)

1 0

Rémi Bernon : mfreadwrite/tests: Test source reader transforms with MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: b37a16c7f39c7054238570d714c56d31af6c5f7d URL: https://gitlab.winehq.org/wine/wine/-/commit/b37a16c7f39c7054238570d714c56d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 20:24:28 2024 +0100 mfreadwrite/tests: Test source reader transforms with MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING. --- dlls/mfreadwrite/tests/mfplat.c | 134 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 121 insertions(+), 13 deletions(-)

1 0

Rémi Bernon : mfreadwrite/tests: Initialize test source stream types from descriptors.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: 5122f6ad9f2271844531410805bd7a918b9d95c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/5122f6ad9f2271844531410805bd7a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 18:04:49 2024 +0100 mfreadwrite/tests: Initialize test source stream types from descriptors. --- dlls/mfreadwrite/tests/mfplat.c | 179 ++++++++++++++++++++++++++++------------ 1 file changed, 126 insertions(+), 53 deletions(-)

1 0

Alexandre Julliard : ntdll: Use the current machine by default to create an ARM64X process.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: 1456b31eecfef91fc8ffc8c2de29ab69c5b5463b URL: https://gitlab.winehq.org/wine/wine/-/commit/1456b31eecfef91fc8ffc8c2de29ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 15:46:17 2024 +0100 ntdll: Use the current machine by default to create an ARM64X process. --- dlls/ntdll/unix/loader.c | 3 ++- dlls/ntdll/unix/process.c | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 88b24420ec1..06959fa95df 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -480,7 +480,8 @@ char *get_alternate_wineloader( WORD machine ) if (machine == current_machine) return NULL; - if (machine == IMAGE_FILE_MACHINE_AMD64) /* try the 64-bit loader */ + /* try the 64-bit loader */ + if (current_machine == IMAGE_FILE_MACHINE_I386 && machine == IMAGE_FILE_MACHINE_AMD64) { size_t len = strlen(wineloader); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 71eab55920d..b58d69fb28a 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -801,7 +801,12 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ } goto done; } - if (!machine) machine = pe_info.machine; + if (!machine) + { + machine = pe_info.machine; + if (is_arm64ec() && pe_info.is_hybrid && machine == IMAGE_FILE_MACHINE_ARM64) + machine = main_image_info.Machine; + } if (!(startup_info = create_startup_info( attr.ObjectName, process_flags, params, &pe_info, &startup_info_size ))) goto done; env_size = get_env_size( params, &winedebug );

1 0

Alexandre Julliard : ntdll: Fix RtlWow64GetCurrentMachine() result on ARM64EC.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: cf7c48e0366ec27dd946f2fcec12cb66f2e0cb23 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf7c48e0366ec27dd946f2fcec12cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 16:30:24 2024 +0100 ntdll: Fix RtlWow64GetCurrentMachine() result on ARM64EC. --- dlls/ntdll/loader.c | 5 ----- dlls/ntdll/ntdll_misc.h | 12 ++++++++++++ dlls/ntdll/process.c | 9 +++++---- dlls/ntdll/tests/wow64.c | 38 ++++++++++++++++---------------------- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4fc8af2662e..55065117a01 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -51,19 +51,14 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); #ifdef __i386__ static const WCHAR pe_dir[] = L"\\i386-windows"; -static const USHORT current_machine = IMAGE_FILE_MACHINE_I386; #elif defined __x86_64__ static const WCHAR pe_dir[] = L"\\x86_64-windows"; -static const USHORT current_machine = IMAGE_FILE_MACHINE_AMD64; #elif defined __arm__ static const WCHAR pe_dir[] = L"\\arm-windows"; -static const USHORT current_machine = IMAGE_FILE_MACHINE_ARMNT; #elif defined __aarch64__ static const WCHAR pe_dir[] = L"\\aarch64-windows"; -static const USHORT current_machine = IMAGE_FILE_MACHINE_ARM64; #else static const WCHAR pe_dir[] = L""; -static const USHORT current_machine = IMAGE_FILE_MACHINE_UNKNOWN; #endif /* we don't want to include winuser.h */ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e4094d341d8..58e29837cd0 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -41,6 +41,18 @@ #define NTDLL_TLS_ERRNO 16 /* TLS slot for _errno() */ +#ifdef __i386__ +static const USHORT current_machine = IMAGE_FILE_MACHINE_I386; +#elif defined(__x86_64__) +static const USHORT current_machine = IMAGE_FILE_MACHINE_AMD64; +#elif defined(__arm__) +static const USHORT current_machine = IMAGE_FILE_MACHINE_ARMNT; +#elif defined(__aarch64__) +static const USHORT current_machine = IMAGE_FILE_MACHINE_ARM64; +#else +static const USHORT current_machine = IMAGE_FILE_MACHINE_UNKNOWN; +#endif + #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) static const UINT_PTR page_size = 0x1000; #else diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index dcdb26f81d1..102e0c930a9 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -94,10 +94,11 @@ NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG disable, ULONG *old_value ) */ USHORT WINAPI RtlWow64GetCurrentMachine(void) { - USHORT current, native; - - RtlWow64GetProcessMachines( GetCurrentProcess(), &current, &native ); - return current ? current : native; + USHORT machine = current_machine; +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) RtlWow64GetCurrentCpuArea( &machine, NULL, NULL ); +#endif + return machine; } diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index a1beb9a4997..aebff700940 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -289,7 +289,7 @@ static void test_query_architectures(void) STARTUPINFOA si = { sizeof(si) }; NTSTATUS status; HANDLE process; - ULONG len; + ULONG i, len; #ifdef __arm64ec__ BOOL is_arm64ec = TRUE; #else @@ -383,27 +383,21 @@ static void test_query_architectures(void) } if (pRtlWow64IsWowGuestMachineSupported) { - BOOLEAN ret = 0xcc; - status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_I386, &ret ); - ok( !status, "failed %lx\n", status ); - ok( ret == (native_machine == IMAGE_FILE_MACHINE_AMD64 || - native_machine == IMAGE_FILE_MACHINE_ARM64), "wrong result %u\n", ret ); - ret = 0xcc; - status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_ARMNT, &ret ); - ok( !status, "failed %lx\n", status ); - ok( !ret || native_machine == IMAGE_FILE_MACHINE_ARM64, "wrong result %u\n", ret ); - ret = 0xcc; - status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_AMD64, &ret ); - ok( !status, "failed %lx\n", status ); - ok( !ret || native_machine == IMAGE_FILE_MACHINE_ARM64, "wrong result %u\n", ret ); - ret = 0xcc; - status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_ARM64, &ret ); - ok( !status, "failed %lx\n", status ); - ok( !ret, "wrong result %u\n", ret ); - ret = 0xcc; - status = pRtlWow64IsWowGuestMachineSupported( 0xdead, &ret ); - ok( !status, "failed %lx\n", status ); - ok( !ret, "wrong result %u\n", ret ); + static const WORD machines[] = { IMAGE_FILE_MACHINE_I386, IMAGE_FILE_MACHINE_ARMNT, + IMAGE_FILE_MACHINE_AMD64, IMAGE_FILE_MACHINE_ARM64, 0xdead }; + + for (i = 0; i < ARRAY_SIZE(machines); i++) + { + BOOLEAN ret = 0xcc; + status = pRtlWow64IsWowGuestMachineSupported( machines[i], &ret ); + ok( !status, "failed %lx\n", status ); + if (is_machine_32bit( machines[i] ) && !is_machine_32bit( native_machine )) + ok( ret || machines[i] == IMAGE_FILE_MACHINE_ARMNT || + broken(current_machine == IMAGE_FILE_MACHINE_I386), /* win10-1607 wow64 */ + "%04x: got %u\n", machines[i], ret ); + else + ok( !ret, "%04x: got %u\n", machines[i], ret ); + } } }

1 0

Alexandre Julliard : ntdll: Redirect the module entry point for ARM64EC modules.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: 8c703f3e2f8162364564a0d47307887d9de5f2a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c703f3e2f8162364564a0d4730788… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 14:00:20 2024 +0100 ntdll: Redirect the module entry point for ARM64EC modules. --- dlls/ntdll/tests/wow64.c | 1 - dlls/ntdll/unix/loader.c | 19 ++++++++----------- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 11 ++++++----- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 941b127a2f6..a1beb9a4997 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -275,7 +275,6 @@ static void test_process_machine( HANDLE process, HANDLE thread, win32_entry is the redirected x86-64 -> ARM64EC one */ ok( image.TransferAddress != entry_point, "wrong entry %p\n", image.TransferAddress ); ok( image.TransferAddress != win32_entry, "wrong entry %p\n", image.TransferAddress ); - todo_wine ok( win32_entry != entry_point, "wrong win32 entry %p\n", win32_entry ); } } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 05284115b67..88b24420ec1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1585,24 +1585,23 @@ static void load_ntdll_wow64_functions( HMODULE module ) /*********************************************************************** - * redirect_arm64ec_ptr + * redirect_arm64ec_rva * - * Redirect a function pointer through the arm64ec redirection table. + * Redirect an address through the arm64ec redirection table. */ -static void *redirect_arm64ec_ptr( void *module, void *ptr, - const IMAGE_ARM64EC_REDIRECTION_ENTRY *map, ULONG map_count ) +ULONG_PTR redirect_arm64ec_rva( void *base, ULONG_PTR rva, const IMAGE_ARM64EC_METADATA *metadata ) { - int min = 0, max = map_count - 1; - ULONG_PTR rva = (char *)ptr - (char *)module; + const IMAGE_ARM64EC_REDIRECTION_ENTRY *map = get_rva( base, metadata->RedirectionMetadata ); + int min = 0, max = metadata->RedirectionMetadataCount - 1; while (min <= max) { int pos = (min + max) / 2; - if (map[pos].Source == rva) return get_rva( module, map[pos].Destination ); + if (map[pos].Source == rva) return map[pos].Destination; if (map[pos].Source < rva) min = pos + 1; else max = pos - 1; } - return ptr; + return rva; } @@ -1615,13 +1614,11 @@ static void redirect_ntdll_functions( HMODULE module ) { const IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg; const IMAGE_ARM64EC_METADATA *metadata; - const IMAGE_ARM64EC_REDIRECTION_ENTRY *map; if (!(loadcfg = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, NULL ))) return; if (!(metadata = (void *)loadcfg->CHPEMetadataPointer)) return; - if (!(map = get_rva( module, metadata->RedirectionMetadata ))) return; #define REDIRECT(name) \ - p##name = redirect_arm64ec_ptr( module, p##name, map, metadata->RedirectionMetadataCount ) + p##name = get_rva( module, redirect_arm64ec_rva( module, (char *)p##name - (char *)module, metadata )) REDIRECT( DbgUiRemoteBreakin ); REDIRECT( KiRaiseUserExceptionDispatcher ); REDIRECT( KiUserExceptionDispatcher ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index af746b220e8..cbf72651a9a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -191,6 +191,7 @@ extern BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ); extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, USHORT load_machine, WCHAR **image, void **module ); extern NTSTATUS load_start_exe( WCHAR **image, void **module ); +extern ULONG_PTR redirect_arm64ec_rva( void *module, ULONG_PTR rva, const IMAGE_ARM64EC_METADATA *metadata ); extern void start_server( BOOL debug ); extern unsigned int server_call_unlocked( void *req_ptr ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index cfe19eae89d..02c0bebe879 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2488,7 +2488,7 @@ static void alloc_arm64ec_map(void) * update_arm64ec_ranges */ static void update_arm64ec_ranges( struct file_view *view, IMAGE_NT_HEADERS *nt, - const IMAGE_DATA_DIRECTORY *dir ) + const IMAGE_DATA_DIRECTORY *dir, UINT *entry_point ) { const IMAGE_ARM64EC_METADATA *metadata; const IMAGE_CHPE_RANGE_ENTRY *map; @@ -2501,6 +2501,7 @@ static void update_arm64ec_ranges( struct file_view *view, IMAGE_NT_HEADERS *nt, if (!arm64ec_view) alloc_arm64ec_map(); commit_arm64ec_map( view ); metadata = (void *)(base + (cfg->CHPEMetadataPointer - nt->OptionalHeader.ImageBase)); + *entry_point = redirect_arm64ec_rva( base, nt->OptionalHeader.AddressOfEntryPoint, metadata ); if (!metadata->CodeMap) return; map = (void *)(base + metadata->CodeMap); @@ -2865,11 +2866,11 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena (!machine && main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64))) { update_arm64x_mapping( view, nt, dir, sections ); - /* reload changed data from NT header */ - image_info->machine = nt->FileHeader.Machine; - image_info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; + /* reload changed machine from NT header */ + image_info->machine = nt->FileHeader.Machine; } - if (image_info->machine == IMAGE_FILE_MACHINE_AMD64) update_arm64ec_ranges( view, nt, dir ); + if (image_info->machine == IMAGE_FILE_MACHINE_AMD64) + update_arm64ec_ranges( view, nt, dir, &image_info->entry_point ); } #endif if (machine && machine != nt->FileHeader.Machine) return STATUS_NOT_SUPPORTED;

1 0

Alexandre Julliard : server: Add hybrid flag in image mapping information.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: de988eeea0801289adb9dbd2420a66d142382ab5 URL: https://gitlab.winehq.org/wine/wine/-/commit/de988eeea0801289adb9dbd2420a66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 15:39:46 2024 +0100 server: Add hybrid flag in image mapping information. --- include/wine/server_protocol.h | 5 ++-- server/mapping.c | 68 ++++++++++++++++++++++++++++++++++-------- server/protocol.def | 3 +- 3 files changed, 60 insertions(+), 16 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0286ee7056e..e039cf59e72 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -844,7 +844,8 @@ typedef struct unsigned char contains_code : 1; unsigned char wine_builtin : 1; unsigned char wine_fakedll : 1; - unsigned char padding : 5; + unsigned char is_hybrid : 1; + unsigned char padding : 4; unsigned char image_flags; unsigned int loader_flags; unsigned int header_size; @@ -6506,7 +6507,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 787 +#define SERVER_PROTOCOL_VERSION 788 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index 13604455729..6b0de1b8b94 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -654,11 +654,10 @@ static int build_shared_mapping( struct mapping *mapping, int fd, return 0; } -/* load the CLR header from its section */ -static int load_clr_header( IMAGE_COR20_HEADER *hdr, size_t va, size_t size, int unix_fd, - IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) +/* load a data directory header from its section */ +static int load_data_dir( void *dir, size_t dir_size, size_t va, size_t size, int unix_fd, + IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) { - ssize_t ret; size_t map_size, file_size; off_t file_start; unsigned int i; @@ -672,18 +671,41 @@ static int load_clr_header( IMAGE_COR20_HEADER *hdr, size_t va, size_t size, int get_section_sizes( &sec[i], &map_size, &file_start, &file_size ); if (size >= map_size) continue; if (va - sec[i].VirtualAddress >= map_size - size) continue; - file_size = min( file_size, map_size ); - size = min( size, sizeof(*hdr) ); - ret = pread( unix_fd, hdr, min( size, file_size ), file_start + va - sec[i].VirtualAddress ); - if (ret <= 0) break; - if (ret < sizeof(*hdr)) memset( (char *)hdr + ret, 0, sizeof(*hdr) - ret ); - return (hdr->MajorRuntimeVersion > COR_VERSION_MAJOR_V2 || - (hdr->MajorRuntimeVersion == COR_VERSION_MAJOR_V2 && - hdr->MinorRuntimeVersion >= COR_VERSION_MINOR)); + if (size > dir_size) size = dir_size; + if (size > file_size) size = file_size; + return pread( unix_fd, dir, size, file_start + va - sec[i].VirtualAddress ); } return 0; } +/* load the CLR header from its section */ +static int load_clr_header( IMAGE_COR20_HEADER *hdr, size_t va, size_t size, int unix_fd, + IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) +{ + int ret = load_data_dir( hdr, sizeof(*hdr), va, size, unix_fd, sec, nb_sec ); + + if (ret <= 0) return 0; + if (ret < sizeof(*hdr)) memset( (char *)hdr + ret, 0, sizeof(*hdr) - ret ); + return (hdr->MajorRuntimeVersion > COR_VERSION_MAJOR_V2 || + (hdr->MajorRuntimeVersion == COR_VERSION_MAJOR_V2 && + hdr->MinorRuntimeVersion >= COR_VERSION_MINOR)); +} + +/* load the LOAD_CONFIG header from its section */ +static int load_cfg_header( IMAGE_LOAD_CONFIG_DIRECTORY64 *cfg, size_t va, size_t size, + int unix_fd, IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) +{ + unsigned int cfg_size; + int ret = load_data_dir( cfg, sizeof(*cfg), va, size, unix_fd, sec, nb_sec ); + + if (ret <= 0) return 0; + cfg_size = ret; + if (cfg_size < offsetof( IMAGE_LOAD_CONFIG_DIRECTORY64, Size ) + sizeof(cfg_size)) return 0; + if (cfg_size > cfg->Size) cfg_size = cfg->Size; + if (cfg_size < sizeof(*cfg)) memset( (char *)cfg + cfg_size, 0, sizeof(*cfg) - cfg_size ); + return 1; +} + /* retrieve the mapping parameters for an executable (PE) image */ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_size, int unix_fd ) { @@ -707,9 +729,14 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s IMAGE_OPTIONAL_HEADER64 hdr64; } opt; } nt; + union + { + IMAGE_LOAD_CONFIG_DIRECTORY32 cfg32; + IMAGE_LOAD_CONFIG_DIRECTORY64 cfg64; + } cfg; off_t pos; int size, has_relocs; - size_t mz_size, clr_va = 0, clr_size = 0; + size_t mz_size, clr_va = 0, clr_size = 0, cfg_va, cfg_size; unsigned int i; /* load the headers */ @@ -753,6 +780,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s clr_va = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; clr_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; } + cfg_va = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress; + cfg_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size; + mapping->image.base = nt.opt.hdr32.ImageBase; mapping->image.entry_point = nt.opt.hdr32.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr32.SizeOfImage ); @@ -801,6 +831,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s clr_va = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; clr_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; } + cfg_va = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress; + cfg_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size; + mapping->image.base = nt.opt.hdr64.ImageBase; mapping->image.entry_point = nt.opt.hdr64.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr64.SizeOfImage ); @@ -834,6 +867,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s return STATUS_INVALID_IMAGE_FORMAT; } + mapping->image.is_hybrid = 0; mapping->image.padding = 0; mapping->image.map_addr = get_fd_map_address( mapping->fd ); mapping->image.image_charact = nt.FileHeader.Characteristics; @@ -875,6 +909,14 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s } } + if (load_cfg_header( &cfg.cfg64, cfg_va, cfg_size, unix_fd, sec, nt.FileHeader.NumberOfSections )) + { + if (nt.opt.hdr32.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + mapping->image.is_hybrid = !!cfg.cfg32.CHPEMetadataPointer; + else + mapping->image.is_hybrid = !!cfg.cfg64.CHPEMetadataPointer; + } + if (!build_shared_mapping( mapping, unix_fd, sec, nt.FileHeader.NumberOfSections )) return STATUS_INVALID_FILE_FOR_SECTION; diff --git a/server/protocol.def b/server/protocol.def index ee4648350db..3c452e08e2a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -860,7 +860,8 @@ typedef struct unsigned char contains_code : 1; unsigned char wine_builtin : 1; unsigned char wine_fakedll : 1; - unsigned char padding : 5; + unsigned char is_hybrid : 1; + unsigned char padding : 4; unsigned char image_flags; unsigned int loader_flags; unsigned int header_size;

1 0

Alexandre Julliard : server: Don't update the machine in the image information for ARM64EC modules.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: bd703632fd82cc2414e78f5f68b71dd587ed278c URL: https://gitlab.winehq.org/wine/wine/-/commit/bd703632fd82cc2414e78f5f68b71d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 12:17:23 2024 +0100 server: Don't update the machine in the image information for ARM64EC modules. --- server/mapping.c | 31 +++++++++++++------------------ server/object.h | 1 + server/process.c | 1 + 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index f754078acf7..69d8f71e23b 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -404,14 +404,6 @@ struct memory_view *get_exe_view( struct process *process ) return LIST_ENTRY( list_head( &process->views ), struct memory_view, entry ); } -static void set_process_machine( struct process *process, struct memory_view *view ) -{ - if (view->image.image_flags & IMAGE_FLAGS_ComPlusNativeReady) - process->machine = native_machine; - else - process->machine = view->image.machine; -} - static int generate_dll_event( struct thread *thread, int code, struct memory_view *view ) { if (!(view->flags & SEC_IMAGE)) return 0; @@ -420,7 +412,8 @@ static int generate_dll_event( struct thread *thread, int code, struct memory_vi } /* add a view to the process list */ -static void add_process_view( struct thread *thread, struct memory_view *view ) +/* return 1 if this is the main exe view */ +static int add_process_view( struct thread *thread, struct memory_view *view ) { struct process *process = thread->process; struct unicode_str name; @@ -434,18 +427,17 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) else if (!(view->image.image_charact & IMAGE_FILE_DLL)) { /* main exe */ - set_process_machine( process, view ); - list_add_head( &process->views, &view->entry ); - free( process->image ); process->image = NULL; if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) process->imagelen = name.len; process->image_info = view->image; - return; + list_add_head( &process->views, &view->entry ); + return 1; } } list_add_tail( &process->views, &view->entry ); + return 0; } static void free_memory_view( struct memory_view *view ) @@ -1401,16 +1393,19 @@ DECL_HANDLER(map_image_view) view->committed = NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; view->image = mapping->image; - view->image.machine = req->machine; view->image.entry_point = req->entry; - add_process_view( current, view ); + if (add_process_view( current, view )) + { + current->process->machine = (view->image.image_flags & IMAGE_FLAGS_ComPlusNativeReady) ? + native_machine : req->machine; + } 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) + if (req->machine != current->process->machine) { /* on 32-bit, the native 64-bit machine is allowed */ - if (is_machine_64bit( current->process->machine ) || view->image.machine != native_machine) + if (is_machine_64bit( current->process->machine ) || req->machine != native_machine) set_error( STATUS_IMAGE_MACHINE_TYPE_MISMATCH ); } } @@ -1443,7 +1438,7 @@ DECL_HANDLER(map_builtin_view) view->image = *image; view->namelen = namelen; memcpy( view->name, image + 1, namelen ); - add_process_view( current, view ); + if (add_process_view( current, view )) current->process->machine = image->machine; } } diff --git a/server/object.h b/server/object.h index dfdd691601f..d4d66536b81 100644 --- a/server/object.h +++ b/server/object.h @@ -253,6 +253,7 @@ static inline int is_machine_supported( unsigned short machine ) { unsigned int i; for (i = 0; i < supported_machines_count; i++) if (supported_machines[i] == machine) return 1; + if (native_machine == IMAGE_FILE_MACHINE_ARM64) return machine == IMAGE_FILE_MACHINE_AMD64; return 0; } diff --git a/server/process.c b/server/process.c index e166aeae64e..39076351cea 100644 --- a/server/process.c +++ b/server/process.c @@ -656,6 +656,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->msg_fd = NULL; process->sigkill_timeout = NULL; process->sigkill_delay = TICKS_PER_SEC / 64; + process->machine = native_machine; process->unix_pid = -1; process->exit_code = STILL_ACTIVE; process->running_threads = 0;

1 0

Alexandre Julliard : server: Don't update the entry point in the image information for ARM64EC modules.
by Alexandre Julliard Feb. 8, 2024

Feb. 8, 2024

Module: wine Branch: master Commit: e05c6c821104d45344fc532a15f96360a24a0174 URL: https://gitlab.winehq.org/wine/wine/-/commit/e05c6c821104d45344fc532a15f963… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 13:10:44 2024 +0100 server: Don't update the entry point in the image information for ARM64EC modules. --- dlls/ntdll/tests/wow64.c | 39 ++++++++++++++++++++++++++++++++++----- dlls/ntdll/unix/server.c | 5 ++--- include/wine/server_protocol.h | 5 ++--- server/debugger.c | 2 +- server/mapping.c | 8 ++++++-- server/process.c | 13 +------------ server/protocol.def | 1 - server/request.h | 5 ++--- server/trace.c | 4 +--- 9 files changed, 49 insertions(+), 33 deletions(-)

1 0