- Minor fixes.

tools/winapi_check/win16/commdlg.api

+%ptr
+
+LPCHOOSECOLOR16
+LPCHOOSEFONT16
+LPPRINTDLG16
+
+%word
+
+short

tools/winapi_check/win16/compobj.api

+%ptr
+
+CLSID *
+FILETIME *
+GUID *
+HTASK16 *
+IMalloc16 *
+LPCLSID
+LPFILETIME
+LPMALLOC16 *
+LPMESSAGEFILTER
+LPMESSAGEFILTER *
+LPOLESTR16 *
+LPUNKNOWN
+
+%str # --forbidden
+
+LPOLESTR
\ No newline at end of file

tools/winapi_check/win16/ddeml.api

+%long
+
+HCONV
+HCONVLIST
+HDDEDATA
+HSZ
+
+%ptr
+
+LPCONVCONTEXT16
+LPCONVINFO16

tools/winapi_check/win16/display.api

 %ptr
 
 LPCURSORINFO
+
+%ptr # --forbidden
+
+struct tagCURSORICONINFO *

tools/winapi_check/win16/gdi.api

+%ptr
+
+BITMAP16 *
+BITMAPINFO *
+DEVMODEA *
+DOCINFO16 *
+FARPROC16 *
+HANDLETABLE16 *
+LOGBRUSH16 *
+LOGFONT16 *
+LOGPALETTE *
+LOGPEN16 *
+LPABC16
+LPENUMLOGFONT16
+LPFONTINFO16
+LPGLYPHMETRICS16
+LPKERNINGPAIR16
+LPLOGFONT16
+LPNEWTEXTMETRIC16
+LPOUTLINETEXTMETRIC16
+LPPALETTEENTRY
+LPPDEVICE
+LPRASTERIZER_STATUS
+LPRGNDATA
+LPSIZE16
+LPTEXTXFORM16
+MAT2 *
+METARECORD *
+PALETTEENTRY *
+TEXTMETRIC16 *
+VOID *
+
+%ptr # --forbidden
+
+LPDEVMODEA
+
+%segptr
+
+FONTENUMPROC16
+FONTENUMPROCEX16
+GOBJENUMPROC16
+LINEDDAPROC16
+MFENUMPROC16
+
 %word
 
 HDC16
+HFONT16
+HGDIOBJ16
+HMETAFILE16
+HPEN16
+HPJOB16
+HPQ16
+HRGN16
\ No newline at end of file

tools/winapi_check/win16/kernel.api

+%long # --forbidden
+
+HKEY
+HMODULE
+
+%ptr
+
+BYTE *
+FARPROC16 *
+HANDLE *
+LPCATCHBUF
+OFSTRUCT *
+OSVERSIONINFO16 *
+SECURITY_ATTRIBUTES *
+SEGINFO *
+SYSLEVEL *
+THUNKLET *
+WIN32_FIND_DATAA *
+WINDEBUGINFO *
+struct ThunkDataCommon *
+
+%ptr # --forbidden
+
+FARPROC
+FARPROC *
+LPHKEY
+
+%word
+
+ATOM
+HLOCAL16
+HQUEUE16
+HRSRC16
+
+%wstr # --forbidden
+
+LPCWSTR
+

tools/winapi_check/win16/keyboard.api

+%word
+
+CHAR
\ No newline at end of file

tools/winapi_check/win16/lzexpand.api

+%ptr
+
+LPOFSTRUCT

tools/winapi_check/win16/mmsystem.api

+%long
+
+FOURCC
+
+%long # --forbidden
+
+HWND
+
+%ptr
+
+DWORD *
+HINSTANCE16 *
+HMIDIIN16 *
+HMIDIOUT16 *
+HMIDISTRM16 *
+HPCSTR
+HPSTR
+HWAVEIN16 *
+HWAVEOUT16 *
+LPAUXCAPS16
+LPHANDLE
+LPHMIXER16
+LPJOYCAPS16
+LPJOYINFO16
+LPJOYINFOEX
+LPMIDIHDR16
+LPMIDIINCAPS16
+LPMIDIOUTCAPS16
+LPMIXERCAPS16
+LPMIXERCONTROLDETAILS16
+LPMIXERLINE16
+LPMIXERLINECONTROLS16
+LPMMCKINFO
+LPMMIOPROC16
+LPMMTIME16
+LPTIMECAPS16
+LPUINT16
+LPWAVEINCAPS16
+LPWAVEOUTCAPS16
+MIDIHDR16 *
+MMCKINFO *
+MMIOINFO16 *
+WAVEHDR *
+
+%ptr # --forbidden
+
+LPWAVEFORMATEX
+LPWAVEHDR
+
+%segptr
+
+LPTIMECALLBACK16
+
+%segptr # --forbidden
+
+YIELDPROC
+
+%word
+
+HDRVR16
+HMIDIIN16
+HMIDIOUT16
+HMIDISTRM16
+HMIXER16
+HMIXEROBJ16
+HMMIO16
+HWAVEIN16
+HWAVEOUT16
+

tools/winapi_check/win16/msacm.api

+%ptr
+
+ACMDRIVERENUMCB16
+ACMFILTERENUMCB16
+ACMFILTERTAGENUMCB16
+ACMFORMATENUMCB16
+ACMFORMATTAGENUMCB16
+LPACMDRIVERDETAILS16
+LPACMFILTERCHOOSE16
+LPACMFILTERDETAILS16
+LPACMFILTERTAGDETAILS16
+LPACMFORMATCHOOSE16
+LPACMFORMATDETAILS16
+LPACMFORMATTAGDETAILS16
+LPACMSTREAMHEADER16
+LPHACMDRIVER16
+LPHACMDRIVERID16
+LPHACMSTREAM16
+
+%ptr # --forbidden
+
+LPWAVEFILTER
+LPWAVEFORMATEX
+
+%word
+
+HACMDRIVER16
+HACMDRIVERID16
+HACMOBJ16
+HACMSTREAM16

