From 36217d173c591a7b739a842ff573e14a7a3d12a7 Mon Sep 17 00:00:00 2001
From: physics-sp <physics-sp@protonmail.com>
Date: Wed, 21 Jul 2021 19:18:15 -0300
Subject: [PATCH] fix integration bugs with SysWhispers2

---
 DarkLoadLibrary/DarkLoadLibrary.vcxproj            |  6 +++++-
 DarkLoadLibrary/DarkLoadLibrary.vcxproj.filters    | 11 +++++++++++
 DarkLoadLibrary/src/ldrutils.c                     |  3 +++
 DarkLoadLibrary/src/main.c                         |  1 -
 DarkLoadLibrary/{include => src}/syscallsstubs.asm |  0
 5 files changed, 19 insertions(+), 2 deletions(-)
 rename DarkLoadLibrary/{include => src}/syscallsstubs.asm (100%)

diff --git a/DarkLoadLibrary/DarkLoadLibrary.vcxproj b/DarkLoadLibrary/DarkLoadLibrary.vcxproj
index db6f3d8..50d5e2b 100644
--- a/DarkLoadLibrary/DarkLoadLibrary.vcxproj
+++ b/DarkLoadLibrary/DarkLoadLibrary.vcxproj
@@ -56,6 +56,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
@@ -153,6 +154,9 @@
     <ClCompile Include="src\main.c" />
     <ClCompile Include="src\pebutils.c" />
     <ClCompile Include="src\syscalls.c" />
+    <MASM Include="src\syscallsstubs.asm">
+      <FileType>Document</FileType>
+    </MASM>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\darkloadlibrary.h" />
@@ -160,9 +164,9 @@
     <ClInclude Include="include\pebstructs.h" />
     <ClInclude Include="include\pebutils.h" />
     <ClInclude Include="include\syscalls.h" />
-    <ClInclude Include="include\syscallsstubs.asm" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/DarkLoadLibrary/DarkLoadLibrary.vcxproj.filters b/DarkLoadLibrary/DarkLoadLibrary.vcxproj.filters
index 8dead88..216d072 100644
--- a/DarkLoadLibrary/DarkLoadLibrary.vcxproj.filters
+++ b/DarkLoadLibrary/DarkLoadLibrary.vcxproj.filters
@@ -27,6 +27,9 @@
     <ClCompile Include="src\main.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\syscalls.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\darkloadlibrary.h">
@@ -41,5 +44,13 @@
     <ClInclude Include="include\pebutils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\syscalls.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <MASM Include="src\syscallsstubs.asm">
+      <Filter>Source Files</Filter>
+    </MASM>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/DarkLoadLibrary/src/ldrutils.c b/DarkLoadLibrary/src/ldrutils.c
index cd828b3..fc0e4c0 100644
--- a/DarkLoadLibrary/src/ldrutils.c
+++ b/DarkLoadLibrary/src/ldrutils.c
@@ -1,4 +1,7 @@
 #include "ldrutils.h"
+#if _M_X64
+#include "syscalls.h"
+#endif
 
 BOOL IsValidPE(
     PBYTE pbData
diff --git a/DarkLoadLibrary/src/main.c b/DarkLoadLibrary/src/main.c
index c796db5..a53f7e8 100644
--- a/DarkLoadLibrary/src/main.c
+++ b/DarkLoadLibrary/src/main.c
@@ -2,7 +2,6 @@
 #include <windows.h>
 
 #include "darkloadlibrary.h"
-#include "syscalls.h"
 
 typedef DWORD (WINAPI * _ThisIsAFunction) (LPCWSTR);
 
diff --git a/DarkLoadLibrary/include/syscallsstubs.asm b/DarkLoadLibrary/src/syscallsstubs.asm
similarity index 100%
rename from DarkLoadLibrary/include/syscallsstubs.asm
rename to DarkLoadLibrary/src/syscallsstubs.asm