Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-20 07:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[XDK]

Browse source 
- 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

svn path=/trunk/; revision=55413
This commit is contained in:
Timo Kreuzer 2012-02-04 17:29:34 +00:00
parent d5606434e4
commit 85bb9f1bce
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/include/xdk/amd64/ke.h
View file

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

4
reactos/include/xdk/ketypes.h
View file

@ -463,7 +463,11 @@ typedef struct _KWAIT_BLOCK {
struct _KWAIT_BLOCK *NextWaitBlock; struct _KWAIT_BLOCK *NextWaitBlock;
USHORT WaitKey; USHORT WaitKey;
UCHAR WaitType; UCHAR WaitType;
#if (NTDDI_VERSION >= NTDDI_LONGHORN)
volatile UCHAR BlockState; volatile UCHAR BlockState;
#else
UCHAR SpareByte;
#endif
#if defined(_WIN64) #if defined(_WIN64)
LONG SpareLong; LONG SpareLong;
#endif #endif