tools/winapi_check/win16/ole2.api

+%ptr
+
+LPDROPTARGET
+LPMONIKER *
+LPRUNNINGOBJECTTABLE *

tools/winapi_check/win16/ole2disp.api

+%ptr
+
+BSTR16 *
+LPBSTR16
+INTERFACEDATA *
+ITypeInfo **
+IUnknown *
+
+%segstr
+
+BSTR16
+
+%word # --forbidden
+
+unsigned

tools/winapi_check/win16/ole2nls.api

+%long
+
+LCTYPE
+
+%word
+
+LANGID

tools/winapi_check/win16/olecli.api

+%long
+
+LHCLIENTDOC
+
+%ptr
+
+LHCLIENTDOC *
+LPOLECLIENT
+LPOLEOBJECT
+LPOLEOBJECT *
+
 %word
 
 HDC16

tools/winapi_check/win16/olesvr.api

+%long
+
+LHSERVER
+LHSERVERDOC
+
+%ptr
+
+BOOL16 *
+LHSERVERDOC *
+LPOLESERVERDOC
+

tools/winapi_check/win16/shell.api

+%long # --forbidden
+
+HKEY
+
+%ptr
+
+HICON16 *
+
+%ptr # --forbidden
+
+LPHKEY
+
+%word
+
+HDROP16

tools/winapi_check/win16/storage.api

+%ptr
+
+LPSTORAGE16
+IID *
+IStorage16 *
+IStorage16 **
+IStream16 *
+IStream16 **
+SNB16
+STATSTG16 *
+ULARGE_INTEGER *
+
+%longlong
+
+LARGE_INTEGER
+
+

tools/winapi_check/win16/toolhelp.api

+%ptr
+
+CLASSENTRY *
+GLOBALENTRY *
+GLOBALINFO *
+LOCALENTRY *
+LOCALINFO *
+MEMMANINFO *
+MODULEENTRY *
+STACKTRACEENTRY *
+TASKENTRY *
+SYSHEAPINFO *
+TIMERINFO *
+
+%ptr # --forbidden
+
+FARPROC
+LOCAL32ENTRY *
+LOCAL32INFO *
+

tools/winapi_check/win16/typelib.api

+%ptr
+
+LPBSTR16
+
+%str # --forbidden
+
+LPOLESTR

tools/winapi_check/win16/user.api

+%long
+
+HHOOK
+POINT16
+
+%ptr
+
+BOOL16 *
+COLORREF *
+CURSORICONINFO *
+DWORD *
+HHOOK *
+LPCOMSTAT16
+LPDCB16
+LPDRIVERINFOSTRUCT16
+LPICONINFO16
+LPMSG16
+LPMSG16_32
+LPMSGBOXPARAMS16
+LPPAINTSTRUCT16
+LPQUEUESTRUCT16 *
+LPSCROLLINFO
+MENUITEMINFO16 *
+MSG16 *
+MSG32_16 *
+PAINTSTRUCT16 *
+SCROLLINFO *
+WINDOWPLACEMENT16 *
+WNDCLASS16 *
+WNDCLASSEX16 *
+
+%segptr
+
+DLGPROC16
+GRAYSTRINGPROC16
+HOOKPROC16
+PROPENUMPROC16
+TIMERPROC16
+WNDENUMPROC16
+WNDPROC16
+
 %word
 
+ATOM
+CHAR
+HACCEL16
+HCURSOR16
 HDC16
+HDRVR16
+HDWP16
+HFONT16
+HMENU16
+HQUEUE16
+HRGN16
+HRSRC16

tools/winapi_check/win16/w32sys.api

+%ptr
+
+LPWIN32SINFO

tools/winapi_check/win16/win32s16.api

+%ptr
+
+LPMEMORY_BASIC_INFORMATION
\ No newline at end of file

tools/winapi_check/win16/win87em.api

+%ptr
+
+struct Win87EmInfoStruct *
\ No newline at end of file

tools/winapi_check/win16/wineps.api

+%ptr # --forbidden
+
+LPDEVMODEA
\ No newline at end of file

tools/winapi_check/win16/wing.api

+%ptr
+
+BITMAPINFO *
+
 %word
 
 HDC16
+WING_DITHER_TYPE

tools/winapi_check/win16/winsock.api

+%long # --forbidden
+u_long
+
+%ptr
+
+LPWSADATA
+struct sockaddr *
+struct timeval *
+ws_fd_set16 *
+
+%unknown
+
+struct in_addr
+
+%word
+
+SOCKET16
+
+%word # --forbidden
+
+u_short
+
+

tools/winapi_check/win16api.dat

@@ -2,237 +2,43 @@
 
 COLORREF
 DWORD
-FOURCC
-HCONV
-HCONVLIST
-HDDEDATA
-HHOOK
-HKEY
 HRESULT
-HSZ
 LCID
-LCTYPE
-LHCLIENTDOC
-LHSERVER
-LHSERVERDOC
 LONG
 LPARAM
 LRESULT
-POINT16
 ULONG
 
 %longlong
 
-LARGE_INTEGER
 ULARGE_INTEGER
 
 %ptr
 
-ACMDRIVERENUMCB16
-ACMFILTERENUMCB16
-ACMFILTERTAGENUMCB16
-ACMFORMATENUMCB16
-ACMFORMATTAGENUMCB16
-BITMAP16 *
-BITMAPINFO *
 BITMAPINFOHEADER *
-BOOL16 *
-BSTR16 *
-BYTE *
-CLASSENTRY *
-CLSID *
-COLORREF *
 CONTEXT86 *
