[PATCH] update winnt.h a bit

[Jeff Muizelaar]

Changelog:
 - add IMAGE_FILE_NET_RUN_FROM_SWAP define
 - update IMAGE_FILE_MACHINE_* defines
 - update IMAGE_SUBSYSTEM_* defines
 - uncomment IMAGE_SCN_TYPE_NO_PAD define
 - update IMAGE_SCN_ALIGN_* defines


-Jeff
-------------- next part --------------
diff -urN wine-old/windows/winnt.h wine/windows/winnt.h
--- wine-old/windows/winnt.h	2003-06-29 18:06:20.000000000 -0400
+++ wine/windows/winnt.h	2003-07-13 16:40:57.000000000 -0400
@@ -1798,6 +1798,7 @@
 #define IMAGE_FILE_32BIT_MACHINE	0x0100
 #define IMAGE_FILE_DEBUG_STRIPPED	0x0200
 #define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP	0x0400
+#define IMAGE_FILE_NET_RUN_FROM_SWAP	0x0800
 #define IMAGE_FILE_SYSTEM		0x1000
 #define IMAGE_FILE_DLL			0x2000
 #define IMAGE_FILE_UP_SYSTEM_ONLY	0x4000
@@ -1805,13 +1806,35 @@
 
 /* These are the settings of the Machine field. */
 #define	IMAGE_FILE_MACHINE_UNKNOWN	0
-#define	IMAGE_FILE_MACHINE_I860		0x14d
-#define	IMAGE_FILE_MACHINE_I386		0x14c
-#define	IMAGE_FILE_MACHINE_R3000	0x162
-#define	IMAGE_FILE_MACHINE_R4000	0x166
-#define	IMAGE_FILE_MACHINE_R10000	0x168
-#define	IMAGE_FILE_MACHINE_ALPHA	0x184
-#define	IMAGE_FILE_MACHINE_POWERPC	0x1F0
+#define	IMAGE_FILE_MACHINE_I860		0x014d
+#define	IMAGE_FILE_MACHINE_I386		0x014c
+#define	IMAGE_FILE_MACHINE_R3000	0x0162
+#define	IMAGE_FILE_MACHINE_R4000	0x0166
+#define	IMAGE_FILE_MACHINE_R10000	0x0168
+#define	IMAGE_FILE_MACHINE_WCEMIPSV2	0x0169
+#define	IMAGE_FILE_MACHINE_ALPHA	0x0184
+#define	IMAGE_FILE_MACHINE_SH3		0x01a2
+#define	IMAGE_FILE_MACHINE_SH3DSP	0x01a3
+#define	IMAGE_FILE_MACHINE_SH3E		0x01a4
+#define	IMAGE_FILE_MACHINE_SH4		0x01a6
+#define	IMAGE_FILE_MACHINE_SH5		0x01a8
+#define	IMAGE_FILE_MACHINE_ARM		0x01c0
+#define	IMAGE_FILE_MACHINE_THUMB	0x01c2
+#define	IMAGE_FILE_MACHINE_AM33		0x01d3
+#define	IMAGE_FILE_MACHINE_POWERPC	0x01f0
+#define	IMAGE_FILE_MACHINE_POWERPCFP	0x01f1
+#define	IMAGE_FILE_MACHINE_IA64		0x0200
+#define	IMAGE_FILE_MACHINE_MIPS16	0x0266
+#define	IMAGE_FILE_MACHINE_ALPHA64	0x0284
+#define	IMAGE_FILE_MACHINE_MIPSFPU	0x0366
+#define	IMAGE_FILE_MACHINE_MIPSFPU16	0x0466
+#define	IMAGE_FILE_MACHINE_AXP64	IMAGE_FILE_MACHINE_ALPHA64
+#define	IMAGE_FILE_MACHINE_TRICORE	0x0520
+#define	IMAGE_FILE_MACHINE_CEF		0x0cef
+#define	IMAGE_FILE_MACHINE_EBC		0x0ebc
+#define	IMAGE_FILE_MACHINE_AMD64	0x8664
+#define	IMAGE_FILE_MACHINE_M32R		0x9041
+#define	IMAGE_FILE_MACHINE_CEE		0xc0ee
 
 #define	IMAGE_SIZEOF_FILE_HEADER	20
 
