diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 436b042afb7..baac37aed35 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -40,6 +40,7 @@ HCRYPTPROV HKEY INT LONG +LSA_HANDLE NTSTATUS POLICY_INFORMATION_CLASS REGSAM @@ -59,10 +60,6 @@ ULONG WORD unsigned int -%long --extension - -LSA_HANDLE - %ptr BYTE * @@ -1094,6 +1091,7 @@ HBITMAP HBRUSH HCOLORSPACE HDC +HDC16 HENHMETAFILE HFONT HGDIOBJ @@ -1101,21 +1099,17 @@ HGLOBAL HMETAFILE HPALETTE HPEN +HPJOB16 HRGN +HRGN16 HWND INT +INT16 LONG LPARAM UINT ULONG WORD - -%long --extension - -HDC16 -HPJOB16 -HRGN16 -INT16 int %ptr @@ -1135,6 +1129,7 @@ DOCINFOW * DWORD * ENHMETARECORD * ENHMFENUMPROC +FARPROC16 FONTENUMPROCA FONTENUMPROCW GCP_RESULTSA * @@ -1204,10 +1199,6 @@ XFORM * VOID ** void * -%ptr --extension - -FARPROC16 - %str LPCSTR @@ -1492,6 +1483,7 @@ LONG ATOM BOOL +BOOL16 BYTE CALID CALTYPE @@ -1503,12 +1495,20 @@ GEOCLASS GEOID GEOTYPE HANDLE +HANDLE16 HFILE +HFILE16 HGLOBAL +HGLOBAL16 HINSTANCE +HINSTANCE16 HLOCAL +HLOCAL16 HMODULE +HMODULE16 HRSRC +HRSRC16 +HTASK16 HWND INT LANGID @@ -1518,25 +1518,13 @@ LCTYPE LONG SIZE_T UINT +UINT16 ULONG WCHAR WORD WOW_HANDLE_TYPE int -%long --extension - -BOOL16 -HANDLE16 -HFILE16 -HGLOBAL16 -HINSTANCE16 -HLOCAL16 -HMODULE16 -HRSRC16 -HTASK16 -UINT16 - %long --pointer DWORD_PTR @@ -1577,6 +1565,7 @@ ENUMRESTYPEPROCA ENUMRESTYPEPROCW FARPROC FARPROC * +FARPROC16 FILETIME * FINDEX_INFO_LEVELS FINDEX_SEARCH_OPS @@ -1671,6 +1660,7 @@ PVOID PTIMERAPCROUTINE PULARGE_INTEGER SECURITY_ATTRIBUTES * +SEGPTR SIZE_T * SYSLEVEL * SYSLEVEL ** @@ -1692,11 +1682,6 @@ va_list va_list * void * -%ptr --extension - -FARPROC16 -SEGPTR - %str LPCSTR @@ -2542,6 +2527,7 @@ WCHAR WORD int long +obj_handle_t unsigned int unsigned long @@ -2549,10 +2535,6 @@ unsigned long ULONG_PTR -%long --extension - -obj_handle_t - %longlong DWORDLONG @@ -2683,8 +2665,12 @@ ULONGLONG * USHORT * UNICODE_STRING * VOID * +WCHAR * WCHAR ** +char * enum loadorder_type[] +int * +obj_handle_t * union cptable * va_list va_list * @@ -2692,13 +2678,6 @@ void * void ** wine_signal_handler -%ptr --extension - -WCHAR * -char * -int * -obj_handle_t * - %str LPCSTR @@ -3939,16 +3918,13 @@ ULARGE_INTEGER * VARIANT * VOID * WNDCLASSA * +WNDCLASSW * int * unsigned char * va_list void * void ** -%ptr --extension - -WNDCLASSW * - %str LPCSTR @@ -4120,6 +4096,7 @@ GUITHREADINFO * DWORD HACCEL HANDLE +HANDLE16 HBITMAP HBRUSH HCONV @@ -4129,14 +4106,18 @@ HDC HDDEDATA HDESK HDEVNOTIFY +HDRVR16 HDWP HFONT +HGLOBAL16 HHOOK HICON HINSTANCE +HINSTANCE16 HKL HMENU HMODULE +HMODULE16 HMONITOR HRESULT HRGN @@ -4145,16 +4126,20 @@ HTASK HWINEVENTHOOK HWINSTA HWND +HWND16 INT +INT16 LONG LPARAM LRESULT SHORT UINT +UINT16 ULONG WCHAR WORD WPARAM +WPARAM16 int %long --pointer @@ -4163,18 +4148,6 @@ INT_PTR UINT_PTR ULONG_PTR -%long --extension - -HANDLE16 -HDRVR16 -HGLOBAL16 -HINSTANCE16 -HMODULE16 -HWND16 -INT16 -UINT16 -WPARAM16 - %longlong POINT @@ -4184,6 +4157,7 @@ POINT BOOL * COLORREF * DLGPROC +DLGPROC16 DESKTOPENUMPROCA DESKTOPENUMPROCW DRAWSTATEPROC @@ -4264,19 +4238,15 @@ WINDOWPLACEMENT * WINEVENTPROC WINSTAENUMPROCA WINSTAENUMPROCW +WND * WNDCLASSA * WNDCLASSEXA * WNDCLASSEXW * WNDCLASSW * WNDENUMPROC WNDPROC -va_list - -%ptr --extension - -DLGPROC16 -WND * WNDPROC16 +va_list %str diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index d1669bde22e..c36ea2fc492 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -133,7 +133,6 @@ sub parse_api_file($$) { my $module; my $kind; my $format; - my $extension = 0; my $forbidden = 0; $output->lazy_progress("$file"); @@ -154,13 +153,10 @@ sub parse_api_file($$) { $kind = $1; $format = undef; $forbidden = 0; - $extension = 0; $$allowed_kind{$kind} = 1; if(/^--forbidden/) { $forbidden = 1; - } elsif(/^--extension/) { - $extension = 1; } elsif(/^--format=(\".*?\"|\S*)/) { $format = $1; $format =~ s/^\"(.*?)\"$/$1/;