Few fixes

microsoft · Dec 3, 2023 · eaea4f3 · eaea4f3
1 parent c959815
commit eaea4f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/inc/msquic.hpp b/src/inc/msquic.hpp
@@ -74,14 +74,16 @@ struct CxPlatLock {
     void Release() noexcept { CxPlatLockRelease(&Handle); }
 };
 
+#pragma warning(push)
+#pragma warning(disable:28167) // TODO - Fix SAL annotations for IRQL changes
 struct CxPlatLockDispatch {
     CXPLAT_DISPATCH_LOCK Handle;
     CxPlatLockDispatch() noexcept { CxPlatDispatchLockInitialize(&Handle); }
     ~CxPlatLockDispatch() noexcept { CxPlatDispatchLockUninitialize(&Handle); }
-    _IRQL_raises_(DISPATCH_LEVEL)
     void Acquire() noexcept { CxPlatDispatchLockAcquire(&Handle); }
     void Release() noexcept { CxPlatDispatchLockRelease(&Handle); }
 };
+#pragma warning(pop)
 
 struct CxPlatPool {
     CXPLAT_POOL Handle;

diff --git a/src/perf/bin/appmain.cpp b/src/perf/bin/appmain.cpp
@@ -382,7 +382,7 @@ main(
     constexpr const char* DriverSearch = "driverName";
     size_t DriverLen = strlen(DriverSearch);
 
-    UniquePtr<char*[]> ArgValues = UniquePtr<char*[]>(new char*[argc]);
+    UniquePtr<char*[]> ArgValues = UniquePtr<char*[]>(new (std::nothrow) char*[argc]);
 
     if (ArgValues.get() == nullptr) {
         return QUIC_STATUS_OUT_OF_MEMORY;

diff --git a/src/perf/lib/PerfClient.cpp b/src/perf/lib/PerfClient.cpp
@@ -501,7 +501,7 @@ PerfClientConnection::Initialize() {
         Worker.Lock.Release();
         auto CredConfig = MsQuicCredentialConfig(QUIC_CREDENTIAL_FLAG_CLIENT | QUIC_CREDENTIAL_FLAG_NO_CERTIFICATE_VALIDATION);
         TcpConn = // TODO: replace new/delete with pool alloc/free
-            new TcpConnection(
+            new (std::nothrow) TcpConnection(
                 Client.Engine.get(),
                 &CredConfig,
                 Client.TargetFamily,