Moved the rest of the API specification from the global file to the

tools/winapi_check/win16/commdlg.api

+%long
+
+DWORD
+LONG
+LPARAM
+LRESULT
+
+%long # --forbidden
+
+BOOL
+
 %ptr
 
 LPCHOOSECOLOR16
 LPCHOOSEFONT16
 LPPRINTDLG16
 
+%segptr
+
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
 %word
 
+BOOL16
+HINSTANCE16
+HWND16
+INT16
+UINT16
+WORD
+WPARAM16
 short

tools/winapi_check/win16/compobj.api

 %long
 
+DWORD
+HRESULT
 ULONG
 
+%long # --forbidden
+
+BOOL
+INT
+
 %ptr
 
 CLSID *
@@ -10,17 +17,38 @@ GUID *
 HTASK16 *
 IMalloc16 *
 LPCLSID
+LPDWORD
 LPFILETIME
 LPMALLOC16 *
 LPMESSAGEFILTER
 LPMESSAGEFILTER *
 LPOLESTR16 *
 LPUNKNOWN
+LPVOID
 LPVOID *
+LPWORD
 REFCLSID
 REFGUID
 REFIID
 
+%str
+
+LPCOLESTR16
+
 %str # --forbidden
 
-LPOLESTR
\ No newline at end of file
+LPOLESTR
+
+%void
+
+void
+VOID
+
+%word
+
+BOOL16
+HINSTANCE16
+HTASK16
+OLESTATUS
+INT16
+WORD

tools/winapi_check/win16/ddeml.api

 %long
 
+DWORD
 HCONV
 HCONVLIST
 HDDEDATA
 HSZ
 
+%long # --forbidden
+
+int
+
 %ptr
 
+LPBYTE
 LPCONVCONTEXT16
 LPCONVINFO16
+LPDWORD
+LPVOID
+
+%str
+
+LPCSTR
+LPSTR
+
+%word
+
+BOOL16
+INT16
+UINT16
+

tools/winapi_check/win16/display.api

+%long
+
+DWORD
+
 %ptr
 
 LPCURSORINFO
@@ -5,3 +9,16 @@ LPCURSORINFO
 %ptr # --forbidden
 
 struct tagCURSORICONINFO *
+
+%str
+
+LPSTR
+
+%void
+
+VOID
+
+%word
+
+BOOL16
+WORD

tools/winapi_check/win16/gdi.api

+%long
+
+COLORREF
+DWORD
+LONG
+LPARAM
+
+%long # --forbidden
+
+HANDLE
+UINT
+int
+
 %ptr
 
 BITMAP16 *
@@ -6,14 +19,19 @@ DEVMODEA *
 DOCINFO16 *
 FARPROC16 *
 HANDLETABLE16 *
+INT16 *
 LOGBRUSH16 *
 LOGFONT16 *
 LOGPALETTE *
 LOGPEN16 *
 LPABC16
+LPBYTE
+LPCVOID
+LPDWORD
 LPENUMLOGFONT16
 LPFONTINFO16
 LPGLYPHMETRICS16
+LPINT16
 LPKERNINGPAIR16
 LPLOGFONT16
 LPNEWTEXTMETRIC16
@@ -26,11 +44,14 @@ LPRECT16
 LPRGNDATA
 LPSIZE16
 LPTEXTXFORM16
+LPVOID
 MAT2 *
 METARECORD *
 PALETTEENTRY *
+POINT16 *
 RECT16 *
 RGBQUAD *
+SEGPTR *
 TEXTMETRIC16 *
 VOID *
 
@@ -40,19 +61,42 @@ LPDEVMODEA
 
 %segptr
 
+FARPROC16
 FONTENUMPROC16
 FONTENUMPROCEX16
 GOBJENUMPROC16
 LINEDDAPROC16
 MFENUMPROC16
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
 
 %word
 
+BOOL16
+BYTE
+HANDLE16
+HBITMAP16
+HBRUSH16
 HDC16
 HFONT16
 HGDIOBJ16
+HGLOBAL16
 HMETAFILE16
+HMODULE16
+HPALETTE16
 HPEN16
 HPJOB16
 HPQ16
-HRGN16
\ No newline at end of file
+HRGN16
+INT16
+UINT16
+WORD

tools/winapi_check/win16/kernel.api

+%long
+
+DWORD
+LONG
+
 %long # --forbidden
 
+BOOL
+HANDLE
+HINSTANCE
 HMODULE
+INT
+UINT
 
 %ptr
 
 BYTE *
+CONTEXT86 *
 FARPROC16 *
 HANDLE *
+LPBYTE
 LPCATCHBUF
+LPCVOID
+LPDWORD
+LPVOID
 OFSTRUCT *
 OSVERSIONINFO16 *
 SECURITY_ATTRIBUTES *
@@ -16,6 +31,7 @@ SYSLEVEL *
 THUNKLET *
 WIN32_FIND_DATAA *
 WINDEBUGINFO *
+UINT16 *
 struct ThunkDataCommon *
 
 %ptr # --forbidden
@@ -24,12 +40,38 @@ FARPROC
 FARPROC *
 LPHKEY
 
+%segptr
+
+FARPROC16
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
+
 %word
 
 ATOM
+BOOL16
+BYTE
+HANDLE16
+HFILE16
+HGLOBAL16
+HINSTANCE16
 HLOCAL16
+HMODULE16
 HQUEUE16
 HRSRC16
+HTASK16
+INT16
+UINT16
+WORD
 
 %word # --forbidden
 
@@ -38,4 +80,3 @@ HKEY
 %wstr # --forbidden
 
 LPCWSTR
-

tools/winapi_check/win16/keyboard.api

+%long
+
+DWORD
+LONG
+
+%ptr
+
+LPBYTE
+LPVOID
+
+%segptr
+
+FARPROC16
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+VOID
+
 %word
 
-CHAR
\ No newline at end of file
+CHAR
+INT16
+UINT16
+WORD
+

tools/winapi_check/win16/lzexpand.api

+%long
+
+LONG
+
 %ptr
 
 LPOFSTRUCT
+LPVOID
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
+%word
+
+HFILE16
+INT16
+UINT16
+

tools/winapi_check/win16/mmsystem.api

 %long
 
+DWORD
 FOURCC
+LONG
+LPARAM
+LRESULT
 
 %long # --forbidden
 
+BOOL
+HINSTANCE
 HWND
 
 %ptr
@@ -18,6 +24,8 @@ HPSTR
 HWAVEIN16 *
 HWAVEOUT16 *
 LPAUXCAPS16
+LPBYTE
+LPDWORD
 LPHANDLE
 LPHMIXER16
 LPJOYCAPS16
@@ -40,6 +48,7 @@ LPWAVEOUTCAPS16
 MIDIHDR16 *
 MMCKINFO *
 MMIOINFO16 *
+UINT16 *
 WAVEHDR *
 WORD *
 
@@ -50,21 +59,41 @@ LPWAVEHDR
 
 %segptr
 
+FARPROC16
 LPTIMECALLBACK16
+SEGPTR
 
 %segptr # --forbidden
 
 YIELDPROC
 
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
 %word
 
+BOOL16
+HANDLE16
 HDRVR16
+HINSTANCE16
 HMIDIIN16
 HMIDIOUT16
 HMIDISTRM16
 HMIXER16
 HMIXEROBJ16
 HMMIO16
+HMODULE16
+HTASK16
 HWAVEIN16
 HWAVEOUT16
-MMRESULT16
\ No newline at end of file
+HWND16
+INT16
+MMRESULT16
+UINT16
+WORD

