diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 16e40140e..7cbc05829 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -1366,6 +1366,7 @@
     <arg nr="1" direction="in">
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
     <arg nr="2" direction="in">
       <not-uninit/>
@@ -1506,6 +1507,7 @@
       <formatstr/>
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
   </function>
   <!-- int fprintf_s(FILE *stream, const char *format [, argument ]...); -->
@@ -1518,6 +1520,7 @@
       <formatstr/>
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
   </function>
   <!-- int fwprintf_s(FILE *stream, const wchar_t *format [, argument ]...); -->
@@ -1530,6 +1533,7 @@
       <formatstr/>
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
   </function>
   <!-- int _snprintf_s(char *buffer, size_t sizeOfBuffer, size_t count, const char *format [, argument] ...); -->
@@ -1645,6 +1649,7 @@
     <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
     </arg>
   </function>
   <!-- ULONG vDbgPrintExWithPrefix(PCCH Prefix, ULONG ComponentId, ULONG Level, PCCH Format, va_list arglist); -->
@@ -1671,6 +1676,7 @@
       <formatstr/>
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
   </function>
   <!-- int wscanf_s(const wchar_t *format [, argument]...); -->
@@ -1682,6 +1688,7 @@
       <formatstr/>
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
   </function>
   <!-- int sscanf_s(const char *buffer, const char *format [, argument ] ...); -->
@@ -1696,6 +1703,7 @@
       <formatstr/>
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
   </function>
   <!-- int fscanf_s(FILE *stream, const char *format [, argument ]...); -->
@@ -1707,6 +1715,7 @@
       <formatstr/>
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
   </function>
   <!-- int fwscanf_s(FILE *stream, const wchar_t *format [, argument ]...); -->
@@ -1718,6 +1727,7 @@
       <formatstr/>
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
   </function>
   <!-- int swscanf_s(const wchar_t *buffer, const wchar_t *format [, argument ] ...); -->
@@ -1732,6 +1742,7 @@
       <formatstr/>
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
   </function>
   <!-- BOOL WINAPI CloseHandle(_In_  HANDLE hObject); -->
@@ -2111,6 +2122,7 @@
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
     </arg>
     <arg nr="3" direction="inout">
       <not-null/>
@@ -2133,6 +2145,7 @@
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
     </arg>
     <arg nr="3" direction="inout">
       <not-null/>
@@ -2223,10 +2236,12 @@
     <arg nr="1" direction="in">
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
     <arg nr="2" direction="in">
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
     <arg nr="3" direction="in">
       <not-uninit/>
@@ -2245,10 +2260,12 @@
     <arg nr="1" direction="in">
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
     <arg nr="2" direction="in">
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
   </function>
   <!-- DWORD WINAPI GetFileAttributes(_In_ LPCTSTR lpFileName);-->
@@ -2329,6 +2346,7 @@
       <formatstr/>
       <not-null/>
       <not-uninit/>
+      <strz/>
     </arg>
     <arg nr="4" direction="in">
       <not-uninit/>
@@ -2433,6 +2451,7 @@ HFONT CreateFont(
     <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
     </arg>
     <arg nr="4"/>
   </function>
@@ -2454,6 +2473,7 @@ HFONT CreateFont(
     <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
     </arg>
     <arg nr="4" direction="in">
       <not-uninit/>
@@ -2482,6 +2502,7 @@ HFONT CreateFont(
     <arg nr="4" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
     </arg>
     <arg nr="5"/>
   </function>