From 475a0d52550f7aead818644f48c5d8ac58f64eab Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 10 Mar 2015 00:13:43 +0000 Subject: [PATCH] [WIN32K] Annotate eng/mapping.c svn path=/trunk/; revision=66650 --- reactos/include/psdk/winddi.h | 13 +++++-- reactos/win32ss/gdi/eng/mapping.c | 59 ++++++++++++++++++------------- reactos/win32ss/gdi/eng/mapping.h | 38 +++++++++++--------- 3 files changed, 66 insertions(+), 44 deletions(-) diff --git a/reactos/include/psdk/winddi.h b/reactos/include/psdk/winddi.h index 3fef431367e..0b0814a9bb6 100644 --- a/reactos/include/psdk/winddi.h +++ b/reactos/include/psdk/winddi.h @@ -1842,7 +1842,7 @@ ENGAPI VOID APIENTRY EngFreeModule( - _In_ HANDLE h); + _In_ _Post_invalid_ HANDLE h); ENGAPI @@ -2089,6 +2089,8 @@ EngMapFile( _Out_ ULONG_PTR *piFile); __drv_preferredFunction("EngMapFontFileFD", "Obsolete") +_Check_return_ +_Success_(return!=FALSE) ENGAPI BOOL APIENTRY @@ -2097,6 +2099,8 @@ EngMapFontFile( _Outptr_result_bytebuffer_(*pcjBuf) PULONG *ppjBuf, _Out_ ULONG *pcjBuf); +_Check_return_ +_Success_(return!=FALSE) ENGAPI BOOL APIENTRY @@ -2105,12 +2109,15 @@ EngMapFontFileFD( _Outptr_result_bytebuffer_(*pcjBuf) PULONG *ppjBuf, _Out_ ULONG *pcjBuf); +_Check_return_ +_Success_(return!=NULL) +_Post_writable_byte_size_(*pulSize) ENGAPI PVOID APIENTRY EngMapModule( - _In_ HANDLE h, - _Out_ PULONG pSize); + _In_ HANDLE h, + _Out_ PULONG pulSize); ENGAPI BOOL diff --git a/reactos/win32ss/gdi/eng/mapping.c b/reactos/win32ss/gdi/eng/mapping.c index 1c7c6e95f84..299e8a793a7 100644 --- a/reactos/win32ss/gdi/eng/mapping.c +++ b/reactos/win32ss/gdi/eng/mapping.c @@ -86,13 +86,12 @@ EngUnmapSectionView( ASSERT(NT_SUCCESS(Status)); } - PVOID NTAPI EngCreateSection( - IN ULONG fl, - IN SIZE_T cjSize, - IN ULONG ulTag) + _In_ ULONG fl, + _In_ SIZE_T cjSize, + _In_ ULONG ulTag) { NTSTATUS Status; PENGSECTION pSection; @@ -131,9 +130,9 @@ EngCreateSection( PVOID NTAPI EngCreateSectionHack( - IN ULONG fl, - IN SIZE_T cjSize, - IN ULONG ulTag) + _In_ ULONG fl, + _In_ SIZE_T cjSize, + _In_ ULONG ulTag) { NTSTATUS Status; PENGSECTION pSection; @@ -169,15 +168,14 @@ EngCreateSectionHack( return pSection; } - - +_Success_(return!=FALSE) BOOL APIENTRY EngMapSection( - IN PVOID pvSection, - IN BOOL bMap, - IN HANDLE hProcess, - OUT PVOID* pvBaseAddress) + _In_ PVOID pvSection, + _In_ BOOL bMap, + _In_ HANDLE hProcess, + _When_(bMap, _Outptr_) PVOID* pvBaseAddress) { NTSTATUS Status; PENGSECTION pSection = pvSection; @@ -246,8 +244,8 @@ EngMapSection( BOOL APIENTRY EngFreeSectionMem( - IN PVOID pvSection OPTIONAL, - IN PVOID pvMappedBase OPTIONAL) + _In_opt_ PVOID pvSection, + _In_opt_ PVOID pvMappedBase) { NTSTATUS Status; PENGSECTION pSection = pvSection; @@ -277,13 +275,17 @@ EngFreeSectionMem( return bResult; } +_Check_return_ +_Success_(return!=NULL) +__drv_allocatesMem(Mem) +_Post_writable_byte_size_(cjSize) PVOID APIENTRY EngAllocSectionMem( - OUT PVOID *ppvSection, - IN ULONG fl, - IN SIZE_T cjSize, - IN ULONG ulTag) + _Outptr_ PVOID *ppvSection, + _In_ ULONG fl, + _In_ SIZE_T cjSize, + _In_ ULONG ulTag) { NTSTATUS Status; PENGSECTION pSection; @@ -321,13 +323,13 @@ EngAllocSectionMem( return pSection->pvMappedBase; } - +_Check_return_ PFILEVIEW NTAPI EngLoadModuleEx( - LPWSTR pwsz, - ULONG cjSizeOfModule, - FLONG fl) + _In_z_ LPWSTR pwsz, + _In_ ULONG cjSizeOfModule, + _In_ FLONG fl) { PFILEVIEW pFileView = NULL; OBJECT_ATTRIBUTES ObjectAttributes; @@ -446,6 +448,9 @@ EngLoadModuleForWrite( return (HANDLE)EngLoadModuleEx(pwsz, cjSizeOfModule, FVF_SYSTEMROOT); } +_Check_return_ +_Success_(return!=NULL) +_Post_writable_byte_size_(*pulSize) PVOID APIENTRY EngMapModule( @@ -475,7 +480,7 @@ EngMapModule( VOID APIENTRY EngFreeModule( - _In_ HANDLE h) + _In_ _Post_invalid_ HANDLE h) { PFILEVIEW pFileView = (PFILEVIEW)h; NTSTATUS Status; @@ -540,7 +545,8 @@ EngUnmapFile( return TRUE; } - +_Check_return_ +_Success_(return!=FALSE) BOOL APIENTRY EngMapFontFileFD( @@ -562,6 +568,9 @@ EngUnmapFontFileFD( UNIMPLEMENTED; } +__drv_preferredFunction("EngMapFontFileFD", "Obsolete") +_Check_return_ +_Success_(return!=FALSE) BOOL APIENTRY EngMapFontFile( diff --git a/reactos/win32ss/gdi/eng/mapping.h b/reactos/win32ss/gdi/eng/mapping.h index 5156b2a3c9a..4aef7ba74b9 100644 --- a/reactos/win32ss/gdi/eng/mapping.h +++ b/reactos/win32ss/gdi/eng/mapping.h @@ -53,36 +53,42 @@ EngUnmapSectionView( PVOID NTAPI EngCreateSection( - IN ULONG fl, - IN SIZE_T cjSize, - IN ULONG ulTag); + _In_ ULONG fl, + _In_ SIZE_T cjSize, + _In_ ULONG ulTag); +_Success_(return!=FALSE) BOOL APIENTRY EngMapSection( - IN PVOID pvSection, - IN BOOL bMap, - IN HANDLE hProcess, - OUT PVOID* pvBaseAddress); + _In_ PVOID pvSection, + _In_ BOOL bMap, + _In_ HANDLE hProcess, + _When_(bMap, _Outptr_) PVOID* pvBaseAddress); +_Check_return_ +_Success_(return!=NULL) +__drv_allocatesMem(Mem) +_Post_writable_byte_size_(cjSize) PVOID APIENTRY EngAllocSectionMem( - OUT PVOID *ppvSection, - IN ULONG fl, - IN SIZE_T cjSize, - IN ULONG ulTag); + _Outptr_ PVOID *ppvSection, + _In_ ULONG fl, + _In_ SIZE_T cjSize, + _In_ ULONG ulTag); BOOL APIENTRY EngFreeSectionMem( - IN PVOID pvSection OPTIONAL, - IN PVOID pvMappedBase OPTIONAL); + _In_opt_ PVOID pvSection, + _In_opt_ PVOID pvMappedBase); +_Check_return_ PFILEVIEW NTAPI EngLoadModuleEx( - LPWSTR pwsz, - ULONG cjSizeOfModule, - FLONG fl); + _In_z_ LPWSTR pwsz, + _In_ ULONG cjSizeOfModule, + _In_ FLONG fl);