diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 09d679244..2a067e825 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -9,18 +9,18 @@
     <noreturn>false</noreturn>
   </function>
 
-  <function name="printf_s">   <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="1"><formatstr/></arg> </function>
-  <function name="wprintf_s">  <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="1"><formatstr/></arg> </function>
-  <function name="fprintf_s">  <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="2"><formatstr/></arg> </function>
-  <function name="fwprintf_s"> <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="2"><formatstr/></arg> </function>
-  <function name="_snprintf">  <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="3"><formatstr/></arg> </function>
-  <function name="_snwprintf"> <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="3"><formatstr/></arg> </function>
+  <function name="printf_s">   <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="1"><formatstr/><not-uninit/><not-null/></arg> </function>
+  <function name="wprintf_s">  <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="1"><formatstr/><not-uninit/><not-null/></arg> </function>
+  <function name="fprintf_s">  <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="2"><formatstr/><not-uninit/><not-null/></arg> </function>
+  <function name="fwprintf_s"> <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="2"><formatstr/><not-uninit/><not-null/></arg> </function>
+  <function name="_snprintf">  <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="3"><formatstr/><not-uninit/><not-null/></arg> </function>
+  <function name="_snwprintf"> <noreturn>false</noreturn> <formatstr secure="true"/>  <arg nr="3"><formatstr/><not-uninit/><not-null/></arg> </function>
 
-  <function name="scanf_s">    <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="1"><formatstr/></arg> </function>
-  <function name="wscanf_s">   <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="1"><formatstr/></arg> </function>
-  <function name="sscanf_s">   <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="2"><formatstr/></arg> </function>
-  <function name="fscanf_s">   <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="2"><formatstr/></arg> </function>
-  <function name="fwscanf_s">  <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="2"><formatstr/></arg> </function>
-  <function name="swscanf_s">  <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="2"><formatstr/></arg> </function>
+  <function name="scanf_s">    <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="1"><formatstr/><not-uninit/><not-null/></arg> </function>
+  <function name="wscanf_s">   <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="1"><formatstr/><not-uninit/><not-null/></arg> </function>
+  <function name="sscanf_s">   <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="2"><formatstr/><not-uninit/><not-null/></arg> </function>
+  <function name="fscanf_s">   <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="2"><formatstr/><not-uninit/><not-null/></arg> </function>
+  <function name="fwscanf_s">  <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="2"><formatstr/><not-uninit/><not-null/></arg> </function>
+  <function name="swscanf_s">  <noreturn>false</noreturn> <formatstr scan="true" secure="true"/>  <arg nr="2"><formatstr/><not-uninit/><not-null/></arg> </function>
 
-</def>
\ No newline at end of file
+</def>