May 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Apply dynamic relocations when mapping an ARM64X binary.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 0a3a1d2b034cbdc0f6d0931bd710e4e461f5149c URL: https://gitlab.winehq.org/wine/wine/-/commit/0a3a1d2b034cbdc0f6d0931bd710e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 12:28:40 2023 +0200 ntdll: Apply dynamic relocations when mapping an ARM64X binary. --- dlls/ntdll/unix/virtual.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 7769d2c31f5..b048d0f52d2 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2177,6 +2177,113 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) return STATUS_SUCCESS; /* page protections will be updated later */ } +#ifdef __aarch64__ + +/*********************************************************************** + * apply_arm64x_relocations + */ +static void apply_arm64x_relocations( char *base, const IMAGE_BASE_RELOCATION *reloc, size_t size ) +{ + const IMAGE_BASE_RELOCATION *reloc_end = (const IMAGE_BASE_RELOCATION *)((const char *)reloc + size); + + while (reloc < reloc_end - 1 && reloc->SizeOfBlock) + { + const USHORT *rel = (const USHORT *)(reloc + 1); + const USHORT *rel_end = (const USHORT *)reloc + reloc->SizeOfBlock / sizeof(USHORT); + char *page = base + reloc->VirtualAddress; + + while (rel < rel_end && *rel) + { + USHORT offset = *rel & 0xfff; + USHORT type = (*rel >> 12) & 3; + USHORT arg = *rel >> 14; + int val; + rel++; + switch (type) + { + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_ZEROFILL: + memset( page + offset, 0, 1 << arg ); + break; + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_VALUE: + memcpy( page + offset, rel, 1 << arg ); + rel += (1 << arg) / sizeof(USHORT); + break; + case IMAGE_DVRT_ARM64X_FIXUP_TYPE_DELTA: + val = (unsigned int)*rel++ * ((arg & 2) ? 8 : 4); + if (arg & 1) val = -val; + *(int *)(page + offset) += val; + break; + } + } + reloc = (const IMAGE_BASE_RELOCATION *)rel_end; + } +} + + +/*********************************************************************** + * update_arm64x_mapping + */ +static void update_arm64x_mapping( char *base, IMAGE_NT_HEADERS *nt, IMAGE_SECTION_HEADER *sections ) +{ + ULONG size, sec, offset; + const IMAGE_DATA_DIRECTORY *dir; + const IMAGE_LOAD_CONFIG_DIRECTORY *cfg; + const IMAGE_DYNAMIC_RELOCATION_TABLE *table; + const char *ptr, *end; + + /* retrieve config directory */ + + if (nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) return; + dir = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG; + if (!dir->VirtualAddress || !dir->Size) return; + cfg = (void *)(base + dir->VirtualAddress); + size = min( dir->Size, cfg->Size ); + + /* apply dynamic relocations */ + + if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, DynamicValueRelocTableSection )) return; + offset = cfg->DynamicValueRelocTableOffset; + sec = cfg->DynamicValueRelocTableSection; + if (!sec || sec > nt->FileHeader.NumberOfSections) return; + if (offset >= sections[sec - 1].Misc.VirtualSize) return; + table = (const IMAGE_DYNAMIC_RELOCATION_TABLE *)(base + sections[sec - 1].VirtualAddress + offset); + ptr = (const char *)(table + 1); + end = ptr + table->Size; + switch (table->Version) + { + case 1: + while (ptr < end) + { + const IMAGE_DYNAMIC_RELOCATION64 *dyn = (const IMAGE_DYNAMIC_RELOCATION64 *)ptr; + if (dyn->Symbol == IMAGE_DYNAMIC_RELOCATION_ARM64X) + { + apply_arm64x_relocations( base, (const IMAGE_BASE_RELOCATION *)(dyn + 1), + dyn->BaseRelocSize ); + break; + } + ptr += sizeof(*dyn) + dyn->BaseRelocSize; + } + break; + case 2: + while (ptr < end) + { + const IMAGE_DYNAMIC_RELOCATION64_V2 *dyn = (const IMAGE_DYNAMIC_RELOCATION64_V2 *)ptr; + if (dyn->Symbol == IMAGE_DYNAMIC_RELOCATION_ARM64X) + { + apply_arm64x_relocations( base, (const IMAGE_BASE_RELOCATION *)(dyn + 1), + dyn->FixupInfoSize ); + break; + } + ptr += dyn->HeaderSize + dyn->FixupInfoSize; + } + break; + default: + FIXME( "unsupported version %u\n", table->Version ); + break; + } +} + +#endif /* __aarch64__ */ /*********************************************************************** * map_image_into_view @@ -2342,6 +2449,12 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena } } +#ifdef __aarch64__ + if (main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64 && + nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM64) + update_arm64x_mapping( ptr, nt, sections ); +#endif + /* set the image protections */ set_vprot( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ );

