[ros-diffs] [tkreuzer] 66655: [NDK] Update no_sal2.h

Author: tkreuzer
Date: Tue Mar 10 09:10:14 2015
New Revision: 66655

URL: http://svn.reactos.org/svn/reactos?rev=66655&view=rev
Log:
[NDK]
Update no_sal2.h

Modified:
    trunk/reactos/include/ndk/no_sal2.h

Modified: trunk/reactos/include/ndk/no_sal2.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/no_sal2.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/no_sal2.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/no_sal2.h	[iso-8859-1] Tue Mar 10 09:10:14 2015
@@ -3,523 +3,701 @@
 
 #define _NO_SAL_2_H_
 
-#undef _Acquires_exclusive_lock_
-#undef _Acquires_lock_
-#undef _Acquires_nonreentrant_lock_
-#undef _Acquires_shared_lock_
-#undef _Always_
-#undef _Analysis_assume_
-#undef _Analysis_assume_lock_acquired_
-#undef _Analysis_assume_lock_held_
-#undef _Analysis_assume_lock_not_held_
-#undef _Analysis_assume_lock_released_
-#undef _Analysis_assume_same_lock_
-#undef _Analysis_mode_
-#undef _Analysis_noreturn_
-#undef _Analysis_suppress_lock_checking_
-#undef _At_
-#undef _At_buffer_
-#undef _Benign_race_begin_
-#undef _Benign_race_end_
-#undef _Check_return_
-#undef _COM_Outptr_
-#undef _COM_Outptr_opt_
-#undef _COM_Outptr_opt_result_maybenull_
-#undef _COM_Outptr_result_maybenull_
-#undef _Const_
-#undef _Create_lock_level_
-#undef _Deref_
-#undef _Deref_in_range_
-#undef _Deref_inout_range_
-#undef _Deref_out_range_
-#undef _Enum_is_bitflag_
-#undef _Field_range_
-#undef _Field_size_
-#undef _Field_size_bytes_
-#undef _Field_size_bytes_full_
-#undef _Field_size_bytes_full_opt_
-#undef _Field_size_bytes_opt_
-#undef _Field_size_bytes_part_
-#undef _Field_size_bytes_part_opt_
-#undef _Field_size_full_
-#undef _Field_size_full_opt_
-#undef _Field_size_opt_
-#undef _Field_size_part_
-#undef _Field_size_part_opt_
-#undef _Function_class_
-#undef _Function_ignore_lock_checking_
-#undef _Group_
-#undef _Guarded_by_
-#undef _Has_lock_kind_
-#undef _Has_lock_level_
-#undef _In_
-#undef _In_defensive_
-#undef _In_opt_
-#undef _In_opt_z_
-#undef _In_range_
-#undef _In_reads_
-#undef _In_reads_bytes_
-#undef _In_reads_bytes_opt_
-#undef _In_reads_opt_
-#undef _In_reads_opt_z_
-#undef _In_reads_or_z_
-#undef _In_reads_to_ptr_
-#undef _In_reads_to_ptr_opt_
-#undef _In_reads_to_ptr_opt_z_
-#undef _In_reads_to_ptr_z_
-#undef _In_reads_z_
-#undef _In_z_
-#undef _Inout_
-#undef _Inout_defensive_
-#undef _Inout_opt_
-#undef _Inout_opt_z_
-#undef _Inout_updates_
-#undef _Inout_updates_all_
-#undef _Inout_updates_all_opt_
-#undef _Inout_updates_bytes_
-#undef _Inout_updates_bytes_all_
-#undef _Inout_updates_bytes_all_opt_
-#undef _Inout_updates_bytes_opt_
-#undef _Inout_updates_bytes_to_
-#undef _Inout_updates_bytes_to_opt_
-#undef _Inout_updates_opt_
-#undef _Inout_updates_opt_z_
-#undef _Inout_updates_to_
-#undef _Inout_updates_to_opt_
-#undef _Inout_updates_z_
-#undef _Inout_z_
-#undef _Interlocked_
-#undef _Interlocked_operand_
-#undef _IRQL_always_function_max_
-#undef _IRQL_always_function_min_
-#undef _IRQL_is_cancel_
-#undef _IRQL_raises_
-#undef _IRQL_requires_
-#undef _IRQL_requires_max_
-#undef _IRQL_requires_min_
-#undef _IRQL_requires_same_
-#undef _IRQL_restores_
-#undef _IRQL_restores_global_
-#undef _IRQL_saves_
-#undef _IRQL_saves_global_
-#undef _IRQL_uses_cancel_
-#undef _Kernel_acquires_resource_
-#undef _Kernel_clear_do_init_
-#undef _Kernel_float_restored_
-#undef _Kernel_float_saved_
-#undef _Kernel_float_used_
-#undef _Kernel_IoGetDmaAdapter_
-#undef _Kernel_releases_resource_
-#undef _Kernel_requires_resource_held_
-#undef _Kernel_requires_resource_not_held_
-#undef _Literal_
-#undef _Lock_level_order_
-#undef _Maybe_raises_SEH_exception_
-#undef _Maybenull_
-#undef _Must_inspect_result_
-#undef _No_competing_thread_
-#undef _No_competing_thread_begin_
-#undef _No_competing_thread_end_
-#undef _Notliteral_
-#undef _Notnull_
-#undef _Notvalid_
-#undef _Null_
-#undef _Null_terminated_
-#undef _NullNull_terminated_
-#undef _On_failure_
-#undef _Out_
-#undef _Out_defensive_
-#undef _Out_opt_
-#undef _Out_range_
-#undef _Out_writes_
-#undef _Out_writes_all_
-#undef _Out_writes_all_opt_
-#undef _Out_writes_bytes_
-#undef _Out_writes_bytes_all_
-#undef _Out_writes_bytes_all_opt_
-#undef _Out_writes_bytes_opt_
-#undef _Out_writes_bytes_to_
-#undef _Out_writes_bytes_to_opt_
-#undef _Out_writes_opt_
-#undef _Out_writes_opt_z_
-#undef _Out_writes_to_
-#undef _Out_writes_to_opt_
-#undef _Out_writes_to_ptr_
-#undef _Out_writes_to_ptr_opt_
-#undef _Out_writes_to_ptr_opt_z_
-#undef _Out_writes_to_ptr_z_
-#undef _Out_writes_z_
-#undef _Outptr_
-#undef _Outptr_opt_
-#undef _Outptr_opt_result_buffer_
-#undef _Outptr_opt_result_buffer_to_
-#undef _Outptr_opt_result_bytebuffer_
-#undef _Outptr_opt_result_bytebuffer_to_
-#undef _Outptr_opt_result_maybenull_
-#undef _Outptr_opt_result_maybenull_z_
-#undef _Outptr_opt_result_nullonfailure_
-#undef _Outptr_opt_result_z_
-#undef _Outptr_result_buffer_
-#undef _Outptr_result_buffer_to_
-#undef _Outptr_result_bytebuffer_
-#undef _Outptr_result_bytebuffer_to_
-#undef _Outptr_result_maybenull_
-#undef _Outptr_result_maybenull_z_
-#undef _Outptr_result_nullonfailure_
-#undef _Outptr_result_z_
-#undef _Outref_
-#undef _Outref_result_buffer_
-#undef _Outref_result_buffer_all_
-#undef _Outref_result_buffer_all_maybenull_
-#undef _Outref_result_buffer_maybenull_
-#undef _Outref_result_buffer_to_
-#undef _Outref_result_buffer_to_maybenull_
-#undef _Outref_result_bytebuffer_
-#undef _Outref_result_bytebuffer_all_
-#undef _Outref_result_bytebuffer_all_maybenull_
-#undef _Outref_result_bytebuffer_maybenull_
-#undef _Outref_result_bytebuffer_to_
-#undef _Outref_result_bytebuffer_to_maybenull_
-#undef _Outref_result_maybenull_
-#undef _Outref_result_nullonfailure_
-#undef _Points_to_data_
-#undef _Post_
-#undef _Post_defensive_
-#undef _Post_equal_to_
-#undef _Post_invalid_
-#undef _Post_ptr_invalid_
-#undef _Post_readable_byte_size_
-#undef _Post_readable_size_
-#undef _Post_same_lock_
-#undef _Post_satisfies_
-#undef _Post_valid_
-#undef _Post_writable_byte_size_
-#undef _Post_writable_size_
-#undef _Post_z_
-#undef _Pre_
-#undef _Pre_defensive_
-#undef _Pre_equal_to_
-#undef _Pre_maybenull_
-#undef _Pre_notnull_
-#undef _Pre_null_
-#undef _Pre_opt_valid_
-#undef _Pre_readable_byte_size_
-#undef _Pre_readable_size_
-#undef _Pre_satisfies_
-#undef _Pre_unknown_
-#undef _Pre_valid_
-#undef _Pre_writable_byte_size_
-#undef _Pre_writable_size_
-#undef _Pre_z_
-#undef _Prepost_z_
-#undef _Printf_format_string_
-#undef _Printf_format_string_params_
-#undef _Raises_SEH_exception_
-#undef _Readable_bytes_
-#undef _Readable_elements_
-#undef _Releases_exclusive_lock_
-#undef _Releases_lock_
-#undef _Releases_nonreentrant_lock_
-#undef _Releases_shared_lock_
-#undef _Requires_exclusive_lock_held_
-#undef _Requires_lock_held_
-#undef _Requires_lock_not_held_
-#undef _Requires_no_locks_held_
-#undef _Requires_shared_lock_held_
-#undef _Reserved_
-#undef _Result_nullonfailure_
-#undef _Result_zeroonfailure_
-#undef _Ret_
-#undef _Ret_maybenull_
-#undef _Ret_maybenull_z_
-#undef _Ret_notnull_
-#undef _Ret_null_
-#undef _Ret_range_
-#undef _Ret_valid_
-#undef _Ret_writes_
-#undef _Ret_writes_bytes_
-#undef _Ret_writes_bytes_maybenull_
-#undef _Ret_writes_bytes_to_
-#undef _Ret_writes_bytes_to_maybenull_
-#undef _Ret_writes_maybenull_
-#undef _Ret_writes_maybenull_z_
-#undef _Ret_writes_to_
-#undef _Ret_writes_to_maybenull_
-#undef _Ret_writes_to_ptr_
-#undef _Ret_writes_to_ptr_z_
-#undef _Ret_writes_z_
-#undef _Ret_z_
-#undef _Return_type_success_
-#undef _Scanf_format_string_
-#undef _Scanf_format_string_params_
-#undef _Scanf_s_format_string_
-#undef _Scanf_s_format_string_params_
-#undef _Strict_type_match_
-#undef _Struct_size_bytes_
-#undef _Success_
-#undef _Use_decl_annotations_
-#undef _Valid_
-#undef _When_
-#undef _Writable_bytes_
-#undef _Writable_elements_
-#undef _Write_guarded_by_
-#define _Acquires_exclusive_lock_(e)
-#define _Acquires_lock_(e)
-#define _Acquires_nonreentrant_lock_(e)
-#define _Acquires_shared_lock_(e)
-#define _Always_(a)
-#define _Analysis_assume_
-#define _Analysis_assume_lock_acquired_(e)
-#define _Analysis_assume_lock_held_(e)
-#define _Analysis_assume_lock_not_held_(e)
-#define _Analysis_assume_lock_released_(e)
-#define _Analysis_assume_same_lock_(e)
-#define _Analysis_mode_(m)
+/* From sal.h */
+#define _Always_(annos)
 #define _Analysis_noreturn_
