From e78997a7f9a7e80c551605cb6793d53837b3d033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20B=C3=A9ron?= Date: Tue, 6 Dec 2005 11:33:42 +0100 Subject: [PATCH] Sort entries in win16.api and win32.api --- tools/winapi/win16.api | 255 ++++++++++++++++---------------- tools/winapi/win32.api | 326 ++++++++++++++++++++--------------------- 2 files changed, 290 insertions(+), 291 deletions(-) diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api index 7db7cbab5c..c11b5b01af 100644 --- a/tools/winapi/win16.api +++ b/tools/winapi/win16.api @@ -362,6 +362,74 @@ INT16 UINT16 WORD +%%keyboard.dll + +%long + +DWORD +LONG + +%ptr + +LPBYTE +LPKBINFO +LPVOID + +%segptr + +FARPROC16 + +%str + +LPCSTR +LPSTR + +%void + +VOID +void + +%word + +CHAR +INT16 +UINT16 +WORD + +%%keyboard.drv + +%long + +DWORD +LONG + +%ptr + +LPBYTE +LPKBINFO +LPVOID + +%segptr + +FARPROC16 + +%str + +LPCSTR +LPSTR + +%void + +VOID +void + +%word + +CHAR +INT16 +UINT16 +WORD + %%krnl386.exe %long @@ -440,74 +508,6 @@ WORD LPCWSTR -%%keyboard.dll - -%long - -DWORD -LONG - -%ptr - -LPBYTE -LPKBINFO -LPVOID - -%segptr - -FARPROC16 - -%str - -LPCSTR -LPSTR - -%void - -VOID -void - -%word - -CHAR -INT16 -UINT16 -WORD - -%%keyboard.drv - -%long - -DWORD -LONG - -%ptr - -LPBYTE -LPKBINFO -LPVOID - -%segptr - -FARPROC16 - -%str - -LPCSTR -LPSTR - -%void - -VOID -void - -%word - -CHAR -INT16 -UINT16 -WORD - %%lzexpand.dll %long @@ -533,24 +533,6 @@ HFILE16 INT16 UINT16 -%%mouse.drv - -%ptr - -LPMOUSEINFO - -%segptr - -FARPROC16 - -%void - -VOID - -%word - -WORD - %%mmsystem.dll %long @@ -664,6 +646,24 @@ VOID WORD +%%mouse.drv + +%ptr + +LPMOUSEINFO + +%segptr + +FARPROC16 + +%void + +VOID + +%word + +WORD + %%msacm.dll %long @@ -773,8 +773,8 @@ LPRUNNINGOBJECTTABLE * LPSTORAGE LPVOID LPVOID * -REFIID REFCLSID +REFIID STATSTG16 * ULONG * void * @@ -913,8 +913,8 @@ LPCSTR %word HINSTANCE16 -OLESTATUS OLE_SERVER_USE +OLESTATUS %%setupx.dll @@ -1086,14 +1086,14 @@ UINT16 DWORD -%str - -char * - %segptr FARPROC16 +%str + +char * + %void void @@ -1477,42 +1477,6 @@ BOOL HWND16 - -%%wintab.dll - -%long - -DWORD -LPARAM -LRESULT - -%ptr - -LPBYTE -LPINT16 -LPLOGCONTEXT16 -LPVOID -LPWTHOOKPROC16 -UINT16 * -WTCONFIGPROC16 -WTENUMPROC16 -WTHOOKPROC16 - -%str - -LPSTR - -%word - -BOOL16 -HCTX16 -HMGR16 -HWND16 -HWTHOOK16 -INT16 -UINT16 -WPARAM16 - %%winsock.dll %long @@ -1555,6 +1519,41 @@ SOCKET16 UINT16 u_short +%%wintab.dll + +%long + +DWORD +LPARAM +LRESULT + +%ptr + +LPBYTE +LPINT16 +LPLOGCONTEXT16 +LPVOID +LPWTHOOKPROC16 +UINT16 * +WTCONFIGPROC16 +WTENUMPROC16 +WTHOOKPROC16 + +%str + +LPSTR + +%word + +BOOL16 +HCTX16 +HMGR16 +HWND16 +HWTHOOK16 +INT16 +UINT16 +WPARAM16 + %%wprocs.dll %ptr diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index f17edf1eba..80020b9a58 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -145,10 +145,10 @@ PTRUSTEEA PTRUSTEEW PUCHAR PULONG -PVOID -PVOID * PVALENTA PVALENTW +PVOID +PVOID * SC_LOCK SECURITY_ATTRIBUTES * WMIDPREQUEST @@ -267,8 +267,8 @@ WORD %str -LPSTR LPCSTR +LPSTR %wstr @@ -295,8 +295,8 @@ int AVISAVECALLBACK CLSID * LONG * -LPAVICOMPRESSOPTIONS * LPAVICOMPRESSOPTIONS +LPAVICOMPRESSOPTIONS * LPAVIFILEINFOA LPAVIFILEINFOW LPAVISTREAMINFOA @@ -304,8 +304,8 @@ LPAVISTREAMINFOW LPBITMAPINFOHEADER LPCLSID LPLONG -LPVOID * LPVOID +LPVOID * PAVIFILE PAVIFILE * PAVISTREAM @@ -613,9 +613,9 @@ ULONG BYTE * CERT_EXTENSION[] -CRYPTPROTECT_PROMPTSTRUCT * CRYPT_ATTRIBUTE[] CRYPT_OID_FUNC_ENTRY[] +CRYPTPROTECT_PROMPTSTRUCT * DATA_BLOB * DWORD * GUID * @@ -718,6 +718,26 @@ int IDirect3D9 * LPVOID +%%d3dx8.dll + +%long + +DWORD +HFONT +HRESULT +UINT + +%ptr + +LPCVOID +LPD3DXBUFFER * +LPD3DXFONT * +LPDIRECT3DDEVICE8 + +%str + +LPSTR + %%d3dxof.dll %long @@ -726,10 +746,10 @@ HRESULT %ptr -REFCLSID -REFIID LPDIRECTXFILE * LPVOID * +REFCLSID +REFIID %%dbghelp.dll @@ -771,8 +791,8 @@ PIMAGEHLP_LINE PIMAGEHLP_LINE64 PIMAGEHLP_MODULE PIMAGEHLP_MODULE64 -PIMAGEHLP_SYMBOL PIMAGEHLP_STACK_FRAME +PIMAGEHLP_SYMBOL PMINIDUMP_CALLBACK_INFORMATION PMINIDUMP_DIRECTORY * PMINIDUMP_EXCEPTION_INFORMATION @@ -821,26 +841,6 @@ LPDCISURFACEINFO * void -%%d3dx8.dll - -%long - -DWORD -HFONT -HRESULT -UINT - -%ptr - -LPD3DXBUFFER * -LPDIRECT3DDEVICE8 -LPCVOID -LPD3DXFONT * - -%str - -LPSTR - %%ddraw.dll %long @@ -871,9 +871,9 @@ HRESULT %ptr +LPVOID * REFCLSID REFIID -LPVOID * %%dinput.dll @@ -1099,9 +1099,9 @@ HRESULT %ptr +LPVOID * REFCLSID REFIID -LPVOID * %%dxdiagn.dll @@ -1226,9 +1226,9 @@ RGNDATA * TEXTMETRICA * TEXTMETRICW * TRIVERTEX * +VOID ** WORD * XFORM * -VOID ** void * %str @@ -1385,9 +1385,9 @@ LPSYSTEMTIME LPVOID PCHAR * PDWORD -PIMAGEHLP_STATUS_ROUTINE PIMAGE_LOAD_CONFIG_DIRECTORY PIMAGE_NT_HEADERS +PIMAGEHLP_STATUS_ROUTINE PLOADED_IMAGE PWIN_CERTIFICATE ULONG * @@ -1561,6 +1561,7 @@ LANGID LATENCY_TIME LCID LCTYPE +LGRPID LONG SIZE_T UINT @@ -1629,7 +1630,6 @@ LARGE_INTEGER * LOCALE_ENUMPROCA LOCALE_ENUMPROCW LONG * -LGRPID LPBOOL LPBYTE LPCHAR_INFO @@ -1660,21 +1660,21 @@ LPOSVERSIONINFOEXW LPOVERLAPPED LPOVERLAPPED * LPOVERLAPPED_COMPLETION_ROUTINE -LPPROCESSENTRY32 -LPPROCESSENTRY32W LPPROCESS_HEAP_ENTRY LPPROCESS_INFORMATION +LPPROCESSENTRY32 +LPPROCESSENTRY32W LPPROGRESS_ROUTINE LPSECURITY_ATTRIBUTES LPSMALL_RECT LPSTARTUPINFOA LPSTARTUPINFOW LPSTR * -LPSYSTEMTIME LPSYSTEM_INFO LPSYSTEM_POWER_STATUS -LPTHREADENTRY32 +LPSYSTEMTIME LPTHREAD_START_ROUTINE +LPTHREADENTRY32 LPTIME_ZONE_INFORMATION LPTOP_LEVEL_EXCEPTION_FILTER LPVOID @@ -1701,10 +1701,10 @@ PIO_COUNTERS PLARGE_INTEGER PMEMORY_BASIC_INFORMATION PSIZE_T -PULONG_PTR -PVOID PTIMERAPCROUTINE PULARGE_INTEGER +PULONG_PTR +PVOID SECURITY_ATTRIBUTES * SEGPTR SIZE_T * @@ -1794,8 +1794,8 @@ LPPROPDATA * LPSPropTagArray LPSPropValue LPSPropValue * -LPSRowSet LPSRow +LPSRowSet LPSTR * LPSTREAM * LPVOID @@ -2195,9 +2195,9 @@ INSTALLTYPE INSTALLUILEVEL INT LANGID -MSIDBERROR MSICOLINFO MSICONDITION +MSIDBERROR MSIHANDLE MSIMODIFY MSIRUNMODE @@ -2214,9 +2214,9 @@ DLLVERSIONINFO * DWORD * FILETIME * HWND * +INSTALLSTATE * INSTALLUI_HANDLERA INSTALLUI_HANDLERW -INSTALLSTATE * INT * LPVOID LPVOID * @@ -2257,6 +2257,16 @@ HRESULT LPVOID * REFCLSID +%%msnet32.dll + +%long + +LONG + +%ptr + +LPVOID + %%msrle32.dll %long @@ -2270,16 +2280,6 @@ UINT DWORD_PTR -%%msnet32.dll - -%long - -LONG - -%ptr - -LPVOID - %%msvcrt.dll %double @@ -2317,6 +2317,7 @@ unsigned __int64 %ptr +_INITTERMFUN * EXCEPTION_REGISTRATION_RECORD * EXCEPTION_REGISTRATION_RECORD ** MSVCRT___sighandler_t @@ -2331,8 +2332,8 @@ MSVCRT_fpos_t * MSVCRT_matherr_func MSVCRT_new_handler_func MSVCRT_terminate_function -MSVCRT_unexpected_function MSVCRT_time_t * +MSVCRT_unexpected_function MSVCRT_wchar_t ** MSVCRT_wchar_t *** MSVCRT_wint_t @@ -2341,7 +2342,6 @@ PEXCEPTION_POINTERS PEXCEPTION_RECORD WCHAR ** WORD ** -_INITTERMFUN * char ** char *** cxx_exception_type * @@ -2352,8 +2352,8 @@ int * long * malloc_func_t struct MSVCRT___JUMP_BUFFER * -struct MSVCRT__exception * struct MSVCRT__diskfree_t * +struct MSVCRT__exception * struct MSVCRT__finddata_t * struct MSVCRT__finddatai64_t * struct MSVCRT__heapinfo * @@ -2377,11 +2377,6 @@ void * char * -%wstr - -MSVCRT_wchar_t * -WCHAR * - %unknown MSVCRT_div_t @@ -2393,6 +2388,27 @@ struct MSVCRT__complex VOID void +%wstr + +MSVCRT_wchar_t * +WCHAR * + +%%msvcrt20.dll + +%long + +int + +%ptr + +WCHAR *** +char *** +int * + +%void + +void + %%msvcrtd.dll %long @@ -2409,22 +2425,6 @@ void * char * -%%msvcrt20.dll - -%long - -int - -%ptr - -WCHAR *** -char *** -int * - -%void - -void - %%msvfw32.dll %long @@ -2460,9 +2460,9 @@ LPBITMAPINFO LPBITMAPINFOHEADER LPDRAWDIBTIME LPDWORD -LPPALETTEENTRY LPOPENFILENAMEA LPOPENFILENAMEW +LPPALETTEENTRY LPVOID PCOMPVARS @@ -2552,16 +2552,16 @@ PNETSETUP_JOIN_STATUS PVOID PVOID * +%void + +VOID + %wstr LMSTR LPCWSTR LPWSTR -%void - -VOID - %%newdev.dll %long @@ -2659,27 +2659,27 @@ ULONGLONG ANSI_STRING * BOOLEAN * -CONTEXT * CLIENT_ID * +CONTEXT * CURDIR * DOS_PATHNAME_TYPE DWORD * EXCEPTION_RECORD * EXCEPTION_REGISTRATION_RECORD * EXCEPTION_REGISTRATION_RECORD ** -FILE_NETWORK_OPEN_INFORMATION * FILE_BASIC_INFORMATION * +FILE_NETWORK_OPEN_INFORMATION * GENERIC_MAPPING * GUID * HANDLE * HMODULE * -IO_STATUS_BLOCK * IMAGE_NT_HEADERS * -IMAGE_RESOURCE_DIRECTORY ** IMAGE_RESOURCE_DATA_ENTRY * IMAGE_RESOURCE_DATA_ENTRY ** +IMAGE_RESOURCE_DIRECTORY ** IMAGE_SECTION_HEADER ** INT * +IO_STATUS_BLOCK * LANGID * LARGE_INTEGER * LCID * @@ -2735,6 +2735,8 @@ PPRIVILEGE_SET PRTL_BITMAP PRTL_BITMAP_RUN PRTL_HEAP_DEFINITION +PRTL_QUERY_REGISTRY_TABLE +PRTL_THREAD_START_ROUTINE PRTL_USER_PROCESS_PARAMETERS PSECURITY_DESCRIPTOR PSECURITY_DESCRIPTOR_CONTROL @@ -2744,8 +2746,6 @@ PSID * PSID_IDENTIFIER_AUTHORITY PSTRING PSYSTEM_MODULE_INFORMATION -PRTL_QUERY_REGISTRY_TABLE -PRTL_THREAD_START_ROUTINE PTIME_FIELDS PTIMER_APC_ROUTINE PTOKEN_GROUPS @@ -2775,8 +2775,8 @@ TEB * UINT * ULONG * ULONGLONG * -USHORT * UNICODE_STRING * +USHORT * VOID * WCHAR ** enum loadorder_type[] @@ -2856,6 +2856,14 @@ UWORD WORD int +%ptr + +DWORD * +LONG * +LPDWORD +UWORD * +WORD * + %str LPCSTR @@ -2866,14 +2874,6 @@ LPSTR LPCWSTR LPWSTR -%ptr - -DWORD * -LONG * -LPDWORD -UWORD * -WORD * - %%ole32.dll %long @@ -2991,17 +2991,17 @@ void ** LPCOLESTR LPOLESTR +%void + +VOID +void + %wstr BSTR OLECHAR * WCHAR * -%void - -VOID -void - %%oleacc.dll %long @@ -3020,15 +3020,15 @@ void ** %%oleaut32.dll -%float - -float - %double DATE double +%float + +float + %long BOOL @@ -3124,19 +3124,19 @@ ULONG * ULONG64 * USHORT * VARIANT * +VARIANT_BOOL * VARIANTARG * VARIANTARG ** -VARIANT_BOOL * VARTYPE * VOID * double * float * int * signed char * -void * -void ** unsigned char * unsigned long * +void * +void ** %str @@ -3241,8 +3241,8 @@ REFIID HINSTANCE LHSERVER LHSERVERDOC -OLESTATUS OLE_SERVER_USE +OLESTATUS %ptr @@ -3377,9 +3377,9 @@ HRESULT %ptr +LPVOID * REFCLSID REFIID -LPVOID * %%quartz.dll @@ -3390,9 +3390,9 @@ LONG %ptr +LPVOID * REFCLSID REFIID -LPVOID * %%rasapi32.dll @@ -3415,23 +3415,23 @@ LPHRASCONN LPRASAUTODIALENTRYA LPRASAUTODIALENTRYW LPRASCONNA -LPRASCONNW LPRASCONNSTATUSA LPRASCONNSTATUSW +LPRASCONNW LPRASDEVINFOA LPRASDEVINFOW LPRASDIALEXTENSIONS LPRASDIALPARAMSA LPRASDIALPARAMSW LPRASENTRYA -LPRASENTRYW LPRASENTRYNAMEA LPRASENTRYNAMEW +LPRASENTRYW LPRASSUBENTRYA LPRASSUBENTRYW LPSTR * -LPWSTR * LPVOID +LPWSTR * %str @@ -3542,14 +3542,14 @@ unsigned short * unsigned short ** void * -%wstr - -LPWSTR - %void void +%wstr + +LPWSTR + %%rsaenh.dll %long @@ -3616,14 +3616,14 @@ void ** %str -LPSTR LPCSTR +LPSTR SEC_CHAR * %wstr -LPWSTR LPCWSTR +LPWSTR SEC_WCHAR * %%sensapi.dll @@ -4183,10 +4183,10 @@ LPBC LPBINDCTX LPBINDSTATUSCALLBACK LPSOFTDISTINFO -LPWSTR * LPUNKNOWN LPVOID LPVOID * +LPWSTR * QUERYCONTEXT * REFCLSID REFIID @@ -4216,7 +4216,6 @@ BOOL BYTE CHAR COLORREF -GUITHREADINFO * DWORD HACCEL HANDLE @@ -4280,13 +4279,14 @@ POINT BOOL * COLORREF * -DLGPROC DESKTOPENUMPROCA DESKTOPENUMPROCW +DLGPROC DLGPROC16 DRAWSTATEPROC DWORD * GRAYSTRINGPROC +GUITHREADINFO * HANDLE * HBRUSH * HICON * @@ -4461,14 +4461,14 @@ TEXTMETRICW * WORD * int * -%void - -void - %str char * +%void + +void + %wstr LPCWSTR @@ -4712,8 +4712,8 @@ DWORD HDRVR LPARAM LRESULT -WORD UINT +WORD %long --pointer @@ -4933,9 +4933,9 @@ FILETIME %ptr -GROUPID * GOPHER_ATTRIBUTE_ENUMERATORA GOPHER_ATTRIBUTE_ENUMERATORW +GROUPID * HANDLE * HINTERNET * INTERNET_STATUS_CALLBACK @@ -4968,16 +4968,16 @@ unsigned long * LPCSTR LPSTR +%void + +void + %wstr LPCWSTR LPWSTR PWSTR -%void - -void - %%winmm.dll %long @@ -5003,21 +5003,21 @@ INT LONG LPARAM LRESULT -MCIERROR MCIDEVICEID +MCIERROR MMRESULT UINT -%long --pointer - -DWORD_PTR -UINT_PTR - %long --forbidden HMMIO16 UINT16 +%long --pointer + +DWORD_PTR +UINT_PTR + %ptr DWORD * @@ -5032,7 +5032,9 @@ LPAUXCAPSW LPBYTE LPCWAVEFORMATEX LPDWORD +LPHMIDIOUT LPHMIXER +LPHWAVEOUT LPJOYCAPSA LPJOYCAPSW LPJOYINFO @@ -5040,7 +5042,6 @@ LPJOYINFOEX LPMIDIHDR LPMIDIINCAPSA LPMIDIINCAPSW -LPHMIDIOUT LPMIDIOUTCAPSA LPMIDIOUTCAPSW LPMIXERCAPSA @@ -5053,14 +5054,13 @@ LPMIXERLINEW LPMMCKINFO LPMMIOPROC LPMMTIME +LPTASKCALLBACK LPTIMECALLBACK LPTIMECAPS LPUINT -LPTASKCALLBACK LPWAVEHDR LPWAVEINCAPSA LPWAVEINCAPSW -LPHWAVEOUT LPWAVEOUTCAPSA LPWAVEOUTCAPSW MIDIHDR * @@ -5076,15 +5076,15 @@ YIELDPROC LPCSTR LPSTR +%void + +void + %wstr LPCWSTR LPWSTR -%void - -void - %%winnls32.dll %long @@ -5119,9 +5119,9 @@ LPPRINTER_DEFAULTSW LPVOID LPVOID * PBYTE -PDWORD PDEVMODEA PDEVMODEW +PDWORD PPRINTER_NOTIFY_INFO %str @@ -5140,12 +5140,12 @@ LPWSTR BOOL DWORD -LPARAM -LRESULT HCTX HMGR HWND HWTHOOK +LPARAM +LRESULT UINT WPARAM int @@ -5197,16 +5197,16 @@ void %long BOOLEAN -INT HANDLE +INT UCHAR ULONG int %ptr -BerElement * BERVAL * +BerElement * CHAR ** HANDLE * LDAPControlA * @@ -5254,16 +5254,16 @@ LPCSTR LPSTR PCHAR +%void + +void + %wstr LPCWSTR LPWSTR PWCHAR -%void - -void - %%wnaspi32.dll %long @@ -5342,10 +5342,10 @@ LPWSAOVERLAPPED LPWSAOVERLAPPED_COMPLETION_ROUTINE LPWSAPROTOCOL_INFOA LPWSAPROTOCOL_INFOW -LPWSASERVICECLASSINFOA -LPWSASERVICECLASSINFOW LPWSAQUERYSETA LPWSAQUERYSETW +LPWSASERVICECLASSINFOA +LPWSASERVICECLASSINFOW PADDRINFOW * WS_fd_set * int * @@ -5365,11 +5365,6 @@ LPCSTR LPSTR char * -%wstr - -LPCWSTR -LPWSTR - %unknown struct WS_in_addr @@ -5378,6 +5373,11 @@ struct WS_in_addr void +%wstr + +LPCWSTR +LPWSTR + %%wsock32.dll %long