Author: osiejka Date: Sun Jul 24 21:02:50 2011 New Revision: 52847
URL: http://svn.reactos.org/svn/reactos?rev=52847&view=rev Log: [NDK] - Remove Resource functions, as they are in wdm.h - add KeTryToAcquireQueuedSpinLockRaiseToSynch, ExRaiseHardError & enum members Patch by Thomas Faber
Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/subsystems/win32/win32k/pch.h
Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=5... ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Sun Jul 24 21:02:50 2011 @@ -114,30 +114,17 @@ );
// -// Resource Functions -// -PVOID -NTAPI -ExEnterCriticalRegionAndAcquireResourceExclusive( - IN PERESOURCE Resource -); - -PVOID -NTAPI -ExEnterCriticalRegionAndAcquireResourceShared( - IN PERESOURCE Resource -); - -PVOID -NTAPI -ExEnterCriticalRegionAndAcquireSharedWaitForExclusive( - IN PERESOURCE Resource -); - -VOID -FASTCALL -ExReleaseResourceAndLeaveCriticalRegion( - IN PERESOURCE Resource +// HardError Functions +// +NTSTATUS +NTAPI +ExRaiseHardError( + IN NTSTATUS ErrorStatus, + IN ULONG NumberOfParameters, + IN ULONG UnicodeStringParameterMask, + IN PULONG_PTR Parameters, + IN ULONG ValidResponseOptions, + OUT PULONG Response );
#endif
Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=5... ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Sun Jul 24 21:02:50 2011 @@ -175,7 +175,9 @@ OptionRetryCancel, OptionYesNo, OptionYesNoCancel, - OptionShutdownSystem + OptionShutdownSystem, + OptionOkNoWait, + OptionCancelTryContinue } HARDERROR_RESPONSE_OPTION, *PHARDERROR_RESPONSE_OPTION;
typedef enum _HARDERROR_RESPONSE
Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=5... ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Sun Jul 24 21:02:50 2011 @@ -124,6 +124,13 @@ FASTCALL KeAcquireQueuedSpinLockRaiseToSynch( IN KSPIN_LOCK_QUEUE_NUMBER LockNumber +); + +BOOLEAN +FASTCALL +KeTryToAcquireQueuedSpinLockRaiseToSynch( + IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + IN PKIRQL OldIrql );
VOID
Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pch... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Sun Jul 24 21:02:50 2011 @@ -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>