-#define _Analysis_suppress_lock_checking_(e)
-#define _At_(t,a)
-#define _At_buffer_(t,i,c,a)
-#define _Benign_race_begin_
-#define _Benign_race_end_
+#define _Analysis_assume_(expr) __analysis_assume(expr)
+#define _At_(target, annos)
+#define _At_buffer_(target, iter, bound, annos)
 #define _Check_return_
 #define _COM_Outptr_
 #define _COM_Outptr_opt_
 #define _COM_Outptr_opt_result_maybenull_
 #define _COM_Outptr_result_maybenull_
 #define _Const_
-#define _Create_lock_level_(n)
-#define _Deref_
-#define _Deref_in_range_(l,h)
-#define _Deref_inout_range_(l,h)
-#define _Deref_out_range_(l,h)
-#define _Enum_is_bitflag_
-#define _Field_range_(l,h)
-#define _Field_size_(s)
-#define _Field_size_bytes_(s)
-#define _Field_size_bytes_full_(s)
-#define _Field_size_bytes_full_opt_(s)
-#define _Field_size_bytes_opt_(s)
-#define _Field_size_bytes_part_(s,c)
-#define _Field_size_bytes_part_opt_(s,c)
-#define _Field_size_full_(s)
-#define _Field_size_full_opt_(s)
-#define _Field_size_opt_(s)
-#define _Field_size_part_(s,c)
-#define _Field_size_part_opt_(s,c)
-#define _Function_class_(n)
-#define _Function_ignore_lock_checking_(e)
-#define _Group_(a)
-#define _Guarded_by_(e)
-#define _Has_lock_kind_(n)
-#define _Has_lock_level_(n)
+#define _Deref_in_bound_
+#define _Deref_in_range_(lb,ub)
+#define _Deref_inout_bound_
+#define _Deref_inout_z_
+#define _Deref_inout_z_bytecap_c_(size)
+#define _Deref_inout_z_cap_c_(size)
+#define _Deref_opt_out_
+#define _Deref_opt_out_opt_
+#define _Deref_opt_out_opt_z_
+#define _Deref_opt_out_z_
+#define _Deref_out_
+#define _Deref_out_bound_
+#define _Deref_out_opt_
+#define _Deref_out_opt_z_
+#define _Deref_out_range_(lb,ub)
+#define _Deref_out_z_
+#define _Deref_out_z_bytecap_c_(size)
+#define _Deref_out_z_cap_c_(size)
+#define _Deref_post_bytecap_(size)
+#define _Deref_post_bytecap_c_(size)
+#define _Deref_post_bytecap_x_(size)
+#define _Deref_post_bytecount_(size)
+#define _Deref_post_bytecount_c_(size)
+#define _Deref_post_bytecount_x_(size)
+#define _Deref_post_cap_(size)
+#define _Deref_post_cap_c_(size)
+#define _Deref_post_cap_x_(size)
+#define _Deref_post_count_(size)
+#define _Deref_post_count_c_(size)
+#define _Deref_post_count_x_(size)
+#define _Deref_post_maybenull_
+#define _Deref_post_notnull_
+#define _Deref_post_null_
+#define _Deref_post_opt_bytecap_(size)
+#define _Deref_post_opt_bytecap_c_(size)
+#define _Deref_post_opt_bytecap_x_(size)
+#define _Deref_post_opt_bytecount_(size)
+#define _Deref_post_opt_bytecount_c_(size)
+#define _Deref_post_opt_bytecount_x_(size)
+#define _Deref_post_opt_cap_(size)
+#define _Deref_post_opt_cap_c_(size)
+#define _Deref_post_opt_cap_x_(size)
+#define _Deref_post_opt_count_(size)
+#define _Deref_post_opt_count_c_(size)
+#define _Deref_post_opt_count_x_(size)
+#define _Deref_post_opt_valid_
+#define _Deref_post_opt_valid_bytecap_(size)
+#define _Deref_post_opt_valid_bytecap_c_(size)
+#define _Deref_post_opt_valid_bytecap_x_(size)
+#define _Deref_post_opt_valid_cap_(size)
+#define _Deref_post_opt_valid_cap_c_(size)
+#define _Deref_post_opt_valid_cap_x_(size)
+#define _Deref_post_opt_z_
+#define _Deref_post_opt_z_bytecap_(size)
+#define _Deref_post_opt_z_bytecap_c_(size)
+#define _Deref_post_opt_z_bytecap_x_(size)
+#define _Deref_post_opt_z_cap_(size)
+#define _Deref_post_opt_z_cap_c_(size)
+#define _Deref_post_opt_z_cap_x_(size)
+#define _Deref_post_valid_
+#define _Deref_post_valid_bytecap_(size)
+#define _Deref_post_valid_bytecap_c_(size)
+#define _Deref_post_valid_bytecap_x_(size)
+#define _Deref_post_valid_cap_(size)
+#define _Deref_post_valid_cap_c_(size)
+#define _Deref_post_valid_cap_x_(size)
+#define _Deref_post_z_
+#define _Deref_post_z_bytecap_(size)
+#define _Deref_post_z_bytecap_c_(size)
+#define _Deref_post_z_bytecap_x_(size)
+#define _Deref_post_z_cap_(size)
+#define _Deref_post_z_cap_c_(size)
+#define _Deref_post_z_cap_x_(size)
+#define _Deref_pre_bytecap_(size)
+#define _Deref_pre_bytecap_c_(size)
+#define _Deref_pre_bytecap_x_(size)
+#define _Deref_pre_bytecount_(size)
+#define _Deref_pre_bytecount_c_(size)
+#define _Deref_pre_bytecount_x_(size)
+#define _Deref_pre_cap_(size)
+#define _Deref_pre_cap_c_(size)
+#define _Deref_pre_cap_x_(size)
+#define _Deref_pre_count_(size)
+#define _Deref_pre_count_c_(size)
+#define _Deref_pre_count_x_(size)
+#define _Deref_pre_invalid_
+#define _Deref_pre_maybenull_
+#define _Deref_pre_notnull_
+#define _Deref_pre_null_
+#define _Deref_pre_opt_bytecap_(size)
+#define _Deref_pre_opt_bytecap_c_(size)
+#define _Deref_pre_opt_bytecap_x_(size)
+#define _Deref_pre_opt_bytecount_(size)
+#define _Deref_pre_opt_bytecount_c_(size)
+#define _Deref_pre_opt_bytecount_x_(size)
+#define _Deref_pre_opt_cap_(size)
+#define _Deref_pre_opt_cap_c_(size)
+#define _Deref_pre_opt_cap_x_(size)
+#define _Deref_pre_opt_count_(size)
+#define _Deref_pre_opt_count_c_(size)
+#define _Deref_pre_opt_count_x_(size)
+#define _Deref_pre_opt_valid_
+#define _Deref_pre_opt_valid_bytecap_(size)
+#define _Deref_pre_opt_valid_bytecap_c_(size)
+#define _Deref_pre_opt_valid_bytecap_x_(size)
+#define _Deref_pre_opt_valid_cap_(size)
+#define _Deref_pre_opt_valid_cap_c_(size)
+#define _Deref_pre_opt_valid_cap_x_(size)
+#define _Deref_pre_opt_z_
+#define _Deref_pre_opt_z_bytecap_(size)
+#define _Deref_pre_opt_z_bytecap_c_(size)
+#define _Deref_pre_opt_z_bytecap_x_(size)
+#define _Deref_pre_opt_z_cap_(size)
+#define _Deref_pre_opt_z_cap_c_(size)
+#define _Deref_pre_opt_z_cap_x_(size)
+#define _Deref_pre_readonly_
+#define _Deref_pre_valid_
+#define _Deref_pre_valid_bytecap_(size)
+#define _Deref_pre_valid_bytecap_c_(size)
+#define _Deref_pre_valid_bytecap_x_(size)
+#define _Deref_pre_valid_cap_(size)
+#define _Deref_pre_valid_cap_c_(size)
+#define _Deref_pre_valid_cap_x_(size)
+#define _Deref_pre_writeonly_
+#define _Deref_pre_z_
+#define _Deref_pre_z_bytecap_(size)
+#define _Deref_pre_z_bytecap_c_(size)
+#define _Deref_pre_z_bytecap_x_(size)
+#define _Deref_pre_z_cap_(size)
+#define _Deref_pre_z_cap_c_(size)
+#define _Deref_pre_z_cap_x_(size)
+#define _Deref_prepost_bytecap_(size)
+#define _Deref_prepost_bytecap_x_(size)
+#define _Deref_prepost_bytecount_(size)
+#define _Deref_prepost_bytecount_x_(size)
+#define _Deref_prepost_cap_(size)
+#define _Deref_prepost_cap_x_(size)
+#define _Deref_prepost_count_(size)
+#define _Deref_prepost_count_x_(size)
+#define _Deref_prepost_opt_bytecap_(size)
+#define _Deref_prepost_opt_bytecap_x_(size)
+#define _Deref_prepost_opt_bytecount_(size)
+#define _Deref_prepost_opt_bytecount_x_(size)
+#define _Deref_prepost_opt_cap_(size)
+#define _Deref_prepost_opt_cap_x_(size)
+#define _Deref_prepost_opt_count_(size)
+#define _Deref_prepost_opt_count_x_(size)
+#define _Deref_prepost_opt_valid_
+#define _Deref_prepost_opt_valid_bytecap_(size)
+#define _Deref_prepost_opt_valid_bytecap_x_(size)
+#define _Deref_prepost_opt_valid_cap_(size)
+#define _Deref_prepost_opt_valid_cap_x_(size)
+#define _Deref_prepost_opt_z_
+#define _Deref_prepost_opt_z_bytecap_(size)
+#define _Deref_prepost_opt_z_cap_(size)
+#define _Deref_prepost_valid_
+#define _Deref_prepost_valid_bytecap_(size)
+#define _Deref_prepost_valid_bytecap_x_(size)
+#define _Deref_prepost_valid_cap_(size)
+#define _Deref_prepost_valid_cap_x_(size)
+#define _Deref_prepost_z_
+#define _Deref_prepost_z_bytecap_(size)
+#define _Deref_prepost_z_cap_(size)
+#define _Deref_ret_bound_
+#define _Deref_ret_opt_z_
+#define _Deref_ret_range_(lb,ub)
+#define _Deref_ret_z_
+#define _Deref2_pre_readonly_
+#define _Field_range_(min,max)
+#define _Field_size_(size)
+#define _Field_size_bytes_(size)
+#define _Field_size_bytes_full_(size)
+#define _Field_size_bytes_full_opt_(size)
+#define _Field_size_bytes_opt_(size)
+#define _Field_size_bytes_part_(size, count)
+#define _Field_size_bytes_part_opt_(size, count)
+#define _Field_size_full_(size)
+#define _Field_size_full_opt_(size)
+#define _Field_size_opt_(size)
+#define _Field_size_part_(size, count)
+#define _Field_size_part_opt_(size, count)
+#define _Field_z_
+#define _Function_class_(x)
+#define _Group_(annos)
 #define _In_