tools/winapi_check/win16/mouse.api

+%segptr
+
+FARPROC16
+
+%void
+
+VOID
\ No newline at end of file

tools/winapi_check/win16/msacm.api

+%long
+
+DWORD
+LPARAM
+LRESULT
+
 %ptr
 
 ACMDRIVERENUMCB16
@@ -13,9 +19,11 @@ LPACMFORMATCHOOSE16
 LPACMFORMATDETAILS16
 LPACMFORMATTAGDETAILS16
 LPACMSTREAMHEADER16
+LPDWORD
 LPHACMDRIVER16
 LPHACMDRIVERID16
 LPHACMSTREAM16
+LPVOID
 
 %ptr # --forbidden
 
@@ -28,4 +36,6 @@ HACMDRIVER16
 HACMDRIVERID16
 HACMOBJ16
 HACMSTREAM16
-MMRESULT16
\ No newline at end of file
+HINSTANCE16
+MMRESULT16
+UINT16

tools/winapi_check/win16/msvideo.api

+%long
+
+DWORD
+
+%ptr
+
+LPVOID
+
+%word
+
+WORD

tools/winapi_check/win16/ole2.api

+%long
+
+DWORD
+HRESULT
+
 %ptr
 
 LPDROPTARGET
 LPMONIKER *
 LPRUNNINGOBJECTTABLE *
+LPVOID
+
+%str
+
+LPCOLESTR16
+
+%void
+
+void
+
+%word
+
+HGLOBAL16
+HICON16
+HWND16
+UINT16
+

tools/winapi_check/win16/ole2disp.api

+%long
+
+DWORD
+HRESULT
+LCID
+
+%long # --forbidden
+
+int
+unsigned
+
 %ptr
 
 BSTR16 *
@@ -6,11 +17,20 @@ INTERFACEDATA *
 ITypeInfo **
 IUnknown *
 REFCLSID
+char *
 
 %segstr
 
 BSTR16
 
-%word # --forbidden
+%str
 
-unsigned
+LPCOLESTR16
+
+%void
+
+void
+
+%word
+
+INT16
\ No newline at end of file

tools/winapi_check/win16/ole2nls.api

 %long
 
+DWORD
+LCID
 LCTYPE
 
+%ptr
+
+LPVOID
+LPWORD
+
+%str
+
+LPCSTR
+LPSTR
+
 %word
 
 LANGID
+BOOL16
+INT16
+UINT16
+
+

tools/winapi_check/win16/olecli.api

 %long
 
 LHCLIENTDOC
+LONG
 
 %ptr
 
@@ -9,6 +10,20 @@ LPOLECLIENT
 LPOLEOBJECT
 LPOLEOBJECT *
 
+%segptr
+
+SEGPTR
+
+%str
+
+LPCSTR
+
 %word
 
+BOOL16
 HDC16
+OLESTATUS
+UINT16
+
+
+

tools/winapi_check/win16/olesvr.api

@@ -9,3 +9,10 @@ BOOL16 *
 LHSERVERDOC *
 LPOLESERVERDOC
 
+%str
+
+LPCSTR
+
+%word
+
+OLESTATUS

tools/winapi_check/win16/setupx.api

-%word # --forbidden
+%long
 
-HKEY
+DWORD
 
 %ptr
 
+LPBYTE
+LPDWORD
+
+%ptr # --forbidden
+
 LPHKEY
+
+%str
+
+LPCSTR
+LPSTR
+
+%word # --forbidden
+
+HKEY

tools/winapi_check/win16/shell.api

+%long
+
+DWORD
+LPARAM
+LRESULT
+
+%long # --forbidden
+
+BOOL
+
 %ptr
 
 HICON16 *
+LPDWORD
+LPWORD
+POINT16 *
 
 %ptr # --forbidden
 
 LPHKEY
 
+%segptr
+
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
 %word
 
+BOOL16
 HDROP16
+HGLOBAL16
+HICON16
+HINSTANCE16
+HWND16
+INT16
+UINT16
+WORD
+WPARAM16
 
 %word # --forbidden
 
-HKEY
+HKEY
\ No newline at end of file

tools/winapi_check/win16/sound.api

+%long
+
+DWORD
+
+%ptr
+
+LPINT16
+
+%void
+
+void
+
+%word
+
+INT16

tools/winapi_check/win16/storage.api

 %long
 
+DWORD
+HRESULT
 ULONG
 
 %longlong
@@ -20,5 +22,10 @@ SNB16
 STATSTG16 *
 ULARGE_INTEGER *
 ULONG *
+void *
+
+%str
+
+LPCOLESTR16
 
 

tools/winapi_check/win16/stress.api

+%long
+
+LONG
+
+%void
+
+void
+
+%word
+
+BOOL16
+INT16
+UINT16

tools/winapi_check/win16/system.api

+%long
+
+DWORD
+
+%ptr
+
+char *
+
+%segptr
+
+FARPROC16
+
+%void
+
+void
+
+%word
+
+WORD

tools/winapi_check/win16/toolhelp.api

+%long
+
+DWORD
+
 %ptr
 
 CLASSENTRY *
@@ -11,6 +15,7 @@ STACKTRACEENTRY *
 TASKENTRY *
 SYSHEAPINFO *
 TIMERINFO *
+void *
 
 %ptr # --forbidden
 
@@ -18,3 +23,18 @@ FARPROC
 LOCAL32ENTRY *
 LOCAL32INFO *
 
+%segptr
+
+FARPROC16
+
+%str
+
+LPCSTR
+
+%word
+
+BOOL16
+HGLOBAL16
+HMODULE16
+HTASK16
+WORD

tools/winapi_check/win16/typelib.api

+%long
+
+DWORD
+HRESULT
+LCID
+
 %ptr
 
 LPBSTR16
 REFGUID
+void *
 
 %str # --forbidden
 
 LPOLESTR
+
+%word
+
+WORD

tools/winapi_check/win16/user.api

 %long
 
+COLORREF
+DWORD
 HHOOK
+LONG
+LPARAM
+LRESULT
 POINT16
 
+%long # --forbidden
+
+BOOL
+INT
+UINT
+HINSTANCE 
+
 %ptr
 
 BOOL16 *
 COLORREF *
+CONTEXT86 *
 CURSORICONINFO *
 DWORD *
 HHOOK *
+INT16 *
+LPBYTE
 LPCOMSTAT16
+LPCVOID
 LPDCB16
 LPDRIVERINFOSTRUCT16
+LPDWORD
 LPICONINFO16
+LPINT16
 LPMSG16
 LPMSG16_32
 LPMSGBOXPARAMS16
@@ -22,19 +40,25 @@ LPPOINT16
 LPQUEUESTRUCT16 *
 LPRECT16
 LPSCROLLINFO
+LPVOID
 MENUITEMINFO16 *
 MSG16 *
 MSG32_16 *
 PAINTSTRUCT16 *
+POINT16 *
 RECT16 *
 SCROLLINFO *
+SEGPTR *
+UINT16 *
 WINDOWPLACEMENT16 *
 WNDCLASS16 *
 WNDCLASSEX16 *
 WORD *
+void *
 
 %segptr
 
+FARPROC16
 DLGPROC16
 GRAYSTRINGPROC16
 HOOKPROC16
@@ -42,18 +66,45 @@ PROPENUMPROC16
 TIMERPROC16
 WNDENUMPROC16
 WNDPROC16
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
 
 %word
 
 ATOM
+BOOL16
+BYTE
 CHAR
+HANDLE16
 HACCEL16
+HBITMAP16
+HBRUSH16
 HCURSOR16
 HDC16
 HDRVR16
 HDWP16
 HFONT16
