- Fixed a bug concerning Win16 documentation.

tools/winapi_check/win16/compobj.api

@@ -31,6 +31,10 @@ REFCLSID
 REFGUID
 REFIID
 
+%segptr
+
+SEGPTR
+
 %str
 
 LPCOLESTR16

tools/winapi_check/win32/gdi32.api

@@ -24,9 +24,10 @@ LPARAM
 UINT
 WORD
 
-%long --forbidden
+%long --extension
 
-int
+HDC16
+HMETAFILE16
 
 %ptr
 
@@ -62,6 +63,7 @@ LPABC
 LPABCFLOAT
 LPBYTE
 LPCOLORADJUSTMENT
+LPCHARSETINFO
 LPCVOID
 LPDEVMODEA
 LPDWORD
@@ -105,7 +107,7 @@ TEXTMETRICW *
 XFORM *
 void *
 
-%ptr # --forbidden
+%ptr --extension
 
 FARPROC16
 

tools/winapi_check/win32/kernel32.api

@@ -31,12 +31,17 @@ ULONG_PTR
 
 %long # --forbidden
 
+int
+
+%long --extension
+
 BOOL16
 HGLOBAL16
 HINSTANCE16
 HMODULE16
+HRSRC16
+HTASK16
 UINT16
-int
 
 %ptr
 
@@ -145,11 +150,8 @@ va_list *
 
 %ptr --extension
 
-BUILTIN16_DESCRIPTOR *
-
-%ptr # --forbidden
-
 FARPROC16
+BUILTIN16_DESCRIPTOR *
 SEGPTR
 
 %str

tools/winapi_check/win32/ntdll.api

@@ -107,11 +107,13 @@ void *
 
 %ptr --extension
 
+EXCEPTION_FRAME **
 GUID *
 WCHAR *
 char *
 char ***
 enum __DEBUG_CLASS
+enum request
 va_list
 
 %str

tools/winapi_check/win32/user32.api

@@ -23,6 +23,7 @@ HHOOK
 HICON
 HINSTANCE
 HKL
+HPEN
 HMENU
 HMONITOR
 HRESULT
@@ -43,9 +44,18 @@ WPARAM
 
 %long # --forbidden
 
-HMODULE16
 int
 
+%long --extension
+
+INT16
+HANDLE16
+HMODULE16
+HINSTANCE16
+HWND16
+UINT16
+WPARAM16
+
 %longlong
 
 POINT 
@@ -124,6 +134,11 @@ WNDENUMPROC
 WNDPROC
 va_list
 
+%ptr --extension
+
+DLGPROC16
+WNDPROC16
+
 %str
 
 LPSTR

tools/winapi_check/winapi_check

@@ -439,6 +439,7 @@ foreach my $file ($options->c_files) {
 	       (defined($module16) || defined($module32)) &&
 	       $linkage ne "extern" && $statements)
 	    {
+		my $external_name;
 		my $name1;
 		my $name2;
 		
@@ -451,9 +452,11 @@ foreach my $file ($options->c_files) {
 			if($name1 =~ s/^$uc_module16\_//) { last; }
 		    }
 
-		    # FIXME: This special case is becuase of a very ugly kludge that should be fixed IMHO
 		    $name2 = $name1;
-		    $name2 = s/^(.*?)16_fn(.*?)$/$116_$2/;
+		    $name2 =~ s/(?:_)?16$//;
+		    $name2 =~ s/16_fn/16_/;
+
+		    $external_name = $external_name16;
 		} elsif(!defined($module16) && defined($module32)) {
 		    my @uc_modules32 = split(/\s*\&\s*/, uc($module32));
 		    push @uc_modules32, "wine";
@@ -471,6 +474,8 @@ foreach my $file ($options->c_files) {
 
 		    $name2 = $name1;
 		    $name2 =~ s/AW$//;
+
+		    $external_name = $external_name32;
 		} else {
 		    my @uc_modules = split(/\s*\&\s*/, uc($module16));
 		    push @uc_modules, split(/\s*\&\s*/, uc($module32));
@@ -481,9 +486,14 @@ foreach my $file ($options->c_files) {
 		    }
 
 		    $name2 = $name1;
+		    $external_name = $external_name32;
+		}
+
+		if(!defined($external_name)) {
+		    $external_name = $internal_name;
 		}
 
-		if($documentation !~ /\b($internal_name|$name1|$name2)\b/) {
+		if($documentation !~ /\b(\Q$external_name\E|$internal_name|$name1|$name2)\b/) {
 		    $output->write("documentation: \\\n$documentation\n");
 		}
 
@@ -503,7 +513,7 @@ foreach my $file ($options->c_files) {
 		    for my $argument_documentation (@argument_documentations) {
 			$n++;
 			if($argument_documentation ne "") {
-			    if($argument_documentation !~ /^\/\*\s+\[(?:in|out|in\/out)\].*?\*\/$/) {
+			    if($argument_documentation !~ /^\/\*\s+\[(?:in|out|in\/out|\?\?\?)\].*?\*\/$/s) {
 				$output->write("argument $n documentation: \\\n$argument_documentation\n");
 			    }
 			}

tools/winapi_check/winapi_options.pm

@@ -289,6 +289,9 @@ sub new {
     return $self;
 }
 
+sub DESTROY {
+}
+
 sub options_set {
     my $self = shift;
 

tools/winapi_check/winapi_parser.pm

@@ -123,11 +123,11 @@ sub parse_c_file {
 	}
 
 	my $documentation;
-	my @argument_documentations;
+	my @argument_documentations = ();
 	{
 	    my $n = $#comments;
 	    while($n >= 0 && ($comments[$n] !~ /^\/\*\*/ ||
-			      $comments[$n] =~ /^\/\*\*+\//)) 
+			      $comments[$n] =~ /^\/\*\*+\/$/)) 
 	    {
 		$n--;
 	    }
@@ -135,6 +135,10 @@ sub parse_c_file {
 	    if(defined($comments[$n]) && $n >= 0) {
 		$documentation = $comments[$n];
 		for(my $m=$n+1; $m <= $#comments; $m++) {
+		    if($comments[$m] =~ /^\/\*\*+\/$/) {
+			@argument_documentations = ();
+			next;
+		    }
 		    push @argument_documentations, $comments[$m];
 		}
 	    } else {