From 4b02a40bc9c94f4706c11366e7f1920e28590d4f Mon Sep 17 00:00:00 2001
From: narzoul <narzoul@users.noreply.github.com>
Date: Sat, 27 May 2017 22:14:48 +0200
Subject: [PATCH] Hooked the IDirectDrawGammaControl interface

---
 DDrawCompat/Common/CompatQueryInterface.h        |  1 +
 DDrawCompat/DDraw/DirectDrawGammaControl.cpp     |  8 ++++++++
 DDrawCompat/DDraw/DirectDrawGammaControl.h       | 15 +++++++++++++++
 DDrawCompat/DDraw/Hooks.cpp                      |  7 ++++++-
 .../Visitors/DirectDrawGammaControlVtblVisitor.h | 16 ++++++++++++++++
 DDrawCompat/DDrawCompat.vcxproj                  |  3 +++
 DDrawCompat/DDrawCompat.vcxproj.filters          |  9 +++++++++
 7 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 DDrawCompat/DDraw/DirectDrawGammaControl.cpp
 create mode 100644 DDrawCompat/DDraw/DirectDrawGammaControl.h
 create mode 100644 DDrawCompat/DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h

diff --git a/DDrawCompat/Common/CompatQueryInterface.h b/DDrawCompat/Common/CompatQueryInterface.h
index 8483241..9398082 100644
--- a/DDrawCompat/Common/CompatQueryInterface.h
+++ b/DDrawCompat/Common/CompatQueryInterface.h
@@ -40,6 +40,7 @@ namespace Compat
 	DEFINE_BASE_INTF(IDirectDrawSurface3, IDirectDrawSurface);
 	DEFINE_BASE_INTF(IDirectDrawSurface4, IDirectDrawSurface);
 	DEFINE_BASE_INTF(IDirectDrawSurface7, IDirectDrawSurface);
+	DEFINE_BASE_INTF(IDirectDrawGammaControl, IDirectDrawSurface);
 
 	DEFINE_BASE_INTF(IDirect3D, IDirectDraw);
 	DEFINE_BASE_INTF(IDirect3D2, IDirectDraw);
diff --git a/DDrawCompat/DDraw/DirectDrawGammaControl.cpp b/DDrawCompat/DDraw/DirectDrawGammaControl.cpp
new file mode 100644
index 0000000..09f8762
--- /dev/null
+++ b/DDrawCompat/DDraw/DirectDrawGammaControl.cpp
@@ -0,0 +1,8 @@
+#include "DDraw/DirectDrawGammaControl.h"
+
+namespace DDraw
+{
+	void DirectDrawGammaControl::setCompatVtable(IDirectDrawGammaControlVtbl& /*vtable*/)
+	{
+	}
+}
diff --git a/DDrawCompat/DDraw/DirectDrawGammaControl.h b/DDrawCompat/DDraw/DirectDrawGammaControl.h
new file mode 100644
index 0000000..aa53078
--- /dev/null
+++ b/DDrawCompat/DDraw/DirectDrawGammaControl.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "Common/CompatVtable.h"
+#include "DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h"
+
+namespace DDraw
+{
+	class DirectDrawGammaControl : public CompatVtable<IDirectDrawGammaControlVtbl>
+	{
+	public:
+		static void setCompatVtable(IDirectDrawGammaControlVtbl& vtable);
+	};
+}
+
+SET_COMPAT_VTABLE(IDirectDrawGammaControlVtbl, DDraw::DirectDrawGammaControl);
diff --git a/DDrawCompat/DDraw/Hooks.cpp b/DDrawCompat/DDraw/Hooks.cpp
index a9a4515..b21a36b 100644
--- a/DDrawCompat/DDraw/Hooks.cpp
+++ b/DDrawCompat/DDraw/Hooks.cpp
@@ -8,6 +8,7 @@
 #include "DDraw/ActivateAppHandler.h"
 #include "DDraw/DirectDraw.h"
 #include "DDraw/DirectDrawClipper.h"
+#include "DDraw/DirectDrawGammaControl.h"
 #include "DDraw/DirectDrawPalette.h"
 #include "DDraw/DirectDrawSurface.h"
 #include "DDraw/Hooks.h"
@@ -81,6 +82,7 @@ namespace
 			hookVtable<IDirectDrawSurface3>(surface);
 			hookVtable<IDirectDrawSurface4>(surface);
 			hookVtable<IDirectDrawSurface7>(surface);