1 0

Alexandre Julliard : ntdll: Support the ARM64EC code map.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: c722353c87da017df25cc9f42b49f0c9f4ce50fd URL: https://gitlab.winehq.org/wine/wine/-/commit/c722353c87da017df25cc9f42b49f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 12:40:32 2023 +0200 ntdll: Support the ARM64EC code map. --- dlls/ntdll/unix/env.c | 12 +++++- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 86 +++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 2 +- 4 files changed, 97 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 3c178350f2b..8b3b9bcd43f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1857,13 +1857,21 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) peb->ImageSubSystemMinorVersion = main_image_info.MinorSubsystemVersion; #ifdef _WIN64 - if (main_image_info.Machine != current_machine) + switch (main_image_info.Machine) { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARMNT: NtCurrentTeb()->WowTebOffset = teb_offset; NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset); wow_peb = (PEB32 *)((char *)peb + page_size); - set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); + set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); ERR( "starting %s in experimental wow64 mode\n", debugstr_us(&params->ImagePathName) ); + break; + case IMAGE_FILE_MACHINE_AMD64: + if (main_image_info.Machine == current_machine) break; + peb->EcCodeBitMap = virtual_alloc_arm64ec_map(); + ERR( "starting %s in experimental ARM64EC mode\n", debugstr_us(&params->ImagePathName) ); + break; } #endif diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index e72b435c65a..d7b591e71f3 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -234,6 +234,7 @@ extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_clear_tls_index( ULONG index ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SIZE_T reserve_size, SIZE_T commit_size, BOOL guard_page ) DECLSPEC_HIDDEN; +extern void *virtual_alloc_arm64ec_map(void) DECLSPEC_HIDDEN; extern void virtual_map_user_shared_data(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) DECLSPEC_HIDDEN; extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b048d0f52d2..0908e6b60bd 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -175,6 +175,8 @@ static void *user_space_limit = (void *)0x7fff0000; static void *working_set_limit = (void *)0x7fff0000; #endif +static UINT64 *arm64ec_map; + struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; /* TEB allocation blocks */ @@ -998,6 +1000,52 @@ static BOOL alloc_pages_vprot( const void *addr, size_t size ) } +static inline UINT64 maskbits( size_t idx ) +{ + return ~(UINT64)0 << (idx & 63); +} + +/*********************************************************************** + * set_arm64ec_range + */ +#ifdef __aarch64__ +static void set_arm64ec_range( const void *addr, size_t size ) +{ + size_t idx = (size_t)addr >> page_shift; + size_t end = ((size_t)addr + size + page_mask) >> page_shift; + size_t pos = idx / 64; + size_t end_pos = end / 64; + + if (end_pos > pos) + { + arm64ec_map[pos++] |= maskbits( idx ); + while (pos < end_pos) arm64ec_map[pos++] = ~(UINT64)0; + if (end & 63) arm64ec_map[pos] |= ~maskbits( end ); + } + else arm64ec_map[pos] |= maskbits( idx ) & ~maskbits( end ); +} +#endif + +/*********************************************************************** + * clear_arm64ec_range + */ +static void clear_arm64ec_range( const void *addr, size_t size ) +{ + size_t idx = (size_t)addr >> page_shift; + size_t end = ((size_t)addr + size + page_mask) >> page_shift; + size_t pos = idx / 64; + size_t end_pos = end / 64; + + if (end_pos > pos) + { + arm64ec_map[pos++] &= ~maskbits( idx ); + while (pos < end_pos) arm64ec_map[pos++] = 0; + if (end & 63) arm64ec_map[pos] &= maskbits( end ); + } + else arm64ec_map[pos] &= ~maskbits( idx ) | maskbits( end ); +} + + /*********************************************************************** * compare_view * @@ -1526,6 +1574,7 @@ static void delete_view( struct file_view *view ) /* [in] View */ { if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size ); set_page_vprot( view->base, view->size, 0 ); + if (arm64ec_map) clear_arm64ec_range( view->base, view->size ); if (mmap_is_in_reserved_area( view->base, view->size )) free_ranges_remove_view( view ); wine_rb_remove( &views_tree, &view->entry ); @@ -2225,9 +2274,10 @@ static void apply_arm64x_relocations( char *base, const IMAGE_BASE_RELOCATION *r */ static void update_arm64x_mapping( char *base, IMAGE_NT_HEADERS *nt, IMAGE_SECTION_HEADER *sections ) { - ULONG size, sec, offset; + ULONG i, size, sec, offset; const IMAGE_DATA_DIRECTORY *dir; const IMAGE_LOAD_CONFIG_DIRECTORY *cfg; + const IMAGE_ARM64EC_METADATA *metadata; const IMAGE_DYNAMIC_RELOCATION_TABLE *table; const char *ptr, *end; @@ -2239,6 +2289,21 @@ static void update_arm64x_mapping( char *base, IMAGE_NT_HEADERS *nt, IMAGE_SECTI cfg = (void *)(base + dir->VirtualAddress); size = min( dir->Size, cfg->Size ); + /* update code ranges */ + + if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, CHPEMetadataPointer )) return; + metadata = (void *)(base + (cfg->CHPEMetadataPointer - nt->OptionalHeader.ImageBase)); + if (metadata->CodeMap && arm64ec_map) + { + const IMAGE_CHPE_RANGE_ENTRY *map = (void *)(base + metadata->CodeMap); + + for (i = 0; i < metadata->CodeMapCount; i++) + { + if ((map[i].StartOffset & 0x3) != 1 /* arm64ec */) continue; + set_arm64ec_range( base + (map[i].StartOffset & ~3), map[i].Length ); + } + } + /* apply dynamic relocations */ if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, DynamicValueRelocTableSection )) return; @@ -3264,6 +3329,25 @@ done: } +/*********************************************************************** + * virtual_alloc_arm64ec_map + */ +void *virtual_alloc_arm64ec_map(void) +{ +#ifdef __aarch64__ + SIZE_T size = ((ULONG_PTR)user_space_limit + page_size) >> (page_shift + 3); /* one bit per page */ + unsigned int status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&arm64ec_map, 0, &size, + MEM_COMMIT, PAGE_READWRITE ); + if (status) + { + ERR( "failed to allocate ARM64EC map: %08x\n", status ); + exit(1); + } +#endif + return arm64ec_map; +} + + /*********************************************************************** * virtual_map_user_shared_data */ diff --git a/include/winternl.h b/include/winternl.h index 04676fe4b99..5ee05097915 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -394,7 +394,7 @@ typedef struct _PEB ULONG FlsHighIndex; /* 22c/350 */ PVOID WerRegistrationData; /* 230/358 */ PVOID WerShipAssertPtr; /* 234/360 */ - PVOID pUnused; /* 238/368 */ + PVOID EcCodeBitMap; /* 238/368 */ PVOID pImageHeaderHash; /* 23c/370 */ ULONG HeapTracingEnabled : 1; /* 240/378 */ ULONG CritSecTracingEnabled : 1;

