From a1501ceb8fdb5aaf03622655ea0dbd205e31e96b Mon Sep 17 00:00:00 2001
From: Venkata Naga Kartik Pidatala <vpidatala@microsoft.com>
Date: Wed, 8 Jan 2025 16:47:50 -0800
Subject: [PATCH] reverting netevent,ntos changes

---
 .../neteventebpfext/netevent_ebpf_ext_event.c    |  1 +
 .../neteventebpfext/sys/neteventebpfext.vcxproj  |  3 +--
 .../sys/neteventebpfext.vcxproj.filters          |  3 ---
 .../user/netevent_ebpf_ext_platform.h            | 16 ----------------
 .../ntosebpfext/sys/ntosebpfext.vcxproj          |  2 +-
 .../ntosebpfext/user/ntosebpfext_user.vcxproj    |  2 +-
 .../user/ntosebpfext_user.vcxproj.filters        | 14 +++++++-------
 7 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/ebpf_extensions/neteventebpfext/netevent_ebpf_ext_event.c b/ebpf_extensions/neteventebpfext/netevent_ebpf_ext_event.c
index 61c59e41..9a54a276 100644
--- a/ebpf_extensions/neteventebpfext/netevent_ebpf_ext_event.c
+++ b/ebpf_extensions/neteventebpfext/netevent_ebpf_ext_event.c
@@ -9,6 +9,7 @@
 #include "ebpf_netevent_hooks.h"
 #include "netevent_ebpf_ext_event.h"
 #include "netevent_ebpf_ext_program_info.h"
+
 #include <errno.h>
 
 //
diff --git a/ebpf_extensions/neteventebpfext/sys/neteventebpfext.vcxproj b/ebpf_extensions/neteventebpfext/sys/neteventebpfext.vcxproj
index 9bb13f3a..e0d31fab 100644
--- a/ebpf_extensions/neteventebpfext/sys/neteventebpfext.vcxproj
+++ b/ebpf_extensions/neteventebpfext/sys/neteventebpfext.vcxproj
@@ -190,7 +190,7 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include;$(SolutionDir)libs\include\kernel;$(SolutionDir)include\kernel;$(SolutionDir)resource;$(SolutionDir)neteventebpfext;$(SolutionDir)external\usersim\src;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SolutionDir)include;$(SolutionDir)libs\include\kernel;$(SolutionDir)include\kernel;$(SolutionDir)resource;$(SolutionDir)neteventebpfext</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;POOL_NX_OPTIN_AUTO;PROVIDER_NAME=netevent</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
@@ -225,7 +225,6 @@
     <ClInclude Include="..\..\..\libs\ebpf_ext\ebpf_ext_hook_provider.h" />
     <ClInclude Include="..\..\..\libs\ebpf_ext\ebpf_ext_prog_info_provider.h" />
     <ClInclude Include="..\..\..\libs\ebpf_ext\ebpf_ext_tracelog.h" />
-    <ClInclude Include="..\..\..\packages\eBPF-for-Windows.0.18.0\build\native\include\ebpf_extension.h" />
     <ClInclude Include="..\netevent_ebpf_ext_event.h" />
     <ClInclude Include="..\netevent_ebpf_ext_program_info.h" />
     <ClInclude Include="resource.h" />
diff --git a/ebpf_extensions/neteventebpfext/sys/neteventebpfext.vcxproj.filters b/ebpf_extensions/neteventebpfext/sys/neteventebpfext.vcxproj.filters
index 422fc222..6fb14cf6 100644
--- a/ebpf_extensions/neteventebpfext/sys/neteventebpfext.vcxproj.filters
+++ b/ebpf_extensions/neteventebpfext/sys/neteventebpfext.vcxproj.filters
@@ -69,9 +69,6 @@
     <ClInclude Include="..\..\..\libs\ebpf_ext\ebpf_ext_tracelog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\packages\eBPF-for-Windows.0.18.0\build\native\include\ebpf_extension.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/ebpf_extensions/neteventebpfext/user/netevent_ebpf_ext_platform.h b/ebpf_extensions/neteventebpfext/user/netevent_ebpf_ext_platform.h
