Moved some of the API specification from the global file to the local

tools/winapi_check/win16/compobj.api

+%long
+
+ULONG
+
 %ptr
 
 CLSID *
@@ -12,6 +16,10 @@ LPMESSAGEFILTER
 LPMESSAGEFILTER *
 LPOLESTR16 *
 LPUNKNOWN
+LPVOID *
+REFCLSID
+REFGUID
+REFIID
 
 %str # --forbidden
 

tools/winapi_check/win16/gdi.api

@@ -20,13 +20,17 @@ LPNEWTEXTMETRIC16
 LPOUTLINETEXTMETRIC16
 LPPALETTEENTRY
 LPPDEVICE
+LPPOINT16
 LPRASTERIZER_STATUS
+LPRECT16
 LPRGNDATA
 LPSIZE16
 LPTEXTXFORM16
 MAT2 *
 METARECORD *
 PALETTEENTRY *
+RECT16 *
+RGBQUAD *
 TEXTMETRIC16 *
 VOID *
 

tools/winapi_check/win16/kernel.api

 %long # --forbidden
 
-HKEY
 HMODULE
 
 %ptr
@@ -32,6 +31,10 @@ HLOCAL16
 HQUEUE16
 HRSRC16
 
+%word # --forbidden
+
+HKEY
+
 %wstr # --forbidden
 
 LPCWSTR

tools/winapi_check/win16/mmsystem.api

@@ -41,6 +41,7 @@ MIDIHDR16 *
 MMCKINFO *
 MMIOINFO16 *
 WAVEHDR *
+WORD *
 
 %ptr # --forbidden
 
@@ -66,4 +67,4 @@ HMIXEROBJ16
 HMMIO16
 HWAVEIN16
 HWAVEOUT16
-
+MMRESULT16
\ No newline at end of file

tools/winapi_check/win16/msacm.api

@@ -28,3 +28,4 @@ HACMDRIVER16
 HACMDRIVERID16
 HACMOBJ16
 HACMSTREAM16
+MMRESULT16
\ No newline at end of file

tools/winapi_check/win16/ole2disp.api

@@ -5,6 +5,7 @@ LPBSTR16
 INTERFACEDATA *
 ITypeInfo **
 IUnknown *
+REFCLSID
 
 %segstr
 

tools/winapi_check/win16/setupx.api

+%word # --forbidden
+
+HKEY
+
+%ptr
+
+LPHKEY

tools/winapi_check/win16/shell.api

-%long # --forbidden
-
-HKEY
-
 %ptr
 
 HICON16 *
@@ -13,3 +9,7 @@ LPHKEY
 %word
 
 HDROP16
+
+%word # --forbidden
+
+HKEY

tools/winapi_check/win16/storage.api

+%long
+
+ULONG
+
+%longlong
+
+LARGE_INTEGER
+
 %ptr
 
 LPSTORAGE16
+LPVOID *
 IID *
 IStorage16 *
 IStorage16 **
 IStream16 *
 IStream16 **
+REFIID
 SNB16
 STATSTG16 *
 ULARGE_INTEGER *
-
-%longlong
-
-LARGE_INTEGER
+ULONG *
 
 

tools/winapi_check/win16/typelib.api

 %ptr
 
 LPBSTR16
+REFGUID
 
 %str # --forbidden
 

tools/winapi_check/win16/user.api

@@ -18,16 +18,20 @@ LPMSG16
 LPMSG16_32
 LPMSGBOXPARAMS16
 LPPAINTSTRUCT16
+LPPOINT16
 LPQUEUESTRUCT16 *
+LPRECT16
 LPSCROLLINFO
 MENUITEMINFO16 *
 MSG16 *
 MSG32_16 *
 PAINTSTRUCT16 *
+RECT16 *
 SCROLLINFO *
 WINDOWPLACEMENT16 *
 WNDCLASS16 *
 WNDCLASSEX16 *
+WORD *
 
 %segptr
 

tools/winapi_check/win16/wing.api

 %ptr
 
 BITMAPINFO *
+RGBQUAD *
 
 %word
 

tools/winapi_check/win16/winsock.api

@@ -4,6 +4,7 @@ u_long
 %ptr
 
 LPWSADATA
+ULONG *
 struct sockaddr *
 struct timeval *
 ws_fd_set16 *

tools/winapi_check/win16api.dat

@@ -7,7 +7,6 @@ LCID
 LONG
 LPARAM
 LRESULT
-ULONG
 
 %longlong
 
@@ -22,21 +21,11 @@ LPBYTE
 LPCVOID
 LPDWORD
 LPINT16
-LPPOINT16
-LPRECT16
 LPVOID
-LPVOID *
 LPWORD
 POINT16 *