-#define _In_defensive_(a)
+#define _In_bound_
+#define _In_bytecount_(size)
+#define _In_bytecount_c_(size)
+#define _In_bytecount_x_(size)
+#define _In_count_(size)
+#define _In_count_c_(size)
+#define _In_count_x_(size)
+#define _In_defensive_(annotes)
 #define _In_opt_
+#define _In_opt_bytecount_(size)
+#define _In_opt_bytecount_c_(size)
+#define _In_opt_bytecount_x_(size)
+#define _In_opt_count_(size)
+#define _In_opt_count_c_(size)
+#define _In_opt_count_x_(size)
+#define _In_opt_ptrdiff_count_(size)
 #define _In_opt_z_
-#define _In_range_(l,h)
-#define _In_reads_(s)
-#define _In_reads_bytes_(s)
-#define _In_reads_bytes_opt_(s)
-#define _In_reads_opt_(s)
-#define _In_reads_opt_z_(s)
-#define _In_reads_or_z_(s)
-#define _In_reads_to_ptr_(p)
-#define _In_reads_to_ptr_opt_(p)
-#define _In_reads_to_ptr_opt_z_(p)
-#define _In_reads_to_ptr_z_(p)
-#define _In_reads_z_(s)
+#define _In_opt_z_bytecount_(size)
+#define _In_opt_z_bytecount_c_(size)
+#define _In_opt_z_count_(size)
+#define _In_opt_z_count_c_(size)
+#define _In_ptrdiff_count_(size)
+#define _In_range_(lb,ub)
+#define _In_reads_(size)
+#define _In_reads_bytes_(size)
+#define _In_reads_bytes_opt_(size)
+#define _In_reads_opt_(size)
+#define _In_reads_opt_z_(size)
+#define _In_reads_or_z_(size)
+#define _In_reads_to_ptr_(ptr)
+#define _In_reads_to_ptr_opt_(ptr)
+#define _In_reads_to_ptr_opt_z_(ptr)
+#define _In_reads_to_ptr_z_(ptr)
+#define _In_reads_z_(size)
 #define _In_z_
