diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 7902859c9..e309dff4e 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -1234,6 +1234,7 @@
   _In_        SIZE_T Length);-->
   <function name="RtlCopyBytes">
     <noreturn>false</noreturn>
+    <returnValue type="VOID"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1301,6 +1302,7 @@
   <!-- void CString::Format(LPCTSTR lpszFormat, ... ); -->
   <function name="CString::Format">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <leak-ignore/>
     <formatstr/>
     <arg nr="1">
@@ -1311,6 +1313,7 @@
   <!-- void CString::AppendFormat(LPCTSTR lpszFormat, ... ); -->
   <function name="CString::AppendFormat">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <leak-ignore/>
     <formatstr/>
     <arg nr="1">
@@ -1318,8 +1321,10 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- int printf_s(const char *format [, argument]...); -->
   <function name="printf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <formatstr secure="true"/>
     <arg nr="1">
@@ -1328,8 +1333,10 @@
       <not-null/>
     </arg>
   </function>
+  <!-- int wprintf_s(const wchar_t *format [, argument]...); -->
   <function name="wprintf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <formatstr secure="true"/>
     <arg nr="1">
@@ -1338,8 +1345,10 @@
       <not-null/>
     </arg>
   </function>
+  <!-- int fprintf_s(FILE *stream, const char *format [, argument ]...); -->
   <function name="fprintf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <formatstr secure="true"/>
     <arg nr="2">
@@ -1348,8 +1357,10 @@
       <not-null/>
     </arg>
   </function>
+  <!-- int fwprintf_s(FILE *stream, const wchar_t *format [, argument ]...); -->
   <function name="fwprintf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <formatstr secure="true"/>
     <arg nr="2">
@@ -1358,8 +1369,10 @@
       <not-null/>
     </arg>
   </function>
+  <!-- int _snprintf_s(char *buffer, size_t sizeOfBuffer, size_t count, const char *format [, argument] ...); -->
   <function name="_snprintf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <formatstr secure="true"/>
     <arg nr="4">
@@ -1368,8 +1381,10 @@
       <not-null/>
     </arg>
   </function>
+  <!-- int _snwprintf_s(wchar_t *buffer, size_t sizeOfBuffer, size_t count, const wchar_t *format [, argument] ...); -->
   <function name="_snwprintf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <formatstr secure="true"/>
     <arg nr="4">
@@ -1414,8 +1429,10 @@
       <not-null/>
     </arg>
   </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">
       <formatstr/>
@@ -1423,8 +1440,10 @@
       <not-null/>
     </arg>
   </function>
+  <!-- int wscanf_s(const wchar_t *format [, argument]...); -->
   <function name="wscanf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <formatstr scan="true" secure="true"/>
     <arg nr="1">
       <formatstr/>
@@ -1432,8 +1451,10 @@
       <not-null/>
     </arg>
   </function>
+  <!-- int sscanf_s(const char *buffer, const char *format [, argument ] ...); -->
   <function name="sscanf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <formatstr scan="true" secure="true"/>
     <arg nr="2">
       <formatstr/>
@@ -1459,8 +1480,10 @@
       <not-null/>
     </arg>
   </function>
+  <!-- int swscanf_s(const wchar_t *buffer, const wchar_t *format [, argument ] ...); -->
   <function name="swscanf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <formatstr scan="true" secure="true"/>
     <arg nr="2">
       <formatstr/>
@@ -1471,15 +1494,22 @@
   <!-- BOOL WINAPI CloseHandle(_In_  HANDLE hObject); -->
   <function name="CloseHandle">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
+  <!--HFILE WINAPI OpenFile(
+  _In_  LPCSTR     lpFileName,
+  _Out_ LPOFSTRUCT lpReOpenBuff,
+  _In_  UINT       uStyle);-->
   <function name="OpenFile">
     <noreturn>false</noreturn>
+    <returnValue type="HFILE"/>
     <arg nr="1">
       <not-uninit/>
       <not-null/>
+      <strz/>
     </arg>
     <arg nr="2"/>
     <arg nr="3">
