get rid of modifications to the public header

Author: ProjectsByJackHe

src/inc/msquic_posix.h

@@ -39,7 +39,6 @@
 #include "quic_sal_stub.h"
 
 #define QUIC_INLINE static inline
-#define QUIC_INVALID_FILE_HANDLE         -1
 
 #ifdef __cplusplus
 extern "C++" {

src/inc/msquic_winkernel.h

@@ -28,7 +28,6 @@
 #include <ntintsafe.h>
 
 #define QUIC_INLINE inline
-#define QUIC_INVALID_FILE_HANDLE         -1
 
 typedef INT8 int8_t;
 typedef INT16 int16_t;

src/inc/msquic_winuser.h

@@ -39,7 +39,6 @@
 #include <stdint.h>
 
 #define QUIC_INLINE inline
-#define QUIC_INVALID_FILE_HANDLE         -1
 
 #define SUCCESS_HRESULT_FROM_WIN32(x) \
     ((HRESULT)(((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16)))

src/platform/unittest/DataPathTest.cpp

@@ -19,6 +19,8 @@
 #include "DataPathTest.cpp.clog.h"
 #endif
 
+#define QUIC_INVALID_FILE_HANDLE (-1)
+
 extern bool UseDuoNic;
 
 //
@@ -1493,6 +1495,45 @@ TEST_F(DataPathTest, XdpMapMode_InitFailsWithoutRawDatapath)
     CxPlatWorkerPoolDelete(WorkerPool, CXPLAT_WORKER_POOL_REF_TOOL);
 }
 
+TEST_F(DataPathTest, XdpMapMode_InitSucceedsWithRawDatapath)
+{
+    //
+    // 1-map config succeeds when DuoNic/XDP (raw datapath) is
+    // available.
+    //
+    if (!UseDuoNic) {
+        GTEST_SKIP_NO_RETURN_("Requires DuoNic/XDP for raw datapath init");
+        return;
+    }
+
+    const uint32_t FakeIfIndex = 0xDEAD;
+    const QUIC_XDP_MAP_HANDLE FakeHandle = (QUIC_XDP_MAP_HANDLE)QUIC_INVALID_FILE_HANDLE;
+    CXPLAT_XDP_MAP_CONFIG MapConfig = { FakeIfIndex, FakeHandle };
+
+    CXPLAT_WORKER_POOL* WorkerPool =
+        CxPlatWorkerPoolCreate(nullptr, CXPLAT_WORKER_POOL_REF_TOOL);
+    ASSERT_NE(nullptr, WorkerPool);
+
+    CXPLAT_DATAPATH_INIT_CONFIG InitConfig = {0};
+    InitConfig.XdpMapConfigs = &MapConfig;
+    InitConfig.XdpMapConfigCount = 1;
+
+    CXPLAT_DATAPATH* Datapath = nullptr;
+    QUIC_STATUS Status =
+        CxPlatDataPathInitialize(
+            0,
+            &EmptyUdpCallbacks,
+            nullptr,
+            WorkerPool,
+            &InitConfig,
+            &Datapath);
+    VERIFY_QUIC_SUCCESS(Status);
+    ASSERT_NE(nullptr, Datapath);
+
+    CxPlatDataPathUninitialize(Datapath);
+    CxPlatWorkerPoolDelete(WorkerPool, CXPLAT_WORKER_POOL_REF_TOOL);
+}
+
 TEST_F(DataPathTest, XdpMapMode_SingleUnknownIfIndex)
 {
     //

src/rs/ffi/linux_bindings.rs

@@ -136,7 +136,6 @@ where
         }
     }
 }
-pub const QUIC_INVALID_FILE_HANDLE: i32 = -1;
 pub const QUIC_ADDRESS_FAMILY_UNSPEC: u32 = 0;
 pub const QUIC_ADDRESS_FAMILY_INET: u32 = 2;
 pub const QUIC_ADDRESS_FAMILY_INET6: u32 = 10;

src/rs/ffi/win_bindings.rs

@@ -136,7 +136,6 @@ where
         }
     }
 }
-pub const QUIC_INVALID_FILE_HANDLE: i32 = -1;
 pub const QUIC_ADDRESS_FAMILY_UNSPEC: u32 = 0;
 pub const QUIC_ADDRESS_FAMILY_INET: u32 = 2;
 pub const QUIC_ADDRESS_FAMILY_INET6: u32 = 23;