-RECT16 *
-REFCLSID
-REFGUID
-REFIID
-RGBQUAD *
 SEGPTR *
 UINT16 *
-ULONG *
-WORD *
 char *
 void *
 
@@ -76,7 +65,6 @@ HMODULE16
 HPALETTE16
 HTASK16
 HWND16
-MMRESULT16
 OLESTATUS
 UINT16
 WORD

tools/winapi_check/win32/advapi32.api

 %long
 
 HCRYPTKEY
+HKEY
+NTSTATUS
 POLICY_INFORMATION_CLASS
 REGSAM
 SC_HANDLE
+SECURITY_IMPERSONATION_LEVEL
+SECURITY_INFORMATION
 SERVICE_STATUS_HANDLE
 TOKEN_INFORMATION_CLASS
 
@@ -17,14 +21,25 @@ HCRYPTPROV *
 LPCWSTR *
 LPENUM_SERVICE_STATUSA
 LPHANDLER_FUNCTION
+LPHKEY
 LPSERVICE_STATUS
 LPSERVICE_TABLE_ENTRYA
 LPSERVICE_TABLE_ENTRYW
+PACL
+PACL *
+PGENERIC_MAPPING
 PLSA_HANDLE
 PLSA_OBJECT_ATTRIBUTES
 PLSA_REFERENCED_DOMAIN_LIST *
 PLSA_TRANSLATED_NAME *
 PLSA_UNICODE_STRING
+PLUID
+PPRIVILEGE_SET
+PSECURITY_DESCRIPTOR_CONTROL
+PSID
+PSID *
+PSID_IDENTIFIER_AUTHORITY
 PSID_NAME_USE
 PUCHAR
+SECURITY_ATTRIBUTES *
 SECURITY_DESCRIPTOR *

tools/winapi_check/win32/avifil32.api

@@ -6,6 +6,7 @@ AVISTREAMINFOW *
 IAVIFile *
 LPAVIFILEINFOA
 LPAVIFILEINFOW
+LPBITMAPINFOHEADER
 PAVIFILE
 PAVIFILE *
 PAVISTREAM

tools/winapi_check/win32/comdlg32.api

@@ -2,6 +2,10 @@
 
 HWND
 
+%long # --forbidden
+
+short
+
 %ptr
 
 LPCHOOSECOLORA

tools/winapi_check/win32/crtdll.api

@@ -9,8 +9,11 @@ CRTDLL_FILE *
 LPDWORD *
 LPSTR **
 PCONTEXT
+PEXCEPTION_FRAME
 PEXCEPTION_FRAME *
+PEXCEPTION_RECORD
 VOID *
+WCHAR *
 _INITTERMFUN *
 jmp_buf
 struct find_t *

tools/winapi_check/win32/ddraw.api

@@ -6,3 +6,4 @@ LPDDENUMCALLBACKEXW
 LPDDENUMCALLBACKW
 LPDIRECTDRAW *
 LPDIRECTDRAWCLIPPER *
+LPGUID

tools/winapi_check/win32/dplayx.api

@@ -4,3 +4,4 @@ LPDIRECTPLAYLOBBY *
 LPDIRECTPLAYLOBBYA *
 LPDPENUMDPCALLBACKA
 LPDPENUMDPCALLBACKW
+LPGUID
\ No newline at end of file

tools/winapi_check/win32/gdi32.api

@@ -49,6 +49,8 @@ LPFONTSIGNATURE
 LPGLYPHMETRICS
 LPHANDLETABLE
 LPKERNINGPAIR
+LPLOGFONTA
+LPLOGFONTW
 LPLOGCOLORSPACEA
 LPLOGCOLORSPACEW
 LPOUTLINETEXTMETRICA
@@ -68,6 +70,7 @@ PFLOAT
 PIXELFORMATDESCRIPTOR *
 PPOLYTEXTA
 PPOLYTEXTW
+RECT *
 RGBQUAD *
 RGNDATA *
 TEXTMETRICA *

tools/winapi_check/win32/imagehlp.api

@@ -25,5 +25,6 @@ PSTACKFRAME
 PSYMBOL_REGISTERED_CALLBACK
 PSYM_ENUMMODULES_CALLBACK
 PSYM_ENUMSYMBOLS_CALLBACK
+PULONG
 PTRANSLATE_ADDRESS_ROUTINE
 PWIN_CERTIFICATE

tools/winapi_check/win32/imm32.api

@@ -8,6 +8,8 @@ HIMC
 LPCANDIDATEFORM
 LPCANDIDATELIST
 LPCOMPOSITIONFORM
+LPLOGFONTA
+LPLOGFONTW
 LPSTYLEBUFA
 LPSTYLEBUFW
 REGISTERWORDENUMPROCA

