From aecb55286a85cdbb7ec79bce34a121902ad698f7 Mon Sep 17 00:00:00 2001
From: narzoul <narzoul@users.noreply.github.com>
Date: Mon, 15 Mar 2021 11:09:17 +0100
Subject: [PATCH] Updated project to SDK/WDK 10.0.19041.0

---
 DDrawCompat/D3dDdi/Device.cpp                 |  2 +-
 DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.h   |  2 +-
 DDrawCompat/D3dDdi/Log/KernelModeThunksLog.h  |  2 +-
 .../D3dDdi/Visitors/AdapterCallbacksVisitor.h |  7 +++-
 .../D3dDdi/Visitors/DeviceCallbacksVisitor.h  | 38 +++++++++++++++++++
 DDrawCompat/DDrawCompat.vcxproj               |  2 +-
 6 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/DDrawCompat/D3dDdi/Device.cpp b/DDrawCompat/D3dDdi/Device.cpp
index 11ac1cb..ff4b94b 100644
--- a/DDrawCompat/D3dDdi/Device.cpp
+++ b/DDrawCompat/D3dDdi/Device.cpp
@@ -2,7 +2,7 @@
 
 #include <d3d.h>
 #include <winternl.h>
-#include <../km/d3dkmthk.h>
+#include <d3dkmthk.h>
 
 #include <Common/CompatVtable.h>
 #include <Common/HResultException.h>
diff --git a/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.h b/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.h
index 27896d1..649938b 100644
--- a/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.h
+++ b/DDrawCompat/D3dDdi/Log/DeviceCallbacksLog.h
@@ -5,7 +5,7 @@
 #include <d3d.h>
 #include <d3dumddi.h>
 #include <winternl.h>
-#include <../km/d3dkmthk.h>
+#include <d3dkmthk.h>
 
 #include <D3dDdi/Log/CommonLog.h>
 
diff --git a/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.h b/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.h
index 76577fc..56b6e9a 100644
--- a/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.h
+++ b/DDrawCompat/D3dDdi/Log/KernelModeThunksLog.h
@@ -5,7 +5,7 @@
 #include <d3d.h>
 #include <d3dumddi.h>
 #include <winternl.h>
-#include <../km/d3dkmthk.h>
+#include <d3dkmthk.h>
 
 #include <D3dDdi/Log/CommonLog.h>
 
diff --git a/DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h b/DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h
index 62ff12a..804aadd 100644
--- a/DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h
+++ b/DDrawCompat/D3dDdi/Visitors/AdapterCallbacksVisitor.h
@@ -9,9 +9,14 @@ template <>
 struct VtableForEach<D3DDDI_ADAPTERCALLBACKS>
 {
 	template <typename Vtable, typename Visitor>
-	static void forEach(Visitor& visitor, UINT /*version*/)
+	static void forEach(Visitor& visitor, UINT version)
 	{
 		DD_VISIT(pfnQueryAdapterInfoCb);
 		DD_VISIT(pfnGetMultisampleMethodListCb);
+
+		if (version >= D3D_UMD_INTERFACE_VERSION_WDDM2_4)
+		{
+			DD_VISIT(pfnQueryAdapterInfoCb2);
+		}
 	}
 };
diff --git a/DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h b/DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h
index 4629698..ebdaffa 100644
--- a/DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h
+++ b/DDrawCompat/D3dDdi/Visitors/DeviceCallbacksVisitor.h
@@ -73,5 +73,43 @@ struct VtableForEach<D3DDDI_DEVICECALLBACKS>
 			DD_VISIT(pfnReclaimAllocations2Cb);
 			DD_VISIT(pfnGetResourcePresentPrivateDriverDataCb);
 		}
+
+		if (version >= D3D_UMD_INTERFACE_VERSION_WDDM2_1_1)
+		{
+			DD_VISIT(pfnUpdateAllocationPropertyCb);
+			DD_VISIT(pfnOfferAllocations2Cb);
+		}
+
+		if (version >= D3D_UMD_INTERFACE_VERSION_WDDM2_1_2)
+		{
+			DD_VISIT(pfnReclaimAllocations3Cb);
+			DD_VISIT(pfnAcquireResourceCb);
+		}
+
+		if (version >= D3D_UMD_INTERFACE_VERSION_WDDM2_1_3)
+		{
+			DD_VISIT(pfnReleaseResourceCb);
+		}
+
+		if (version >= D3D_UMD_INTERFACE_VERSION_WDDM2_2_1)
+		{
+			DD_VISIT(pfnCreateHwContextCb);
+			DD_VISIT(pfnDestroyHwContextCb);
+			DD_VISIT(pfnCreateHwQueueCb);
+			DD_VISIT(pfnDestroyHwQueueCb);
+			DD_VISIT(pfnSubmitCommandToHwQueueCb);
+			DD_VISIT(pfnSubmitWaitForSyncObjectsToHwQueueCb);
+			DD_VISIT(pfnSubmitSignalSyncObjectsToHwQueueCb);
+		}
+
+		if (version >= D3D_UMD_INTERFACE_VERSION_WDDM2_4_2)
+		{
+			DD_VISIT(pfnSubmitPresentBltToHwQueueCb);
+		}
+
+		if (version >= D3D_UMD_INTERFACE_VERSION_WDDM2_5_2)
+		{
+			DD_VISIT(pfnSubmitPresentToHwQueueCb);
+		}
 	}
 };
diff --git a/DDrawCompat/DDrawCompat.vcxproj b/DDrawCompat/DDrawCompat.vcxproj
index 6c0a6ce..711aeea 100644
--- a/DDrawCompat/DDrawCompat.vcxproj
+++ b/DDrawCompat/DDrawCompat.vcxproj
@@ -18,7 +18,7 @@
     <ProjectGuid>{1146187A-17DE-4350-B9D1-9F9EAA934908}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>DDrawCompat</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">