1 0

Alexandre Julliard : ntdll: Implement RtlIsEcCode().
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: f2623cca38b0038200dc327f90a198108edb0de1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2623cca38b0038200dc327f90a198… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 12:43:53 2023 +0200 ntdll: Implement RtlIsEcCode(). --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_x86_64.c | 12 ++++++++++++ include/winternl.h | 3 +++ 3 files changed, 16 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b7659ac8c49..4ae544cdbb4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -836,6 +836,7 @@ @ stdcall RtlIsCriticalSectionLocked(ptr) @ stdcall RtlIsCriticalSectionLockedByThread(ptr) @ stdcall RtlIsDosDeviceName_U(wstr) +@ stdcall -arch=x86_64 -norelay RtlIsEcCode(ptr) @ stub RtlIsGenericTableEmpty # @ stub RtlIsGenericTableEmptyAvl @ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 84f6935c5ce..d514ece8787 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -680,6 +680,18 @@ void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) } +/************************************************************************** + * RtlIsEcCode (NTDLL.@) + */ +BOOLEAN WINAPI RtlIsEcCode( const void *ptr ) +{ + const UINT64 *map = (const UINT64 *)NtCurrentTeb()->Peb->EcCodeBitMap; + ULONG_PTR page = (ULONG_PTR)ptr / page_size; + if (!map) return FALSE; + return (map[page / 64] >> (page & 63)) & 1; +} + + static ULONG64 get_int_reg( CONTEXT *context, int reg ) { return *(&context->Rax + reg); diff --git a/include/winternl.h b/include/winternl.h index 5ee05097915..4061843c4c7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4615,6 +4615,9 @@ NTSYSAPI BOOLEAN WINAPI RtlIsActivationContextActive(HANDLE); NTSYSAPI BOOL WINAPI RtlIsCriticalSectionLocked(RTL_CRITICAL_SECTION *); NTSYSAPI BOOL WINAPI RtlIsCriticalSectionLockedByThread(RTL_CRITICAL_SECTION *); NTSYSAPI ULONG WINAPI RtlIsDosDeviceName_U(PCWSTR); +#ifdef __x86_64__ +NTSYSAPI BOOLEAN WINAPI RtlIsEcCode(const void*); +#endif NTSYSAPI BOOLEAN WINAPI RtlIsNameLegalDOS8Dot3(const UNICODE_STRING*,POEM_STRING,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlIsNormalizedString(ULONG,const WCHAR*,INT,BOOLEAN*); NTSYSAPI BOOLEAN WINAPI RtlIsProcessorFeaturePresent(UINT);