+#define _In_z_bytecount_(size)
+#define _In_z_bytecount_c_(size)
+#define _In_z_count_(size)
+#define _In_z_count_c_(size)
 #define _Inout_
-#define _Inout_defensive_(a)
+#define _Inout_bytecap_(size)
+#define _Inout_bytecap_c_(size)
+#define _Inout_bytecap_x_(size)
+#define _Inout_bytecount_(size)
+#define _Inout_bytecount_c_(size)
+#define _Inout_bytecount_x_(size)
+#define _Inout_cap_(size)
+#define _Inout_cap_c_(size)
+#define _Inout_cap_x_(size)
+#define _Inout_count_(size)
+#define _Inout_count_c_(size)
+#define _Inout_count_x_(size)
+#define _Inout_defensive_(annotes)
 #define _Inout_opt_
+#define _Inout_opt_bytecap_(size)
+#define _Inout_opt_bytecap_c_(size)
+#define _Inout_opt_bytecap_x_(size)
+#define _Inout_opt_bytecount_(size)
+#define _Inout_opt_bytecount_c_(size)
+#define _Inout_opt_bytecount_x_(size)
+#define _Inout_opt_cap_(size)
+#define _Inout_opt_cap_c_(size)
+#define _Inout_opt_cap_x_(size)
+#define _Inout_opt_count_(size)
+#define _Inout_opt_count_c_(size)
+#define _Inout_opt_count_x_(size)
+#define _Inout_opt_ptrdiff_count_(size)
 #define _Inout_opt_z_