@@ -1491,6 +1521,7 @@
   _Out_  LPDCB lpDCB); -->
   <function name="BuildCommDCB">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1502,6 +1533,7 @@
   _Out_  LPCOMMTIMEOUTS lpCommTimeouts); -->
   <function name="BuildCommDCBAndTimeouts">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1516,6 +1548,7 @@
   _Inout_opt_  LPOVERLAPPED lpOverlapped); -->
   <function name="WriteFile">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1536,6 +1569,7 @@
   _Inout_opt_  LPOVERLAPPED lpOverlapped); -->
   <function name="ReadFile">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1558,6 +1592,7 @@
   _In_opt_  HANDLE hTemplateFile); -->
   <function name="CreateFile">
     <noreturn>false</noreturn>
+    <returnValue type="HANDLE"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1585,6 +1620,7 @@
   _In_  LPCOMMTIMEOUTS lpCommTimeouts); -->
   <function name="SetCommTimeouts">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1597,6 +1633,7 @@
   _In_  LPDCB lpDCB);-->
   <function name="SetCommState">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1621,6 +1658,7 @@
   <function name="_mbstok_l">
     <pure/>
     <noreturn>false</noreturn>
+    <returnValue type="unsigned char *"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1694,6 +1732,7 @@
   _Out_ LPTSTR pszPath);-->
   <function name="SHGetFolderPath,SHGetFolderPathA,SHGetFolderPathW">
     <noreturn>false</noreturn>
+    <returnValue type="HRESULT"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1720,6 +1759,7 @@
   _Inout_opt_ LPDWORD lpcbData);-->
   <function name="RegQueryValueEx,RegQueryValueExA,RegQueryValueExW">
     <noreturn>false</noreturn>
+    <returnValue type="LONG"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1735,6 +1775,7 @@
   <!-- LONG WINAPI RegCloseKey(_In_ HKEY hKey );-->
   <function name="RegCloseKey">
     <noreturn>false</noreturn>
+    <returnValue type="LONG"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1745,6 +1786,7 @@
   <!-- int _mbsicmp_l(const wchar_t *string1, const wchar_t *string2, _locale_t locale); -->
   <function name="_stricmp_l,_wcsicmp_l,_mbsicmp_l">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1765,6 +1807,7 @@
   <!-- int _mbsicmp(const unsigned char *string1, const unsigned char *string2); -->
   <function name="stricmp,_stricmp,wcsicmp,_wcsicmp,_mbsicmp,_tcsicmp">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1778,6 +1821,7 @@
   <!-- DWORD WINAPI GetFileAttributes(_In_ LPCTSTR lpFileName);-->
   <function name="GetFileAttributes,GetFileAttributesA,GetFileAttributesW">
     <noreturn>false</noreturn>
+    <returnValue type="DWORD"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1791,6 +1835,7 @@
   _Out_    PHKEY   phkResult); -->
   <function name="RegOpenKeyEx,RegOpenKeyExA,RegOpenKeyExW">
     <noreturn>false</noreturn>
+    <returnValue type="LONG"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1806,6 +1851,7 @@
   <!-- 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">
       <not-uninit/>
@@ -1834,6 +1880,7 @@
        int _swprintf_s_l(wchar_t *buffer, size_t sizeOfBuffer, const wchar_t *format, locale_t locale, ...);-->
   <function name="_sprintf_s_l,_swprintf_s_l">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <minsize type="argvalue" arg="2"/>
@@ -1863,6 +1910,7 @@
   _Out_opt_   PFILETIME lpftLastWriteTime); -->
   <function name="RegEnumKeyEx,RegEnumKeyExA,RegEnumKeyExW">
     <noreturn>false</noreturn>
