- Minor API update.

- Minor bug fixes.

tools/winapi_check/nativeapi.pm

@@ -47,11 +47,11 @@ sub new {
     my $conditional_functions = \%{$self->{CONDITIONAL_FUNCTIONS}};
 
     my $api_file = "$winapi_check_dir/nativeapi.dat";
-    my $configure_in_file = "$wine_dir/configure.in";
+    my $configure_ac_file = "$wine_dir/configure.ac";
     my $config_h_in_file = "$wine_dir/include/config.h.in";
 
     $api_file =~ s/^\.\///;
-    $configure_in_file =~ s/^\.\///;
+    $configure_ac_file =~ s/^\.\///;
     $config_h_in_file =~ s/^\.\///;
 
     $output->progress("$api_file");
@@ -67,10 +67,10 @@ sub new {
     }
     close(IN);
 
-    $output->progress("$configure_in_file");
+    $output->progress("$configure_ac_file");
 
     my $again = 0;
-    open(IN, "< $configure_in_file");   
+    open(IN, "< $configure_ac_file");   
     local $/ = "\n";
     while($again || (defined($_ = <IN>))) {
 	$again = 0;

tools/winapi_check/win32/advapi32.api

@@ -50,8 +50,10 @@ LPSERVICE_STATUS
 LPSERVICE_TABLE_ENTRYA
 LPSERVICE_TABLE_ENTRYW
 LPVOID
+LPVOID *
 PACL
 PACL *
+PBOOL
 PDWORD
 PGENERIC_MAPPING
 PHANDLE

tools/winapi_check/win32/ole32.api

@@ -42,6 +42,7 @@ IPersistStream *
 IStorage *
 IStorage **
 IStream *
+IUnknown *
 LPBC
 LPBC *
 LPCLSID
@@ -55,6 +56,7 @@ LPFORMATETC
 LPGUID
 LPLOCKBYTES *
 LPMALLOC *
+LPMARSHAL *
 LPMESSAGEFILTER
 LPMESSAGEFILTER *
 LPMONIKER
@@ -70,6 +72,7 @@ LPOLEOBJECT
 LPOLESTREAM
 LPOLESTR *
 LPPERSISTSTORAGE
+LPSTREAM
 LPRUNNINGOBJECTTABLE *
 LPUNKNOWN
 LPUNKNOWN *
@@ -84,6 +87,7 @@ REFGUID
 REFIID
 SNB
 STGMEDIUM *
+ULONG *
 WORD *
 void *
 void **

tools/winapi_check/win32/rpcrt4.api

@@ -27,7 +27,6 @@ RPC_STATUS *
 UUID *
 unsigned char **
 unsigned short
-void *
 
 %str
 

tools/winapi_check/win32/shlwapi.api

@@ -37,6 +37,7 @@ int
 %ptr
 
 BOOL *
+CLSID *
 DLLVERSIONINFO *
 HICON *
 IFACE_INDEX_TBL *
@@ -51,6 +52,7 @@ LPCSTR *
 LPCVOID
 LPCWSTR *
 LPDWORD
+LPDWORD *
 LPHWND
 LPINT
 LPITEMIDLIST
@@ -64,13 +66,16 @@ LPUNKNOWN *
 LPVOID
 LPVOID *
 LPWORD
+PACL
 PHUSKEY
+PSECURITY_DESCRIPTOR
 PVOID
 REFIID
 REFGUID
 SHFILEINFOW *
-unsigned char *
+UINT *
 WNDCLASSA *
+unsigned char *
 
 %ptr --extension
 

tools/winapi_check/winapi_check

@@ -510,7 +510,10 @@ foreach my $file (@c_files) {
 			    if($macro =~ /^HAVE_X11/) {
 				# Do nothing X Windows is handled differently
 			    } elsif($macro =~ /^HAVE_(.*?)_H$/) {
-				if($header ne "alloca.h" && !$preprocessor->is_def("STATFS_DEFINED_BY_$1")) {
+				my $name = $1;
+				if($header !~ /^alloca\.h|sys\/time\.h|unistd\.h$/ && 
+				   !$preprocessor->is_def("STATFS_DEFINED_BY_$name")) 
+				{
 				    $output->write("$file: #$directive $argument: is a conditional include, " . 
 						   "but is not protected\n");
 				}