-#define _Inout_updates_(s)
-#define _Inout_updates_all_(s)
-#define _Inout_updates_all_opt_(s)
-#define _Inout_updates_bytes_(s)
-#define _Inout_updates_bytes_all_(s)
-#define _Inout_updates_bytes_all_opt_(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_opt_(s)
-#define _Inout_updates_opt_z_(s)
-#define _Inout_updates_to_(s,c)
-#define _Inout_updates_to_opt_(s,c)
-#define _Inout_updates_z_(s)
+#define _Inout_opt_z_bytecap_(size)
+#define _Inout_opt_z_bytecap_c_(size)
+#define _Inout_opt_z_bytecap_x_(size)
+#define _Inout_opt_z_bytecount_(size)
+#define _Inout_opt_z_bytecount_c_(size)
+#define _Inout_opt_z_cap_(size)
+#define _Inout_opt_z_cap_c_(size)
+#define _Inout_opt_z_cap_x_(size)
+#define _Inout_opt_z_count_(size)
+#define _Inout_opt_z_count_c_(size)
+#define _Inout_ptrdiff_count_(size)
+#define _Inout_updates_(size)
+#define _Inout_updates_all_(size)
+#define _Inout_updates_all_opt_(size)
+#define _Inout_updates_bytes_(size)
+#define _Inout_updates_bytes_all_(size)
+#define _Inout_updates_bytes_all_opt_(size)
+#define _Inout_updates_bytes_opt_(size)
+#define _Inout_updates_bytes_to_(size,count)
+#define _Inout_updates_bytes_to_opt_(size,count)
+#define _Inout_updates_opt_(size)
+#define _Inout_updates_opt_z_(size)
+#define _Inout_updates_to_(size,count)
+#define _Inout_updates_to_opt_(size,count)
+#define _Inout_updates_z_(size)
 #define _Inout_z_
-#define _Interlocked_
+#define _Inout_z_bytecap_(size)
+#define _Inout_z_bytecap_c_(size)
+#define _Inout_z_bytecap_x_(size)
+#define _Inout_z_bytecount_(size)
+#define _Inout_z_bytecount_c_(size)
+#define _Inout_z_cap_(size)
+#define _Inout_z_cap_c_(size)
+#define _Inout_z_cap_x_(size)
+#define _Inout_z_count_(size)
+#define _Inout_z_count_c_(size)
 #define _Interlocked_operand_
-#define _IRQL_always_function_max_(i)
-#define _IRQL_always_function_min_(i)
-#define _IRQL_is_cancel_
-#define _IRQL_raises_(i)
-#define _IRQL_requires_(i)
-#define _IRQL_requires_max_(i)
-#define _IRQL_requires_min_(i)
-#define _IRQL_requires_same_
-#define _IRQL_restores_
-#define _IRQL_restores_global_(k,s)
-#define _IRQL_saves_
-#define _IRQL_saves_global_(k,s)
-#define _IRQL_uses_cancel_
-#define _Kernel_acquires_resource_(k)
-#define _Kernel_clear_do_init_(yn)
-#define _Kernel_float_restored_
-#define _Kernel_float_saved_
-#define _Kernel_float_used_
-#define _Kernel_IoGetDmaAdapter_
-#define _Kernel_releases_resource_(k)
-#define _Kernel_requires_resource_held_(k)
-#define _Kernel_requires_resource_not_held_(k)
 #define _Literal_
-#define _Lock_level_order_(n1,n2)
-#define _Maybe_raises_SEH_exception_
 #define _Maybenull_
+#define _Maybevalid_
+#define _Maybe_raises_SEH_exception
 #define _Must_inspect_result_
-#define _No_competing_thread_
-#define _No_competing_thread_begin_
-#define _No_competing_thread_end_
 #define _Notliteral_
 #define _Notnull_
+#define _Notref_
 #define _Notvalid_
 #define _Null_
 #define _Null_terminated_
 #define _NullNull_terminated_
-#define _On_failure_(a)
+#define _On_failure_(annos)
 #define _Out_
-#define _Out_defensive_(a)
+#define _Out_bound_
+#define _Out_bytecap_(size)
+#define _Out_bytecap_c_(size)
+#define _Out_bytecap_post_bytecount_(cap,count)
+#define _Out_bytecap_x_(size)
+#define _Out_bytecapcount_(capcount)
+#define _Out_bytecapcount_x_(capcount)
+#define _Out_cap_(size)
+#define _Out_cap_c_(size)
+#define _Out_cap_m_(mult,size)
+#define _Out_cap_post_count_(cap,count)
+#define _Out_cap_x_(size)
+#define _Out_capcount_(capcount)
+#define _Out_capcount_x_(capcount)
+#define _Out_defensive_(annotes)
 #define _Out_opt_
-#define _Out_range_(l,h)
-#define _Out_writes_(s)
-#define _Out_writes_all_(s)
-#define _Out_writes_all_opt_(s)
-#define _Out_writes_bytes_(s)
-#define _Out_writes_bytes_all_(s)
-#define _Out_writes_bytes_all_opt_(s)
-#define _Out_writes_bytes_opt_(s)
-#define _Out_writes_bytes_to_(s,c)
-#define _Out_writes_bytes_to_opt_(s,c)
-#define _Out_writes_opt_(s)
-#define _Out_writes_opt_z_(s)
-#define _Out_writes_to_(s,c)
-#define _Out_writes_to_opt_(s,c)
-#define _Out_writes_to_ptr_(p)
-#define _Out_writes_to_ptr_opt_(p)
-#define _Out_writes_to_ptr_opt_z_(p)
-#define _Out_writes_to_ptr_z_(p)
-#define _Out_writes_z_(s)
+#define _Out_opt_bytecap_(size)
+#define _Out_opt_bytecap_c_(size)
+#define _Out_opt_bytecap_post_bytecount_(cap,count)
+#define _Out_opt_bytecap_x_(size)
+#define _Out_opt_bytecapcount_(capcount)
+#define _Out_opt_bytecapcount_x_(capcount)
+#define _Out_opt_cap_(size)
+#define _Out_opt_cap_c_(size)
+#define _Out_opt_cap_m_(mult,size)
+#define _Out_opt_cap_post_count_(cap,count)
+#define _Out_opt_cap_x_(size)
+#define _Out_opt_capcount_(capcount)
+#define _Out_opt_capcount_x_(capcount)
+#define _Out_opt_ptrdiff_cap_(size)
+#define _Out_opt_z_bytecap_(size)
+#define _Out_opt_z_bytecap_c_(size)
+#define _Out_opt_z_bytecap_post_bytecount_(cap,count)
+#define _Out_opt_z_bytecap_x_(size)
+#define _Out_opt_z_bytecapcount_(capcount)
+#define _Out_opt_z_cap_(size)
+#define _Out_opt_z_cap_c_(size)
+#define _Out_opt_z_cap_m_(mult,size)
+#define _Out_opt_z_cap_post_count_(cap,count)
+#define _Out_opt_z_cap_x_(size)
+#define _Out_opt_z_capcount_(capcount)
+#define _Out_ptrdiff_cap_(size)
+#define _Out_range_(lb,ub)
+#define _Out_writes_(size)
+#define _Out_writes_all_(size)
+#define _Out_writes_all_opt_(size)
+#define _Out_writes_bytes_(size)
+#define _Out_writes_bytes_all_(size)
+#define _Out_writes_bytes_all_opt_(size)
+#define _Out_writes_bytes_opt_(size)
+#define _Out_writes_bytes_to_(size,count)
+#define _Out_writes_bytes_to_opt_(size,count)
+#define _Out_writes_opt_(size)
+#define _Out_writes_opt_z_(size)
+#define _Out_writes_to_(size,count)
+#define _Out_writes_to_opt_(size,count)
+#define _Out_writes_to_ptr_(ptr)
+#define _Out_writes_to_ptr_opt_(ptr)
+#define _Out_writes_to_ptr_opt_z_(ptr)
+#define _Out_writes_to_ptr_z_(ptr)
+#define _Out_writes_z_(size)
+#define _Out_z_bytecap_(size)
+#define _Out_z_bytecap_c_(size)
+#define _Out_z_bytecap_post_bytecount_(cap,count)
+#define _Out_z_bytecap_x_(size)
+#define _Out_z_bytecapcount_(capcount)
+#define _Out_z_cap_(size)
+#define _Out_z_cap_c_(size)
+#define _Out_z_cap_m_(mult,size)
+#define _Out_z_cap_post_count_(cap,count)
+#define _Out_z_cap_x_(size)
+#define _Out_z_capcount_(capcount)
 #define _Outptr_
 #define _Outptr_opt_
