diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3032553e9c4..ea2234afe33 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -71,6 +71,7 @@ extern void virtual_init_threading(void); /* server support */ extern timeout_t server_start_time; +extern unsigned int server_cpus; extern int is_wow64; extern void server_init_process(void); extern NTSTATUS server_init_process_done(void); diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 9ec5513a88c..62585692724 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -307,7 +307,19 @@ NTSTATUS WINAPI NtQueryInformationProcess( case ProcessWow64Information: if (ProcessInformationLength == sizeof(DWORD)) { - *(DWORD *)ProcessInformation = is_wow64; + DWORD val = 0; + + if (ProcessHandle == GetCurrentProcess()) val = is_wow64; + else if (server_cpus & (1 << CPU_x86_64)) + { + 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); + } + SERVER_END_REQ; + } + *(DWORD *)ProcessInformation = val; len = sizeof(DWORD); } else ret = STATUS_INFO_LENGTH_MISMATCH; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index a4f29539a4b..1eea402debd 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -94,7 +94,7 @@ static const enum cpu_type client_cpu = CPU_SPARC; #error Unsupported CPU #endif -static unsigned int server_cpus; +unsigned int server_cpus = 0; int is_wow64 = FALSE; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS