* include/winbase.h (DUPLICATE_CLOSE_SOURCE,

	DUPLICATE_SAME_ACCESS): Remove defines.
	(HANDLE_FLAG_INHERIT, HANDLE_FLAG_PROTECT_FROM_CLOSE): Sync with
	ddk/ntapi.h defines.
	(SEM_*) : Likewise.
	* include/winnt.h (COMPRESSION_*, ACCESS_*, SYSTEM_*): Sync with
	ddk/ntifs.h defines.
	(FILE_*): Likewise.
	(MEM_IMAGE, SEC_*): Likewise.
	(DUPLICATE_CLOSE_SOURCE, DUPLICATE_SAME_ACCESS,
	DUPLICATE_SAME_ATTRIBUTES): Sync with ddk/winddk.h defines.
	(TOKEN_*): Sync with ddk/ntifs.h defines.
	* include/ddk/ntapi.h: Add comments noting definitions in
	winbase.h.
	* include/ddk/ntifs.h: Add comments noting definitions in
	winnt.h.
	* include/ddk/winddk.h: Add comments noting definitions in
	winnt.h.

3 files changed, 30 insertions, 18 deletions

diff --git a/winsup/w32api/include/ddk/ntapi.h b/winsup/w32api/include/ddk/ntapi.h
index 4b94a7870..bc65f9e6c 100644
--- a/winsup/w32api/include/ddk/ntapi.h
+++ b/winsup/w32api/include/ddk/ntapi.h
@@ -754,8 +754,10 @@ ZwSetInformationObject(
 	IN ULONG  ObjectInformationLength);
 
 /* OBJECT_BASIC_INFORMATION.Attributes constants */
+/* also in winbase.h */
 #define HANDLE_FLAG_INHERIT               0x01
 #define HANDLE_FLAG_PROTECT_FROM_CLOSE    0x02
+/* end winbase.h */
 #define PERMANENT                         0x10
 #define EXCLUSIVE                         0x20
 
@@ -1404,11 +1406,12 @@ typedef struct _PROCESS_ACCESS_TOKEN {
 } PROCESS_ACCESS_TOKEN, *PPROCESS_ACCESS_TOKEN;
 
 /* DefaultHardErrorMode constants */
+/* also in winbase.h */
 #define SEM_FAILCRITICALERRORS            0x0001
 #define SEM_NOGPFAULTERRORBOX             0x0002
 #define SEM_NOALIGNMENTFAULTEXCEPT        0x0004
 #define SEM_NOOPENFILEERRORBOX            0x8000
