- Minor API file update.

- Minor bug fixes.

tools/winapi_check/modules.dat

@@ -65,19 +65,21 @@ dlls/dsound
 
 graphics
 
-% dlls/gdi/gdi.spec
+% dlls/gdi/gdi.exe.spec
 
 dlls/gdi
-graphics/metafiledrv
-graphics/win16drv
+dlls/gdi/enhmfdrv
+dlls/gdi/mfdrv
+dlls/gdi/win16drv
 graphics
 objects
 
 % dlls/gdi/gdi32.spec
 
 dlls/gdi
-graphics/enhmetafiledrv
-graphics/metafiledrv
+dlls/gdi/enhmfdrv
+dlls/gdi/mfdrv
+dlls/gdi/win16drv
 graphics
 objects
 
@@ -105,7 +107,7 @@ dlls/imm32
 
 % dlls/kernel/comm.spec
 
-% dlls/kernel/kernel.spec
+% dlls/kernel/krnl386.exe.spec
 
 dlls/kernel
 files
@@ -202,6 +204,10 @@ dlls/msacm
 
 dlls/msacm
 
+% dlls/msacm/imaadp32/imaadp32.acm.spec
+
+dlls/msacm/imaadp32
+
 % dlls/msacm/msg711/msg711.drv.spec
 
 dlls/msacm/msg711
@@ -395,7 +401,7 @@ dlls/user
 
 dlls/url
 
-% dlls/user/user.spec
+% dlls/user/user.exe.spec
 
 controls
 dlls/user

tools/winapi_check/modules.pm

@@ -156,7 +156,7 @@ sub new {
     }
 
     foreach my $spec_file (@spec_files) {
-	if(!$spec_file_found{$spec_file}) {
+	if(!$spec_file_found{$spec_file} && $spec_file !~ m%tests/[^/]+$%) {
 	    $output->write("modules.dat: $spec_file: exists but is not specified\n");
 	}
     }

tools/winapi_check/win16/setupx.api

@@ -1,5 +1,6 @@
 %long
 
+BOOL
 DWORD
 LPARAM
 int

tools/winapi_check/win32/imaadp32.api

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

tools/winapi_check/win32/ntdll.api

@@ -32,6 +32,10 @@ UINT
 ULONG
 WCHAR
 
+%long --extension
+
+handle_t
+
 %long # --forbidden
 
 int
@@ -114,6 +118,8 @@ WCHAR ***
 char *
 char ***
 enum __WINE_DEBUG_CLASS
+enum fd_type *
+int *
 va_list
 
 %str

tools/winapi_check/win32/setupapi.api

@@ -1,6 +1,7 @@
 %long
 
 BOOL
+LONG
 DWORD
 HDEVINFO
 HINF
@@ -9,22 +10,33 @@ HSPFILEQ
 HWND
 UINT
 
+%long --ptr
+
+UINT_PTR
+
 %ptr
 
-PSP_DEVINFO_DATA
+BYTE *
+DWORD *
+INFCONTEXT *
+INT *
 PDWORD
+PSP_DEVINFO_DATA
 PSP_FILE_CALLBACK_A
 PSP_FILE_CALLBACK_W
-PINFCONTEXT
+PSP_FILE_COPY_PARAMS_A
+PSP_FILE_COPY_PARAMS_W
+PSTR
 PUINT
 PVOID
+UINT *
 
 %str
 
-LPSTR
 PCSTR
+PCWSTR
 PWSTR
 
 %void
 
-VOID
+void

tools/winapi_check/win32/ttydrv.api

@@ -7,6 +7,7 @@ DWORD
 INT
 HDC
 HBITMAP
+HFONT
 HGDIOBJ
 HRGN
 HWND
@@ -35,6 +36,7 @@ LPTEXTMETRICW
 INT *
 POINT *
 RECT *
+TTYDRV_PDEVICE *
 WINDOWPOS *
 struct tagCURSORICONINFO *
 

tools/winapi_check/win32/wineps.api

@@ -3,8 +3,11 @@
 BOOL
 COLORREF
 DWORD
+HBITMAP
+HBRUSH
 HDC
-HGDIOBJ
+HFONT
+HPEN
 HWND
 INT
 LPARAM
@@ -27,6 +30,7 @@ LPLOGFONTW
 LPSIZE
 LPVOID
 POINT *
+PSDRV_PDEVICE *
 RECT *
 TEXTMETRICW *
 void *

tools/winapi_check/win32/x11drv.api

@@ -6,9 +6,12 @@ COLORREF
 DWORD
 HANDLE
 HBITMAP
+HBRUSH
 HDC
+HFONT
 HGDIOBJ
 HICON
+HPEN
 HRGN
 HWND
 INT
@@ -46,8 +49,10 @@ LPVOID *
 PIXELFORMATDESCRIPTOR *
 POINT *
 RECT *
+RGBQUAD *
 TEXTMETRICW *
 WINDOWPOS *
+X11DRV_PDEVICE *
 void *
 
 %str

tools/winapi_check/winapi_check

@@ -496,7 +496,7 @@ foreach my $file (@c_files) {
 
 		if($check_protection && $header) {
 		    if((-e "$wine_dir/include/$header" || -e "$wine_dir/$file_dir/$header")) {
-			if($header !~ /^ctype.h$/) {
+			if($header !~ /^(oleauto\.h|win(?:base|def|error|gdi|nls|nt|user)\.h)$/) {
 			    $output->write("$file: #include \<$header\> is a local include\n");
 			}
 		    }