1 0

Alexandre Julliard : ntdll: Handle the extended memory attributes in NtAllocateVirtualMemoryEx().
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 5b6e82f0f9c274d6fc77ae2103256a4539afb43c URL: https://gitlab.winehq.org/wine/wine/-/commit/5b6e82f0f9c274d6fc77ae2103256a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 12:49:42 2023 +0200 ntdll: Handle the extended memory attributes in NtAllocateVirtualMemoryEx(). --- dlls/ntdll/unix/server.c | 56 ++++++++++++++++++++++++++++-------------- dlls/ntdll/unix/virtual.c | 54 +++++++++++++++++++++------------------- include/wine/server_protocol.h | 3 ++- include/winnt.h | 10 ++++++++ server/protocol.def | 1 + server/trace.c | 4 ++- 6 files changed, 82 insertions(+), 46 deletions(-)

1 0

Alexandre Julliard : ntdll: Support the MEM_EXTENDED_PARAMETER_EC_CODE attribute.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 1b823e5f3e6e6e25a4816610c855b41f5ff52a44 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b823e5f3e6e6e25a4816610c855b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 13:02:14 2023 +0200 ntdll: Support the MEM_EXTENDED_PARAMETER_EC_CODE attribute. --- dlls/ntdll/tests/virtual.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 7 +++-- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index a239a75ad47..425d02473ba 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -37,6 +37,8 @@ static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char*); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static NTSTATUS (WINAPI *pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static BOOLEAN (WINAPI *pRtlIsEcCode)(const void *); static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); static NTSTATUS (WINAPI *pNtMapViewOfSectionEx)(HANDLE, HANDLE, PVOID *, const LARGE_INTEGER *, SIZE_T *, @@ -291,6 +293,7 @@ static void check_region_size_(void *p, SIZE_T s, unsigned int line) static void test_NtAllocateVirtualMemoryEx(void) { + MEM_EXTENDED_PARAMETER ext; SIZE_T size, size2; char *p, *p1, *p2; NTSTATUS status; @@ -421,6 +424,73 @@ static void test_NtAllocateVirtualMemoryEx(void) status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p2, &size2, MEM_RELEASE); ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); } + + memset( &ext, 0, sizeof(ext) ); + ext.Type = MemExtendedParameterAttributeFlags; + ext.ULong = MEM_EXTENDED_PARAMETER_EC_CODE; + size = 0x10000; + addr1 = NULL; + status = pNtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr1, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, &ext, 1 ); +#ifdef __x86_64__ + if (pRtlGetNativeSystemInformation) + { + SYSTEM_CPU_INFORMATION cpu_info; + + pRtlGetNativeSystemInformation( SystemCpuInformation, &cpu_info, sizeof(cpu_info), NULL ); + if (cpu_info.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64) + { + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + if (pRtlIsEcCode) ok( pRtlIsEcCode( addr1 ), "not EC code %p\n", addr1 ); + size = 0; + NtFreeVirtualMemory( NtCurrentProcess(), &addr1, &size, MEM_RELEASE ); + + size = 0x10000; + addr1 = NULL; + status = pNtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr1, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, NULL, 0 ); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + if (pRtlIsEcCode) ok( !pRtlIsEcCode( addr1 ), "EC code %p\n", addr1 ); + size = 0x1000; + status = pNtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr1, &size, MEM_COMMIT, + PAGE_EXECUTE_READWRITE, &ext, 1 ); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + if (pRtlIsEcCode) + { + ok( pRtlIsEcCode( addr1 ), "not EC code %p\n", addr1 ); + ok( !pRtlIsEcCode( (char *)addr1 + 0x1000 ), "EC code %p\n", (char *)addr1 + 0x1000 ); + } + size = 0x2000; + status = pNtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr1, &size, MEM_COMMIT, + PAGE_EXECUTE_READWRITE, NULL, 0 ); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + if (pRtlIsEcCode) + { + ok( pRtlIsEcCode( addr1 ), "not EC code %p\n", addr1 ); + ok( !pRtlIsEcCode( (char *)addr1 + 0x1000 ), "EC code %p\n", (char *)addr1 + 0x1000 ); + } + + NtFreeVirtualMemory( NtCurrentProcess(), &addr1, &size, MEM_DECOMMIT ); + if (pRtlIsEcCode) ok( pRtlIsEcCode( addr1 ), "not EC code %p\n", addr1 ); + + size = 0x2000; + ext.ULong = 0; + status = pNtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr1, &size, MEM_COMMIT, + PAGE_EXECUTE_READWRITE, &ext, 1 ); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + if (pRtlIsEcCode) + { + ok( pRtlIsEcCode( addr1 ), "not EC code %p\n", addr1 ); + ok( !pRtlIsEcCode( (char *)addr1 + 0x1000 ), "EC code %p\n", (char *)addr1 + 0x1000 ); + } + + size = 0; + NtFreeVirtualMemory( NtCurrentProcess(), &addr1, &size, MEM_RELEASE ); + return; + } + } +#endif + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); } static void test_NtAllocateVirtualMemoryEx_address_requirements(void) @@ -1928,6 +1998,8 @@ START_TEST(virtual) pRtlFreeUserStack = (void *)GetProcAddress(mod, "RtlFreeUserStack"); pRtlFindExportedRoutineByName = (void *)GetProcAddress(mod, "RtlFindExportedRoutineByName"); pRtlGetEnabledExtendedFeatures = (void *)GetProcAddress(mod, "RtlGetEnabledExtendedFeatures"); + pRtlGetNativeSystemInformation = (void *)GetProcAddress(mod, "RtlGetNativeSystemInformation"); + pRtlIsEcCode = (void *)GetProcAddress(mod, "RtlIsEcCode"); pNtAllocateVirtualMemoryEx = (void *)GetProcAddress(mod, "NtAllocateVirtualMemoryEx"); pNtMapViewOfSectionEx = (void *)GetProcAddress(mod, "NtMapViewOfSectionEx"); pNtSetInformationVirtualMemory = (void *)GetProcAddress(mod, "NtSetInformationVirtualMemory"); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 1301d26eed7..fb2a7120aa8 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1008,7 +1008,6 @@ static inline UINT64 maskbits( size_t idx ) /*********************************************************************** * set_arm64ec_range */ -#ifdef __aarch64__ static void set_arm64ec_range( const void *addr, size_t size ) { size_t idx = (size_t)addr >> page_shift; @@ -1024,7 +1023,7 @@ static void set_arm64ec_range( const void *addr, size_t size ) } else arm64ec_map[pos] |= maskbits( idx ) & ~maskbits( end ); } -#endif + /*********************************************************************** * clear_arm64ec_range @@ -3958,6 +3957,8 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ return STATUS_INVALID_PARAMETER; } + if (!arm64ec_map && (attributes & MEM_EXTENDED_PARAMETER_EC_CODE)) return STATUS_INVALID_PARAMETER; + /* Reserve the memory */ server_enter_uninterrupted_section( &virtual_mutex, &sigset ); @@ -4000,6 +4001,8 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ } } + if (!status && (attributes & MEM_EXTENDED_PARAMETER_EC_CODE)) set_arm64ec_range( base, size ); + if (!status) VIRTUAL_DEBUG_DUMP_VIEW( view ); server_leave_uninterrupted_section( &virtual_mutex, &sigset );

