=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: include: Rename IMAGE_FILE_MACHINE_ARMV7 to IMAGE_FILE_MACHINE_ARMNT.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 538a0abbd7dae8bfd23e1c93223cac6dc51765ba
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=538a0abbd7dae8bfd23e1c93223cac6dc51765ba

Author: André Hentschel <nerv at dawncrow.de>
Date:   Thu Aug 16 22:39:46 2012 +0200

include: Rename IMAGE_FILE_MACHINE_ARMV7 to IMAGE_FILE_MACHINE_ARMNT.

---

 dlls/dbghelp/cpu_arm.c       |    2 +-
 dlls/kernel32/tests/file.c   |    2 +-
 dlls/kernel32/tests/loader.c |    2 +-
 dlls/ntdll/virtual.c         |    4 ++--
 include/winnt.h              |    2 +-
 programs/winedbg/be_arm.c    |    2 +-
 tools/winedump/pe.c          |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c
index a38afe8..769bc95 100644
--- a/dlls/dbghelp/cpu_arm.c
+++ b/dlls/dbghelp/cpu_arm.c
@@ -245,7 +245,7 @@ static BOOL arm_fetch_minidump_module(struct dump_context* dc, unsigned index, u
 }
 
 DECLSPEC_HIDDEN struct cpu cpu_arm = {
-    IMAGE_FILE_MACHINE_ARMV7,
+    IMAGE_FILE_MACHINE_ARMNT,
     4,
     CV_ARM_R0 + 11,
     arm_get_addr,
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index c6e9f18..c046371 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -1779,7 +1779,7 @@ static BOOL create_fake_dll( LPCSTR filename )
 #elif defined __sparc__
     nt->FileHeader.Machine = IMAGE_FILE_MACHINE_SPARC;
 #elif defined __arm__
-    nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMV7;
+    nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT;
 #else
 # error You must specify the machine type
 #endif
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index e98ebc1..e503171 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -63,7 +63,7 @@ static IMAGE_NT_HEADERS nt_header =
 #elif defined __sparc__
       IMAGE_FILE_MACHINE_SPARC, /* Machine */
 #elif defined __arm__
-      IMAGE_FILE_MACHINE_ARMV7, /* Machine */
+      IMAGE_FILE_MACHINE_ARMNT, /* Machine */
 #else
 # error You must specify the machine type
 #endif
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 806b7a9..88bcdbb 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -1063,7 +1063,7 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt )
     if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM ||
         nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB)
         return STATUS_SUCCESS;
-    if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7)
+    if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMNT)
     {
         SYSTEM_CPU_INFORMATION sci;
         if (SUCCEEDED(NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL )) &&
@@ -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_AMD64:   arch = "AMD-64"; 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_SPARC:   arch = "SPARC"; break;
         default: arch = wine_dbg_sprintf( "Unknown-%04x", nt->FileHeader.Machine ); break;
diff --git a/include/winnt.h b/include/winnt.h
index 2f78820..5625e37 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -2401,7 +2401,7 @@ typedef struct _IMAGE_VXD_HEADER {
 #define	IMAGE_FILE_MACHINE_SH5		0x01a8
 #define	IMAGE_FILE_MACHINE_ARM		0x01c0
 #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_POWERPC	0x01f0
 #define	IMAGE_FILE_MACHINE_POWERPCFP	0x01f1
diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c
index f375fe8..2f1021e 100644
--- a/programs/winedbg/be_arm.c
+++ b/programs/winedbg/be_arm.c
@@ -1189,7 +1189,7 @@ static int be_arm_store_integer(const struct dbg_lvalue* lvalue, unsigned size,
 
 struct backend_cpu be_arm =
 {
-    IMAGE_FILE_MACHINE_ARMV7,
+    IMAGE_FILE_MACHINE_ARMNT,
     4,
     be_cpu_linearize,
     be_cpu_build_addr,
diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c
index c655451..4cf0b40 100644
--- a/tools/winedump/pe.c
+++ b/tools/winedump/pe.c
@@ -62,7 +62,7 @@ const char *get_machine_str(int mach)
     case IMAGE_FILE_MACHINE_AMD64:      return "AMD64";
     case IMAGE_FILE_MACHINE_IA64:       return "IA64";
     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_SPARC:      return "SPARC";
     }