+HGLOBAL16
+HICON16
+HINSTANCE16
 HMENU16
+HMODULE16
+HPALETTE16
 HQUEUE16
 HRGN16
 HRSRC16
+HTASK16
+HWND16
+INT16
+UINT16
+WORD
+WPARAM16

tools/winapi_check/win16/ver.api

+%long
+
+DWORD
+
+%ptr
+
+LPDWORD
+LPVOID
+SEGPTR *
+UINT16 *
+
+%segptr
+
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%word
+
+UINT16

tools/winapi_check/win16/w32sys.api

+%long
+
+DWORD
+
 %ptr
 
 LPWIN32SINFO
+
+%segptr
+
+SEGPTR
+
+%word
+
+HFILE16
+WORD

tools/winapi_check/win16/win32s16.api

+%long
+
+DWORD
+
+%long # --forbidden
+
+BOOL
+HANDLE
+
 %ptr
 
-LPMEMORY_BASIC_INFORMATION
\ No newline at end of file
+LPCVOID
+LPDWORD
+LPMEMORY_BASIC_INFORMATION
+LPVOID
+
+%segptr
+
+SEGPTR
+
+%void
+
+void
+
+%word
+
+WORD

tools/winapi_check/win16/win87em.api

+%long # --forbidden
+
+int
+
 %ptr
 
-struct Win87EmInfoStruct *
\ No newline at end of file
+struct Win87EmInfoStruct *
+void *
+
+%void
+
+void

tools/winapi_check/win16/winaspi.api

+%long
+
+DWORD
+
+%segptr
+
+FARPROC16
+SEGPTR
+
+%word
+
+BOOL16
+WORD

tools/winapi_check/win16/windebug.api

+%ptr
+
+CONTEXT86 *
+
+%void
+
+void
\ No newline at end of file

tools/winapi_check/win16/wineps.api

+%long
+
+DWORD
+
 %ptr # --forbidden
 
-LPDEVMODEA
\ No newline at end of file
+LPDEVMODEA
+
+%str
+
+LPCSTR
+LPSTR
+
+%word
+
+HANDLE16
+HWND16
+INT16
+WORD

tools/winapi_check/win16/wing.api

+%long
+
+COLORREF
+
 %ptr
 
 BITMAPINFO *
 RGBQUAD *
+SEGPTR *
+
+%segptr
+
+SEGPTR
 
 %word
 
+BOOL16
+HBITMAP16
+HBRUSH16
 HDC16
+HPALETTE16
+INT16
+UINT16
 WING_DITHER_TYPE
+
+

tools/winapi_check/win16/winsock.api

+%long
+
+DWORD
+LONG
+
 %long # --forbidden
+
+BOOL
+INT
+HINSTANCE
 u_long
 
 %ptr
 
+INT16 *
 LPWSADATA
 ULONG *
+char *
 struct sockaddr *
 struct timeval *
 ws_fd_set16 *
 
-%unknown
+%segptr
 
-struct in_addr
+FARPROC16
+SEGPTR
+
+%str
+
+LPCSTR
+
+%void
+
+void
 
 %word
 
+HANDLE16
+HWND16
+INT16
 SOCKET16
+UINT16
+WORD
 
 %word # --forbidden
 
 u_short
 
+%unknown
 
+struct in_addr

tools/winapi_check/win16/wprocs.api

+%long
+
+DWORD
+
+%ptr
+
+CONTEXT86 *
+
+%segptr
+
+FARPROC16
+
+%void
+
+void
+
+%word
+
+HMODULE16
+WORD

tools/winapi_check/win16api.dat

-%long
-
-COLORREF
-DWORD
-HRESULT
-LCID
-LONG
-LPARAM
-LRESULT
-
-%longlong
-
-ULARGE_INTEGER
-
-%ptr
-
-BITMAPINFOHEADER *
-CONTEXT86 *
-INT16 *
-LPBYTE
-LPCVOID
-LPDWORD
-LPINT16
-LPVOID
-LPWORD
-POINT16 *
-SEGPTR *
-UINT16 *
-char *
-void *
-
-%s_word
-
-INT16
-
-%segptr
-
-FARPROC16
-SEGPTR
-
-%str
-
-LPCOLESTR16
-LPCSTR
-LPSTR
-LPOLESTR16
-
-%void
-
-void
-VOID
-
-%word
-
-BOOL16
-BYTE
-HANDLE16
-HBITMAP16
-HBRUSH16
-HFILE16
-HGLOBAL16
-HICON16
-HINSTANCE16
-HMODULE16
-HPALETTE16
-HTASK16
-HWND16
-OLESTATUS
-UINT16
-WORD
-WPARAM16
-
-%unknown # --forbidden
-
-BOOL
-HANDLE
-HINSTANCE
-INT
-UINT
-int
-long
-

tools/winapi_check/win32/advapi32.api

 %long
 
+ACCESS_MASK
+BOOL
+BYTE
+DWORD
+HANDLE
 HCRYPTKEY
 HKEY
+LONG
 NTSTATUS
+PHANDLE
 POLICY_INFORMATION_CLASS
 REGSAM
 SC_HANDLE
@@ -10,23 +17,36 @@ SECURITY_IMPERSONATION_LEVEL
 SECURITY_INFORMATION
 SERVICE_STATUS_HANDLE
 TOKEN_INFORMATION_CLASS
-
+ULONG
+WORD
 %long --extension
 
 LSA_HANDLE
 
 %ptr
 
+BYTE *
+DWORD *
+FILETIME *
+HANDLE *
 HCRYPTPROV *
+LPBOOL
+LPBYTE
+LPCSTR *
 LPCWSTR *
+LPDWORD
 LPENUM_SERVICE_STATUSA
 LPHANDLER_FUNCTION
 LPHKEY
+LPLONG
+LPSECURITY_ATTRIBUTES
 LPSERVICE_STATUS
 LPSERVICE_TABLE_ENTRYA
 LPSERVICE_TABLE_ENTRYW
+LPVOID
 PACL
 PACL *
+PDWORD
 PGENERIC_MAPPING
 PLSA_HANDLE
 PLSA_OBJECT_ATTRIBUTES
@@ -35,11 +55,24 @@ PLSA_TRANSLATED_NAME *
 PLSA_UNICODE_STRING
 PLUID
 PPRIVILEGE_SET
+PSECURITY_DESCRIPTOR
 PSECURITY_DESCRIPTOR_CONTROL
 PSID
 PSID *
 PSID_IDENTIFIER_AUTHORITY
 PSID_NAME_USE
 PUCHAR
+PVOID
+PVOID *
 SECURITY_ATTRIBUTES *
 SECURITY_DESCRIPTOR *
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR

tools/winapi_check/win32/avifil32.api

+%long
+
+DWORD
+HRESULT
+LONG
+UINT
+ULONG
+
 %ptr
 
 AVICOMPRESSOPTIONS *
 AVISTREAMINFOA *
 AVISTREAMINFOW *
+CLSID *
 IAVIFile *
+LONG *
 LPAVIFILEINFOA
 LPAVIFILEINFOW
 LPBITMAPINFOHEADER
+LPCLSID
+LPVOID
 PAVIFILE
 PAVIFILE *
 PAVISTREAM
 PAVISTREAM *
-PGETFRAME
\ No newline at end of file
+PGETFRAME
+
+%str
+
+LPCSTR
+
+%void
+
+void

tools/winapi_check/win32/comctl32.api

 %long
 
+BOOL
+CHAR
 COLORREF
+DWORD
+HANDLE
 HBITMAP
 HDC
 HDPA
 HDSA
 HICON
 HIMAGELIST
+HINSTANCE
 HPROPSHEETPAGE
+HRESULT
 HWND
+INT
+LANGID
+LPARAM
+LRESULT
+UINT
+WORD
+
+%long # --forbidden
+
+int
+
+%longlong
+
+POINT 
+
+%ptr
+
+INT *
+IStream *
+LPCVOID
+LPINT
+LPRECT
+LPSTR *
+LPVOID
+LPWSTR *
+POINT *
 
 %ptr
 
+DLLVERSIONINFO *
 DPAENUMPROC
 DPALOADPROC
 DSAENUMPROC
@@ -28,7 +61,22 @@ LPCREATEMRULIST
 LPCTBBUTTON
 LPINITCOMMONCONTROLSEX
 LPNMHDR
+LPSCROLLINFO
 LPSTREAM
 PFNDPACOMPARE
 PFNDPAMERGE
 TRACKMOUSEEVENT *
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%void
+
+VOID

tools/winapi_check/win32/comdlg32.api

 %long
 
+BOOL
+DWORD
 HWND
+UINT
 
 %long # --forbidden
 
@@ -19,3 +22,13 @@ LPOPENFILENAMEW
 LPPAGESETUPDLGA
 LPPRINTDLGA
 LPPRINTDLGW
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR

tools/winapi_check/win32/crtdll.api

 %long
 
+BOOL
+CHAR
+DWORD
+HANDLE
+HFILE
+INT
+LONG
+UINT
+WCHAR
 clock_t
 time_t
 
+%long # --forbidden
+
+int
+long
+unsigned
+
 %ptr
 
+CHAR *
 CRTDLL_FILE *
+INT *
+LPCVOID
+LPDWORD
 LPDWORD *
+LPINT
+LPSTR *
 LPSTR **
+LPVOID
+LPWSTR *
 PCONTEXT
 PEXCEPTION_FRAME
 PEXCEPTION_FRAME *
@@ -15,11 +38,29 @@ PEXCEPTION_RECORD
 VOID *
 WCHAR *
 _INITTERMFUN *
+char *
 jmp_buf
 struct find_t *
 struct stat *
 struct win_stat *
 time_t *
+va_list
+void *
+
+%str
+
+LPSTR
+LPCSTR
+
+%void
+
+void
+VOID
+
+%wstr
+
+LPCWSTR
+LPWSTR
 
 %unknown
 

tools/winapi_check/win32/ddraw.api

+%long
+
+DWORD
+HRESULT
+
 %ptr
 
 LPDDENUMCALLBACKA
@@ -7,3 +12,8 @@ LPDDENUMCALLBACKW
 LPDIRECTDRAW *
 LPDIRECTDRAWCLIPPER *
 LPGUID
+LPUNKNOWN
+LPVOID
+LPVOID *
+REFCLSID
+REFIID
\ No newline at end of file

tools/winapi_check/win32/dplayx.api

+%long
+
+DWORD
+HRESULT
+
 %ptr
 
+IUnknown *
 LPDIRECTPLAYLOBBY *
 LPDIRECTPLAYLOBBYA *
 LPDPENUMDPCALLBACKA
 LPDPENUMDPCALLBACKW
-LPGUID
\ No newline at end of file
+LPGUID
+LPVOID
+LPVOID *
+REFCLSID
+REFIID

tools/winapi_check/win32/dsound.api

+%long
+
+DWORD
+HRESULT
+
 %ptr
 
+IUnknown *
 LPDIRECTSOUND *
-LPDSENUMCALLBACKA
\ No newline at end of file
+LPDSENUMCALLBACKA
+LPVOID
+LPVOID *
+REFCLSID
+REFGUID
+REFIID
+

tools/winapi_check/win32/gdi32.api

 %long
 
+BOOL
 COLORREF
+DWORD
+FLOAT
+HANDLE
 HBITMAP
 HBRUSH
 HCOLORSPACE
@@ -8,15 +12,26 @@ HDC
 HENHMETAFILE
 HFONT
 HGDIOBJ
+HGLOBAL
 HMETAFILE
 HPALETTE
 HPEN
 HRGN
 HWND
+INT
+LONG
+LPARAM
+UINT
+WORD
+
+%long # --forbidden
+
+int
 
 %ptr
 
 ABORTPROC
+BYTE *
 BITMAP *
 BITMAPINFO *
 BITMAPINFOHEADER *
@@ -25,6 +40,7 @@ DEVMODEA *
 DEVMODEW *
 DOCINFOA *
 DOCINFOW *
+DWORD *
 ENHMETARECORD *
 ENHMFENUMPROC
 FONTENUMPROCA
@@ -35,6 +51,7 @@ GCP_RESULTSA *
 GCP_RESULTSW *
 GOBJENUMPROC
 HANDLETABLE *
+INT *
 LINEDDAPROC
 LOGBRUSH *
 LOGFONTA *
@@ -43,11 +60,16 @@ LOGPALETTE *
 LOGPEN *
 LPABC
 LPABCFLOAT
+LPBYTE
 LPCOLORADJUSTMENT
+LPCVOID
+LPDEVMODEA
+LPDWORD
 LPENHMETAHEADER
 LPFONTSIGNATURE
 LPGLYPHMETRICS
 LPHANDLETABLE
+LPINT
 LPKERNINGPAIR
 LPLOGFONTA
 LPLOGFONTW
@@ -57,9 +79,13 @@ LPOUTLINETEXTMETRICA
 LPOUTLINETEXTMETRICW
 LPPALETTEENTRY
 LPPIXELFORMATDESCRIPTOR
+LPPOINT
 LPRASTERIZER_STATUS
+LPRECT
 LPRGNDATA
 LPSIZE
+LPVOID
+LPVOID *
 LPXFORM
 MAT2 *
 METAFILEPICT *
@@ -68,6 +94,7 @@ MFENUMPROC
 PALETTEENTRY *
 PFLOAT
 PIXELFORMATDESCRIPTOR *
+POINT *
 PPOLYTEXTA
 PPOLYTEXTW
 RECT *
@@ -76,3 +103,18 @@ RGNDATA *
 TEXTMETRICA *
 TEXTMETRICW *
 XFORM *
+void *
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR

tools/winapi_check/win32/icmp.api

 %long
 
+DWORD
+HANDLE
 IPAddr
+WORD
 
 %ptr
 
-PIP_OPTION_INFORMATION
\ No newline at end of file
+LPVOID
+PIP_OPTION_INFORMATION

tools/winapi_check/win32/imagehlp.api

 %long
 
+BOOL
+BOOLEAN
 DIGEST_HANDLE
+DWORD
+HANDLE
+HMODULE
+ULONG
 USHORT
+WORD
 
 %ptr
 
 DIGEST_FUNCTION
+LPDWORD
+LPSYSTEMTIME
+LPVOID
 PAPI_VERSION
+PCHAR
 PCHAR *
+PDWORD
 PENUMLOADED_MODULES_CALLBACK
 PFUNCTION_TABLE_ACCESS_ROUTINE
 PGET_MODULE_BASE_ROUTINE
@@ -27,4 +39,19 @@ PSYM_ENUMMODULES_CALLBACK
 PSYM_ENUMSYMBOLS_CALLBACK
 PULONG
 PTRANSLATE_ADDRESS_ROUTINE
+PVOID
 PWIN_CERTIFICATE
+ULONG *
+
+%str
+
+LPSTR
+LPCSTR
+
+%void
+
+VOID
+
+%wstr
+
+LPWSTR

