From 8efa106d2abf64388545746acec11e1443e4aaee Mon Sep 17 00:00:00 2001
From: Sebastian <versat@users.noreply.github.com>
Date: Fri, 22 Mar 2019 19:50:27 +0100
Subject: [PATCH] windows.cfg: Add direction attributes; fix and enhance
 configurations. (#1750)

---
 cfg/windows.cfg | 1284 +++++++++++++++++++++++++----------------------
 1 file changed, 687 insertions(+), 597 deletions(-)

diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index bc4bc5129..b4723bbef 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -1294,17 +1294,18 @@
     <returnValue type="SIZE_T"/>
     <leak-ignore/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
+      <not-uninit/>
       <not-bool/>
       <valid>0:</valid>
     </arg>
@@ -1317,16 +1318,17 @@
     <noreturn>false</noreturn>
     <returnValue type="VOID"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
+      <not-uninit/>
       <not-bool/>
       <valid>0:</valid>
     </arg>
@@ -1334,14 +1336,14 @@
   <function name="RtlFillBytes">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-bool/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
     <warn severity="style" reason="Obsolete" alternatives="RtlFillMemory"/>
@@ -1353,11 +1355,12 @@
     <noreturn>false</noreturn>
     <returnValue type="PVOID"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="2"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
+      <not-uninit/>
       <not-bool/>
       <valid>0:</valid>
     </arg>
@@ -1365,10 +1368,11 @@
   <function name="RtlZeroBytes">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
+      <not-uninit/>
       <not-bool/>
       <valid>0:</valid>
     </arg>
@@ -1386,7 +1390,7 @@
     <returnValue type="void"/>
     <leak-ignore/>
     <formatstr/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <formatstr/>
       <not-uninit/>
     </arg>
@@ -1397,7 +1401,7 @@
     <returnValue type="void"/>
     <leak-ignore/>
     <formatstr/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <formatstr/>
       <not-uninit/>
     </arg>
@@ -1408,7 +1412,7 @@
     <returnValue type="int"/>
     <leak-ignore/>
     <formatstr secure="true"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
@@ -1420,7 +1424,7 @@
     <returnValue type="int"/>
     <leak-ignore/>
     <formatstr secure="true"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
@@ -1432,7 +1436,7 @@
     <returnValue type="int"/>
     <leak-ignore/>
     <formatstr secure="true"/>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
@@ -1444,78 +1448,107 @@
     <returnValue type="int"/>
     <leak-ignore/>
     <formatstr secure="true"/>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
     </arg>
   </function>
   <!-- int _snprintf_s(char *buffer, size_t sizeOfBuffer, size_t count, const char *format [, argument] ...); -->
+  <!-- template <size_t size> int _snprintf_s(char (&buffer)[size], size_t count, const char *format [, argument] ...); // C++ only -->
   <function name="_snprintf_s">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
+    <arg nr="1" direction="out"/>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
+    <!-- Disabled because depending on the overloaded function it is arg3 or arg4
     <formatstr secure="true"/>
     <arg nr="4">
       <formatstr/>
       <not-uninit/>
       <not-null/>
-    </arg>
+    </arg> -->
   </function>
   <!-- int _snwprintf_s(wchar_t *buffer, size_t sizeOfBuffer, size_t count, const wchar_t *format [, argument] ...); -->
+  <!-- template <size_t size> int _snwprintf_s(wchar_t (&buffer)[size], size_t count, const wchar_t *format [, argument] ...); // C++ only -->
   <function name="_snwprintf_s">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
+    <arg nr="1" direction="out"/>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
+    <!-- Disabled because depending on the overloaded function it is arg3 or arg4
     <formatstr secure="true"/>
     <arg nr="4">
       <formatstr/>
       <not-uninit/>
       <not-null/>
-    </arg>
+    </arg> -->
   </function>
   <function name="DbgPrint">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
     </arg>
   </function>
+  <!-- ULONG DbgPrintEx(ULONG ComponentId, ULONG Level, PCSTR Format, ...); -->
   <function name="DbgPrintEx">
     <noreturn>false</noreturn>
+    <returnValue type="ULONG"/>
     <leak-ignore/>
-    <arg nr="3">
+    <arg nr="1" direction="in"/>
+    <arg nr="2" direction="in"/>
+    <arg nr="3" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
     </arg>
   </function>
+  <!-- ULONG vDbgPrintEx(ULONG ComponentId, ULONG Level, PCCH Format, va_list arglist); -->
   <function name="vDbgPrintEx">
     <noreturn>false</noreturn>
+    <returnValue type="ULONG"/>
     <leak-ignore/>
-    <arg nr="3">
+    <arg nr="1" direction="in"/>
+    <arg nr="2" direction="in"/>
+    <arg nr="3" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
     </arg>
+    <arg nr="4"/>
   </function>
+  <!-- ULONG vDbgPrintExWithPrefix(PCCH Prefix, ULONG ComponentId, ULONG Level, PCCH Format, va_list arglist); -->
   <function name="vDbgPrintExWithPrefix">
     <noreturn>false</noreturn>
+    <returnValue type="ULONG"/>
     <leak-ignore/>
+    <arg nr="1" direction="in"/>
+    <arg nr="2" direction="in"/>
+    <arg nr="3" direction="in"/>
     <arg nr="4">
       <formatstr/>
       <not-uninit/>
       <not-null/>
     </arg>
+    <arg nr="5"/>
   </function>
   <!-- int scanf_s(const char *format [, argument]...); -->
   <function name="scanf_s">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <formatstr scan="true" secure="true"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
@@ -1526,7 +1559,7 @@
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <formatstr scan="true" secure="true"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
@@ -1536,26 +1569,33 @@
   <function name="sscanf_s">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
     <formatstr scan="true" secure="true"/>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
     </arg>
   </function>
+  <!-- int fscanf_s(FILE *stream, const char *format [, argument ]...); -->
   <function name="fscanf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <formatstr scan="true" secure="true"/>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
     </arg>
   </function>
+  <!-- int fwscanf_s(FILE *stream, const wchar_t *format [, argument ]...); -->
   <function name="fwscanf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <formatstr scan="true" secure="true"/>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
@@ -1565,8 +1605,11 @@
   <function name="swscanf_s">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
     <formatstr scan="true" secure="true"/>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <formatstr/>
       <not-uninit/>
       <not-null/>
@@ -1576,7 +1619,7 @@
   <function name="CloseHandle">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -1587,13 +1630,13 @@
   <function name="OpenFile">
     <noreturn>false</noreturn>
     <returnValue type="HFILE"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-null/>
       <strz/>
     </arg>
-    <arg nr="2"/>
-    <arg nr="3">
+    <arg nr="2" direction="out"/>
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -1603,10 +1646,10 @@
   <function name="BuildCommDCB">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2"/>
+    <arg nr="2" direction="out"/>
   </function>
   <!-- BOOL WINAPI BuildCommDCBAndTimeouts(
   _In_   LPCTSTR lpDef,
@@ -1615,11 +1658,11 @@
   <function name="BuildCommDCBAndTimeouts">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2"/>
-    <arg nr="3"/>
+    <arg nr="2" direction="out"/>
+    <arg nr="3" direction="out"/>
   </function>
   <!-- BOOL WINAPI WriteFile(
   _In_         HANDLE hFile,
@@ -1630,17 +1673,17 @@
   <function name="WriteFile">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <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">
       <not-uninit/>
     </arg>
-    <arg nr="4"/>
-    <arg nr="5"/>
+    <arg nr="4" direction="out"/>
+    <arg nr="5" direction="inout"/>
   </function>
   <!-- BOOL WINAPI ReadFile(
   _In_         HANDLE hFile,
@@ -1651,17 +1694,17 @@
   <function name="ReadFile">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4"/>
-    <arg nr="5"/>
+    <arg nr="4" direction="out"/>
+    <arg nr="5" direction="inout"/>
   </function>
   <!-- HANDLE WINAPI CreateFile(
   _In_      LPCTSTR lpFileName,
@@ -1674,25 +1717,25 @@
   <function name="CreateFile,CreateFileA,CreateFileW">
     <noreturn>false</noreturn>
     <returnValue type="HANDLE"/>
-    <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">
       <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>
@@ -1702,10 +1745,10 @@
   <function name="SetCommTimeouts">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -1715,10 +1758,10 @@
   <function name="SetCommState">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -1727,10 +1770,10 @@
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -1741,14 +1784,14 @@
     <noreturn>false</noreturn>
     <returnValue type="unsigned char *"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -1760,17 +1803,17 @@
     <noreturn>false</noreturn>
     <pure/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="inout">
       <not-null/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -1782,14 +1825,14 @@
     <noreturn>false</noreturn>
     <pure/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="inout">
       <not-null/>
     </arg>
   </function>
@@ -1798,11 +1841,13 @@
   <function name="_getcwd,_wgetcwd">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
+      <valid>1:</valid>
+      <not-bool/>
     </arg>
   </function>
   <!-- HRESULT SHGetFolderPath(
@@ -1815,19 +1860,19 @@
     <noreturn>false</noreturn>
     <returnValue type="HRESULT"/>
     <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">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="out">
       <not-null/>
     </arg>
   </function>
@@ -1842,23 +1887,25 @@
     <noreturn>false</noreturn>
     <returnValue type="LONG"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
+    <arg nr="2" direction="in"/>
     <arg nr="3">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="out">
       <not-uninit/>
     </arg>
-    <arg nr="6"/>
+    <arg nr="5" direction="out"/>
+    <arg nr="6" direction="inout"/>
   </function>
   <!-- LONG WINAPI RegCloseKey(_In_ HKEY hKey );-->
   <function name="RegCloseKey">
     <noreturn>false</noreturn>
     <returnValue type="LONG"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -1870,15 +1917,15 @@
     <returnValue type="int"/>
     <leak-ignore/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-null/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -1892,11 +1939,11 @@
     <returnValue type="int"/>
     <leak-ignore/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-null/>
     </arg>
@@ -1905,8 +1952,9 @@
   <function name="GetFileAttributes,GetFileAttributesA,GetFileAttributesW">
     <noreturn>false</noreturn>
     <returnValue type="DWORD"/>
+    <use-retval/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -1920,28 +1968,29 @@
     <noreturn>false</noreturn>
     <returnValue type="LONG"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="2" direction="in"/>
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="5"/>
+    <arg nr="5" direction="out"/>
   </function>
   <!-- int __cdecl wsprintf(_Out_ LPTSTR  lpOut, _In_  LPCTSTR lpFmt, _In_ ...);-->
   <function name="wsprintf,wsprintfA,wsprintfW">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-uninit/>
       <minsize type="strlen" arg="2"/>
     </arg>
     <formatstr/>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <formatstr/>
       <not-null/>
       <not-uninit/>
@@ -1965,20 +2014,20 @@
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <minsize type="argvalue" arg="2"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
     <formatstr/>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <formatstr/>
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -1995,13 +2044,18 @@
     <noreturn>false</noreturn>
     <returnValue type="LONG"/>
     <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="8"/>
+    <arg nr="3" direction="out"/>
+    <arg nr="4" direction="inout"/>
+    <arg nr="5"/>
+    <arg nr="6" direction="inout"/>
+    <arg nr="7" direction="inout"/>
+    <arg nr="8" direction="out"/>
   </function>
   <!-- 
 HFONT CreateFont(
@@ -2027,7 +2081,20 @@ HFONT CreateFont(
     <arg nr="any">
       <not-uninit/>
     </arg>
-    <arg nr="14"/>
+    <arg nr="1" direction="in"/>
+    <arg nr="2" direction="in"/>
+    <arg nr="3" direction="in"/>
+    <arg nr="4" direction="in"/>
+    <arg nr="5" direction="in"/>
+    <arg nr="6" direction="in"/>
+    <arg nr="7" direction="in"/>
+    <arg nr="8" direction="in"/>
+    <arg nr="9" direction="in"/>
+    <arg nr="10" direction="in"/>
+    <arg nr="11" direction="in"/>
+    <arg nr="12" direction="in"/>
+    <arg nr="13" direction="in"/>
+    <arg nr="14" direction="in"/>
   </function>
   <!-- USHORT WINAPI CaptureStackBackTrace(
   _In_      ULONG  FramesToSkip,
@@ -2037,13 +2104,14 @@ HFONT CreateFont(
   <function name="CaptureStackBackTrace">
     <noreturn>false</noreturn>
     <returnValue type="USHORT"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4"/>
+    <arg nr="3" direction="out"/>
+    <arg nr="4" direction="out"/>
   </function>
   <!-- int _vsnprintf(char *buffer, size_t count, const char *format, va_list argptr);
        int _vsnwprintf(wchar_t *buffer, size_t count, const wchar_t *format, va_list argptr);-->
@@ -2051,15 +2119,15 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-uninit/>
       <minsize type="argvalue" arg="2"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2072,19 +2140,19 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-uninit/>
       <minsize type="argvalue" arg="2"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
     <arg nr="5"/>
@@ -2096,19 +2164,19 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-uninit/>
       <minsize type="argvalue" arg="2"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2120,23 +2188,23 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-uninit/>
       <minsize type="argvalue" arg="2"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="in">
       <not-uninit/>
     </arg>
     <arg nr="6"/>
@@ -2147,13 +2215,13 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
     <arg nr="4"/>
@@ -2164,7 +2232,7 @@ HFONT CreateFont(
   <function name="_strdup,_wcsdup,_mbsdup,_tcsdup">
     <noreturn>false</noreturn>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2174,17 +2242,17 @@ HFONT CreateFont(
   <function name="_strdup_dbg,_wcsdup_dbg,_tcsdup_dbg">
     <noreturn>false</noreturn>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
@@ -2196,12 +2264,12 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -2213,15 +2281,15 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <minsize type="argvalue" arg="2"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
     <formatstr/>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <formatstr/>
       <not-null/>
       <not-uninit/>
@@ -2233,14 +2301,14 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="errno_t"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2250,7 +2318,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2270,11 +2338,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
     </arg>
   </function>
@@ -2288,10 +2356,10 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
     </arg>
   </function>
@@ -2304,10 +2372,10 @@ HFONT CreateFont(
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2328,12 +2396,12 @@ HFONT CreateFont(
     <use-retval/>
     <noreturn>false</noreturn>
     <returnValue type="FILE *"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2347,11 +2415,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="size_t"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
@@ -2363,15 +2431,15 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="size_t"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2389,25 +2457,26 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <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">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="6">
+    <arg nr="5" direction="out"/>
+    <arg nr="6" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="7">
+    <arg nr="7" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="8"/>
+    <arg nr="8" direction="out"/>
   </function>
   <!-- BOOL PathIsDirectory(_In_ LPCTSTR pszPath);-->
   <function name="PathIsDirectory,PathIsDirectoryA,PathIsDirectoryW">
@@ -2415,7 +2484,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2426,10 +2495,10 @@ 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>
   </function>
@@ -2440,12 +2509,12 @@ HFONT CreateFont(
     <arg nr="1">
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2455,7 +2524,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2465,7 +2534,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="HANDLE"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2474,10 +2543,10 @@ 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>
   </function>
@@ -2487,11 +2556,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2505,19 +2574,19 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <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>
   </function>
@@ -2530,16 +2599,16 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2549,7 +2618,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2559,7 +2628,7 @@ HFONT CreateFont(
   <function name="DispatchMessage,DispatchMessageA,DispatchMessageW">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2576,17 +2645,17 @@ HFONT CreateFont(
   _In_     LPARAM lParam); -->
   <function name="SendMessage,SendMessageA,SendMessageW,PostMessage,PostMessageA,PostMessageW">
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2596,7 +2665,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="VOID"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2607,18 +2676,19 @@ HFONT CreateFont(
   _In_ LPARAM lParam); -->
   <function name="DefWindowProc,DefWindowProcA,DefWindowProcW">
     <noreturn>false</noreturn>
+    <returnValue type="LRESULT"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2632,20 +2702,20 @@ HFONT CreateFont(
     <returnValue type="UINT"/>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -2660,19 +2730,19 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="DWORD"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -2686,14 +2756,14 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="DWORD"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="2"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -2710,25 +2780,25 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="DWORD"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="5"/>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="6">
+    <arg nr="6" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -2744,24 +2814,24 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="4"/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -2774,10 +2844,10 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="HDC"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
     </arg>
   </function>
@@ -2788,10 +2858,10 @@ 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-null/>
     </arg>
   </function>
@@ -2803,7 +2873,7 @@ HFONT CreateFont(
     <pure/>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2815,10 +2885,10 @@ HFONT CreateFont(
     <returnValue type="HICON"/>
     <leak-ignore/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2829,7 +2899,7 @@ HFONT CreateFont(
     <returnValue type="HBRUSH"/>
     <leak-ignore/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2838,7 +2908,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="LPVOID"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
     </arg>
   </function>
@@ -2847,10 +2917,10 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="HGLOBAL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2859,7 +2929,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2871,11 +2941,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2896,37 +2966,37 @@ HFONT CreateFont(
     <returnValue type="HWND"/>
     <use-retval/>
     <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">
       <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>
-    <arg nr="8">
+    <arg nr="8" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="9">
+    <arg nr="9" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="10">
+    <arg nr="10" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="11">
+    <arg nr="11" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2948,40 +3018,40 @@ HFONT CreateFont(
     <returnValue type="HWND"/>
     <use-retval/>
     <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">
       <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>
-    <arg nr="8">
+    <arg nr="8" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="9">
+    <arg nr="9" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="10">
+    <arg nr="10" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="11">
+    <arg nr="11" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="12">
+    <arg nr="12" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -2992,11 +3062,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3008,7 +3078,7 @@ HFONT CreateFont(
   <function name="RegisterClass,RegisterClassEx">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3019,10 +3089,10 @@ HFONT CreateFont(
   <function name="UnregisterClass,UnregisterClassA,UnregisterClassW">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3035,16 +3105,16 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <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">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3054,7 +3124,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="LPVOID"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-null/>
     </arg>
@@ -3065,7 +3135,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-null/>
     </arg>
@@ -3076,7 +3146,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3094,10 +3164,10 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="HANDLE"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3107,7 +3177,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3118,7 +3188,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3130,7 +3200,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="__int64">arg1&gt;0?arg1:-arg1</returnValue>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -3143,13 +3213,13 @@ HFONT CreateFont(
     <use-retval/>
     <noreturn>false</noreturn>
     <returnValue type="HANDLE"/>
-    <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">
       <not-uninit/>
     </arg>
   </function>
@@ -3164,23 +3234,23 @@ 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="in">
       <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>
   </function>
@@ -3191,10 +3261,10 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="DWORD"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3213,11 +3283,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="FILE *"/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3228,7 +3298,7 @@ HFONT CreateFont(
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3245,20 +3315,20 @@ HFONT CreateFont(
     <use-retval/>
     <noreturn>false</noreturn>
     <returnValue type="HANDLE"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="out">
       <not-null/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="6">
+    <arg nr="6" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3269,11 +3339,11 @@ HFONT CreateFont(
     <use-retval/>
     <noreturn>false</noreturn>
     <returnValue type="HANDLE"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
     </arg>
   </function>
@@ -3281,7 +3351,7 @@ HFONT CreateFont(
   <function name="FindClose">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3297,24 +3367,24 @@ HFONT CreateFont(
     <use-retval/>
     <noreturn>false</noreturn>
     <returnValue type="HANDLE"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <not-null/>
     </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="out"/>
   </function>
   <!-- BOOL WINAPI FindNextFile(
   _In_  HANDLE            hFindFile,
@@ -3324,11 +3394,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
     </arg>
   </function>
@@ -3339,10 +3409,10 @@ 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"/>
   </function>
   <!-- DWORD WINAPI QueryDosDevice(
   _In_opt_ LPCTSTR lpDeviceName,
@@ -3353,10 +3423,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="DWORD"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="2" direction="out"/>
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3369,13 +3440,13 @@ 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="out">
       <not-null/>
     </arg>
-    <arg nr="3"/>
+    <arg nr="3" direction="inout"/>
   </function>
   <!-- DWORD WINAPI GetTempPath(
   _In_  DWORD  nBufferLength,
@@ -3384,11 +3455,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="DWORD"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <valid>0:</valid>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <minsize type="argvalue" arg="1"/>
     </arg>
   </function>
@@ -3397,7 +3468,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3411,16 +3482,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/>
     </arg>
-    <arg nr="4">
+    <arg nr="3" direction="out"/>
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="5"/>
+    <arg nr="5" direction="out"/>
   </function>
   <!-- BOOL SetupDiEnumDeviceInfo(
   _In_  HDEVINFO         DeviceInfoSet,
@@ -3430,13 +3502,13 @@ 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="out"/>
   </function>
   <!-- HDEVINFO SetupDiGetClassDevs(
   _In_opt_ const GUID   *ClassGuid,
@@ -3447,13 +3519,14 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="HDEVINFO"/>
     <leak-ignore/>
-    <arg nr="2">
+    <arg nr="1" direction="in"/>
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3462,12 +3535,12 @@ HFONT CreateFont(
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -3479,17 +3552,17 @@ HFONT CreateFont(
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3498,20 +3571,20 @@ HFONT CreateFont(
     <leak-ignore/>
     <returnValue type="void *"/>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
       <minsize type="sizeof" arg="2"/>
       <minsize type="argvalue" arg="4"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
@@ -3527,14 +3600,14 @@ HFONT CreateFont(
     <use-retval/>
     <returnValue type="int"/>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3542,7 +3615,7 @@ HFONT CreateFont(
   <function name="_close">
     <returnValue type="int"/>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3551,16 +3624,16 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="inout">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <not-bool/>
       <valid>0:</valid>
@@ -3574,17 +3647,17 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <not-bool/>
       <valid>0:</valid>
@@ -3598,22 +3671,22 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <not-bool/>
       <valid>0:</valid>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3623,16 +3696,16 @@ HFONT CreateFont(
     <use-retval/>
     <returnValue type="void *"/>
     <noreturn>false</noreturn>
-    <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">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
@@ -3642,11 +3715,11 @@ HFONT CreateFont(
     <use-retval/>
     <noreturn>false</noreturn>
     <returnValue type="void *"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3666,12 +3739,12 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="size_t">strlen(arg1)</returnValue>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3683,28 +3756,28 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="size_t">strlen(arg1)</returnValue>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
   </function>
   <!-- unsigned char *_mbsrchr_l(const unsigned char *str, unsigned int c, _locale_t locale ); // C only  
-       unsigned char *_mbsrchr_(unsigned char *str, unsigned int c, _locale_t locale ); // C++ only  
-       const unsigned char *_mbsrchr_(const unsigned char *str, unsigned int c, _locale_t locale ); // C++ only-->
+       unsigned char *_mbsrchr_l(unsigned char *str, unsigned int c, _locale_t locale ); // C++ only  
+       const unsigned char *_mbsrchr_l(const unsigned char *str, unsigned int c, _locale_t locale ); // C++ only-->
   <function name="_mbsrchr_l">
     <use-retval/>
     <noreturn>false</noreturn>
     <returnValue type="unsigned char *"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3716,11 +3789,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="unsigned char *"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3730,22 +3803,22 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="size_t"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3754,18 +3827,18 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="size_t"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3778,10 +3851,10 @@ HFONT CreateFont(
     <arg nr="1">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3795,11 +3868,11 @@ HFONT CreateFont(
     <returnValue type="FILE *"/>
     <noreturn>false</noreturn>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3812,15 +3885,15 @@ HFONT CreateFont(
   <function name="_mbsncpy,_mbsnbcpy,_tcsncpy">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <not-bool/>
       <valid>0:</valid>
@@ -3831,20 +3904,20 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="errno_t"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="2"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="4"/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3854,20 +3927,20 @@ HFONT CreateFont(
   <function name="_strncpy_l,_wcsncpy_l,_mbsncpy_l,_tcsncpy_l">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <not-bool/>
       <valid>0:</valid>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3878,24 +3951,25 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="errno_t"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="2"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="4"/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="in">
       <not-uninit/>
+      <not-bool/>
     </arg>
   </function>
   <!-- errno_t _localtime32_s( struct tm* _tm, const __time32_t *time);
@@ -3904,11 +3978,13 @@ HFONT CreateFont(
     <returnValue type="errno_t"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
+      <not-uninit/>
+      <not-bool/>
     </arg>
   </function>
   <!-- __time32_t _time32( __time32_t *destTime ); -->
@@ -3916,8 +3992,7 @@ HFONT CreateFont(
     <returnValue type="__time32_t"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
-      <not-uninit/>
+    <arg nr="1" direction="out">
       <not-bool/>
     </arg>
   </function>
@@ -3926,8 +4001,7 @@ HFONT CreateFont(
     <returnValue type="__time64_t"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
-      <not-uninit/>
+    <arg nr="1" direction="out">
       <not-bool/>
     </arg>
   </function>
@@ -3937,11 +4011,13 @@ HFONT CreateFont(
     <returnValue type="BOOL"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
+      <not-bool/>
     </arg>
-    <arg nr="2" default="0">
+    <arg nr="2" default="0" direction="in">
       <not-uninit/>
+      <not-bool/>
     </arg>
   </function>
   <!-- BOOL WINAPI RemoveDirectory(_In_ LPCTSTR lpPathName); -->
@@ -3949,7 +4025,7 @@ HFONT CreateFont(
     <returnValue type="BOOL"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3959,7 +4035,7 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -3986,7 +4062,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="VOID"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -3998,11 +4074,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="DWORD"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4011,7 +4087,7 @@ HFONT CreateFont(
   <function name="LoadLibrary,LoadLibraryA,LoadLibraryW">
     <noreturn>false</noreturn>
     <returnValue type="HMODULE"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -4024,14 +4100,14 @@ HFONT CreateFont(
   <function name="LoadLibraryEx,LoadLibraryExA,LoadLibraryExW">
     <noreturn>false</noreturn>
     <returnValue type="HMODULE"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <strz/>
     </arg>
     <arg nr="2">
       <valid>0</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4042,7 +4118,7 @@ HFONT CreateFont(
     <returnValue type="HMODULE"/>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <strz/>
     </arg>
@@ -4054,13 +4130,13 @@ HFONT CreateFont(
   <function name="GetModuleHandleEx,GetModuleHandleExA,GetModuleHandleExW">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <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="out">
       <not-null/>
     </arg>
   </function>
@@ -4069,7 +4145,7 @@ HFONT CreateFont(
   <function name="FreeLibrary">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4080,11 +4156,11 @@ HFONT CreateFont(
   <function name="FreeLibraryAndExitThread">
     <noreturn>true</noreturn>
     <returnValue type="VOID"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4096,12 +4172,12 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4113,17 +4189,17 @@ HFONT CreateFont(
   <function name="CreateEvent,CreateEventA,CreateEventW">
     <noreturn>false</noreturn>
     <returnValue type="HANDLE"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4136,19 +4212,19 @@ HFONT CreateFont(
   <function name="CreateEventEx,CreateEventExA,CreateEventExW">
     <noreturn>false</noreturn>
     <returnValue type="HANDLE"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4160,14 +4236,14 @@ HFONT CreateFont(
   <function name="OpenEvent,OpenEventA,OpenEventW">
     <noreturn>false</noreturn>
     <returnValue type="HANDLE"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -4183,7 +4259,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -4193,7 +4269,7 @@ HFONT CreateFont(
   <function name="InitializeCriticalSection">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
       <not-bool/>
     </arg>
@@ -4204,11 +4280,11 @@ HFONT CreateFont(
   <function name="InitializeCriticalSectionAndSpinCount">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4220,15 +4296,15 @@ HFONT CreateFont(
   <function name="InitializeCriticalSectionEx">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4240,11 +4316,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="DWORD"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4254,7 +4330,7 @@ HFONT CreateFont(
   <function name="DeleteCriticalSection">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -4266,7 +4342,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -4278,7 +4354,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -4290,7 +4366,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -4306,12 +4382,12 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <leak-ignore/>
     <warn severity="style" alternatives="StringCchCat">Due to security concerns it is not recommended to use this function, see MSDN for details.</warn>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -4324,7 +4400,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <leak-ignore/>
     <warn severity="style" alternatives="StringCbLength,StringCchLength">Due to security concerns it is not recommended to use this function, see MSDN for details.</warn>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <strz/>
     </arg>
@@ -4337,17 +4413,17 @@ HFONT CreateFont(
   <function name="CreateSemaphore,CreateSemaphoreA,CreateSemaphoreW">
     <returnValue type="HANDLE"/>
     <noreturn>false</noreturn>
-    <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">
       <not-uninit/>
       <valid>1:</valid>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4362,17 +4438,17 @@ HFONT CreateFont(
   <function name="CreateSemaphoreEx,CreateSemaphoreExA,CreateSemaphoreExW">
     <returnValue type="HANDLE"/>
     <noreturn>false</noreturn>
-    <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">
       <not-uninit/>
       <valid>1:</valid>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4381,7 +4457,7 @@ HFONT CreateFont(
       <!-- dwFlags is reserved and must be 0 -->
       <valid>0</valid>
     </arg>
-    <arg nr="6">
+    <arg nr="6" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4392,13 +4468,13 @@ HFONT CreateFont(
   <function name="OpenSemaphore,OpenSemaphoreA,OpenSemaphoreW">
     <returnValue type="HANDLE"/>
     <noreturn>false</noreturn>
-    <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">
       <not-uninit/>
       <not-null/>
       <not-bool/>
@@ -4412,16 +4488,16 @@ HFONT CreateFont(
   <function name="ReleaseSemaphore">
     <returnValue type="BOOL"/>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-bool/>
       <valid>1:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="out">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4433,14 +4509,14 @@ HFONT CreateFont(
   <function name="CreateMutex,CreateMutexA,CreateMutexW">
     <returnValue type="HANDLE"/>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4453,19 +4529,19 @@ HFONT CreateFont(
   <function name="CreateMutexEx,CreateMutexExA,CreateMutexExW">
     <returnValue type="HANDLE"/>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <valid>0,1</valid>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4476,13 +4552,13 @@ HFONT CreateFont(
   <function name="OpenMutex,OpenMutexA,OpenMutexW">
     <returnValue type="HANDLE"/>
     <noreturn>false</noreturn>
-    <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">
       <not-uninit/>
       <not-null/>
       <not-bool/>
@@ -4495,7 +4571,7 @@ HFONT CreateFont(
     <returnValue type="BOOL"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4506,7 +4582,7 @@ HFONT CreateFont(
     <returnValue type="void *"/>
     <use-retval/>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
@@ -4517,7 +4593,7 @@ HFONT CreateFont(
     <returnValue type="void *"/>
     <noreturn>false</noreturn>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
@@ -4535,7 +4611,7 @@ HFONT CreateFont(
   <function name="strlwr">
     <returnValue type="char *">arg1</returnValue>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -4546,7 +4622,7 @@ HFONT CreateFont(
   <function name="strupr">
     <returnValue type="char *">arg1</returnValue>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -4559,7 +4635,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
   </function>
@@ -4574,7 +4650,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4593,10 +4669,19 @@ HFONT CreateFont(
   <function name="AllocateAndInitializeSid">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
     </arg>
-    <arg nr="11">
+    <arg nr="2" direction="in"/>
+    <arg nr="3" direction="in"/>
+    <arg nr="4" direction="in"/>
+    <arg nr="5" direction="in"/>
+    <arg nr="6" direction="in"/>
+    <arg nr="7" direction="in"/>
+    <arg nr="8" direction="in"/>
+    <arg nr="9" direction="in"/>
+    <arg nr="10" direction="in"/>
+    <arg nr="11" direction="out">
       <not-null/>
     </arg>
   </function>
@@ -4604,7 +4689,7 @@ HFONT CreateFont(
   <function name="FreeSid">
     <noreturn>false</noreturn>
     <returnValue type="PVOID"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4616,13 +4701,13 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="LPVOID"/>
     <use-retval/>
-    <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">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
@@ -4636,17 +4721,17 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="LPVOID"/>
     <use-retval/>
-    <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">
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
@@ -4658,13 +4743,13 @@ HFONT CreateFont(
   <function name="HeapFree">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <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">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -4678,13 +4763,13 @@ HFONT CreateFont(
     <returnValue type="SIZE_T"/>
     <use-retval/>
     <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">
       <not-uninit/>
     </arg>
   </function>
@@ -4696,13 +4781,13 @@ 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">
       <not-uninit/>
     </arg>
   </function>
@@ -4719,10 +4804,10 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <!-- Allowed to be nullptr if variable pointed to by arg2 is 0 -->
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="inout">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -4736,15 +4821,15 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <leak-ignore/>
     <!-- The function does nothing (useful) if arg1 is nullptr or arg2 is nullptr or arg3 is 0 -->
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
       <!-- TODO: #8335 arg3 is the number of characters, not bytes. -->
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <valid>1:</valid>
     </arg>
@@ -4756,13 +4841,13 @@ HFONT CreateFont(
   <function name="socket">
     <noreturn>false</noreturn>
     <returnValue type="SOCKET"/>
-    <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">
       <not-uninit/>
     </arg>
   </function>
@@ -4771,7 +4856,7 @@ HFONT CreateFont(
   <function name="closesocket">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4783,13 +4868,13 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="SOCKET"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="inout">
       <not-uninit/>
     </arg>
   </function>
@@ -4801,15 +4886,15 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-bool/>
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-bool/>
       <not-uninit/>
       <valid>0:</valid>
@@ -4823,14 +4908,14 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
@@ -4843,13 +4928,13 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="inout">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -4862,13 +4947,13 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="inout">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -4883,19 +4968,19 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <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">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="out">
       <not-null/>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="inout">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -4907,7 +4992,7 @@ HFONT CreateFont(
     <returnValue type="u_long"/>
     <leak-ignore/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4918,7 +5003,7 @@ HFONT CreateFont(
     <returnValue type="u_short"/>
     <leak-ignore/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4929,7 +5014,7 @@ HFONT CreateFont(
     <returnValue type="unsigned long"/>
     <leak-ignore/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -4942,7 +5027,7 @@ HFONT CreateFont(
     <returnValue type="char *"/>
     <leak-ignore/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4954,13 +5039,13 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <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="inout">
       <not-null/>
     </arg>
   </function>
@@ -4971,10 +5056,10 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4985,7 +5070,7 @@ HFONT CreateFont(
     <returnValue type="u_long"/>
     <leak-ignore/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -4996,7 +5081,7 @@ HFONT CreateFont(
     <returnValue type="u_short"/>
     <leak-ignore/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5009,17 +5094,17 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5034,22 +5119,22 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="5"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="out">
     </arg>
-    <arg nr="6">
+    <arg nr="6" direction="inout">
     </arg>
   </function>
   <!--int select(
@@ -5062,19 +5147,19 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <!-- ignored -->
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="inout">
       <!-- optional -->
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="inout">
       <!-- optional -->
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="inout">
       <!-- optional -->
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5087,17 +5172,17 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5112,23 +5197,23 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <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>
   </function>
@@ -5142,20 +5227,20 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <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">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-null/>
       <minsize type="argvalue" arg="5"/>
     </arg>
-    <arg nr="5">
+    <arg nr="5" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
@@ -5167,10 +5252,10 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5181,10 +5266,10 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="out">
       <not-null/>
     </arg>
   </function>
@@ -5205,7 +5290,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5227,7 +5312,7 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <valid>0:255</valid>
     </arg>
@@ -5238,11 +5323,11 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <valid>0:255</valid>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5252,10 +5337,10 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5265,7 +5350,7 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <valid>0:255</valid>
     </arg>
@@ -5276,11 +5361,11 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <valid>0:255</valid>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5290,34 +5375,36 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
   <function name="umask">
     <returnValue type="int"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
     <warn severity="style" alternatives="_umask" reason="Obsolete"/>
   </function>
   <function name="_umask">
     <returnValue type="int"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
+  <!-- errno_t _umask_s(int mode, int * pOldMode); -->
   <function name="_umask_s">
     <returnValue type="errno_t"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-bool/>
       <not-uninit/>
     </arg>
-    <arg nr="1">
+    <arg nr="2" direction="out">
       <not-null/>
+      <not-bool/>
     </arg>
   </function>
   <!-- HLOCAL WINAPI LocalAlloc(
@@ -5327,12 +5414,12 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="HLOCAL"/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
       <not-bool/>
       <valid>0:</valid>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -5346,14 +5433,14 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="HLOCAL"/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-bool/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
       <not-bool/>
       <valid>0:</valid>
@@ -5363,7 +5450,7 @@ HFONT CreateFont(
   <function name="LocalFree">
     <noreturn>false</noreturn>
     <returnValue type="HLOCAL"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-bool/>
     </arg>
   </function>
@@ -5374,7 +5461,7 @@ HFONT CreateFont(
     <returnValue type="UINT"/>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-bool/>
     </arg>
@@ -5384,7 +5471,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="LPVOID"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-bool/>
     </arg>
@@ -5394,7 +5481,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-bool/>
     </arg>
@@ -5408,28 +5495,31 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="DWORD"/>
     <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="inout">
       <!-- nullptr is valid -->
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
   </function>
   <!-- unsigned char *_mbscat(unsigned char *strDestination, const unsigned char *strSource); -->
+  <!-- template <size_t size> unsigned char *_mbscat(unsigned char (&strDestination)[size], const unsigned char *strSource); // C++ only -->
   <function name="_mbscat">
     <returnValue type="unsigned char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
+      <not-uninit/>
+      <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -5439,17 +5529,17 @@ HFONT CreateFont(
     <returnValue type="errno_t"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <strz/>
       <minsize type="argvalue" arg="2"/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -5458,14 +5548,14 @@ HFONT CreateFont(
   <function name="CreatePen">
     <returnValue type="HPEN"/>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>