- Minor API files fixes.

tools/winapi_check/modules.dat

@@ -281,6 +281,10 @@ misc
 dlls/shell32
 memory
 
+% dlls/shell32/shfolder.spec
+
+dlls/shell32
+
 % dlls/shell32/shlwapi.spec
 
 dlls/shell32
@@ -404,39 +408,39 @@ dlls/wing
 
 dlls/wininet
 
-% dlls/winmm/joystick/joystick.spec
+% dlls/winmm/joystick/joystick.drv.spec
 
 dlls/winmm/joystick
 
-% dlls/winmm/mcianim/mcianim.spec
+% dlls/winmm/mcianim/mcianim.drv.spec
 
 dlls/winmm/mcianim
 
-% dlls/winmm/mciavi/mciavi.spec
+% dlls/winmm/mciavi/mciavi.drv.spec
 
 dlls/winmm/mciavi
 
-% dlls/winmm/mcicda/mcicda.spec
+% dlls/winmm/mcicda/mcicda.drv.spec
 
 dlls/winmm/mcicda
 
-% dlls/winmm/mciseq/mciseq.spec
+% dlls/winmm/mciseq/mciseq.drv.spec
 
 dlls/winmm/mciseq
 
-% dlls/winmm/mciwave/mciwave.spec
+% dlls/winmm/mciwave/mciwave.drv.spec
 
 dlls/winmm/mciwave
 
-% dlls/winmm/midimap/midimap.spec
+% dlls/winmm/midimap/midimap.drv.spec
 
 dlls/winmm/midimap
 
-% dlls/winmm/wavemap/msacm.spec
+% dlls/winmm/wavemap/msacm.drv.spec
 
 dlls/winmm/wavemap
 
-% dlls/winmm/wineoss/wineoss.spec
+% dlls/winmm/wineoss/wineoss.drv.spec
 
 dlls/winmm/wineoss
 
@@ -453,12 +457,16 @@ windows
 
 dlls/winsock
 
+% dlls/winsock/ws2_32.spec
+
+dlls/winsock
+
 % dlls/winsock/wsock32.spec
 
 dlls/winsock
 misc
 
-% dlls/winspool/winspool.spec
+% dlls/winspool/winspool.drv.spec
 
 dlls/winspool
 win32

tools/winapi_check/win32/crtdll.api

+%double
+
+double
+
 %long
 
 BOOL

tools/winapi_check/win32/kernel32.api

@@ -78,6 +78,7 @@ LONG *
 LPBOOL
 LPBYTE
 LPCHAR_INFO
+LPCOMMPROP
 LPCOMMTIMEOUTS
 LPCOMSTAT
 LPCONSOLE_CURSOR_INFO
@@ -85,7 +86,6 @@ LPCONSOLE_SCREEN_BUFFER_INFO
 LPCPINFO
 LPCVOID
 LPDCB
-LPDCB *
 LPDEBUG_EVENT
 LPDWORD
 LPFILETIME

tools/winapi_check/win32/msvfw32.api

@@ -2,7 +2,6 @@
 
 BOOL
 DWORD
-HANDLE
 HDC
 HIC
 HINSTANCE

tools/winapi_check/win32/ole32.api

@@ -73,6 +73,7 @@ LPOLESTR *
 LPPERSISTSTORAGE
 LPRUNNINGOBJECTTABLE *
 LPUNKNOWN
+LPUNKNOWN *
 LPVOID
 LPVOID *
 LPWORD

tools/winapi_check/win32/oleaut32.api

@@ -45,9 +45,6 @@ COLORREF *
 CY *
 DATE *
 FLOAT *
-ICreateErrorInfo **
-IErrorInfo *
-IErrorInfo **
 ITypeLib *
 ITypeLib **
 LONG *

tools/winapi_check/win32/olecli32.api

 %long
 
 BOOL
-DWORD
 HDC
-HRESULT
 LHCLIENTDOC
 LONG
 OLECLIPFORMAT
@@ -12,20 +10,11 @@ OLEOPT_RENDER
 
 %ptr
 
-IPersistStream *
-IStream *
 LHCLIENTDOC *
 LONG *
-LPFORMATETC
-LPSTORAGE
 LPOLECLIENT