+    <returnValue type="LONG"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1892,13 +1940,20 @@ HFONT CreateFont(
 -->
   <function name="CreateFont">
     <noreturn>false</noreturn>
+    <returnValue type="HFONT"/>
     <arg nr="any">
       <not-uninit/>
     </arg>
     <arg nr="14"/>
   </function>
+  <!-- USHORT WINAPI CaptureStackBackTrace(
+  _In_      ULONG  FramesToSkip,
+  _In_      ULONG  FramesToCapture,
+  _Out_     PVOID  *BackTrace,
+  _Out_opt_ PULONG BackTraceHash); -->
   <function name="CaptureStackBackTrace">
     <noreturn>false</noreturn>
+    <returnValue type="USHORT"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -1911,6 +1966,7 @@ HFONT CreateFont(
        int _vsnwprintf(wchar_t *buffer, size_t count, const wchar_t *format, va_list argptr);-->
   <function name="_vsnprintf,_vsnwprintf">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1931,6 +1987,7 @@ HFONT CreateFont(
        int _vswprintf_l(wchar_t *buffer,  size_t count, const wchar_t *format, locale_t locale, va_list argptr);-->
   <function name="_vsnprintf_l,_vsnwprintf_l,_vswprintf_l">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1954,6 +2011,7 @@ HFONT CreateFont(
        int _vsnwprintf_s( wchar_t *buffer, size_t sizeOfBuffer, size_t count, const wchar_t *format, va_list argptr); -->
   <function name="vsnprintf_s,_vsnprintf_s,_vsnwprintf_s">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1977,6 +2035,7 @@ HFONT CreateFont(
        int _vsnwprintf_s_l(wchar_t *buffer, size_t sizeOfBuffer, size_t count, const wchar_t *format, locale_t locale, va_list argptr); -->
   <function name="_vsnprintf_s_l,_vsnwprintf_s_l">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2003,6 +2062,7 @@ HFONT CreateFont(
       int __vswprintf_l(wchar_t *buffer, const wchar_t *format, locale_t locale, va_list argptr);-->
   <function name="_vsprintf_l,__vswprintf_l">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2049,6 +2109,7 @@ HFONT CreateFont(
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2065,6 +2126,7 @@ HFONT CreateFont(
        int _snwprintf(wchar_t *buffer, size_t count, const wchar_t *format, ...);-->
   <function name="_snprintf,_snwprintf,_sntprintf">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <minsize type="argvalue" arg="2"/>
@@ -2085,6 +2147,7 @@ HFONT CreateFont(
        errno_t _mbscpy_s(unsigned char *strDestination, size_t numberOfElements, const unsigned char *strSource); -->
   <function name="strcpy_s,wcscpy_s,_mbscpy_s,_tcscpy_s">
     <noreturn>false</noreturn>
+    <returnValue type="errno_t"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2101,6 +2164,7 @@ HFONT CreateFont(
   <!-- int _CrtSetDbgFlag(int newFlag); -->
   <function name="_CrtSetDbgFlag">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2120,6 +2184,7 @@ HFONT CreateFont(
        int _wstat64i32(const wchar_t *path, struct _stat64i32 *buffer); -->
   <function name="_stat,_tstat,_stat32,_stat64,_tstat64,_stati64,_tstati64,_stat32i64,_tstat32i64,_stat64i32,_tstat64i32,_wstat,_wstat32,_wstat64,_wstati64,_wstat32i64,_wstat64i32">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2137,6 +2202,7 @@ HFONT CreateFont(
        int _fstat64i32(int fd, struct _stat64i32 *buffer);-->
   <function name="_fstat,_fstat32,_fstat64,_fstati64,_fstat32i64,_fstat64i32">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2148,6 +2214,7 @@ HFONT CreateFont(
   <!-- int _fseeki64(FILE *stream, __int64 offset, int origin); -->
   <function name="_fseeki64">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2176,6 +2243,7 @@ HFONT CreateFont(
   <function name="_wfopen,_tfopen">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="FILE *"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -2193,6 +2261,7 @@ HFONT CreateFont(
   <function name="strnlen_s,wcsnlen_s,_mbsnlen,_mbstrnlen">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="size_t"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2208,6 +2277,7 @@ HFONT CreateFont(
   <function name="_mbsnlen_l,_mbstrnlen_l">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="size_t"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2233,6 +2303,7 @@ HFONT CreateFont(
   ); -->
   <function name="WideCharToMultiByte">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2258,6 +2329,7 @@ HFONT CreateFont(
   <function name="PathIsDirectory,PathIsDirectoryA,PathIsDirectoryW">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2268,6 +2340,7 @@ HFONT CreateFont(
   _In_ WORD   wAttributes); -->
   <function name="SetConsoleTextAttribute">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2279,6 +2352,7 @@ HFONT CreateFont(
   <!-- errno_t _wfopen_s(FILE** pFile, const wchar_t *filename, const wchar_t *mode); -->
   <function name="_wfopen_s,_tfopen_s">
     <noreturn>false</noreturn>
+    <returnValue type="errno_t"/>
     <arg nr="1">
       <not-null/>
     </arg>
@@ -2295,6 +2369,7 @@ HFONT CreateFont(
   <!-- BOOL WINAPI DeleteFile(_In_ LPCTSTR lpFileName);-->
   <function name="DeleteFile,DeleteFileA,DeleteFileW">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2304,6 +2379,7 @@ HFONT CreateFont(
   <function name="GetStdHandle">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="HANDLE"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2312,6 +2388,7 @@ HFONT CreateFont(
   <!-- BOOL WINAPI SetStdHandle(_In_ DWORD  nStdHandle, _In_ HANDLE hHandle); -->
   <function name="SetStdHandle">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2324,6 +2401,7 @@ HFONT CreateFont(
        int _waccess(const wchar_t *path, int mode); -->
   <function name="_access,_waccess,_taccess">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2333,8 +2411,15 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- BOOL WINAPI PeekMessage(
+  _Out_    LPMSG lpMsg,
+  _In_opt_ HWND  hWnd,
+  _In_     UINT  wMsgFilterMin,
+  _In_     UINT  wMsgFilterMax,
+  _In_     UINT  wRemoveMsg); -->
   <function name="PeekMessage,PeekMessageA,PeekMessageW">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2352,8 +2437,14 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- BOOL WINAPI GetMessage(
+  _Out_    LPMSG lpMsg,
+  _In_opt_ HWND  hWnd,
+  _In_     UINT  wMsgFilterMin,
+  _In_     UINT  wMsgFilterMax); -->
   <function name="GetMessage,GetMessageA,GetMessageW">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2368,14 +2459,19 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- BOOL WINAPI TranslateMessage(
+  _In_ const MSG *lpMsg); -->
   <function name="TranslateMessage">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
   </function>
+  <!-- LRESULT WINAPI DispatchMessage(
+  _In_ const MSG *lpmsg); -->
   <function name="DispatchMessage,DispatchMessageA,DispatchMessageW">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -2384,6 +2480,16 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- LRESULT WINAPI SendMessage(
+  _In_ HWND   hWnd,
+  _In_ UINT   Msg,
+  _In_ WPARAM wParam,
+  _In_ LPARAM lParam); -->
+  <!-- BOOL WINAPI PostMessage(
+  _In_opt_ HWND   hWnd,
+  _In_     UINT   Msg,
+  _In_     WPARAM wParam,
+  _In_     LPARAM lParam); -->
   <function name="SendMessage,SendMessageA,SendMessageW,PostMessage,PostMessageA,PostMessageW">
     <noreturn>false</noreturn>
     <arg nr="1">
@@ -2400,13 +2506,21 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- VOID WINAPI PostQuitMessage(
+  _In_ int nExitCode); -->
   <function name="PostQuitMessage">
     <noreturn>false</noreturn>
+    <returnValue type="VOID"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
+  <!-- LRESULT WINAPI DefWindowProc(
+  _In_ HWND   hWnd,
+  _In_ UINT   Msg,
+  _In_ WPARAM wParam,
+  _In_ LPARAM lParam); -->
   <function name="DefWindowProc,DefWindowProcA,DefWindowProcW">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -2424,8 +2538,14 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- UINT WINAPI GetPrivateProfileInt(
+  _In_ LPCTSTR lpAppName,
+  _In_ LPCTSTR lpKeyName,
+  _In_ INT     nDefault,
+  _In_ LPCTSTR lpFileName); -->
   <function name="GetPrivateProfileInt,GetPrivateProfileIntA,GetPrivateProfileIntW">
     <noreturn>false</noreturn>
+    <returnValue type="UINT"/>
     <use-retval/>
     <leak-ignore/>
     <arg nr="1">
@@ -2447,8 +2567,14 @@ HFONT CreateFont(
       <strz/>
     </arg>
   </function>
+  <!-- DWORD WINAPI GetPrivateProfileSection(
+  _In_  LPCTSTR lpAppName,
+  _Out_ LPTSTR  lpReturnedString,
+  _In_  DWORD   nSize,
+  _In_  LPCTSTR lpFileName); -->
   <function name="GetPrivateProfileSection,GetPrivateProfileSectionA,GetPrivateProfileSectionW">
     <noreturn>false</noreturn>
+    <returnValue type="DWORD"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2468,8 +2594,13 @@ HFONT CreateFont(
       <strz/>
     </arg>
   </function>
+  <!-- DWORD WINAPI GetPrivateProfileSectionNames(
+  _Out_ LPTSTR  lpszReturnBuffer,
+  _In_  DWORD   nSize,
+  _In_  LPCTSTR lpFileName); -->
   <function name="GetPrivateProfileSectionNames,GetPrivateProfileSectionNamesA,GetPrivateProfileSectionNamesW">
     <noreturn>false</noreturn>
+    <returnValue type="DWORD"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2484,8 +2615,16 @@ HFONT CreateFont(
       <strz/>
     </arg>
   </function>
+  <!-- DWORD WINAPI GetPrivateProfileString(
+  _In_  LPCTSTR lpAppName,
+  _In_  LPCTSTR lpKeyName,
+  _In_  LPCTSTR lpDefault,
+  _Out_ LPTSTR  lpReturnedString,
+  _In_  DWORD   nSize,
+  _In_  LPCTSTR lpFileName); -->
   <function name="GetPrivateProfileString,GetPrivateProfileStringA,GetPrivateProfileStringW">
     <noreturn>false</noreturn>
+    <returnValue type="DWORD"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2511,8 +2650,15 @@ HFONT CreateFont(
       <strz/>
     </arg>
   </function>
+  <!-- BOOL WINAPI GetPrivateProfileStruct(
+  _In_  LPCTSTR lpszSection,
+  _In_  LPCTSTR lpszKey,
+  _Out_ LPVOID  lpStruct,
+  _In_  UINT    uSizeStruct,
+  _In_  LPCTSTR szFile); -->
   <function name="GetPrivateProfileStruct,GetPrivateProfileStructA,GetPrivateProfileStructW">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2537,8 +2683,12 @@ HFONT CreateFont(
       <strz/>
     </arg>
   </function>
+  <!-- HDC BeginPaint(
+  _In_  HWND          hwnd,
+  _Out_ LPPAINTSTRUCT lpPaint); -->
   <function name="BeginPaint">
     <noreturn>false</noreturn>
+    <returnValue type="HDC"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2547,8 +2697,12 @@ HFONT CreateFont(
       <not-null/>
     </arg>
   </function>
+  <!-- BOOL EndPaint(
+  _In_       HWND        hWnd,
+  _In_ const PAINTSTRUCT *lpPaint); -->
   <function name="EndPaint">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2557,8 +2711,11 @@ HFONT CreateFont(
       <not-null/>
     </arg>
   </function>
+  <!-- HGDIOBJ GetStockObject(
+  _In_ int fnObject); -->
   <function name="GetStockObject">
     <noreturn>false</noreturn>
+    <returnValue type="HGDIOBJ"/>
     <pure/>
     <use-retval/>
     <leak-ignore/>
@@ -2566,8 +2723,12 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- HICON WINAPI LoadIcon(
+  _In_opt_ HINSTANCE hInstance,
+  _In_     LPCTSTR   lpIconName); -->
   <function name="LoadIcon,LoadIconA,LoadIconW">
     <noreturn>false</noreturn>
+    <returnValue type="HICON"/>
     <leak-ignore/>
     <use-retval/>
     <arg nr="1">
@@ -2578,24 +2739,34 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- HBRUSH CreateSolidBrush(
+  _In_ COLORREF crColor); -->
   <function name="CreateSolidBrush">
     <noreturn>false</noreturn>
+    <returnValue type="HBRUSH"/>
     <leak-ignore/>
     <use-retval/>
     <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
+  <!-- BOOL UpdateWindow(
+  _In_ HWND hWnd); -->
   <function name="UpdateWindow">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
   </function>
+  <!-- BOOL WINAPI EnableWindow(
+  _In_ HWND hWnd,
+  _In_ BOOL bEnable); -->
   <function name="EnableWindow">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2605,8 +2776,21 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- HWND WINAPI CreateWindow(
+  _In_opt_ LPCTSTR   lpClassName,
+  _In_opt_ LPCTSTR   lpWindowName,
+  _In_     DWORD     dwStyle,
+  _In_     int       x,
+  _In_     int       y,
+  _In_     int       nWidth,
+  _In_     int       nHeight,
+  _In_opt_ HWND      hWndParent,
+  _In_opt_ HMENU     hMenu,
+  _In_opt_ HINSTANCE hInstance,
+  _In_opt_ LPVOID    lpParam); -->
   <function name="CreateWindow,CreateWindowA,CreateWindowW">
     <noreturn>false</noreturn>
+    <returnValue type="HWND"/>
     <use-retval/>
     <leak-ignore/>
     <arg nr="1">
@@ -2643,8 +2827,22 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- HWND WINAPI CreateWindowEx(
+  _In_     DWORD     dwExStyle,
+  _In_opt_ LPCTSTR   lpClassName,
+  _In_opt_ LPCTSTR   lpWindowName,
+  _In_     DWORD     dwStyle,
+  _In_     int       x,
+  _In_     int       y,
+  _In_     int       nWidth,
+  _In_     int       nHeight,
+  _In_opt_ HWND      hWndParent,
+  _In_opt_ HMENU     hMenu,
+  _In_opt_ HINSTANCE hInstance,
+  _In_opt_ LPVOID    lpParam); -->
   <function name="CreateWindowEx,CreateWindowExA,CreateWindowExW">
     <noreturn>false</noreturn>
+    <returnValue type="HWND"/>
     <use-retval/>
     <leak-ignore/>
     <arg nr="1">
@@ -2684,8 +2882,12 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- BOOL WINAPI SetWindowText(
+  _In_     HWND    hWnd,
+  _In_opt_ LPCTSTR lpString); -->
   <function name="SetWindowText,SetWindowTextA,SetWindowTextW">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2696,6 +2898,10 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- ATOM WINAPI RegisterClass(
+  _In_ const WNDCLASS *lpWndClass); -->
+  <!-- ATOM WINAPI RegisterClassEx(
+  _In_ const WNDCLASSEX *lpwcx); -->
   <function name="RegisterClass,RegisterClassEx">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -2704,8 +2910,12 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- BOOL WINAPI UnregisterClass(
+  _In_     LPCTSTR   lpClassName,
+  _In_opt_ HINSTANCE hInstance); -->
   <function name="UnregisterClass,UnregisterClassA,UnregisterClassW">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -2713,8 +2923,14 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!-- int WINAPI MessageBox(
+  _In_opt_ HWND    hWnd,
+  _In_opt_ LPCTSTR lpText,
+  _In_opt_ LPCTSTR lpCaption,
+  _In_     UINT    uType); -->
   <function name="MessageBox,MessageBoxA,MessageBoxW">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2729,27 +2945,51 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
-  <function name="GlobalLock,GlobalUnlock">
+  <!-- LPVOID WINAPI GlobalLock(
+  _In_ HGLOBAL hMem); -->
+  <function name="GlobalLock">
     <noreturn>false</noreturn>
+    <returnValue type="LPVOID"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
       <not-null/>
     </arg>
   </function>
+  <!-- BOOL WINAPI GlobalUnlock(
+  _In_ HGLOBAL hMem); -->
+  <function name="GlobalUnlock">
+    <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+  </function>
+  <!-- BOOL WINAPI OpenClipboard(
+  _In_opt_ HWND hWndNewOwner); -->
   <function name="OpenClipboard">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
+  <!-- BOOL WINAPI EmptyClipboard(void); -->
+  <!-- BOOL WINAPI CloseClipboard(void); -->
   <function name="EmptyClipboard,CloseClipboard">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
   </function>
+  <!-- HANDLE WINAPI SetClipboardData(
+  _In_     UINT   uFormat,
+  _In_opt_ HANDLE hMem); -->
   <function name="SetClipboardData">
     <noreturn>false</noreturn>
+    <returnValue type="HANDLE"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2762,6 +3002,7 @@ HFONT CreateFont(
        int _wrmdir(const wchar_t *dirname);-->
   <function name="_rmdir,_wrmdir">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2772,6 +3013,7 @@ HFONT CreateFont(
        int _wmkdir(const wchar_t *dirname); -->
   <function name="_mkdir,_wmkdir">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2784,7 +3026,7 @@ HFONT CreateFont(
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <returnValue>arg1&gt;0?arg1:-arg1</returnValue>
+    <returnValue type="__int64">arg1&gt;0?arg1:-arg1</returnValue>
     <arg nr="1">
       <not-uninit/>
       <not-bool/>
@@ -2797,6 +3039,7 @@ HFONT CreateFont(
   <function name="CreateWaitableTimer">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="HANDLE"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -2816,6 +3059,7 @@ HFONT CreateFont(
   _In_           BOOL             fResume);-->
   <function name="SetWaitableTimer">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2842,6 +3086,7 @@ HFONT CreateFont(
   _In_ DWORD  dwMilliseconds); -->
   <function name="WaitForSingleObject">
     <noreturn>false</noreturn>
+    <returnValue type="DWORD"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2853,6 +3098,7 @@ HFONT CreateFont(
   <!-- int _pclose(FILE *stream); -->
   <function name="_pclose">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -2862,6 +3108,7 @@ HFONT CreateFont(
        FILE *_wpopen(const wchar_t *command, const wchar_t *mode);-->
   <function name="_popen,_wpopen,_tpopen">
     <noreturn>false</noreturn>
+    <returnValue type="FILE *"/>
     <use-retval/>
     <arg nr="1">
       <not-null/>
@@ -2894,6 +3141,7 @@ HFONT CreateFont(
   <function name="FindFirstFileEx,FindFirstFileExA,FindFirstFileExW">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="HANDLE"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -2917,6 +3165,7 @@ HFONT CreateFont(
   <function name="FindFirstFile,FindFirstFileW,FindFirstFileA">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="HANDLE"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -2928,6 +3177,7 @@ HFONT CreateFont(
   <!-- BOOL WINAPI FindClose(_Inout_ HANDLE hFindFile); -->
   <function name="FindClose">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -2943,6 +3193,7 @@ HFONT CreateFont(
   <function name="CreateThread">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="HANDLE"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -2967,6 +3218,7 @@ HFONT CreateFont(
   <function name="FindNextFile,FindNextFileW,FindNextFileA">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -2981,6 +3233,7 @@ HFONT CreateFont(
   _In_opt_ LPCTSTR lpValue);-->
   <function name="SetEnvironmentVariable,SetEnvironmentVariableW,SetEnvironmentVariableA">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -2994,6 +3247,7 @@ HFONT CreateFont(
   <function name="QueryDosDevice,QueryDosDeviceW,QueryDosDeviceA">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="DWORD"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -3009,6 +3263,7 @@ HFONT CreateFont(
   <function name="GetDefaultCommConfig,GetDefaultCommConfigW,GetDefaultCommConfigA">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -3023,6 +3278,7 @@ HFONT CreateFont(
   _Out_ LPTSTR lpBuffer);-->
   <function name="GetTempPath,GetTempPathW,GetTempPathA">
     <noreturn>false</noreturn>
+    <returnValue type="DWORD"/>
     <leak-ignore/>
     <arg nr="1">
       <valid>0:</valid>
@@ -3035,6 +3291,7 @@ HFONT CreateFont(
   <!-- BOOL SetupDiDestroyDeviceInfoList(_In_ HDEVINFO DeviceInfoSet);-->
   <function name="SetupDiDestroyDeviceInfoList">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -3048,6 +3305,7 @@ HFONT CreateFont(
   _Out_opt_ PDWORD           RequiredSize);-->
   <function name="SetupDiGetDeviceInstanceId">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -3066,6 +3324,7 @@ HFONT CreateFont(
   _Out_ PSP_DEVINFO_DATA DeviceInfoData);-->
   <function name="SetupDiEnumDeviceInfo">
     <noreturn>false</noreturn>
+    <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -3082,6 +3341,7 @@ HFONT CreateFont(
   _In_           DWORD  Flags ); -->
   <function name="SetupDiGetClassDevs">
     <noreturn>false</noreturn>
+    <returnValue type="HDEVINFO"/>
     <leak-ignore/>
     <arg nr="2">
       <not-uninit/>
@@ -3096,7 +3356,6 @@ HFONT CreateFont(
   <!-- unsigned char *_mbsstr(const unsigned char *str, const unsigned char *strSearch  -->
   <function name="_mbsstr,_tcsstr">
     <use-retval/>
-    <returnValue type="unsigned char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -3186,14 +3445,15 @@ HFONT CreateFont(
   <!-- void _swab(char *src, char *dest, int n);-->
   <function name="_swab">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
+      <not-uninit/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="2">
       <not-null/>
-      <not-uninit/>
       <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="3">
@@ -3277,6 +3537,7 @@ HFONT CreateFont(
   <function name="_aligned_malloc">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="void *"/>
     <arg nr="1">
       <not-uninit/>
       <valid>0:</valid>
@@ -3541,6 +3802,7 @@ HFONT CreateFont(
       _In_ DWORD dwMilliseconds);-->
   <function name="Sleep">
     <noreturn>false</noreturn>
+    <returnValue type="VOID"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -3635,6 +3897,7 @@ HFONT CreateFont(
   _In_ DWORD   dwExitCode);-->
   <function name="FreeLibraryAndExitThread">
     <noreturn>true</noreturn>
+    <returnValue type="VOID"/>
     <arg nr="1">
       <not-uninit/>
       <not-bool/>
@@ -3747,6 +4010,7 @@ HFONT CreateFont(
   _Out_ LPCRITICAL_SECTION lpCriticalSection);-->
   <function name="InitializeCriticalSection">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <arg nr="1">
       <not-null/>
       <not-bool/>
@@ -3807,6 +4071,7 @@ HFONT CreateFont(
   _Inout_ LPCRITICAL_SECTION lpCriticalSection);-->
   <function name="DeleteCriticalSection">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -3817,6 +4082,7 @@ HFONT CreateFont(
   _Inout_ LPCRITICAL_SECTION lpCriticalSection);-->
   <function name="EnterCriticalSection">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -3840,6 +4106,7 @@ HFONT CreateFont(
   _Inout_ LPCRITICAL_SECTION lpCriticalSection);-->
   <function name="LeaveCriticalSection">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -4064,6 +4331,7 @@ HFONT CreateFont(
   void *memblock);-->
   <function name="_freea">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -4094,6 +4362,7 @@ HFONT CreateFont(
   <!--void WINAPI GetSystemTime(_Out_ LPSYSTEMTIME lpSystemTime);-->
   <function name="GetLocalTime,GetSystemTime">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -4108,6 +4377,7 @@ HFONT CreateFont(
   <!--void WINAPI SetLastError(_In_ DWORD dwErrCode);-->
   <function name="SetLastError">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -4734,6 +5004,7 @@ HFONT CreateFont(
   __in  int iError);-->
   <function name="WSASetLastError">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -4830,12 +5101,14 @@ HFONT CreateFont(
   <!-- Intrinsic __noop https://docs.microsoft.com/en-us/cpp/intrinsics/noop -->
   <function name="__noop">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
     <leak-ignore/>
     <arg nr="any"/>
   </function>
   <!-- Intrinsic void __nop(); https://docs.microsoft.com/en-us/cpp/intrinsics/nop -->
   <function name="__nop">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
   </function>
   <podtype name="LARGE_INTEGER" sign="s" size="8"/>
   <podtype name="POINTER_SIGNED" sign="s"/>