diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 2fbcd8691..e01489be2 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -5577,7 +5577,7 @@ HFONT CreateFont(
   <function name="_putenv,_wputenv,_tputenv">
     <returnValue type="int"/>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -5591,7 +5591,7 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -5609,28 +5609,28 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <minsize type="argvalue" arg="4"/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="out">
       <minsize type="argvalue" arg="6"/>
     </arg>
-    <arg nr="6">
+    <arg nr="6" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="7"/>
-    <arg nr="8">
+    <arg nr="7" direction="out"/>
+    <arg nr="8" direction="inout">
       <not-bool/>
     </arg>
   </function>
@@ -5643,17 +5643,17 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-null/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="out">
       <not-null/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5663,81 +5663,76 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
-  <!--
-  BOOL MiniDumpReadDumpStream(
-  PVOID               BaseOfDump,
-  ULONG               StreamNumber,
-  PMINIDUMP_DIRECTORY *Dir,
-  PVOID               *StreamPointer,
-  ULONG               *StreamSize
-);
--->
+  <!-- BOOL MiniDumpReadDumpStream(
+  _In_ PVOID BaseOfDump,
+  _In_ ULONG StreamNumber,
+  _Outptr_result_maybenull_ PMINIDUMP_DIRECTORY * Dir,
+  _Outptr_result_maybenull_ PVOID * StreamPointer,
+  _Out_opt_ ULONG * StreamSize); -->
   <function name="MiniDumpReadDumpStream">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-bool/>
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-bool/>
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="out">
       <not-bool/>
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="out">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="out">
       <not-uninit/>
     </arg>
   </function>
-  <!-- 
-  BOOL MiniDumpWriteDump(
-  HANDLE                            hProcess,
-  DWORD                             ProcessId,
-  HANDLE                            hFile,
-  MINIDUMP_TYPE                     DumpType,
-  PMINIDUMP_EXCEPTION_INFORMATION   ExceptionParam,
-  PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
-  PMINIDUMP_CALLBACK_INFORMATION    CallbackParam
-); -->
+  <!-- BOOL MiniDumpWriteDump(
+  _In_ HANDLE hProcess,
+  _In_ DWORD ProcessId,
+  _In_ HANDLE hFile,
+  _In_ MINIDUMP_TYPE DumpType,
+  _In_opt_ PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+  _In_opt_ PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
+  _In_opt_ PMINIDUMP_CALLBACK_INFORMATION CallbackParam); -->
   <function name="MiniDumpWriteDump">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-bool/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-bool/>
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-bool/>
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="6">
+    <arg nr="6" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="7">
+    <arg nr="7" direction="in">
       <not-uninit/>
     </arg>
   </function>