diff --git a/cfg/microsoft_sal.cfg b/cfg/microsoft_sal.cfg
index a101fe82d..7da0474fe 100644
--- a/cfg/microsoft_sal.cfg
+++ b/cfg/microsoft_sal.cfg
@@ -6,11 +6,12 @@
   <define name="_In_z_" value=""/>
   <define name="_In_opt_" value=""/>
   <define name="_In_opt_z_" value=""/>
-  <define name="_In_reads_opt_" value=""/>
-  <define name="_In_reads_bytes_opt_" value=""/>
-  <define name="_In_reads_opt_z_" value=""/>
-  <define name="_In_reads_to_ptr_opt_" value=""/>
-  <define name="_In_reads_to_ptr_opt_z_" value=""/>
+  <define name="_In_reads_opt_(s)" value=""/>
+  <define name="_In_reads_bytes_opt_(s)" value=""/>
+  <define name="_In_reads_opt_z_(s)" value=""/>
+  <define name="_In_reads_or_z_opt_(s)" value=""/>
+  <define name="_In_reads_to_ptr_opt_(p)" value=""/>
+  <define name="_In_reads_to_ptr_opt_z_(p)" value=""/>
   <define name="_In_reads_(s)" value=""/>
   <define name="_In_reads_bytes_(s)" value=""/>
   <define name="_In_reads_z_(s)" value=""/>
@@ -22,30 +23,30 @@
   <define name="_Inout_z_" value=""/>
   <define name="_Inout_opt_" value=""/>
   <define name="_Inout_opt_z_" value=""/>
-  <define name="_Inout_updates_opt_" value=""/>
-  <define name="_Inout_updates_bytes_opt_" value=""/>
-  <define name="_Inout_updates_to_opt_" value=""/>
-  <define name="_Inout_updates_bytes_to_opt_" value=""/>
-  <define name="_Inout_updates_all_opt_" value=""/>
-  <define name="_Inout_updates_bytes_all_opt_" value=""/>
+  <define name="_Inout_updates_opt_(s)" value=""/>
+  <define name="_Inout_updates_bytes_opt_(s)" value=""/>
+  <define name="_Inout_updates_to_opt_(s, c)" value=""/>
+  <define name="_Inout_updates_bytes_to_opt_(s, c)" value=""/>
+  <define name="_Inout_updates_all_opt_(s)" value=""/>
+  <define name="_Inout_updates_bytes_all_opt_(s)" value=""/>
   <define name="_Inout_updates_(s)" value=""/>
   <define name="_Inout_updates_bytes_(s)" value=""/>
   <define name="_Inout_updates_z_(s)" value=""/>
-  <define name="_Inout_updates_to_(s,c)" value=""/>
-  <define name="_Inout_updates_bytes_to_(s,c)" value=""/>
+  <define name="_Inout_updates_to_(s, c)" value=""/>
+  <define name="_Inout_updates_bytes_to_(s, c)" value=""/>
   <define name="_Inout_updates_all_(s)" value=""/>
   <define name="_Inout_updates_bytes_all_(s)" value=""/>
   <!-- Output Parameters -->
   <define name="_Out_" value=""/>
   <define name="_Out_opt_" value=""/>
-  <define name="_Out_writes_opt_" value=""/>
-  <define name="_Out_writes_opt_z_" value=""/>
-  <define name="_Out_writes_to_opt_" value=""/>
-  <define name="_Out_writes_bytes_to_opt_" value=""/>
-  <define name="_Out_writes_all_opt_" value=""/>
-  <define name="_Out_writes_bytes_all_opt_" value=""/>
-  <define name="_Out_writes_to_ptr_opt_" value=""/>
-  <define name="_Out_writes_to_ptr_opt_z_" value=""/>
+  <define name="_Out_writes_opt_(s)" value=""/>
+  <define name="_Out_writes_opt_z_(s)" value=""/>
+  <define name="_Out_writes_to_opt_(s, c)" value=""/>
+  <define name="_Out_writes_bytes_to_opt_(s, c)" value=""/>
+  <define name="_Out_writes_all_opt_(s)" value=""/>
+  <define name="_Out_writes_bytes_all_opt_(s)" value=""/>
+  <define name="_Out_writes_to_ptr_opt_(p)" value=""/>
+  <define name="_Out_writes_to_ptr_opt_z_(p)" value=""/>
   <define name="_Outptr_" value=""/>
   <define name="_Outptr_opt_" value=""/>
   <define name="_Outptr_result_maybenull_" value=""/>