tools/winapi_check/win32/kernel32.api

@@ -11,6 +11,7 @@ ULONG_PTR
 %long # --forbidden
 
 BOOL16
+UINT16
 
 %ptr
 
@@ -70,8 +71,11 @@ OSVERSIONINFOA *
 OSVERSIONINFOW *
 PAPCFUNC
 PEXCEPTION_POINTERS
+PLARGE_INTEGER
 PLONG
+PTIMERAPCROUTINE
 PULARGE_INTEGER
+SECURITY_ATTRIBUTES *
 SYSLEVEL *
 SYSLEVEL **
 SYSTEMTIME *

tools/winapi_check/win32/msvfw32.api

@@ -9,3 +9,4 @@ HWND
 
 FARPROC
 ICINFO *
+LPBITMAPINFOHEADER
\ No newline at end of file

tools/winapi_check/win32/ntdll.api

@@ -4,9 +4,12 @@ FILE_INFORMATION_CLASS
 FS_INFORMATION_CLASS
 KEY_INFORMATION_CLASS
 KEY_VALUE_INFORMATION_CLASS
+NTSTATUS
 OBJECT_INFORMATION_CLASS
 PROCESSINFOCLASS
 SECTION_INHERIT
+SECURITY_IMPERSONATION_LEVEL
+SECURITY_INFORMATION
 SYSTEM_INFORMATION_CLASS
 THREADINFOCLASS
 TIMER_TYPE
@@ -22,17 +25,32 @@ EXCEPTION_RECORD *
 LPRTL_RWLOCK
 PACE_HEADER
 PACE_HEADER *
+PACL
+PACL *
 PANSI_STRING
 PBOOLEAN
+PEXCEPTION_FRAME
+PEXCEPTION_RECORD
+PGENERIC_MAPPING
 PIMAGE_NT_HEADERS
 PIO_APC_ROUTINE
 PIO_STATUS_BLOCK
+PLARGE_INTEGER
+PLUID
 POBJDIR_INFORMATION
 POBJECT_ATTRIBUTES
+PPRIVILEGE_SET
 PRTL_HEAP_DEFINITION
+PSECURITY_DESCRIPTOR_CONTROL
+PSID
+PSID *
+PSID_IDENTIFIER_AUTHORITY
 PSTRING
 PTIME_FIELDS
+PTIMERAPCROUTINE
 PTOKEN_PRIVILEGES
+PULONG
 PUNICODE_STRING
 PWCHAR
 struct _TEB *
+

tools/winapi_check/win32/ole32.api

@@ -22,17 +22,20 @@ IMoniker **
 IPersistStream *
 IStorage *
 IStorage **
+LPBC
 LPBC *
 LPDATAADVISEHOLDER *
 LPDATAOBJECT
 LPDROPTARGET
 LPENUMFORMATETC *
 LPENUMOLEVERB *
+LPFORMATETC
 LPLOCKBYTES *
 LPMESSAGEFILTER
 LPMESSAGEFILTER *
 LPMONIKER
 LPMONIKER *
+LPMSG
 LPOLEADVISEHOLDER *
 LPOLEINPLACEACTIVEOBJECT
 LPOLEINPLACEFRAME
@@ -42,11 +45,15 @@ LPOLESTR
 LPOLESTR *
 LPPERSISTSTORAGE
 LPRUNNINGOBJECTTABLE *
+LPSTORAGE
 LPSTREAM *
 MULTI_QI *
 SNB
 STGMEDIUM *
+WCHAR *
 
 %ptr # --forbidden
 
-LPOLESTR16
\ No newline at end of file
+LPOLESTR16
+
+

tools/winapi_check/win32/oleaut32.api

@@ -3,17 +3,23 @@
 CY
 double
 
-
 %long
 
 DATE
+HCURSOR
+HICON
 HPALETTE
+HWND
+OLE_COLOR
 REGKIND
 SYSKIND
 USHORT
 VARIANT_BOOL
 VARTYPE
-VOID **
+
+%long # --forbidden
+
+short
 
 %ptr
 
@@ -27,7 +33,10 @@ ITypeLib *
 ITypeLib **
 LPBSTR
 LPFONTDESC
+LPOCPFIPARAMS
 LPOLESTR
+LPPICTDESC
+LPSTREAM
 SAFEARRAY *
 SAFEARRAY **
 SAFEARRAYBOUND *

tools/winapi_check/win32/olecli32.api

@@ -3,11 +3,14 @@
 HDC
 LHCLIENTDOC
 OLECLIPFORMAT
+OLESTATUS
 OLEOPT_RENDER
 
 %ptr
 
 IPersistStream *
-LPOLECLIENT
 LHCLIENTDOC *
