Merged all API files into two files (Win16/Win32).

diff --git a/tools/winapi_check/modules.pm b/tools/winapi_check/modules.pm
index 42c02cf..051aabf 100644
--- a/tools/winapi_check/modules.pm
+++ b/tools/winapi_check/modules.pm
@@ -49,15 +49,24 @@
 
     open(IN, "< $file") || die "$file: $!\n";
     local $/ = "\n";
-    while(<IN>) {
+    my $header = 1;
+    my $lookahead = 0;
+    while($lookahead || defined($_ = <IN>)) {
+	$lookahead = 0;
 	s/^\s*(.*?)\s*$/$1/;
 	s/^(.*?)\s*#.*$/$1/;
 	/^$/ && next;
 
-	if(/^name\s*(\S*)/) { $module = $1; }
-	if(/^type\s*(\w+)/) { $type = $1; }
+	if($header)  {
+	    if(/^name\s*(\S*)/) { $module = $1; }
+	    if(/^\d+|@/) { $header = 0; $lookahead = 1; }
+	    next;
+	}
 
-	if(defined($module) && defined($type)) { last; }
+	if(/^(\d+|@)\s+pascal(?:16)?/) {
+	    $type = "win16";
+	    last;
+	}
     }
     close(IN);
 
@@ -67,7 +76,7 @@
     }
 
     if(!defined($type)) {
-	$type = "";
+	$type = "win32";
     }
 
     return ($type, $module);
@@ -143,8 +152,6 @@
     foreach my $spec_file (@spec_files) {
 	(my $type, my $module) = get_spec_file_type("$wine_dir/$spec_file");
 
-	if(!$type) { $type = "win32"; }
-
 	$$spec_file2module{$spec_file} = $module;
 	$$module2spec_file{$module} = $spec_file;