+			hookVtable<IDirectDrawGammaControl>(surface);
 		}
 		else
 		{
@@ -91,7 +93,10 @@ namespace
 	template <typename Interface>
 	void hookVtable(const CompatPtr<Interface>& intf)
 	{
-		CompatVtable<Vtable<Interface>>::hookVtable(intf.get()->lpVtbl);
+		if (intf)
+		{
+			CompatVtable<Vtable<Interface>>::hookVtable(intf.get()->lpVtbl);
+		}
 	}
 }
 
diff --git a/DDrawCompat/DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h b/DDrawCompat/DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h
new file mode 100644
index 0000000..32f8c46
--- /dev/null
+++ b/DDrawCompat/DDraw/Visitors/DirectDrawGammaControlVtblVisitor.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "Common/VtableVisitor.h"
+
+template <>
+struct VtableForEach<IDirectDrawGammaControlVtbl>
+{
+	template <typename Vtable, typename Visitor>
+	static void forEach(Visitor& visitor)
+	{
+		VtableForEach<IUnknownVtbl>::forEach<Vtable>(visitor);
+
+		DD_VISIT(GetGammaRamp);
+		DD_VISIT(SetGammaRamp);
+	}
+};
diff --git a/DDrawCompat/DDrawCompat.vcxproj b/DDrawCompat/DDrawCompat.vcxproj
index aa04093..277984c 100644
--- a/DDrawCompat/DDrawCompat.vcxproj
+++ b/DDrawCompat/DDrawCompat.vcxproj
@@ -183,6 +183,7 @@
     <ClInclude Include="DDraw\ActivateAppHandler.h" />
     <ClInclude Include="DDraw\DirectDraw.h" />
     <ClInclude Include="DDraw\DirectDrawClipper.h" />
+    <ClInclude Include="DDraw\DirectDrawGammaControl.h" />
     <ClInclude Include="DDraw\DirectDrawPalette.h" />
     <ClInclude Include="DDraw\DirectDrawSurface.h" />
     <ClInclude Include="DDraw\Hooks.h" />
@@ -197,6 +198,7 @@
     <ClInclude Include="DDraw\IReleaseNotifier.h" />
     <ClInclude Include="DDraw\RealPrimarySurface.h" />
     <ClInclude Include="DDraw\Visitors\DirectDrawClipperVtblVisitor.h" />
+    <ClInclude Include="DDraw\Visitors\DirectDrawGammaControlVtblVisitor.h" />
     <ClInclude Include="DDraw\Visitors\DirectDrawPaletteVtblVisitor.h" />
     <ClInclude Include="DDraw\Visitors\DirectDrawSurfaceVtblVisitor.h" />
     <ClInclude Include="DDraw\Visitors\DirectDrawVtblVisitor.h" />
@@ -248,6 +250,7 @@
     <ClCompile Include="DDraw\ActivateAppHandler.cpp" />
     <ClCompile Include="DDraw\DirectDraw.cpp" />
     <ClCompile Include="DDraw\DirectDrawClipper.cpp" />
+    <ClCompile Include="DDraw\DirectDrawGammaControl.cpp" />
     <ClCompile Include="DDraw\DirectDrawPalette.cpp" />
     <ClCompile Include="DDraw\DirectDrawSurface.cpp" />
     <ClCompile Include="DDraw\Hooks.cpp" />
diff --git a/DDrawCompat/DDrawCompat.vcxproj.filters b/DDrawCompat/DDrawCompat.vcxproj.filters
index 2f2d03b..5ce1577 100644
--- a/DDrawCompat/DDrawCompat.vcxproj.filters
+++ b/DDrawCompat/DDrawCompat.vcxproj.filters
@@ -306,6 +306,12 @@
     <ClInclude Include="Win32\DisplayMode.h">
       <Filter>Header Files\Win32</Filter>
     </ClInclude>
+    <ClInclude Include="DDraw\Visitors\DirectDrawGammaControlVtblVisitor.h">
+      <Filter>Header Files\DDraw\Visitors</Filter>
+    </ClInclude>
+    <ClInclude Include="DDraw\DirectDrawGammaControl.h">
+      <Filter>Header Files\DDraw</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Gdi\Gdi.cpp">
@@ -467,6 +473,9 @@
     <ClCompile Include="Win32\DisplayMode.cpp">
       <Filter>Source Files\Win32</Filter>
     </ClCompile>
+    <ClCompile Include="DDraw\DirectDrawGammaControl.cpp">
+      <Filter>Source Files\DDraw</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="Dll\DDrawCompat.def">