Minor API files update.

tools/winapi_check/modules.dat

@@ -4,6 +4,10 @@ dlls/advapi32
 memory
 misc
 
+% dlls/avicap32/avicap32.spec
+
+dlls/avicap32
+
 % dlls/avifil32/avifil32.spec
 
 dlls/avifil32
@@ -37,6 +41,10 @@ dlls/dciman32
 dlls/ddraw
 dlls/ddraw/dclipper
 
+% dlls/devenum/devenum.spec
+
+dlls/devenum
+
 % dlls/dinput/dinput.spec
 
 dlls/dinput
@@ -128,6 +136,10 @@ dlls/mapi32
 
 dlls/msimg32
 
+% dlls/msrle32/msrle32.spec
+
+dlls/msrle32
+
 % dlls/msvcrt/msvcrt.spec
 
 dlls/msvcrt
@@ -168,6 +180,10 @@ dlls/lzexpand
 
 dlls/lzexpand
 
+% dlls/msdmo/msdmo.spec
+
+dlls/msdmo
+
 % dlls/mpr/mpr.spec
 
 dlls/mpr
@@ -190,6 +206,10 @@ dlls/msvideo
 
 dlls/msvideo
 
+% dlls/netapi32/netapi32.spec
+
+dlls/netapi32
+
 % dlls/ntdll/ntdll.spec
 
 dlls/ntdll
@@ -234,6 +254,10 @@ dlls/oleaut32
 
 dlls/oleaut32
 
+% dlls/qcap/qcap.spec
+
+dlls/qcap
+
 % dlls/oleaut32/typelib.spec
 
 dlls/oleaut32

tools/winapi_check/win16/winsock.api

@@ -14,9 +14,9 @@ INT16 *
 LPWSADATA16
 ULONG *
 char *
-struct timeval *
+struct WS_sockaddr *
+struct WS_timeval *
 ws_fd_set16 *
-ws_sockaddr *
 
 %segptr
 

tools/winapi_check/win32/avicap32.api

+

tools/winapi_check/win32/mapi32.api

+

tools/winapi_check/win32/msimg32.api

+

tools/winapi_check/win32/msrle32.api

+%long
+
+DWORD
+HDRVR
+LONG
+UINT

tools/winapi_check/win32/msvcrt.api

@@ -63,6 +63,7 @@ struct _stat *
 struct _timeb *
 struct _utimbuf *
 struct _wfinddata_t *
+struct MSVCRT_tm *
 terminate_function
 type_info *
 unexpected_function

tools/winapi_check/win32/msvfw32.api

@@ -2,6 +2,7 @@
 
 BOOL
 DWORD
+HANDLE
 HDC
 HDRAWDIB
 HIC
@@ -18,6 +19,8 @@ WORD
 
 FARPROC
 ICINFO *
+LONG *
+LPBITMAPINFO
 LPBITMAPINFOHEADER
 LPDWORD
 LPVOID

tools/winapi_check/win32/netapi32.api

+%long
+
+BOOL
+
+%ptr
+
+PNCB

tools/winapi_check/win32/shlwapi.api

@@ -15,12 +15,15 @@ HMENU
 HMODULE
 HPALETTE
 HRESULT
+HUSKEY
 HWND
 LPARAM
 LRESULT
 UCHAR
 REGSAM
+SHREGENUM_FLAGS
 UINT
+URLIS
 WCHAR
 WORD
 WPARAM
@@ -53,15 +56,18 @@ LPSHFILEOPSTRUCTW
 LPSTRRET
 LPUNKNOWN *
 LPVOID
+LPVOID *
+PHUSKEY
 REFIID
 REFGUID
 SHFILEINFOW *
 unsigned char *
-void *
 WNDCLASSA *
 
 %ptr --extension
 
+UNKNOWN_SHLWAPI_1 *
+UNKNOWN_SHLWAPI_2 *
 WNDCLASSW *
 
 %str

tools/winapi_check/win32/sti.api

+

tools/winapi_check/win32/ttydrv.api

@@ -24,20 +24,15 @@ int
 %ptr
 
 BITMAPINFO *
-BYTE *
 DC *
 DEVMODEA *
 DWORD *
 CREATESTRUCTA *
 LPBYTE
 LPCVOID
-LPDIDEVICEOBJECTDATA
-LPDWORD
 LPINT
-LPMOUSE_EVENT_PROC
 LPSIZE
 LPTEXTMETRICW
-LPVOID
 INT *
 POINT *
 RECT *

tools/winapi_check/win32/url.api

+

tools/winapi_check/win32/urlmon.api

@@ -19,4 +19,3 @@ REFIID
 %wstr
 
 LPCWSTR
-LPWSTR

tools/winapi_check/win32/winedos.api

@@ -5,13 +5,16 @@ BYTE
 HANDLE
 INT
 UINT
+ULONG_PTR
 WORD
 
 
 %ptr
 
 CONTEXT86 *
+BYTE *
 DOSRELAY
+PAPCFUNC
 LPDOSTASK
 LPVOID
 

tools/winapi_check/win32/ws2_32.api

@@ -12,13 +12,10 @@ UINT
 WORD
 WSAEVENT
 int
+long
 u_long
 u_short
 
-%long # --forbidden
-
-SOCKET16
-
 %ptr
 
 FARPROC
@@ -35,16 +32,15 @@ LPWSAOVERLAPPED_COMPLETION_ROUTINE
 LPWSANETWORKEVENTS
 LPWSAPROTOCOL_INFOA
 LPWSAPROTOCOL_INFOW
-ULONG *
-WIN_hostent *
-WIN_protoent *
-WIN_servent *
+WS_fd_set *
 char *
 int *
-struct sockaddr *
-struct timeval *
-ws_fd_set32 *
-ws_sockaddr *
+u_long *
+struct WS_hostent *
+struct WS_protoent *
+struct WS_servent *
+struct WS_sockaddr *
+struct WS_timeval *
 
 %str
 
@@ -53,7 +49,7 @@ LPSTR
 
 %unknown
 
-struct in_addr
+struct WS_in_addr
 
 %void
 

tools/winapi_check/win32/x11drv.api

@@ -20,8 +20,6 @@ WORD
 
 %long # --forbidden
 
-INT16
-UINT16
 int
 
 %ptr
@@ -38,11 +36,8 @@ HANDLE *
 INT *
 LPBYTE
 LPCVOID
-LPDIDEVICEOBJECTDATA
-LPDWORD
 LPINT
 LPLOGFONTW
-LPMOUSE_EVENT_PROC
 LPPOINT
 LPRECT
 LPSIZE

tools/winapi_check/winapi_check

@@ -393,7 +393,7 @@ foreach my $file (@c_files) {
     my $conditional = 0;
     my $found_include = sub {
 	local $_ = shift;
-	if(/^\"config\.h\"/) {
+	if(/^\"(?:config\.h|wine\/port\.h)\"/) {
 	    $config++;
 	}
     };