[ros-diffs] [akhaldi] 46244: [XDK] - Remove duplicate QUOTA_LIMITS [WDM] - Update wdm.h with the recent changes to XDK

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Wed Mar 17 11:16:54 2010
New Revision: 46244

URL: http://svn.reactos.org/svn/reactos?rev=46244&view=rev
Log:
[XDK]
- Remove duplicate QUOTA_LIMITS
[WDM]
- Update wdm.h with the recent changes to XDK

Modified:
    branches/header-work/include/ddk/wdm.h
    branches/header-work/include/xdk/pstypes.h

Modified: branches/header-work/include/ddk/wdm.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?rev=46244&r1=46243&r2=46244&view=diff
==============================================================================
--- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Wed Mar 17 11:16:54 2010
@@ -4034,6 +4034,8 @@
   (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
 
 #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
@@ -4964,6 +4966,8 @@
 #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
@@ -5107,16 +5111,6 @@
 #define QUOTA_LIMITS_HARDWS_MAX_ENABLE  0x00000004
 #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

Modified: branches/header-work/include/xdk/pstypes.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/pstypes.h?rev=46244&r1=46243&r2=46244&view=diff
==============================================================================
--- branches/header-work/include/xdk/pstypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/pstypes.h [iso-8859-1] Wed Mar 17 11:16:54 2010
@@ -7,16 +7,6 @@
 #define QUOTA_LIMITS_HARDWS_MAX_ENABLE  0x00000004
 #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