From 8f1ddc86db4abd2e2f9a98f322543316ecbd09af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= <nefarius@dhmx.at>
Date: Sat, 21 Nov 2020 14:06:43 +0100
Subject: [PATCH] Reworked includes Added DMF include and library paths

---
 sys/Driver.cpp       |  5 +++--
 sys/Driver.h         |  8 +++++---
 sys/Queue.cpp        |  3 ++-
 sys/ViGEmBus.vcxproj | 12 ++++++++----
 sys/busenum.cpp      |  1 +
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/sys/Driver.cpp b/sys/Driver.cpp
index 342cadf..64e0ee3 100644
--- a/sys/Driver.cpp
+++ b/sys/Driver.cpp
@@ -34,7 +34,8 @@
 
 
 #include "Driver.h"
-#include "driver.tmh"
+#include "trace.h"
+#include "Driver.tmh"
 #include <wdmguid.h>
 
 #ifdef ALLOC_PRAGMA
@@ -45,7 +46,7 @@
 #pragma alloc_text (PAGE, Bus_EvtDriverContextCleanup)
 #endif
 
-
+#include "Queue.hpp"
 #include "EmulationTargetPDO.hpp"
 #include "XusbPdo.hpp"
 #include "Ds4Pdo.hpp"
diff --git a/sys/Driver.h b/sys/Driver.h
index 76f99d9..7d3f4a9 100644
--- a/sys/Driver.h
+++ b/sys/Driver.h
@@ -35,14 +35,16 @@
 
 #pragma once
 
-#include "trace.h"
+#include <initguid.h>
+//#pragma warning(disable:5040)
+//#include <DmfModules.Library.h>
+//#pragma warning(default:5040)
 #include <ntddk.h>
 #include <wdf.h>
 #define NTSTRSAFE_LIB
 #include <ntstrsafe.h>
-#include <initguid.h>
+
 #include <ViGEm/km/BusShared.h>
-#include "Queue.hpp"
 
 
 
diff --git a/sys/Queue.cpp b/sys/Queue.cpp
index 9f49a76..e5c0eb2 100644
--- a/sys/Queue.cpp
+++ b/sys/Queue.cpp
@@ -34,7 +34,8 @@
 
 
 #include "Driver.h"
-#include "queue.tmh"
+#include "trace.h"
+#include "Queue.tmh"
 
 #include "EmulationTargetPDO.hpp"
 #include "XusbPdo.hpp"
diff --git a/sys/ViGEmBus.vcxproj b/sys/ViGEmBus.vcxproj
index 9b7a61e..d44cd3f 100644
--- a/sys/ViGEmBus.vcxproj
+++ b/sys/ViGEmBus.vcxproj
@@ -120,7 +120,7 @@
       <TimeStamp>$(AppVeyorBuildVersion)</TimeStamp>
     </Inf>
     <Link>
-      <AdditionalDependencies>$(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\DMF\$(Configuration)\$(Platform)\lib\DmfK\DmfK.lib;$(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ClCompile>
       <WppRecorderEnabled>true</WppRecorderEnabled>
@@ -128,6 +128,7 @@
       <WppKernelMode>true</WppKernelMode>
       <WppScanConfigurationData>trace.h</WppScanConfigurationData>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>..\..\DMF\DMF\Modules.Library;..\..\DMF\DMF\Framework;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -135,7 +136,7 @@
       <TimeStamp>$(AppVeyorBuildVersion)</TimeStamp>
     </Inf>
     <Link>
-      <AdditionalDependencies>$(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\DMF\$(Configuration)\$(Platform)\lib\DmfK\DmfK.lib;$(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -146,6 +147,7 @@
       <WppEnabled>true</WppEnabled>
       <WppScanConfigurationData>trace.h</WppScanConfigurationData>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>..\..\DMF\DMF\Modules.Library;..\..\DMF\DMF\Framework;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -153,7 +155,7 @@
       <TimeStamp>$(AppVeyorBuildVersion)</TimeStamp>
     </Inf>
     <Link>
-      <AdditionalDependencies>$(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\DMF\$(Configuration)\$(Platform)\lib\DmfK\DmfK.lib;$(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <ClCompile>
@@ -161,6 +163,7 @@
       <WppEnabled>true</WppEnabled>
       <WppScanConfigurationData>trace.h</WppScanConfigurationData>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>..\..\DMF\DMF\Modules.Library;..\..\DMF\DMF\Framework;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -168,7 +171,7 @@
       <TimeStamp>$(AppVeyorBuildVersion)</TimeStamp>
     </Inf>
     <Link>
-      <AdditionalDependencies>$(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\DMF\$(Configuration)\$(Platform)\lib\DmfK\DmfK.lib;$(DDK_LIB_PATH)ntstrsafe.lib;$(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <ClCompile>
@@ -180,6 +183,7 @@
       <WppEnabled>true</WppEnabled>
       <WppScanConfigurationData>trace.h</WppScanConfigurationData>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>..\..\DMF\DMF\Modules.Library;..\..\DMF\DMF\Framework;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/sys/busenum.cpp b/sys/busenum.cpp
index ccad29e..44bd8b5 100644
--- a/sys/busenum.cpp
+++ b/sys/busenum.cpp
@@ -34,6 +34,7 @@
 
 
 #include "Driver.h"
+#include "trace.h"
 #include "busenum.tmh"
 
 #include "EmulationTargetPDO.hpp"