Merge pull request #17 from samyun/master

Upgrade WIL version, fix string format validation issues. Update version to 2.0.3.2
microsoft · Nov 29, 2023 · 88a4151 · 88a4151
2 parents 4fe77d0 + c707c50
commit 88a4151
Show file tree

Hide file tree

Showing 22 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # ctsTraffic
 ctsTraffic is a highly scalable client/server networking tool giving detailed performance and reliability analytics
 
-If you would like to download the latest build and not have to pull down the source code to build it yourself, you can download them from [https://github.com/microsoft/ctsTraffic/tree/master/Releases/2.0.3.0](https://github.com/microsoft/ctsTraffic/tree/master/Releases/2.0.3.0) .
+If you would like to download the latest build and not have to pull down the source code to build it yourself, you can download them from [https://github.com/microsoft/ctsTraffic/tree/master/Releases/2.0.3.2](https://github.com/microsoft/ctsTraffic/tree/master/Releases/2.0.3.2) .
 
 # New Visualization Tool!
 A great new visualization toolset has been created that can post-process the output files generated by ctsTraffic.

diff --git a/Releases/2.0.3.2/arm64/ctsPerf.exe b/Releases/2.0.3.2/arm64/ctsPerf.exe
diff --git a/Releases/2.0.3.2/arm64/ctsPerf.pdb b/Releases/2.0.3.2/arm64/ctsPerf.pdb
diff --git a/Releases/2.0.3.2/arm64/ctsTraffic.exe b/Releases/2.0.3.2/arm64/ctsTraffic.exe
diff --git a/Releases/2.0.3.2/arm64/ctsTraffic.pdb b/Releases/2.0.3.2/arm64/ctsTraffic.pdb
diff --git a/Releases/2.0.3.2/x64/ctsPerf.exe b/Releases/2.0.3.2/x64/ctsPerf.exe
diff --git a/Releases/2.0.3.2/x64/ctsPerf.pdb b/Releases/2.0.3.2/x64/ctsPerf.pdb
diff --git a/Releases/2.0.3.2/x64/ctsTraffic.exe b/Releases/2.0.3.2/x64/ctsTraffic.exe
diff --git a/Releases/2.0.3.2/x64/ctsTraffic.pdb b/Releases/2.0.3.2/x64/ctsTraffic.pdb
diff --git a/Releases/2.0.3.2/x86/ctsPerf.exe b/Releases/2.0.3.2/x86/ctsPerf.exe
diff --git a/Releases/2.0.3.2/x86/ctsPerf.pdb b/Releases/2.0.3.2/x86/ctsPerf.pdb
diff --git a/Releases/2.0.3.2/x86/ctsTraffic.exe b/Releases/2.0.3.2/x86/ctsTraffic.exe
diff --git a/Releases/2.0.3.2/x86/ctsTraffic.pdb b/Releases/2.0.3.2/x86/ctsTraffic.pdb
diff --git a/ctsPerf/ctsPerf.aps b/ctsPerf/ctsPerf.aps
diff --git a/ctsPerf/ctsPerf.rc b/ctsPerf/ctsPerf.rc
diff --git a/ctsPerf/ctsPerf.vcxproj b/ctsPerf/ctsPerf.vcxproj
@@ -422,12 +422,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>
diff --git a/ctsPerf/packages.config b/ctsPerf/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.230202.1" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231028.1" targetFramework="native" />
 </packages>
diff --git a/ctsTraffic/Resource.rc b/ctsTraffic/Resource.rc
diff --git a/ctsTraffic/ctsAcceptEx.cpp b/ctsTraffic/ctsAcceptEx.cpp
@@ -420,7 +420,7 @@ namespace details
         FAIL_FAST_IF_MSG(
             err != 0,
             "setsockopt(SO_UPDATE_ACCEPT_CONTEXT) failed [%d], accept socket [%p], listen socket [%p]",
-            WSAGetLastError(), m_acceptSocket.get(), listeningSocket);
+            WSAGetLastError(), reinterpret_cast<void*>(m_acceptSocket.get()), reinterpret_cast<void*>(listeningSocket));
 
         SOCKADDR_INET* localAddr{};
         auto localAddrLen = static_cast<int>(sizeof SOCKADDR_INET);

diff --git a/ctsTraffic/ctsConfig.cpp b/ctsTraffic/ctsConfig.cpp
@@ -3126,7 +3126,7 @@ namespace ctsTraffic::ctsConfig
 
         if (g_breakOnError)
         {
-            FAIL_FAST_MSG(ctString::convert_to_string(text).c_str());
+            FAIL_FAST_MSG("%ws", text);
         }
 
         fwprintf(stderr, L"%ws\n", text);
@@ -3933,7 +3933,7 @@ namespace ctsTraffic::ctsConfig
 
         if (g_breakOnError)
         {
-            FAIL_FAST_MSG(ctString::convert_to_string(text).c_str());
+            FAIL_FAST_MSG("%ws", text);
         }
 
         auto writeToConsole = false;

diff --git a/ctsTraffic/ctsTraffic.vcxproj b/ctsTraffic/ctsTraffic.vcxproj
@@ -482,12 +482,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.230202.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>
diff --git a/ctsTraffic/packages.config b/ctsTraffic/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.230202.1" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231028.1" targetFramework="native" />
 </packages>