-CURSORICONINFO *
-DEVMODEA *
-DOCINFO16 *
-DWORD *
-FARPROC *
-FARPROC16 *
-FILETIME *
-GLOBALENTRY *
-GLOBALINFO *
-GUID *
-HANDLE *
-HANDLETABLE16 *
-HHOOK *
-HICON16 *
-HINSTANCE16 *
-HMIDIIN16 *
-HMIDIOUT16 *
-HMIDISTRM16 *
-HPCSTR
-HPSTR
-HTASK16 *
-HWAVEIN16 *
-HWAVEOUT16 *
-IID *
-IMalloc16 *
 INT16 *
-INTERFACEDATA *
-IStorage16 *
-IStorage16 **
-IStream16 *
-IStream16 **
-ITypeInfo **
-IUnknown *
-LHCLIENTDOC *
-LHSERVERDOC *
-LOCAL32ENTRY *
-LOCAL32INFO *
-LOCALENTRY *
-LOCALINFO *
-LOGBRUSH16 *
-LOGFONT16 *
-LOGPALETTE *
-LOGPEN16 *
-LPABC16
-LPACMDRIVERDETAILS16
-LPACMFILTERCHOOSE16
-LPACMFILTERDETAILS16
-LPACMFILTERTAGDETAILS16
-LPACMFORMATCHOOSE16
-LPACMFORMATDETAILS16
-LPACMFORMATTAGDETAILS16
-LPACMSTREAMHEADER16
-LPAUXCAPS16
-LPBSTR16
 LPBYTE
-LPCATCHBUF
-LPCHOOSECOLOR16
-LPCHOOSEFONT16
-LPCLSID
-LPCOMSTAT16
-LPCONVCONTEXT16
-LPCONVINFO16
 LPCVOID
-LPDCB16
-LPDEVMODEA
-LPDRIVERINFOSTRUCT16
 LPDWORD
-LPENUMLOGFONT16
-LPFILETIME
-LPFONTINFO16
-LPGLYPHMETRICS16
-LPHACMDRIVER16
-LPHACMDRIVERID16
-LPHACMSTREAM16
-LPHANDLE
-LPHKEY
-LPHMIXER16
-LPICONINFO16
 LPINT16
-LPJOYCAPS16
-LPJOYINFO16
-LPJOYINFOEX
-LPKERNINGPAIR16
-LPLOGFONT16
-LPMALLOC16 *
-LPMEMORY_BASIC_INFORMATION
-LPMESSAGEFILTER
-LPMESSAGEFILTER *
-LPMIDIHDR16
-LPMIDIINCAPS16
-LPMIDIOUTCAPS16
-LPMIXERCAPS16
-LPMIXERCONTROLDETAILS16
-LPMIXERLINE16
-LPMIXERLINECONTROLS16
-LPMMCKINFO
-LPMMIOPROC16
-LPMMTIME16
-LPMONIKER *
-LPMSG16
-LPMSG16_32
-LPMSGBOXPARAMS16
-LPNEWTEXTMETRIC16
-LPOFSTRUCT
-LPOLECLIENT
-LPOLEOBJECT
-LPOLEOBJECT *
-LPOLESERVERDOC
-LPOLESTR16 *
-LPDROPTARGET
-LPOUTLINETEXTMETRIC16
-LPPAINTSTRUCT16
-LPPALETTEENTRY
-LPPDEVICE
 LPPOINT16
-LPPRINTDLG16
-LPQUEUESTRUCT16 *
-LPRASTERIZER_STATUS
 LPRECT16
-LPRGNDATA
-LPRUNNINGOBJECTTABLE *
-LPSCROLLINFO
-LPSIZE16
-LPSTORAGE16
-LPTEXTXFORM16
-LPTIMECAPS16
-LPUINT16
-LPUNKNOWN
 LPVOID
 LPVOID *
-LPWAVEFILTER
-LPWAVEFORMATEX
-LPWAVEHDR
-LPWAVEINCAPS16
-LPWAVEOUTCAPS16
-LPWIN32SINFO
 LPWORD
-LPWSADATA
-MAT2 *
-MEMMANINFO *
-MENUITEMINFO16 *
-METARECORD *
-MIDIHDR16 *
-MMCKINFO *
-MMIOINFO16 *
-MODULEENTRY *
-MSG16 *
-MSG32_16 *
-OFSTRUCT *
-OSVERSIONINFO16 *
-PAINTSTRUCT16 *
-PALETTEENTRY *
 POINT16 *
 RECT16 *
 REFCLSID
 REFGUID
 REFIID
 RGBQUAD *
-SCROLLINFO *
-SECURITY_ATTRIBUTES *
-SEGINFO *
 SEGPTR *
-SNB16
-STACKTRACEENTRY *
-STATSTG16 *
-SYSHEAPINFO *
-SYSLEVEL *
-TASKENTRY *
-TEXTMETRIC16 *
-THUNKLET *
-TIMERINFO *
 UINT16 *
-ULARGE_INTEGER *
 ULONG *
-VOID *
-WAVEHDR *
-WIN32_FIND_DATAA *
-WINDEBUGINFO *
-WINDOWPLACEMENT16 *
-WNDCLASS16 *
-WNDCLASSEX16 *
 WORD *
 char *
-struct ThunkDataCommon *
-struct Win87EmInfoStruct *
-struct sockaddr *
-struct tagCURSORICONINFO *
-struct timeval *
 void *
-ws_fd_set16 *
 
 %s_word
 
@@ -240,38 +46,16 @@ INT16
 
 %segptr
 
-DLGPROC16
 FARPROC16
-FONTENUMPROC16
-FONTENUMPROCEX16
-GOBJENUMPROC16
-GRAYSTRINGPROC16
-HOOKPROC16
-LINEDDAPROC16
-LPTIMECALLBACK16
-MFENUMPROC16
-PROPENUMPROC16
 SEGPTR
-TIMERPROC16
-WNDENUMPROC16
-WNDPROC16
-
-%segstr
-
-BSTR16
 
 %str
 
 LPCOLESTR16
 LPCSTR
