Skip to content

W
wine-winehq
Commit f78bd7f4 authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard
Browse files
Options

ntdll: Enable wow64 on ARM64.

parent fc1dc668
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/ntdll/process.c
View file @ f78bd7f4
...@@ -419,12 +419,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( ...@@ -419,12 +419,13 @@ NTSTATUS WINAPI NtQueryInformationProcess(
ULONG_PTR val = 0; ULONG_PTR val = 0;
if (ProcessHandle == GetCurrentProcess()) val = is_wow64; if (ProcessHandle == GetCurrentProcess()) val = is_wow64;
else if (server_cpus & (1 << CPU_x86_64)) else if (server_cpus & ((1 << CPU_x86_64) | (1 << CPU_ARM64)))
{ {
SERVER_START_REQ( get_process_info ) SERVER_START_REQ( get_process_info )
{ {
req->handle = wine_server_obj_handle( ProcessHandle ); req->handle = wine_server_obj_handle( ProcessHandle );
if (!(ret = wine_server_call( req ))) val = (reply->cpu != CPU_x86_64); if (!(ret = wine_server_call( req )))
val = (reply->cpu != CPU_x86_64 && reply->cpu != CPU_ARM64);
} }
SERVER_END_REQ; SERVER_END_REQ;
} }
......
dlls/ntdll/server.c
View file @ f78bd7f4
...@@ -1503,7 +1503,7 @@ size_t server_init_thread( void *entry_point ) ...@@ -1503,7 +1503,7 @@ size_t server_init_thread( void *entry_point )
} }
SERVER_END_REQ; SERVER_END_REQ;
is_wow64 = !is_win64 && (server_cpus & (1 << CPU_x86_64)) != 0; is_wow64 = !is_win64 && (server_cpus & ((1 << CPU_x86_64) | (1 << CPU_ARM64))) != 0;
ntdll_get_thread_data()->wow64_redir = is_wow64; ntdll_get_thread_data()->wow64_redir = is_wow64;
switch (ret) switch (ret)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment