- Move more stuff to wdm.h

- FILE_OPEN_FOR_RECOVERY should be FILE_OPEN_REMOTE_INSTANCE

svn path=/branches/header-work/; revision=45705

diff --git a/dll/win32/kernel32/file/create.c b/dll/win32/kernel32/file/create.c
index b6d39f6..f5c9fab 100644 (file)
--- a/dll/win32/kernel32/file/create.c
+++ b/dll/win32/kernel32/file/create.c
@@ -170,14 +170,14 @@ HANDLE WINAPI CreateFileW (LPCWSTR                        lpFileName,
    if(dwFlagsAndAttributes & FILE_FLAG_BACKUP_SEMANTICS)
    {
       if(dwDesiredAccess & GENERIC_ALL)
-         Flags |= FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_FOR_RECOVERY;
+         Flags |= FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_REMOTE_INSTANCE;
       else
       {
          if(dwDesiredAccess & GENERIC_READ)
             Flags |= FILE_OPEN_FOR_BACKUP_INTENT;
 
          if(dwDesiredAccess & GENERIC_WRITE)
-            Flags |= FILE_OPEN_FOR_RECOVERY;
+            Flags |= FILE_OPEN_REMOTE_INSTANCE;
       }
    }
    else

diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 365b3e0..d6ac18c 100644 (file)
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -227,7 +227,16 @@ typedef enum _MODE {
 #define FILE_CREATE_TREE_CONNECTION       0x00000080
 #define FILE_COMPLETE_IF_OPLOCKED         0x00000100
 #define FILE_NO_EA_KNOWLEDGE              0x00000200
-
+#define FILE_OPEN_REMOTE_INSTANCE         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
 
 /* Simple types */
 typedef UCHAR KPROCESSOR_MODE;

diff --git a/include/ddk/winddk.h b/include/ddk/winddk.h
index 9188071..e0109b9 100644 (file)
--- a/include/ddk/winddk.h
+++ b/include/ddk/winddk.h
@@ -239,17 +239,6 @@ typedef enum _DPFLTR_TYPE
 #define FILE_COPY_STRUCTURED_STORAGE      0x00000041
 #define FILE_STRUCTURED_STORAGE           0x00000441
 
-#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_ANY_ACCESS                   0x00000000
 #define FILE_SPECIAL_ACCESS               FILE_ANY_ACCESS
 #define FILE_READ_ACCESS                  0x00000001

diff --git a/include/ndk/iotypes.h b/include/ndk/iotypes.h
index 04fd038..121ce2d 100644 (file)
--- a/include/ndk/iotypes.h
+++ b/include/ndk/iotypes.h
@@ -107,7 +107,7 @@ extern POBJECT_TYPE NTSYSAPI IoDriverObjectType;
 #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_OPEN_REMOTE_INSTANCE               0x00000400
 #define FILE_RANDOM_ACCESS                      0x00000800
 #define FILE_DELETE_ON_CLOSE                    0x00001000
 #define FILE_OPEN_BY_FILE_ID                    0x00002000

diff --git a/include/psdk/winnt.h b/include/psdk/winnt.h
index e739a3a..bd0fac1 100644 (file)
--- a/include/psdk/winnt.h
+++ b/include/psdk/winnt.h
@@ -400,7 +400,7 @@ typedef DWORD FLONG;
 #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_OPEN_REMOTE_INSTANCE      0x00000400
 #define FILE_RANDOM_ACCESS             0x00000800
 #define FILE_DELETE_ON_CLOSE           0x00001000
 #define FILE_OPEN_BY_FILE_ID           0x00002000

diff --git a/include/psdk/winternl.h b/include/psdk/winternl.h
index 1464c6e..f101f04 100644 (file)
--- a/include/psdk/winternl.h
+++ b/include/psdk/winternl.h
@@ -1398,7 +1398,7 @@ typedef struct _RTL_HANDLE_TABLE
 #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_OPEN_REMOTE_INSTANCE       0x00000400
 #define FILE_RANDOM_ACCESS              0x00000800
 #define FILE_DELETE_ON_CLOSE            0x00001000
 #define FILE_OPEN_BY_FILE_ID            0x00002000