-LPCWSTR
 LPSTR
 LPOLESTR16
 
-%unknown
-
-struct in_addr
-
 %void
 
 void
@@ -279,73 +63,32 @@ VOID
 
 %word
 
-ATOM
 BOOL16
 BYTE
-CHAR
-HACCEL16
-HACMDRIVER16
-HACMDRIVERID16
-HACMOBJ16
-HACMSTREAM16
 HANDLE16
 HBITMAP16
 HBRUSH16
-HCURSOR16
-HDROP16
-HDRVR16
-HDWP16
 HFILE16
-HFONT16
-HGDIOBJ16
 HGLOBAL16
 HICON16
 HINSTANCE16
-HLOCAL16
-HMENU16
-HMETAFILE16
-HMIDIIN16
-HMIDIOUT16
-HMIDISTRM16
-HMIXER16
-HMIXEROBJ16
-HMMIO16
 HMODULE16
 HPALETTE16
-HPEN16
-HPJOB16
-HPQ16
-HQUEUE16
-HRGN16
-HRSRC16
 HTASK16
-HWAVEIN16
-HWAVEOUT16
 HWND16
-LANGID
 MMRESULT16
 OLESTATUS
-SOCKET16
 UINT16
-WING_DITHER_TYPE
 WORD
 WPARAM16
 
 %unknown # --forbidden
 
 BOOL
-FARPROC
 HANDLE
 HINSTANCE
-HMODULE
-HWND
 INT
-LPOLESTR
 UINT
-YIELDPROC
 int
 long
-short
-u_long
-u_short
-unsigned
+

tools/winapi_check/win32/advapi32.api

 %long
 
+HCRYPTKEY
 POLICY_INFORMATION_CLASS
+REGSAM
+SC_HANDLE
+SERVICE_STATUS_HANDLE
+TOKEN_INFORMATION_CLASS
 
 %long --extension
 
-LSA_HANDLE
\ No newline at end of file
+LSA_HANDLE
+
+%ptr
+
+HCRYPTPROV *
+LPCWSTR *
+LPENUM_SERVICE_STATUSA
+LPHANDLER_FUNCTION
+LPSERVICE_STATUS
+LPSERVICE_TABLE_ENTRYA
+LPSERVICE_TABLE_ENTRYW
+PLSA_HANDLE
+PLSA_OBJECT_ATTRIBUTES
+PLSA_REFERENCED_DOMAIN_LIST *
+PLSA_TRANSLATED_NAME *
+PLSA_UNICODE_STRING
+PSID_NAME_USE
+PUCHAR
+SECURITY_DESCRIPTOR *

tools/winapi_check/win32/avifil32.api

@@ -10,3 +10,4 @@ PAVIFILE
 PAVIFILE *
 PAVISTREAM
 PAVISTREAM *
+PGETFRAME
\ No newline at end of file

tools/winapi_check/win32/comctl32.api

@@ -3,9 +3,32 @@
 COLORREF
 HBITMAP
 HDC
+HDPA
+HDSA
 HICON
+HIMAGELIST
+HPROPSHEETPAGE
 HWND
 
 %ptr
 
-TRACKMOUSEEVENT *
\ No newline at end of file
+DPAENUMPROC
+DPALOADPROC
+DSAENUMPROC
+HDPA *
+IMAGEINFO *
+IMAGELISTDRAWPARAMS *
+LPCOLDTBBUTTON
+LPCOLORMAP
+LPCPROPSHEETHEADERA
+LPCPROPSHEETHEADERW
+LPCPROPSHEETPAGEA
+LPCPROPSHEETPAGEW
+LPCREATEMRULIST
+LPCTBBUTTON
+LPINITCOMMONCONTROLSEX
+LPNMHDR
+LPSTREAM
+PFNDPACOMPARE
+PFNDPAMERGE
+TRACKMOUSEEVENT *

tools/winapi_check/win32/comdlg32.api

 %long
 
-HWND
\ No newline at end of file
+HWND
+
+%ptr
+
+LPCHOOSECOLORA
+LPCHOOSECOLORW
+LPCHOOSEFONTA
+LPCHOOSEFONTW
+LPFINDREPLACEA
+LPFINDREPLACEW
+LPOPENFILENAMEA
+LPOPENFILENAMEW
+LPPAGESETUPDLGA
+LPPRINTDLGA
+LPPRINTDLGW

tools/winapi_check/win32/crtdll.api

+%long
+
+clock_t
+time_t
+
+%ptr
+
+CRTDLL_FILE *
+LPDWORD *
+LPSTR **
+PCONTEXT
+PEXCEPTION_FRAME *
+VOID *
+_INITTERMFUN *
+jmp_buf
+struct find_t *
+struct stat *
+struct win_stat *
+time_t *
+
+%unknown
+
+new_handler_type
+sig_handler_type

tools/winapi_check/win32/ddraw.api

+%ptr
+
+LPDDENUMCALLBACKA
+LPDDENUMCALLBACKEXA
+LPDDENUMCALLBACKEXW
+LPDDENUMCALLBACKW
+LPDIRECTDRAW *
+LPDIRECTDRAWCLIPPER *

tools/winapi_check/win32/dplayx.api

+%ptr
+
+LPDIRECTPLAYLOBBY *
+LPDIRECTPLAYLOBBYA *
+LPDPENUMDPCALLBACKA
+LPDPENUMDPCALLBACKW

tools/winapi_check/win32/dsound.api

+%ptr
+
+LPDIRECTSOUND *
+LPDSENUMCALLBACKA
\ No newline at end of file

tools/winapi_check/win32/gdi32.api

@@ -16,7 +16,60 @@ HWND
 
 %ptr
 
+ABORTPROC
 BITMAP *
 BITMAPINFO *
 BITMAPINFOHEADER *
