diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index 322c62170a9..ab056e69187 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -246,7 +246,7 @@ sub _refresh { my $field_sizes = \${$self->{FIELD_SIZES}}; my $pack = $self->pack; - $pack = 4 if !defined($pack); + $pack = 8 if !defined($pack); my $max_field_align = 0; diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 14a4e562ae7..19ac72ab222 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -39,8 +39,8 @@ COLORADJUSTMENT !DEVMODEA !DEVMODEW DIBSECTION -DISPLAY_DEVICEA: !DeviceID !DeviceKey -DISPLAY_DEVICEW: !DeviceID !DeviceKey +DISPLAY_DEVICEA +DISPLAY_DEVICEW DOCINFOA DOCINFOW EMR @@ -53,8 +53,8 @@ EMRBITBLT EMRCHORD EMRCLOSEFIGURE EMRCREATEBRUSHINDIRECT -!EMRCREATECOLORSPACE -!EMRCREATECOLORSPACEW +EMRCREATECOLORSPACE +EMRCREATECOLORSPACEW EMRCREATEDIBPATTERNBRUSHPT EMRCREATEMONOBRUSH !EMRCREATEPALETTE @@ -79,8 +79,8 @@ EMRFRAMERGN EMRGDICOMMENT EMRGLSBOUNDEDRECORD EMRGLSRECORD -EMRINVERTRGN EMRINTERSECTCLIPRECT +EMRINVERTRGN EMRLINETO EMRMASKBLT EMRMODIFYWORLDTRANSFORM @@ -91,13 +91,21 @@ EMRPIE EMRPIXELFORMAT EMRPLGBLT EMRPOLYBEZIER +EMRPOLYBEZIER16 EMRPOLYBEZIERTO +EMRPOLYBEZIERTO16 EMRPOLYDRAW +EMRPOLYDRAW16 EMRPOLYGON +EMRPOLYGON16 EMRPOLYLINE +EMRPOLYLINE16 EMRPOLYLINETO +EMRPOLYLINETO16 EMRPOLYPOLYGON +EMRPOLYPOLYGON16 EMRPOLYPOLYLINE +EMRPOLYPOLYLINE16 EMRPOLYTEXTOUTA EMRPOLYTEXTOUTW EMRREALIZEPALETTE @@ -117,10 +125,10 @@ EMRSETBKCOLOR EMRSETBKMODE EMRSETBRUSHORGEX EMRSETCOLORADJUSTMENT -!EMRSETCOLORSPACE +EMRSETCOLORSPACE EMRSETDIBITSTODEVICE EMRSETICMMODE -!EMRSETLAYOUT +EMRSETLAYOUT EMRSETMAPMODE EMRSETMAPPERFLAGS EMRSETMETARGN @@ -132,7 +140,7 @@ EMRSETROP2 EMRSETSTRETCHBLTMODE EMRSETTEXTALIGN EMRSETTEXTCOLOR -!EMRSETTEXTJUSTIFICATION +EMRSETTEXTJUSTIFICATION EMRSETVIEWPORTEXTEX EMRSETVIEWPORTORGEX EMRSETWINDOWEXTEX @@ -144,7 +152,7 @@ EMRSTROKEANDFILLPATH EMRSTROKEPATH EMRTEXT EMRWIDENPATH -ENHMETAHEADER: !szlMicrometers +ENHMETAHEADER ENHMETARECORD ENHMFENUMPROC ENUMLOGFONTA @@ -154,6 +162,8 @@ ENUMLOGFONTW EXTLOGFONTA EXTLOGFONTW EXTLOGPEN +EnumICMProfilesProcCallbackA +EnumICMProfilesProcCallbackW FIXED FONTENUMPROCA FONTENUMPROCEXA @@ -169,6 +179,8 @@ GOBJENUMPROC GRADIENT_RECT GRADIENT_TRIANGLE HANDLETABLE +ICMENUMPROCA +ICMENUMPROCW KERNINGPAIR LCSCSTYPE LCSGAMUTMATCH @@ -194,8 +206,8 @@ LPCHARSETINFO LPCIEXYZ LPCIEXYZTRIPLE LPCOLORADJUSTMENT -LPDEVMODEA -LPDEVMODEW +!LPDEVMODEA +!LPDEVMODEW LPDIBSECTION LPDISPLAY_DEVICEA LPDISPLAY_DEVICEW @@ -263,6 +275,7 @@ NEWTEXTMETRICEXW NEWTEXTMETRICW NPEXTLOGPEN !NPLOGPALETTE +OLDFONTENUMPROC OLDFONTENUMPROCA OLDFONTENUMPROCW OUTLINETEXTMETRICA @@ -299,8 +312,8 @@ PEMRBITBLT PEMRCHORD PEMRCLOSEFIGURE PEMRCREATEBRUSHINDIRECT -!PEMRCREATECOLORSPACE -!PEMRCREATECOLORSPACEW +PEMRCREATECOLORSPACE +PEMRCREATECOLORSPACEW PEMRCREATEDIBPATTERNBRUSHPT PEMRCREATEMONOBRUSH PEMRCREATEPALETTE @@ -337,13 +350,21 @@ PEMRPIE PEMRPIXELFORMAT PEMRPLGBLT PEMRPOLYBEZIER +PEMRPOLYBEZIER16 PEMRPOLYBEZIERTO +PEMRPOLYBEZIERTO16 PEMRPOLYDRAW +PEMRPOLYDRAW16 PEMRPOLYGON +PEMRPOLYGON16 PEMRPOLYLINE +PEMRPOLYLINE16 PEMRPOLYLINETO +PEMRPOLYLINETO16 PEMRPOLYPOLYGON +PEMRPOLYPOLYGON16 PEMRPOLYPOLYLINE +PEMRPOLYPOLYLINE16 PEMRPOLYTEXTOUTA PEMRPOLYTEXTOUTW PEMRREALIZEPALETTE @@ -363,10 +384,10 @@ PEMRSETBKCOLOR PEMRSETBKMODE PEMRSETBRUSHORGEX PEMRSETCOLORADJUSTMENT -!PEMRSETCOLORSPACE +PEMRSETCOLORSPACE PEMRSETDIBITSTODEVICE PEMRSETICMMODE -!PEMRSETLAYOUT +PEMRSETLAYOUT PEMRSETMAPMODE PEMRSETMAPPERFLAGS PEMRSETMETARGN @@ -378,7 +399,7 @@ PEMRSETROP2 PEMRSETSTRETCHBLTMODE PEMRSETTEXTALIGN PEMRSETTEXTCOLOR -!PEMRSETTEXTJUSTIFICATION # Can't find in any SDK. However #define EMR_SETTEXTJUSTIFICATION exixts +!PEMRSETTEXTJUSTIFICATION PEMRSETVIEWPORTEXTEX PEMRSETVIEWPORTORGEX PEMRSETWINDOWEXTEX @@ -458,49 +479,57 @@ winbase.h %type +ACTCTXA +ACTCTXW +ACTCTX_SECTION_KEYED_DATA +ACTCTX_SECTION_KEYED_DATA_2600 +ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA +ACTIVATION_CONTEXT_BASIC_INFORMATION BY_HANDLE_FILE_INFORMATION -COMMCONFIG +!COMMCONFIG COMMPROP COMMTIMEOUTS -COMSTAT +!COMSTAT CREATE_PROCESS_DEBUG_INFO CREATE_THREAD_DEBUG_INFO CRITICAL_SECTION CRITICAL_SECTION_DEBUG -DCB -DEBUG_EVENT -!ENUMRESLANGPROCA -!ENUMRESLANGPROCW -!ENUMRESNAMEPROCA -!ENUMRESNAMEPROCW -!ENUMRESTYPEPROCA -!ENUMRESTYPEPROCW +!DCB +!DEBUG_EVENT +ENUMRESLANGPROCA +ENUMRESLANGPROCW +ENUMRESNAMEPROCA +ENUMRESNAMEPROCW +ENUMRESTYPEPROCA +ENUMRESTYPEPROCW EXCEPTION_DEBUG_INFO EXIT_PROCESS_DEBUG_INFO EXIT_THREAD_DEBUG_INFO !FILETIME HW_PROFILE_INFOA HW_PROFILE_INFOW -LDT_ENTRY +!LDT_ENTRY LOAD_DLL_DEBUG_INFO LPBY_HANDLE_FILE_INFORMATION -LPCOMMCONFIG +!LPCOMMCONFIG LPCOMMPROP LPCOMMTIMEOUTS -LPCOMSTAT -LPCONTEXT +!LPCOMSTAT +!LPCONTEXT LPCRITICAL_SECTION LPCRITICAL_SECTION_DEBUG -LPDCB -LPDEBUG_EVENT +!LPDCB +!LPDEBUG_EVENT LPEXCEPTION_POINTERS LPEXCEPTION_RECORD LPFIBER_START_ROUTINE !LPFILETIME LPHW_PROFILE_INFOA LPHW_PROFILE_INFOW -LPLDT_ENTRY +!LPLDT_ENTRY +LPLONG LPMEMORYSTATUS +!LPMEMORYSTATUSEX LPOFSTRUCT LPOSVERSIONINFOA LPOSVERSIONINFOEXA @@ -508,43 +537,58 @@ LPOSVERSIONINFOEXW LPOSVERSIONINFOW LPOVERLAPPED LPOVERLAPPED_COMPLETION_ROUTINE -LPPROCESS_HEAP_ENTRY +!LPPROCESS_HEAP_ENTRY LPPROCESS_INFORMATION LPPROGRESS_ROUTINE LPSECURITY_ATTRIBUTES LPSTARTUPINFOA LPSTARTUPINFOW LPSYSTEMTIME -LPSYSTEM_INFO +!LPSYSTEM_INFO LPSYSTEM_POWER_STATUS LPTHREAD_START_ROUTINE LPTIME_ZONE_INFORMATION +LPVOID LPWIN32_FILE_ATTRIBUTE_DATA LPWIN32_FIND_DATAA LPWIN32_FIND_DATAW -LPWIN32_STREAM_ID +!LPWIN32_STREAM_ID MEMORYSTATUS +!MEMORYSTATUSEX OFSTRUCT OSVERSIONINFOA -OSVERSIONINFOEXA: !wSuiteMask !wProductType !wReserved -OSVERSIONINFOEXW: !wSuiteMask !wProductType !wReserved +OSVERSIONINFOEXA +OSVERSIONINFOEXW OSVERSIONINFOW OUTPUT_DEBUG_STRING_INFO OVERLAPPED +PACTCTXA +PACTCTXW +PACTCTX_SECTION_KEYED_DATA +PACTCTX_SECTION_KEYED_DATA_2600 +PACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA +PACTIVATION_CONTEXT_BASIC_INFORMATION PAPCFUNC PBY_HANDLE_FILE_INFORMATION +PCACTCTXA +PCACTCTXW +PCACTCTX_SECTION_KEYED_DATA +PCACTCTX_SECTION_KEYED_DATA_2600 +PCACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA PCRITICAL_SECTION PCRITICAL_SECTION_DEBUG PFIBER_START_ROUTINE !PFILETIME +PHKEY POFSTRUCT POSVERSIONINFOA POSVERSIONINFOEXA POSVERSIONINFOEXW POSVERSIONINFOW -PPROCESS_HEAP_ENTRY +!PPROCESS_HEAP_ENTRY PPROCESS_INFORMATION -PROCESS_HEAP_ENTRY +PQUERYACTCTXW_FUNC +!PROCESS_HEAP_ENTRY PROCESS_INFORMATION PSECURITY_ATTRIBUTES PSYSTEMTIME @@ -556,13 +600,13 @@ RIP_INFO SECURITY_ATTRIBUTES STARTUPINFOA STARTUPINFOW -!SYSLEVEL +SYSLEVEL SYSTEMTIME !SYSTEM_INFO SYSTEM_POWER_STATUS TIME_ZONE_INFORMATION UNLOAD_DLL_DEBUG_INFO -!WAITORTIMERCALLBACK +WAITORTIMERCALLBACK WIN32_FILE_ATTRIBUTE_DATA WIN32_FIND_DATAA WIN32_FIND_DATAW @@ -594,35 +638,38 @@ ACCESS_DENIED_ACE ACCESS_MASK ACE_HEADER ACL +ACL_REVISION_INFORMATION +ACL_SIZE_INFORMATION ATOM BOOL BOOLEAN BYTE -!CATCHBUF +CATCHBUF CCHAR CHAR COLORREF !CONTEXT -!CONTEXT86 -!DATE -!DOUBLE +CONTEXT86 +DATE +DOUBLE DWORD DWORD32 -!DWORD64 -!DWORDLONG +DWORD64 +DWORDLONG DWORD_PTR -!EXCEPTION_FRAME +EXCEPTION_FRAME EXCEPTION_POINTERS EXCEPTION_RECORD +EXCEPTION_REGISTRATION_RECORD EXECUTION_STATE FARPROC FLOAT FLOATING_SAVE_AREA -FPO_DATA +!FPO_DATA GENERIC_MAPPING GLOBALHANDLE HALF_PTR -HANDLE +!HANDLE HCURSOR HFILE HGDIOBJ @@ -644,42 +691,43 @@ IMAGE_EXPORT_DIRECTORY IMAGE_FILE_HEADER IMAGE_FUNCTION_ENTRY IMAGE_IMPORT_BY_NAME -!IMAGE_IMPORT_DESCRIPTOR +IMAGE_IMPORT_DESCRIPTOR !IMAGE_LINENUMBER IMAGE_LOAD_CONFIG_DIRECTORY IMAGE_NT_HEADERS IMAGE_OPTIONAL_HEADER IMAGE_OS2_HEADER !IMAGE_RELOCATION -IMAGE_RESOURCE_DATA_ENTRY: !ResourceHandle +IMAGE_RESOURCE_DATA_ENTRY IMAGE_RESOURCE_DIRECTORY -IMAGE_RESOURCE_DIRECTORY_ENTRY +!IMAGE_RESOURCE_DIRECTORY_ENTRY IMAGE_RESOURCE_DIRECTORY_STRING IMAGE_RESOURCE_DIR_STRING_U !IMAGE_SECTION_HEADER IMAGE_SEPARATE_DEBUG_HEADER !IMAGE_SYMBOL -IMAGE_THUNK_DATA +!IMAGE_THUNK_DATA IMAGE_TLS_DIRECTORY IMAGE_VXD_HEADER INT -!INT16 +INT16 INT32 -!INT64 -!INT8 +INT64 +INT8 INT_PTR +!IO_COUNTERS LANGID -!LARGE_INTEGER +LARGE_INTEGER LCID LIST_ENTRY LOCALHANDLE LONG LONG32 -!LONG64 -!LONGLONG +LONG64 +LONGLONG LONG_PTR LPARAM -!LPCATCHBUF +LPCATCHBUF LPCRECT LPCRECTL LPCVOID @@ -701,24 +749,28 @@ MESSAGE_RESOURCE_BLOCK MESSAGE_RESOURCE_DATA MESSAGE_RESOURCE_ENTRY !NT_TIB +OBJECT_TYPE_LIST PACCESS_ALLOWED_ACE PACCESS_DENIED_ACE PACCESS_TOKEN PACE_HEADER PACL +PACL_REVISION_INFORMATION +PACL_SIZE_INFORMATION PCCH PCH !PCONTEXT PCSTR -!PCTSTR +PCTSTR PCWCH PCWSTR -!PEXCEPTION_FRAME -!PEXCEPTION_HANDLER +PEXCEPTION_FRAME +PEXCEPTION_HANDLER PEXCEPTION_POINTERS PEXCEPTION_RECORD +PEXCEPTION_REGISTRATION_RECORD PFLOATING_SAVE_AREA -PFPO_DATA +!PFPO_DATA PGENERIC_MAPPING PHANDLE PIMAGE_ARCHIVE_MEMBER_HEADER @@ -736,33 +788,36 @@ PIMAGE_FILE_HEADER PIMAGE_FUNCTION_ENTRY PIMAGE_IMPORT_BY_NAME PIMAGE_IMPORT_DESCRIPTOR -PIMAGE_LINENUMBER +!PIMAGE_LINENUMBER PIMAGE_LOAD_CONFIG_DIRECTORY PIMAGE_NT_HEADERS PIMAGE_OPTIONAL_HEADER PIMAGE_OS2_HEADER -PIMAGE_RELOCATION +!PIMAGE_RELOCATION PIMAGE_RESOURCE_DATA_ENTRY PIMAGE_RESOURCE_DIRECTORY -PIMAGE_RESOURCE_DIRECTORY_ENTRY +!PIMAGE_RESOURCE_DIRECTORY_ENTRY PIMAGE_RESOURCE_DIRECTORY_STRING PIMAGE_RESOURCE_DIR_STRING_U -PIMAGE_SECTION_HEADER +!PIMAGE_SECTION_HEADER PIMAGE_SEPARATE_DEBUG_HEADER -PIMAGE_SYMBOL -PIMAGE_THUNK_DATA +!PIMAGE_SYMBOL +!PIMAGE_THUNK_DATA PIMAGE_TLS_CALLBACK PIMAGE_TLS_DIRECTORY PIMAGE_VXD_HEADER +!PIO_COUNTERS PISECURITY_DESCRIPTOR_RELATIVE PLARGE_INTEGER PLIST_ENTRY PLUID +PLUID_AND_ATTRIBUTES PMEMORY_BASIC_INFORMATION PMESSAGE_RESOURCE_BLOCK PMESSAGE_RESOURCE_DATA PMESSAGE_RESOURCE_ENTRY -PNT_TIB +!PNT_TIB +POBJECT_TYPE_LIST POINT POINTL POINTS @@ -776,10 +831,12 @@ PRLIST_ENTRY PROC PRTL_CRITICAL_SECTION PRTL_CRITICAL_SECTION_DEBUG +PRTL_OSVERSIONINFOEXW +PRTL_OSVERSIONINFOW PRTL_RESOURCE_DEBUG -!PSECURITY_DESCRIPTOR: void -PSECURITY_QUALITY_OF_SERVICE -!PSID: void +PSECURITY_DESCRIPTOR +!PSECURITY_QUALITY_OF_SERVICE +PSID PSID_IDENTIFIER_AUTHORITY PSINGLE_LIST_ENTRY PSIZE @@ -791,6 +848,7 @@ PTOKEN_PRIVILEGES PTOP_LEVEL_EXCEPTION_FILTER PTSTR PULARGE_INTEGER +PVECTORED_EXCEPTION_HANDLER PVOID PWCH PWSTR @@ -798,6 +856,8 @@ RECT RECTL RTL_CRITICAL_SECTION RTL_CRITICAL_SECTION_DEBUG +RTL_OSVERSIONINFOEXW +RTL_OSVERSIONINFOW RTL_RESOURCE_DEBUG SECURITY_CONTEXT_TRACKING_MODE SECURITY_DESCRIPTOR @@ -829,16 +889,16 @@ TOKEN_USER UCHAR UHALF_PTR UINT -!UINT16 +UINT16 UINT32 -!UINT64 -!UINT8 +UINT64 +UINT8 UINT_PTR -!ULARGE_INTEGER +ULARGE_INTEGER ULONG ULONG32 -!ULONG64 -!ULONGLONG +ULONG64 +ULONGLONG ULONG_PTR USHORT WAITORTIMERCALLBACKFUNC @@ -847,7 +907,7 @@ WORD WPARAM __int16 __int32 -!__int64 +__int64 __int8 %%%dlls/shell32/tests @@ -864,6 +924,7 @@ basetsd.h winnt.h windef.h wtypes.h +guiddef.h shellapi.h shlobj.h @@ -880,52 +941,141 @@ shlobj.h %type -APPBARDATA +APPBARDATA +AUTO_SCROLL_DATA BFFCALLBACK -BROWSEINFOA -BROWSEINFOW +BLOB +!BROWSEINFOA +!BROWSEINFOW +BSTR +BSTRBLOB +BYTE_BLOB +BYTE_SIZEDARR +CABINETSTATE CIDA +CLIPDATA +CLIPFORMAT +CLSID +COAUTHIDENTITY +COAUTHINFO +COSERVERINFO +DATE +DOUBLE DRAGINFOA DRAGINFOW DROPFILES +DWORD_SIZEDARR +FILEDESCRIPTORA +FILEDESCRIPTORW +FILEGROUPDESCRIPTORA +FILEGROUPDESCRIPTORW FILEOP_FLAGS +FLAGGED_BYTE_BLOB +FLAGGED_WORD_BLOB +FMTID +GUID +HMETAFILEPICT +HYPER_SIZEDARR +IFileSystemBindData +IFileSystemBindDataVtbl +IID +IShellChangeNotify IShellIcon ITEMIDLIST -LPBROWSEINFOA -LPBROWSEINFOW +LPBLOB +!LPBROWSEINFOA +!LPBROWSEINFOW +LPBSTR +LPBSTRBLOB +LPCABINETSTATE LPCITEMIDLIST +LPCOLESTR +LPCY +LPDECIMAL LPDRAGINFOA LPDRAGINFOW +LPDROPFILES +LPFILEDESCRIPTORA +LPFILEDESCRIPTORW +LPFILEGROUPDESCRIPTORA +LPFILEGROUPDESCRIPTORW +LPFILESYSTEMBINDDATA +LPGUID LPIDA LPITEMIDLIST +LPOLESTR +LPSHChangeDWORDAsIDList +LPSHChangeProductKeyAsIDList LPSHDESCRIPTIONID -LPSHELLEXECUTEINFOA -LPSHELLEXECUTEINFOW -!LPSHELLFLAGSTATE -# LPSHELLVIEWDATA +!LPSHELLEXECUTEINFOA +!LPSHELLEXECUTEINFOW +LPSHELLFLAGSTATE +LPSHELLSTATE +!LPSHELLVIEWDATA LPSHFILEOPSTRUCTA LPSHFILEOPSTRUCTW LPSHITEMID +LPSHNAMEMAPPINGA +LPSHNAMEMAPPINGW NOTIFYICONDATAA NOTIFYICONDATAW +OLECHAR PAPPBARDATA -PBROWSEINFOA -PBROWSEINFOW +!PBROWSEINFOA +!PBROWSEINFOW PNOTIFYICONDATAA PNOTIFYICONDATAW PRINTEROP_FLAGS +PROPID +RemHBITMAP +RemHENHMETAFILE +RemHGLOBAL +RemHMETAFILEPICT +RemHPALETTE +SCODE +SHChangeDWORDAsIDList +SHChangeNotifyEntry +SHChangeProductKeyAsIDList SHDESCRIPTIONID -SHELLEXECUTEINFOA -SHELLEXECUTEINFOW -!SHELLFLAGSTATE -# SHELLVIEWDATA +!SHELLEXECUTEINFOA +!SHELLEXECUTEINFOW +SHELLFLAGSTATE +SHELLSTATE +!SHELLVIEWDATA SHELLVIEWID -# SHELLVIEWPROC +SHELLVIEWPROC SHFILEINFOA SHFILEINFOW SHFILEOPSTRUCTA SHFILEOPSTRUCTW SHITEMID +SHNAMEMAPPINGA +SHNAMEMAPPINGW +UP_BYTE_BLOB +UP_FLAGGED_BYTE_BLOB +UP_FLAGGED_WORD_BLOB +VARIANT_BOOL +VARTYPE +WORD_SIZEDARR +_VARIANT_BOOL +remoteMETAFILEPICT +rpcLOGPALETTE +userBITMAP +userCLIPFORMAT +userHBITMAP +userHENHMETAFILE +userHGLOBAL +userHMETAFILE +userHMETAFILEPICT +userHPALETTE +wireBSTR +wireCLIPFORMAT +wireHBITMAP +wireHENHMETAFILE +wireHGLOBAL +wireHMETAFILE +wireHMETAFILEPICT +wireHPALETTE %%%dlls/shlwapi/tests @@ -954,10 +1104,10 @@ shlwapi.h %type -!ASSOCF +ASSOCF DLLGETVERSIONPROC DLLVERSIONINFO -!DLLVERSIONINFO2 +DLLVERSIONINFO2 HUSKEY IQueryAssociations PHUSKEY @@ -988,10 +1138,32 @@ urlmon.h BINDINFO IBindHost +IBindHostVtbl IBindStatusCallback +IBindStatusCallbackVtbl IBinding +IBindingVtbl +IInternetProtocolInfo +IInternetProtocolInfoVtbl +IPersistMoniker +IPersistMonikerVtbl IWinInetHttpInfo +IWinInetHttpInfoVtbl IWinInetInfo +IWinInetInfoVtbl +LPBINDHOST +LPBINDING +LPBINDSTATUSCALLBACK +LPIINTERNETPROTOCOLINFO +LPPERSISTMONIKER +LPREMFORMATETC +LPREMSECURITY_ATTRIBUTES +LPWININETHTTPINFO +LPWININETINFO +PREMSECURITY_ATTRIBUTES +REMSECURITY_ATTRIBUTES +RemBINDINFO +RemFORMATETC %%%dlls/user/tests @@ -1038,15 +1210,16 @@ DESKTOPENUMPROCW DLGITEMTEMPLATE DLGPROC DLGTEMPLATE -!DRAWITEMSTRUCT +DRAWITEMSTRUCT DRAWSTATEPROC DRAWTEXTPARAMS EDITWORDBREAKPROCA EDITWORDBREAKPROCW EVENTMSG FILTERKEYS -GUITHREADINFO +FLASHWINFO GRAYSTRINGPROC +GUITHREADINFO HARDWAREHOOKSTRUCT HARDWAREINPUT HDEVNOTIFY @@ -1060,7 +1233,7 @@ HOOKPROC ICONINFO ICONMETRICSA ICONMETRICSW -INPUT +!INPUT KBDLLHOOKSTRUCT KEYBDINPUT LPACCEL @@ -1093,7 +1266,7 @@ LPDRAWITEMSTRUCT LPDRAWTEXTPARAMS LPEVENTMSG LPFILTERKEYS -!LPGUITHREADINFO +LPGUITHREADINFO LPHARDWAREHOOKSTRUCT LPHARDWAREINPUT LPHELPINFO @@ -1103,7 +1276,7 @@ LPHIGHCONTRASTA LPHIGHCONTRASTW LPICONMETRICSA LPICONMETRICSW -LPINPUT +!LPINPUT LPKBDLLHOOKSTRUCT LPKEYBDINPUT LPMDICREATESTRUCTA @@ -1113,7 +1286,7 @@ LPMEASUREITEMSTRUCT LPMENUINFO LPMENUITEMINFOA LPMENUITEMINFOW -LPMENUTEMPLATE +!LPMENUTEMPLATE LPMINIMIZEDMETRICS LPMINMAXINFO LPMONITORINFO @@ -1140,6 +1313,7 @@ LPSOUNDSENTRYA LPSOUNDSENTRYW LPSTICKYKEYS LPSTYLESTRUCT +LPTITLEBARINFO LPTOGGLEKEYS LPTPMPARAMS LPTRACKMOUSEEVENT @@ -1159,7 +1333,7 @@ MENUITEMINFOA MENUITEMINFOW MENUITEMTEMPLATE MENUITEMTEMPLATEHEADER -MENUTEMPLATE +!MENUTEMPLATE MINIMIZEDMETRICS MINMAXINFO MONITORENUMPROC @@ -1195,6 +1369,7 @@ PDLGITEMTEMPLATEA PDLGITEMTEMPLATEW PDRAWITEMSTRUCT PEVENTMSG +PFLASHWINFO PGUITHREADINFO PHARDWAREHOOKSTRUCT PHARDWAREINPUT @@ -1204,7 +1379,7 @@ PHELPWININFOW PICONINFO PICONMETRICSA PICONMETRICSW -PINPUT +!PINPUT PKBDLLHOOKSTRUCT PKEYBDINPUT PMDINEXTMENU @@ -1228,6 +1403,8 @@ PROPENUMPROCA PROPENUMPROCEXA PROPENUMPROCEXW PROPENUMPROCW +PTITLEBARINFO +PUSEROBJECTFLAGS PWINDOWINFO PWINDOWPLACEMENT PWINDOWPOS @@ -1244,11 +1421,13 @@ SOUNDSENTRYW STICKYKEYS STYLESTRUCT TIMERPROC +TITLEBARINFO TOGGLEKEYS TPMPARAMS TRACKMOUSEEVENT -WINDOWINFO: !dwWindowStatus -!WINDOWPLACEMENT +USEROBJECTFLAGS +WINDOWINFO +WINDOWPLACEMENT WINDOWPOS WINEVENTPROC WINSTAENUMPROCA @@ -1285,131 +1464,131 @@ wininet.h %type -!GOPHER_ABSTRACT_ATTRIBUTE_TYPEA -!GOPHER_ABSTRACT_ATTRIBUTE_TYPEW GOPHER_ABSTRACT_ATTRIBUTE_TYPE -!GOPHER_ADMIN_ATTRIBUTE_TYPEA -!GOPHER_ADMIN_ATTRIBUTE_TYPEW +GOPHER_ABSTRACT_ATTRIBUTE_TYPEA +GOPHER_ABSTRACT_ATTRIBUTE_TYPEW GOPHER_ADMIN_ATTRIBUTE_TYPE -!GOPHER_ASK_ATTRIBUTE_TYPEA -!GOPHER_ASK_ATTRIBUTE_TYPEW +GOPHER_ADMIN_ATTRIBUTE_TYPEA +GOPHER_ADMIN_ATTRIBUTE_TYPEW GOPHER_ASK_ATTRIBUTE_TYPE -!GOPHER_ATTRIBUTE_ENUMERATORA -!GOPHER_ATTRIBUTE_ENUMERATORW +GOPHER_ASK_ATTRIBUTE_TYPEA +GOPHER_ASK_ATTRIBUTE_TYPEW GOPHER_ATTRIBUTE_ENUMERATOR +GOPHER_ATTRIBUTE_ENUMERATORA +GOPHER_ATTRIBUTE_ENUMERATORW +GOPHER_ATTRIBUTE_TYPE !GOPHER_ATTRIBUTE_TYPEA !GOPHER_ATTRIBUTE_TYPEW -GOPHER_ATTRIBUTE_TYPE +GOPHER_FIND_DATA GOPHER_FIND_DATAA GOPHER_FIND_DATAW -GOPHER_FIND_DATA GOPHER_GEOGRAPHICAL_LOCATION_ATTRIBUTE_TYPE -!GOPHER_LOCATION_ATTRIBUTE_TYPEA -!GOPHER_LOCATION_ATTRIBUTE_TYPEW GOPHER_LOCATION_ATTRIBUTE_TYPE +GOPHER_LOCATION_ATTRIBUTE_TYPEA +GOPHER_LOCATION_ATTRIBUTE_TYPEW GOPHER_MOD_DATE_ATTRIBUTE_TYPE -!GOPHER_ORGANIZATION_ATTRIBUTE_TYPEA -!GOPHER_ORGANIZATION_ATTRIBUTE_TYPEW GOPHER_ORGANIZATION_ATTRIBUTE_TYPE -!GOPHER_PROVIDER_ATTRIBUTE_TYPEA -!GOPHER_PROVIDER_ATTRIBUTE_TYPEW +GOPHER_ORGANIZATION_ATTRIBUTE_TYPEA +GOPHER_ORGANIZATION_ATTRIBUTE_TYPEW GOPHER_PROVIDER_ATTRIBUTE_TYPE +GOPHER_PROVIDER_ATTRIBUTE_TYPEA +GOPHER_PROVIDER_ATTRIBUTE_TYPEW GOPHER_SCORE_ATTRIBUTE_TYPE GOPHER_SCORE_RANGE_ATTRIBUTE_TYPE -!GOPHER_SITE_ATTRIBUTE_TYPEA -!GOPHER_SITE_ATTRIBUTE_TYPEW GOPHER_SITE_ATTRIBUTE_TYPE +GOPHER_SITE_ATTRIBUTE_TYPEA +GOPHER_SITE_ATTRIBUTE_TYPEW GOPHER_TIMEZONE_ATTRIBUTE_TYPE GOPHER_TTL_ATTRIBUTE_TYPE -!GOPHER_UNKNOWN_ATTRIBUTE_TYPEA -!GOPHER_UNKNOWN_ATTRIBUTE_TYPEW GOPHER_UNKNOWN_ATTRIBUTE_TYPE +GOPHER_UNKNOWN_ATTRIBUTE_TYPEA +GOPHER_UNKNOWN_ATTRIBUTE_TYPEW GOPHER_VERONICA_ATTRIBUTE_TYPE -!GOPHER_VERSION_ATTRIBUTE_TYPEA -!GOPHER_VERSION_ATTRIBUTE_TYPEW GOPHER_VERSION_ATTRIBUTE_TYPE -!GOPHER_VIEW_ATTRIBUTE_TYPEA -!GOPHER_VIEW_ATTRIBUTE_TYPEW +GOPHER_VERSION_ATTRIBUTE_TYPEA +GOPHER_VERSION_ATTRIBUTE_TYPEW GOPHER_VIEW_ATTRIBUTE_TYPE -!GROUPID +GOPHER_VIEW_ATTRIBUTE_TYPEA +GOPHER_VIEW_ATTRIBUTE_TYPEW +GROUPID HINTERNET HTTP_VERSION_INFO INTERNET_ASYNC_RESULT INTERNET_AUTH_NOTIFY_DATA INTERNET_BUFFERSA INTERNET_BUFFERSW -INTERNET_CACHE_ENTRY_INFOA -INTERNET_CACHE_ENTRY_INFOW -!INTERNET_CERTIFICATE_INFOA -!INTERNET_CERTIFICATE_INFOW +!INTERNET_CACHE_ENTRY_INFOA +!INTERNET_CACHE_ENTRY_INFOW INTERNET_CERTIFICATE_INFO +INTERNET_CERTIFICATE_INFOA +INTERNET_CERTIFICATE_INFOW INTERNET_CONNECTED_INFO INTERNET_PORT -!INTERNET_PROXY_INFOA -!INTERNET_PROXY_INFOW INTERNET_PROXY_INFO +INTERNET_PROXY_INFOA +INTERNET_PROXY_INFOW INTERNET_STATUS_CALLBACK INTERNET_VERSION_INFO -!LPGOPHER_ABSTRACT_ATTRIBUTE_TYPEA -!LPGOPHER_ABSTRACT_ATTRIBUTE_TYPEW LPGOPHER_ABSTRACT_ATTRIBUTE_TYPE -!LPGOPHER_ADMIN_ATTRIBUTE_TYPEA -!LPGOPHER_ADMIN_ATTRIBUTE_TYPEW +LPGOPHER_ABSTRACT_ATTRIBUTE_TYPEA +LPGOPHER_ABSTRACT_ATTRIBUTE_TYPEW LPGOPHER_ADMIN_ATTRIBUTE_TYPE -!LPGOPHER_ASK_ATTRIBUTE_TYPEA -!LPGOPHER_ASK_ATTRIBUTE_TYPEW +LPGOPHER_ADMIN_ATTRIBUTE_TYPEA +LPGOPHER_ADMIN_ATTRIBUTE_TYPEW LPGOPHER_ASK_ATTRIBUTE_TYPE +LPGOPHER_ASK_ATTRIBUTE_TYPEA +LPGOPHER_ASK_ATTRIBUTE_TYPEW +LPGOPHER_ATTRIBUTE_TYPE !LPGOPHER_ATTRIBUTE_TYPEA !LPGOPHER_ATTRIBUTE_TYPEW -LPGOPHER_ATTRIBUTE_TYPE LPGOPHER_FIND_DATAA LPGOPHER_FIND_DATAW LPGOPHER_GEOGRAPHICAL_LOCATION_ATTRIBUTE_TYPE -!LPGOPHER_LOCATION_ATTRIBUTE_TYPEA -!LPGOPHER_LOCATION_ATTRIBUTE_TYPEW LPGOPHER_LOCATION_ATTRIBUTE_TYPE +LPGOPHER_LOCATION_ATTRIBUTE_TYPEA +LPGOPHER_LOCATION_ATTRIBUTE_TYPEW LPGOPHER_MOD_DATE_ATTRIBUTE_TYPE -!LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPEA -!LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPEW LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPE -!LPGOPHER_PROVIDER_ATTRIBUTE_TYPEA -!LPGOPHER_PROVIDER_ATTRIBUTE_TYPEW +LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPEA +LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPEW LPGOPHER_PROVIDER_ATTRIBUTE_TYPE +LPGOPHER_PROVIDER_ATTRIBUTE_TYPEA +LPGOPHER_PROVIDER_ATTRIBUTE_TYPEW LPGOPHER_SCORE_ATTRIBUTE_TYPE LPGOPHER_SCORE_RANGE_ATTRIBUTE_TYPE -!LPGOPHER_SITE_ATTRIBUTE_TYPEA -!LPGOPHER_SITE_ATTRIBUTE_TYPEW LPGOPHER_SITE_ATTRIBUTE_TYPE +LPGOPHER_SITE_ATTRIBUTE_TYPEA +LPGOPHER_SITE_ATTRIBUTE_TYPEW LPGOPHER_TIMEZONE_ATTRIBUTE_TYPE LPGOPHER_TTL_ATTRIBUTE_TYPE -!LPGOPHER_UNKNOWN_ATTRIBUTE_TYPEA -!LPGOPHER_UNKNOWN_ATTRIBUTE_TYPEW LPGOPHER_UNKNOWN_ATTRIBUTE_TYPE +LPGOPHER_UNKNOWN_ATTRIBUTE_TYPEA +LPGOPHER_UNKNOWN_ATTRIBUTE_TYPEW LPGOPHER_VERONICA_ATTRIBUTE_TYPE -!LPGOPHER_VERSION_ATTRIBUTE_TYPEA -!LPGOPHER_VERSION_ATTRIBUTE_TYPEW LPGOPHER_VERSION_ATTRIBUTE_TYPE -!LPGOPHER_VIEW_ATTRIBUTE_TYPEA -!LPGOPHER_VIEW_ATTRIBUTE_TYPEW +LPGOPHER_VERSION_ATTRIBUTE_TYPEA +LPGOPHER_VERSION_ATTRIBUTE_TYPEW LPGOPHER_VIEW_ATTRIBUTE_TYPE +LPGOPHER_VIEW_ATTRIBUTE_TYPEA +LPGOPHER_VIEW_ATTRIBUTE_TYPEW LPHINTERNET LPHTTP_VERSION_INFO LPINTERNET_ASYNC_RESULT LPINTERNET_BUFFERSA LPINTERNET_BUFFERSW -LPINTERNET_CACHE_ENTRY_INFOA -LPINTERNET_CACHE_ENTRY_INFOW -!LPINTERNET_CERTIFICATE_INFOA -!LPINTERNET_CERTIFICATE_INFOW +!LPINTERNET_CACHE_ENTRY_INFOA +!LPINTERNET_CACHE_ENTRY_INFOW +LPINTERNET_CERTIFICATE_INFOA +LPINTERNET_CERTIFICATE_INFOW LPINTERNET_CONNECTED_INFO LPINTERNET_PORT -!LPINTERNET_PROXY_INFOA -!LPINTERNET_PROXY_INFOW +LPINTERNET_PROXY_INFOA +LPINTERNET_PROXY_INFOW LPINTERNET_STATUS_CALLBACK LPINTERNET_VERSION_INFO -LPURL_COMPONENTSA -LPURL_COMPONENTSW +LPURL_COMPONENTSA: !INTERNET_SCHEME +LPURL_COMPONENTSW: !INTERNET_SCHEME PFN_AUTH_NOTIFY PFN_DIAL_HANDLER -URL_COMPONENTSA -URL_COMPONENTSW +URL_COMPONENTSA: !INTERNET_SCHEME +URL_COMPONENTSW: !INTERNET_SCHEME diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 6fa839f721e..899540a12c9 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -191,7 +191,7 @@ sub _find_align_kind_size { $align = 4; $kind = "pointer"; $size = 4; - } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char)$/) { + } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char|byte)$/) { $align = 1; $kind = defined($1) ? $1 : "signed"; $size = 1; @@ -216,18 +216,18 @@ sub _find_align_kind_size { $kind = defined($1) ? $1 : "signed"; $size = 8; } elsif (/^(?:double)$/) { - $align = 4; + $align = 8; $kind = "float"; $size = 8; } elsif (/^(?:long\s+double)$/) { $align = 4; $kind = "float"; $size = 12; - } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|MENU|METAFILE|WND)$/) { + } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|RESULT|WND)$/) { $align = 4; $kind = "unsigned"; $size = 4; - } elsif (/^LP(?:CSTR|CWSTR|DWORD|VOID|WSTR)$/) { + } elsif (/^LP(?:BYTE|CSTR|CWSTR|DWORD|STR|VOID|WSTR)$/) { $align = 4; $kind = "pointer"; $size = 4; @@ -235,9 +235,29 @@ sub _find_align_kind_size { $align = 4; $kind = "struct"; $size = 8; - } elsif (/^(?:LARGE_INTEGER)$/) { + } elsif (/^(?:VOID)$/) { + $align = 4; + $kind = "signed"; + $size = 4; + } elsif (/^(?:SHORT)$/) { + $align = 2; + $kind = "unsigned"; + $size = 2; + } elsif (/^(?:BYTE)$/) { + $align = 1; + $kind = "unsigned"; + $size = 1; + } elsif (/^(?:DWORD)$/) { $align = 4; - $kind = "signed"; + $kind = "unsigned"; + $size = 4; + } elsif (/^(?:WORD)$/) { + $align = 2; + $kind = "unsigned"; + $size = 2; + } elsif (/^(?:LARGE_INTEGER)$/) { + $align = 8; + $kind = "union"; $size = 8; } elsif (/^(struct|union)$/) { $kind = $1;