tools/winapi_check/win32/imm32.api

 %long
 
-HWND
+BOOL
+DWORD
 HIMC
+HKL
+HWND
+LONG
+LPARAM
+LRESULT
+UINT
+WPARAM
 
 %ptr
 
 LPCANDIDATEFORM
 LPCANDIDATELIST
+LPCVOID
 LPCOMPOSITIONFORM
+LPDWORD
 LPLOGFONTA
 LPLOGFONTW
+LPPOINT
 LPSTYLEBUFA
 LPSTYLEBUFW
+LPVOID
 REGISTERWORDENUMPROCA
 REGISTERWORDENUMPROCW
+
+%str
+
+LPSTR
+LPCSTR
+
+%wstr
+
+LPWSTR
+LPCWSTR

tools/winapi_check/win32/kernel32.api

 %long
 
+ATOM
+BOOL
+BYTE
+CHAR
 CALID
 CALTYPE
 COORD
+DWORD
 LCTYPE
+HANDLE
+HFILE
+HGLOBAL
+HINSTANCE
 HLOCAL
+HMODULE
 HRSRC
+INT
+LANGID
+LCID
+LONG
+PHANDLE
+UINT
+WCHAR
+WORD
+
+%long --pointer
+
 ULONG_PTR
 
 %long # --forbidden
 
 BOOL16
+HGLOBAL16
+HINSTANCE16
+HMODULE16
 UINT16
+int
+
+%longlong
+
+LARGE_INTEGER
 
 %ptr
 
+BOOL *
 BY_HANDLE_FILE_INFORMATION *
+DWORD *
 CALINFO_ENUMPROCA
+CONTEXT *
+CONTEXT86 *
 CODEPAGE_ENUMPROCA
 CODEPAGE_ENUMPROCW
+CRITICAL_SECTION *
 DATEFMT_ENUMPROCA
 DATEFMT_ENUMPROCW
 ENUMRESLANGPROCA
@@ -29,22 +63,31 @@ ENUMRESTYPEPROCA
 ENUMRESTYPEPROCW
 FARPROC
 FARPROC *
+FILETIME *
 GET_FILEEX_INFO_LEVELS
+HANDLE *
 HANDLER_ROUTINE *
 INPUT_RECORD *
 LARGE_INTEGER *
 LOCALE_ENUMPROCA
 LOCALE_ENUMPROCW
+LONG *
+LPBOOL
+LPBYTE
 LPCHAR_INFO
 LPCOMMTIMEOUTS
 LPCOMSTAT
 LPCONSOLE_CURSOR_INFO
 LPCONSOLE_SCREEN_BUFFER_INFO
 LPCPINFO
+LPCVOID
 LPDCB
 LPDCB *
 LPDEBUG_EVENT
+LPDWORD
+LPFILETIME
 LPINPUT_RECORD
+LPLONG
 LPLDT_ENTRY
 LPMEMORYSTATUS
 LPMEMORY_BASIC_INFORMATION
@@ -55,15 +98,22 @@ LPPROCESSENTRY
 LPPROCESS_HEAP_ENTRY *
 LPPROCESS_INFORMATION
 LPPROGRESS_ROUTINE
+LPSECURITY_ATTRIBUTES
 LPSMALL_RECT
 LPSTARTUPINFOA
 LPSTARTUPINFOW
+LPSTR *
 LPSYSTEM_INFO
 LPSYSTEM_POWER_STATUS
+LPSYSTEMTIME
 LPTHREAD_START_ROUTINE
 LPTHREADENTRY
 LPTIME_ZONE_INFORMATION
 LPTOP_LEVEL_EXCEPTION_FILTER
+LPVOID
+LPVOID *
+LPWORD
+LPWSTR *
 NUMBERFMTA *
 NUMBERFMTW *
 OFSTRUCT *
@@ -75,6 +125,9 @@ PLARGE_INTEGER
 PLONG
 PTIMERAPCROUTINE
 PULARGE_INTEGER
+PDWORD
+PVOID
+PVOID *
 SECURITY_ATTRIBUTES *
 SYSLEVEL *
 SYSLEVEL **
@@ -83,15 +136,26 @@ TIMEFMT_ENUMPROCA
 TIMEFMT_ENUMPROCW
 WIN32_FIND_DATAA *
 WIN32_FIND_DATAW *
+WORD *
 struct ThunkDataCommon *
-
-%longlong
-
-LARGE_INTEGER
+va_list
 
 %ptr # --forbidden
 
 FARPROC16
-HGLOBAL16
-HINSTANCE16
-SEGPTR
\ No newline at end of file
+SEGPTR
+
+%str
+
+LPSTR
+LPCSTR
+
+%void
+
+void
+VOID
+
+%wstr
+
+LPCWSTR
+LPWSTR

tools/winapi_check/win32/lz32.api

+%long
+
+HFILE
+INT
+LONG
+UINT
+
 %ptr
 
-LPOFSTRUCT
\ No newline at end of file
+LPOFSTRUCT
+LPVOID
+
+%str
+
+LPSTR
+LPCSTR
+
+%void
+
+void
+
+%wstr
+
+LPWSTR
+LPCWSTR

tools/winapi_check/win32/midimap.api

+%long
+
+DWORD
+UINT
+WORD

tools/winapi_check/win32/mpr.api

 %long
 
+BOOL
+BYTE
+DWORD
+HANDLE
 HPROVIDER
 HWND
+INT
+UINT
+WORD
 enum NOTIFYTYPE
 
 %ptr
 
 ENUMPASSWORDPROC
+BOOL *
 LPAUTHDLGSTRUCTA
+LPBYTE
+LPCSTR *
 LPCONNECTDLGSTRUCTA
 LPCONNECTDLGSTRUCTW
 LPDISCDLGSTRUCTA
 LPDISCDLGSTRUCTW
+LPDWORD
 LPHANDLE
 LPNETCONNECTINFOSTRUCT
 LPNETINFOSTRUCT
 LPNETRESOURCEA
 LPNETRESOURCEW
+LPSTR *
+LPVOID
+LPWORD
+LPWSTR *
 NOTIFYCALLBACK
 PHPROVIDER
+
+%str
+
+LPSTR
+LPCSTR
+
+%void
+
+VOID
+
+%wstr
+
+LPCWSTR
+LPWSTR

tools/winapi_check/win32/msacm32.api

 %long
 
+DWORD
 HACMDRIVER
 HACMDRIVERID
 HACMOBJ
 HACMSTREAM
+HINSTANCE
+LPARAM
+LRESULT
+MMRESULT
+UINT
 
 %ptr
 
@@ -16,6 +22,8 @@ ACMFORMATENUMCBA
 ACMFORMATENUMCBW
 ACMFORMATTAGENUMCBA
 ACMFORMATTAGENUMCBW
+LPDWORD
+LPVOID
 PACMDRIVERDETAILSA
 PACMDRIVERDETAILSW
 PACMFILTERCHOOSEA

tools/winapi_check/win32/msacmmap.api

+%long
+
+DWORD
+UINT
+WORD

tools/winapi_check/win32/msvfw32.api

 %long
 
+BOOL
+DWORD
+HANDLE
 HDC
 HIC
+HINSTANCE
 HPALETTE
 HWND
+INT
+LONG
+LRESULT
+UINT
+WORD
 
 %ptr
 
 FARPROC
 ICINFO *
-LPBITMAPINFOHEADER
\ No newline at end of file
+LPBITMAPINFOHEADER
+LPDWORD
+LPVOID
+
+%str
+
+LPCSTR
+
+%wstr
+
+LPCWSTR