-
+COLORADJUSTMENT *
+DEVMODEA *
+DEVMODEW *
+DOCINFOA *
+DOCINFOW *
+ENHMETARECORD *
+ENHMFENUMPROC
+FONTENUMPROCA
+FONTENUMPROCEXA
+FONTENUMPROCEXW
+FONTENUMPROCW
+GCP_RESULTSA *
+GCP_RESULTSW *
+GOBJENUMPROC
+HANDLETABLE *
+LINEDDAPROC
+LOGBRUSH *
+LOGFONTA *
+LOGFONTW *
+LOGPALETTE *
+LOGPEN *
+LPABC
+LPABCFLOAT
+LPCOLORADJUSTMENT
+LPENHMETAHEADER
+LPFONTSIGNATURE
+LPGLYPHMETRICS
+LPHANDLETABLE
+LPKERNINGPAIR
+LPLOGCOLORSPACEA
+LPLOGCOLORSPACEW
+LPOUTLINETEXTMETRICA
+LPOUTLINETEXTMETRICW
+LPPALETTEENTRY
+LPPIXELFORMATDESCRIPTOR
+LPRASTERIZER_STATUS
+LPRGNDATA
+LPSIZE
+LPXFORM
+MAT2 *
+METAFILEPICT *
+METARECORD *
+MFENUMPROC
+PALETTEENTRY *
+PFLOAT
+PIXELFORMATDESCRIPTOR *
+PPOLYTEXTA
+PPOLYTEXTW
+RGBQUAD *
+RGNDATA *
+TEXTMETRICA *
+TEXTMETRICW *
+XFORM *

tools/winapi_check/win32/icmp.api

+%long
+
+IPAddr
+
+%ptr
+
+PIP_OPTION_INFORMATION
\ No newline at end of file

tools/winapi_check/win32/imagehlp.api

+%long
+
+DIGEST_HANDLE
+USHORT
+
+%ptr
+
+DIGEST_FUNCTION
+PAPI_VERSION
+PCHAR *
+PENUMLOADED_MODULES_CALLBACK
+PFUNCTION_TABLE_ACCESS_ROUTINE
+PGET_MODULE_BASE_ROUTINE
+PIMAGEHLP_MODULE
+PIMAGEHLP_STATUS_ROUTINE
+PIMAGEHLP_SYMBOL
+PIMAGE_DEBUG_INFORMATION
+PIMAGE_LOAD_CONFIG_DIRECTORY
+PIMAGE_NT_HEADERS
+PIMAGE_SECTION_HEADER
+PIMAGE_SECTION_HEADER *
+PLOADED_IMAGE
+PREAD_PROCESS_MEMORY_ROUTINE
+PSTACKFRAME
+PSYMBOL_REGISTERED_CALLBACK
+PSYM_ENUMMODULES_CALLBACK
+PSYM_ENUMSYMBOLS_CALLBACK
+PTRANSLATE_ADDRESS_ROUTINE
+PWIN_CERTIFICATE

tools/winapi_check/win32/imm32.api

@@ -2,3 +2,13 @@
 
 HWND
 HIMC
+
+%ptr
+
+LPCANDIDATEFORM
+LPCANDIDATELIST
+LPCOMPOSITIONFORM
+LPSTYLEBUFA
+LPSTYLEBUFW
+REGISTERWORDENUMPROCA
+REGISTERWORDENUMPROCW

tools/winapi_check/win32/kernel32.api

+%long
+
+CALID
+CALTYPE
+COORD
+LCTYPE
+HLOCAL
+HRSRC
+ULONG_PTR
+
+%long # --forbidden
+
+BOOL16
+
+%ptr
+
+BY_HANDLE_FILE_INFORMATION *
+CALINFO_ENUMPROCA
+CODEPAGE_ENUMPROCA
+CODEPAGE_ENUMPROCW
+DATEFMT_ENUMPROCA
+DATEFMT_ENUMPROCW
+ENUMRESLANGPROCA
+ENUMRESLANGPROCW
+ENUMRESNAMEPROCA
+ENUMRESNAMEPROCW
+ENUMRESTYPEPROCA
+ENUMRESTYPEPROCW
+FARPROC
+FARPROC *
+GET_FILEEX_INFO_LEVELS
+HANDLER_ROUTINE *
+INPUT_RECORD *
+LARGE_INTEGER *
+LOCALE_ENUMPROCA
+LOCALE_ENUMPROCW
+LPCHAR_INFO
+LPCOMMTIMEOUTS
+LPCOMSTAT
+LPCONSOLE_CURSOR_INFO
+LPCONSOLE_SCREEN_BUFFER_INFO
+LPCPINFO
+LPDCB
+LPDCB *
+LPDEBUG_EVENT
+LPINPUT_RECORD
+LPLDT_ENTRY
+LPMEMORYSTATUS
+LPMEMORY_BASIC_INFORMATION
+LPMODULEENTRY
+LPOVERLAPPED
+LPOVERLAPPED_COMPLETION_ROUTINE
+LPPROCESSENTRY
+LPPROCESS_HEAP_ENTRY *
+LPPROCESS_INFORMATION
+LPPROGRESS_ROUTINE
+LPSMALL_RECT
+LPSTARTUPINFOA
+LPSTARTUPINFOW
+LPSYSTEM_INFO
+LPSYSTEM_POWER_STATUS
+LPTHREAD_START_ROUTINE
+LPTHREADENTRY
+LPTIME_ZONE_INFORMATION
+LPTOP_LEVEL_EXCEPTION_FILTER
+NUMBERFMTA *
+NUMBERFMTW *
+OFSTRUCT *
+OSVERSIONINFOA *
+OSVERSIONINFOW *
+PAPCFUNC
+PEXCEPTION_POINTERS
+PLONG
+PULARGE_INTEGER
+SYSLEVEL *
+SYSLEVEL **
+SYSTEMTIME *
+TIMEFMT_ENUMPROCA
+TIMEFMT_ENUMPROCW
+WIN32_FIND_DATAA *
+WIN32_FIND_DATAW *
+struct ThunkDataCommon *
+
+%longlong
+
+LARGE_INTEGER
+
+%ptr # --forbidden
+
+FARPROC16
+HGLOBAL16
+HINSTANCE16
+SEGPTR
\ No newline at end of file

