API files update.

tools/winapi_check/modules.dat

@@ -16,6 +16,10 @@ dlls/avifil32
 
 dlls/avifil32
 
+% dlls/comcat/comcat.spec
+
+dlls/comcat
+
 % dlls/comctl32/comctl32.spec
 
 dlls/comctl32
@@ -555,4 +559,3 @@ dlls/wintrust
 
 dlls/x11drv
 graphics/x11drv
-windows/x11drv

tools/winapi_check/modules.pm

@@ -143,6 +143,8 @@ sub new {
     foreach my $spec_file (@spec_files) {
 	(my $type, my $module) = get_spec_file_type("$wine_dir/$spec_file");
 
+	if(!$type) { $type = "win32"; }
+
 	$$spec_file2module{$spec_file} = $module;
 	$$module2spec_file{$module} = $spec_file;
 

tools/winapi_check/win16/avifile.api

@@ -8,6 +8,7 @@ ULONG
 
 %ptr
 
+IAVIFile *
 LPCLSID
 PAVIFILE
 PAVIFILE *

tools/winapi_check/win32/avicap32.api

@@ -1,17 +0,0 @@
-%long
-
-BOOL
-DWORD
-HWND
-UINT
-int
-
-%str
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
-LPWSTR

tools/winapi_check/win32/avifil32.api

@@ -9,15 +9,15 @@ ULONG
 %ptr
 
 AVICOMPRESSOPTIONS *
-AVIFILEINFOA *
-AVIFILEINFOW *
 AVISTREAMINFOA *
 AVISTREAMINFOW *
 CLSID *
+IAVIFile *
 LONG *
+LPAVIFILEINFOA
+LPAVIFILEINFOW
 LPBITMAPINFOHEADER
 LPCLSID
-LPLONG
 LPVOID
 PAVIFILE
 PAVIFILE *
@@ -32,7 +32,3 @@ LPCSTR
 %void
 
 void
-
-%wstr
-
-LPCWSTR

tools/winapi_check/win32/comcat.api

@@ -0,0 +1,9 @@
+%long
+
+HRESULT
+
+%ptr
+
+REFCLSID
+REFIID
+LPVOID *

tools/winapi_check/win32/imaadp32.api

@@ -1,6 +1,8 @@
 %long
 
 DWORD
-LONG
+LPARAM
+LRESULT
 HDRVR
 UINT
+

tools/winapi_check/win32/imm32.api

@@ -3,7 +3,6 @@
 BOOL
 DWORD
 HIMC
-HIMCC
 HKL
 HWND
 LONG
@@ -12,10 +11,6 @@ LRESULT
 UINT
 WPARAM
 
-%long # --forbidden
-
-int
-
 %ptr
 
 LPCANDIDATEFORM
@@ -23,14 +18,11 @@ LPCANDIDATELIST
 LPCVOID
 LPCOMPOSITIONFORM
 LPDWORD
-LPHKL
-LPINPUTCONTEXT
 LPLOGFONTA
 LPLOGFONTW
 LPPOINT
 LPSTYLEBUFA
 LPSTYLEBUFW
-LPUINT
 LPVOID
 REGISTERWORDENUMPROCA
 REGISTERWORDENUMPROCW

tools/winapi_check/win32/kernel32.api

@@ -45,6 +45,10 @@ HRSRC16
 HTASK16
 UINT16
 
+%longlong
+
+DWORDLONG
+
 %ptr
 
 BOOL *

tools/winapi_check/win32/msg711.api

@@ -1,6 +0,0 @@
-%long
-
-DWORD
-LONG
-HDRVR
-UINT

tools/winapi_check/win32/msrle32.api

@@ -1,6 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LONG
-UINT

tools/winapi_check/win32/ntdll.api

@@ -112,15 +112,10 @@ void *
 
 %ptr --extension
 
-GUID *
 WCHAR *
-WCHAR ***
 char *
-char ***
-enum __WINE_DEBUG_CLASS
 enum fd_type *
 int *
-va_list
 
 %str
 

tools/winapi_check/win32/quartz.api

@@ -1,19 +0,0 @@
-%long
-
-DWORD
-HRESULT
-LONG
-
-%ptr
-
-CLSID *
-IID *
-void **
-
-%str
-
-LPSTR
-
-%wstr
-
-LPWSTR

tools/winapi_check/win32/shdocvw.api

@@ -5,10 +5,10 @@ HRESULT
 
 %ptr
 
-CLSID *
 DLLVERSIONINFO *
-IID *
+LPVOID *
-void **
+REFCLSID
+REFIID
 
 %wstr
 

tools/winapi_check/win32/urlmon.api

@@ -3,47 +3,27 @@
 BOOL
 DWORD
 HRESULT
-UINT
 long
 
 %ptr
 
-BINDINFO *
-CLIPFORMAT *
-CLSID *
 DWORD *
-FORMATETC *
-HIT_LOGGING_INFO *
 IBindCtx *
 IBindCtx **
 IBindStatusCallback *
 IBindStatusCallback **
 IEnumFORMATETC *
-IEnumFORMATETC **
-IID *
 IMoniker *
 IMoniker **
-IStream **
-IUnknown *
-LPCSTR *
 LPVOID
 LPVOID *
-LPWSTR *
+REFCLSID
-SOFTDISTINFO *
+REFIID
-ULONG *
-void *
-void **
 
 %str
 
 LPCSTR
-LPSTR
 
 %wstr
 
 LPCWSTR
-LPWSTR
-
-%void
-
-void

tools/winapi_check/win32/user32.api

@@ -126,6 +126,7 @@ PSECURITY_INFORMATION
 PSECURITY_QUALITY_OF_SERVICE
 PUINT
 PVOID
+PWINDOWINFO
 RECT *
 SCROLLINFO *
 SECURITY_QUALITY_OF_SERVICE *

tools/winapi_check/win32/wineps.api

@@ -8,6 +8,7 @@ HBRUSH
 HDC
 HFONT
 HPEN
+HRGN
 HWND
 INT
 LPARAM