niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

ntdll: Use the current machine by default to create an ARM64X process.

Browse source
This commit is contained in:
Alexandre Julliard 2024-02-08 15:46:17 +01:00
parent de988eeea0
commit 1456b31eec
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/ntdll/unix/loader.c
View file

@ -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);

7
dlls/ntdll/unix/process.c
View file

@ -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 );