tools/winapi_check/win32/lz32.api

+%ptr
+
+LPOFSTRUCT
\ No newline at end of file

tools/winapi_check/win32/mpr.api

 %long
 
-HWND
\ No newline at end of file
+HPROVIDER
+HWND
+enum NOTIFYTYPE
+
+%ptr
+
+ENUMPASSWORDPROC
+LPAUTHDLGSTRUCTA
+LPCONNECTDLGSTRUCTA
+LPCONNECTDLGSTRUCTW
+LPDISCDLGSTRUCTA
+LPDISCDLGSTRUCTW
+LPHANDLE
+LPNETCONNECTINFOSTRUCT
+LPNETINFOSTRUCT
+LPNETRESOURCEA
+LPNETRESOURCEW
+NOTIFYCALLBACK
+PHPROVIDER

tools/winapi_check/win32/msacm32.api

@@ -34,3 +34,5 @@ PACMSTREAMHEADER
 PHACMDRIVER
 PHACMDRIVERID
 PHACMSTREAM
+PWAVEFILTER
+PWAVEFORMATEX

tools/winapi_check/win32/msvfw32.api

@@ -5,3 +5,7 @@ HIC
 HPALETTE
 HWND
 
+%ptr
+
+FARPROC
+ICINFO *

tools/winapi_check/win32/ntdll.api

+%long
+
+FILE_INFORMATION_CLASS
+FS_INFORMATION_CLASS
+KEY_INFORMATION_CLASS
+KEY_VALUE_INFORMATION_CLASS
+OBJECT_INFORMATION_CLASS
+PROCESSINFOCLASS
+SECTION_INHERIT
+SYSTEM_INFORMATION_CLASS
+THREADINFOCLASS
+TIMER_TYPE
+TOKEN_TYPE
+
+%longlong
+
+LARGE_INTEGER
+
+%ptr
+
+EXCEPTION_RECORD *
+LPRTL_RWLOCK
+PACE_HEADER
+PACE_HEADER *
+PANSI_STRING
+PBOOLEAN
+PIMAGE_NT_HEADERS
+PIO_APC_ROUTINE
+PIO_STATUS_BLOCK
+POBJDIR_INFORMATION
+POBJECT_ATTRIBUTES
+PRTL_HEAP_DEFINITION
+PSTRING
+PTIME_FIELDS
+PTOKEN_PRIVILEGES
+PUNICODE_STRING
+PWCHAR
+struct _TEB *

tools/winapi_check/win32/ole32.api

@@ -3,8 +3,50 @@
 CLIPFORMAT
 HACCEL
 HMENU
+HOLEMENU
 HWND
 
 %ptr
+
 CLIPFORMAT *
+COSERVERINFO *
+GUID *
+HGLOBAL *
+IDataObject *
+IDataObject **
+IDropSource *
+IErrorInfo *
+ILockBytes *
+IMoniker *
+IMoniker **
+IPersistStream *
+IStorage *
+IStorage **
+LPBC *
+LPDATAADVISEHOLDER *
+LPDATAOBJECT
+LPDROPTARGET
+LPENUMFORMATETC *
+LPENUMOLEVERB *
+LPLOCKBYTES *
+LPMESSAGEFILTER
+LPMESSAGEFILTER *
+LPMONIKER
+LPMONIKER *
+LPOLEADVISEHOLDER *
+LPOLEINPLACEACTIVEOBJECT
+LPOLEINPLACEFRAME
+LPOLEINPLACEFRAMEINFO
+LPOLEMENUGROUPWIDTHS
+LPOLESTR
+LPOLESTR *
+LPPERSISTSTORAGE
+LPRUNNINGOBJECTTABLE *
+LPSTREAM *
+MULTI_QI *
+SNB
+STGMEDIUM *
+
+%ptr # --forbidden
 
+LPOLESTR16
\ No newline at end of file

tools/winapi_check/win32/oleaut32.api

+%double
+
+CY
+double
+
+
 %long
 
+DATE
 HPALETTE
+REGKIND
+SYSKIND
+USHORT
+VARIANT_BOOL
+VARTYPE
+VOID **
 
 %ptr
 
+BSTR *
+CY *
 COLORREF *
+DATE *
+FLOAT *
+IErrorInfo *
+ITypeLib *
+ITypeLib **
+LPBSTR
+LPFONTDESC
+LPOLESTR
+SAFEARRAY *
+SAFEARRAY **
+SAFEARRAYBOUND *
+USHORT *
+VARIANT *
+VARIANTARG *
+VARIANT_BOOL *
+double *
+short *
+
+%wstr
+
+BSTR
+

tools/winapi_check/win32/olecli32.api

 %long
 
-HDC
\ No newline at end of file
+HDC
+LHCLIENTDOC
+OLECLIPFORMAT
+OLEOPT_RENDER
+
+%ptr
+
+IPersistStream *
+LPOLECLIENT
+LHCLIENTDOC *
+LPOLEOBJECT *

tools/winapi_check/win32/oledlg.api

@@ -2,3 +2,24 @@
 
 HMENU
 HWND
