From 48226eeb5596df68f43fe7a3104a1f2ce3892ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20L=C3=B6nnhager?= <david.l@mullvad.net>
Date: Thu, 18 Apr 2024 10:07:06 +0200
Subject: [PATCH 1/2] Bump binaries submodule

Also update driverlogic to point to the new wireguard header
---
 dist-assets/binaries                                     | 2 +-
 windows/driverlogic/driverlogic.vcxproj                  | 6 +++---
 windows/driverlogic/driverlogic.vcxproj.filters          | 2 +-
 windows/driverlogic/src/driverlogic.cpp                  | 2 +-
 windows/driverlogic/src/{wireguard_dll.h => wireguard.h} | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename windows/driverlogic/src/{wireguard_dll.h => wireguard.h} (96%)

diff --git a/dist-assets/binaries b/dist-assets/binaries
index d9edc48af33d..7db2c76522e2 160000
--- a/dist-assets/binaries
+++ b/dist-assets/binaries
@@ -1 +1 @@
-Subproject commit d9edc48af33db4afbcb8d6c7754e1dfe963d5172
+Subproject commit 7db2c76522e29b4acd8f461fc87f794954c6df95
diff --git a/windows/driverlogic/driverlogic.vcxproj b/windows/driverlogic/driverlogic.vcxproj
index ab9e6c19b5f5..c68d0568ab82 100644
--- a/windows/driverlogic/driverlogic.vcxproj
+++ b/windows/driverlogic/driverlogic.vcxproj
@@ -61,7 +61,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../dist-assets/binaries/wireguard-nt/api/;$(ProjectDir)../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
@@ -83,7 +83,7 @@
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>$(ProjectDir)../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../dist-assets/binaries/wireguard-nt/api/;$(ProjectDir)../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -115,7 +115,7 @@
     <ClInclude Include="src\targetver.h" />
     <ClInclude Include="src\util.h" />
     <ClInclude Include="src\wintun.h" />
-    <ClInclude Include="src\wireguard_dll.h" />
+    <ClInclude Include="src\wireguard.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/windows/driverlogic/driverlogic.vcxproj.filters b/windows/driverlogic/driverlogic.vcxproj.filters
index fae74cfdee3e..bd73d300299b 100644
--- a/windows/driverlogic/driverlogic.vcxproj.filters
+++ b/windows/driverlogic/driverlogic.vcxproj.filters
@@ -26,6 +26,6 @@
     <ClInclude Include="src\util.h" />
     <ClInclude Include="src\wintun.h" />
     <ClInclude Include="src\devenum.h" />
-    <ClInclude Include="src\wireguard_dll.h" />
+    <ClInclude Include="src\wireguard.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/windows/driverlogic/src/driverlogic.cpp b/windows/driverlogic/src/driverlogic.cpp
index 795960b6d2f9..7cd8cf5f51fc 100644
--- a/windows/driverlogic/src/driverlogic.cpp
+++ b/windows/driverlogic/src/driverlogic.cpp
@@ -4,7 +4,7 @@
 #include "service.h"
 #include "log.h"
 #include "wintun.h"
-#include "wireguard_dll.h"
+#include "wireguard.h"
 #include "devenum.h"
 #include <string>
 #include <libcommon/error.h>
diff --git a/windows/driverlogic/src/wireguard_dll.h b/windows/driverlogic/src/wireguard.h
similarity index 96%
rename from windows/driverlogic/src/wireguard_dll.h
rename to windows/driverlogic/src/wireguard.h
index 7260ce5b4dfa..e99da56c05c5 100644
--- a/windows/driverlogic/src/wireguard_dll.h
+++ b/windows/driverlogic/src/wireguard.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <wireguard.h>
+#include <wireguard-nt/wireguard.h>
 #include <libcommon/error.h>
 #include "util.h"
 

From c80d2d35b33f367bf4aec014c3751663b616fb04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20L=C3=B6nnhager?= <david.l@mullvad.net>
Date: Thu, 18 Apr 2024 10:21:22 +0200
Subject: [PATCH 2/2] Remove pointless submodule update

---
 .github/workflows/daemon.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml
index a5107fbcf8c1..3293e028791e 100644
--- a/.github/workflows/daemon.yml
+++ b/.github/workflows/daemon.yml
@@ -114,10 +114,6 @@ jobs:
       - name: Checkout submodules
         run: git submodule update --init --depth=1
 
-      - name: Checkout wireguard-nt
-        working-directory: dist-assets/binaries
-        run: git submodule update --init -- wireguard-nt
-
       - name: Install Protoc
         uses: arduino/setup-protoc@v1
         with: