forked from Mirrors/wine-wine
ntdll: Make the client cpu constant global.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>master
parent
9e3893cc29
commit
67949d96a7
|
@ -417,10 +417,8 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, HANDLE *handle, pe_image
|
||||||
/* assume current arch */
|
/* assume current arch */
|
||||||
#if defined(__i386__) || defined(__x86_64__)
|
#if defined(__i386__) || defined(__x86_64__)
|
||||||
info->cpu = is_64bit ? CPU_x86_64 : CPU_x86;
|
info->cpu = is_64bit ? CPU_x86_64 : CPU_x86;
|
||||||
#elif defined(__arm__)
|
#else
|
||||||
info->cpu = CPU_ARM;
|
info->cpu = client_cpu;
|
||||||
#elif defined(__aarch64__)
|
|
||||||
info->cpu = CPU_ARM64;
|
|
||||||
#endif
|
#endif
|
||||||
*handle = 0;
|
*handle = 0;
|
||||||
return STATUS_SUCCESS;
|
return STATUS_SUCCESS;
|
||||||
|
|
|
@ -100,18 +100,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(server);
|
||||||
#define SOCKETNAME "socket" /* name of the socket file */
|
#define SOCKETNAME "socket" /* name of the socket file */
|
||||||
#define LOCKNAME "lock" /* name of the lock file */
|
#define LOCKNAME "lock" /* name of the lock file */
|
||||||
|
|
||||||
#ifdef __i386__
|
|
||||||
static const enum cpu_type client_cpu = CPU_x86;
|
|
||||||
#elif defined(__x86_64__)
|
|
||||||
static const enum cpu_type client_cpu = CPU_x86_64;
|
|
||||||
#elif defined(__arm__)
|
|
||||||
static const enum cpu_type client_cpu = CPU_ARM;
|
|
||||||
#elif defined(__aarch64__)
|
|
||||||
static const enum cpu_type client_cpu = CPU_ARM64;
|
|
||||||
#else
|
|
||||||
#error Unsupported CPU
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
|
static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
|
||||||
|
|
||||||
static const char *server_dir;
|
static const char *server_dir;
|
||||||
|
|
|
@ -28,6 +28,16 @@
|
||||||
#define InterlockedCompareExchange64(dest,xchg,cmp) RtlInterlockedCompareExchange64(dest,xchg,cmp)
|
#define InterlockedCompareExchange64(dest,xchg,cmp) RtlInterlockedCompareExchange64(dest,xchg,cmp)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __i386__
|
||||||
|
static const enum cpu_type client_cpu = CPU_x86;
|
||||||
|
#elif defined(__x86_64__)
|
||||||
|
static const enum cpu_type client_cpu = CPU_x86_64;
|
||||||
|
#elif defined(__arm__)
|
||||||
|
static const enum cpu_type client_cpu = CPU_ARM;
|
||||||
|
#elif defined(__aarch64__)
|
||||||
|
static const enum cpu_type client_cpu = CPU_ARM64;
|
||||||
|
#endif
|
||||||
|
|
||||||
struct debug_info
|
struct debug_info
|
||||||
{
|
{
|
||||||
unsigned int str_pos; /* current position in strings buffer */
|
unsigned int str_pos; /* current position in strings buffer */
|
||||||
|
|
Loading…
Reference in New Issue