API files update.
diff --git a/tools/winapi_check/modules.dat b/tools/winapi_check/modules.dat
index 0fc0135..b0b4598 100644
--- a/tools/winapi_check/modules.dat
+++ b/tools/winapi_check/modules.dat
@@ -16,6 +16,10 @@
dlls/avifil32
+% dlls/comcat/comcat.spec
+
+dlls/comcat
+
% dlls/comctl32/comctl32.spec
dlls/comctl32
@@ -555,4 +559,3 @@
dlls/x11drv
graphics/x11drv
-windows/x11drv
diff --git a/tools/winapi_check/modules.pm b/tools/winapi_check/modules.pm
index 9a9936c..9a2790e 100644
--- a/tools/winapi_check/modules.pm
+++ b/tools/winapi_check/modules.pm
@@ -143,6 +143,8 @@
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;
diff --git a/tools/winapi_check/win16/avifile.api b/tools/winapi_check/win16/avifile.api
index 334be0d..68526fa 100644
--- a/tools/winapi_check/win16/avifile.api
+++ b/tools/winapi_check/win16/avifile.api
@@ -8,6 +8,7 @@
%ptr
+IAVIFile *
LPCLSID
PAVIFILE
PAVIFILE *
diff --git a/tools/winapi_check/win32/avicap32.api b/tools/winapi_check/win32/avicap32.api
index b6279f6..e69de29 100644
--- a/tools/winapi_check/win32/avicap32.api
+++ b/tools/winapi_check/win32/avicap32.api
@@ -1,17 +0,0 @@
-%long
-
-BOOL
-DWORD
-HWND
-UINT
-int
-
-%str
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
-LPWSTR
\ No newline at end of file
diff --git a/tools/winapi_check/win32/avifil32.api b/tools/winapi_check/win32/avifil32.api
index 31fb729..dafecf6 100644
--- a/tools/winapi_check/win32/avifil32.api
+++ b/tools/winapi_check/win32/avifil32.api
@@ -9,15 +9,15 @@
%ptr
AVICOMPRESSOPTIONS *
-AVIFILEINFOA *
-AVIFILEINFOW *
AVISTREAMINFOA *
AVISTREAMINFOW *
CLSID *
+IAVIFile *
LONG *
+LPAVIFILEINFOA
+LPAVIFILEINFOW
LPBITMAPINFOHEADER
LPCLSID
-LPLONG
LPVOID
PAVIFILE
PAVIFILE *
@@ -32,7 +32,3 @@
%void
void
-
-%wstr
-
-LPCWSTR
\ No newline at end of file
diff --git a/tools/winapi_check/win32/comcat.api b/tools/winapi_check/win32/comcat.api
new file mode 100644
index 0000000..b5108d9
--- /dev/null
+++ b/tools/winapi_check/win32/comcat.api
@@ -0,0 +1,9 @@
+%long
+
+HRESULT
+
+%ptr
+
+REFCLSID
+REFIID
+LPVOID *
\ No newline at end of file
diff --git a/tools/winapi_check/win32/imaadp32.api b/tools/winapi_check/win32/imaadp32.api
index 927d81c..3afe2d9 100644
--- a/tools/winapi_check/win32/imaadp32.api
+++ b/tools/winapi_check/win32/imaadp32.api
@@ -1,6 +1,8 @@
%long
DWORD
-LONG
+LPARAM
+LRESULT
HDRVR
UINT
+
diff --git a/tools/winapi_check/win32/imm32.api b/tools/winapi_check/win32/imm32.api
index 63cd110..dc329d7 100644
--- a/tools/winapi_check/win32/imm32.api
+++ b/tools/winapi_check/win32/imm32.api
@@ -3,7 +3,6 @@
BOOL
DWORD
HIMC
-HIMCC
HKL
HWND
LONG
@@ -12,10 +11,6 @@
UINT
WPARAM
-%long # --forbidden
-
-int
-
%ptr
LPCANDIDATEFORM
@@ -23,14 +18,11 @@
LPCVOID
LPCOMPOSITIONFORM
LPDWORD
-LPHKL
-LPINPUTCONTEXT
LPLOGFONTA
LPLOGFONTW
LPPOINT
LPSTYLEBUFA
LPSTYLEBUFW
-LPUINT
LPVOID
REGISTERWORDENUMPROCA
REGISTERWORDENUMPROCW
diff --git a/tools/winapi_check/win32/kernel32.api b/tools/winapi_check/win32/kernel32.api
index d026b32..22f71f3 100644
--- a/tools/winapi_check/win32/kernel32.api
+++ b/tools/winapi_check/win32/kernel32.api
@@ -45,6 +45,10 @@
HTASK16
UINT16
+%longlong
+
+DWORDLONG
+
%ptr
BOOL *
diff --git a/tools/winapi_check/win32/msg711.api b/tools/winapi_check/win32/msg711.api
index 927d81c..e69de29 100644
--- a/tools/winapi_check/win32/msg711.api
+++ b/tools/winapi_check/win32/msg711.api
@@ -1,6 +0,0 @@
-%long
-
-DWORD
-LONG
-HDRVR
-UINT
diff --git a/tools/winapi_check/win32/msrle32.api b/tools/winapi_check/win32/msrle32.api
index ad54723..e69de29 100644
--- a/tools/winapi_check/win32/msrle32.api
+++ b/tools/winapi_check/win32/msrle32.api
@@ -1,6 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LONG
-UINT
diff --git a/tools/winapi_check/win32/ntdll.api b/tools/winapi_check/win32/ntdll.api
index 33e8642..fbcbc48 100644
--- a/tools/winapi_check/win32/ntdll.api
+++ b/tools/winapi_check/win32/ntdll.api
@@ -112,15 +112,10 @@
%ptr --extension
-GUID *
WCHAR *
-WCHAR ***
char *
-char ***
-enum __WINE_DEBUG_CLASS
enum fd_type *
int *
-va_list
%str
diff --git a/tools/winapi_check/win32/quartz.api b/tools/winapi_check/win32/quartz.api
index 046d85a..e69de29 100644
--- a/tools/winapi_check/win32/quartz.api
+++ b/tools/winapi_check/win32/quartz.api
@@ -1,19 +0,0 @@
-%long
-
-DWORD
-HRESULT
-LONG
-
-%ptr
-
-CLSID *
-IID *
-void **
-
-%str
-
-LPSTR
-
-%wstr
-
-LPWSTR
diff --git a/tools/winapi_check/win32/shdocvw.api b/tools/winapi_check/win32/shdocvw.api
index 05c62a8..c5480c6 100644
--- a/tools/winapi_check/win32/shdocvw.api
+++ b/tools/winapi_check/win32/shdocvw.api
@@ -5,10 +5,10 @@
%ptr
-CLSID *
DLLVERSIONINFO *
-IID *
-void **
+LPVOID *
+REFCLSID
+REFIID
%wstr
diff --git a/tools/winapi_check/win32/urlmon.api b/tools/winapi_check/win32/urlmon.api
index df9c14d..ec2c2bb 100644
--- a/tools/winapi_check/win32/urlmon.api
+++ b/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 *
-SOFTDISTINFO *
-ULONG *
-void *
-void **
+REFCLSID
+REFIID
%str
LPCSTR
-LPSTR
%wstr
LPCWSTR
-LPWSTR
-
-%void
-
-void
diff --git a/tools/winapi_check/win32/user32.api b/tools/winapi_check/win32/user32.api
index 0f1f7df..5491dd0 100644
--- a/tools/winapi_check/win32/user32.api
+++ b/tools/winapi_check/win32/user32.api
@@ -126,6 +126,7 @@
PSECURITY_QUALITY_OF_SERVICE
PUINT
PVOID
+PWINDOWINFO
RECT *
SCROLLINFO *
SECURITY_QUALITY_OF_SERVICE *
diff --git a/tools/winapi_check/win32/wineps.api b/tools/winapi_check/win32/wineps.api
index 2ad8288..c6e7863 100644
--- a/tools/winapi_check/win32/wineps.api
+++ b/tools/winapi_check/win32/wineps.api
@@ -8,6 +8,7 @@
HDC
HFONT
HPEN
+HRGN
HWND
INT
LPARAM
