Moved some of the API specification from the global file to the local files.
diff --git a/tools/winapi_check/win16/compobj.api b/tools/winapi_check/win16/compobj.api index 364b0f0..f759997 100644 --- a/tools/winapi_check/win16/compobj.api +++ b/tools/winapi_check/win16/compobj.api
@@ -1,3 +1,7 @@ +%long + +ULONG + %ptr CLSID * @@ -12,6 +16,10 @@ LPMESSAGEFILTER * LPOLESTR16 * LPUNKNOWN +LPVOID * +REFCLSID +REFGUID +REFIID %str # --forbidden
diff --git a/tools/winapi_check/win16/gdi.api b/tools/winapi_check/win16/gdi.api index f13b249..a04932d 100644 --- a/tools/winapi_check/win16/gdi.api +++ b/tools/winapi_check/win16/gdi.api
@@ -20,13 +20,17 @@ LPOUTLINETEXTMETRIC16 LPPALETTEENTRY LPPDEVICE +LPPOINT16 LPRASTERIZER_STATUS +LPRECT16 LPRGNDATA LPSIZE16 LPTEXTXFORM16 MAT2 * METARECORD * PALETTEENTRY * +RECT16 * +RGBQUAD * TEXTMETRIC16 * VOID *
diff --git a/tools/winapi_check/win16/kernel.api b/tools/winapi_check/win16/kernel.api index 9527481..ace280c 100644 --- a/tools/winapi_check/win16/kernel.api +++ b/tools/winapi_check/win16/kernel.api
@@ -1,6 +1,5 @@ %long # --forbidden -HKEY HMODULE %ptr @@ -32,6 +31,10 @@ HQUEUE16 HRSRC16 +%word # --forbidden + +HKEY + %wstr # --forbidden LPCWSTR
diff --git a/tools/winapi_check/win16/mmsystem.api b/tools/winapi_check/win16/mmsystem.api index 9d14270..777edca 100644 --- a/tools/winapi_check/win16/mmsystem.api +++ b/tools/winapi_check/win16/mmsystem.api
@@ -41,6 +41,7 @@ MMCKINFO * MMIOINFO16 * WAVEHDR * +WORD * %ptr # --forbidden @@ -66,4 +67,4 @@ HMMIO16 HWAVEIN16 HWAVEOUT16 - +MMRESULT16 \ No newline at end of file
diff --git a/tools/winapi_check/win16/msacm.api b/tools/winapi_check/win16/msacm.api index 2446fdb..10d19e9 100644 --- a/tools/winapi_check/win16/msacm.api +++ b/tools/winapi_check/win16/msacm.api
@@ -28,3 +28,4 @@ HACMDRIVERID16 HACMOBJ16 HACMSTREAM16 +MMRESULT16 \ No newline at end of file
diff --git a/tools/winapi_check/win16/ole2disp.api b/tools/winapi_check/win16/ole2disp.api index 7854e1e..a9bd8af 100644 --- a/tools/winapi_check/win16/ole2disp.api +++ b/tools/winapi_check/win16/ole2disp.api
@@ -5,6 +5,7 @@ INTERFACEDATA * ITypeInfo ** IUnknown * +REFCLSID %segstr
diff --git a/tools/winapi_check/win16/setupx.api b/tools/winapi_check/win16/setupx.api new file mode 100644 index 0000000..a2ebc0c --- /dev/null +++ b/tools/winapi_check/win16/setupx.api
@@ -0,0 +1,7 @@ +%word # --forbidden + +HKEY + +%ptr + +LPHKEY
diff --git a/tools/winapi_check/win16/shell.api b/tools/winapi_check/win16/shell.api index e8a94c2..ffc5ab0 100644 --- a/tools/winapi_check/win16/shell.api +++ b/tools/winapi_check/win16/shell.api
@@ -1,7 +1,3 @@ -%long # --forbidden - -HKEY - %ptr HICON16 * @@ -13,3 +9,7 @@ %word HDROP16 + +%word # --forbidden + +HKEY
diff --git a/tools/winapi_check/win16/storage.api b/tools/winapi_check/win16/storage.api index 164a836..b893415 100644 --- a/tools/winapi_check/win16/storage.api +++ b/tools/winapi_check/win16/storage.api
@@ -1,17 +1,24 @@ +%long + +ULONG + +%longlong + +LARGE_INTEGER + %ptr LPSTORAGE16 +LPVOID * IID * IStorage16 * IStorage16 ** IStream16 * IStream16 ** +REFIID SNB16 STATSTG16 * ULARGE_INTEGER * - -%longlong - -LARGE_INTEGER +ULONG *
diff --git a/tools/winapi_check/win16/typelib.api b/tools/winapi_check/win16/typelib.api index 1c1b56e..7b3dbaa 100644 --- a/tools/winapi_check/win16/typelib.api +++ b/tools/winapi_check/win16/typelib.api
@@ -1,6 +1,7 @@ %ptr LPBSTR16 +REFGUID %str # --forbidden
diff --git a/tools/winapi_check/win16/user.api b/tools/winapi_check/win16/user.api index 3d77613..474f18d 100644 --- a/tools/winapi_check/win16/user.api +++ b/tools/winapi_check/win16/user.api
@@ -18,16 +18,20 @@ LPMSG16_32 LPMSGBOXPARAMS16 LPPAINTSTRUCT16 +LPPOINT16 LPQUEUESTRUCT16 * +LPRECT16 LPSCROLLINFO MENUITEMINFO16 * MSG16 * MSG32_16 * PAINTSTRUCT16 * +RECT16 * SCROLLINFO * WINDOWPLACEMENT16 * WNDCLASS16 * WNDCLASSEX16 * +WORD * %segptr
diff --git a/tools/winapi_check/win16/wing.api b/tools/winapi_check/win16/wing.api index 56954a2..8c69547 100644 --- a/tools/winapi_check/win16/wing.api +++ b/tools/winapi_check/win16/wing.api
@@ -1,6 +1,7 @@ %ptr BITMAPINFO * +RGBQUAD * %word
diff --git a/tools/winapi_check/win16/winsock.api b/tools/winapi_check/win16/winsock.api index 6309ee0..2174110 100644 --- a/tools/winapi_check/win16/winsock.api +++ b/tools/winapi_check/win16/winsock.api
@@ -4,6 +4,7 @@ %ptr LPWSADATA +ULONG * struct sockaddr * struct timeval * ws_fd_set16 *
diff --git a/tools/winapi_check/win16api.dat b/tools/winapi_check/win16api.dat index 91c6846..3af5905 100644 --- a/tools/winapi_check/win16api.dat +++ b/tools/winapi_check/win16api.dat
@@ -7,7 +7,6 @@ LONG LPARAM LRESULT -ULONG %longlong @@ -22,21 +21,11 @@ LPCVOID LPDWORD LPINT16 -LPPOINT16 -LPRECT16 LPVOID -LPVOID * LPWORD POINT16 * -RECT16 * -REFCLSID -REFGUID -REFIID -RGBQUAD * SEGPTR * UINT16 * -ULONG * -WORD * char * void * @@ -76,7 +65,6 @@ HPALETTE16 HTASK16 HWND16 -MMRESULT16 OLESTATUS UINT16 WORD
diff --git a/tools/winapi_check/win32/advapi32.api b/tools/winapi_check/win32/advapi32.api index 0cb4ccd..60d295a 100644 --- a/tools/winapi_check/win32/advapi32.api +++ b/tools/winapi_check/win32/advapi32.api
@@ -1,9 +1,13 @@ %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 @@ 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 *
diff --git a/tools/winapi_check/win32/avifil32.api b/tools/winapi_check/win32/avifil32.api index 03f4b06..82de14f 100644 --- a/tools/winapi_check/win32/avifil32.api +++ b/tools/winapi_check/win32/avifil32.api
@@ -6,6 +6,7 @@ IAVIFile * LPAVIFILEINFOA LPAVIFILEINFOW +LPBITMAPINFOHEADER PAVIFILE PAVIFILE * PAVISTREAM
diff --git a/tools/winapi_check/win32/comdlg32.api b/tools/winapi_check/win32/comdlg32.api index 7ecc208..ffb6260 100644 --- a/tools/winapi_check/win32/comdlg32.api +++ b/tools/winapi_check/win32/comdlg32.api
@@ -2,6 +2,10 @@ HWND +%long # --forbidden + +short + %ptr LPCHOOSECOLORA
diff --git a/tools/winapi_check/win32/crtdll.api b/tools/winapi_check/win32/crtdll.api index 1531c1f..58fb6c2 100644 --- a/tools/winapi_check/win32/crtdll.api +++ b/tools/winapi_check/win32/crtdll.api
@@ -9,8 +9,11 @@ LPDWORD * LPSTR ** PCONTEXT +PEXCEPTION_FRAME PEXCEPTION_FRAME * +PEXCEPTION_RECORD VOID * +WCHAR * _INITTERMFUN * jmp_buf struct find_t *
diff --git a/tools/winapi_check/win32/ddraw.api b/tools/winapi_check/win32/ddraw.api index d2879f0..72e018f 100644 --- a/tools/winapi_check/win32/ddraw.api +++ b/tools/winapi_check/win32/ddraw.api
@@ -6,3 +6,4 @@ LPDDENUMCALLBACKW LPDIRECTDRAW * LPDIRECTDRAWCLIPPER * +LPGUID
diff --git a/tools/winapi_check/win32/dplayx.api b/tools/winapi_check/win32/dplayx.api index cfd958a..944b067 100644 --- a/tools/winapi_check/win32/dplayx.api +++ b/tools/winapi_check/win32/dplayx.api
@@ -4,3 +4,4 @@ LPDIRECTPLAYLOBBYA * LPDPENUMDPCALLBACKA LPDPENUMDPCALLBACKW +LPGUID \ No newline at end of file
diff --git a/tools/winapi_check/win32/gdi32.api b/tools/winapi_check/win32/gdi32.api index 52cac50..6ca4702 100644 --- a/tools/winapi_check/win32/gdi32.api +++ b/tools/winapi_check/win32/gdi32.api
@@ -49,6 +49,8 @@ LPGLYPHMETRICS LPHANDLETABLE LPKERNINGPAIR +LPLOGFONTA +LPLOGFONTW LPLOGCOLORSPACEA LPLOGCOLORSPACEW LPOUTLINETEXTMETRICA @@ -68,6 +70,7 @@ PIXELFORMATDESCRIPTOR * PPOLYTEXTA PPOLYTEXTW +RECT * RGBQUAD * RGNDATA * TEXTMETRICA *
diff --git a/tools/winapi_check/win32/imagehlp.api b/tools/winapi_check/win32/imagehlp.api index 712e172..034596f 100644 --- a/tools/winapi_check/win32/imagehlp.api +++ b/tools/winapi_check/win32/imagehlp.api
@@ -25,5 +25,6 @@ PSYMBOL_REGISTERED_CALLBACK PSYM_ENUMMODULES_CALLBACK PSYM_ENUMSYMBOLS_CALLBACK +PULONG PTRANSLATE_ADDRESS_ROUTINE PWIN_CERTIFICATE
diff --git a/tools/winapi_check/win32/imm32.api b/tools/winapi_check/win32/imm32.api index 071e3eb..baadc8c 100644 --- a/tools/winapi_check/win32/imm32.api +++ b/tools/winapi_check/win32/imm32.api
@@ -8,6 +8,8 @@ LPCANDIDATEFORM LPCANDIDATELIST LPCOMPOSITIONFORM +LPLOGFONTA +LPLOGFONTW LPSTYLEBUFA LPSTYLEBUFW REGISTERWORDENUMPROCA
diff --git a/tools/winapi_check/win32/kernel32.api b/tools/winapi_check/win32/kernel32.api index 1a24727..df56c57 100644 --- a/tools/winapi_check/win32/kernel32.api +++ b/tools/winapi_check/win32/kernel32.api
@@ -11,6 +11,7 @@ %long # --forbidden BOOL16 +UINT16 %ptr @@ -70,8 +71,11 @@ OSVERSIONINFOW * PAPCFUNC PEXCEPTION_POINTERS +PLARGE_INTEGER PLONG +PTIMERAPCROUTINE PULARGE_INTEGER +SECURITY_ATTRIBUTES * SYSLEVEL * SYSLEVEL ** SYSTEMTIME *
diff --git a/tools/winapi_check/win32/msvfw32.api b/tools/winapi_check/win32/msvfw32.api index 94f7a3f..cfbeb2b 100644 --- a/tools/winapi_check/win32/msvfw32.api +++ b/tools/winapi_check/win32/msvfw32.api
@@ -9,3 +9,4 @@ FARPROC ICINFO * +LPBITMAPINFOHEADER \ No newline at end of file
diff --git a/tools/winapi_check/win32/ntdll.api b/tools/winapi_check/win32/ntdll.api index 508f644..538da80 100644 --- a/tools/winapi_check/win32/ntdll.api +++ b/tools/winapi_check/win32/ntdll.api
@@ -4,9 +4,12 @@ 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 @@ 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 * +
diff --git a/tools/winapi_check/win32/ole32.api b/tools/winapi_check/win32/ole32.api index 2f3b2a2..df390d4 100644 --- a/tools/winapi_check/win32/ole32.api +++ b/tools/winapi_check/win32/ole32.api
@@ -22,17 +22,20 @@ 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 * LPPERSISTSTORAGE LPRUNNINGOBJECTTABLE * +LPSTORAGE LPSTREAM * MULTI_QI * SNB STGMEDIUM * +WCHAR * %ptr # --forbidden -LPOLESTR16 \ No newline at end of file +LPOLESTR16 + +
diff --git a/tools/winapi_check/win32/oleaut32.api b/tools/winapi_check/win32/oleaut32.api index 161806f..52357a9 100644 --- a/tools/winapi_check/win32/oleaut32.api +++ b/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 ** LPBSTR LPFONTDESC +LPOCPFIPARAMS LPOLESTR +LPPICTDESC +LPSTREAM SAFEARRAY * SAFEARRAY ** SAFEARRAYBOUND *
diff --git a/tools/winapi_check/win32/olecli32.api b/tools/winapi_check/win32/olecli32.api index b9b0f0f..1108180 100644 --- a/tools/winapi_check/win32/olecli32.api +++ b/tools/winapi_check/win32/olecli32.api
@@ -3,11 +3,14 @@ HDC LHCLIENTDOC OLECLIPFORMAT +OLESTATUS OLEOPT_RENDER %ptr IPersistStream * -LPOLECLIENT LHCLIENTDOC * +LPFORMATETC +LPSTORAGE +LPOLECLIENT LPOLEOBJECT *
diff --git a/tools/winapi_check/win32/olepro32.api b/tools/winapi_check/win32/olepro32.api new file mode 100644 index 0000000..1b6c026 --- /dev/null +++ b/tools/winapi_check/win32/olepro32.api
@@ -0,0 +1,9 @@ +%long + +HWND + +%ptr + +LPOCPFIPARAMS +LPPICTDESC +LPSTREAM
diff --git a/tools/winapi_check/win32/olesvr32.api b/tools/winapi_check/win32/olesvr32.api index 0046901..ee9cbd22 100644 --- a/tools/winapi_check/win32/olesvr32.api +++ b/tools/winapi_check/win32/olesvr32.api
@@ -3,6 +3,7 @@ LHSERVER LHSERVERDOC OLE_SERVER_USE +OLESTATUS %ptr
diff --git a/tools/winapi_check/win32/shell32.api b/tools/winapi_check/win32/shell32.api index b6b42a3..2a37be6 100644 --- a/tools/winapi_check/win32/shell32.api +++ b/tools/winapi_check/win32/shell32.api
@@ -5,12 +5,12 @@ HDROP HMENU HICON +HKEY HWND %ptr HIMAGELIST * -IDSTRUCT * IDropTarget * IShellFolder ** LPBROWSEINFOA @@ -19,8 +19,10 @@ LPDRAWITEMSTRUCT LPFNCREATEINSTANCE LPFNFMCALLBACK +LPHKEY LPITEMIDLIST * LPMEASUREITEMSTRUCT +LPNOTIFYREGISTER LPSHELLEXECUTEINFOA LPSHELLEXECUTEINFOW LPSHELLFLAGSTATE
diff --git a/tools/winapi_check/win32/shlwapi.api b/tools/winapi_check/win32/shlwapi.api index c2835fa..8e202f9 100644 --- a/tools/winapi_check/win32/shlwapi.api +++ b/tools/winapi_check/win32/shlwapi.api
@@ -1,3 +1,4 @@ %long +HKEY HWND \ No newline at end of file
diff --git a/tools/winapi_check/win32/user32.api b/tools/winapi_check/win32/user32.api index 1876f31..93cef80 100644 --- a/tools/winapi_check/win32/user32.api +++ b/tools/winapi_check/win32/user32.api
@@ -45,6 +45,7 @@ LPMENUITEMINFOA LPMENUITEMINFOW LPMONITORINFO +LPMSG LPMSGBOXPARAMSA LPMSGBOXPARAMSW MENUITEMINFOA * @@ -59,6 +60,7 @@ PROPENUMPROCEXW PROPENUMPROCW PSECURITY_QUALITY_OF_SERVICE +RECT * SCROLLINFO * SECURITY_INFORMATION * SECURITY_QUALITY_OF_SERVICE *
diff --git a/tools/winapi_check/win32/winmm.api b/tools/winapi_check/win32/winmm.api index f3b0309..97cac22 100644 --- a/tools/winapi_check/win32/winmm.api +++ b/tools/winapi_check/win32/winmm.api
@@ -12,6 +12,10 @@ HWAVEOUT HWND +%long # --forbidden + +UINT16 + %ptr HMIDIIN *
diff --git a/tools/winapi_check/win32api.dat b/tools/winapi_check/win32api.dat index 35ab1ab..5d4d21d 100644 --- a/tools/winapi_check/win32api.dat +++ b/tools/winapi_check/win32api.dat
@@ -12,7 +12,6 @@ HFILE HGLOBAL HINSTANCE -HKEY HKL HMODULE HRESULT @@ -24,11 +23,7 @@ LPARAM LRESULT MMRESULT -NTSTATUS -OLESTATUS PHANDLE -SECURITY_IMPERSONATION_LEVEL -SECURITY_INFORMATION UINT ULONG WCHAR @@ -58,7 +53,6 @@ IStream * IUnknown * LONG * -LPBITMAPINFOHEADER LPBOOL LPBYTE LPCLSID @@ -68,23 +62,16 @@ 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 * 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 @@ %long # --forbidden HMODULE16 -UINT16 int long -short unsigned