[XDK]

- Remove duplicate QUOTA_LIMITS
[WDM]
- Update wdm.h with the recent changes to XDK

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

diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 7cc8565..5816d3a 100644 (file)
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -4035,6 +4035,8 @@ typedef struct _IO_COMPLETION_CONTEXT {
 
 #define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16)
 
 
 #define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16)
 

+#define METHOD_FROM_CTL_CODE(ctrlCode)          ((ULONG)(ctrlCode & 3))
+

 #define IRP_NOCACHE                     0x00000001
 #define IRP_PAGING_IO                   0x00000002
 #define IRP_MOUNT_COMPLETION            0x00000002
 #define IRP_NOCACHE                     0x00000001
 #define IRP_PAGING_IO                   0x00000002
 #define IRP_MOUNT_COMPLETION            0x00000002


@@ -4964,6 +4966,8 @@ typedef struct _IO_STACK_LOCATION {
 #define METHOD_OUT_DIRECT                 2
 #define METHOD_NEITHER                    3
 
 #define METHOD_OUT_DIRECT                 2
 #define METHOD_NEITHER                    3
 

+#define METHOD_DIRECT_TO_HARDWARE       METHOD_IN_DIRECT
+#define METHOD_DIRECT_FROM_HARDWARE     METHOD_OUT_DIRECT

 
 #define FILE_SUPERSEDED                   0x00000000
 #define FILE_OPENED                       0x00000001
 
 #define FILE_SUPERSEDED                   0x00000000
 #define FILE_OPENED                       0x00000001


@@ -5108,16 +5112,6 @@ extern POBJECT_TYPE NTSYSAPI PsProcessType;
 #define QUOTA_LIMITS_HARDWS_MAX_DISABLE 0x00000008
 #define QUOTA_LIMITS_USE_DEFAULT_LIMITS 0x00000010
 
 #define QUOTA_LIMITS_HARDWS_MAX_DISABLE 0x00000008
 #define QUOTA_LIMITS_USE_DEFAULT_LIMITS 0x00000010
 

-/* Process Qoutas */
-typedef struct _QUOTA_LIMITS {
-    SIZE_T PagedPoolLimit;
-    SIZE_T NonPagedPoolLimit;
-    SIZE_T MinimumWorkingSetSize;
-    SIZE_T MaximumWorkingSetSize;
-    SIZE_T PagefileLimit;
-    LARGE_INTEGER TimeLimit;
-} QUOTA_LIMITS, *PQUOTA_LIMITS;
-

 /* Thread Access Rights */
 #define THREAD_TERMINATE                 0x0001
 #define THREAD_SUSPEND_RESUME            0x0002
 /* Thread Access Rights */
 #define THREAD_TERMINATE                 0x0001
 #define THREAD_SUSPEND_RESUME            0x0002

diff --git a/include/xdk/pstypes.h b/include/xdk/pstypes.h
index 218397d..6e2504e 100644 (file)
--- a/include/xdk/pstypes.h
+++ b/include/xdk/pstypes.h
@@ -8,16 +8,6 @@
 #define QUOTA_LIMITS_HARDWS_MAX_DISABLE 0x00000008
 #define QUOTA_LIMITS_USE_DEFAULT_LIMITS 0x00000010
 
 #define QUOTA_LIMITS_HARDWS_MAX_DISABLE 0x00000008
 #define QUOTA_LIMITS_USE_DEFAULT_LIMITS 0x00000010
 

-/* Process Qoutas */
-typedef struct _QUOTA_LIMITS {
-    SIZE_T PagedPoolLimit;
-    SIZE_T NonPagedPoolLimit;
-    SIZE_T MinimumWorkingSetSize;
-    SIZE_T MaximumWorkingSetSize;
-    SIZE_T PagefileLimit;
-    LARGE_INTEGER TimeLimit;
-} QUOTA_LIMITS, *PQUOTA_LIMITS;
-

 /* Thread Access Rights */
 #define THREAD_TERMINATE                 0x0001
 #define THREAD_SUSPEND_RESUME            0x0002
 /* Thread Access Rights */
 #define THREAD_TERMINATE                 0x0001
 #define THREAD_SUSPEND_RESUME            0x0002