From 181a114d44eb7003cdcebc83936bc828855e92ab Mon Sep 17 00:00:00 2001
From: Serge Gautherie <winehq-git_serge_180711@gautherie.fr>
Date: Fri, 17 Jul 2020 06:14:44 +0200
Subject: [PATCH] winapi_test: Fix a verifying loop on headers, which never
 finds any type name.

Signed-off-by: Serge Gautherie <winehq-git_serge_180711@gautherie.fr>
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 tools/winapi/winapi_test | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test
index 8b7596f040e..1061dd8157a 100755
--- a/tools/winapi/winapi_test
+++ b/tools/winapi/winapi_test
@@ -871,8 +871,7 @@ foreach my $test_dir (@test_dirs) {
 
 foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) {
     $output->prefix("$header: ");
-    $header =~ s%^include/%%;
-    my $type_name2type = $file2types{$pointer_size}{"include/$header"};
+    my $type_name2type = $file2types{$pointer_size}{$header};
     foreach my $_type_name (sort(keys(%$type_name2type))) {
 	my $type_name = $_type_name;
 
@@ -886,10 +885,10 @@ $output->prefix("$winapi_dir/tests.dat: ");
 foreach my $type_name (sort(keys(%type_names_used))) {
     my $found = 0;
     foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) {
-	my $type_name2type = $file2types{$pointer_size}{"include/$header"};
-	if (exists($type_name2type{$type_name})) {
-	    $found = 1;
-	}
+        if (exists($file2types{$pointer_size}{$header}{$type_name})) {
+            $found = 1;
+            last;
+        }
     }
 
     if (!$found) {