+LPFORMATETC
+LPSTORAGE
+LPOLECLIENT
 LPOLEOBJECT *

tools/winapi_check/win32/olepro32.api

+%long
+
+HWND
+
+%ptr
+
+LPOCPFIPARAMS
+LPPICTDESC
+LPSTREAM

tools/winapi_check/win32/olesvr32.api

@@ -3,6 +3,7 @@
 LHSERVER
 LHSERVERDOC
 OLE_SERVER_USE
+OLESTATUS
 
 %ptr
 

tools/winapi_check/win32/shell32.api

@@ -5,12 +5,12 @@ HBITMAP
 HDROP
 HMENU
 HICON
+HKEY
 HWND
 
 %ptr
 
 HIMAGELIST *
-IDSTRUCT *
 IDropTarget *
 IShellFolder **
 LPBROWSEINFOA
@@ -19,8 +19,10 @@ LPCITEMIDLIST *
 LPDRAWITEMSTRUCT
 LPFNCREATEINSTANCE
 LPFNFMCALLBACK
+LPHKEY
 LPITEMIDLIST *
 LPMEASUREITEMSTRUCT
+LPNOTIFYREGISTER
 LPSHELLEXECUTEINFOA
 LPSHELLEXECUTEINFOW
 LPSHELLFLAGSTATE

tools/winapi_check/win32/shlwapi.api

 %long
 
+HKEY
 HWND
\ No newline at end of file

tools/winapi_check/win32/user32.api

@@ -45,6 +45,7 @@ LPMENUINFO
 LPMENUITEMINFOA
 LPMENUITEMINFOW
 LPMONITORINFO
+LPMSG
 LPMSGBOXPARAMSA
 LPMSGBOXPARAMSW
 MENUITEMINFOA *
@@ -59,6 +60,7 @@ PROPENUMPROCEXA
 PROPENUMPROCEXW
 PROPENUMPROCW
 PSECURITY_QUALITY_OF_SERVICE
+RECT *
 SCROLLINFO *
 SECURITY_INFORMATION *
 SECURITY_QUALITY_OF_SERVICE *

tools/winapi_check/win32/winmm.api

@@ -12,6 +12,10 @@ HWAVEIN
 HWAVEOUT
 HWND
 
+%long # --forbidden
+
+UINT16
+
 %ptr
 
 HMIDIIN *

tools/winapi_check/win32api.dat

@@ -12,7 +12,6 @@ HANDLE
 HFILE
 HGLOBAL
 HINSTANCE
-HKEY
 HKL
 HMODULE
 HRESULT
@@ -24,11 +23,7 @@ LONG
 LPARAM
 LRESULT
 MMRESULT
-NTSTATUS
-OLESTATUS
 PHANDLE
-SECURITY_IMPERSONATION_LEVEL
-SECURITY_INFORMATION
 UINT
 ULONG
 WCHAR
@@ -58,7 +53,6 @@ INT *
 IStream *
 IUnknown *
 LONG *
-LPBITMAPINFOHEADER
 LPBOOL
 LPBYTE
 LPCLSID
@@ -68,23 +62,16 @@ LPDEVMODEA
 LPDEVMODEW
 LPDWORD
 LPFILETIME
-LPFORMATETC
-LPGUID
-LPHKEY
 LPINT
 LPITEMIDLIST
-LPLOGFONTA
-LPLOGFONTW
 LPLONG
 LPMALLOC *
-LPMSG
 LPOLECLIENTSITE
 LPOLEOBJECT
 LPPOINT
 LPRECT
 LPSCROLLINFO
 LPSECURITY_ATTRIBUTES
-LPSTORAGE
 LPSTR *
 LPSTRRET
 LPSYSTEMTIME
@@ -95,34 +82,17 @@ LPVOID
 LPVOID *
 LPWORD
 LPWSTR *
-PACL
-PACL *
 PCHAR
 PDWORD
-PEXCEPTION_FRAME
-PEXCEPTION_RECORD
-PGENERIC_MAPPING
-PLARGE_INTEGER
-PLUID
 POINT *
-PPRIVILEGE_SET
 PSECURITY_DESCRIPTOR
-PSECURITY_DESCRIPTOR_CONTROL
-PSID
-PSID *
-PSID_IDENTIFIER_AUTHORITY
-PTIMERAPCROUTINE
-PULONG
 PVOID
 PVOID *
-RECT *
 REFCLSID
 REFGUID
 REFIID
-SECURITY_ATTRIBUTES *
 UINT *
 ULONG *
-WCHAR *
 WORD *
 char *
 va_list
@@ -149,8 +119,6 @@ LPWSTR
 %long # --forbidden
 
 HMODULE16
-UINT16
 int
 long
-short
 unsigned