1 0

Alexandre Julliard : server: Make x86_64 a supported architecture on ARM64.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 17a0e19489e14107f8ed7bcad9a07cb75e566ead URL: https://gitlab.winehq.org/wine/wine/-/commit/17a0e19489e14107f8ed7bcad9a07c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 14:25:58 2023 +0200 server: Make x86_64 a supported architecture on ARM64. --- server/registry.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/registry.c b/server/registry.c index 03e5f20cae5..3fea7dd79a4 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1857,6 +1857,7 @@ static void init_supported_machines(void) if (prefix_type == PREFIX_64BIT) { supported_machines[count++] = IMAGE_FILE_MACHINE_ARM64; + supported_machines[count++] = IMAGE_FILE_MACHINE_AMD64; supported_machines[count++] = IMAGE_FILE_MACHINE_I386; } supported_machines[count++] = IMAGE_FILE_MACHINE_ARMNT;

1 0

Zebediah Figura : vkd3d-shader/preproc: Lex whitespace and invalid characters in #include and #line directives.
by Alexandre Julliard 09 May '23

09 May '23

Module: vkd3d Branch: master Commit: ddbfd88e74e1e80a3bf56c2e5b55a2bd7c53d92c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ddbfd88e74e1e80a3bf56c2e5b55a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 8 12:52:10 2023 -0500 vkd3d-shader/preproc: Lex whitespace and invalid characters in #include and #line directives. Avoid letting them fall through to the default rule. A syntax error will be emitted by the parser. --- libs/vkd3d-shader/preproc.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 7686e018..be4a0598 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -175,9 +175,9 @@ INT_SUFFIX [uUlL]{0,2} return T_NEWLINE; } -<INITIAL>{WS}+ {} +<INITIAL,INCLUDE,LINE>{WS}+ {} <INITIAL>[-()\[\]{},+!*/<>&|^?:] {return yytext[0];} -<INITIAL>. {return T_TEXT;} +<INITIAL,INCLUDE,LINE>. {return T_TEXT;} %%

