Module: wine Branch: master Commit: 65549c5e58d42b4736bb47251030a6f6d0c0a66a URL: http://source.winehq.org/git/wine.git/?a=commit;h=65549c5e58d42b4736bb472510...
Author: Juan Lang juan.lang@gmail.com Date: Thu Jul 17 09:39:29 2008 -0700
iphlpapi: Move Icmp* functions from icmp to iphlpapi.
---
dlls/icmp/Makefile.in | 2 -- dlls/icmp/icmp.spec | 8 ++++---- dlls/iphlpapi/Makefile.in | 1 + dlls/{icmp/icmp_main.c => iphlpapi/icmp.c} | 8 ++++---- dlls/{icmp => iphlpapi}/ip.h | 0 dlls/{icmp => iphlpapi}/ip_icmp.h | 0 dlls/iphlpapi/iphlpapi.spec | 5 +++++ 7 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in index 5286e86..3154034 100644 --- a/dlls/icmp/Makefile.in +++ b/dlls/icmp/Makefile.in @@ -6,8 +6,6 @@ MODULE = icmp.dll IMPORTLIB = icmp IMPORTS = kernel32
-C_SRCS = icmp_main.c - @MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/icmp/icmp.spec b/dlls/icmp/icmp.spec index 93d5b27..ec69de4 100644 --- a/dlls/icmp/icmp.spec +++ b/dlls/icmp/icmp.spec @@ -1,8 +1,8 @@ -@ stdcall IcmpCloseHandle(ptr) -@ stdcall IcmpCreateFile() +@ stdcall IcmpCloseHandle(ptr) iphlpapi.IcmpCloseHandle +@ stdcall IcmpCreateFile() iphlpapi.IcmpCreateFile @ stub IcmpParseReplies -@ stub IcmpSendEcho2 -@ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) +@ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) iphlpapi.IcmpSendEcho2 +@ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) iphlpapi.IcmpSendEcho @ stub do_echo_rep @ stub do_echo_req @ stub register_icmp diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index b52a1c0..76315af 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = advapi32 kernel32 EXTRALIBS = @RESOLVLIBS@
C_SRCS = \ + icmp.c \ ifenum.c \ iphlpapi_main.c \ ipstats.c diff --git a/dlls/icmp/icmp_main.c b/dlls/iphlpapi/icmp.c similarity index 99% rename from dlls/icmp/icmp_main.c rename to dlls/iphlpapi/icmp.c index 82243da..d4a45e4 100644 --- a/dlls/icmp/icmp_main.c +++ b/dlls/iphlpapi/icmp.c @@ -146,7 +146,7 @@ static int in_cksum(u_short *addr, int len) */
/*********************************************************************** - * IcmpCreateFile (ICMP.@) + * IcmpCreateFile (IPHLPAPI.@) */ HANDLE WINAPI IcmpCreateFile(VOID) { @@ -171,7 +171,7 @@ HANDLE WINAPI IcmpCreateFile(VOID)
/*********************************************************************** - * IcmpCloseHandle (ICMP.@) + * IcmpCloseHandle (IPHLPAPI.@) */ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) { @@ -189,7 +189,7 @@ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle)
/*********************************************************************** - * IcmpSendEcho (ICMP.@) + * IcmpSendEcho (IPHLPAPI.@) */ DWORD WINAPI IcmpSendEcho( HANDLE IcmpHandle, @@ -364,7 +364,7 @@ DWORD WINAPI IcmpSendEcho( case ICMP_UNREACH_ISOLATED: #endif #ifdef ICMP_UNREACH_HOST_PROHIB - case ICMP_UNREACH_HOST_PROHIB: + case ICMP_UNREACH_HOST_PROHIB: #endif #ifdef ICMP_UNREACH_TOSHOST case ICMP_UNREACH_TOSHOST: diff --git a/dlls/icmp/ip.h b/dlls/iphlpapi/ip.h similarity index 100% rename from dlls/icmp/ip.h rename to dlls/iphlpapi/ip.h diff --git a/dlls/icmp/ip_icmp.h b/dlls/iphlpapi/ip_icmp.h similarity index 100% rename from dlls/icmp/ip_icmp.h rename to dlls/iphlpapi/ip_icmp.h diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 5ea43c5..c31dc49 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -54,6 +54,11 @@ @ stdcall GetUdpTable( ptr ptr long ) @ stub GetUdpTableFromStack @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) +@ stdcall IcmpCloseHandle(ptr) +@ stdcall IcmpCreateFile() +@ stub IcmpParseReplies +@ stub IcmpSendEcho2 +@ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) @ stub InternalCreateIpForwardEntry @ stub InternalCreateIpNetEntry @ stub InternalDeleteIpForwardEntry