-LPOLECLIENTSITE
 LPOLEOBJECT
 LPOLEOBJECT *
-LPVOID *
-REFCLSID
-REFIID
-void **
 
 %str
 

tools/winapi_check/win32/opengl32.api

@@ -35,14 +35,15 @@ GLdouble *
 GLfloat *
 GLint *
 GLshort *
+GLstring
 GLuint *
 GLubyte *
 GLushort *
 GLvoid *
+GLvoid **
 LPGLYPHMETRICSFLOAT
 LPLAYERPLANEDESCRIPTOR
 void *
-void **
 
 %str
 

tools/winapi_check/win32/shlwapi.api

@@ -7,6 +7,7 @@ LONG
 HANDLE
 HDC
 HKEY
+HMENU
 HPALETTE
 HRESULT
 HWND
@@ -32,6 +33,10 @@ LPVOID
 REFGUID
 void *
 
+%ptr --extension
+
+WNDCLASSW *
+
 %str
 
 LPCSTR

tools/winapi_check/win32/user32.api

@@ -43,6 +43,7 @@ WPARAM
 %long # --forbidden
 
 HMODULE16
+int
 
 %longlong
 
@@ -58,6 +59,7 @@ DRAWSTATEPROC
 FARPROC
 GRAYSTRINGPROC
 HANDLE *
+HICON *
 HKL *
 HWND *
 HOOKPROC
@@ -108,7 +110,6 @@ PSECURITY_INFORMATION
 PSECURITY_QUALITY_OF_SERVICE
 RECT *
 SCROLLINFO *
-SECURITY_INFORMATION *
 SECURITY_QUALITY_OF_SERVICE *
 TIMERPROC
 UINT *

tools/winapi_check/win32/wininet.api

@@ -8,6 +8,7 @@ INTERNET_PORT
 
 %ptr
 
+LPCSTR *
 LPCVOID
 LPDWORD
 LPURL_COMPONENTSA

tools/winapi_check/win32/ws2_32.api

+%long
+
+BOOL
+DWORD
+GROUP
+INT
+LONG
+SOCKET
+UINT
+WSAEVENT
+
+%long # --forbidden
+
+int
+
+%ptr
+
+LPWSADATA
+LPWSANETWORKEVENTS
+LPWSAPROTOCOL_INFOA

tools/winapi_check/winapi_local.pm

@@ -47,7 +47,7 @@ sub check_function {
     } elsif(!$winapi->is_allowed_kind($implemented_return_kind) || !$winapi->allowed_type_in_module($return_type,$module)) {
 	$forbidden_return_type = 1;
 	if($options->report_argument_forbidden($return_type)) {
-	    $output->write("forbidden return type: $return_type ($implemented_return_kind)" . "\n");
+	    $output->write("return type is forbidden: $return_type ($implemented_return_kind)\n");
 	}
     }
     
@@ -138,6 +138,8 @@ sub check_function {
 		    $output->write("forbidden argument " . ($n + 1) . " type " . $type . " (" . $kind . ")\n");
 		}
 	    }
+
+	    # FIXME: Kludge
 	    if(defined($kind) && $kind eq "longlong") {
 		$n+=2;
 		("long", "long");
@@ -156,7 +158,19 @@ sub check_function {
 		$segmented = 1;
 	    }
 
-	    if($argument_kinds[$n] ne $declared_argument_kinds[$n]) {
+	    # FIXME: Kludge
+	    if(!defined($argument_types[$n])) {
+		$argument_types[$n] = "";
+	    }
+
+	    if(!$winapi->is_allowed_kind($argument_kinds[$n]) ||
+	       !$winapi->allowed_type_in_module($argument_types[$n], $module)) 
+	    {
+		if($options->report_argument_forbidden($argument_types[$n])) {
+		    $output->write("argument " . ($n + 1) . " type is forbidden: " .
+				   "$argument_types[$n] ($argument_kinds[$n])\n");
+		}
+	    } elsif($argument_kinds[$n] ne $declared_argument_kinds[$n]) {
 		if($options->report_argument_kind($argument_kinds[$n]) ||
 		   $options->report_argument_kind($declared_argument_kinds[$n]))
 		{