+
+%ptr
+
+HMENU *
+LPOLEUIBUSYA
+LPOLEUIBUSYW
+LPOLEUICHANGEICONA
+LPOLEUICHANGEICONW
+LPOLEUICHANGESOURCEA
+LPOLEUICHANGESOURCEW
+LPOLEUICONVERTA
+LPOLEUICONVERTW
+LPOLEUIEDITLINKSA
+LPOLEUIEDITLINKSW
+LPOLEUIINSERTOBJECTA
+LPOLEUIINSERTOBJECTW
+LPOLEUILINKCONTAINERA
+LPOLEUIOBJECTPROPSA
+LPOLEUIOBJECTPROPSW
+LPOLEUIPASTESPECIALA
+LPOLEUIPASTESPECIALW

tools/winapi_check/win32/olesvr32.api

+%long
+
+LHSERVER
+LHSERVERDOC
+OLE_SERVER_USE
+
+%ptr
+
+LHSERVER *
+LHSERVERDOC *
+LPOLESERVER
+LPOLESERVERDOC

tools/winapi_check/win32/psapi.api

+%ptr
+
+HMODULE *
+LPMODULEINFO
+PPROCESS_MEMORY_COUNTERS
+PPSAPI_WS_WATCH_INFORMATION
+

tools/winapi_check/win32/rasapi32.api

+%ptr
+
+LPRASCONNA
+LPRASDIALPARAMS
+LPRASENTRYNAME

tools/winapi_check/win32/shell32.api

@@ -2,10 +2,34 @@
 
 COLORREF
 HBITMAP
+HDROP
 HMENU
 HICON
 HWND
 
 %ptr
 
+HIMAGELIST *
+IDSTRUCT *
+IDropTarget *
+IShellFolder **
+LPBROWSEINFOA
+LPCITEMIDLIST
+LPCITEMIDLIST *
+LPDRAWITEMSTRUCT
+LPFNCREATEINSTANCE
+LPFNFMCALLBACK
+LPITEMIDLIST *
+LPMEASUREITEMSTRUCT
+LPSHELLEXECUTEINFOA
+LPSHELLEXECUTEINFOW
+LPSHELLFLAGSTATE
+LPSHELLFOLDER
+LPSHELLVIEWDATA
+LPSHFILEOPSTRUCTA
+LPSHFILEOPSTRUCTW
+PAPPBARDATA
+PNOTIFYICONDATAA
 PNOTIFYICONDATAW
+SHFILEINFOA *
+SHFILEINFOW *

tools/winapi_check/win32/tapi32.api

 %long
 
+HCALL
+HLINE
+HLINEAPP
+HPHONE
+HPHONEAPP
 HWND
+
+%ptr
+
+LINECALLBACK
+LPHCALL
+LPHLINE
+LPHLINEAPP
+LPHPHONE
+LPHPHONEAPP
+LPLINEADDRESSCAPS
+LPLINEADDRESSSTATUS
+LPLINECALLINFO
+LPLINECALLLIST
+LPLINECALLPARAMS
+LPLINECALLSTATUS
+LPLINECOUNTRYLIST
+LPLINEDEVCAPS
+LPLINEDEVSTATUS
+LPLINEDIALPARAMS
+LPLINEEXTENSIONID
+LPLINEFORWARDLIST
+LPLINEGENERATETONE
+LPLINEMEDIACONTROLCALLSTATE
+LPLINEMEDIACONTROLDIGIT
+LPLINEMEDIACONTROLMEDIA
+LPLINEMEDIACONTROLTONE
+LPLINEMONITORTONE
+LPLINEPROVIDERLIST
+LPLINETRANSLATECAPS
+LPLINETRANSLATEOUTPUT
+LPPHONEBUTTONINFO
+LPPHONECAPS
+LPPHONEEXTENSIONID
+LPPHONESTATUS
+LPVARSTRING
+PHONECALLBACK

tools/winapi_check/win32/user32.api

@@ -4,16 +4,69 @@ COLORREF
 HACCEL
 HBITMAP
 HBRUSH
+HCONV
+HCONVLIST
 HCURSOR
 HDC
+HDDEDATA
 HDESK
+HDWP
 HFONT
+HHOOK
 HICON
 HMENU
 HMONITOR
 HRGN
+HSZ
+HWINSTA
 HWND
+SHORT
 
 %ptr
 
 COLORREF *
+DLGPROC
+DRAWSTATEPROC
+FARPROC
+GRAYSTRINGPROC
+HKL *
+HWND *
+HOOKPROC
+LPACCEL
+LPCHARSETINFO
+LPCMENUINFO
+LPCONVCONTEXT
+LPCONVINFO
+LPDISPLAY_DEVICEA
+LPDISPLAY_DEVICEW
+LPDRAWTEXTPARAMS
+LPICONINFO
+LPMENUINFO
+LPMENUITEMINFOA
+LPMENUITEMINFOW
+LPMONITORINFO
+LPMSGBOXPARAMSA
+LPMSGBOXPARAMSW
+MENUITEMINFOA *
+MENUITEMINFOW *
+MONITORENUMPROC
+MSG *
+PAINTSTRUCT *
+PBYTE
+PFNCALLBACK
+PROPENUMPROCA
+PROPENUMPROCEXA
+PROPENUMPROCEXW
+PROPENUMPROCW
+PSECURITY_QUALITY_OF_SERVICE
+SCROLLINFO *
+SECURITY_INFORMATION *
+SECURITY_QUALITY_OF_SERVICE *
+TIMERPROC
+WINDOWPLACEMENT *
+WNDCLASSA *
+WNDCLASSEXA *
+WNDCLASSEXW *
+WNDCLASSW *
+WNDENUMPROC
+WNDPROC

tools/winapi_check/win32/w32skrnl.api

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

tools/winapi_check/win32/winmm.api

 %long
 
