move.

kouzhudong · Feb 1, 2024 · 3fbd85c · 3fbd85c
1 parent 588565b
commit 3fbd85c
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 1,808 deletions.
diff --git a/NetTool/NetTool.cpp b/NetTool/NetTool.cpp
@@ -6,6 +6,8 @@
 #include "IPArp.h"
 #include "whois.h"
 #include "ping.h"
+#include "pathpings.h"
+#include "tracert.h"
 
 
 #ifdef _WIN64  

diff --git a/NetTool/NetTool.vcxproj b/NetTool/NetTool.vcxproj
@@ -149,18 +149,40 @@
   <ItemGroup>
     <ClCompile Include="IPArp.Cpp" />
     <ClCompile Include="NetTool.cpp" />
+    <ClCompile Include="pathping.cpp" />
     <ClCompile Include="Ping.cpp" />
     <ClCompile Include="resolve.cpp" />
+    <ClCompile Include="tracert.cpp" />
     <ClCompile Include="whois.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="IPArp.h" />
     <ClInclude Include="iphdr.h" />
+    <ClInclude Include="pathping.h" />
+    <ClInclude Include="pathpings.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="ping.h" />
     <ClInclude Include="resolve.h" />
+    <ClInclude Include="tracert.h" />
     <ClInclude Include="whois.h" />
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="localmsg.mc">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc %(FullPath)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">localmsg.rc; localmsg.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="nlstxt.mc">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc %(FullPath)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nlstxt.rc; nlstxt.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="pathping.mc">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc %(FullPath)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pathping.rc; pathping.h;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/NetTool/NetTool.vcxproj.filters b/NetTool/NetTool.vcxproj.filters
@@ -30,6 +30,12 @@
     <ClCompile Include="resolve.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="tracert.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="pathping.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h">
@@ -50,5 +56,25 @@
     <ClInclude Include="ping.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="tracert.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="pathping.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="pathpings.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="localmsg.mc">
+      <Filter>资源文件</Filter>
+    </CustomBuild>
+    <CustomBuild Include="nlstxt.mc">
+      <Filter>资源文件</Filter>
+    </CustomBuild>
+    <CustomBuild Include="pathping.mc">
+      <Filter>资源文件</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
diff --git a/NetTool/NetTool.vcxproj.user b/NetTool/NetTool.vcxproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommandArguments>ping www.baidu.com</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>tracert www.baidu.com</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
diff --git a/NetTool/localmsg.rc b/NetTool/localmsg.rc
@@ -0,0 +1,2 @@
+LANGUAGE 0x9,0x1
+1 11 "MSG00001.bin"
diff --git a/NetTool/nlstxt.rc b/NetTool/nlstxt.rc
@@ -0,0 +1,2 @@
+LANGUAGE 0x9,0x1
+1 11 "MSG00001.bin"
diff --git a/libnet/pathping.cpp → NetTool/pathping.cpp b/libnet/pathping.cpp → NetTool/pathping.cpp
diff --git a/NetTool/pathping.rc b/NetTool/pathping.rc
@@ -0,0 +1,2 @@
+LANGUAGE 0x9,0x1
+1 11 "MSG00001.bin"
diff --git a/libnet/pathpings.h → NetTool/pathpings.h b/libnet/pathpings.h → NetTool/pathpings.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "pch.h"
+#include <winternl.h>
 
 typedef struct in_addr IPV4_ADDRESS;
 typedef struct in6_addr IPV6_ADDRESS;
@@ -54,11 +55,4 @@ extern HANDLE g_hIcmp;
 extern ULONG g_ulRcvBufSize;
 
 
-EXTERN_C_START
-
-
-__declspec(dllexport)
 int __cdecl pathping(int argc, char ** argv);
-
-
-EXTERN_C_END
diff --git a/NetTool/pch.h b/NetTool/pch.h
@@ -54,7 +54,7 @@
 #include <mstcpip.h>
 #include <Intshcut.h>
 //#include <winternl.h>
-#include <SubAuth.h>
+//#include <SubAuth.h>
 //#include <NTSecAPI.h>
 //#include <ntdef.h>
 //#include <netioapi.h>

