iphlpapi: Move Icmp* functions from icmp to iphlpapi.

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

dlls/icmp/icmp.spec

-@ 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

dlls/iphlpapi/Makefile.in

@@ -8,6 +8,7 @@ IMPORTS   = advapi32 kernel32
 EXTRALIBS = @RESOLVLIBS@
 
 C_SRCS = \
+	icmp.c \
 	ifenum.c \
 	iphlpapi_main.c \
 	ipstats.c

dlls/icmp/icmp_main.c → 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:

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