-
+/* end winbase.h */
 typedef struct _POOLED_USAGE_AND_LIMITS {
 	ULONG  PeakPagedPoolUsage;
 	ULONG  PagedPoolUsage;
diff --git a/winsup/w32api/include/ddk/ntifs.h b/winsup/w32api/include/ddk/ntifs.h
index 0c4dd2b09..efc8cd1a0 100644
--- a/winsup/w32api/include/ddk/ntifs.h
+++ b/winsup/w32api/include/ddk/ntifs.h
@@ -24,7 +24,7 @@
 #define _NTIFS_
 #define _GNU_NTIFS_
 
-#if __GNUC__ >=3
+#if __GNUC__ > =3
 #pragma GCC system_header
 #endif
 
@@ -54,11 +54,6 @@ extern PSE_EXPORTS                  SeExports;
 extern PACL                         SePublicDefaultDacl;
 extern PACL                         SeSystemDefaultDacl;
 
-#define ACCESS_ALLOWED_ACE_TYPE         (0x0)
-#define ACCESS_DENIED_ACE_TYPE          (0x1)
-#define SYSTEM_AUDIT_ACE_TYPE           (0x2)
-#define SYSTEM_ALARM_ACE_TYPE           (0x3)
-
 #define ANSI_DOS_STAR                   ('<')
 #define ANSI_DOS_QM                     ('>')
 #define ANSI_DOS_DOT                    ('"')
@@ -67,6 +62,12 @@ extern PACL                         SeSystemDefaultDacl;
 #define DOS_QM                          (L'>')
 #define DOS_DOT                         (L'"')
 
+/* also in winnt.h */
+#define ACCESS_ALLOWED_ACE_TYPE         (0x0)
+#define ACCESS_DENIED_ACE_TYPE          (0x1)
+#define SYSTEM_AUDIT_ACE_TYPE           (0x2)
+#define SYSTEM_ALARM_ACE_TYPE           (0x3)
+ 
 #define COMPRESSION_FORMAT_NONE         (0x0000)
 #define COMPRESSION_FORMAT_DEFAULT      (0x0001)
 #define COMPRESSION_FORMAT_LZNT1        (0x0002)
@@ -85,6 +86,7 @@ extern PACL                         SeSystemDefaultDacl;
 #define FILE_ACTION_REMOVED_BY_DELETE       0x00000009
 #define FILE_ACTION_ID_NOT_TUNNELLED        0x0000000A
 #define FILE_ACTION_TUNNELLED_ID_COLLISION  0x0000000B
+/* end  winnt.h */
 
 #define FILE_EA_TYPE_BINARY             0xfffe
 #define FILE_EA_TYPE_ASCII              0xfffd
@@ -99,6 +101,7 @@ extern PACL                         SeSystemDefaultDacl;
 
 #define FILE_NEED_EA                    0x00000080
 
+/* also in winnt.h */
 #define FILE_NOTIFY_CHANGE_FILE_NAME    0x00000001
 #define FILE_NOTIFY_CHANGE_DIR_NAME     0x00000002
 #define FILE_NOTIFY_CHANGE_NAME         0x00000003
@@ -113,6 +116,7 @@ extern PACL                         SeSystemDefaultDacl;
 #define FILE_NOTIFY_CHANGE_STREAM_SIZE  0x00000400
 #define FILE_NOTIFY_CHANGE_STREAM_WRITE 0x00000800
 #define FILE_NOTIFY_VALID_MASK          0x00000fff
+/* end winnt.h */
 
 #define FILE_OPLOCK_BROKEN_TO_LEVEL_2   0x00000007
 #define FILE_OPLOCK_BROKEN_TO_NONE      0x00000008
@@ -228,11 +232,11 @@ extern PACL                         SeSystemDefaultDacl;
 #define IO_ATTACH_DEVICE                0x0400
 
 #define IO_ATTACH_DEVICE_API            0x80000000
-
+/* also in winnt.h */
 #define IO_COMPLETION_QUERY_STATE       0x0001
 #define IO_COMPLETION_MODIFY_STATE      0x0002
 #define IO_COMPLETION_ALL_ACCESS        (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3)
-
+/* end winnt.h */
 #define IO_FILE_OBJECT_NON_PAGED_POOL_CHARGE    64
 #define IO_FILE_OBJECT_PAGED_POOL_CHARGE        1024
 
@@ -252,10 +256,10 @@ extern PACL                         SeSystemDefaultDacl;
 
 #define MAP_PROCESS                     1L
 #define MAP_SYSTEM                      2L
-
 #define MEM_DOS_LIM                     0x40000000
+/* also in winnt.h */
 #define MEM_IMAGE                       SEC_IMAGE
-
+/* end winnt.h */ 
 #define OB_TYPE_TYPE                    1
 #define OB_TYPE_DIRECTORY               2
 #define OB_TYPE_SYMBOLIC_LINK           3
@@ -288,13 +292,15 @@ extern PACL                         SeSystemDefaultDacl;
 #define PORT_CONNECT                    0x0001
 #define PORT_ALL_ACCESS                 (STANDARD_RIGHTS_ALL |\
                                          PORT_CONNECT)
-
-#define SEC_BASED                       0x00200000
-#define SEC_NO_CHANGE                   0x00400000
-#define SEC_FILE                        0x00800000
-#define SEC_IMAGE                       0x01000000
-#define SEC_COMMIT                      0x08000000
-#define SEC_NOCACHE                     0x10000000
+/* also in winnt.h */
+#define SEC_BASED	0x00200000
+#define SEC_NO_CHANGE	0x00400000
+#define SEC_FILE	0x00800000
+#define SEC_IMAGE	0x01000000
+#define SEC_VLM		0x02000000
+#define SEC_RESERVE	0x04000000
+#define SEC_COMMIT	0x08000000
+#define SEC_NOCACHE	0x10000000
 
 #define SECURITY_WORLD_SID_AUTHORITY    {0,0,0,0,0,1}
 #define SECURITY_WORLD_RID              (0x00000000L)
@@ -331,6 +337,7 @@ extern PACL                         SeSystemDefaultDacl;
 #define TOKEN_EXECUTE    (STANDARD_RIGHTS_EXECUTE)
 
 #define TOKEN_SOURCE_LENGTH 8
+/* end winnt.h */
 
 #define TOKEN_HAS_TRAVERSE_PRIVILEGE    0x01
 #define TOKEN_HAS_BACKUP_PRIVILEGE      0x02
diff --git a/winsup/w32api/include/ddk/winddk.h b/winsup/w32api/include/ddk/winddk.h
index eedc3abe6..4de95c9c5 100644
--- a/winsup/w32api/include/ddk/winddk.h
+++ b/winsup/w32api/include/ddk/winddk.h
@@ -733,9 +733,11 @@ typedef VOID DDKAPI
 #define SYMBOLIC_LINK_QUERY               0x0001
 #define SYMBOLIC_LINK_ALL_ACCESS          (STANDARD_RIGHTS_REQUIRED | 0x1)
 
+/* also in winnt,h */
 #define DUPLICATE_CLOSE_SOURCE            0x00000001
 #define DUPLICATE_SAME_ACCESS             0x00000002
 #define DUPLICATE_SAME_ATTRIBUTES         0x00000004
+/* end winnt.h */
 
 typedef struct _OBJECT_NAME_INFORMATION {               
   UNICODE_STRING  Name;