[ros-diffs] [tkreuzer] 55413: [XDK] - fix ASSERTs in amd64 inline functions - fix definition of KWAIT_BLOCK These fixes are not critical, so I don't update wdm.h to avoid additional recompilation

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Sat Feb  4 17:29:34 2012
New Revision: 55413

URL: http://svn.reactos.org/svn/reactos?rev=55413&view=rev
Log:
[XDK]
- fix ASSERTs in amd64 inline functions
- fix definition of KWAIT_BLOCK
These fixes are not critical, so I don't update wdm.h to avoid additional recompilation

Modified:
    trunk/reactos/include/xdk/amd64/ke.h
    trunk/reactos/include/xdk/ketypes.h

Modified: trunk/reactos/include/xdk/amd64/ke.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/amd64/ke.h?rev=55413&r1=55412&r2=55413&view=diff
==============================================================================
--- trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] Sat Feb  4 17:29:34 2012
@@ -73,7 +73,7 @@
 VOID
 KeLowerIrql(IN KIRQL NewIrql)
 {
-  //ASSERT(KeGetCurrentIrql() >= NewIrql);
+  ASSERT((KIRQL)__readcr8() >= NewIrql);
   __writecr8(NewIrql);
 }
 
@@ -84,7 +84,7 @@
   KIRQL OldIrql;
 
   OldIrql = (KIRQL)__readcr8();
-  //ASSERT(OldIrql <= NewIrql);
+  ASSERT(OldIrql <= NewIrql);
   __writecr8(NewIrql);
   return OldIrql;
 }

Modified: trunk/reactos/include/xdk/ketypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=55413&r1=55412&r2=55413&view=diff
==============================================================================
--- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Sat Feb  4 17:29:34 2012
@@ -463,7 +463,11 @@
   struct _KWAIT_BLOCK *NextWaitBlock;
   USHORT WaitKey;
   UCHAR WaitType;
+#if (NTDDI_VERSION >= NTDDI_LONGHORN)
   volatile UCHAR BlockState;
+#else
+  UCHAR SpareByte;
+#endif
 #if defined(_WIN64)
   LONG SpareLong;
 #endif