From d040534b028485d945c2ec91f464d8a2914a2757 Mon Sep 17 00:00:00 2001
From: Olaf Siejka <caemyr@openmailbox.org>
Date: Sun, 24 Jul 2011 21:02:50 +0000
Subject: [PATCH] [NDK] - Remove Resource functions, as they are in wdm.h - add
 KeTryToAcquireQueuedSpinLockRaiseToSynch, ExRaiseHardError & enum members 
 Patch by Thomas Faber

svn path=/trunk/; revision=52847
---
 reactos/include/ndk/exfuncs.h         | 31 ++++++++-------------------
 reactos/include/ndk/extypes.h         |  4 +++-
 reactos/include/ndk/kefuncs.h         |  7 ++++++
 reactos/subsystems/win32/win32k/pch.h |  2 ++
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/reactos/include/ndk/exfuncs.h b/reactos/include/ndk/exfuncs.h
index 0d40a3fd0d4..bca62309f97 100644
--- a/reactos/include/ndk/exfuncs.h
+++ b/reactos/include/ndk/exfuncs.h
@@ -114,30 +114,17 @@ ExEnumHandleTable(
 );
 
 //
-// Resource Functions
+// HardError Functions
 //
-PVOID
+NTSTATUS
 NTAPI
-ExEnterCriticalRegionAndAcquireResourceExclusive(
-    IN PERESOURCE Resource
-);
-
-PVOID
-NTAPI
-ExEnterCriticalRegionAndAcquireResourceShared(
-    IN PERESOURCE Resource
-);
-
-PVOID
-NTAPI
-ExEnterCriticalRegionAndAcquireSharedWaitForExclusive(
-    IN PERESOURCE Resource
-);
-
-VOID
-FASTCALL
-ExReleaseResourceAndLeaveCriticalRegion(
-    IN PERESOURCE Resource
+ExRaiseHardError(
+    IN NTSTATUS ErrorStatus,
+    IN ULONG NumberOfParameters,
+    IN ULONG UnicodeStringParameterMask,
+    IN PULONG_PTR Parameters,
+    IN ULONG ValidResponseOptions,
+    OUT PULONG Response
 );
 
 #endif
diff --git a/reactos/include/ndk/extypes.h b/reactos/include/ndk/extypes.h
index 79669029b68..19dd221a074 100644
--- a/reactos/include/ndk/extypes.h
+++ b/reactos/include/ndk/extypes.h
@@ -175,7 +175,9 @@ typedef enum _HARDERROR_RESPONSE_OPTION
     OptionRetryCancel,
     OptionYesNo,
     OptionYesNoCancel,
-    OptionShutdownSystem
+    OptionShutdownSystem,
+    OptionOkNoWait,
+    OptionCancelTryContinue
 } HARDERROR_RESPONSE_OPTION, *PHARDERROR_RESPONSE_OPTION;
 
 typedef enum _HARDERROR_RESPONSE
diff --git a/reactos/include/ndk/kefuncs.h b/reactos/include/ndk/kefuncs.h
index 78f6b16dec9..4888006a86e 100644
--- a/reactos/include/ndk/kefuncs.h
+++ b/reactos/include/ndk/kefuncs.h
@@ -126,6 +126,13 @@ KeAcquireQueuedSpinLockRaiseToSynch(
     IN KSPIN_LOCK_QUEUE_NUMBER LockNumber
 );
 
+BOOLEAN
+FASTCALL
+KeTryToAcquireQueuedSpinLockRaiseToSynch(
+    IN KSPIN_LOCK_QUEUE_NUMBER LockNumber,
+    IN PKIRQL OldIrql
+);
+
 VOID
 FASTCALL
 KeAcquireInStackQueuedSpinLockRaiseToSynch(
diff --git a/reactos/subsystems/win32/win32k/pch.h b/reactos/subsystems/win32/win32k/pch.h
index b703d6b868b..67281678916 100644
--- a/reactos/subsystems/win32/win32k/pch.h
+++ b/reactos/subsystems/win32/win32k/pch.h
@@ -13,6 +13,8 @@
 #define _NO_COM
 
 /* DDK/NDK/SDK Headers */
+#undef NTDDI_VERSION
+#define NTDDI_VERSION NTDDI_WS03SP1
 #include <ntddk.h>
 #include <ntddmou.h>
 #include <ntifs.h>