@@ -61,8 +62,8 @@
   <define name="_Out_writes_(s)" value=""/>
   <define name="_Out_writes_bytes_(s)" value=""/>
   <define name="_Out_writes_z_(s)" value=""/>
-  <define name="_Out_writes_to_(s,c)" value=""/>
-  <define name="_Out_writes_bytes_to_(s,c)" value=""/>
+  <define name="_Out_writes_to_(s, c)" value=""/>
+  <define name="_Out_writes_bytes_to_(s, c)" value=""/>
   <define name="_Out_writes_all_(s)" value=""/>
   <define name="_Out_writes_bytes_all_(s)" value=""/>
   <define name="_Out_writes_to_ptr_(p)" value=""/>
@@ -73,8 +74,8 @@
   <define name="_Outptr_opt_result_bytebuffer_(s)" value=""/>
   <define name="_Outptr_result_buffer_to_(s, c)" value=""/>
   <define name="_Outptr_result_bytebuffer_to_(s, c)" value=""/>
-  <define name="_Outptr_opt_result_buffer_to_(s,c)" value=""/>
-  <define name="_Outptr_opt_result_bytebuffer_to_(s,c)" value=""/>
+  <define name="_Outptr_opt_result_buffer_to_(s, c)" value=""/>
+  <define name="_Outptr_opt_result_bytebuffer_to_(s, c)" value=""/>
   <!-- Output Reference Parameters -->
   <define name="_Outref_" value=""/>
   <define name="_Outref_result_maybenull_" value=""/>
@@ -87,25 +88,32 @@
   <define name="_Outref_result_buffer_maybenull_(s)" value=""/>
   <define name="_Outref_result_bytebuffer_maybenull_(s)" value=""/>
   <define name="_Outref_result_buffer_to_maybenull_(s, c)" value=""/>
-  <define name="_Outref_result_bytebuffer_to_maybenull_(s,c)" value=""/>
+  <define name="_Outref_result_bytebuffer_to_maybenull_(s, c)" value=""/>
   <define name="_Outref_result_buffer_all_maybenull_(s)" value=""/>
   <define name="_Outref_result_bytebuffer_all_maybenull_(s)" value=""/>
   <!-- Return Values -->
   <define name="_Ret_z_" value=""/>
+  <define name="_Ret_maybenull_z_" value=""/>
+  <define name="_Ret_notnull_" value=""/>
+  <define name="_Ret_maybenull_" value=""/>
+  <define name="_Ret_null_" value=""/>
+  <define name="_Ret_valid_" value=""/>
   <define name="_Ret_writes_(s)" value=""/>
   <define name="_Ret_writes_bytes_(s)" value=""/>
+  <define name="_Ret_writes_bytes_to_(s, c)" value=""/>
   <define name="_Ret_writes_z_(s)" value=""/>
-  <define name="_Ret_writes_to_(s,c)" value=""/>
+  <define name="_Ret_writes_to_(s, c)" value=""/>
   <define name="_Ret_writes_maybenull_(s)" value=""/>
-  <define name="_Ret_writes_to_maybenull_(s)" value=""/>
+  <define name="_Ret_writes_to_maybenull_(s, c)" value=""/>
   <define name="_Ret_writes_maybenull_z_(s)" value=""/>
+  <define name="_Ret_writes_bytes_to_maybenull_(s, c)" value=""/>
   <!-- Other Common Annotations -->
   <define name="_In_range_(low, hi)" value=""/>
   <define name="_Out_range_(low, hi)" value=""/>
   <define name="_Ret_range_(low, hi)" value=""/>
   <define name="_Deref_in_range_(low, hi)" value=""/>
   <define name="_Deref_out_range_(low, hi)" value=""/>
-  <define name="_Deref_inout_range_(low, hi)" value=""/>
+  <define name="_Deref_ret_range_(low, hi)" value=""/>
   <define name="_Field_range_(low, hi)" value=""/>
   <define name="_Pre_equal_to_(expr)" value=""/>
   <define name="_Post_equal_to_(expr)" value=""/>