[tkreuzer] 66711: [PSDK] Add missing _Enum_is_bitflag_ and _Strict_type_match_ annotations. remove a wrong annotation
Author: tkreuzer Date: Sat Mar 14 18:12:50 2015 New Revision: 66711
URL: http://svn.reactos.org/svn/reactos?rev=66711&view=rev Log: [PSDK] Add missing _Enum_is_bitflag_ and _Strict_type_match_ annotations. remove a wrong annotation
Modified: trunk/reactos/include/ndk/no_sal2.h trunk/reactos/include/psdk/sal.h
Modified: trunk/reactos/include/ndk/no_sal2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/no_sal2.h?rev=6... ============================================================================== --- trunk/reactos/include/ndk/no_sal2.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/no_sal2.h [iso-8859-1] Sat Mar 14 18:12:50 2015 @@ -183,6 +183,7 @@ #define _Deref_ret_range_(lb,ub) #define _Deref_ret_z_ #define _Deref2_pre_readonly_ +#define _Enum_is_bitflag_ #define _Field_range_(min,max) #define _Field_size_(size) #define _Field_size_bytes_(size) @@ -308,7 +309,7 @@ #define _Literal_ #define _Maybenull_ #define _Maybevalid_ -#define _Maybe_raises_SEH_exception +#define _Maybe_raises_SEH_exception_ #define _Must_inspect_result_ #define _Notliteral_ #define _Notnull_ @@ -566,7 +567,6 @@ #define _Prepost_z_ #define _Printf_format_string_ #define _Raises_SEH_exception_ -#define _Maybe_raises_SEH_exception_ #define _Readable_bytes_(size) #define _Readable_elements_(size) #define _Reserved_ @@ -629,6 +629,7 @@ #define _Return_type_success_(expr) #define _Scanf_format_string_ #define _Scanf_s_format_string_ +#define _Strict_type_match_ #define _Struct_size_bytes_(size) #define _Success_(expr) #define _Unchanged_(e)
Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=6671... ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sat Mar 14 18:12:50 2015 @@ -599,6 +599,7 @@ //#define _Deref_ret_range_(lb,ub) //#define _Deref_ret_z_ //#define _Deref2_pre_readonly_ +//#define _Enum_is_bitflag_ #define _Field_range_(min,max) _SAL2_NAME(_Field_range_) _Group_(_SA_annotes2(SAL_range,min,max)) #define _Field_size_(size) _SAL2_NAME(_Field_size_) _Group_(_Notnull_ _Writable_elements_(size)) #define _Field_size_opt_(size) _SAL2_NAME(_Field_size_opt_) _Group_(_Maybenull_ _Writable_elements_(size)) @@ -723,7 +724,7 @@ #define _Literal_ _SAL2_NAME(_Literal_) _Group_([SAL_pre] [SAL_annotes(Name="SAL_constant", p1="__yes")]) #define _Maybenull_ [SAL_annotes(Name="SAL_null", p1="__maybe")] #define _Maybevalid_ [SAL_annotes(Name="SAL_valid", p1="__maybe")] -//#define _Maybe_raises_SEH_exception +#define _Maybe_raises_SEH_exception_ _SAL2_NAME(_Maybe_raises_SEH_exception_) _Group_(_Pre_ [SAL_annotes(Name="SAL_inTry", p1="__yes")]) #define _Must_inspect_result_ _SAL2_NAME(_Must_inspect_result_) _Group_(_Post_ [SAL_annotes(Name="SAL_mustInspect")] [SA_Post(MustCheck=SA_Yes)]) #define _Notliteral_ _SAL2_NAME(_Notliteral_) _Group_([SAL_pre] [SAL_annotes(Name="SAL_constant", p1="__no")] ) #define _Notnull_ [SAL_annotes(Name="SAL_null", p1="__no")] @@ -979,7 +980,6 @@ #define _Prepost_z_ _SAL2_NAME(_Prepost_z_) _Group_(_Pre_z_ _Post_z_) #define _Printf_format_string_ _SAL2_NAME(_Printf_format_string_) _Group_([SA_FormatString(Style="printf")] ) //#define _Raises_SEH_exception_ -#define _Maybe_raises_SEH_exception_ _SAL2_NAME(_Maybe_raises_SEH_exception_) _Group_(_Pre_ [SAL_annotes(Name="SAL_inTry", p1="__yes")]) #define _Readable_bytes_(size) _SAL2_NAME(_Readable_bytes_) _Group_(_SA_annotes1(SAL_readableTo, byteCount(size))) #define _Readable_elements_(size) _SAL2_NAME(_Readable_elements_) _Group_([SAL_annotes(Name="SAL_readableTo", p1="elementCount(size)")]) #define _Reserved_ _SAL2_NAME(_Reserved_) _Group_([SA_Pre(Null=SA_Yes)]) @@ -1043,6 +1043,7 @@ #define _Return_type_success_(expr) _SAL2_NAME(_Return_type_success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) #define _Scanf_format_string_ _SAL2_NAME(_Scanf_format_string_) _Group_([SA_FormatString(Style="scanf")]) #define _Scanf_s_format_string_ _SAL2_NAME(_Scanf_s_format_string_) _Group_([SA_FormatString(Style="scanf_s")]) +#define _Strict_type_match_ _SAL2_NAME(_Strict_type_match_) _Group_([SAL_annotes(Name="SAL_strictType2")]) #define _Struct_size_bytes_(size) _SAL2_NAME(_Struct_size_bytes_) _Group_(_Writable_bytes_(byteCount(size))) #define _Success_(expr) _SAL2_NAME(_Success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) #define _Unchanged_(expr) _SAL2_NAME(_Unchanged_) _Group_([SAL_at(p1=_SA_SPECSTRIZE(expr))] _Group_(_Post_equal_to_(expr) _Const_)) @@ -1402,7 +1403,7 @@ #define _Literal_ #define _Maybenull_ #define _Maybevalid_ -#define _Maybe_raises_SEH_exception +#define _Maybe_raises_SEH_exception_ #define _Must_inspect_result_ #define _Notliteral_ #define _Notnull_ @@ -1660,7 +1661,6 @@ #define _Prepost_z_ #define _Printf_format_string_ #define _Raises_SEH_exception_ -#define _Maybe_raises_SEH_exception_ #define _Readable_bytes_(size) #define _Readable_elements_(size) #define _Reserved_ @@ -1724,6 +1724,7 @@ #define _Return_type_success_(expr) #define _Scanf_format_string_ #define _Scanf_s_format_string_ +#define _Strict_type_match_ #define _Struct_size_bytes_(size) #define _Success_(expr) #define _Unchanged_(e)
-
tkreuzer＠svn.reactos.org