Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 21:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DDK/XDK]

Browse source 
- Improve definition of ExInterlockedCompareExchange64 and interlocked SList functions and improve some annotations based on native header
- Update processor feature constants

svn path=/trunk/; revision=67521
This commit is contained in:
Timo Kreuzer 2015-05-02 22:20:18 +00:00
parent 49dfd75396
commit 0c0c8d637f
6 changed files with 412 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

315
reactos/include/ddk/wdm.h
View file

@ -1181,24 +1181,38 @@ typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX {
} SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX;; } SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX;;
/* Processor features */ /* Processor features */
#define PF_FLOATING_POINT_PRECISION_ERRATA 0 #define PF_FLOATING_POINT_PRECISION_ERRATA 0
#define PF_FLOATING_POINT_EMULATED 1 #define PF_FLOATING_POINT_EMULATED 1
#define PF_COMPARE_EXCHANGE_DOUBLE 2 #define PF_COMPARE_EXCHANGE_DOUBLE 2
#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 #define PF_MMX_INSTRUCTIONS_AVAILABLE 3
#define PF_PPC_MOVEMEM_64BIT_OK 4 #define PF_PPC_MOVEMEM_64BIT_OK 4
#define PF_ALPHA_BYTE_INSTRUCTIONS 5 #define PF_ALPHA_BYTE_INSTRUCTIONS 5
#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 #define PF_XMMI_INSTRUCTIONS_AVAILABLE 6
#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 #define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7
#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 #define PF_RDTSC_INSTRUCTION_AVAILABLE 8
#define PF_PAE_ENABLED 9 #define PF_PAE_ENABLED 9
#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 #define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10
#define PF_SSE_DAZ_MODE_AVAILABLE 11 #define PF_SSE_DAZ_MODE_AVAILABLE 11
#define PF_NX_ENABLED 12 #define PF_NX_ENABLED 12
#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 #define PF_SSE3_INSTRUCTIONS_AVAILABLE 13
#define PF_COMPARE_EXCHANGE128 14 #define PF_COMPARE_EXCHANGE128 14
#define PF_COMPARE64_EXCHANGE128 15 #define PF_COMPARE64_EXCHANGE128 15
#define PF_CHANNELS_ENABLED 16 #define PF_CHANNELS_ENABLED 16
#define PF_XSAVE_ENABLED 17 #define PF_XSAVE_ENABLED 17
#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18
#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19
#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20
#define PF_VIRT_FIRMWARE_ENABLED 21
#define PF_RDWRFSGSBASE_AVAILABLE 22
#define PF_FASTFAIL_AVAILABLE 23
#define PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE 24
#define PF_ARM_64BIT_LOADSTORE_ATOMIC 25
#define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26
#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27
#define PF_RDRAND_INSTRUCTION_AVAILABLE 28
#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29
#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30
#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31
#define MAXIMUM_WAIT_OBJECTS 64 #define MAXIMUM_WAIT_OBJECTS 64
@ -11645,77 +11659,77 @@ RtlCheckBit(
#if !defined(_WINBASE_) #if !defined(_WINBASE_)
#if defined(_WIN64) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || defined(_NTOSP_)) #if defined(_WIN64) && !defined(_NTSYSTEM_) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || !defined(_NTOSP_))
NTKERNELAPI NTKERNELAPI
VOID VOID
InitializeSListHead( InitializeSListHead(
_Out_ PSLIST_HEADER SListHead); _Out_ PSLIST_HEADER SListHead);
#else #else /* defined(_WIN64) && ... */
/* HACK */
_IRQL_requires_max_(APC_LEVEL)
NTKERNELAPI
DECLSPEC_NORETURN
VOID
NTAPI
ExRaiseStatus(
_In_ NTSTATUS Status);
FORCEINLINE FORCEINLINE
VOID VOID
InitializeSListHead( InitializeSListHead(
_Out_ PSLIST_HEADER SListHead) _Out_ PSLIST_HEADER SListHead)
{ {
#if defined(_IA64_)
ULONG64 FeatureBits;
#endif
#if defined(_WIN64) #if defined(_WIN64)
if (((ULONG_PTR)SListHead & 0xf) != 0) { if (((ULONG_PTR)SListHead & 0xf) != 0) {
RtlRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); ExRaiseStatus(STATUS_DATATYPE_MISALIGNMENT);
} }
#endif
RtlZeroMemory(SListHead, sizeof(SLIST_HEADER));
#if defined(_IA64_) #if defined(_IA64_)
FeatureBits = __getReg(CV_IA64_CPUID4); SListHead->Region = (ULONG_PTR)SListHead & VRN_MASK;
if ((FeatureBits & KF_16BYTE_INSTR) != 0) { #else
SListHead->Header16.HeaderType = 1; SListHead->Region = 0;
SListHead->Header16.Init = 1; #endif /* _IA64_ */
} #endif /* _WIN64 */
#endif SListHead->Alignment = 0;
} }
#endif #endif /* defined(_WIN64) && ... */
#if defined(_WIN64) #ifdef _X86_
#define InterlockedPopEntrySList(Head) \
ExpInterlockedPopEntrySList(Head)
#define InterlockedPushEntrySList(Head, Entry) \
ExpInterlockedPushEntrySList(Head, Entry)
#define InterlockedFlushSList(Head) \
ExpInterlockedFlushSList(Head)
#define QueryDepthSList(Head) \
ExQueryDepthSList(Head)
#else /* !defined(_WIN64) */
NTKERNELAPI
PSLIST_ENTRY
FASTCALL
InterlockedPopEntrySList(
_Inout_ PSLIST_HEADER ListHead);
NTKERNELAPI NTKERNELAPI
PSLIST_ENTRY PSLIST_ENTRY
FASTCALL FASTCALL
InterlockedPushEntrySList( InterlockedPushEntrySList(
_Inout_ PSLIST_HEADER ListHead, _Inout_ PSLIST_HEADER SListHead,
_Inout_ __drv_aliasesMem PSLIST_ENTRY ListEntry); _Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry);
#define InterlockedFlushSList(ListHead) \ NTKERNELAPI
ExInterlockedFlushSList(ListHead) PSLIST_ENTRY
FASTCALL
InterlockedPopEntrySList(
_Inout_ PSLIST_HEADER SListHead);
#define QueryDepthSList(Head) \ #define InterlockedFlushSList(SListHead) \
ExQueryDepthSList(Head) ExInterlockedFlushSList(SListHead)
#endif /* !defined(_WIN64) */ #else /* !_X86_ */
#define InterlockedPushEntrySList(SListHead, SListEntry) \
ExpInterlockedPushEntrySList(SListHead, SListEntry)
#define InterlockedPopEntrySList(SListHead) \
ExpInterlockedPopEntrySList(SListHead)
#define InterlockedFlushSList(SListHead) \
ExpInterlockedFlushSList(SListHead)
#endif /* _X86_ */
#define QueryDepthSList(SListHead) \
ExQueryDepthSList(SListHead)
#endif /* !defined(_WINBASE_) */ #endif /* !defined(_WINBASE_) */
@ -14787,78 +14801,96 @@ ExTryToAcquireFastMutex(
#define ExInterlockedPushEntryList ExfInterlockedPushEntryList #define ExInterlockedPushEntryList ExfInterlockedPushEntryList
#endif /* defined(_X86_) */ #endif /* defined(_X86_) */
#if defined(_WIN64) #ifdef _X86_
#ifdef _WIN2K_COMPAT_SLIST_USAGE
#if defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || \
defined(_NTHAL_) || defined(_NTOSP_)
NTKERNELAPI NTKERNELAPI
USHORT PSLIST_ENTRY
ExQueryDepthSList(_In_ PSLIST_HEADER ListHead); FASTCALL
ExInterlockedPushEntrySList(
_Inout_ PSLIST_HEADER SListHead,
_Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry,
_Inout_opt_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock);
NTKERNELAPI
PSLIST_ENTRY
FASTCALL
ExInterlockedPopEntrySList(
_Inout_ PSLIST_HEADER SListHead,
_Inout_opt_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock);
#else /* !_WIN2K_COMPAT_SLIST_USAGE */
#define ExInterlockedPushEntrySList(SListHead, SListEntry, Lock) \
InterlockedPushEntrySList(SListHead, SListEntry)
#define ExInterlockedPopEntrySList(SListHead, Lock) \
InterlockedPopEntrySList(SListHead)
#endif /* _WIN2K_COMPAT_SLIST_USAGE */
NTKERNELAPI
PSLIST_ENTRY
FASTCALL
ExInterlockedFlushSList(
_Inout_ PSLIST_HEADER SListHead);
#ifdef NONAMELESSUNION
#define ExQueryDepthSList(SListHead) (SListHead)->s.Depth
#else #else
FORCEINLINE #define ExQueryDepthSList(SListHead) (SListHead)->Depth
USHORT
ExQueryDepthSList(_In_ PSLIST_HEADER ListHead)
{
return (USHORT)(ListHead->Alignment & 0xffff);
}
#endif #endif
NTKERNELAPI #else /* !_X86_ */
PSLIST_ENTRY
ExpInterlockedFlushSList(
PSLIST_HEADER ListHead);
NTKERNELAPI
PSLIST_ENTRY
ExpInterlockedPopEntrySList(
_Inout_ PSLIST_HEADER ListHead);
NTKERNELAPI NTKERNELAPI
PSLIST_ENTRY PSLIST_ENTRY
ExpInterlockedPushEntrySList( ExpInterlockedPushEntrySList(
_Inout_ PSLIST_HEADER ListHead, _Inout_ PSLIST_HEADER SListHead,
_Inout_ __drv_aliasesMem PSLIST_ENTRY ListEntry); _Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry);
#define ExInterlockedFlushSList(Head) \ NTKERNELAPI
ExpInterlockedFlushSList(Head) PSLIST_ENTRY
#define ExInterlockedPopEntrySList(Head, Lock) \ ExpInterlockedPopEntrySList(
ExpInterlockedPopEntrySList(Head) _Inout_ PSLIST_HEADER SListHead);
#define ExInterlockedPushEntrySList(Head, Entry, Lock) \
ExpInterlockedPushEntrySList(Head, Entry)
#else /* !defined(_WIN64) */ NTKERNELAPI
PSLIST_ENTRY
ExpInterlockedFlushSList(
_Inout_ PSLIST_HEADER SListHead);
#ifdef NONAMELESSUNION #if !defined(_NTSYSTEM_) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || defined(_NTOSP_))
#define ExQueryDepthSList(listhead) (listhead)->s.Depth NTKERNELAPI
USHORT
ExQueryDepthSList(_In_ PSLIST_HEADER SListHead);
#else #else
#define ExQueryDepthSList(listhead) (listhead)->Depth FORCEINLINE
USHORT
ExQueryDepthSList(_In_ PSLIST_HEADER SListHead)
{
#ifdef _WIN64
return (USHORT)(SListHead->Alignment & 0xffff);
#else /* !_WIN64 */
return (USHORT)SListHead->Depth;
#endif /* _WIN64 */
}
#endif #endif
NTKERNELAPI #define ExInterlockedPushEntrySList(SListHead, SListEntry, Lock) \
PSINGLE_LIST_ENTRY ExpInterlockedPushEntrySList(SListHead, SListEntry)
FASTCALL
ExInterlockedFlushSList( #define ExInterlockedPopEntrySList(SListHead, Lock) \
_Inout_ PSLIST_HEADER ListHead); ExpInterlockedPopEntrySList(SListHead)
#define ExInterlockedFlushSList(SListHead) \
ExpInterlockedFlushSList(SListHead)
#endif /* _X86_ */
#endif /* !defined(_WIN64) */
#if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) #if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_)
NTKERNELAPI
PSINGLE_LIST_ENTRY
FASTCALL
ExInterlockedPopEntrySList(
_Inout_ PSLIST_HEADER ListHead,
_Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock);
NTKERNELAPI
PSINGLE_LIST_ENTRY
FASTCALL
ExInterlockedPushEntrySList(
_Inout_ PSLIST_HEADER ListHead,
_Inout_ __drv_aliasesMem PSINGLE_LIST_ENTRY ListEntry,
_Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock);
_IRQL_requires_max_(APC_LEVEL) _IRQL_requires_max_(APC_LEVEL)
NTKERNELAPI NTKERNELAPI
PVOID PVOID
@ -14876,13 +14908,6 @@ ExFreeToPagedLookasideList(
#else /* !_WIN2K_COMPAT_SLIST_USAGE */ #else /* !_WIN2K_COMPAT_SLIST_USAGE */
#if !defined(_WIN64)
#define ExInterlockedPopEntrySList(_ListHead, _Lock) \
InterlockedPopEntrySList(_ListHead)
#define ExInterlockedPushEntrySList(_ListHead, _ListEntry, _Lock) \
InterlockedPushEntrySList(_ListHead, _ListEntry)
#endif
_IRQL_requires_max_(APC_LEVEL) _IRQL_requires_max_(APC_LEVEL)
static __inline static __inline
PVOID PVOID
@ -15282,12 +15307,7 @@ ExInterlockedAddUlong(
_In_ ULONG Increment, _In_ ULONG Increment,
_Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); _Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock);
#if defined(_AMD64_) || defined(_IA64_) #if defined(_M_IX86)
#define ExInterlockedCompareExchange64(Destination, Exchange, Comperand, Lock) \
InterlockedCompareExchange64(Destination, *(Exchange), *(Comperand))
#elif defined(_X86_)
NTKERNELAPI NTKERNELAPI
LONGLONG LONGLONG
@ -15302,16 +15322,10 @@ ExfInterlockedCompareExchange64(
#else #else
NTKERNELAPI #define ExInterlockedCompareExchange64(Destination, Exchange, Comperand, Lock) \
LONGLONG InterlockedCompareExchange64(Destination, *(Exchange), *(Comperand))
FASTCALL
ExInterlockedCompareExchange64(
IN OUT LONGLONG volatile *Destination,
IN PLONGLONG Exchange,
IN PLONGLONG Comparand,
IN PKSPIN_LOCK Lock);
#endif /* defined(_AMD64_) || defined(_IA64_) */ #endif /* defined(_M_IX86) */
NTKERNELAPI NTKERNELAPI
PLIST_ENTRY PLIST_ENTRY
@ -15689,6 +15703,12 @@ NTAPI
ExFlushLookasideListEx( ExFlushLookasideListEx(
_Inout_ PLOOKASIDE_LIST_EX Lookaside); _Inout_ PLOOKASIDE_LIST_EX Lookaside);
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:__WARNING_MEMORY_NOT_ACQUIRED)
#endif
__drv_allocatesMem(Mem)
_Must_inspect_result_ _Must_inspect_result_
_IRQL_requires_max_(DISPATCH_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL)
FORCEINLINE FORCEINLINE
@ -15721,12 +15741,16 @@ ExAllocateFromLookasideListEx(
return Entry; return Entry;
} }
#ifdef _MSC_VER
#pragma warning(pop)
#endif
_IRQL_requires_max_(DISPATCH_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL)
FORCEINLINE FORCEINLINE
VOID VOID
ExFreeToLookasideListEx( ExFreeToLookasideListEx(
_Inout_ PLOOKASIDE_LIST_EX Lookaside, _Inout_ PLOOKASIDE_LIST_EX Lookaside,
_In_ PVOID Entry) _In_ __drv_freesMem(Entry) PVOID Entry)
{ {
Lookaside->L.TotalFrees += 1; Lookaside->L.TotalFrees += 1;
if (ExQueryDepthSList(&Lookaside->L.ListHead) >= Lookaside->L.Depth) { if (ExQueryDepthSList(&Lookaside->L.ListHead) >= Lookaside->L.Depth) {
@ -15755,8 +15779,12 @@ ExSetResourceOwnerPointerEx(
#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
__drv_allocatesMem(Mem)
_IRQL_requires_max_(DISPATCH_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL)
static __inline PVOID _Ret_maybenull_
_Post_writable_byte_size_(Lookaside->L.Size)
static __inline
PVOID
ExAllocateFromNPagedLookasideList( ExAllocateFromNPagedLookasideList(
_Inout_ PNPAGED_LOOKASIDE_LIST Lookaside) _Inout_ PNPAGED_LOOKASIDE_LIST Lookaside)
{ {
@ -15794,10 +15822,11 @@ ExAllocateFromNPagedLookasideList(
} }
_IRQL_requires_max_(DISPATCH_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL)
static __inline VOID static __inline
VOID
ExFreeToNPagedLookasideList( ExFreeToNPagedLookasideList(
_Inout_ PNPAGED_LOOKASIDE_LIST Lookaside, _Inout_ PNPAGED_LOOKASIDE_LIST Lookaside,
_In_ PVOID Entry) _In_ __drv_freesMem(Mem) PVOID Entry)
{ {
Lookaside->L.TotalFrees++; Lookaside->L.TotalFrees++;
#ifdef NONAMELESSUNION #ifdef NONAMELESSUNION

46
reactos/include/psdk/winnt.h
View file

@ -2569,18 +2569,40 @@ typedef enum {
#define PROCESSOR_ARCHITECTURE_MSIL 8 #define PROCESSOR_ARCHITECTURE_MSIL 8
#define PROCESSOR_ARCHITECTURE_AMD64 9 #define PROCESSOR_ARCHITECTURE_AMD64 9
#define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF
#define PF_FLOATING_POINT_PRECISION_ERRATA 0
#define PF_FLOATING_POINT_EMULATED 1 /* Processor features */
#define PF_COMPARE_EXCHANGE_DOUBLE 2 #define PF_FLOATING_POINT_PRECISION_ERRATA 0
#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 #define PF_FLOATING_POINT_EMULATED 1
#define PF_PPC_MOVEMEM_64BIT_OK 4 #define PF_COMPARE_EXCHANGE_DOUBLE 2
#define PF_ALPHA_BYTE_INSTRUCTIONS 5 #define PF_MMX_INSTRUCTIONS_AVAILABLE 3
#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 #define PF_PPC_MOVEMEM_64BIT_OK 4
#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 #define PF_ALPHA_BYTE_INSTRUCTIONS 5
#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 #define PF_XMMI_INSTRUCTIONS_AVAILABLE 6
#define PF_PAE_ENABLED 9 #define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7
#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 #define PF_RDTSC_INSTRUCTION_AVAILABLE 8
#define PF_NX_ENABLED 12 #define PF_PAE_ENABLED 9
#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10
#define PF_SSE_DAZ_MODE_AVAILABLE 11
#define PF_NX_ENABLED 12
#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13
#define PF_COMPARE_EXCHANGE128 14
#define PF_COMPARE64_EXCHANGE128 15
#define PF_CHANNELS_ENABLED 16
#define PF_XSAVE_ENABLED 17
#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18
#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19
#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20
#define PF_VIRT_FIRMWARE_ENABLED 21
#define PF_RDWRFSGSBASE_AVAILABLE 22
#define PF_FASTFAIL_AVAILABLE 23
#define PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE 24
#define PF_ARM_64BIT_LOADSTORE_ATOMIC 25
#define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26
#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27
#define PF_RDRAND_INSTRUCTION_AVAILABLE 28
#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29
#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30
#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31
/* also in ddk/ntifs.h */ /* also in ddk/ntifs.h */
#define FILE_ACTION_ADDED 0x00000001 #define FILE_ACTION_ADDED 0x00000001

173
reactos/include/xdk/exfuncs.h
View file

@ -84,78 +84,96 @@ ExTryToAcquireFastMutex(
#define ExInterlockedPushEntryList ExfInterlockedPushEntryList #define ExInterlockedPushEntryList ExfInterlockedPushEntryList
#endif /* defined(_X86_) */ #endif /* defined(_X86_) */
#if defined(_WIN64) #ifdef _X86_
#ifdef _WIN2K_COMPAT_SLIST_USAGE
#if defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || \
defined(_NTHAL_) || defined(_NTOSP_)
NTKERNELAPI NTKERNELAPI
USHORT PSLIST_ENTRY
ExQueryDepthSList(_In_ PSLIST_HEADER ListHead); FASTCALL
ExInterlockedPushEntrySList(
_Inout_ PSLIST_HEADER SListHead,
_Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry,
_Inout_opt_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock);
NTKERNELAPI
PSLIST_ENTRY
FASTCALL
ExInterlockedPopEntrySList(
_Inout_ PSLIST_HEADER SListHead,
_Inout_opt_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock);
#else /* !_WIN2K_COMPAT_SLIST_USAGE */
#define ExInterlockedPushEntrySList(SListHead, SListEntry, Lock) \
InterlockedPushEntrySList(SListHead, SListEntry)
#define ExInterlockedPopEntrySList(SListHead, Lock) \
InterlockedPopEntrySList(SListHead)
#endif /* _WIN2K_COMPAT_SLIST_USAGE */
NTKERNELAPI
PSLIST_ENTRY
FASTCALL
ExInterlockedFlushSList(
_Inout_ PSLIST_HEADER SListHead);
#ifdef NONAMELESSUNION
#define ExQueryDepthSList(SListHead) (SListHead)->s.Depth
#else #else
FORCEINLINE #define ExQueryDepthSList(SListHead) (SListHead)->Depth
USHORT
ExQueryDepthSList(_In_ PSLIST_HEADER ListHead)
{
return (USHORT)(ListHead->Alignment & 0xffff);
}
#endif #endif
NTKERNELAPI #else /* !_X86_ */
PSLIST_ENTRY
ExpInterlockedFlushSList(
PSLIST_HEADER ListHead);
NTKERNELAPI
PSLIST_ENTRY
ExpInterlockedPopEntrySList(
_Inout_ PSLIST_HEADER ListHead);
NTKERNELAPI NTKERNELAPI
PSLIST_ENTRY PSLIST_ENTRY
ExpInterlockedPushEntrySList( ExpInterlockedPushEntrySList(
_Inout_ PSLIST_HEADER ListHead, _Inout_ PSLIST_HEADER SListHead,
_Inout_ __drv_aliasesMem PSLIST_ENTRY ListEntry); _Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry);
#define ExInterlockedFlushSList(Head) \ NTKERNELAPI
ExpInterlockedFlushSList(Head) PSLIST_ENTRY
#define ExInterlockedPopEntrySList(Head, Lock) \ ExpInterlockedPopEntrySList(
ExpInterlockedPopEntrySList(Head) _Inout_ PSLIST_HEADER SListHead);
#define ExInterlockedPushEntrySList(Head, Entry, Lock) \
ExpInterlockedPushEntrySList(Head, Entry)
#else /* !defined(_WIN64) */ NTKERNELAPI
PSLIST_ENTRY
ExpInterlockedFlushSList(
_Inout_ PSLIST_HEADER SListHead);
#ifdef NONAMELESSUNION #if !defined(_NTSYSTEM_) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || defined(_NTOSP_))
#define ExQueryDepthSList(listhead) (listhead)->s.Depth NTKERNELAPI
USHORT
ExQueryDepthSList(_In_ PSLIST_HEADER SListHead);
#else #else
#define ExQueryDepthSList(listhead) (listhead)->Depth FORCEINLINE
USHORT
ExQueryDepthSList(_In_ PSLIST_HEADER SListHead)
{
#ifdef _WIN64
return (USHORT)(SListHead->Alignment & 0xffff);
#else /* !_WIN64 */
return (USHORT)SListHead->Depth;
#endif /* _WIN64 */
}
#endif #endif
NTKERNELAPI #define ExInterlockedPushEntrySList(SListHead, SListEntry, Lock) \
PSINGLE_LIST_ENTRY ExpInterlockedPushEntrySList(SListHead, SListEntry)
FASTCALL
ExInterlockedFlushSList( #define ExInterlockedPopEntrySList(SListHead, Lock) \
_Inout_ PSLIST_HEADER ListHead); ExpInterlockedPopEntrySList(SListHead)
#define ExInterlockedFlushSList(SListHead) \
ExpInterlockedFlushSList(SListHead)
#endif /* _X86_ */
#endif /* !defined(_WIN64) */
#if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) #if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_)
NTKERNELAPI
PSINGLE_LIST_ENTRY
FASTCALL
ExInterlockedPopEntrySList(
_Inout_ PSLIST_HEADER ListHead,
_Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock);
NTKERNELAPI
PSINGLE_LIST_ENTRY
FASTCALL
ExInterlockedPushEntrySList(
_Inout_ PSLIST_HEADER ListHead,
_Inout_ __drv_aliasesMem PSINGLE_LIST_ENTRY ListEntry,
_Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock);
_IRQL_requires_max_(APC_LEVEL) _IRQL_requires_max_(APC_LEVEL)
NTKERNELAPI NTKERNELAPI
PVOID PVOID
@ -173,13 +191,6 @@ ExFreeToPagedLookasideList(
#else /* !_WIN2K_COMPAT_SLIST_USAGE */ #else /* !_WIN2K_COMPAT_SLIST_USAGE */
#if !defined(_WIN64)
#define ExInterlockedPopEntrySList(_ListHead, _Lock) \
InterlockedPopEntrySList(_ListHead)
#define ExInterlockedPushEntrySList(_ListHead, _ListEntry, _Lock) \
InterlockedPushEntrySList(_ListHead, _ListEntry)
#endif
_IRQL_requires_max_(APC_LEVEL) _IRQL_requires_max_(APC_LEVEL)
static __inline static __inline
PVOID PVOID
@ -693,12 +704,7 @@ ExInterlockedAddUlong(
_In_ ULONG Increment, _In_ ULONG Increment,
_Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); _Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock);
#if defined(_AMD64_) || defined(_IA64_) #if defined(_M_IX86)
#define ExInterlockedCompareExchange64(Destination, Exchange, Comperand, Lock) \
InterlockedCompareExchange64(Destination, *(Exchange), *(Comperand))
#elif defined(_X86_)
NTKERNELAPI NTKERNELAPI
LONGLONG LONGLONG
@ -713,16 +719,10 @@ ExfInterlockedCompareExchange64(
#else #else
NTKERNELAPI #define ExInterlockedCompareExchange64(Destination, Exchange, Comperand, Lock) \
LONGLONG InterlockedCompareExchange64(Destination, *(Exchange), *(Comperand))
FASTCALL
ExInterlockedCompareExchange64(
IN OUT LONGLONG volatile *Destination,
IN PLONGLONG Exchange,
IN PLONGLONG Comparand,
IN PKSPIN_LOCK Lock);
#endif /* defined(_AMD64_) || defined(_IA64_) */ #endif /* defined(_M_IX86) */
NTKERNELAPI NTKERNELAPI
PLIST_ENTRY PLIST_ENTRY
@ -1189,6 +1189,12 @@ NTAPI
ExFlushLookasideListEx( ExFlushLookasideListEx(
_Inout_ PLOOKASIDE_LIST_EX Lookaside); _Inout_ PLOOKASIDE_LIST_EX Lookaside);
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:__WARNING_MEMORY_NOT_ACQUIRED)
#endif
__drv_allocatesMem(Mem)
_Must_inspect_result_ _Must_inspect_result_
_IRQL_requires_max_(DISPATCH_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL)
FORCEINLINE FORCEINLINE
@ -1221,12 +1227,16 @@ ExAllocateFromLookasideListEx(
return Entry; return Entry;
} }
#ifdef _MSC_VER
#pragma warning(pop)
#endif
_IRQL_requires_max_(DISPATCH_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL)
FORCEINLINE FORCEINLINE
VOID VOID
ExFreeToLookasideListEx( ExFreeToLookasideListEx(
_Inout_ PLOOKASIDE_LIST_EX Lookaside, _Inout_ PLOOKASIDE_LIST_EX Lookaside,
_In_ PVOID Entry) _In_ __drv_freesMem(Entry) PVOID Entry)
{ {
Lookaside->L.TotalFrees += 1; Lookaside->L.TotalFrees += 1;
if (ExQueryDepthSList(&Lookaside->L.ListHead) >= Lookaside->L.Depth) { if (ExQueryDepthSList(&Lookaside->L.ListHead) >= Lookaside->L.Depth) {
@ -1255,8 +1265,12 @@ ExSetResourceOwnerPointerEx(
#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
__drv_allocatesMem(Mem)
_IRQL_requires_max_(DISPATCH_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL)
static __inline PVOID _Ret_maybenull_
_Post_writable_byte_size_(Lookaside->L.Size)
static __inline
PVOID
ExAllocateFromNPagedLookasideList( ExAllocateFromNPagedLookasideList(
_Inout_ PNPAGED_LOOKASIDE_LIST Lookaside) _Inout_ PNPAGED_LOOKASIDE_LIST Lookaside)
{ {
@ -1294,10 +1308,11 @@ ExAllocateFromNPagedLookasideList(
} }
_IRQL_requires_max_(DISPATCH_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL)
static __inline VOID static __inline
VOID
ExFreeToNPagedLookasideList( ExFreeToNPagedLookasideList(
_Inout_ PNPAGED_LOOKASIDE_LIST Lookaside, _Inout_ PNPAGED_LOOKASIDE_LIST Lookaside,
_In_ PVOID Entry) _In_ __drv_freesMem(Mem) PVOID Entry)
{ {
Lookaside->L.TotalFrees++; Lookaside->L.TotalFrees++;
#ifdef NONAMELESSUNION #ifdef NONAMELESSUNION

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

@ -118,24 +118,38 @@ typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX {
} SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX;; } SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX;;
/* Processor features */ /* Processor features */
#define PF_FLOATING_POINT_PRECISION_ERRATA 0 #define PF_FLOATING_POINT_PRECISION_ERRATA 0
#define PF_FLOATING_POINT_EMULATED 1 #define PF_FLOATING_POINT_EMULATED 1
#define PF_COMPARE_EXCHANGE_DOUBLE 2 #define PF_COMPARE_EXCHANGE_DOUBLE 2
#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 #define PF_MMX_INSTRUCTIONS_AVAILABLE 3
#define PF_PPC_MOVEMEM_64BIT_OK 4 #define PF_PPC_MOVEMEM_64BIT_OK 4
#define PF_ALPHA_BYTE_INSTRUCTIONS 5 #define PF_ALPHA_BYTE_INSTRUCTIONS 5
#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 #define PF_XMMI_INSTRUCTIONS_AVAILABLE 6
#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 #define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7
#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 #define PF_RDTSC_INSTRUCTION_AVAILABLE 8
#define PF_PAE_ENABLED 9 #define PF_PAE_ENABLED 9
#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 #define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10
#define PF_SSE_DAZ_MODE_AVAILABLE 11 #define PF_SSE_DAZ_MODE_AVAILABLE 11
#define PF_NX_ENABLED 12 #define PF_NX_ENABLED 12
#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 #define PF_SSE3_INSTRUCTIONS_AVAILABLE 13
#define PF_COMPARE_EXCHANGE128 14 #define PF_COMPARE_EXCHANGE128 14
#define PF_COMPARE64_EXCHANGE128 15 #define PF_COMPARE64_EXCHANGE128 15
#define PF_CHANNELS_ENABLED 16 #define PF_CHANNELS_ENABLED 16
#define PF_XSAVE_ENABLED 17 #define PF_XSAVE_ENABLED 17
#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18
#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19
#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20
#define PF_VIRT_FIRMWARE_ENABLED 21
#define PF_RDWRFSGSBASE_AVAILABLE 22
#define PF_FASTFAIL_AVAILABLE 23
#define PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE 24
#define PF_ARM_64BIT_LOADSTORE_ATOMIC 25
#define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26
#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27
#define PF_RDRAND_INSTRUCTION_AVAILABLE 28
#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29
#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30
#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31
#define MAXIMUM_WAIT_OBJECTS 64 #define MAXIMUM_WAIT_OBJECTS 64

92
reactos/include/xdk/rtlfuncs.h
View file

@ -3301,77 +3301,77 @@ RtlCheckBit(
#if !defined(_WINBASE_) #if !defined(_WINBASE_)
#if defined(_WIN64) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || defined(_NTOSP_)) #if defined(_WIN64) && !defined(_NTSYSTEM_) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || !defined(_NTOSP_))
NTKERNELAPI NTKERNELAPI
VOID VOID
InitializeSListHead( InitializeSListHead(
_Out_ PSLIST_HEADER SListHead); _Out_ PSLIST_HEADER SListHead);
#else #else /* defined(_WIN64) && ... */
/* HACK */
_IRQL_requires_max_(APC_LEVEL)
NTKERNELAPI
DECLSPEC_NORETURN
VOID
NTAPI
ExRaiseStatus(
_In_ NTSTATUS Status);
FORCEINLINE FORCEINLINE
VOID VOID
InitializeSListHead( InitializeSListHead(
_Out_ PSLIST_HEADER SListHead) _Out_ PSLIST_HEADER SListHead)
{ {
#if defined(_IA64_)
ULONG64 FeatureBits;
#endif
#if defined(_WIN64) #if defined(_WIN64)
if (((ULONG_PTR)SListHead & 0xf) != 0) { if (((ULONG_PTR)SListHead & 0xf) != 0) {
RtlRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); ExRaiseStatus(STATUS_DATATYPE_MISALIGNMENT);
} }
#endif
RtlZeroMemory(SListHead, sizeof(SLIST_HEADER));
#if defined(_IA64_) #if defined(_IA64_)
FeatureBits = __getReg(CV_IA64_CPUID4); SListHead->Region = (ULONG_PTR)SListHead & VRN_MASK;
if ((FeatureBits & KF_16BYTE_INSTR) != 0) { #else
SListHead->Header16.HeaderType = 1; SListHead->Region = 0;
SListHead->Header16.Init = 1; #endif /* _IA64_ */
} #endif /* _WIN64 */
#endif SListHead->Alignment = 0;
} }
#endif #endif /* defined(_WIN64) && ... */
#if defined(_WIN64) #ifdef _X86_
#define InterlockedPopEntrySList(Head) \
ExpInterlockedPopEntrySList(Head)
#define InterlockedPushEntrySList(Head, Entry) \
ExpInterlockedPushEntrySList(Head, Entry)
#define InterlockedFlushSList(Head) \
ExpInterlockedFlushSList(Head)
#define QueryDepthSList(Head) \
ExQueryDepthSList(Head)
#else /* !defined(_WIN64) */
NTKERNELAPI
PSLIST_ENTRY
FASTCALL
InterlockedPopEntrySList(
_Inout_ PSLIST_HEADER ListHead);
NTKERNELAPI NTKERNELAPI
PSLIST_ENTRY PSLIST_ENTRY
FASTCALL FASTCALL
InterlockedPushEntrySList( InterlockedPushEntrySList(
_Inout_ PSLIST_HEADER ListHead, _Inout_ PSLIST_HEADER SListHead,
_Inout_ __drv_aliasesMem PSLIST_ENTRY ListEntry); _Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry);
#define InterlockedFlushSList(ListHead) \ NTKERNELAPI
ExInterlockedFlushSList(ListHead) PSLIST_ENTRY
FASTCALL
InterlockedPopEntrySList(
_Inout_ PSLIST_HEADER SListHead);
#define QueryDepthSList(Head) \ #define InterlockedFlushSList(SListHead) \
ExQueryDepthSList(Head) ExInterlockedFlushSList(SListHead)
#endif /* !defined(_WIN64) */ #else /* !_X86_ */
#define InterlockedPushEntrySList(SListHead, SListEntry) \
ExpInterlockedPushEntrySList(SListHead, SListEntry)
#define InterlockedPopEntrySList(SListHead) \
ExpInterlockedPopEntrySList(SListHead)
#define InterlockedFlushSList(SListHead) \
ExpInterlockedFlushSList(SListHead)
#endif /* _X86_ */
#define QueryDepthSList(SListHead) \
ExQueryDepthSList(SListHead)
#endif /* !defined(_WINBASE_) */ #endif /* !defined(_WINBASE_) */

46
reactos/include/xdk/winnt_old.h
View file

@ -674,18 +674,40 @@ typedef enum {
#define PROCESSOR_ARCHITECTURE_MSIL 8 #define PROCESSOR_ARCHITECTURE_MSIL 8
#define PROCESSOR_ARCHITECTURE_AMD64 9 #define PROCESSOR_ARCHITECTURE_AMD64 9
#define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF
#define PF_FLOATING_POINT_PRECISION_ERRATA 0
#define PF_FLOATING_POINT_EMULATED 1 /* Processor features */
#define PF_COMPARE_EXCHANGE_DOUBLE 2 #define PF_FLOATING_POINT_PRECISION_ERRATA 0
#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 #define PF_FLOATING_POINT_EMULATED 1
#define PF_PPC_MOVEMEM_64BIT_OK 4 #define PF_COMPARE_EXCHANGE_DOUBLE 2
#define PF_ALPHA_BYTE_INSTRUCTIONS 5 #define PF_MMX_INSTRUCTIONS_AVAILABLE 3
#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 #define PF_PPC_MOVEMEM_64BIT_OK 4
#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 #define PF_ALPHA_BYTE_INSTRUCTIONS 5
#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 #define PF_XMMI_INSTRUCTIONS_AVAILABLE 6
#define PF_PAE_ENABLED 9 #define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7
#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 #define PF_RDTSC_INSTRUCTION_AVAILABLE 8
#define PF_NX_ENABLED 12 #define PF_PAE_ENABLED 9
#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10
#define PF_SSE_DAZ_MODE_AVAILABLE 11
#define PF_NX_ENABLED 12
#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13
#define PF_COMPARE_EXCHANGE128 14
#define PF_COMPARE64_EXCHANGE128 15
#define PF_CHANNELS_ENABLED 16
#define PF_XSAVE_ENABLED 17
#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18
#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19
#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20
#define PF_VIRT_FIRMWARE_ENABLED 21
#define PF_RDWRFSGSBASE_AVAILABLE 22
#define PF_FASTFAIL_AVAILABLE 23
#define PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE 24
#define PF_ARM_64BIT_LOADSTORE_ATOMIC 25
#define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26
#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27
#define PF_RDRAND_INSTRUCTION_AVAILABLE 28
#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29
#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30
#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31
/* also in ddk/ntifs.h */ /* also in ddk/ntifs.h */
#define FILE_ACTION_ADDED 0x00000001 #define FILE_ACTION_ADDED 0x00000001