tools/winapi_check/win32/ntdll.api

 %long
 
+ACCESS_MASK
+BOOL
+BOOLEAN
+BYTE
+DWORD
 FILE_INFORMATION_CLASS
 FS_INFORMATION_CLASS
+HANDLE
+HMODULE
+INT
 KEY_INFORMATION_CLASS
 KEY_VALUE_INFORMATION_CLASS
+LONG
 NTSTATUS
 OBJECT_INFORMATION_CLASS
+PHANDLE
 PROCESSINFOCLASS
 SECTION_INHERIT
 SECURITY_IMPERSONATION_LEVEL
@@ -15,6 +25,14 @@ SYSTEM_INFORMATION_CLASS
 THREADINFOCLASS
 TIMER_TYPE
 TOKEN_TYPE
+UINT
+ULONG
+WCHAR
+
+%long # --forbidden
+
+int
+unsigned
 
 %longlong
 
@@ -22,14 +40,27 @@ LARGE_INTEGER
 
 %ptr
 
+CONTEXT *
+CONTEXT86 *
+CRITICAL_SECTION *
+DWORD *
 EXCEPTION_RECORD *
+HANDLE *
+LPBYTE
+LPDWORD
+LPFILETIME
 LPRTL_RWLOCK
+LPVOID
+LPVOID *
+LPWSTR *
 PACE_HEADER
 PACE_HEADER *
 PACL
 PACL *
 PANSI_STRING
 PBOOLEAN
+PCHAR
+PDWORD
 PEXCEPTION_FRAME
 PEXCEPTION_RECORD
 PGENERIC_MAPPING
@@ -42,6 +73,7 @@ POBJDIR_INFORMATION
 POBJECT_ATTRIBUTES
 PPRIVILEGE_SET
 PRTL_HEAP_DEFINITION
+PSECURITY_DESCRIPTOR
 PSECURITY_DESCRIPTOR_CONTROL
 PSID
 PSID *
@@ -52,7 +84,25 @@ PTIMERAPCROUTINE
 PTOKEN_PRIVILEGES
 PULONG
 PUNICODE_STRING
+PVOID
+PVOID *
 PWCHAR
 VOID *
 struct _TEB *
+va_list
+void *
+
+%str
+
+LPSTR
+LPCSTR
+
+%void
+
+void
+VOID
+
+%wstr
 
+LPCWSTR
+LPWSTR

tools/winapi_check/win32/ole32.api

 %long
 
+BOOL
 CLIPFORMAT
+DWORD
 HACCEL
+HANDLE
+HGLOBAL
+HINSTANCE
 HMENU
+HRESULT
 HOLEMENU
 HWND
+INT
+UINT
+ULONG
+WORD
+
+%long # --forbidden
+
+int
 
 %ptr
 
 CLIPFORMAT *
+CLSID *
 COSERVERINFO *
 DVTARGETDEVICE *
+DWORD *
+FILETIME *
 GUID *
 HGLOBAL *
 ICreateErrorInfo **
@@ -25,39 +42,65 @@ IMoniker **
 IPersistStream *
 IStorage *
 IStorage **
+IStream *
 LPBC
 LPBC *
+LPCLSID
 LPDATAADVISEHOLDER *
 LPDATAOBJECT
 LPDROPTARGET
+LPDWORD
 LPENUMFORMATETC *
 LPENUMOLEVERB *
+LPFILETIME
 LPFORMATETC
 LPLOCKBYTES *
+LPMALLOC *
 LPMESSAGEFILTER
 LPMESSAGEFILTER *
 LPMONIKER
 LPMONIKER *
 LPMSG
 LPOLEADVISEHOLDER *
+LPOLECLIENTSITE
 LPOLEINPLACEACTIVEOBJECT
 LPOLEINPLACEFRAME
 LPOLEINPLACEFRAMEINFO
 LPOLEMENUGROUPWIDTHS
+LPOLEOBJECT
 LPOLESTREAM
 LPOLESTR
 LPOLESTR *
 LPPERSISTSTORAGE
 LPRUNNINGOBJECTTABLE *
+LPUNKNOWN
+LPVOID
+LPVOID *
+LPWORD
 LPSTORAGE
 LPSTREAM *
 MULTI_QI *
+OLECHAR *
+REFCLSID
+REFGUID
+REFIID
 SNB
 STGMEDIUM *
 WCHAR *
+WORD *
+void *
+void **
+
+%str
 
-%ptr # --forbidden
+LPCOLESTR
+
+%str # --forbidden
 
 LPOLESTR16
 
+%void
+
+VOID
+void
 

tools/winapi_check/win32/oleaut32.api

@@ -5,27 +5,44 @@ double
 
 %long
 
+BOOL
+BYTE
+CHAR
 DATE
+DWORD
+FLOAT
 HCURSOR
 HICON
+HINSTANCE
 HPALETTE
+HRESULT
 HWND
+INT
+LCID
+LONG
 OLE_COLOR
 REGKIND
 SYSKIND
+UINT
+ULONG
 USHORT
 VARIANT_BOOL
 VARTYPE
+WORD
 
 %long # --forbidden
 
+int
 short
+unsigned
 
 %ptr
 
 BSTR *
-CY *
+BYTE *
+CHAR *
 COLORREF *
+CY *
 DATE *
 FLOAT *
 ICreateErrorInfo **
@@ -33,23 +50,46 @@ IErrorInfo *
 IErrorInfo **
 ITypeLib *
 ITypeLib **
+LONG *
 LPBSTR
+LPCLSID
+LPDWORD
 LPFONTDESC
 LPOCPFIPARAMS
 LPOLESTR
 LPPICTDESC
 LPSTREAM
+LPUNKNOWN
+LPUNKNOWN *
+LPVOID
+LPVOID *
+OLECHAR *
+REFCLSID
+REFGUID
+REFIID
 SAFEARRAY *
 SAFEARRAY **
 SAFEARRAYBOUND *
+ULONG *
 USHORT *
 VARIANT *
 VARIANTARG *
 VARIANT_BOOL *
+char *
 double *
 short *
+void *
+void **
+
+%str # ???
+
+LPCOLESTR
+
+%void
+
+void
 
-%wstr
+%wstr # ???
 
 BSTR
 

tools/winapi_check/win32/olecli32.api

 %long
 
+BOOL
+DWORD
 HDC
+HRESULT
 LHCLIENTDOC
+LONG
 OLECLIPFORMAT
 OLESTATUS
 OLEOPT_RENDER
@@ -9,8 +13,21 @@ OLEOPT_RENDER
 %ptr
 
 IPersistStream *
+IStream *
 LHCLIENTDOC *
+LONG *
 LPFORMATETC
 LPSTORAGE
 LPOLECLIENT
+LPOLECLIENTSITE
+LPOLEOBJECT
 LPOLEOBJECT *
+LPVOID *
+REFCLSID
+REFIID
+void **
+
+%str
+
+LPCSTR
+

tools/winapi_check/win32/oledlg.api

 %long
 
+BOOL
 HMENU
 HWND
+INT
+UINT
+WORD
 
 %ptr
 
 HMENU *
+LPOLEOBJECT
 LPOLEUIBUSYA
 LPOLEUIBUSYW
 LPOLEUICHANGEICONA
@@ -23,3 +28,12 @@ LPOLEUIOBJECTPROPSA
 LPOLEUIOBJECTPROPSW
 LPOLEUIPASTESPECIALA
 LPOLEUIPASTESPECIALW
+REFCLSID
+
+%str
+
+LPSTR
+
+%wstr
+
+LPCWSTR

tools/winapi_check/win32/olepro32.api

 %long
 