diff --git a/libnet/tracert.cpp → NetTool/tracert.cpp b/libnet/tracert.cpp → NetTool/tracert.cpp
diff --git a/libnet/tracert.h → NetTool/tracert.h b/libnet/tracert.h → NetTool/tracert.h
@@ -2,13 +2,6 @@
 
 #include "pch.h"
 #include <netiodef.h>
+#include <tdiinfo.h>
 
-
-EXTERN_C_START
-
-
-__declspec(dllexport)
 int WINAPI tracert(int argc, char ** argv);
-
-
-EXTERN_C_END
diff --git a/inc/libnet.h b/inc/libnet.h
@@ -189,16 +189,6 @@ void WINAPI NotifyAddrChangeTest();
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-__declspec(dllimport)
-int WINAPI tracert(int argc, char ** argv);
-
-__declspec(dllimport)
-int WINAPI pathping(int argc, char ** argv);
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-
-
 __declspec(dllimport)
 void WINAPI DnsQueryTest(int argc, char * argv[]);
 

diff --git a/libnet/libnet.vcxproj b/libnet/libnet.vcxproj
@@ -191,23 +191,19 @@
     <ClInclude Include="html.h" />
     <ClInclude Include="IOCTL.h" />
     <ClInclude Include="IpAddr.h" />
-    <ClInclude Include="iphdr.h" />
     <ClInclude Include="IpHelper.h" />
     <ClInclude Include="log.h" />
     <ClInclude Include="NetApi.h" />
     <ClInclude Include="NetBIOS.h" />
     <ClInclude Include="NetworkListManager.h" />
     <ClInclude Include="notify.h" />
-    <ClInclude Include="pathping.h" />
     <ClInclude Include="pathpings.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="raw.h" />
-    <ClInclude Include="resolve.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="Sock.h" />
     <ClInclude Include="spi.h" />
     <ClInclude Include="tcp.h" />
-    <ClInclude Include="tracert.h" />
     <ClInclude Include="udp.h" />
     <ClInclude Include="WebBrowser.h" />
     <ClInclude Include="wfp.h" />
@@ -229,7 +225,6 @@
     <ClCompile Include="NetBIOS.cpp" />
     <ClCompile Include="NetworkListManager.cpp" />
     <ClCompile Include="notify.cpp" />
-    <ClCompile Include="pathping.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -240,7 +235,6 @@
     <ClCompile Include="Sock.cpp" />
     <ClCompile Include="spi.cpp" />
     <ClCompile Include="tcp.cpp" />
-    <ClCompile Include="tracert.cpp" />
     <ClCompile Include="udp.cpp" />
     <ClCompile Include="WebBrowser.cpp" />
     <ClCompile Include="wfp.cpp" />
@@ -254,33 +248,6 @@
   <ItemGroup>
     <ResourceCompile Include="libnet.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="localmsg.mc">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc %(FullPath)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">localmsg.rc; localmsg.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc %(FullPath)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">localmsg.rc; localmsg.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="nlstxt.mc">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc %(FullPath)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nlstxt.rc; nlstxt.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc %(FullPath)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nlstxt.rc; nlstxt.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="pathping.mc">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc %(FullPath)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pathping.rc; pathping.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc %(FullPath)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pathping.rc; pathping.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
   <ItemGroup>
     <None Include="..\README.md" />
   </ItemGroup>

diff --git a/libnet/libnet.vcxproj.filters b/libnet/libnet.vcxproj.filters
@@ -90,24 +90,12 @@
     <ClInclude Include="dns.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="tracert.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="pathping.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
     <ClInclude Include="pathpings.h">
       <Filter>头文件</Filter>
     </ClInclude>
     <ClInclude Include="NetworkListManager.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="iphdr.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="resolve.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
@@ -179,12 +167,6 @@
     <ClCompile Include="dns.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="tracert.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="pathping.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
     <ClCompile Include="NetworkListManager.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
@@ -197,17 +179,6 @@
       <Filter>资源文件</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="localmsg.mc">
-      <Filter>资源文件</Filter>
-    </CustomBuild>
-    <CustomBuild Include="nlstxt.mc">
-      <Filter>资源文件</Filter>
-    </CustomBuild>
-    <CustomBuild Include="pathping.mc">
-      <Filter>资源文件</Filter>
-    </CustomBuild>
-  </ItemGroup>
   <ItemGroup>
     <None Include="..\README.md" />
   </ItemGroup>