-#define _Outptr_opt_result_buffer_(s)
-#define _Outptr_opt_result_buffer_to_(s,c)
-#define _Outptr_opt_result_bytebuffer_(s)
-#define _Outptr_opt_result_bytebuffer_to_(s,c)
+#define _Outptr_opt_result_buffer_(size)
+#define _Outptr_opt_result_buffer_all_(size)
+#define _Outptr_opt_result_buffer_all_maybenull_(size)
+#define _Outptr_opt_result_buffer_maybenull_(size)
+#define _Outptr_opt_result_buffer_to_(size, count)
+#define _Outptr_opt_result_buffer_to_maybenull_(size, count)
+#define _Outptr_opt_result_bytebuffer_(size)
+#define _Outptr_opt_result_bytebuffer_all_(size)
+#define _Outptr_opt_result_bytebuffer_all_maybenull_(size)
+#define _Outptr_opt_result_bytebuffer_maybenull_(size)
+#define _Outptr_opt_result_bytebuffer_to_(size, count)
+#define _Outptr_opt_result_bytebuffer_to_maybenull_(size, count)
 #define _Outptr_opt_result_maybenull_
 #define _Outptr_opt_result_maybenull_z_
 #define _Outptr_opt_result_nullonfailure_
 #define _Outptr_opt_result_z_
-#define _Outptr_result_buffer_(s)
-#define _Outptr_result_buffer_to_(s,c)
-#define _Outptr_result_bytebuffer_(s)
-#define _Outptr_result_bytebuffer_to_(s,c)
+#define _Outptr_result_buffer_(size)
+#define _Outptr_result_buffer_all_(size)
+#define _Outptr_result_buffer_all_maybenull_(size)
+#define _Outptr_result_buffer_maybenull_(size)
+#define _Outptr_result_buffer_to_(size, count)
+#define _Outptr_result_buffer_to_maybenull_(size, count)
+#define _Outptr_result_bytebuffer_(size)
+#define _Outptr_result_bytebuffer_all_(size)
+#define _Outptr_result_bytebuffer_all_maybenull_(size)
+#define _Outptr_result_bytebuffer_maybenull_(size)
+#define _Outptr_result_bytebuffer_to_(size, count)
+#define _Outptr_result_bytebuffer_to_maybenull_(size, count)
 #define _Outptr_result_maybenull_
 #define _Outptr_result_maybenull_z_
 #define _Outptr_result_nullonfailure_
 #define _Outptr_result_z_
 #define _Outref_
-#define _Outref_result_buffer_(s)
-#define _Outref_result_buffer_all_(s)
-#define _Outref_result_buffer_all_maybenull_(s)
-#define _Outref_result_buffer_maybenull_(s)
-#define _Outref_result_buffer_to_(s,c)
-#define _Outref_result_buffer_to_maybenull_(s,c)
-#define _Outref_result_bytebuffer_(s)
-#define _Outref_result_bytebuffer_all_(s)
-#define _Outref_result_bytebuffer_all_maybenull_(s)
-#define _Outref_result_bytebuffer_maybenull_(s)
-#define _Outref_result_bytebuffer_to_(s,c)
-#define _Outref_result_bytebuffer_to_maybenull_(s,c)
+#define _Outref_result_buffer_(size)
+#define _Outref_result_buffer_all_(size)
+#define _Outref_result_buffer_all_maybenull_(size)
+#define _Outref_result_buffer_maybenull_(size)
+#define _Outref_result_buffer_to_(size, count)
+#define _Outref_result_buffer_to_maybenull_(size, count)
+#define _Outref_result_bytebuffer_(size)
+#define _Outref_result_bytebuffer_all_(size)
+#define _Outref_result_bytebuffer_all_maybenull_(size)
+#define _Outref_result_bytebuffer_maybenull_(size)
+#define _Outref_result_bytebuffer_to_(size, count)
+#define _Outref_result_bytebuffer_to_maybenull_(size, count)
 #define _Outref_result_maybenull_
 #define _Outref_result_nullonfailure_
 #define _Points_to_data_
 #define _Post_
+#define _Post_bytecap_(size)
+#define _Post_bytecount_(size)
+#define _Post_bytecount_c_(size)
+#define _Post_bytecount_x_(size)
+#define _Post_cap_(size)
+#define _Post_count_(size)
+#define _Post_count_c_(size)
+#define _Post_count_x_(size)
 #define _Post_defensive_
-#define _Post_equal_to_(e)
-#define _Post_invalid_       _Post_ _Deref_ _Notvalid_
-#define _Post_ptr_invalid_   _Post_ _Notvalid_
-#define _Post_readable_byte_size_(s) _Post_ _Readable_bytes_(s) _Post_ _Valid_
-#define _Post_readable_size_(s)     _Post_ _Readable_elements_(s) _Post_ _Valid_
-#define _Post_same_lock_(e1,e2)
-#define _Post_satisfies_(e)
-#define _Post_valid_         _Post_ _Valid_
-#define _Post_writable_byte_size_(s) _Post_ _Writable_bytes_(s)
-#define _Post_writable_size_(s)     _Post_ _Writable_elements_(s)
-#define _Post_z_             _Post_ _Null_terminated_
+#define _Post_equal_to_(expr)
+#define _Post_invalid_
+#define _Post_maybenull_
+#define _Post_maybez_
+#define _Post_notnull_
+#define _Post_null_
+#define _Post_ptr_invalid_
+#define _Post_readable_byte_size_(size)
+#define _Post_readable_size_(size)
+#define _Post_satisfies_(cond)
+#define _Post_valid_
+#define _Post_writable_byte_size_(size)
+#define _Post_writable_size_(size)
+#define _Post_z_
+#define _Post_z_bytecount_(size)
+#define _Post_z_bytecount_c_(size)
+#define _Post_z_bytecount_x_(size)
+#define _Post_z_count_(size)
+#define _Post_z_count_c_(size)
+#define _Post_z_count_x_(size)
 #define _Pre_