-HWND
+HRESULT
 
 %ptr
 
-LPOCPFIPARAMS
-LPPICTDESC
-LPSTREAM
+LPVOID *
+REFCLSID
+REFIID

tools/winapi_check/win32/olesvr32.api

 %long
 
+HINSTANCE
 LHSERVER
 LHSERVERDOC
 OLE_SERVER_USE
@@ -7,7 +8,12 @@ OLESTATUS
 
 %ptr
 
+BOOL *
 LHSERVER *
 LHSERVERDOC *
 LPOLESERVER
 LPOLESERVERDOC
+
+%str
+
+LPCSTR
\ No newline at end of file

tools/winapi_check/win32/psapi.api

+%long
+
+BOOL
+DWORD
+HANDLE
+HMODULE
+
 %ptr
 
+DWORD *
 HMODULE *
+LPDWORD
 LPMODULEINFO
+LPVOID
+LPVOID *
 PPROCESS_MEMORY_COUNTERS
 PPSAPI_WS_WATCH_INFORMATION
 
+%str
+
+LPSTR
+
+%wstr
+
+LPWSTR

tools/winapi_check/win32/rasapi32.api

+%long
+
+DWORD
+
 %ptr
 
+LPBOOL
+LPDWORD
 LPRASCONNA
 LPRASDIALPARAMS
 LPRASENTRYNAME
+
+%str
+
+LPSTR

tools/winapi_check/win32/shell32.api

 %long
 
+BOOL
+BYTE
 COLORREF
+DWORD
+HANDLE
 HBITMAP
 HDROP
+HGLOBAL
 HMENU
 HICON
+HINSTANCE
 HKEY
+HMODULE
+HRESULT
 HWND
+INT
+LONG
+LPARAM
+LRESULT
+UINT
+ULONG
+WCHAR
+WORD
+WPARAM
+
+%long # --forbidden
+
+int
 
 %ptr
 
+CLSID *
+DLLVERSIONINFO *
+DWORD *
+HICON *
 HIMAGELIST *
 IDropTarget *
 IShellFolder **
+IStream *
+IUnknown *
 LPBROWSEINFOA
+LPBYTE
 LPCITEMIDLIST
 LPCITEMIDLIST *
+LPCVOID
 LPDRAWITEMSTRUCT
+LPDWORD
 LPFNCREATEINSTANCE
 LPFNFMCALLBACK
 LPHKEY
+LPITEMIDLIST
 LPITEMIDLIST *
+LPMALLOC *
 LPMEASUREITEMSTRUCT
 LPNOTIFYREGISTER
+LPSECURITY_ATTRIBUTES
 LPSHELLEXECUTEINFOA
 LPSHELLEXECUTEINFOW
 LPSHELLFLAGSTATE
@@ -30,8 +63,35 @@ LPSHELLFOLDER
 LPSHELLVIEWDATA
 LPSHFILEOPSTRUCTA
 LPSHFILEOPSTRUCTW
+LPSTRRET
+LPTPMPARAMS
+LPUNKNOWN
+LPUNKNOWN *
+LPVOID
+LPVOID *
+LPWORD
+LPWSTR *
 PAPPBARDATA
 PNOTIFYICONDATAA
 PNOTIFYICONDATAW
+POINT *
 SHFILEINFOA *
 SHFILEINFOW *
+REFCLSID
+REFIID
+UINT *
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+VOID
+
+%wstr
+
+LPCWSTR
+LPWSTR

tools/winapi_check/win32/shlwapi.api

 %long
 
+BOOL
+BYTE
+DWORD
+INT
+LONG
 HKEY
-HWND
\ No newline at end of file
+HRESULT
+HWND
+UINT
+WCHAR
+WORD
+
+%long # --forbidden
+
+int
+
+%ptr
+
+LPDWORD
+LPITEMIDLIST
+LPSTRRET
+LPVOID
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+
+%wstr
+
+LPCWSTR
+LPWSTR
\ No newline at end of file

tools/winapi_check/win32/tapi32.api

 %long
 
+DWORD
 HCALL
+HINSTANCE
 HLINE
 HLINEAPP
 HPHONE
@@ -9,7 +11,9 @@ HWND
 
 %ptr
 
+HICON *
 LINECALLBACK
+LPDWORD
 LPHCALL
 LPHLINE
 LPHLINEAPP
@@ -41,4 +45,12 @@ LPPHONECAPS
 LPPHONEEXTENSIONID
 LPPHONESTATUS
 LPVARSTRING
+LPVOID
 PHONECALLBACK
+
+%str
+
+LPSTR
+LPCSTR
+
+

tools/winapi_check/win32/user32.api

 %long
 
+ATOM
+BOOL
+BYTE
+CHAR
 COLORREF
+DWORD
+HANDLE
 HACCEL
 HBITMAP
 HBRUSH
@@ -14,33 +20,64 @@ HDWP
 HFONT
 HHOOK
 HICON
+HINSTANCE
+HKL
 HMENU
 HMONITOR
+HRESULT
 HRGN
 HSZ
 HWINSTA
 HWND
+INT
+LONG
+LPARAM
+LRESULT
 SHORT
+UINT
+WCHAR
+WORD
+WPARAM
+
+%long # --forbidden
+
+HMODULE16
+HTASK
+int
+
+%longlong
+
+POINT 
 
 %ptr
 
+BOOL *
 COLORREF *
+DWORD *
 DLGPROC
 DRAWSTATEPROC
 FARPROC
 GRAYSTRINGPROC
+HANDLE *
 HKL *
 HWND *
 HOOKPROC
+INT *
 LPACCEL
 LPCHARSETINFO
 LPCMENUINFO
 LPCONVCONTEXT
 LPCONVINFO
+LPBYTE
+LPCVOID
+LPDEVMODEA
+LPDEVMODEW
 LPDISPLAY_DEVICEA
 LPDISPLAY_DEVICEW
 LPDRAWTEXTPARAMS
+LPDWORD
 LPICONINFO
+LPINT
 LPMENUINFO
 LPMENUITEMINFOA
 LPMENUITEMINFOW
@@ -48,6 +85,13 @@ LPMONITORINFO
 LPMSG
 LPMSGBOXPARAMSA
 LPMSGBOXPARAMSW
+LPPOINT
+LPRECT
+LPSCROLLINFO
+LPSECURITY_ATTRIBUTES
+LPTPMPARAMS
+LPVOID
+LPWORD
 MENUITEMINFOA *
 MENUITEMINFOW *
 MONITORENUMPROC
@@ -55,16 +99,19 @@ MSG *
 PAINTSTRUCT *
 PBYTE
 PFNCALLBACK
+POINT *
 PROPENUMPROCA
 PROPENUMPROCEXA
 PROPENUMPROCEXW
 PROPENUMPROCW
+PSECURITY_DESCRIPTOR
 PSECURITY_QUALITY_OF_SERVICE
 RECT *
 SCROLLINFO *
 SECURITY_INFORMATION *
 SECURITY_QUALITY_OF_SERVICE *
 TIMERPROC
+UINT *
 WINDOWPLACEMENT *
 WNDCLASSA *
 WNDCLASSEXA *
@@ -72,3 +119,19 @@ WNDCLASSEXW *
 WNDCLASSW *
 WNDENUMPROC
 WNDPROC
+va_list
+
+%str
+
+LPSTR
+LPCSTR
+
+%void
+
+void
+VOID
+
+%wstr
+
+LPWSTR
+LPCWSTR

tools/winapi_check/win32/version.api

