[DDK/XDK]

- Change inclusion order. This is necessary when using VS static analyze, which requires IRQL level constants to be defined before IRQL annotations are used.
- Comment out 2 ASSERTS in amd64 specific code for now.
- Add cmtypes to ntddk.template.h to account, replacing the manually added structures

svn path=/trunk/; revision=59154

reactos/include/ddk/ntddk.h

@@ -108,6 +108,47 @@ typedef struct _ZONE_HEADER {
 
 #define PROTECTED_POOL                    0x80000000
 
+/******************************************************************************
+ *                            Configuration Manager Types                     *
+ ******************************************************************************/
+
+typedef struct _KEY_NAME_INFORMATION {
+  ULONG NameLength;
+  WCHAR Name[1];
+} KEY_NAME_INFORMATION, *PKEY_NAME_INFORMATION;
+
+typedef struct _KEY_CACHED_INFORMATION {
+  LARGE_INTEGER LastWriteTime;
+  ULONG TitleIndex;
+  ULONG SubKeys;
+  ULONG MaxNameLen;
+  ULONG Values;
+  ULONG MaxValueNameLen;
+  ULONG MaxValueDataLen;
+  ULONG NameLength;
+} KEY_CACHED_INFORMATION, *PKEY_CACHED_INFORMATION;
+
+typedef struct _KEY_VIRTUALIZATION_INFORMATION {
+  ULONG VirtualizationCandidate:1;
+  ULONG VirtualizationEnabled:1;
+  ULONG VirtualTarget:1;
+  ULONG VirtualStore:1;
+  ULONG VirtualSource:1;
+  ULONG Reserved:27;
+} KEY_VIRTUALIZATION_INFORMATION, *PKEY_VIRTUALIZATION_INFORMATION;
+
+#define CmResourceTypeMaximum             8
+
+typedef struct _CM_PCCARD_DEVICE_DATA {
+  UCHAR Flags;
+  UCHAR ErrorCode;
+  USHORT Reserved;
+  ULONG BusData;
+  ULONG DeviceId;
+  ULONG LegacyBaseAddress;
+  UCHAR IRQMap[16];
+} CM_PCCARD_DEVICE_DATA, *PCM_PCCARD_DEVICE_DATA;
+
 /******************************************************************************
  *                         I/O Manager Types                                  *
  ******************************************************************************/
@@ -2122,7 +2163,6 @@ extern PCCHAR KeNumberProcessors;
 #endif
 
 
-
 /******************************************************************************
  *                          Kernel Debugger Types                             *
  ******************************************************************************/
@@ -5836,33 +5876,6 @@ FsRtlIsTotalDeviceFailure(
   _In_ NTSTATUS Status);
 #endif
 
-/* Output parameters of ZwQueryKey */
-
-typedef struct _KEY_NAME_INFORMATION {
-  ULONG NameLength;
-  WCHAR Name[1];
-} KEY_NAME_INFORMATION, *PKEY_NAME_INFORMATION;
-
-typedef struct _KEY_CACHED_INFORMATION {
-  LARGE_INTEGER LastWriteTime;
-  ULONG         TitleIndex;
-  ULONG         SubKeys;
-  ULONG         MaxNameLen;
-  ULONG         Values;
-  ULONG         MaxValueNameLen;
-  ULONG         MaxValueDataLen;
-  ULONG         NameLength;
-} KEY_CACHED_INFORMATION, *PKEY_CACHED_INFORMATION;
-
-typedef struct _KEY_VIRTUALIZATION_INFORMATION {
-  ULONG VirtualizationCandidate  :1;
-  ULONG VirtualizationEnabled  :1;
-  ULONG VirtualTarget  :1;
-  ULONG VirtualStore  :1;
-  ULONG VirtualSource  :1;
-  ULONG Reserved  :27;
-} KEY_VIRTUALIZATION_INFORMATION, *PKEY_VIRTUALIZATION_INFORMATION;
-
 #ifdef __cplusplus
 }
 #endif

