* include/winnt.h (FILE_*): Sync with ddk/winddk.h.

	* include/winioctl.h (FILE_*): Sync with ddk/winddk.h.

3 files changed, 128 insertions, 43 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index acbdbca78..882edd189 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-18  Danny Smith <dannysmith@users.sourceforge.net>
+
+	* include/winnt.h (FILE_*): Sync with ddk/winddk.h.
+	* include/winioctl.h (FILE_*): Sync with ddk/winddk.h.
+
 2003-07-17  Pierre Humblet  <pierre.humblet@ieee.org>
 
 	* include/mmsystem.h (TIME_KILL_SYNCHRONOUS): Add define.
diff --git a/winsup/w32api/include/winioctl.h b/winsup/w32api/include/winioctl.h
index 3f9e71b17..d32b38172 100644
--- a/winsup/w32api/include/winioctl.h
+++ b/winsup/w32api/include/winioctl.h
@@ -170,10 +170,13 @@ extern "C" {
 #define SERIAL_LSRMST_LSR_DATA  	1
 #define SERIAL_LSRMST_LSR_NODATA	2
 #define SERIAL_LSRMST_MST	3
-#define FILE_ANY_ACCESS     0
-#define FILE_READ_ACCESS	1
-#define FILE_WRITE_ACCESS	2
-#define FILE_SPECIAL_ACCESS (FILE_ANY_ACCESS)
+
+/*  Also in ddk/winddk.h */
+#define FILE_ANY_ACCESS		0x00000000
+#define FILE_SPECIAL_ACCESS	FILE_ANY_ACCESS
+#define FILE_READ_ACCESS	0x00000001
+#define FILE_WRITE_ACCESS	0x00000002
+
 #define DISK_LOGGING_START	0
 #define DISK_LOGGING_STOP	1
 #define DISK_LOGGING_DUMP	2
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 1b3262afe..2e46a542c 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -1,6 +1,6 @@
 #ifndef _WINNT_H
 #define _WINNT_H
-#if __GNUC__ >=3
+#if __GNUC__ >= 3
 #pragma GCC system_header
 #endif
 
@@ -196,49 +196,126 @@ typedef DWORD FLONG;
 #define STANDARD_RIGHTS_ALL	0x1F0000
 #define SPECIFIC_RIGHTS_ALL	0xFFFF
 #define ACCESS_SYSTEM_SECURITY	0x1000000
+
 #define MAXIMUM_ALLOWED	0x2000000
 #define GENERIC_READ	0x80000000
 #define GENERIC_WRITE	0x40000000
 #define GENERIC_EXECUTE	0x20000000
 #define GENERIC_ALL	0x10000000
-#define FILE_READ_DATA	1
-#define FILE_LIST_DIRECTORY	1
-#define FILE_WRITE_DATA	2
-#define FILE_ADD_FILE	2
-#define FILE_APPEND_DATA	4
-#define FILE_ADD_SUBDIRECTORY	4
-#define FILE_CREATE_PIPE_INSTANCE	4
-#define FILE_READ_EA	8
-#define FILE_READ_PROPERTIES	8
-#define FILE_WRITE_EA	16
-#define FILE_WRITE_PROPERTIES	16
-#define FILE_EXECUTE	32
-#define FILE_TRAVERSE	32
-#define FILE_DELETE_CHILD	64
-#define FILE_READ_ATTRIBUTES	128
-#define FILE_WRITE_ATTRIBUTES	256
-#define FILE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x1FF)
-#define FILE_GENERIC_READ (STANDARD_RIGHTS_READ|FILE_READ_DATA|FILE_READ_ATTRIBUTES|FILE_READ_EA|SYNCHRONIZE)
-#define FILE_GENERIC_WRITE (STANDARD_RIGHTS_WRITE|FILE_WRITE_DATA|FILE_WRITE_ATTRIBUTES|FILE_WRITE_EA|FILE_APPEND_DATA|SYNCHRONIZE)
-#define FILE_GENERIC_EXECUTE (STANDARD_RIGHTS_EXECUTE|FILE_READ_ATTRIBUTES|FILE_EXECUTE|SYNCHRONIZE)
-#define FILE_SHARE_READ	1
-#define FILE_SHARE_WRITE 2
-#define FILE_SHARE_DELETE 4
-#define FILE_ATTRIBUTE_READONLY	1
-#define FILE_ATTRIBUTE_HIDDEN	2
-#define FILE_ATTRIBUTE_SYSTEM	4
-#define FILE_ATTRIBUTE_DIRECTORY	16
-#define FILE_ATTRIBUTE_ARCHIVE	32
-#define FILE_ATTRIBUTE_DEVICE	64
-#define FILE_ATTRIBUTE_NORMAL	128
-#define FILE_ATTRIBUTE_TEMPORARY	256
-#define FILE_ATTRIBUTE_SPARSE_FILE	512
-#define FILE_ATTRIBUTE_REPARSE_POINT	1024
-#define FILE_ATTRIBUTE_COMPRESSED	2048
-#define FILE_ATTRIBUTE_OFFLINE	0x1000
-#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED	0x2000
-#define FILE_ATTRIBUTE_ENCRYPTED	0x4000
-#define INVALID_FILE_ATTRIBUTES	((DWORD)-1)
+
+/* Also in ddk/winddk.h */
+#define FILE_LIST_DIRECTORY		0x00000001
+#define FILE_READ_DATA			0x00000001
+#define FILE_ADD_FILE			0x00000002
+#define FILE_WRITE_DATA			0x00000002
+#define FILE_ADD_SUBDIRECTORY		0x00000004
+#define FILE_APPEND_DATA		0x00000004
+#define FILE_CREATE_PIPE_INSTANCE	0x00000004
+#define FILE_READ_EA			0x00000008
+#define FILE_READ_PROPERTIES		0x00000008
+#define FILE_WRITE_EA			0x00000010
+#define FILE_WRITE_PROPERTIES		0x00000010
+#define FILE_EXECUTE			0x00000020
+#define FILE_TRAVERSE			0x00000020
+#define FILE_DELETE_CHILD		0x00000040
+#define FILE_READ_ATTRIBUTES		0x00000080
+#define FILE_WRITE_ATTRIBUTES		0x00000100
+			
+#define FILE_SUPERSEDED			0x00000000
+#define FILE_OPENED			0x00000001
+#define FILE_CREATED			0x00000002
+#define FILE_OVERWRITTEN		0x00000003
+#define FILE_EXISTS			0x00000004
+#define FILE_DOES_NOT_EXIST		0x00000005
+			
+#define FILE_SHARE_READ			0x00000001
+#define FILE_SHARE_WRITE		0x00000002
+#define FILE_SHARE_DELETE		0x00000004
+#define FILE_SHARE_VALID_FLAGS		0x00000007
+			
+#define FILE_ATTRIBUTE_READONLY			0x00000001
+#define FILE_ATTRIBUTE_HIDDEN			0x00000002
+#define FILE_ATTRIBUTE_SYSTEM			0x00000004
+#define FILE_ATTRIBUTE_DIRECTORY		0x00000010
+#define FILE_ATTRIBUTE_ARCHIVE			0x00000020
+#define FILE_ATTRIBUTE_DEVICE			0x00000040
+#define FILE_ATTRIBUTE_NORMAL			0x00000080
+#define FILE_ATTRIBUTE_TEMPORARY		0x00000100
+#define FILE_ATTRIBUTE_SPARSE_FILE		0x00000200
+#define FILE_ATTRIBUTE_REPARSE_POINT		0x00000400
+#define FILE_ATTRIBUTE_COMPRESSED		0x00000800
+#define FILE_ATTRIBUTE_OFFLINE			0x00001000
+#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED	0x00002000
+#define FILE_ATTRIBUTE_ENCRYPTED		0x00004000
+#define FILE_ATTRIBUTE_VALID_FLAGS		0x00007fb7
+#define FILE_ATTRIBUTE_VALID_SET_FLAGS		0x000031a7
+				
+#define FILE_COPY_STRUCTURED_STORAGE		0x00000041
+#define FILE_STRUCTURED_STORAGE			0x00000441
+			
+#define FILE_VALID_OPTION_FLAGS			0x00ffffff
+#define FILE_VALID_PIPE_OPTION_FLAGS		0x00000032
+#define FILE_VALID_MAILSLOT_OPTION_FLAGS	0x00000032
+#define FILE_VALID_SET_FLAGS			0x00000036
+			
+#define FILE_SUPERSEDE			0x00000000
+#define FILE_OPEN			0x00000001
+#define FILE_CREATE			0x00000002
+#define FILE_OPEN_IF			0x00000003
+#define FILE_OVERWRITE			0x00000004
+#define FILE_OVERWRITE_IF		0x00000005
+#define FILE_MAXIMUM_DISPOSITION	0x00000005
+			
+#define FILE_DIRECTORY_FILE		0x00000001
+#define FILE_WRITE_THROUGH		0x00000002
+#define FILE_SEQUENTIAL_ONLY		0x00000004
+#define FILE_NO_INTERMEDIATE_BUFFERING	0x00000008
+#define FILE_SYNCHRONOUS_IO_ALERT	0x00000010
+#define FILE_SYNCHRONOUS_IO_NONALERT	0x00000020
+#define FILE_NON_DIRECTORY_FILE		0x00000040
+#define FILE_CREATE_TREE_CONNECTION	0x00000080
+#define FILE_COMPLETE_IF_OPLOCKED	0x00000100
+#define FILE_NO_EA_KNOWLEDGE		0x00000200
+#define FILE_OPEN_FOR_RECOVERY		0x00000400
+#define FILE_RANDOM_ACCESS		0x00000800
+#define FILE_DELETE_ON_CLOSE		0x00001000
+#define FILE_OPEN_BY_FILE_ID		0x00002000
+#define FILE_OPEN_FOR_BACKUP_INTENT	0x00004000
+#define FILE_NO_COMPRESSION		0x00008000
+#define FILE_RESERVE_OPFILTER		0x00100000
+#define FILE_OPEN_REPARSE_POINT		0x00200000
+#define FILE_OPEN_NO_RECALL		0x00400000
+#define FILE_OPEN_FOR_FREE_SPACE_QUERY	0x00800000
+
+#define FILE_ALL_ACCESS \
+  (STANDARD_RIGHTS_REQUIRED | \
+   SYNCHRONIZE | \
+   0x1FF)
+
+#define FILE_GENERIC_EXECUTE \
+  (STANDARD_RIGHTS_EXECUTE | \
+   FILE_READ_ATTRIBUTES | \
+   FILE_EXECUTE | \
+   SYNCHRONIZE)
+
+#define FILE_GENERIC_READ \
+  (STANDARD_RIGHTS_READ | \
+   FILE_READ_DATA | \
+   FILE_READ_ATTRIBUTES | \
+   FILE_READ_EA | \
+   SYNCHRONIZE)
+
+#define FILE_GENERIC_WRITE \
+  (STANDARD_RIGHTS_WRITE | \
+   FILE_WRITE_DATA | \
+   FILE_WRITE_ATTRIBUTES | \
+   FILE_WRITE_EA | \
+   FILE_APPEND_DATA | \
+   SYNCHRONIZE)
+/* end ddk/winddk.h sync */
+
+#define INVALID_FILE_ATTRIBUTES	(DWORD (-1))
+
 #define FILE_NOTIFY_CHANGE_FILE_NAME	1
 #define FILE_NOTIFY_CHANGE_DIR_NAME	2
 #define FILE_NOTIFY_CHANGE_ATTRIBUTES	4