index aea905b7..42b0c913 100644
--- a/ebpf_extensions/neteventebpfext/user/netevent_ebpf_ext_platform.h
+++ b/ebpf_extensions/neteventebpfext/user/netevent_ebpf_ext_platform.h
@@ -4,19 +4,3 @@
 #pragma once
 
 #include "usersim/../../src/net_platform.h"
-#include "ndis.h"
-#include "cxplat.h"
-#include "ebpf_extension.h"
-#include "ebpf_program_types.h"
-#include "ebpf_result.h"
-#include "ebpf_windows.h"
-#include "shared_context.h"
-
-#include <specstrings.h>
-#include <stdint.h>
-
-#include "ebpf_nethooks.h"
-#include "ebpf_program_attach_type_guids.h"
-#include "ebpf_program_types.h"
-#include "ebpf_windows.h"
-
diff --git a/ebpf_extensions/ntosebpfext/sys/ntosebpfext.vcxproj b/ebpf_extensions/ntosebpfext/sys/ntosebpfext.vcxproj
index d24e9ce4..919829b8 100644
--- a/ebpf_extensions/ntosebpfext/sys/ntosebpfext.vcxproj
+++ b/ebpf_extensions/ntosebpfext/sys/ntosebpfext.vcxproj
@@ -24,7 +24,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{CED1E84E-D502-44AC-9072-C1159C01AB26}</ProjectGuid>
+    <ProjectGuid>{55499E36-37D4-4F86-B694-9F2990315758}</ProjectGuid>
     <TemplateGuid>{1bc93793-694f-48fe-9372-81e2b05556fd}</TemplateGuid>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
diff --git a/ebpf_extensions/ntosebpfext/user/ntosebpfext_user.vcxproj b/ebpf_extensions/ntosebpfext/user/ntosebpfext_user.vcxproj
index aff0f9bb..5bd14be0 100644
--- a/ebpf_extensions/ntosebpfext/user/ntosebpfext_user.vcxproj
+++ b/ebpf_extensions/ntosebpfext/user/ntosebpfext_user.vcxproj
@@ -18,7 +18,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{1D0D0C27-0045-47DD-95D5-B15E8B37E486}</ProjectGuid>
+    <ProjectGuid>{630bb78f-6211-41d8-8e3a-096e22e169ef}</ProjectGuid>
     <RootNamespace>ntosebpfextunit</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>ntosebpfext_user</ProjectName>
diff --git a/ebpf_extensions/ntosebpfext/user/ntosebpfext_user.vcxproj.filters b/ebpf_extensions/ntosebpfext/user/ntosebpfext_user.vcxproj.filters
index 28bd2fe9..27ca089e 100644
--- a/ebpf_extensions/ntosebpfext/user/ntosebpfext_user.vcxproj.filters
+++ b/ebpf_extensions/ntosebpfext/user/ntosebpfext_user.vcxproj.filters
@@ -25,13 +25,13 @@
     <ClCompile Include="..\..\..\libs\ebpf_ext\ebpf_ext.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\libs\ebpf_ext\ebpf_ext_hook_provider.c">
+    <ClCompile Include="..\..\libs\ebpf_ext\ebpf_ext_hook_provider.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\libs\ebpf_ext\ebpf_ext_prog_info_provider.c">
+    <ClCompile Include="..\..\libs\ebpf_ext\ebpf_ext_prog_info_provider.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\libs\ebpf_ext\ebpf_ext_tracelog.c">
+    <ClCompile Include="..\..\libs\ebpf_ext\ebpf_ext_tracelog.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -45,16 +45,16 @@
     <ClInclude Include="..\ntos_ebpf_ext_process.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\libs\ebpf_ext\ebpf_ext.h">
+    <ClInclude Include="..\..\libs\ebpf_ext\ebpf_ext.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\libs\ebpf_ext\ebpf_ext_hook_provider.h">
+    <ClInclude Include="..\..\libs\ebpf_ext\ebpf_ext_hook_provider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\libs\ebpf_ext\ebpf_ext_prog_info_provider.h">
+    <ClInclude Include="..\..\libs\ebpf_ext\ebpf_ext_prog_info_provider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\libs\ebpf_ext\ebpf_ext_tracelog.h">
+    <ClInclude Include="..\..\libs\ebpf_ext\ebpf_ext_tracelog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>