commit 20ca00113b884feda4a34147ed4ad03f2c15f150
author Patrik Stridvall <ps@leissner.se> Tue Jun 19 03:34:52 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jun 19 03:34:52 2001 +0000
tree b40a7c91a891e13d39283498f813cbe07c2c6c60
parent 163652b3f61cc8e9a029b30a8a9ac00270680225

- Slightly better handling of external/internal names.
- Minor bug fixes.
- Minor API files update.

tools/winapi_check/winapi_documentation.pm

diff --git a/tools/winapi_check/winapi_documentation.pm b/tools/winapi_check/winapi_documentation.pm
index f162d07..26f7222 100644
--- a/tools/winapi_check/winapi_documentation.pm
+++ b/tools/winapi_check/winapi_documentation.pm
@@ -75,7 +75,7 @@
 	$external_name = $internal_name;
     }
 
-    if($options->documentation_pedantic) {
+    if($options->documentation_name) {
 	my $n = 0;
 	if((++$n && defined($module16) && defined($external_name16) &&
 	    $external_name16 ne "@" && $documentation !~ /\b\Q$external_name16\E\b/) ||
@@ -87,17 +87,15 @@
 	    $external_name32 eq "@" && $documentation !~ /\@/))
 	{
 	    my $external_name = ($external_name16, $external_name32)[($n-1)/2];
-	    $output->write("documentation: wrong or missing name ($external_name) \\\n$documentation\n");
-	}
-    } else {
-	if($documentation !~ /\b(?:\Q$external_name\E|$internal_name|$name1|$name2)\b/) {
-	    $output->write("documentation: wrong or missing name \\\n$documentation\n");
+	    if($options->documentation_pedantic || $documentation !~ /\b(?:$internal_name|$name1|$name2)\b/) {
+		$output->write("documentation: wrong or missing name ($external_name) \\\n$documentation\n");
+	    }
 	}
     }
 
     if($options->documentation_ordinal) {
 	if(defined($module16)) {
-	    my $ordinal16 = $win16api->function_ordinal($internal_name);
+	    my $ordinal16 = $win16api->function_internal_ordinal($internal_name);
 
 	    if(!defined($ordinal16)) {
 		$output->write("function have no ordinal\n");
@@ -112,7 +110,7 @@
 	    }
 	}
 	if(defined($module32)) {
-	    my $ordinal32 = $win32api->function_ordinal($internal_name);
+	    my $ordinal32 = $win32api->function_internal_ordinal($internal_name);
 
 	    if(!defined($ordinal32)) {
 		$output->write("function have no ordinal\n");
@@ -129,7 +127,7 @@
     }
 
     if($options->documentation_pedantic) {
-	my $ordinal = $win16api->function_ordinal($internal_name);
+	my $ordinal = $win16api->function_internal_ordinal($internal_name);
 	if(defined($ordinal) && $documentation !~ /^ \*\s+(?:\@|\w+)(?:\s+[\(\[]\w+\.(?:\@|\d+)[\)\]])+/m) {
 	    $output->write("documentation: pedantic check failed \\\n$documentation\n");
 	}