+%long
+
+DWORD
+UINT
+
+%ptr
+
+LPDWORD
+LPVOID
+LPVOID *
+UINT *
+
+%str
+
+LPSTR
+LPCSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR

tools/winapi_check/win32/w32skrnl.api

+%long
+
+DWORD
+
 %long # --forbidden
 
-HTASK16
\ No newline at end of file
+HTASK16
+
+%str
+
+LPSTR
+

tools/winapi_check/win32/wineoss.api

+%long
+
+DWORD
+UINT
+WORD

tools/winapi_check/win32/winmm.api

 %long
 
+BOOL
+DWORD
 FOURCC
 HDRVR
+HINSTANCE
 HMIDIIN
 HMIDIOUT
 HMIDISTRM
 HMIXER
 HMIXEROBJ
 HMMIO
+HMODULE
 HWAVEIN
 HWAVEOUT
 HWND
+MMRESULT
+INT
+LONG
+LPARAM
+LRESULT
+UINT
 
 %long # --forbidden
 
+HMMIO16
+HTASK
 UINT16
 
 %ptr
 
+DWORD *
 HMIDIIN *
 HMIDIOUT *
 HMIDISTRM *
@@ -27,6 +40,8 @@ HWAVEIN *
 HWAVEOUT *
 LPAUXCAPSA
 LPAUXCAPSW
+LPBYTE
+LPDWORD
 LPHMIXER
 LPJOYCAPSA
 LPJOYCAPSW
@@ -60,8 +75,16 @@ MIDIHDR *
 MMCKINFO *
 MMIOINFO *
 WAVEHDR *
+UINT *
+WORD *
 YIELDPROC
 
-%long # --forbidden
+%str
 
-HMMIO16
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR

tools/winapi_check/win32/winspool.api

 %long
 
+BOOL
+DWORD
+HANDLE
 HWND
+INT
+LONG
+WORD
 
 %ptr
 
 DEVMODEW *
+HANDLE *
+LPBYTE
+LPDEVMODEA
+LPDEVMODEW
+LPDWORD
 LPPRINTER_DEFAULTSA
 LPPRINTER_DEFAULTSW
+LPVOID
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR

tools/winapi_check/win32/wnaspi32.api

+%long
+
+DWORD
+
 %ptr
 
 LPSRB
\ No newline at end of file

tools/winapi_check/win32/wow32.api

 %long
 
-WOW_HANDLE_TYPE
\ No newline at end of file
+BOOL
+DWORD
+HANDLE
+WORD
+WOW_HANDLE_TYPE
+
+%ptr
+
+LPDWORD
+LPVOID
+PDWORD
+WORD *

tools/winapi_check/win32/wsock32.api

 %long
 
+BOOL
+DWORD
+HANDLE
 HWND
+INT
+LONG
+UINT
 SOCKET
 u_long
 u_short
@@ -8,11 +14,17 @@ u_short
 %long # --forbidden
 
 SOCKET16
+long
 
 %ptr
 
 FARPROC
+INT *
+LPDWORD
+LPVOID
 LPWSADATA
+ULONG *
+char *
 struct WIN_hostent *
 struct WIN_protoent *
 struct WIN_servent *
@@ -21,6 +33,15 @@ struct sockaddr *
 struct timeval *
 ws_fd_set32 *
 
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
 %unknown
 
 struct in_addr
\ No newline at end of file

tools/winapi_check/win32api.dat

-%long
-
-ACCESS_MASK
-ATOM
-BOOL
-BOOLEAN
-BYTE
-CHAR
-DWORD
-FLOAT
-HANDLE
-HFILE
-HGLOBAL
-HINSTANCE
-HKL
-HMODULE
-HRESULT
-HTASK
-INT
-LANGID
-LCID
-LONG
-LPARAM
-LRESULT
-MMRESULT
-PHANDLE
-UINT
-ULONG
-WCHAR
-WORD
-WPARAM
-
-%longlong
-
-POINT
-ULARGE_INTEGER
-
-%ptr
-
-BOOL *
-BYTE *
-CHAR *
-CLSID *
-CONTEXT *
-CONTEXT86 *
-CRITICAL_SECTION *
-DLLVERSIONINFO *
-DWORD *
-FILETIME *
-HANDLE *
-HICON *
-INT *
-IStream *
-IUnknown *
-LONG *
-LPBOOL
-LPBYTE
-LPCLSID
-LPCSTR *
-LPCVOID
-LPDEVMODEA
-LPDEVMODEW
-LPDWORD
-LPFILETIME
-LPINT
-LPITEMIDLIST
-LPLONG
-LPMALLOC *
-LPOLECLIENTSITE
-LPOLEOBJECT
-LPPOINT
-LPRECT
-LPSCROLLINFO
-LPSECURITY_ATTRIBUTES
-LPSTR *
-LPSTRRET
-LPSYSTEMTIME
-LPTPMPARAMS
-LPUNKNOWN
-LPUNKNOWN *
-LPVOID
-LPVOID *
-LPWORD
-LPWSTR *
-PCHAR
-PDWORD
-POINT *
-PSECURITY_DESCRIPTOR
-PVOID
-PVOID *
-REFCLSID
-REFGUID
-REFIID
-UINT *
-ULONG *
-WORD *
-char *
-va_list
-void *
-void **
-
-%str
-
-LPCSTR
-LPSTR
-OLECHAR *
-
-%void
-
-void
-VOID
-
-%wstr
-
-LPCOLESTR
-LPCWSTR
-LPWSTR
-
-%long # --forbidden
-
-HMODULE16
-int
-long
-unsigned

tools/winapi_check/winapi.pm

@@ -13,12 +13,8 @@ sub new {
 
     $$output = shift;
     $$name = shift;
-    my $file = shift;
     my $path = shift;
 
-    $file =~ s/^.\/(.*)$/$1/;
-    $self->parse_api_file($file);
-
     my @files = map {
 	s/^.\/(.*)$/$1/;
 	$_; 
@@ -328,7 +324,7 @@ sub types_unlimited_used_in_modules {
 	    $count++;
 	    push @modules, $module;
 	}
-        if($count <= 1) {
+        if($count) {
 	    foreach my $module (@modules) {
 	      $$used_types{$type}{$module} = 1;
 	    }

tools/winapi_check/winapi_check

@@ -50,8 +50,8 @@ if($options->help) {
 
 my $output = 'output'->new;
 
-my $win16api = 'winapi'->new($output, "win16", "$winapi_check_dir/win16api.dat", "$winapi_check_dir/win16");
-my $win32api = 'winapi'->new($output, "win32", "$winapi_check_dir/win32api.dat", "$winapi_check_dir/win32");
+my $win16api = 'winapi'->new($output, "win16", "$winapi_check_dir/win16");
+my $win32api = 'winapi'->new($output, "win32", "$winapi_check_dir/win32");
 'winapi'->read_spec_files($wine_dir, $win16api, $win32api);
 
 my $nativeapi = 'nativeapi'->new($output, "$winapi_check_dir/nativeapi.dat", "$wine_dir/configure.in", "$wine_dir/include/config.h.in");

tools/winapi_check/winapi_local.pm

@@ -129,7 +129,7 @@ sub check_function {
 	    } elsif(!$winapi->is_allowed_kind($kind) ||
 		    !$winapi->allowed_type_in_module($type, $module)) {
 		if($options->report_argument_forbidden($type)) {
-		    &$output("forbidden argument " . ($n + 1) . " type (" . $type . ")");
+		    &$output("forbidden argument " . ($n + 1) . " type " . $type . " (" . $kind . ")");
 		}
 	    }
 	    if(defined($kind) && $kind eq "longlong") {