1 0

Zebediah Figura : vkd3d-shader/preproc: Ignore newlines in C comments.
by Alexandre Julliard 09 May '23

09 May '23

Module: vkd3d Branch: master Commit: 871cf0b4b503b0e85263a86b7b1c2dd3c8fad711 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/871cf0b4b503b0e85263a86b7b1c2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 8 13:06:31 2023 -0500 vkd3d-shader/preproc: Ignore newlines in C comments. Avoid letting them fall through to the default rule. --- libs/vkd3d-shader/preproc.l | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index be4a0598..a54e47bc 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -74,6 +74,7 @@ INT_SUFFIX [uUlL]{0,2} <C_COMMENT>"*/" {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT>. {} +<C_COMMENT>\n {} <ERROR>(\\{NEWLINE}|[^\n])* {return T_STRING;}

1 0

Zebediah Figura : vkd3d-shader/preproc: Use %option nodefault in the lexer.
by Alexandre Julliard 09 May '23

09 May '23

Module: vkd3d Branch: master Commit: 7b8845474d82424c348344c06fd8e57187d5269c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b8845474d82424c348344c06fd8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 8 12:57:22 2023 -0500 vkd3d-shader/preproc: Use %option nodefault in the lexer. --- libs/vkd3d-shader/preproc.l | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index a54e47bc..8e35e355 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -40,6 +40,7 @@ static void update_location(struct preproc_ctx *ctx); %option bison-locations %option extra-type="struct preproc_ctx *" %option never-interactive +%option nodefault %option noinput %option nounput %option noyy_top_state

1 0

Zebediah Figura : vkd3d-shader/hlsl: Lex invalid characters in #line directives.
by Alexandre Julliard 09 May '23

09 May '23

Module: vkd3d Branch: master Commit: 600fdcd112d9f74ca79ebd9f74174d49bda0f1f7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/600fdcd112d9f74ca79ebd9f74174… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 8 12:56:36 2023 -0500 vkd3d-shader/hlsl: Lex invalid characters in #line directives. Avoid letting them fall through to the default rule. --- libs/vkd3d-shader/hlsl.l | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 10751bbe..8a7cd234 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -266,6 +266,10 @@ row_major {return KW_ROW_MAJOR; } return STRING; } <pp_line>{WS}+ {} +<pp_line>{ANY} { + FIXME("Malformed preprocessor line directive?\n"); + BEGIN(INITIAL); + } <pp_line>{NEWLINE} { FIXME("Malformed preprocessor line directive?\n"); BEGIN(INITIAL);

1 0