From 36588028142793dbe43a6421db3d9fb64412b32c Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Mon, 17 Dec 2018 08:30:13 +0300 Subject: [PATCH] include: Add compatibility macros for Visual Studio 10.0. Signed-off-by: Dmitry Timoshkov Signed-off-by: Alexandre Julliard --- include/sal.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/include/sal.h b/include/sal.h index 29746c3a038..35f64934f69 100644 --- a/include/sal.h +++ b/include/sal.h @@ -25,12 +25,15 @@ #define _At_buffer_(a, b, c, d) #define _Check_return_ +#define _Check_return_opt_ #define _Deref_out_ +#define _Deref_out_z_ #define _Deref_out_opt_ #define _Deref_out_opt_z_ #define _Deref_post_opt_cap_(count) #define _Deref_post_opt_valid_ +#define _Deref_post_opt_z_cap_(count) #define _Deref_post_valid_ #define _Deref_post_z_ #define _Deref_prepost_opt_z_ @@ -40,10 +43,25 @@ #define _In_ #define _In_bytecount_(count) +#define _In_bytecount_c_(count) +#define _In_bytecount_x_(count) #define _In_count_(count) +#define _In_count_c_(count) +#define _In_count_x_(count) #define _In_opt_ +#define _In_opt_bytecount_(count) +#define _In_opt_bytecount_c_(count) +#define _In_opt_bytecount_x_(count) #define _In_opt_count_(count) +#define _In_opt_count_c_(count) +#define _In_opt_count_x_(count) +#define _In_opt_ptrdiff_count_(count) #define _In_opt_z_ +#define _In_opt_z_count_(count) +#define _In_opt_z_count_c_(count) +#define _In_opt_z_bytecount_(count) +#define _In_opt_z_bytecount_c_(count) +#define _In_ptrdiff_count_(count) #define _In_range_(min, max) #define _In_reads_(count) #define _In_reads_bytes_(count) @@ -53,11 +71,18 @@ #define _In_reads_or_z_opt_(count) #define _In_reads_z_(count) #define _In_z_ +#define _In_z_bytecount_(count) +#define _In_z_bytecount_c_(count) +#define _In_z_count_(count) +#define _In_z_count_c_(count) #define _Inout_ +#define _Inout_bytecap_x_(count) #define _Inout_cap_(count) #define _Inout_opt_ +#define _Inout_opt_cap_c_(count) #define _Inout_opt_z_ +#define _Inout_opt_z_bytecap_(count) #define _Inout_updates_(count) #define _Inout_updates_bytes_(count) #define _Inout_updates_opt_(count) @@ -72,13 +97,37 @@ #define _Out_ #define _Out_bytecap_(count) +#define _Out_bytecap_c_(count) +#define _Out_bytecap_x_(count) #define _Out_bytecapcount_(count) #define _Out_bytecap_post_bytecount_(count1, count2) #define _Out_cap_(count) +#define _Out_cap_c_(count) +#define _Out_cap_m_(count1, count2) +#define _Out_cap_x_(count) #define _Out_cap_post_count_(count1, count2) #define _Out_opt_ +#define _Out_opt_bytecap_(count) +#define _Out_opt_bytecap_c_(count) +#define _Out_opt_bytecap_x_(count) +#define _Out_opt_bytecap_post_bytecount_(count1, count2) +#define _Out_opt_bytecapcount_(count) +#define _Out_opt_cap_(count) +#define _Out_opt_cap_m_(count1, count2) +#define _Out_opt_cap_c_(count) +#define _Out_opt_cap_x_(count) +#define _Out_opt_cap_post_count_(count1, count2) +#define _Out_opt_ptrdiff_cap_(count) +#define _Out_opt_z_bytecap_(count) +#define _Out_opt_z_bytecap_c_(count) +#define _Out_opt_z_bytecap_x_(count) +#define _Out_opt_z_bytecap_post_bytecount_(count1, count2) #define _Out_opt_z_cap_(count) +#define _Out_opt_z_cap_c_(count) +#define _Out_opt_z_cap_m_(count1, count2) +#define _Out_opt_z_cap_x_(count) #define _Out_opt_z_cap_post_count_(count1, count2) +#define _Out_ptrdiff_cap_(count) #define _Out_writes_(count) #define _Out_writes_bytes_(count) #define _Out_writes_bytes_all_(count) @@ -91,8 +140,14 @@ #define _Out_writes_to_(count1, count2) #define _Out_writes_to_opt_(count1, count2) #define _Out_writes_z_(count) +#define _Out_z_bytecap_(count) +#define _Out_z_bytecap_c_(count) +#define _Out_z_bytecap_x_(count) +#define _Out_z_bytecap_post_bytecount_(count1, count2) #define _Out_z_cap_(count) #define _Out_z_cap_c_(count) +#define _Out_z_cap_m_(count1, count2) +#define _Out_z_cap_x_(count) #define _Out_z_cap_post_count_(count1, count2) #define _Outptr_result_buffer_(count) @@ -103,19 +158,24 @@ #define _Param_(p) +#define _Post_count_(count) +#define _Post_count_c_(count) #define _Post_equal_to_(exp) #define _Post_invalid_ #define _Post_maybez_ +#define _Post_ptr_invalid_ #define _Post_readable_size_(count) #define _Post_satisfies_(exp) #define _Post_writable_byte_size_(count) #define _Post_z_ +#define _Pre_cap_for_(count) #define _Pre_maybenull_ #define _Pre_notnull_ #define _Pre_opt_z_ #define _Pre_writable_size_(count) #define _Pre_z_ +#define _Prepost_z_ #define _Printf_format_string_ #define _Printf_format_string_params_(count) @@ -124,6 +184,8 @@ #define _Ret_maybenull_z_ #define _Ret_notnull_ #define _Ret_opt_ +#define _Ret_opt_bytecap_(count) +#define _Ret_opt_bytecap_x_(count) #define _Ret_opt_z_cap_(count) #define _Ret_writes_bytes_maybenull_(count) #define _Ret_z_