Skip to content

W
wine-cw
Commit 538a0abb authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard
Browse files
Options

include: Rename IMAGE_FILE_MACHINE_ARMV7 to IMAGE_FILE_MACHINE_ARMNT.

parent 03d377ea
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
dlls/dbghelp/cpu_arm.c
View file @ 538a0abb
...@@ -245,7 +245,7 @@ static BOOL arm_fetch_minidump_module(struct dump_context* dc, unsigned index, u ...@@ -245,7 +245,7 @@ static BOOL arm_fetch_minidump_module(struct dump_context* dc, unsigned index, u
} }
DECLSPEC_HIDDEN struct cpu cpu_arm = { DECLSPEC_HIDDEN struct cpu cpu_arm = {
IMAGE_FILE_MACHINE_ARMV7, IMAGE_FILE_MACHINE_ARMNT,
4, 4,
CV_ARM_R0 + 11, CV_ARM_R0 + 11,
arm_get_addr, arm_get_addr,
......
dlls/kernel32/tests/file.c
View file @ 538a0abb
...@@ -1779,7 +1779,7 @@ static BOOL create_fake_dll( LPCSTR filename ) ...@@ -1779,7 +1779,7 @@ static BOOL create_fake_dll( LPCSTR filename )
#elif defined __sparc__ #elif defined __sparc__
nt->FileHeader.Machine = IMAGE_FILE_MACHINE_SPARC; nt->FileHeader.Machine = IMAGE_FILE_MACHINE_SPARC;
#elif defined __arm__ #elif defined __arm__
nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMV7; nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT;
#else #else
# error You must specify the machine type # error You must specify the machine type
#endif #endif
......
dlls/kernel32/tests/loader.c
View file @ 538a0abb
...@@ -63,7 +63,7 @@ static IMAGE_NT_HEADERS nt_header = ...@@ -63,7 +63,7 @@ static IMAGE_NT_HEADERS nt_header =
#elif defined __sparc__ #elif defined __sparc__
IMAGE_FILE_MACHINE_SPARC, /* Machine */ IMAGE_FILE_MACHINE_SPARC, /* Machine */
#elif defined __arm__ #elif defined __arm__
IMAGE_FILE_MACHINE_ARMV7, /* Machine */ IMAGE_FILE_MACHINE_ARMNT, /* Machine */
#else #else
# error You must specify the machine type # error You must specify the machine type
#endif #endif
......
dlls/ntdll/virtual.c
View file @ 538a0abb
...@@ -1063,7 +1063,7 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) ...@@ -1063,7 +1063,7 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt )
if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM ||
nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB) nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB)
return STATUS_SUCCESS; return STATUS_SUCCESS;
if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7) if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMNT)
{ {
SYSTEM_CPU_INFORMATION sci; SYSTEM_CPU_INFORMATION sci;
if (SUCCEEDED(NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL )) && if (SUCCEEDED(NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL )) &&
...@@ -1086,7 +1086,7 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) ...@@ -1086,7 +1086,7 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt )
case IMAGE_FILE_MACHINE_ALPHA64: arch = "Alpha-64"; break; case IMAGE_FILE_MACHINE_ALPHA64: arch = "Alpha-64"; break;
case IMAGE_FILE_MACHINE_AMD64: arch = "AMD-64"; break; case IMAGE_FILE_MACHINE_AMD64: arch = "AMD-64"; break;
case IMAGE_FILE_MACHINE_ARM: arch = "ARM"; break; case IMAGE_FILE_MACHINE_ARM: arch = "ARM"; break;
case IMAGE_FILE_MACHINE_ARMV7: arch = "ARMv7"; break; case IMAGE_FILE_MACHINE_ARMNT: arch = "ARMNT"; break;
case IMAGE_FILE_MACHINE_THUMB: arch = "ARM Thumb"; break; case IMAGE_FILE_MACHINE_THUMB: arch = "ARM Thumb"; break;
case IMAGE_FILE_MACHINE_SPARC: arch = "SPARC"; break; case IMAGE_FILE_MACHINE_SPARC: arch = "SPARC"; break;
default: arch = wine_dbg_sprintf( "Unknown-%04x", nt->FileHeader.Machine ); break; default: arch = wine_dbg_sprintf( "Unknown-%04x", nt->FileHeader.Machine ); break;
......
include/winnt.h
View file @ 538a0abb
...@@ -2401,7 +2401,7 @@ typedef struct _IMAGE_VXD_HEADER { ...@@ -2401,7 +2401,7 @@ typedef struct _IMAGE_VXD_HEADER {
#define IMAGE_FILE_MACHINE_SH5 0x01a8 #define IMAGE_FILE_MACHINE_SH5 0x01a8
#define IMAGE_FILE_MACHINE_ARM 0x01c0 #define IMAGE_FILE_MACHINE_ARM 0x01c0
#define IMAGE_FILE_MACHINE_THUMB 0x01c2 #define IMAGE_FILE_MACHINE_THUMB 0x01c2
#define IMAGE_FILE_MACHINE_ARMV7 0x01c4 #define IMAGE_FILE_MACHINE_ARMNT 0x01c4
#define IMAGE_FILE_MACHINE_AM33 0x01d3 #define IMAGE_FILE_MACHINE_AM33 0x01d3
#define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_POWERPC 0x01f0
#define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 #define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1
......
programs/winedbg/be_arm.c
View file @ 538a0abb
...@@ -1189,7 +1189,7 @@ static int be_arm_store_integer(const struct dbg_lvalue* lvalue, unsigned size, ...@@ -1189,7 +1189,7 @@ static int be_arm_store_integer(const struct dbg_lvalue* lvalue, unsigned size,
struct backend_cpu be_arm = struct backend_cpu be_arm =
{ {
IMAGE_FILE_MACHINE_ARMV7, IMAGE_FILE_MACHINE_ARMNT,
4, 4,
be_cpu_linearize, be_cpu_linearize,
be_cpu_build_addr, be_cpu_build_addr,
......
tools/winedump/pe.c
View file @ 538a0abb
...@@ -62,7 +62,7 @@ const char *get_machine_str(int mach) ...@@ -62,7 +62,7 @@ const char *get_machine_str(int mach)
case IMAGE_FILE_MACHINE_AMD64: return "AMD64"; case IMAGE_FILE_MACHINE_AMD64: return "AMD64";
case IMAGE_FILE_MACHINE_IA64: return "IA64"; case IMAGE_FILE_MACHINE_IA64: return "IA64";
case IMAGE_FILE_MACHINE_ARM: return "ARM"; case IMAGE_FILE_MACHINE_ARM: return "ARM";
case IMAGE_FILE_MACHINE_ARMV7: return "ARMv7"; case IMAGE_FILE_MACHINE_ARMNT: return "ARMNT";
case IMAGE_FILE_MACHINE_THUMB: return "ARM Thumb"; case IMAGE_FILE_MACHINE_THUMB: return "ARM Thumb";
case IMAGE_FILE_MACHINE_SPARC: return "SPARC"; case IMAGE_FILE_MACHINE_SPARC: return "SPARC";
} }
......
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