...
From 3436789d4246c3079fdfcc2558a76eddfbbe8ea5 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath <nathbap...@gmail.com> Date: Fri, 31 May 2019 21:55:39 +0530 Subject: [PATCH] include/sal: Update sal definitions
Signed-off-by: Biswapriyo Nath <nathbap...@gmail.com> --- mingw-w64-headers/include/sal.h | 147 +++++++++++++++++++------------- 1 file changed, 87 insertions(+), 60 deletions(-) diff --git a/mingw-w64-headers/include/sal.h b/mingw-w64-headers/include/sal.h index d915adeb..6915a81b 100644 --- a/mingw-w64-headers/include/sal.h +++ b/mingw-w64-headers/include/sal.h @@ -17,94 +17,105 @@ #define __checkReturn __inner_checkReturn -/* Pointer parameters */ +/* Input parameters */ #define _In_ -#define _Out_ -#define _Inout_ +#define _In_opt_ #define _In_z_ -#define _Inout_z_ +#define _In_opt_z_ #define _In_reads_(s) +#define _In_reads_opt_(s) #define _In_reads_bytes_(s) +#define _In_reads_bytes_opt_(s) #define _In_reads_z_(s) +#define _In_reads_opt_z_(s) #define _In_reads_or_z_(s) +#define _In_reads_or_z_opt_(s) +#define _In_reads_to_ptr_(p) +#define _In_reads_to_ptr_opt_(p) +#define _In_reads_to_ptr_z_(p) +#define _In_reads_to_ptr_opt_z_(p) + +/* Output parameters */ +#define _Out_ +#define _Out_opt_ #define _Out_writes_(s) +#define _Out_writes_opt_(s) #define _Out_writes_bytes_(s) +#define _Out_writes_bytes_opt_(s) #define _Out_writes_z_(s) -#define _Inout_updates_(s) -#define _Inout_updates_bytes_(s) -#define _Inout_updates_z_(s) -#define _Out_writes_to_(s,c) -#define _Out_writes_bytes_to_(s, c) +#define _Out_writes_opt_z_(s) +#define _Out_writes_to_(s, c) +#define _Out_writes_to_opt_(s, c) #define _Out_writes_all_(s) +#define _Out_writes_all_opt_(s) +#define _Out_writes_bytes_to_(s, c) +#define _Out_writes_bytes_to_opt_(s, c) #define _Out_writes_bytes_all_(s) -#define _Inout_updates_to_(s, c) -#define _Inout_updates_bytes_to_(s, c) -#define _Inout_updates_all_(s) -#define _Inout_updates_bytes_all_(s) -#define _In_reads_to_ptr_(p) -#define _In_reads_to_ptr_z_(p) +#define _Out_writes_bytes_all_opt_(s) #define _Out_writes_to_ptr_(p) -#define _Out_writes_to_ptr_z(p) +#define _Out_writes_to_ptr_opt_(p) +#define _Out_writes_to_ptr_z_(p) +#define _Out_writes_to_ptr_opt_z_(p) -/* Optional pointer parameters */ -#define __in_opt -#define __out_opt -#define __inout_opt -#define _In_opt_ -#define _Out_opt_ +/* Inout parameters */ +#define _Inout_ #define _Inout_opt_ -#define _In_opt_z_ +#define _Inout_z_ #define _Inout_opt_z_ -#define _In_reads_opt_(s) -#define _In_reads_bytes_opt_(s) -#define _In_reads_opt_z_(s) - -#define _Out_writes_opt_(s) -#define _Out_writes_opt_z_(s) +#define _Inout_updates_(s) #define _Inout_updates_opt_(s) -#define _Inout_updates_bytes_opt_(s) +#define _Inout_updates_z_(s) #define _Inout_updates_opt_z_(s) -#define _Out_writes_to_opt_(s, c) -#define _Out_writes_bytes_to_opt_(s, c) -#define _Out_writes_all_opt_(s) -#define _Out_writes_bytes_all_opt_(s) - +#define _Inout_updates_to_(s, c) #define _Inout_updates_to_opt_(s, c) -#define _Inout_updates_bytes_to_opt_(s, c) +#define _Inout_updates_all_(s) #define _Inout_updates_all_opt_(s) +#define _Inout_updates_bytes_(s) +#define _Inout_updates_bytes_opt_(s) +#define _Inout_updates_bytes_to_(s, c) +#define _Inout_updates_bytes_to_opt_(s, c) +#define _Inout_updates_bytes_all_(s) #define _Inout_updates_bytes_all_opt_(s) -#define _In_reads_to_ptr_opt_(p) -#define _In_reads_to_ptr_opt_z_(p) -#define _Out_writes_to_ptr_opt_(p) -#define _Out_writes_to_ptr_opt_z_(p) -/* Output pointer parameters */ +/* Pointer to pointer parameters */ #define _Outptr_ -#define _Outptr_opt_ #define _Outptr_result_maybenull_ +#define _Outptr_opt_ #define _Outptr_opt_result_maybenull_ #define _Outptr_result_z_ #define _Outptr_opt_result_z_ #define _Outptr_result_maybenull_z_ #define _Outptr_opt_result_maybenull_z_ +#define _Outptr_result_nullonfailure_ +#define _Outptr_opt_result_nullonfailure_ #define _COM_Outptr_ -#define _COM_Outptr_opt_ #define _COM_Outptr_result_maybenull_ +#define _COM_Outptr_opt_ #define _COM_Outptr_opt_result_maybenull_ #define _Outptr_result_buffer_(s) -#define _Outptr_result_bytebuffer_(s) #define _Outptr_opt_result_buffer_(s) -#define _Outptr_opt_result_bytebuffer_(s) #define _Outptr_result_buffer_to_(s, c) -#define _Outptr_result_bytebuffer_to_(s, c) -#define _Outptr_result_bytebuffer_maybenull_(s) #define _Outptr_opt_result_buffer_to_(s, c) +#define _Outptr_result_buffer_all_(s) +#define _Outptr_opt_result_buffer_all_(s) +#define _Outptr_result_buffer_maybenull_(s) +#define _Outptr_opt_result_buffer_maybenull_(s) +#define _Outptr_result_buffer_to_maybenull_(s, c) +#define _Outptr_opt_result_buffer_to_maybenull_(s, c) +#define _Outptr_result_buffer_all_maybenull_(s) +#define _Outptr_opt_result_buffer_all_maybenull_(s) +#define _Outptr_result_bytebuffer_(s) +#define _Outptr_opt_result_bytebuffer_(s) +#define _Outptr_result_bytebuffer_to_(s, c) #define _Outptr_opt_result_bytebuffer_to_(s, c) -#define _Result_nullonfailure_ -#define _Result_zeroonfailure_ -#define _Outptr_result_nullonfailure_ -#define _Outptr_opt_result_nullonfailure_ -#define _Outref_result_nullonfailure_ +#define _Outptr_result_bytebuffer_all_(s) +#define _Outptr_opt_result_bytebuffer_all_(s) +#define _Outptr_result_bytebuffer_maybenull_(s) +#define _Outptr_opt_result_bytebuffer_maybenull_(s) +#define _Outptr_result_bytebuffer_to_maybenull_(s, c) +#define _Outptr_opt_result_bytebuffer_to_maybenull_(s, c) +#define _Outptr_result_bytebuffer_all_maybenull_(s) +#define _Outptr_opt_result_bytebuffer_all_maybenull_(s) /* Output reference parameters */ #define _Outref_ @@ -121,23 +132,39 @@ #define _Outref_result_bytebuffer_to_maybenull_(s, c) #define _Outref_result_buffer_all_maybenull_(s) #define _Outref_result_bytebuffer_all_maybenull_(s) +#define _Outref_result_nullonfailure_ +#define _Result_nullonfailure_ +#define _Result_zeroonfailure_ /* Return values */ #define _Ret_z_ +#define _Ret_maybenull_z_ +#define _Ret_notnull_ +#define _Ret_maybenull_ +#define _Ret_null_ +#define _Ret_valid_ #define _Ret_writes_(s) -#define _Ret_writes_bytes_(s) #define _Ret_writes_z_(s) -#define _Ret_writes_bytes_to_(s, c) +#define _Ret_writes_bytes_(s) #define _Ret_writes_maybenull_(s) -#define _Ret_writes_to_maybenull_(s, c) #define _Ret_writes_maybenull_z_(s) -#define _Ret_maybenull_ -#define _Ret_maybenull_z_ -#define _Ret_null_ -#define _Ret_notnull_ -#define _Ret_writes_bytes_to_(s, c) #define _Ret_writes_bytes_maybenull_(s) +#define _Ret_writes_to_(s, c) +#define _Ret_writes_bytes_to_(s, c) +#define _Ret_writes_to_maybenull_(s, c) #define _Ret_writes_bytes_to_maybenull_(s, c) +#define _Points_to_data_ +#define _Literal_ +#define _Notliteral_ +#define _Deref_ret_range_(l,u) +#define _Unchanged_(e) +#define _Pre_satisfies_(c) +#define _Post_satisfies_(c) + +/* Optional pointer parameters */ +#define __in_opt +#define __out_opt +#define __inout_opt /* Other common annotations */ #define _In_range_(low, hi) -- 2.21.0
_______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
