- API file update.

- Minor bug fixes.

tools/winapi/win32.api

@@ -2515,6 +2515,7 @@ long
 
 %ptr
 
+BINDINFO *
 DWORD *
 IBindCtx *
 IBindCtx **
@@ -2523,6 +2524,9 @@ IBindStatusCallback **
 IEnumFORMATETC *
 IMoniker *
 IMoniker **
+LPBC
+LPWSTR *
+LPVOID
 LPVOID *
 REFCLSID
 REFIID
@@ -2532,6 +2536,10 @@ void **
 
 LPCSTR
 
+%void
+
+void
+
 %wstr
 
 LPCWSTR
@@ -2689,7 +2697,6 @@ va_list
 
 DLGPROC16
 HOOKPROC16
-SEGPTR
 WND *
 WNDPROC16
 
@@ -2886,6 +2893,7 @@ LPCWSTR
 BOOL
 DWORD
 FILETIME
+GROUPID
 HANDLE
 HINTERNET
 HRESULT
@@ -2901,6 +2909,7 @@ LPCSTR *
 LPCVOID
 LPDWORD
 LPINTERNET_BUFFERSA
+LPINTERNET_BUFFERSW
 LPINTERNET_CACHE_ENTRY_INFOA
 LPINTERNET_CACHE_ENTRY_INFOW
 LPURL_COMPONENTSA

tools/winapi_check/winapi_check

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright 1999-2001 Patrik Stridvall
+# Copyright 1999-2002 Patrik Stridvall
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -546,7 +546,9 @@ foreach my $file (@c_files) {
 			    $include = "$header";
 			}
 		    } elsif($header eq "controls.h") { # FIXME: Kludge
-			$include = "dlls/user/controls.h";
+			$include = "dlls/user/$header";
+		    } elsif($header eq "ts_xlib.h") { # FIXME: Kludge
+			$include = "dlls/x11drv/$header";
 		    } elsif($check_local) {
 			$output->write("$file: #include \"$header\": file not found\n");
 		    }
@@ -623,6 +625,11 @@ foreach my $file (@c_files) {
 			foreach my $name (keys(%{$include2info{"dlls/user/$header"}{includes}})) {
 			    $include2info{$name}{used}++;
 			}
+		    } elsif($header eq "ts_xlib.h") { # FIXME: Kludge
+			$include2info{"dlls/x11drv/$header"}{used}++;
+			foreach my $name (keys(%{$include2info{"dlls/user/$header"}{includes}})) {
+			    $include2info{$name}{used}++;
+			}
 		    } elsif(-e "$wine_dir/include/$header") {
 			$include2info{"include/$header"}{used}++;
 			foreach my $name (keys(%{$include2info{"include/$header"}{includes}})) {

tools/winapi_check/winapi_parser.pm

@@ -164,8 +164,9 @@ sub parse_c_file {
 
     print STDERR "Processing file '$file' ... " if $options->verbose;
     open(IN, "< $file") || die "<internal>: $file: $!\n";
-    $/ = "\n";
+    local $_ = "";
     while($again || defined(my $line = <IN>)) {
+	$_ = "" if !defined($_);
 	if(!$again) {
 	    chomp $line;
 
@@ -177,8 +178,8 @@ sub parse_c_file {
 		$_ = $line;
 		$lookahead_count = 0;
 	    }
-	    print " $level($lookahead_count): $line\n" if $options->debug >= 2;
-	    print "*** $_\n" if $options->debug >= 3;
+	    $output->write(" $level($lookahead_count): $line\n") if $options->debug >= 2;
+	    $output->write("*** $_\n") if $options->debug >= 3;
 	} else {
 	    $lookahead_count = 0;
 	    $again = 0;