- Added support for %struct16 (used by CLSID).

tools/winapi/win32.api

@@ -218,7 +218,6 @@ LPRECT
 LPSCROLLINFO
 LPSTR *
 LPSTREAM
-LPUINT
 LPVOID
 LPWSTR *
 PFNDPACOMPARE
@@ -227,6 +226,7 @@ POINT *
 RECT *
 SMOOTHSCROLLSTRUCT *
 TRACKMOUSEEVENT *
+UINT *
 
 %str
 
@@ -305,6 +305,7 @@ void
 
 BOOL
 DWORD
+HANDLE
 
 %ptr
 
@@ -753,6 +754,7 @@ LANGID
 LCID
 LCTYPE
 LONG
+SIZE_T
 UINT
 WCHAR
 WORD
@@ -798,6 +800,7 @@ CURRENCYFMTA *
 CURRENCYFMTW *
 DATEFMT_ENUMPROCA
 DATEFMT_ENUMPROCW
+DOS_DEVICE *
 DWORD *
 ENUMRESLANGPROCA
 ENUMRESLANGPROCW
@@ -875,12 +878,15 @@ PHANDLE
 PHANDLER_ROUTINE
 PLARGE_INTEGER
 PLONG
+PSIZE_T
 PTIMERAPCROUTINE
 PULARGE_INTEGER
 SECURITY_ATTRIBUTES *
+SIZE_T *
 SYSLEVEL *
 SYSLEVEL **
 SYSTEMTIME *
+TDB *
 TIMEFMT_ENUMPROCA
 TIMEFMT_ENUMPROCW
 WIN32_FIND_DATAA *
@@ -1335,11 +1341,22 @@ LPCWSTR
 %long
 
 BOOL
+DWORD
+NET_API_STATUS
 
 %ptr
 
+LPDWORD
+LPVOID
+LPVOID *
+LPWSTR * 
+PBYTE *
 PNCB
 
+%wstr
+
+LPWSTR
+
 %%ntdll.dll
 
 %double
@@ -1362,6 +1379,7 @@ INT
 KEY_INFORMATION_CLASS
 KEY_VALUE_INFORMATION_CLASS
 LONG
+MEMORY_INFORMATION_CLASS
 NTSTATUS
 OBJECT_INFORMATION_CLASS
 PROCESSINFOCLASS
@@ -1398,13 +1416,15 @@ CONTEXT86 *
 DWORD *
 EXCEPTION_FRAME *
 EXCEPTION_RECORD *
-FILETIME *
 HANDLE *
+HANDLERPROC
 IMAGE_NT_HEADERS *
 IMAGE_SECTION_HEADER **
 INT *
 LARGE_INTEGER *
 LPBYTE
+LPCVOID
+LPCVOID *
 LPDWORD
 LPDWORD *
 LPRTL_RWLOCK
@@ -1418,8 +1438,8 @@ PACL
 PACL *
 PANSI_STRING
 PBOOLEAN
+PCANSI_STRING
 PCRTL_BITMAP
-PCVOID
 PDWORD
 PEXCEPTION_FRAME
 PEXCEPTION_RECORD
@@ -2257,14 +2277,18 @@ DLLVERSIONINFO *
 DWORD *
 HICON *
 HKEY *
+IBindCtx *
+IConnectionPoint **
 IFACE_INDEX_TBL *
 IID *
 INT *
+IPropertyBag *
 IStream *
 IStream **
 ITEMIDLIST *
 IUnknown *
 IUnknown **
+LPBC
 LPBROWSEINFOW
 LPBYTE
 LPCITEMIDLIST
@@ -2293,6 +2317,8 @@ LPVOID
 LPVOID *
 LPWORD
 LPWSTR *
+OLECMD *
+OLECMDTEXT *
 PHUSKEY
 PLONG
 PSECURITY_DESCRIPTOR
@@ -2303,6 +2329,7 @@ REFIID
 SHFILEINFOW *
 UINT *
 ULARGE_INTEGER *
+VARIANT *
 VOID *
 WNDCLASSA *
 unsigned char *
@@ -2320,7 +2347,7 @@ WNDCLASSW *
 LPCSTR
 LPSTR
 
-%unknown
+%struct16
 
 CLSID
 
@@ -2590,7 +2617,6 @@ HWND *
 INT *
 LPACCEL
 LPBYTE
-LPCHARSETINFO
 LPCMENUINFO
 LPCONVCONTEXT
 LPCONVINFO

tools/winapi_check/winapi_local.pm

@@ -208,7 +208,10 @@ sub _check_function {
 	    }
 
 	    # FIXME: Kludge
-	    if(defined($kind) && $kind eq "longlong") {
+	    if(defined($kind) && $kind eq "struct16") {
+		$n+=4;
+		("long", "long", "long", "long");
+	    } elsif(defined($kind) && $kind eq "longlong") {
 		$n+=2;
 		("long", "long");
 	    } else {