[ros-diffs] [reactos] 03/03: [IPHLPAPI] Simplify spec file

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=175abab7adab9db5a6e36…

commit 175abab7adab9db5a6e36a34b9d6f89ffbc51d6a
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Sun Aug 25 11:44:43 2019 +0200
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Sun Sep 8 16:23:46 2019 +0200

    [IPHLPAPI] Simplify spec file
    
    Also move the exports where they are on Windows. This was already handled correctly by
MSVC and still doesn't fix the order on GCC builds, but that is a different story and
shall be addressed at a different time.
---
 dll/win32/iphlpapi/iphlpapi.spec | 53 ++++++++++++----------------------------
 1 file changed, 16 insertions(+), 37 deletions(-)

diff --git a/dll/win32/iphlpapi/iphlpapi.spec b/dll/win32/iphlpapi/iphlpapi.spec
index d9a20667939..6d186f35152 100644
--- a/dll/win32/iphlpapi/iphlpapi.spec
+++ b/dll/win32/iphlpapi/iphlpapi.spec
@@ -116,6 +116,22 @@
 @ stdcall NotifyRouteChange( ptr ptr )
 @ stub NotifyRouteChangeEx
 @ stub NotifySecurityHealthChange
+@ stdcall _PfAddFiltersToInterface@24()
+@ stdcall _PfAddGlobalFilterToInterface@8()
+@ stdcall _PfBindInterfaceToIPAddress@12()
+@ stdcall _PfBindInterfaceToIndex@16()
+@ stdcall _PfCreateInterface@24()
+@ stdcall _PfDeleteInterface@4()
+@ stdcall _PfDeleteLog@0()
+@ stdcall _PfGetInterfaceStatistics@16()
+@ stdcall _PfMakeLog@4()
+@ stdcall _PfRebindFilters@8()
+@ stdcall _PfRemoveFilterHandles@12()
+@ stdcall _PfRemoveFiltersFromInterface@20()
+@ stdcall _PfRemoveGlobalFilterFromInterface@8()
+@ stdcall _PfSetLogBuffer@28()
+@ stdcall _PfTestPacket@20()
+@ stdcall _PfUnBindInterface@4()
 @ stdcall RestoreMediaSense(ptr ptr)
 @ stdcall SendARP(long long ptr ptr)
 @ stub SetAdapterIpAddress
@@ -136,43 +152,6 @@
 @ stdcall SetTcpEntry( ptr )
 @ stub SetTcpEntryToStack
 @ stdcall UnenableRouter( ptr ptr )
-
-# These are actually stubs, but we need to forward them to preserve the decoration.
-@ stdcall -arch=i386 _PfAddFiltersToInterface@24() _PfAddFiltersToInterface@24
-@ stdcall -arch=i386 _PfAddGlobalFilterToInterface@8() _PfAddGlobalFilterToInterface@8
-@ stdcall -arch=i386 _PfBindInterfaceToIPAddress@12() _PfBindInterfaceToIPAddress@12
-@ stdcall -arch=i386 _PfBindInterfaceToIndex@16() _PfBindInterfaceToIndex@16
-@ stdcall -arch=i386 _PfCreateInterface@24() _PfCreateInterface@24
-@ stdcall -arch=i386 _PfDeleteInterface@4() _PfDeleteInterface@4
-@ stdcall -arch=i386 _PfDeleteLog@0() _PfDeleteLog@0
-@ stdcall -arch=i386 _PfGetInterfaceStatistics@16() _PfGetInterfaceStatistics@16
-@ stdcall -arch=i386 _PfMakeLog@4() _PfMakeLog@4
-@ stdcall -arch=i386 _PfRebindFilters@8() _PfRebindFilters@8
-@ stdcall -arch=i386 _PfRemoveFilterHandles@12() _PfRemoveFilterHandles@12
-@ stdcall -arch=i386 _PfRemoveFiltersFromInterface@20() _PfRemoveFiltersFromInterface@20
-@ stdcall -arch=i386 _PfRemoveGlobalFilterFromInterface@8()
_PfRemoveGlobalFilterFromInterface@8
-@ stdcall -arch=i386 _PfSetLogBuffer@28() _PfSetLogBuffer@28
-@ stdcall -arch=i386 _PfTestPacket@20() _PfTestPacket@20
-@ stdcall -arch=i386 _PfUnBindInterface@4() _PfUnBindInterface@4
-
-# x64 does not use decoration in these names
-@ stdcall -arch=x86_64 _PfAddFiltersToInterface@24()
-@ stdcall -arch=x86_64 _PfAddGlobalFilterToInterface@8()
-@ stdcall -arch=x86_64 _PfBindInterfaceToIPAddress@12()
-@ stdcall -arch=x86_64 _PfBindInterfaceToIndex@16()
-@ stdcall -arch=x86_64 _PfCreateInterface@24()
-@ stdcall -arch=x86_64 _PfDeleteInterface@4()
-@ stdcall -arch=x86_64 _PfDeleteLog@0()
-@ stdcall -arch=x86_64 _PfGetInterfaceStatistics@16()
-@ stdcall -arch=x86_64 _PfMakeLog@4()
-@ stdcall -arch=x86_64 _PfRebindFilters@8()
-@ stdcall -arch=x86_64 _PfRemoveFilterHandles@12()
-@ stdcall -arch=x86_64 _PfRemoveFiltersFromInterface@20()
-@ stdcall -arch=x86_64 _PfRemoveGlobalFilterFromInterface@8()
-@ stdcall -arch=x86_64 _PfSetLogBuffer@28()
-@ stdcall -arch=x86_64 _PfTestPacket@20()
-@ stdcall -arch=x86_64 _PfUnBindInterface@4()
-
 @ stub do_echo_rep
 @ stub do_echo_req
 @ stub register_icmp