@@ -1852,12 +1875,19 @@
 
 /* Subsystem Values */
 
-#define	IMAGE_SUBSYSTEM_UNKNOWN		0
-#define	IMAGE_SUBSYSTEM_NATIVE		1
-#define	IMAGE_SUBSYSTEM_WINDOWS_GUI	2	/* Windows GUI subsystem */
-#define	IMAGE_SUBSYSTEM_WINDOWS_CUI	3	/* Windows character subsystem*/
-#define	IMAGE_SUBSYSTEM_OS2_CUI		5
-#define	IMAGE_SUBSYSTEM_POSIX_CUI	7
+#define	IMAGE_SUBSYSTEM_UNKNOWN			0
+#define	IMAGE_SUBSYSTEM_NATIVE			1
+#define	IMAGE_SUBSYSTEM_WINDOWS_GUI		2	/* Windows GUI subsystem */
+#define	IMAGE_SUBSYSTEM_WINDOWS_CUI		3	/* Windows character subsystem */
+#define	IMAGE_SUBSYSTEM_OS2_CUI			5
+#define	IMAGE_SUBSYSTEM_POSIX_CUI		7
+#define	IMAGE_SUBSYSTEM_NATIVE_WINDOWS		8	/* native Win9x driver */
+#define	IMAGE_SUBSYSTEM_WINDOWS_CE_GUI		9	/* Windows CE subsystem */
+#define	IMAGE_SUBSYSTEM_EFI_APPLICATION		10
+#define	IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER	11
+#define	IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER	12
+#define	IMAGE_SUBSYSTEM_EFI_ROM			13
+#define	IMAGE_SUBSYSTEM_XBOX			14
 
 typedef struct _IMAGE_FILE_HEADER {
   WORD  Machine;
@@ -1952,7 +1982,7 @@
 /* #define IMAGE_SCN_TYPE_DSECT			0x00000001 - Reserved */
 /* #define IMAGE_SCN_TYPE_NOLOAD		0x00000002 - Reserved */
 /* #define IMAGE_SCN_TYPE_GROUP			0x00000004 - Reserved */
-/* #define IMAGE_SCN_TYPE_NO_PAD		0x00000008 - Reserved */
+#define IMAGE_SCN_TYPE_NO_PAD			0x00000008 /* Reserved */
 /* #define IMAGE_SCN_TYPE_COPY			0x00000010 - Reserved */
 
 #define IMAGE_SCN_CNT_CODE			0x00000020
@@ -1980,9 +2010,17 @@
 #define	IMAGE_SCN_ALIGN_4BYTES			0x00300000
 #define	IMAGE_SCN_ALIGN_8BYTES			0x00400000
 #define	IMAGE_SCN_ALIGN_16BYTES			0x00500000  /* Default */
-#define IMAGE_SCN_ALIGN_32BYTES			0x00600000
-#define IMAGE_SCN_ALIGN_64BYTES			0x00700000
-/* 						0x00800000 - Unused */
+#define	IMAGE_SCN_ALIGN_32BYTES			0x00600000
+#define	IMAGE_SCN_ALIGN_64BYTES			0x00700000
+#define	IMAGE_SCN_ALIGN_128BYTES		0x00800000
+#define	IMAGE_SCN_ALIGN_256BYTES		0x00900000
+#define	IMAGE_SCN_ALIGN_512BYTES		0x00A00000
+#define	IMAGE_SCN_ALIGN_1024BYTES		0x00B00000
+#define	IMAGE_SCN_ALIGN_2048BYTES		0x00C00000
+#define	IMAGE_SCN_ALIGN_4096BYTES		0x00D00000
+#define	IMAGE_SCN_ALIGN_8192BYTES		0x00E00000
+/* 						0x00F00000 - Unused */
+#define	IMAGE_SCN_ALIGN_MASK			0x00F00000
 
 #define IMAGE_SCN_LNK_NRELOC_OVFL		0x01000000