+#define _Pre_bytecap_(size)
+#define _Pre_bytecap_c_(size)
+#define _Pre_bytecap_x_(size)
+#define _Pre_bytecount_(size)
+#define _Pre_bytecount_c_(size)
+#define _Pre_bytecount_x_(size)
+#define _Pre_cap_(size)
+#define _Pre_cap_c_(size)
+#define _Pre_cap_c_one_
+#define _Pre_cap_for_(param)
+#define _Pre_cap_m_(mult,size)
+#define _Pre_cap_x_(size)
+#define _Pre_count_(size)
+#define _Pre_count_c_(size)
+#define _Pre_count_x_(size)
 #define _Pre_defensive_
-#define _Pre_equal_to_(e)
-#define _Pre_maybenull_      _Pre_ _Maybenull_
-#define _Pre_notnull_        _Pre_ _Notnull_
-#define _Pre_null_           _Pre_ _Null_
-#define _Pre_opt_valid_      _Pre_maybenull_ _Pre_ _Valid_
-#define _Pre_readable_byte_size_(s) _Pre_ _Readable_bytes_(s) _Pre_ _Valid_
-#define _Pre_readable_size_(s)      _Pre_ _Readable_elements_(s) _Pre_ _Valid_
-#define _Pre_satisfies_(e)
+#define _Pre_equal_to_(expr)
+#define _Pre_invalid_
+#define _Pre_maybenull_
+#define _Pre_notnull_
+#define _Pre_null_
+#define _Pre_opt_bytecap_(size)
+#define _Pre_opt_bytecap_c_(size)
+#define _Pre_opt_bytecap_x_(size)
+#define _Pre_opt_bytecount_(size)
+#define _Pre_opt_bytecount_c_(size)
+#define _Pre_opt_bytecount_x_(size)
+#define _Pre_opt_cap_(size)
+#define _Pre_opt_cap_c_(size)
+#define _Pre_opt_cap_c_one_
+#define _Pre_opt_cap_for_(param)
+#define _Pre_opt_cap_m_(mult,size)
+#define _Pre_opt_cap_x_(size)
+#define _Pre_opt_count_(size)
+#define _Pre_opt_count_c_(size)
+#define _Pre_opt_count_x_(size)
+#define _Pre_opt_ptrdiff_cap_(ptr)
+#define _Pre_opt_ptrdiff_count_(ptr)
+#define _Pre_opt_valid_
+#define _Pre_opt_valid_bytecap_(size)
+#define _Pre_opt_valid_bytecap_c_(size)
+#define _Pre_opt_valid_bytecap_x_(size)
+#define _Pre_opt_valid_cap_(size)
+#define _Pre_opt_valid_cap_c_(size)
+#define _Pre_opt_valid_cap_x_(size)
+#define _Pre_opt_z_
+#define _Pre_opt_z_bytecap_(size)
+#define _Pre_opt_z_bytecap_c_(size)
+#define _Pre_opt_z_bytecap_x_(size)
+#define _Pre_opt_z_cap_(size)
+#define _Pre_opt_z_cap_c_(size)
+#define _Pre_opt_z_cap_x_(size)
+#define _Pre_ptrdiff_cap_(ptr)
+#define _Pre_ptrdiff_count_(ptr)
+#define _Pre_readable_byte_size_(size)
+#define _Pre_readable_size_(size)
+#define _Pre_readonly_
+#define _Pre_satisfies_(cond)
 #define _Pre_unknown_
-#define _Pre_valid_          _Pre_notnull_ _Pre_ _Valid_
-#define _Pre_writable_byte_size_(s) _Pre_ _Writable_bytes_(s)
-#define _Pre_writable_size_(s)      _Pre_ _Writable_elements_(s)
-#define _Pre_z_              _Pre_ _Null_terminated_
-#define _Prepost_z_          _Pre_z_ _Post_z_
+#define _Pre_valid_
+#define _Pre_valid_bytecap_(size)
+#define _Pre_valid_bytecap_c_(size)
+#define _Pre_valid_bytecap_x_(size)
+#define _Pre_valid_cap_(size)
+#define _Pre_valid_cap_c_(size)
+#define _Pre_valid_cap_x_(size)
+#define _Pre_writable_byte_size_(size)
+#define _Pre_writable_size_(size)
+#define _Pre_writeonly_
+#define _Pre_z_
+#define _Pre_z_bytecap_(size)
+#define _Pre_z_bytecap_c_(size)
+#define _Pre_z_bytecap_x_(size)
+#define _Pre_z_cap_(size)
+#define _Pre_z_cap_c_(size)
+#define _Pre_z_cap_x_(size)
+#define _Prepost_bytecount_(size)
+#define _Prepost_bytecount_c_(size)
+#define _Prepost_bytecount_x_(size)
+#define _Prepost_count_(size)
+#define _Prepost_count_c_(size)
+#define _Prepost_count_x_(size)
+#define _Prepost_opt_bytecount_(size)
+#define _Prepost_opt_bytecount_c_(size)
+#define _Prepost_opt_bytecount_x_(size)
+#define _Prepost_opt_count_(size)
+#define _Prepost_opt_count_c_(size)
+#define _Prepost_opt_count_x_(size)
+#define _Prepost_opt_valid_
+#define _Prepost_opt_z_
+#define _Prepost_valid_
+#define _Prepost_z_
 #define _Printf_format_string_
-#define _Printf_format_string_params_(x)
 #define _Raises_SEH_exception_
-#define _Readable_bytes_(s)
-#define _Readable_elements_(s)
-#define _Releases_exclusive_lock_(e)
-#define _Releases_lock_(e)
-#define _Releases_nonreentrant_lock_(e)
-#define _Releases_shared_lock_(e)
-#define _Requires_exclusive_lock_held_(e)
-#define _Requires_lock_held_(e)
-#define _Requires_lock_not_held_(e)
-#define _Requires_no_locks_held_
-#define _Requires_shared_lock_held_(e)
-#define _Reserved_           _Pre_equal_to_(0) _Pre_ _Null_
+#define _Maybe_raises_SEH_exception_
+#define _Readable_bytes_(size)
+#define _Readable_elements_(size)
+#define _Reserved_
 #define _Result_nullonfailure_
 #define _Result_zeroonfailure_
 #define _Ret_
