Alexandre Julliard : make_specfiles: Don't add forwards to the api-ms-* dlls.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Sep 26 19:39:08 2019 +0200

make_specfiles: Don't add forwards to the api-ms-* dlls.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec | 2 +-
 dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec | 2 +-
 tools/make_specfiles                                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec b/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec
index b835f4e7c7..fe546fff4c 100644
--- a/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec
+++ b/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec
@@ -1,4 +1,4 @@
-@ stdcall -norelay GetProcessHeap() kernel32.GetProcessHeap
+@ stdcall GetProcessHeap() kernel32.GetProcessHeap
 @ stdcall GetProcessHeaps(long ptr) kernel32.GetProcessHeaps
 @ stdcall HeapAlloc(long long long) kernel32.HeapAlloc
 @ stdcall HeapCompact(long long) kernel32.HeapCompact
diff --git a/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec b/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec
index fc4d357b39..88bb720301 100644
--- a/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec
+++ b/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec
@@ -1,4 +1,4 @@
-@ stdcall -norelay GetProcessHeap() kernel32.GetProcessHeap
+@ stdcall GetProcessHeap() kernel32.GetProcessHeap
 @ stdcall GetProcessHeaps(long ptr) kernel32.GetProcessHeaps
 @ stdcall HeapAlloc(long long long) kernel32.HeapAlloc
 @ stdcall HeapCompact(long long) kernel32.HeapCompact
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 5c30ce5003..7fef3a6821 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -575,7 +575,7 @@ sub update_spec_file($)
         my $func = $descr{name};
         if (!defined $funcs{$func})
         {
-            $funcs{$func} = \%descr unless $commented_out;
+            $funcs{$func} = \%descr unless $commented_out || $name =~ /-/;
             goto done;
         }