diff --git a/cfg/std.cfg b/cfg/std.cfg
index aba39d55a..3c3cf6acd 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -3720,6 +3720,10 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <function name="vsprintf,std::vsprintf">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <minsize type="argvalue" arg="2"/>
+    </arg>
     <arg nr="2">
       <not-null/>
       <not-uninit/>
@@ -3731,8 +3735,8 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
+      <not-null/>
       <minsize type="argvalue" arg="2"/>
-      <not-uninit/>
     </arg>
     <arg nr="2">
       <not-uninit/>
diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 50676a8d2..50ea2b6af 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -1843,14 +1843,96 @@ HFONT CreateFont(
     <arg nr="2">
       <not-uninit/>
     </arg>
-    <formatstr/>
     <arg nr="3">
-      <formatstr/>
       <not-null/>
       <not-uninit/>
     </arg>
     <arg nr="4"/>
   </function>
+  <!-- int _vsnprintf_l (char *buffer   , size_t count, const char *format, locale_t locale,  va_list argptr); 
+       int _vsnwprintf_l(wchar_t *buffer, size_t count, const wchar_t *format, locale_t locale, va_list argptr); 
+       int _vswprintf_l(wchar_t *buffer,  size_t count, const wchar_t *format, locale_t locale, va_list argptr);-->
+  <function name="_vsnprintf_l,_vsnwprintf_l,_vswprintf_l">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+      <minsize type="argvalue" arg="2"/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="4">
+      <not-uninit/>
+    </arg>
+    <arg nr="5"/>
+  </function>
+  <!-- int vsnprintf_s(char *buffer, size_t sizeOfBuffer, size_t count, const char *format, va_list argptr); 
+       int _vsnprintf_s( char *buffer, size_t sizeOfBuffer, size_t count, const char *format, va_list argptr);
+       int _vsnwprintf_s( wchar_t *buffer, size_t sizeOfBuffer, size_t count, const wchar_t *format, va_list argptr); -->
+  <function name="vsnprintf_s,_vsnprintf_s,_vsnwprintf_s">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+      <minsize type="argvalue" arg="2"/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+    <arg nr="4">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="5"/>
+  </function>
+  <!-- int _vsnprintf_s_l(char *buffer, size_t sizeOfBuffer, size_t count, const char *format, locale_t locale,  va_list argptr); 
+       int _vsnwprintf_s_l(wchar_t *buffer, size_t sizeOfBuffer, size_t count, const wchar_t *format, locale_t locale, va_list argptr); -->
+  <function name="_vsnprintf_s_l,_vsnwprintf_s_l">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+      <minsize type="argvalue" arg="2"/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+    <arg nr="4">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="5">
+      <not-uninit/>
+    </arg>
+    <arg nr="6"/>
+  </function>
+  <!-- int _vsprintf_l(char *buffer, const char *format, locale_t locale, va_list argptr); 
+      int __vswprintf_l(wchar_t *buffer, const wchar_t *format, locale_t locale, va_list argptr);-->
+  <function name="_vsprintf_l, __vswprintf_l">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+    <arg nr="4"/>
+  </function>
   <!-- char *_strdup(const char *strSource);
     wchar_t *_wcsdup(const wchar_t *strSource);
     unsigned char *_mbsdup(const unsigned char *strSource);-->