diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api index 8ebd3c693bb..df92d77e8ea 100644 --- a/tools/winapi/win16.api +++ b/tools/winapi/win16.api @@ -598,6 +598,7 @@ LPMMIOPROC16 LPMMTIME16 LPTIMECAPS16 LPUINT16 +LPVOID LPWAVEFORMATEX LPWAVEHDR LPWAVEINCAPS16 @@ -1225,6 +1226,7 @@ RECT16 * SCROLLINFO * SEGPTR * UINT16 * +VA_LIST16 WINDOWPLACEMENT16 * WNDCLASS16 * WNDCLASSEX16 * diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index f5aac962f43..ef4f9e5e095 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3,6 +3,7 @@ %long ACCESS_MASK +ACCESS_MODE ACL_INFORMATION_CLASS ALG_ID BOOL @@ -20,10 +21,12 @@ REGSAM SC_HANDLE SC_STATUS_TYPE SE_OBJECT_TYPE +SECURITY_DESCRIPTOR_CONTROL SECURITY_IMPERSONATION_LEVEL SECURITY_INFORMATION SERVICE_STATUS_HANDLE TOKEN_INFORMATION_CLASS +TOKEN_TYPE UINT ULONG WORD @@ -38,6 +41,7 @@ LSA_HANDLE BYTE * DWORD * FILETIME * +GUID * HANDLE * HCRYPTHASH * HCRYPTKEY * @@ -51,19 +55,26 @@ LPENUM_SERVICE_STATUSA LPENUM_SERVICE_STATUSW LPHANDLER_FUNCTION LPHW_PROFILE_INFOA +LPHW_PROFILE_INFOW LPLONG +LPPROCESS_INFORMATION LPQUERY_SERVICE_CONFIGA LPQUERY_SERVICE_CONFIGW +LPQUERY_SERVICE_LOCK_STATUSA +LPQUERY_SERVICE_LOCK_STATUSW LPSECURITY_ATTRIBUTES LPSERVICE_STATUS LPSERVICE_TABLE_ENTRYA LPSERVICE_TABLE_ENTRYW +LPSTARTUPINFOA +LPSTARTUPINFOW LPSTR * LPVOID LPVOID * LPWSTR * MD4_CTX * MD5_CTX * +PACCESS_MASK PACL PACL * PACTRL_ACCESSW * @@ -78,13 +89,19 @@ PEXPLICIT_ACCESSW * PGENERIC_MAPPING PHANDLE PHKEY +PLSA_ENUMERATION_HANDLE PLSA_HANDLE PLSA_OBJECT_ATTRIBUTES PLSA_REFERENCED_DOMAIN_LIST * PLSA_TRANSLATED_NAME * +PLSA_TRANSLATED_SID * PLSA_UNICODE_STRING +PLSA_UNICODE_STRING * PLUID POBJECT_TYPE_LIST +POBJECTS_AND_NAME_A +POBJECTS_AND_NAME_W +POBJECTS_AND_SID PPRIVILEGE_SET PSECURITY_DESCRIPTOR PSECURITY_DESCRIPTOR * @@ -94,6 +111,7 @@ PSID PSID * PSID_IDENTIFIER_AUTHORITY PSID_NAME_USE +PTOKEN_GROUPS PTRUSTEEA PTRUSTEEW PUCHAR @@ -102,6 +120,7 @@ PVOID PVOID * PVALENTA PVALENTW +SC_LOCK SECURITY_ATTRIBUTES * WCHAR * unsigned char * @@ -124,16 +143,28 @@ LPWSTR %long +BOOL +DWORD +HINSTANCE HMODULE HRESULT +HWND +INT %ptr LPCSTRTABLE +LPDWORD +SETUPCOMMAND_PARAMS * %str LPCSTR +LPSTR + +%void + +void %%amstream.dll @@ -148,7 +179,7 @@ LPVOID * REFCLSID REFIID -%%atl +%%atl.dll %long @@ -164,8 +195,15 @@ _ATL_MODULEA * _ATL_MODULEW * _ATL_OBJMAP_ENTRYA * CLSID * +IID * +IStream * +IStream ** +IUnknown * +IUnknown ** +LPDWORD LPVOID LPVOID * +REFCLSID REFIID void * @@ -199,6 +237,7 @@ LPWSTR BOOL DWORD +HANDLE HRESULT HWND INT @@ -335,7 +374,9 @@ ULONG %ptr +LPVOID PCHAR +ULONG * %str @@ -521,6 +562,7 @@ DWORD * GUID * PCCERT_CONTEXT PCCRL_CONTEXT +PCCRL_CONTEXT * PVOID SIP_ADD_NEWPROVIDER * SIP_DISPATCH_INFO * @@ -584,7 +626,7 @@ UINT IDirect3D9 * -%%d3dxof +%%d3dxof.dll %long @@ -607,6 +649,7 @@ DWORD HANDLE HMODULE IMAGEHLP_SYMBOL_TYPE_INFO +MINIDUMP_TYPE ULONG %longlong @@ -633,6 +676,10 @@ PIMAGEHLP_LINE PIMAGEHLP_MODULE PIMAGEHLP_SYMBOL PIMAGEHLP_STACK_FRAME +PMINIDUMP_CALLBACK_INFORMATION +PMINIDUMP_DIRECTORY * +PMINIDUMP_EXCEPTION_INFORMATION +PMINIDUMP_USER_STREAM_INFORMATION PREAD_PROCESS_MEMORY_ROUTINE PSYM_ENUMERATESYMBOLS_CALLBACK PSYM_ENUMMODULES_CALLBACK @@ -642,8 +689,11 @@ PSYMBOL_REGISTERED_CALLBACK PSYMBOL_INFO PTRANSLATE_ADDRESS_ROUTINE PVOID +ULONG * char * char ** +void * +void ** %str @@ -932,7 +982,7 @@ LPVOID * REFCLSID REFIID -%%dswave +%%dswave.dll %long @@ -1336,11 +1386,10 @@ PULONG LPWSTR -%%itss +%%itss.dll %long -BOOL HRESULT %ptr @@ -1425,6 +1474,9 @@ LARGE_INTEGER BOOL * BY_HANDLE_FILE_INFORMATION * CALINFO_ENUMPROCA +CALINFO_ENUMPROCEXA +CALINFO_ENUMPROCEXW +CALINFO_ENUMPROCW CHAR_INFO * CODEPAGE_ENUMPROCA CODEPAGE_ENUMPROCW @@ -1435,6 +1487,8 @@ CRITICAL_SECTION * CURRENCYFMTA * CURRENCYFMTW * DATEFMT_ENUMPROCA +DATEFMT_ENUMPROCEXA +DATEFMT_ENUMPROCEXW DATEFMT_ENUMPROCW DWORD * ENUMRESLANGPROCA @@ -1491,6 +1545,7 @@ LPOVERLAPPED LPOVERLAPPED * LPOVERLAPPED_COMPLETION_ROUTINE LPPROCESSENTRY32 +LPPROCESSENTRY32W LPPROCESS_HEAP_ENTRY LPPROCESS_INFORMATION LPPROGRESS_ROUTINE @@ -1539,6 +1594,7 @@ SIZE_T * SYSLEVEL * SYSLEVEL ** SYSTEMTIME * +TIME_ZONE_INFORMATION * TIMEFMT_ENUMPROCA TIMEFMT_ENUMPROCW UILANGUAGE_ENUMPROCA @@ -1615,6 +1671,7 @@ HRESULT INT LONG SCODE +UINT ULONG int @@ -1629,19 +1686,25 @@ LONGLONG %ptr +ALLOCATEBUFFER * ALLOCATEMORE * CMC_buffer CMC_extension * +FREEBUFFER * LPADRLIST LPALLOCATEBUFFER LPBYTE +LPCIID +LPENTRYLIST LPFREEBUFFER LPLHANDLE +LPMALLOC LPMAPIADVISESINK LPMAPIADVISESINK * LPMAPINAMEID LPMAPIPROP LPMAPISESSION * +LPPROPDATA * LPSPropTagArray LPSPropValue LPSPropValue * @@ -1654,11 +1717,13 @@ LPVOID * LPWSTR * PULONG PUSHORT +PVOID ULONG * void * %str +LPCSTR LPSTR %void @@ -1720,7 +1785,7 @@ HDRVR LONG UINT -%%mlang +%%mlang.dll %long @@ -1896,18 +1961,41 @@ LONG UINT WORD -%%mscms +%%mscms.dll %long +BMFORMAT BOOL +COLORTYPE DWORD HPROFILE +HTRANSFORM +LPARAM +TAGTYPE +ULONG %ptr +LPBYTE +LPDWORD +LPLOGCOLORSPACEA +LPLOGCOLORSPACEW +PBMCALLBACKFN +PBOOL +PBYTE +PBYTE * +PCOLOR +PCOLOR_NAME PDWORD +PENUMTYPEA +PENUMTYPEW +PHPROFILE +PNAMED_PROFILE_INFO PPROFILE +PPROFILEHEADER +PTAGTYPE +PVOID %str @@ -1916,6 +2004,8 @@ PSTR %wstr +LPCWSTR +LPWSTR PCWSTR PWSTR @@ -1952,7 +2042,7 @@ LPARAM LRESULT UINT -%%mshtml +%%mshtml.dll %long @@ -1981,7 +2071,6 @@ LPCWSTR BOOL DWORD -HINSTANCE HRESULT HWND INSTALLMESSAGE @@ -1994,7 +2083,9 @@ MSICOLINFO MSICONDITION MSIHANDLE MSIMODIFY +MSIRUNMODE UINT +USERINFOSTATE WORD int unsigned int @@ -2007,6 +2098,7 @@ DWORD * FILETIME * HWND * INSTALLUI_HANDLERA +INSTALLUI_HANDLERW INSTALLSTATE * INT * LPVOID @@ -2016,6 +2108,7 @@ PCCERT_CONTEXT * REFCLSID REFIID UINT * +WORD * char * %str @@ -2056,7 +2149,7 @@ LRESULT LPARAM UINT -%%msnet32 +%%msnet32.dll %long @@ -2119,6 +2212,7 @@ MSVCRT_wint_t PCONTEXT PEXCEPTION_POINTERS PEXCEPTION_RECORD +WCHAR * WCHAR ** WORD ** _INITTERMFUN * @@ -2212,15 +2306,19 @@ LPARAM LRESULT UINT WORD +int %ptr +BOOL * FARPROC ICINFO * LONG * LPBITMAPINFO LPBITMAPINFOHEADER +LPDRAWDIBTIME LPDWORD +LPPALETTEENTRY LPOPENFILENAMEA LPOPENFILENAMEW LPVOID @@ -2289,6 +2387,7 @@ PBROWSER_EMULATED_DOMAIN * PBYTE * PDWORD PNCB +PNETSETUP_JOIN_STATUS PVOID * %wstr @@ -2346,6 +2445,7 @@ LANGID LCID LONG MEMORY_INFORMATION_CLASS +MUTANT_INFORMATION_CLASS NTSTATUS OBJECT_INFORMATION_CLASS PROCESSINFOCLASS @@ -2355,6 +2455,7 @@ SECURITY_INFORMATION SIZE_T SYSTEM_INFORMATION_CLASS THREADINFOCLASS +TIMER_INFORMATION_CLASS TIMER_TYPE TOKEN_INFORMATION_CLASS TOKEN_TYPE @@ -2426,6 +2527,7 @@ LPWSTR * LUID * LUID_AND_ATTRIBUTES * MESSAGE_RESOURCE_ENTRY ** +NTSTATUS * OBJECT_ATTRIBUTES * OEM_STRING * PACCESS_MASK @@ -2452,6 +2554,7 @@ PIO_APC_ROUTINE PIO_STATUS_BLOCK PLARGE_INTEGER PLDR_MODULE * +PLONG PLPCMESSAGE PLPCSECTIONINFO PLPCSECTIONMAPINFO @@ -2472,6 +2575,7 @@ PSID * PSID_IDENTIFIER_AUTHORITY PSTRING PSYSTEM_MODULE_INFORMATION +PRTL_QUERY_REGISTRY_TABLE PRTL_THREAD_START_ROUTINE PTIMERAPCROUTINE PTIME_FIELDS @@ -2484,9 +2588,12 @@ PVOID PVOID * PWSTR * RTL_CRITICAL_SECTION * +RTL_HANDLE * +RTL_HANDLE ** +RTL_HANDLE_TABLE * +RTL_OSVERSIONINFOEXW * RTL_USER_PROCESS_PARAMETERS * RTL_USER_PROCESS_PARAMETERS ** -RTL_OSVERSIONINFOEXW * SECURITY_DESCRIPTOR * SIZE_T * STRING * @@ -2558,6 +2665,7 @@ SQLPOINTER * SQLSMALLINT * SQLUINTEGER * SQLUSMALLINT * +WCHAR * %%ole32.dll @@ -2591,6 +2699,7 @@ DWORD * FILETIME * GUID * HGLOBAL * +HRESULT * ICreateErrorInfo ** IDataObject * IDataObject ** @@ -2601,6 +2710,7 @@ ILockBytes * IMoniker * IMoniker ** IPersistStream * +IPropertySetStorage ** IStorage * IStorage ** IStream * @@ -2646,6 +2756,7 @@ LPVOID LPVOID * MULTI_QI * OLECHAR * +OLECHAR ** PROPVARIANT * PSECURITY_DESCRIPTOR REFCLSID @@ -2999,6 +3110,9 @@ LPDWORD LPMODULEINFO LPVOID LPVOID * +PENUM_PAGE_FILE_CALLBACKA +PENUM_PAGE_FILE_CALLBACKW +PPERFORMANCE_INFORMATION PPROCESS_MEMORY_COUNTERS PPSAPI_WS_WATCH_INFORMATION @@ -3042,7 +3156,11 @@ LPVOID * BOOL DWORD +HANDLE HRASCONN +HWND +RASPROJECTION +UINT %ptr @@ -3051,26 +3169,56 @@ LPBYTE LPCSTR * LPCWSTR * LPDWORD +LPHRASCONN LPRASAUTODIALENTRYA LPRASAUTODIALENTRYW LPRASCONNA LPRASCONNW +LPRASCONNSTATUSA +LPRASCONNSTATUSW LPRASDEVINFOA LPRASDEVINFOW +LPRASDIALEXTENSIONS LPRASDIALPARAMSA +LPRASDIALPARAMSW LPRASENTRYA LPRASENTRYW LPRASENTRYNAMEA LPRASENTRYNAMEW +LPRASSUBENTRYA +LPRASSUBENTRYW LPVOID %str LPCSTR +LPSTR %wstr LPCWSTR +LPWSTR + +%%riched20.dll + +%long + +HRESULT +HWND +LPARAM +LRESULT +UINT +WPARAM + +%ptr + +IUnknown * +IUnknown ** +void * + +%void + +void %%riched32.dll @@ -3173,12 +3321,41 @@ DWORD * HCRYPTHASH * HCRYPTKEY * HCRYPTPROV * +PVTableProvStruc %str LPSTR + +%wstr + +LPCWSTR + +%%rsaenh.dll + +%long + +ALG_ID +BOOL +DWORD +HCRYPTHASH +HCRYPTKEY +HCRYPTPROV +HRESULT + +%ptr + +BYTE * +DWORD * +HCRYPTHASH * +HCRYPTKEY * +HCRYPTPROV * PVTableProvStruc +%str + +LPSTR + %wstr LPCWSTR @@ -3223,6 +3400,25 @@ LPSTR LPWSTR +%%sensapi.dll + +%long + +BOOL + +%ptr + +LPDWORD +LPQOCINFO + +%str + +LPCSTR + +%wstr + +LPCWSTR + %%serialui.dll %long @@ -3243,6 +3439,10 @@ LPFNADDPROPSHEETPAGE LPCSTR +%wstr + +LPCWSTR + %%setupapi.dll %long @@ -3272,19 +3472,24 @@ BYTE * GUID * INFCONTEXT * LONGLONG * +LPBYTE * LPDWORD LPCVOID LPGUID +LPVOID +LPWIN32_FIND_DATAW PBYTE PDWORD PINFCONTEXT PINT +PSP_CLASSINSTALL_HEADER PSP_DEVICE_INTERFACE_DATA PSP_DEVICE_INTERFACE_DETAIL_DATA_A PSP_DEVICE_INTERFACE_DETAIL_DATA_W PSP_DEVINFO_DATA PSP_DEVINFO_LIST_DETAIL_DATA_A PSP_DEVINFO_LIST_DETAIL_DATA_W +PSP_DEVINSTALL_PARAMS_A PSP_FILE_CALLBACK_A PSP_FILE_CALLBACK_W PSP_FILE_COPY_PARAMS_A @@ -3293,6 +3498,7 @@ PSP_INF_INFORMATION PSTR * PUINT PVOID +PWSTR * UINT * void * @@ -3305,6 +3511,7 @@ PSTR %void +VOID void %wstr @@ -3320,7 +3527,10 @@ PWSTR BOOL DWORD +HINSTANCE HRESULT +HWND +int %ptr @@ -3329,6 +3539,14 @@ LPVOID * REFCLSID REFIID +%str + +LPCSTR + +%void + +void + %wstr LPCWSTR @@ -3369,6 +3587,7 @@ POINT %ptr AUTO_SCROLL_DATA * +BOOL * CABINETSTATE * CLSID * DLLVERSIONINFO * @@ -3416,6 +3635,7 @@ LPSHELLFOLDER LPSHELLSTATE LPSHFILEOPSTRUCTA LPSHFILEOPSTRUCTW +LPSHQUERYRBINFO LPSTRRET LPTPMPARAMS LPUNKNOWN @@ -3480,6 +3700,7 @@ LONG LPARAM LRESULT REGSAM +SHREGDEL_FLAGS SHREGENUM_FLAGS UCHAR UINT @@ -3538,12 +3759,14 @@ LPCWSTR * LPDWORD LPINT LPITEMIDLIST +LPMSG LPOPENFILENAMEW LPPAGESETUPDLGW LPPOLICYDATA LPPRINTDLGW LPSECURITY_ATTRIBUTES LPSHELLEXECUTEINFOW +LPSHELLFOLDER LPSHFILEOPSTRUCTW LPSHLWAPI_CLIST LPSHLWAPI_CLIST * @@ -3565,6 +3788,7 @@ PLONG PPOINTL PSECURITY_DESCRIPTOR PVOID +PVOID * RECT * REFCLSID REFGUID @@ -3708,6 +3932,7 @@ LPPALETTEENTRY LPPOINT LPSIZE LPTEXTMETRICW +LPVOID POINT * RECT * TTYDRV_PDEVICE * @@ -3749,7 +3974,6 @@ BOOL DWORD HRESULT QUERYOPTION -long %ptr @@ -3762,6 +3986,7 @@ IBindStatusCallback ** IEnumFORMATETC * IInternetSecurityManager ** IInternetSession ** +IInternetZoneManager ** IMoniker * IMoniker ** IServiceProvider * @@ -3833,6 +4058,7 @@ LPARAM LRESULT SHORT UINT +ULONG WCHAR WORD WPARAM @@ -3900,6 +4126,7 @@ LPMSGBOXPARAMSA LPMSGBOXPARAMSW LPPOINT LPRECT +LPSCROLLBARINFO LPSCROLLINFO LPSECURITY_ATTRIBUTES LPTPMPARAMS @@ -3910,6 +4137,7 @@ MENUITEMINFOW * MONITORENUMPROC MSG * PAINTSTRUCT * +PALTTABINFO PCOMBOBOXINFO PCONVCONTEXT PCONVINFO @@ -3918,6 +4146,7 @@ PDWORD_PTR PFLASHWINFO PFNCALLBACK PICONINFO +PLASTINPUTINFO POINT * PROPENUMPROCA PROPENUMPROCEXA @@ -4168,6 +4397,7 @@ UINT %ptr +IUnknown * IWineD3D * %%winedos.dll @@ -4250,7 +4480,7 @@ WORD BITMAPINFO * DEVMODEW * -DOCINFOA * +DOCINFOW * DWORD * FONTENUMPROCW INT * @@ -4298,6 +4528,11 @@ HWND INTERNET_PORT LONG int +unsigned long + +%long --pointer + +DWORD_PTR %longlong @@ -4305,9 +4540,11 @@ FILETIME %ptr +GROUPID * GOPHER_ATTRIBUTE_ENUMERATORA GOPHER_ATTRIBUTE_ENUMERATORW HANDLE * +HINTERNET * INTERNET_STATUS_CALLBACK LPBYTE LPCSTR * @@ -4320,13 +4557,18 @@ LPINTERNET_BUFFERSA LPINTERNET_BUFFERSW LPINTERNET_CACHE_ENTRY_INFOA LPINTERNET_CACHE_ENTRY_INFOW +LPINTERNET_CACHE_GROUP_INFOA +LPINTERNET_CACHE_GROUP_INFOW LPURL_COMPONENTSA LPURL_COMPONENTSW LPVOID LPVOID * LPWIN32_FIND_DATAA LPWIN32_FIND_DATAW +PBYTE PVOID +SYSTEMTIME * +unsigned long * %str @@ -4337,6 +4579,7 @@ LPSTR LPCWSTR LPWSTR +PWSTR %void @@ -4394,6 +4637,7 @@ HWAVEIN * LPAUXCAPSA LPAUXCAPSW LPBYTE +LPCWAVEFORMATEX LPDWORD LPHMIXER LPJOYCAPSA @@ -4420,7 +4664,6 @@ LPTIMECALLBACK LPTIMECAPS LPUINT LPTASKCALLBACK -LPWAVEFORMATEX LPWAVEHDR LPWAVEINCAPSA LPWAVEINCAPSW @@ -4479,8 +4722,12 @@ LPDWORD LPPRINTER_DEFAULTSA LPPRINTER_DEFAULTSW LPVOID +LPVOID * PBYTE PDWORD +PDEVMODEA +PDEVMODEW +PPRINTER_NOTIFY_INFO %str @@ -4532,6 +4779,7 @@ LPWSTR BOOL DWORD +HCATADMIN HWND LONG @@ -4567,6 +4815,7 @@ INT SOCKET UINT WORD +WSAESETSERVICEOP WSAEVENT int long @@ -4588,6 +4837,8 @@ LPVOID LPWPUPOSTMESSAGE LPWSABUF LPWSADATA +LPWSANAMESPACE_INFOA +LPWSANAMESPACE_INFOW LPWSANETWORKEVENTS LPWSAOVERLAPPED LPWSAOVERLAPPED_COMPLETION_ROUTINE @@ -4663,6 +4914,29 @@ void LPWSTR +%%wtsapi32.dll + +%long + +BOOL +DWORD +HANDLE +WTS_INFO_CLASS + +%ptr + +DWORD * +LPSTR * +LPWSTR * +PWTS_PROCESS_INFOA * +PWTS_PROCESS_INFOW * +PWTS_SESSION_INFOA * +PWTS_SESSION_INFOW * + +%void + +void + %%x11drv.dll %long @@ -4685,6 +4959,7 @@ HWND INT LONG LPARAM +LRESULT SHORT UINT WCHAR @@ -4695,7 +4970,6 @@ int BITMAPINFO * BLENDFUNCTION -BYTE * CREATESTRUCTA * CURSORICONINFO * DEVMODEW * @@ -4708,6 +4982,7 @@ INT * LPBYTE LPCVOID LPDEVMODEW +LPINPUT LPINT LPLOGFONTW LPPALETTEENTRY @@ -4727,11 +5002,6 @@ X11DRV_PDEVICE ** VOID ** void * -%str - -LPCSTR -LPSTR - %void void