Francois Gouget : winapi_check: Fix support for .ocx API documentation.

Alexandre Julliard julliard at winehq.org
Tue Apr 14 16:15:27 CDT 2020


Module: wine
Branch: master
Commit: 5fec86769421a86899e9af267259fe355c8b11ec
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5fec86769421a86899e9af267259fe355c8b11ec

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Apr 14 16:55:18 2020 +0200

winapi_check: Fix support for .ocx API documentation.

The module name must include non-default extensions, for instance
'wshom.ocx'. Truncating the module name prevents later lookups from
finding the API's spec file declaration.

Signed-off-by: Francois Gouget <fgouget at free.fr>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/winapi/winapi_documentation.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/winapi/winapi_documentation.pm b/tools/winapi/winapi_documentation.pm
index a168cfa6b7..d959e11ac8 100644
--- a/tools/winapi/winapi_documentation.pm
+++ b/tools/winapi/winapi_documentation.pm
@@ -77,11 +77,10 @@ sub check_documentation($) {
 		my $found_name = 0;
 		my $found_ordinal = 0;
 
-		$module =~ s/\.(acm|dll|drv|exe|ocx)$//; # FIXME: Kludge
 		$module = "kernel" if $module eq "krnl386"; # FIXME: Kludge
 
 		foreach (split(/\n/, $documentation)) {
-		    if(/^(\s*)\*(\s*)(\@|\S+)(\s*)([\(\[])(\w+)\.(\@|\d+)([\)\]])/) {
+		    if(/^(\s*)\*(\s*)(\@|\S+)(\s*)([\(\[])(\w+(?:\.\w+)?)\.(\@|\d+)([\)\]])/) {
 			my $external_name2 = $3;
 			my $module2 = $6;
 			my $ordinal2 = $7;




More information about the wine-cvs mailing list