winapi_check: update
Patrik Stridvall
ps at leissner.se
Fri Feb 20 09:53:51 CST 2004
*** winapi_check
* tools/winapi/win16.api,
tools/winapi/win32.api,
tools/winapi_check/winapi_check,
tools/winapi_check/winapi_documentation.pm,
tools/winapi_check/winapi_local.pm,
tools/winapi_check/winapi_parser.pm:
- API files update.
- Minor bug fixes.
---8<---
Index: wine/tools/winapi/win16.api
===================================================================
RCS file: /home/wine/wine/tools/winapi/win16.api,v
retrieving revision 1.9
diff -u -u -r1.9 win16.api
--- wine/tools/winapi/win16.api 8 Aug 2003 21:04:17 -0000 1.9
+++ wine/tools/winapi/win16.api 20 Feb 2004 14:46:30 -0000
@@ -244,6 +244,30 @@
BOOL16
WORD
+%%display.drv
+
+%long
+
+DWORD
+
+%ptr
+
+LPCURSORINFO16
+struct tagCURSORICONINFO *
+
+%str
+
+LPSTR
+
+%void
+
+VOID
+
+%word
+
+BOOL16
+WORD
+
%%gdi.exe
%long
@@ -453,6 +477,40 @@
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
@@ -478,6 +536,24 @@
INT16
UINT16
+%%mouse.drv
+
+%ptr
+
+LPMOUSEINFO
+
+%segptr
+
+FARPROC16
+
+%void
+
+VOID
+
+%word
+
+WORD
+
%%mmsystem.dll
%long
@@ -995,7 +1071,7 @@
INT16
UINT16
-%%system.dll
+%%system.drv
%long
@@ -1133,6 +1209,7 @@
SCROLLINFO *
SEGPTR *
UINT16 *
+VA_LIST16
WINDOWPLACEMENT16 *
WNDCLASS16 *
WNDCLASSEX16 *
@@ -1427,6 +1504,7 @@
LPWSADATA16
ULONG *
char *
+struct WS_in_addr
struct WS_sockaddr *
struct WS_timeval *
ws_fd_set16 *
@@ -1439,10 +1517,6 @@
%str
LPCSTR
-
-%unknown
-
-struct in_addr
%void
Index: wine/tools/winapi/win32.api
===================================================================
RCS file: /home/wine/wine/tools/winapi/win32.api,v
retrieving revision 1.16
diff -u -u -r1.16 win32.api
--- wine/tools/winapi/win32.api 8 Aug 2003 21:04:17 -0000 1.16
+++ wine/tools/winapi/win32.api 20 Feb 2004 14:46:30 -0000
@@ -50,6 +50,8 @@
LPHANDLER_FUNCTION
LPHW_PROFILE_INFOA
LPLONG
+LPQUERY_SERVICE_CONFIGA
+LPQUERY_SERVICE_CONFIGW
LPSECURITY_ATTRIBUTES
LPSERVICE_STATUS
LPSERVICE_TABLE_ENTRYA
@@ -63,6 +65,10 @@
PACTRL_AUDITW *
PBOOL
PDWORD
+PEXPLICIT_ACCESSA
+PEXPLICIT_ACCESSA *
+PEXPLICIT_ACCESSW
+PEXPLICIT_ACCESSW *
PGENERIC_MAPPING
PHANDLE
PHKEY
@@ -72,14 +78,19 @@
PLSA_TRANSLATED_NAME *
PLSA_UNICODE_STRING
PLUID
+POBJECT_TYPE_LIST
PPRIVILEGE_SET
PSECURITY_DESCRIPTOR
+PSECURITY_DESCRIPTOR *
PSECURITY_DESCRIPTOR_CONTROL
PSID
PSID *
PSID_IDENTIFIER_AUTHORITY
PSID_NAME_USE
+PTRUSTEEA
+PTRUSTEEW
PUCHAR
+PULONG
PVOID
PVOID *
PVALENTA
@@ -92,6 +103,10 @@
LPCSTR
LPSTR
+%void
+
+VOID
+
%wstr
LPCWSTR
@@ -173,7 +188,6 @@
%long
BOOL
-DWORD
HFCI
HFDI
HRESULT
@@ -185,6 +199,7 @@
%ptr
DLLVERSIONINFO *
+EXTRACTdest *
PCCAB
PERF
PFDICABINETINFO
@@ -217,6 +232,34 @@
LPCSTR
+%%capi2032.dll
+
+%long
+
+DWORD
+
+%ptr
+
+DWORD *
+PVOID
+PVOID *
+char *
+
+%%cfgmgr32.dll
+
+%long
+
+CONFIGRET
+ULONG
+
+%ptr
+
+PCHAR
+
+%str
+
+PCSTR
+
%%comcat.dll
%long
@@ -234,7 +277,6 @@
%long
BOOL
-CHAR
COLORREF
DWORD
DWORD_PTR
@@ -252,6 +294,7 @@
HWND
INT
LANGID
+LONG
LPARAM
LRESULT
UINT
@@ -267,16 +310,13 @@
%ptr
DLLVERSIONINFO *
-DPAENUMPROC
DPALOADPROC
-DSAENUMPROC
DWORD_PTR *
HDPA *
IMAGEINFO *
IMAGELISTDRAWPARAMS *
INT *
IStream *
-LPCOLDTBBUTTON
LPCOLORMAP
LPCPROPSHEETHEADERA
LPCPROPSHEETHEADERW
@@ -296,9 +336,10 @@
LPVOID
LPWSTR *
PFNDPACOMPARE
+PFNDPAENUMCALLBACK
PFNDPAMERGE
+PFNDSAENUMCALLBACK
POINT *
-RECT *
SMOOTHSCROLLSTRUCT *
SUBCLASSPROC
TRACKMOUSEEVENT *
@@ -387,9 +428,13 @@
%ptr
BYTE *
+CRYPTPROTECT_PROMPTSTRUCT *
+DATA_BLOB *
DWORD *
GUID *
PCCERT_CONTEXT
+PCCRL_CONTEXT
+PVOID
SIP_ADD_NEWPROVIDER *
SIP_DISPATCH_INFO *
void *
@@ -646,6 +691,16 @@
REFCLSID
REFIID
+%%dmusic32.dll
+
+%long
+
+HRESULT
+
+%ptr
+
+LPVOID
+
%%dplayx.dll
%long
@@ -675,7 +730,7 @@
%ptr
-LPVOID
+LPVOID *
REFCLSID
REFIID
@@ -701,6 +756,18 @@
REFCLSID
REFIID
+%%dswave
+
+%long
+
+HRESULT
+
+%ptr
+
+REFCLSID
+REFIID
+LPVOID *
+
%%gdi32.dll
%long
@@ -762,6 +829,8 @@
GCP_RESULTSW *
GOBJENUMPROC
HANDLETABLE *
+ICMENUMPROCA
+ICMENUMPROCW
INT *
LINEDDAPROC
LOGBRUSH *
@@ -823,7 +892,6 @@
%ptr --extension
-DC *
FARPROC16
%str
@@ -855,6 +923,44 @@
char *
void *
+%void
+
+void
+
+%%glut32.dll
+
+%double
+
+double
+
+%float
+
+float
+
+%long
+
+int
+unsigned int
+
+%ptr
+
+void *
+void **
+
+%void
+
+void
+
+%%iccvid.dll
+
+%long
+
+DWORD
+HDRVR
+LONG
+LRESULT
+UINT
+
%%icmp.dll
%long
@@ -870,6 +976,19 @@
LPVOID
PIP_OPTION_INFORMATION
+%%ifsmgr.vxd
+
+%long
+
+BOOL
+DWORD
+
+%ptr
+
+LPDWORD
+LPOVERLAPPED
+LPVOID
+
%%imaadp32.acm
%long
@@ -885,22 +1004,21 @@
%long
BOOL
-BOOLEAN
DWORD
HANDLE
HMODULE
ULONG
-USHORT
WORD
%ptr
DIGEST_FUNCTION
DIGEST_HANDLE
+LPAPI_VERSION
LPDWORD
+LPSTACKFRAME
LPSYSTEMTIME
LPVOID
-PAPI_VERSION
PCHAR
PCHAR *
PDWORD
@@ -913,16 +1031,12 @@
PIMAGE_DEBUG_INFORMATION
PIMAGE_LOAD_CONFIG_DIRECTORY
PIMAGE_NT_HEADERS
-PIMAGE_SECTION_HEADER
-PIMAGE_SECTION_HEADER *
PLOADED_IMAGE
PREAD_PROCESS_MEMORY_ROUTINE
-PSTACKFRAME
PSYMBOL_REGISTERED_CALLBACK
PSYM_ENUMMODULES_CALLBACK
PSYM_ENUMSYMBOLS_CALLBACK
PTRANSLATE_ADDRESS_ROUTINE
-PULONG
PVOID
PWIN_CERTIFICATE
ULONG *
@@ -987,6 +1101,7 @@
BOOL
DWORD
+HANDLE
IPAddr
IPMask
UINT
@@ -1009,17 +1124,23 @@
PMIB_ICMP
PMIB_IFROW
PMIB_IFTABLE
+PMIB_IFTABLE *
PMIB_IPADDRTABLE
+PMIB_IPADDRTABLE *
PMIB_IPFORWARDROW
PMIB_IPFORWARDTABLE
+PMIB_IPFORWARDTABLE *
PMIB_IPNETROW
PMIB_IPNETTABLE
+PMIB_IPNETTABLE *
PMIB_IPSTATS
PMIB_TCPROW
PMIB_TCPSTATS
PMIB_TCPTABLE
+PMIB_TCPTABLE *
PMIB_UDPSTATS
PMIB_UDPTABLE
+PMIB_UDPTABLE *
PULONG
%wstr
@@ -1047,6 +1168,8 @@
COORD
DWORD
EXECUTION_STATE
+GEOCLASS
+GEOID
HANDLE
HFILE
HGLOBAL
@@ -1056,6 +1179,7 @@
HRSRC
INT
LANGID
+LATENCY_TIME
LCID
LCTYPE
LONG
@@ -1066,7 +1190,6 @@
WORD
WOW_HANDLE_TYPE
int
-unsigned char
%long --extension
@@ -1121,15 +1244,20 @@
FILETIME *
FINDEX_INFO_LEVELS
FINDEX_SEARCH_OPS
+GEO_ENUMPROC
GET_FILEEX_INFO_LEVELS
+GUID *
HANDLE *
INPUT_RECORD *
+LANGGROUPLOCALE_ENUMPROCA
+LANGGROUPLOCALE_ENUMPROCW
LANGUAGEGROUP_ENUMPROCA
LANGUAGEGROUP_ENUMPROCW
LARGE_INTEGER *
LOCALE_ENUMPROCA
LOCALE_ENUMPROCW
LONG *
+LGRPID
LPBOOL
LPBYTE
LPCHAR_INFO
@@ -1140,12 +1268,15 @@
LPCONSOLE_CURSOR_INFO
LPCONSOLE_SCREEN_BUFFER_INFO
LPCPINFO
+LPCPINFOEXA
+LPCPINFOEXW
LPCVOID
LPDCB
LPDEBUG_EVENT
LPDWORD
LPFIBER_START_ROUTINE
LPFILETIME
+LPHEAPLIST32
LPINPUT_RECORD
LPLDT_ENTRY
LPMEMORYSTATUS
@@ -1176,7 +1307,6 @@
LPVOID *
LPWORD
LPWSTR *
-MEMMANINFO *
NUMBERFMTA *
NUMBERFMTW *
OFSTRUCT *
@@ -1188,6 +1318,7 @@
PEXCEPTION_POINTERS
PHANDLE
PHANDLER_ROUTINE
+PIO_COUNTERS
PLARGE_INTEGER
PLONG
PMEMORY_BASIC_INFORMATION
@@ -1330,6 +1461,32 @@
LONG
UINT
+%%mmdevldr.vxd
+
+%long
+
+BOOL
+DWORD
+
+%ptr
+
+LPDWORD
+LPOVERLAPPED
+LPVOID
+
+%%monodebg.vxd
+
+%long
+
+BOOL
+DWORD
+
+%ptr
+
+LPDWORD
+LPOVERLAPPED
+LPVOID
+
%%mpr.dll
%long
@@ -1486,13 +1643,71 @@
LRESULT
UINT
+%%mshtml
+
+%long
+
+BOOL
+HINSTANCE
+HRESULT
+INT
+
+%ptr
+
+LPVOID *
+REFCLSID
+REFIID
+
+%str
+
+LPCSTR
+
+%%msi.dll
+
+%long
+
+BOOL
+DWORD
+HRESULT
+INSTALLSTATE
+INSTALLUILEVEL
+LANGID
+MSICOLINFO
+MSIHANDLE
+UINT
+int
+unsigned int
+
+%ptr
+
+BYTE *
+DLLVERSIONINFO *
+DWORD *
+FILETIME *
+HWND *
+INSTALLSTATE *
+INT *
+MSIHANDLE *
+PCCERT_CONTEXT *
+UINT *
+char *
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
%%msimg32.dll
%long
BOOL
HDC
-UINT
int
%ptr
@@ -1556,17 +1771,15 @@
long
unsigned int
unsigned long
+unsigned short int
%longlong
-LONGLONG
-ULONGLONG
__int64
+unsigned __int64
%ptr
-EXCEPTION_FRAME *
-EXCEPTION_FRAME **
MSVCRT_EXCEPTION_FRAME *
MSVCRT_FILE *
MSVCRT_exception *
@@ -1582,8 +1795,8 @@
MSVCRT_wchar_t ***
MSVCRT_wint_t
PCONTEXT
-PEXCEPTION_FRAME
-PEXCEPTION_FRAME *
+PEXCEPTION_REGISTRATION_RECORD
+PEXCEPTION_REGISTRATION_RECORD *
PEXCEPTION_POINTERS
PEXCEPTION_RECORD
WCHAR **
@@ -1603,11 +1816,13 @@
struct MSVCRT_tm *
struct _diskfree_t *
struct _finddata_t *
+struct _finddatai64_t *
struct _stat *
struct _stati64 *
struct _timeb *
struct _utimbuf *
struct _wfinddata_t *
+struct _wfinddatai64_t *
terminate_function
type_info *
unexpected_function
@@ -1640,6 +1855,7 @@
%ptr
+int *
void *
%%msvcrt20.dll
@@ -1704,10 +1920,21 @@
LPCWSTR
+%%msvidc32.dll
+
+%long
+
+DWORD
+HDRVR
+LONG
+LRESULT
+UINT
+
%%mswsock.dll
%long
+BOOL
DWORD
HANDLE
SOCKET
@@ -1727,9 +1954,9 @@
%long
-BOOL
DWORD
NET_API_STATUS
+UCHAR
%ptr
@@ -1741,6 +1968,7 @@
LPWSTR *
PBROWSER_EMULATED_DOMAIN *
PBYTE *
+PDWORD
PNCB
PVOID *
@@ -1749,6 +1977,28 @@
LPCWSTR
LPWSTR
+%%newdev.dll
+
+%long
+
+BOOL
+DWORD
+HWND
+
+%ptr
+
+LPGUID
+PBOOL
+PDWORD
+
+%str
+
+LPCSTR
+
+%wstr
+
+LPCWSTR
+
%%ntdll.dll
%double
@@ -1758,6 +2008,7 @@
%long
ACCESS_MASK
+ACL_INFORMATION_CLASS
BOOL
BOOLEAN
BYTE
@@ -1790,6 +2041,7 @@
ULONG
WCHAR
WORD
+enum loadorder_type
int
long
unsigned int
@@ -1805,21 +2057,24 @@
%longlong
+DWORDLONG
LONGLONG
ULONGLONG
%ptr
+ANSI_STRING *
BOOLEAN *
CONTEXT *
-CONTEXT86 *
CLIENT_ID *
CURDIR *
DOS_PATHNAME_TYPE
DWORD *
-EXCEPTION_FRAME *
EXCEPTION_RECORD *
+EXCEPTION_REGISTRATION_RECORD *
+EXCEPTION_REGISTRATION_RECORD **
GENERIC_MAPPING *
+GUID *
HANDLE *
HANDLERPROC
HMODULE *
@@ -1861,7 +2116,6 @@
PCRTL_BITMAP
PCSZ
PDWORD
-PEXCEPTION_FRAME
PEXCEPTION_RECORD
PGENERIC_MAPPING
PHANDLE
@@ -1884,6 +2138,7 @@
PRTL_BITMAP
PRTL_BITMAP_RUN
PRTL_HEAP_DEFINITION
+PRTL_USER_PROCESS_PARAMETERS
PSECURITY_DESCRIPTOR
PSECURITY_DESCRIPTOR_CONTROL
PSID
@@ -1891,17 +2146,24 @@
PSID_IDENTIFIER_AUTHORITY
PSTRING
PSYSTEM_MODULE_INFORMATION
+PRTL_THREAD_START_ROUTINE
PTIMERAPCROUTINE
PTIME_FIELDS
PTOKEN_PRIVILEGES
PULONG
PUNICODE_STRING
+PVECTORED_EXCEPTION_HANDLER
PVOID
PVOID *
PWSTR *
RTL_CRITICAL_SECTION *
+RTL_USER_PROCESS_PARAMETERS *
+RTL_USER_PROCESS_PARAMETERS **
+RTL_OSVERSIONINFOEXW *
+SECURITY_DESCRIPTOR *
SIZE_T *
STRING *
+TEB *
TIME_ZONE_INFORMATION *
UINT *
ULONG *
@@ -1910,7 +2172,6 @@
UNICODE_STRING *
VOID *
WCHAR **
-struct _TEB *
union cptable *
void *
void **
@@ -2029,7 +2290,6 @@
LPENUMFORMATETC *
LPENUMOLEVERB *
LPFORMATETC
-LPGUID
LPLOCKBYTES *
LPMALLOC *
LPMALLOCSPY
@@ -2082,11 +2342,27 @@
VOID
void
+%%oleacc.dll
+
+%long
+
+HRESULT
+HWND
+LONG
+
+%ptr
+
+REFIID
+void **
+
%%oleaut32.dll
+%float
+
+float
+
%double
-CY
DATE
double
@@ -2109,6 +2385,7 @@
LONG
OLE_COLOR
REGKIND
+SHORT
SYSKIND
UINT
ULONG
@@ -2122,6 +2399,12 @@
unsigned int
unsigned long
+%longlong
+
+CY
+LONG64
+ULONG64
+
%ptr
BSTR *
@@ -2133,9 +2416,10 @@
DISPID *
DISPPARAMS *
EXCEPINFO *
-FLOAT *
+GUID *
ICreateTypeLib **
-IID *
+ICreateTypeLib2 **
+IDispatch *
INTERFACEDATA *
IRecordInfo *
IRecordInfo **
@@ -2146,6 +2430,7 @@
IUnknown *
IUnknown **
LONG *
+LONG64 *
LPBSTR
LPBYTE
LPCLSID
@@ -2169,9 +2454,11 @@
SAFEARRAY *
SAFEARRAY **
SAFEARRAYBOUND *
+SHORT *
UDATE *
UINT *
ULONG *
+ULONG64 *
USHORT *
VARIANT *
VARIANTARG *
@@ -2180,8 +2467,8 @@
VARTYPE *
VOID *
double *
+float *
int *
-short *
signed char *
void *
void **
@@ -2352,7 +2639,6 @@
GLvoid **
LPGLYPHMETRICSFLOAT
LPLAYERPLANEDESCRIPTOR
-char *
void *
%str
@@ -2536,6 +2822,35 @@
void
+%%rsabase.dll
+
+%long
+
+ALG_ID
+BOOL
+DWORD
+HCRYPTHASH
+HCRYPTKEY
+HCRYPTPROV
+HRESULT
+
+%ptr
+
+BYTE *
+DWORD *
+HCRYPTHASH *
+HCRYPTKEY *
+HCRYPTPROV *
+
+%str
+
+LPSTR
+PVTableProvStruc
+
+%wstr
+
+LPCWSTR
+
%%serialui.dll
%long
@@ -2570,6 +2885,7 @@
HWND
INT
LONG
+REGSAM
UINT
%long --ptr
@@ -2579,22 +2895,28 @@
%ptr
BYTE *
-DWORD *
GUID *
INFCONTEXT *
-INT *
+LPDWORD
+LPCVOID
LPGUID
PBYTE
PDWORD
+PINFCONTEXT
+PINT
PSP_DEVICE_INTERFACE_DATA
-PSP_DEVICE_INTERFACE_DETAIL_DATAA
-PSP_DEVICE_INTERFACE_DETAIL_DATAW
+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_FILE_CALLBACK_A
PSP_FILE_CALLBACK_W
PSP_FILE_COPY_PARAMS_A
PSP_FILE_COPY_PARAMS_W
+PSP_INF_INFORMATION
PSTR
+PSTR *
PUINT
PVOID
UINT *
@@ -2603,7 +2925,6 @@
%str
LPCSTR
-LPSTR
PCSTR
%void
@@ -2657,6 +2978,7 @@
INT
LONG
LRESULT
+RESTRICTIONS
UINT
ULONG
WORD
@@ -2669,6 +2991,7 @@
%ptr
+AUTO_SCROLL_DATA *
CABINETSTATE *
CLSID *
DLLVERSIONINFO *
@@ -2678,6 +3001,7 @@
HICON *
HIMAGELIST *
HWND *
+IShellFolder *
IShellFolder **
IStream *
ITEMIDLIST *
@@ -2686,7 +3010,6 @@
LPBYTE
LPCITEMIDLIST
LPCITEMIDLIST *
-LPCNOTIFYREGISTER
LPCRECT
LPCSHELLFOLDERVIEWINFO
LPCVOID
@@ -2707,7 +3030,6 @@
LPMALLOC *
LPMEASUREITEMSTRUCT
LPPOINT
-LPSCROLLSAMPLES
LPSECURITY_ATTRIBUTES
LPSHELLEXECUTEINFOA
LPSHELLEXECUTEINFOW
@@ -2732,9 +3054,9 @@
POINT *
REFCLSID
REFIID
+SHChangeNotifyEntry *
SHFILEINFOA *
SHFILEINFOW *
-UINT *
int *
%str
@@ -2800,6 +3122,7 @@
%ptr
BOOL *
+BSTR *
CLSID *
DLLVERSIONINFO *
DWORD *
@@ -2859,6 +3182,7 @@
REFGUID
REFIID
SHFILEINFOW *
+STRRET *
UINT *
ULARGE_INTEGER *
VARIANT *
@@ -2967,20 +3291,19 @@
%long
BOOL
-CHAR
COLORREF
DWORD
HBITMAP
HDC
HFONT
+HKL
HRGN
HWND
INT
-INT16
LONG
+SHORT
UINT
-UINT16
-WORD
+WCHAR
int
%ptr
@@ -2988,7 +3311,7 @@
BITMAPINFO *
CREATESTRUCTA *
DC *
-DEVMODEA *
+DEVMODEW *
DWORD *
INT *
LPBYTE
@@ -3009,7 +3332,6 @@
%str
LPCSTR
-LPSTR
%void
@@ -3199,6 +3521,7 @@
PCONVINFO
PCURSORINFO
PDWORD_PTR
+PFLASHWINFO
PFNCALLBACK
PICONINFO
POINT *
@@ -3250,6 +3573,73 @@
LPCWSTR
LPWSTR
+%%uxtheme.dll
+
+%long
+
+BOOL
+COLORREF
+DWORD
+HBRUSH
+HDC
+HIMAGELIST
+HRESULT
+HRGN
+HTHEME
+HTHEMEFILE
+HWND
+THEMESIZE
+UINT
+int
+
+%longlong
+
+POINT
+
+%ptr
+
+BOOL *
+COLORREF *
+DTBGOPTS *
+EnumThemeProc
+HRGN *
+HTHEMEFILE *
+INTLIST *
+LOGFONTW *
+LPVOID
+MARGINS *
+POINT *
+PROPERTYORIGIN *
+ParseThemeIniFileProc
+RECT *
+SIZE *
+TEXTMETRICW *
+WORD *
+char *
+int *
+
+%void
+
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%vdhcp.vxd
+
+%long
+
+BOOL
+DWORD
+
+%ptr
+
+LPDWORD
+LPOVERLAPPED
+LPVOID
+
%%version.dll
%long
@@ -3275,6 +3665,58 @@
LPCWSTR
LPWSTR
+%%vnb.vxd
+
+%long
+
+BOOL
+DWORD
+
+%ptr
+
+LPDWORD
+LPOVERLAPPED
+LPVOID
+
+%%vnetbios.vxd
+
+%long
+
+BOOL
+DWORD
+
+%ptr
+
+LPDWORD
+LPOVERLAPPED
+LPVOID
+
+%%vtdapi.vxd
+
+%long
+
+BOOL
+DWORD
+
+%ptr
+
+LPDWORD
+LPOVERLAPPED
+LPVOID
+
+%%vwin32.vxd
+
+%long
+
+BOOL
+DWORD
+
+%ptr
+
+LPDWORD
+LPOVERLAPPED
+LPVOID
+
%%w32skrnl.dll
%long
@@ -3315,19 +3757,23 @@
UINT
WORD
-%%winedos.dll
+%%wined3d.dll
%long
-BOOL
-BYTE
-DWORD
UINT
-int
%ptr
-DWORD *
+IDirect3DImpl *
+
+%%winedos.dll
+
+%long
+
+BYTE
+DWORD
+int
%str
@@ -3400,10 +3846,10 @@
BITMAPINFO *
DC *
-DEVICEFONTENUMPROC
-DEVMODEA *
+DEVMODEW *
DOCINFOA *
DWORD *
+FONTENUMPROCW
INT *
LPCVOID
LPDEVMODEA
@@ -3425,7 +3871,7 @@
%void
-VOID
+void
%wstr
@@ -3447,9 +3893,12 @@
HRESULT
HWND
INTERNET_PORT
+LONG
%ptr
+GOPHER_ATTRIBUTE_ENUMERATORA
+GOPHER_ATTRIBUTE_ENUMERATORW
HANDLE *
INTERNET_STATUS_CALLBACK
LPBYTE
@@ -3457,6 +3906,8 @@
LPCVOID
LPCWSTR *
LPDWORD
+LPGOPHER_FIND_DATAA
+LPGOPHER_FIND_DATAW
LPINTERNET_BUFFERSA
LPINTERNET_BUFFERSW
LPINTERNET_CACHE_ENTRY_INFOA
@@ -3467,6 +3918,7 @@
LPVOID *
LPWIN32_FIND_DATAA
LPWIN32_FIND_DATAW
+PVOID
%str
@@ -3502,9 +3954,16 @@
LONG
LPARAM
LRESULT
+MCIERROR
+MCIDEVICEID
MMRESULT
UINT
+%long --ptr
+
+DWORD_PTR
+UINT_PTR
+
%long --forbidden
HMMIO16
@@ -3514,12 +3973,10 @@
DWORD *
HMIDIIN *
-HMIDIOUT *
HMIDISTRM *
HPCSTR
HPSTR
HWAVEIN *
-HWAVEOUT *
LPAUXCAPSA
LPAUXCAPSW
LPBYTE
@@ -3532,6 +3989,7 @@
LPMIDIHDR
LPMIDIINCAPSA
LPMIDIINCAPSW
+LPHMIDIOUT
LPMIDIOUTCAPSA
LPMIDIOUTCAPSW
LPMIXERCAPSA
@@ -3551,6 +4009,7 @@
LPWAVEHDR
LPWAVEINCAPSA
LPWAVEINCAPSW
+LPHWAVEOUT
LPWAVEOUTCAPSA
LPWAVEOUTCAPSW
MIDIHDR *
@@ -3594,6 +4053,8 @@
LPPRINTER_DEFAULTSA
LPPRINTER_DEFAULTSW
LPVOID
+PBYTE
+PDWORD
%str
@@ -3693,6 +4154,7 @@
LPGUID
LPINT
LPQOS
+LPSOCKADDR
LPVOID
LPWPUPOSTMESSAGE
LPWSABUF
@@ -3713,6 +4175,7 @@
struct WS_sockaddr *
struct WS_timeval *
u_long *
+u_short *
%str
@@ -3771,7 +4234,6 @@
%long
BOOL
-CHAR
COLORREF
DWORD
HANDLE
@@ -3781,6 +4243,7 @@
HDC
HFONT
HICON
+HKL
HPALETTE
HPEN
HRGN
@@ -3788,8 +4251,9 @@
INT
LONG
LPARAM
+SHORT
UINT
-WORD
+WCHAR
WPARAM
int
@@ -3800,11 +4264,12 @@
CREATESTRUCTA *
CURSORICONINFO *
DC *
-DEVICEFONTENUMPROC
-DEVMODEA *
+DEVMODEW *
DWORD *
+FONTENUMPROCW
HANDLE *
HANDLE16 *
+HKL *
INT *
LPBYTE
LPCVOID
@@ -3817,6 +4282,7 @@
LPSIZE
LPVOID
LPVOID *
+LPWTPACKET *
PIXELFORMATDESCRIPTOR *
POINT *
RECT *
Index: wine/tools/winapi_check/winapi_check
===================================================================
RCS file: /home/wine/wine/tools/winapi_check/winapi_check,v
retrieving revision 1.64
diff -u -u -r1.64 winapi_check
--- wine/tools/winapi_check/winapi_check 28 Oct 2003 21:45:30 -0000 1.64
+++ wine/tools/winapi_check/winapi_check 20 Feb 2004 14:46:30 -0000
@@ -538,9 +538,10 @@
} else {
$include = "$header";
}
- } elsif($header =~ /^(?:\.\.\/kernel\/(kernel_private\.h))$/) { # FIXME: Kludge
- my $header2 = $1;
- $include = "dlls/kernel/$header2";
+ } elsif($header =~ /^(?:kernel_private\.h)$/) { # FIXME: Kludge
+ $include = "dlls/kernel/$header";
+ } elsif($header =~ /^(?:gdi_private\.h)$/) { # FIXME: Kludge
+ $include = "dlls/gdi/$header";
} elsif($header =~ /^(?:ntdll_misc\.h)$/) { # FIXME: Kludge
$include = "dlls/ntdll/$header";
} elsif($header =~ /^(?:controls\.h|message\.h)$/) { # FIXME: Kludge
@@ -618,10 +619,14 @@
$include2info{$name}{used}++;
}
}
- } elsif($header =~ /^(?:\.\.\/kernel\/(kernel_private\.h))$/) { # FIXME: Kludge
- my $header2 = $1;
- $include2info{"dlls/kernel/$header2"}{used}++;
- foreach my $name (keys(%{$include2info{"dlls/kernel/$header2"}{includes}})) {
+ } elsif($header =~ /^(?:kernel_private\.h)$/) { # FIXME: Kludge
+ $include2info{"dlls/kernel/$header"}{used}++;
+ foreach my $name (keys(%{$include2info{"dlls/kernel/$header"}{includes}})) {
+ $include2info{$name}{used}++;
+ }
+ } elsif($header =~ /^(?:gdi_private\.h)$/) { # FIXME: Kludge
+ $include2info{"dlls/gdi/$header"}{used}++;
+ foreach my $name (keys(%{$include2info{"dlls/gdi/$header"}{includes}})) {
$include2info{$name}{used}++;
}
} elsif($header =~ /^(?:ntdll_misc\.h)$/) { # FIXME: Kludge
@@ -629,7 +634,6 @@
foreach my $name (keys(%{$include2info{"dlls/ntdll/$header"}{includes}})) {
$include2info{$name}{used}++;
}
-
} elsif($header =~ /^(?:controls\.h|message\.h)$/) { # FIXME: Kludge
$include2info{"dlls/user/$header"}{used}++;
foreach my $name (keys(%{$include2info{"dlls/user/$header"}{includes}})) {
Index: wine/tools/winapi_check/winapi_documentation.pm
===================================================================
RCS file: /home/wine/wine/tools/winapi_check/winapi_documentation.pm,v
retrieving revision 1.17
diff -u -u -r1.17 winapi_documentation.pm
--- wine/tools/winapi_check/winapi_documentation.pm 8 Aug 2003 21:04:17 -0000 1.17
+++ wine/tools/winapi_check/winapi_documentation.pm 20 Feb 2004 14:46:30 -0000
@@ -125,13 +125,20 @@
if(!$documentation_error && $options->documentation_wrong) {
foreach (split(/\n/, $documentation)) {
- if(/^\s*\*\s*(\S+)\s*[\(\[]\s*(\w+)\s*\.\s*([^\s\)\]]*)\s*[\)\]].*?$/) {
+ if (/^\s*\*\s*(\S+)\s*[\(\[]\s*(\w+(?:\.(?:DRV|VXD))?)\s*\.\s*([^\s\)\]]*)\s*[\)\]].*?$/) {
my $external_name = $1;
my $module = $2;
my $ordinal = $3;
- if(!$options->documentation_pedantic && $ordinal ne "@") {
+ if ($ordinal eq "@") {
+ # Nothing
+ } elsif ($ordinal =~ /^\d+$/) {
$ordinal = int($ordinal);
+ } elsif ($ordinal eq "init") {
+ $ordinal = 0;
+ } else {
+ $output->write("documentation: $external_name (\U$module\E.$ordinal) wrong\n");
+ next;
}
my $found = 0;
@@ -156,7 +163,8 @@
}
- if(!$found) {
+
+ if (!$found && $external_name ne "DllMain" && $ordinal !~ /^0$/) {
$output->write("documentation: $external_name (\U$module\E.$ordinal) wrong\n");
}
}
Index: wine/tools/winapi_check/winapi_local.pm
===================================================================
RCS file: /home/wine/wine/tools/winapi_check/winapi_local.pm,v
retrieving revision 1.35
diff -u -u -r1.35 winapi_local.pm
--- wine/tools/winapi_check/winapi_local.pm 2 Jan 2003 19:26:11 -0000 1.35
+++ wine/tools/winapi_check/winapi_local.pm 20 Feb 2004 14:46:31 -0000
@@ -147,7 +147,7 @@
}
}
- my $declared_calling_convention = $winapi->function_internal_calling_convention($internal_name);
+ my $declared_calling_convention = $winapi->function_internal_calling_convention($internal_name) || "";
my @declared_argument_kinds = split(/\s+/, $winapi->function_internal_arguments($internal_name));
my $declared_register = 0;
@@ -171,16 +171,22 @@
}
if($declared_calling_convention eq "varargs") {
- if($#argument_types != -1 && $argument_types[$#argument_types] eq "...") {
+ if ($#argument_types != -1 &&
+ (($winapi->name eq "win32" && $argument_types[$#argument_types] eq "...") ||
+ ($winapi->name eq "win16" && $argument_types[$#argument_types] eq "VA_LIST16")))
+ {
pop @argument_types;
} else {
- $output->write("function not implemented as vararg\n");
+ $output->write("function not implemented as varargs\n");
}
- } elsif($#argument_types != -1 && $argument_types[$#argument_types] eq "...") {
- if($#argument_types == 0 || $winapi->name eq "win16") {
+ } elsif ($#argument_types != -1 &&
+ (($winapi->name eq "win32" && $argument_types[$#argument_types] eq "...") ||
+ ($winapi->name eq "win16" && $argument_types[$#argument_types] eq "VA_LIST16")))
+ {
+ if($#argument_types == 0) {
pop @argument_types;
} else {
- $output->write("function not declared as vararg\n");
+ $output->write("function not declared as varargs\n");
}
}
Index: wine/tools/winapi_check/winapi_parser.pm
===================================================================
RCS file: /home/wine/wine/tools/winapi_check/winapi_parser.pm,v
retrieving revision 1.35
diff -u -u -r1.35 winapi_parser.pm
--- wine/tools/winapi_check/winapi_parser.pm 8 Aug 2003 21:04:17 -0000 1.35
+++ wine/tools/winapi_check/winapi_parser.pm 20 Feb 2004 14:46:31 -0000
@@ -499,20 +499,29 @@
my @arguments32 = ("HWAVEOUT", $4);
&$function_begin($documentation_line, $documentation,
$function_line, "", "UINT16", "WINAPI", "waveOut" . $2 . "16", \@arguments16);
- &$function_end($., "");
+ &$function_end($function_line, "");
&$function_begin($documentation_line, $documentation,
$function_line, "", "UINT", "WINAPI", "waveOut" . $2, \@arguments32);
- &$function_end($., "");
+ &$function_end($function_line, "");
} elsif($1 eq 2) {
my @arguments16 = ("UINT16", $4);
my @arguments32 = ("UINT", $4);
&$function_begin($documentation_line, $documentation,
$function_line, "", "UINT16", "WINAPI", "waveOut". $2 . "16", \@arguments16);
- &$function_end($., "");
+ &$function_end($function_line, "");
&$function_begin($documentation_line, $documentation,
$function_line, "", "UINT", "WINAPI", "waveOut" . $2, \@arguments32);
- &$function_end($., "");
+ &$function_end($function_line, "");
}
+ } elsif(/DEFINE_THISCALL_WRAPPER\((\S*)\)/s) {
+ my @lines = split(/\n/, $&);
+ my $function_line = $. - scalar(@lines) + 1;
+
+ $_ = $'; $again = 1;
+
+ &$function_begin($documentation_line, $documentation,
+ $function_line, "", "void", "", "__thiscall_" . $1, \());
+ &$function_end($function_line, "");
} elsif(/DEFINE_REGS_ENTRYPOINT_\d+\(\s*(\S*)\s*,\s*([^\s,\)]*).*?\)/s) {
$_ = $'; $again = 1;
$regs_entrypoints{$2} = $1;
More information about the wine-patches
mailing list