reactos/include/ddk/ntifs.h

@@ -4982,7 +4982,6 @@ typedef struct _KQUEUE {
 } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE;
 
 
-
 /******************************************************************************
  *                              Kernel Functions                              *
  ******************************************************************************/
@@ -10010,7 +10009,7 @@ typedef struct _SecBuffer
 #ifdef MIDL_PASS
     MIDL_PROP([size_is(cbBuffer)]) PCHAR pvBuffer;
 #else
-    __field_bcount(cbBuffer) void SEC_FAR *pvBuffer;
+    _Field_size_bytes_(cbBuffer) void SEC_FAR *pvBuffer;
 #endif
 } SecBuffer, *PSecBuffer;
 
@@ -10018,7 +10017,7 @@ typedef struct _SecBufferDesc
 {
     ULONG ulVersion;
     ULONG cBuffers;
-    MIDL_PROP([size_is(cBuffers)]) __field_ecount(cBuffers) PSecBuffer pBuffers;
+    MIDL_PROP([size_is(cBuffers)]) _Field_size_(cBuffers) PSecBuffer pBuffers;
 } SecBufferDesc, SEC_FAR *PSecBufferDesc;
 
 typedef struct _SecPkgInfoW
@@ -10129,17 +10128,17 @@ typedef struct _SecPkgContext_KeyInfoW
 typedef struct _SecPkgContext_SessionKey
 {
     ULONG SessionKeyLength;
-    __field_bcount(SessionKeyLength) PUCHAR SessionKey;
+    _Field_size_bytes_(SessionKeyLength) PUCHAR SessionKey;
 } SecPkgContext_SessionKey, *PSecPkgContext_SessionKey;
 
 typedef struct _SecPkgContext_NegoKeys
 {
     ULONG KeyType;
     USHORT KeyLength;
-    __field_bcount(KeyLength) PUCHAR KeyValue;
+    _Field_size_bytes_(KeyLength) PUCHAR KeyValue;
     ULONG  VerifyKeyType;
     USHORT VerifyKeyLength;
-    __field_bcount(VerifyKeyLength) PUCHAR VerifyKeyValue;
+    _Field_size_bytes_(VerifyKeyLength) PUCHAR VerifyKeyValue;
 } SecPkgContext_NegoKeys, *PSecPkgContext_NegoKeys;
 
 typedef struct _SecPkgContext_DceInfo

reactos/include/xdk/amd64/ke.h

@@ -74,7 +74,7 @@ FORCEINLINE
 VOID
 KeLowerIrql(IN KIRQL NewIrql)
 {
-  ASSERT((KIRQL)__readcr8() >= NewIrql);
+  //ASSERT((KIRQL)__readcr8() >= NewIrql);
   __writecr8(NewIrql);
 }
 
@@ -85,7 +85,7 @@ KfRaiseIrql(IN KIRQL NewIrql)
   KIRQL OldIrql;
 
   OldIrql = (KIRQL)__readcr8();
-  ASSERT(OldIrql <= NewIrql);
+  //ASSERT(OldIrql <= NewIrql);
   __writecr8(NewIrql);
   return OldIrql;
 }

reactos/include/xdk/ntddk.template.h

@@ -93,6 +93,7 @@ typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS;
 
 $define (_NTDDK_)
 $include (extypes.h)
+$include (cmtypes.h)
 $include (iotypes.h)
 $include (haltypes.h)
 $include (ketypes.h)

reactos/include/xdk/wdm.template.h

@@ -220,8 +220,8 @@ $include (obtypes.h)
 $include (pstypes.h)
 $include (wmitypes.h)
 
-$include (rtlfuncs.h)
 $include (kefuncs.h)
+$include (rtlfuncs.h)
 $include (mmfuncs.h)
 $include (sefuncs.h)
 $include (cmfuncs.h)