=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: ntdll: Enable wow64 on ARM64.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri May 8 05:21:28 CDT 2015
Module: wine
Branch: master
Commit: f78bd7f4d99b99567a0bda09d7c08ffefd5b1325
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78bd7f4d99b99567a0bda09d7c08ffefd5b1325
Author: André Hentschel <nerv at dawncrow.de>
Date: Thu May 7 23:37:44 2015 +0200
ntdll: Enable wow64 on ARM64.
---
dlls/ntdll/process.c | 5 +++--
dlls/ntdll/server.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
index 3ac8d52..c69de5e 100644
--- a/dlls/ntdll/process.c
+++ b/dlls/ntdll/process.c
@@ -419,12 +419,13 @@ NTSTATUS WINAPI NtQueryInformationProcess(
ULONG_PTR val = 0;
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 )
{
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;
}
diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
index 652a1aa..95111ad 100644
--- a/dlls/ntdll/server.c
+++ b/dlls/ntdll/server.c
@@ -1503,7 +1503,7 @@ size_t server_init_thread( void *entry_point )
}
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;
switch (ret)
More information about the wine-cvs
mailing list