+#define _Ret_bound_
+#define _Ret_bytecap_(size)
+#define _Ret_bytecap_c_(size)
+#define _Ret_bytecap_x_(size)
+#define _Ret_bytecount_(size)
+#define _Ret_bytecount_c_(size)
+#define _Ret_bytecount_x_(size)
+#define _Ret_cap_(size)
+#define _Ret_cap_c_(size)
+#define _Ret_cap_x_(size)
+#define _Ret_count_(size)
+#define _Ret_count_c_(size)
+#define _Ret_count_x_(size)
 #define _Ret_maybenull_
 #define _Ret_maybenull_z_
 #define _Ret_notnull_
 #define _Ret_null_
-#define _Ret_range_(l,h)
+#define _Ret_opt_
+#define _Ret_opt_bytecap_(size)
+#define _Ret_opt_bytecap_c_(size)
+#define _Ret_opt_bytecap_x_(size)
+#define _Ret_opt_bytecount_(size)
+#define _Ret_opt_bytecount_c_(size)
+#define _Ret_opt_bytecount_x_(size)
+#define _Ret_opt_cap_(size)
+#define _Ret_opt_cap_c_(size)
+#define _Ret_opt_cap_x_(size)
+#define _Ret_opt_count_(size)
+#define _Ret_opt_count_c_(size)
+#define _Ret_opt_count_x_(size)
+#define _Ret_opt_valid_
+#define _Ret_opt_z_
+#define _Ret_opt_z_bytecap_(size)
+#define _Ret_opt_z_bytecount_(size)
+#define _Ret_opt_z_cap_(size)
+#define _Ret_opt_z_count_(size)
+#define _Ret_range_(lb,ub)
 #define _Ret_valid_
-#define _Ret_writes_(s)
-#define _Ret_writes_bytes_(s)
-#define _Ret_writes_bytes_maybenull_(s)
-#define _Ret_writes_bytes_to_(s,c)
-#define _Ret_writes_bytes_to_maybenull_(s,c)
-#define _Ret_writes_maybenull_(s)
-#define _Ret_writes_maybenull_z_(s)
-#define _Ret_writes_to_(s,c)
-#define _Ret_writes_to_maybenull_(s,c)
-#define _Ret_writes_to_ptr_(p)
-#define _Ret_writes_to_ptr_z_(p)
-#define _Ret_writes_z_(s)
+#define _Ret_writes_(size)
+#define _Ret_writes_bytes_(size)
+#define _Ret_writes_bytes_maybenull_(size)
+#define _Ret_writes_bytes_to_(size,count)
+#define _Ret_writes_bytes_to_maybenull_(size,count)
+#define _Ret_writes_maybenull_(size)
+#define _Ret_writes_maybenull_z_(size)
+#define _Ret_writes_to_(size,count)
+#define _Ret_writes_to_maybenull_(size,count)
+#define _Ret_writes_z_(size)
 #define _Ret_z_
-#define _Return_type_success_(c)
+#define _Ret_z_bytecap_(size)
+#define _Ret_z_bytecount_(size)
+#define _Ret_z_cap_(size)
+#define _Ret_z_count_(size)
+#define _Return_type_success_(expr)
 #define _Scanf_format_string_
-#define _Scanf_format_string_params_(x)
 #define _Scanf_s_format_string_
-#define _Scanf_s_format_string_params_(x)
-#define _Strict_type_match_
-#define _Struct_size_bytes_(s)
-#define _Success_(c)
+#define _Struct_size_bytes_(size)
+#define _Success_(expr)
+#define _Unchanged_(e)
 #define _Use_decl_annotations_
 #define _Valid_
-#define _When_(c,a)
-#define _Writable_bytes_(s)
-#define _Writable_elements_(s)
-#define _Write_guarded_by_(e)
+#define _When_(expr, annos)
+#define _Writable_bytes_(size)
+#define _Writable_elements_(size)
+
+/* driverspecs.h */
+#define _Dispatch_type_(type)
+#define _IRQL_always_function_max_(irql)
+#define _IRQL_always_function_min_(irql)
+#define _IRQL_is_cancel_
+#define _IRQL_raises_(irql)
+#define _IRQL_requires_(irql)
+#define _IRQL_requires_max_(irql)
+#define _IRQL_requires_min_(irql)
+#define _IRQL_requires_same_
+#define _IRQL_restores_
+#define _IRQL_restores_global_(kind,param)
+#define _IRQL_saves_
+#define _IRQL_saves_global_(kind,param)
+#define _IRQL_uses_cancel_
+#define _Kernel_clear_do_init_(yesNo)
+#define _Kernel_float_restored_
+#define _Kernel_float_saved_
+#define _Kernel_float_used_
+#define _Kernel_IoGetDmaAdapter_
+#define _Kernel_releases_resource_(kind)
+#define _Kernel_requires_resource_held_(kind)
+#define _Kernel_requires_resource_not_held_(kind)
+#define _Kernel_acquires_resource_(kind)
+#define _Landmark_(name)
+
+/* concurrencysal.h */
+#define _Benign_race_begin_ __pragma(warning(push))
+#define _Benign_race_end_ __pragma(warning(pop))
+#define _No_competing_thread_begin_ __pragma(warning(push))
+#define _No_competing_thread_end_ __pragma(warning(pop))
+#define _Acquires_exclusive_lock_(lock)
+#define _Acquires_lock_(lock)
+#define _Acquires_nonreentrant_lock_(lock)
+#define _Acquires_shared_lock_(lock)
+#define _Analysis_assume_lock_acquired_(lock)
+#define _Analysis_assume_lock_released_(lock)
+#define _Analysis_assume_lock_held_(lock)
+#define _Analysis_assume_lock_not_held_(lock)
+#define _Analysis_assume_same_lock_(lock1, lock2)
+#define _Analysis_suppress_lock_checking_(lock)
+#define _Create_lock_level_(level)
+#define _Csalcat1_(x,y)
+#define _Csalcat2_(x,y)
+#define _Function_ignore_lock_checking_(lock)
+#define _Guarded_by_(lock)
+#define _Has_lock_kind_(kind)
+#define _Has_lock_level_(level)
+#define _Interlocked_
+#define _Internal_lock_level_order_(a,b)
+#define _Lock_level_order_(a,b)
+#define _No_competing_thread_
+#define _Post_same_lock_(lock1,lock2)
+#define _Releases_exclusive_lock_(lock)
+#define _Releases_lock_(lock)
+#define _Releases_nonreentrant_lock_(lock)
+#define _Releases_shared_lock_(lock)
+#define _Requires_exclusive_lock_held_(lock)
+#define _Requires_shared_lock_held_(lock)
+#define _Requires_lock_held_(lock)
+#define _Requires_lock_not_held_(lock)
+#define _Requires_no_locks_held_
+#define _Write_guarded_by_(lock)