From d10b8009fb9d4c83bc9f396b66c192cb8c7ccdd2 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 26 Sep 2012 09:40:44 +0000 Subject: [PATCH] [PSDK/DDK/XDK] - Remove duplicated definitions from ntddk.h - Fix annotations in ntifs.h, wdm.h, ntgdi.h, winddi.h [NDK] - Declare most of the heap functions only for user mode - Remove duplicate RtlGetNtGlobalFlags() svn path=/trunk/; revision=57389 --- reactos/include/ddk/ntddk.h | 53 ------------------------------- reactos/include/ddk/ntifs.h | 4 +-- reactos/include/ddk/wdm.h | 8 ++--- reactos/include/ndk/rtlfuncs.h | 29 ++++++++--------- reactos/include/psdk/ntgdi.h | 15 ++++++--- reactos/include/psdk/winddi.h | 3 +- reactos/include/xdk/iofuncs.h | 4 +-- reactos/include/xdk/kefuncs.h | 4 +-- reactos/include/xdk/mmfuncs.h | 57 ++-------------------------------- 9 files changed, 37 insertions(+), 140 deletions(-) diff --git a/reactos/include/ddk/ntddk.h b/reactos/include/ddk/ntddk.h index 626cd7de70d..969d18422c9 100644 --- a/reactos/include/ddk/ntddk.h +++ b/reactos/include/ddk/ntddk.h @@ -4680,59 +4680,6 @@ MmAddPhysicalMemory( _In_ PPHYSICAL_ADDRESS StartAddress, _Inout_ PLARGE_INTEGER NumberOfBytes); -_Must_inspect_result_ -_IRQL_requires_max_(DISPATCH_LEVEL) -_When_(return != NULL, _Post_writable_byte_size_(NumberOfBytes)) -NTKERNELAPI -PVOID -NTAPI -MmAllocateContiguousMemory( - _In_ SIZE_T NumberOfBytes, - _In_ PHYSICAL_ADDRESS HighestAcceptableAddress); - -_Must_inspect_result_ -_IRQL_requires_max_(DISPATCH_LEVEL) -_When_(return != NULL, _Post_writable_byte_size_(NumberOfBytes)) -NTKERNELAPI -PVOID -NTAPI -MmAllocateContiguousMemorySpecifyCache( - _In_ SIZE_T NumberOfBytes, - _In_ PHYSICAL_ADDRESS LowestAcceptableAddress, - _In_ PHYSICAL_ADDRESS HighestAcceptableAddress, - _In_opt_ PHYSICAL_ADDRESS BoundaryAddressMultiple, - _In_ MEMORY_CACHING_TYPE CacheType); - -_Must_inspect_result_ -_IRQL_requires_max_(DISPATCH_LEVEL) -_When_(return != NULL, _Post_writable_byte_size_(NumberOfBytes)) -NTKERNELAPI -PVOID -NTAPI -MmAllocateContiguousMemorySpecifyCacheNode( - _In_ SIZE_T NumberOfBytes, - _In_ PHYSICAL_ADDRESS LowestAcceptableAddress, - _In_ PHYSICAL_ADDRESS HighestAcceptableAddress, - _In_opt_ PHYSICAL_ADDRESS BoundaryAddressMultiple, - _In_ MEMORY_CACHING_TYPE CacheType, - _In_ NODE_REQUIREMENT PreferredNode); - -_IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI -VOID -NTAPI -MmFreeContiguousMemory( - _In_ PVOID BaseAddress); - -_IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI -VOID -NTAPI -MmFreeContiguousMemorySpecifyCache( - _In_reads_bytes_(NumberOfBytes) PVOID BaseAddress, - _In_ SIZE_T NumberOfBytes, - _In_ MEMORY_CACHING_TYPE CacheType); - #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h index 6559723dc28..839a700f226 100644 --- a/reactos/include/ddk/ntifs.h +++ b/reactos/include/ddk/ntifs.h @@ -5083,8 +5083,8 @@ KeInsertHeadQueue( _Inout_ PLIST_ENTRY Entry); _IRQL_requires_min_(PASSIVE_LEVEL) -_When_((Timeout==NULL || *Timeout!=0), _IRQL_requires_max_(APC_LEVEL)) -_When_((Timeout!=NULL && *Timeout==0), _IRQL_requires_max_(DISPATCH_LEVEL)) +_When_((Timeout==NULL || Timeout->QuadPart!=0), _IRQL_requires_max_(APC_LEVEL)) +_When_((Timeout!=NULL && Timeout->QuadPart==0), _IRQL_requires_max_(DISPATCH_LEVEL)) NTKERNELAPI PLIST_ENTRY NTAPI diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h index b56f751d82f..efb0e07337a 100644 --- a/reactos/include/ddk/wdm.h +++ b/reactos/include/ddk/wdm.h @@ -11399,8 +11399,8 @@ MmMapIoSpace( _In_ MEMORY_CACHING_TYPE CacheType); _Must_inspect_result_ -_When_(AccessMode==0, _IRQL_requires_max_(DISPATCH_LEVEL)) -_When_(AccessMode==1, _Maybe_raises_SEH_exception_ _IRQL_requires_max_(APC_LEVEL)) +_When_(AccessMode==KernelMode, _IRQL_requires_max_(DISPATCH_LEVEL)) +_When_(AccessMode==UserMode, _Maybe_raises_SEH_exception_ _IRQL_requires_max_(APC_LEVEL)) NTKERNELAPI PVOID NTAPI @@ -12618,8 +12618,8 @@ IoCreateDevice( _Outptr_result_nullonfailure_ _At_(*DeviceObject, __drv_allocatesMem(Mem) - _When_((((_In_function_class_(DRIVER_INITIALIZE)) - ||(_In_function_class_(DRIVER_DISPATCH)))), + _When_(((_In_function_class_(DRIVER_INITIALIZE)) + ||(_In_function_class_(DRIVER_DISPATCH))), __drv_aliasesMem)) PDEVICE_OBJECT *DeviceObject); diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h index 0e3665c9369..271f6db87c7 100644 --- a/reactos/include/ndk/rtlfuncs.h +++ b/reactos/include/ndk/rtlfuncs.h @@ -726,6 +726,7 @@ RtlLogStackBackTrace( VOID ); +#ifdef NTOS_MODE_USER // // Heap Functions // @@ -805,13 +806,6 @@ RtlFreeHeap( IN PVOID P ); -NTSYSAPI -ULONG -NTAPI -RtlGetNtGlobalFlags( - VOID -); - ULONG NTAPI RtlGetProcessHeaps( @@ -942,15 +936,6 @@ RtlSetUserFlagsHeap( IN ULONG UserFlagsSet ); -NTSYSAPI -SIZE_T -NTAPI -RtlSizeHeap( - IN PVOID HeapHandle, - IN ULONG Flags, - IN PVOID MemoryPointer -); - NTSYSAPI BOOLEAN NTAPI @@ -970,6 +955,18 @@ RtlWalkHeap( #define RtlGetProcessHeap() (NtCurrentPeb()->ProcessHeap) +#endif // NTOS_MODE_USER + +NTSYSAPI +SIZE_T +NTAPI +RtlSizeHeap( + IN PVOID HeapHandle, + IN ULONG Flags, + IN PVOID MemoryPointer +); + + // // Security Functions // diff --git a/reactos/include/psdk/ntgdi.h b/reactos/include/psdk/ntgdi.h index 9260c7ce4eb..ef94558f7a4 100644 --- a/reactos/include/psdk/ntgdi.h +++ b/reactos/include/psdk/ntgdi.h @@ -193,8 +193,9 @@ NtGdiGetOutlineTextMetricsInternalW( _Out_opt_ OUTLINETEXTMETRICW *potmw, _Out_ TMDIFF *ptmd); +_Success_(return != FALSE) W32KAPI -BOOL _Success_(return != FALSE) +BOOL APIENTRY NtGdiGetAndSetDCDword( _In_ HDC hdc, @@ -404,8 +405,9 @@ NtGdiGetWidthTable( OUT FLONG *pflInfo ); +_Success_(return != 0) W32KAPI -INT _Success_(return != 0) +INT APIENTRY NtGdiDescribePixelFormat( _In_ HDC hdc, @@ -1646,8 +1648,9 @@ NtGdiSetFontXform( _In_ DWORD dwxScale, _In_ DWORD dwyScale); +_Success_(return != FALSE) W32KAPI -BOOL _Success_(return != FALSE) +BOOL APIENTRY NtGdiGetMiterLimit( _In_ HDC hdc, @@ -2357,8 +2360,9 @@ NtGdiLineTo( _In_ INT x, _In_ INT y); +_Success_(return != FALSE) W32KAPI -BOOL _Success_(return != FALSE) +BOOL APIENTRY NtGdiMoveTo( _In_ HDC hdc, @@ -2405,8 +2409,9 @@ NtGdiStretchBlt( _In_ DWORD dwRop, _In_ DWORD dwBackColor); +_Success_(return != FALSE) W32KAPI -BOOL _Success_(return != FALSE) +BOOL APIENTRY NtGdiSetBrushOrg( _In_ HDC hdc, diff --git a/reactos/include/psdk/winddi.h b/reactos/include/psdk/winddi.h index e5a61835ecd..27f8a029ef3 100644 --- a/reactos/include/psdk/winddi.h +++ b/reactos/include/psdk/winddi.h @@ -1256,7 +1256,7 @@ EngAllocMem( _In_ ULONG ulTag); _Must_inspect_result_ -_Ret_opt_bytecount_(cj) +_Ret_opt_bytecount_(cjMemSize) WIN32KAPI PVOID APIENTRY @@ -1558,6 +1558,7 @@ APIENTRY EngDeleteWnd( _In_ _Post_ptr_invalid_ WNDOBJ *pwo); +_Success_(return==0) WIN32KAPI DWORD APIENTRY diff --git a/reactos/include/xdk/iofuncs.h b/reactos/include/xdk/iofuncs.h index 85ed0fe1f7c..98ec1500558 100644 --- a/reactos/include/xdk/iofuncs.h +++ b/reactos/include/xdk/iofuncs.h @@ -821,8 +821,8 @@ IoCreateDevice( _Outptr_result_nullonfailure_ _At_(*DeviceObject, __drv_allocatesMem(Mem) - _When_((((_In_function_class_(DRIVER_INITIALIZE)) - ||(_In_function_class_(DRIVER_DISPATCH)))), + _When_(((_In_function_class_(DRIVER_INITIALIZE)) + ||(_In_function_class_(DRIVER_DISPATCH))), __drv_aliasesMem)) PDEVICE_OBJECT *DeviceObject); diff --git a/reactos/include/xdk/kefuncs.h b/reactos/include/xdk/kefuncs.h index 852a042ac84..d33a8a4f34f 100644 --- a/reactos/include/xdk/kefuncs.h +++ b/reactos/include/xdk/kefuncs.h @@ -640,8 +640,8 @@ KeInsertHeadQueue( _Inout_ PLIST_ENTRY Entry); _IRQL_requires_min_(PASSIVE_LEVEL) -_When_((Timeout==NULL || *Timeout!=0), _IRQL_requires_max_(APC_LEVEL)) -_When_((Timeout!=NULL && *Timeout==0), _IRQL_requires_max_(DISPATCH_LEVEL)) +_When_((Timeout==NULL || Timeout->QuadPart!=0), _IRQL_requires_max_(APC_LEVEL)) +_When_((Timeout!=NULL && Timeout->QuadPart==0), _IRQL_requires_max_(DISPATCH_LEVEL)) NTKERNELAPI PLIST_ENTRY NTAPI diff --git a/reactos/include/xdk/mmfuncs.h b/reactos/include/xdk/mmfuncs.h index 6611fc9956a..20fd8b16a59 100644 --- a/reactos/include/xdk/mmfuncs.h +++ b/reactos/include/xdk/mmfuncs.h @@ -298,8 +298,8 @@ MmMapIoSpace( _In_ MEMORY_CACHING_TYPE CacheType); _Must_inspect_result_ -_When_(AccessMode==0, _IRQL_requires_max_(DISPATCH_LEVEL)) -_When_(AccessMode==1, _Maybe_raises_SEH_exception_ _IRQL_requires_max_(APC_LEVEL)) +_When_(AccessMode==KernelMode, _IRQL_requires_max_(DISPATCH_LEVEL)) +_When_(AccessMode==UserMode, _Maybe_raises_SEH_exception_ _IRQL_requires_max_(APC_LEVEL)) NTKERNELAPI PVOID NTAPI @@ -574,59 +574,6 @@ NTAPI MmAddPhysicalMemory( _In_ PPHYSICAL_ADDRESS StartAddress, _Inout_ PLARGE_INTEGER NumberOfBytes); - -_Must_inspect_result_ -_IRQL_requires_max_(DISPATCH_LEVEL) -_When_(return != NULL, _Post_writable_byte_size_(NumberOfBytes)) -NTKERNELAPI -PVOID -NTAPI -MmAllocateContiguousMemory( - _In_ SIZE_T NumberOfBytes, - _In_ PHYSICAL_ADDRESS HighestAcceptableAddress); - -_Must_inspect_result_ -_IRQL_requires_max_(DISPATCH_LEVEL) -_When_(return != NULL, _Post_writable_byte_size_(NumberOfBytes)) -NTKERNELAPI -PVOID -NTAPI -MmAllocateContiguousMemorySpecifyCache( - _In_ SIZE_T NumberOfBytes, - _In_ PHYSICAL_ADDRESS LowestAcceptableAddress, - _In_ PHYSICAL_ADDRESS HighestAcceptableAddress, - _In_opt_ PHYSICAL_ADDRESS BoundaryAddressMultiple, - _In_ MEMORY_CACHING_TYPE CacheType); - -_Must_inspect_result_ -_IRQL_requires_max_(DISPATCH_LEVEL) -_When_(return != NULL, _Post_writable_byte_size_(NumberOfBytes)) -NTKERNELAPI -PVOID -NTAPI -MmAllocateContiguousMemorySpecifyCacheNode( - _In_ SIZE_T NumberOfBytes, - _In_ PHYSICAL_ADDRESS LowestAcceptableAddress, - _In_ PHYSICAL_ADDRESS HighestAcceptableAddress, - _In_opt_ PHYSICAL_ADDRESS BoundaryAddressMultiple, - _In_ MEMORY_CACHING_TYPE CacheType, - _In_ NODE_REQUIREMENT PreferredNode); - -_IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI -VOID -NTAPI -MmFreeContiguousMemory( - _In_ PVOID BaseAddress); - -_IRQL_requires_max_(DISPATCH_LEVEL) -NTKERNELAPI -VOID -NTAPI -MmFreeContiguousMemorySpecifyCache( - _In_reads_bytes_(NumberOfBytes) PVOID BaseAddress, - _In_ SIZE_T NumberOfBytes, - _In_ MEMORY_CACHING_TYPE CacheType); $endif (_NTDDK_) $if (_NTIFS_)