-HWND
\ No newline at end of file
+FOURCC
+HDRVR
+HMIDIIN
+HMIDIOUT
+HMIDISTRM
+HMIXER
+HMIXEROBJ
+HMMIO
+HWAVEIN
+HWAVEOUT
+HWND
+
+%ptr
+
+HMIDIIN *
+HMIDIOUT *
+HMIDISTRM *
+HPCSTR
+HPSTR
+HWAVEIN *
+HWAVEOUT *
+LPAUXCAPSA
+LPAUXCAPSW
+LPHMIXER
+LPJOYCAPSA
+LPJOYCAPSW
+LPJOYINFO
+LPJOYINFOEX
+LPMIDIHDR
+LPMIDIINCAPSA
+LPMIDIINCAPSW
+LPMIDIOUTCAPSA
+LPMIDIOUTCAPSW
+LPMIXERCAPSA
+LPMIXERCAPSW
+LPMIXERCONTROLDETAILS
+LPMIXERLINEA
+LPMIXERLINECONTROLSA
+LPMIXERLINECONTROLSW
+LPMIXERLINEW
+LPMMCKINFO
+LPMMIOPROC
+LPMMTIME
+LPTIMECALLBACK
+LPTIMECAPS
+LPUINT
+LPWAVEFORMATEX
+LPWAVEHDR
+LPWAVEINCAPSA
+LPWAVEINCAPSW
+LPWAVEOUTCAPSA
+LPWAVEOUTCAPSW
+MIDIHDR *
+MMCKINFO *
+MMIOINFO *
+WAVEHDR *
+YIELDPROC
+
+%long # --forbidden
+
+HMMIO16

tools/winapi_check/win32/winspool.api

 %long
 
-HWND
\ No newline at end of file
+HWND
+
+%ptr
+
+DEVMODEW *
+LPPRINTER_DEFAULTSA
+LPPRINTER_DEFAULTSW

tools/winapi_check/win32/wnaspi32.api

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

tools/winapi_check/win32/wow32.api

+%long
+
+WOW_HANDLE_TYPE
\ No newline at end of file

tools/winapi_check/win32/wsock32.api

 %long
 
 HWND
+SOCKET
+u_long
+u_short
+
+%long # --forbidden
+
+SOCKET16
+
+%ptr
+
+FARPROC
+LPWSADATA
+struct WIN_hostent *
+struct WIN_protoent *
+struct WIN_servent *
+struct netent *
+struct sockaddr *
+struct timeval *
+ws_fd_set32 *
+
+%unknown
+
+struct in_addr
\ No newline at end of file

tools/winapi_check/winapi.pm

@@ -271,9 +271,15 @@ sub allowed_type_in_module {
     my $allowed_modules_limited = \%{$self->{ALLOWED_MODULES_LIMITED}};
 
     my $type = shift;
-    my $module = shift;
+    my @modules = split(/ \& /, shift);
+
+    if(!$$allowed_modules_limited{$type}) { return 1; }
 
-    return !$$allowed_modules_limited{$type} || $$allowed_modules{$type}{$module};
+    foreach my $module (@modules) {
+	if($$allowed_modules{$type}{$module}) { return 1; }
+    }
+
+    return 0;
 }
 
 sub type_used_in_module {
@@ -281,10 +287,12 @@ sub type_used_in_module {
     my $used_modules = \%{$self->{USED_MODULES}};
 
     my $type = shift;
-    my $module = shift;
+    my @modules = split(/ \& /, shift);
+
+    foreach my $module (@modules) {
+	$$used_modules{$type}{$module} = 1;
+    }
 
-    $$used_modules{$type}{$module} = 1;
-    
     return ();
 }
 
@@ -304,6 +312,31 @@ sub types_not_used {
     return $not_used;
 }
 
+sub types_unlimited_used_in_modules {
+    my $self = shift;
+
+    my $output = \${$self->{OUTPUT}};
+    my $used_modules = \%{$self->{USED_MODULES}};
+    my $allowed_modules = \%{$self->{ALLOWED_MODULES}};
+    my $allowed_modules_unlimited = \%{$self->{ALLOWED_MODULES_UNLIMITED}};
+
+    my $used_types;
+    foreach my $type (sort(keys(%$allowed_modules_unlimited))) {
+	my $count = 0;
+	my @modules = ();
+	foreach my $module (sort(keys(%{$$used_modules{$type}}))) {
+	    $count++;
+	    push @modules, $module;
+	}
+        if($count <= 1) {
+	    foreach my $module (@modules) {
+	      $$used_types{$type}{$module} = 1;
+	    }
+	}
+    }
+    return $used_types;
+}
+
 sub translate_argument {
     my $self = shift;
     my $translate_argument = \%{$self->{TRANSLATE_ARGUMENT}};

tools/winapi_check/winapi_check

@@ -275,7 +275,7 @@ foreach my $file ($options->files) {
 	   if(!$nativeapi->is_conditional($_)) {
 	       if(/^HAVE_/ && !/^HAVE_(IPX|MESAGL|BUGGY_MESAGL|WINE_CONSTRUCTOR)$/)
 	       {
-		   $output->write("$file: $_ is not a declared as a conditional\n");
+		   $output->write("$file: $_ is not declared as a conditional\n");
 	       }
 	   } else {
 	       $conditional++;

tools/winapi_check/winapi_global.pm

@@ -34,9 +34,21 @@ sub check {
 
 	foreach my $module (sort(keys(%$not_used))) {
 	    foreach my $type (sort(keys(%{$$not_used{$module}}))) {
-		$output->write("*.c: $module: type $type not used\n");
+		$output->write("*.c: $module: type ($type) not used\n");
 	    }
-	}	
+	}
+
+	my $types_used = $winapi->types_unlimited_used_in_modules;
+
+	foreach my $type (sort(keys(%$types_used))) {
+	    $output->write("*.c: type ($type) only used in module[s] (");
+	    my $count = 0;
+	    foreach my $module (sort(keys(%{$$types_used{$type}}))) {
+		if($count++) { $output->write(", "); }
+		$output->write("$module");
+	    }
+	    $output->write(")\n");
+	}
     }
 }