Add hooking helpers for catching function signature mismatches

Only used in d3d12 hooks for now

Author: FakeMichau

OptiScaler/OptiScaler.vcxproj

@@ -320,6 +320,7 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y
     <ClInclude Include="hooks\DxgiFactory_WrappedCalls.h" />
     <ClInclude Include="hooks\Dxgi_Hooks.h" />
     <ClInclude Include="hooks\FG_Hooks.h" />
+    <ClInclude Include="hooks\Hook_Utils.h" />
     <ClInclude Include="hooks\LibraryLoad_Hooks.h" />
     <ClInclude Include="hooks\CommandBuffer_StateTracker.h" />
     <ClInclude Include="hooks\Xell_Hooks.h" />

OptiScaler/OptiScaler.vcxproj.filters

@@ -815,6 +815,9 @@
     <ClInclude Include="shaders\hud_copy\precompile\HudCopy_Shader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="hooks\Hook_Utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Config.cpp">

OptiScaler/exports/d3d12.h

@@ -42,7 +42,7 @@ HRESULT _D3D12CreateDeviceExport(IUnknown* adapter, D3D_FEATURE_LEVEL minLevel,
     return D3d12Proxy::D3D12CreateDevice_Hooked()(adapter, minLevel, riid, ppDevice);
 }
 
-HRESULT _D3D12SerializeRootSignatureExport(D3d12Proxy::D3D12_ROOT_SIGNATURE_DESC_L* pRootSignature,
+HRESULT _D3D12SerializeRootSignatureExport(D3D12_ROOT_SIGNATURE_DESC* pRootSignature,
                                            D3D_ROOT_SIGNATURE_VERSION Version, ID3DBlob** ppBlob,
                                            ID3DBlob** ppErrorBlob)
 {
@@ -57,7 +57,7 @@ HRESULT _D3D12CreateRootSignatureDeserializerExport(LPCVOID pSrcData, SIZE_T Src
         pSrcData, SrcDataSizeInBytes, pRootSignatureDeserializerInterface, ppRootSignatureDeserializer);
 }
 
-HRESULT _D3D12SerializeVersionedRootSignatureExport(D3d12Proxy::D3D12_VERSIONED_ROOT_SIGNATURE_DESC_L* pRootSignature,
+HRESULT _D3D12SerializeVersionedRootSignatureExport(D3D12_VERSIONED_ROOT_SIGNATURE_DESC* pRootSignature,
                                                     ID3DBlob** ppBlob, ID3DBlob** ppErrorBlob)
 {
     return D3d12Proxy::D3D12SerializeVersionedRootSignature_Hooked()(pRootSignature, ppBlob, ppErrorBlob);

OptiScaler/hooks/D3D12_Hooks.cpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <type_traits>
+
+// For getting function signature of methods, example of usage:
+// using PFN_CheckFeatureSupport = rewrite_signature<decltype(&ID3D12Device::CheckFeatureSupport)>::type;
+template <typename T> struct rewrite_signature;
+template <typename Ret, typename Class, typename... Args> struct rewrite_signature<Ret (Class::*)(Args...)>
+{
+    using type = Ret(WINAPI*)(Class*, Args...);
+};
+
+// For checking that the hooked function's signature matches the original
+// Place just above function definition, example of usage:
+// VALIDATE_HOOK(hkCheckFeatureSupport, PFN_CheckFeatureSupport)
+#define VALIDATE_HOOK(HookName, PfnType)                                                                               \
+    extern std::remove_pointer_t<PfnType> HookName;                                                                    \
+    static_assert(std::is_same_v<decltype(&HookName), PfnType>,                                                        \
+                  "Signature mismatch: " #HookName " does not match " #PfnType);

OptiScaler/hooks/Hook_Utils.h

@@ -14,61 +14,14 @@
 class D3d12Proxy
 {
   public:
-    typedef struct D3D12_ROOT_SIGNATURE_DESC_L
-    {
-        UINT NumParameters;
-        D3D12_ROOT_PARAMETER* pParameters;
-        UINT NumStaticSamplers;
-        D3D12_STATIC_SAMPLER_DESC* pStaticSamplers;
-        D3D12_ROOT_SIGNATURE_FLAGS Flags;
-    } D3D12_ROOT_SIGNATURE_DESC_L;
-
-    typedef struct D3D12_ROOT_SIGNATURE_DESC1_L
-    {
-        UINT NumParameters;
-        D3D12_ROOT_PARAMETER1* pParameters;
-        UINT NumStaticSamplers;
-        D3D12_STATIC_SAMPLER_DESC* pStaticSamplers;
-        D3D12_ROOT_SIGNATURE_FLAGS Flags;
-    } D3D12_ROOT_SIGNATURE_DESC1_L;
-
-    typedef struct D3D12_ROOT_SIGNATURE_DESC2_L
-    {
-        UINT NumParameters;
-        D3D12_ROOT_PARAMETER1* pParameters;
-        UINT NumStaticSamplers;
-        D3D12_STATIC_SAMPLER_DESC1* pStaticSamplers;
-        D3D12_ROOT_SIGNATURE_FLAGS Flags;
-    } D3D12_ROOT_SIGNATURE_DESC2_L;
-
-    typedef struct D3D12_VERSIONED_ROOT_SIGNATURE_DESC_L
-    {
-        D3D_ROOT_SIGNATURE_VERSION Version;
-        union
-        {
-            D3D12_ROOT_SIGNATURE_DESC_L Desc_1_0;
-            D3D12_ROOT_SIGNATURE_DESC1_L Desc_1_1;
-            D3D12_ROOT_SIGNATURE_DESC2_L Desc_1_2;
-        };
-    } D3D12_VERSIONED_ROOT_SIGNATURE_DESC_L;
-
-    typedef HRESULT (*PFN_D3D12CreateDevice)(IUnknown*, D3D_FEATURE_LEVEL, REFIID, void**);
-    typedef HRESULT (*PFN_D3D12SerializeRootSignature)(D3D12_ROOT_SIGNATURE_DESC_L* pRootSignature,
-                                                       D3D_ROOT_SIGNATURE_VERSION Version, ID3DBlob** ppBlob,
-                                                       ID3DBlob** ppErrorBlob);
-    typedef HRESULT (*PFN_D3D12CreateRootSignatureDeserializer)(LPCVOID pSrcData, SIZE_T SrcDataSizeInBytes,
-                                                                REFIID pRootSignatureDeserializerInterface,
-                                                                void** ppRootSignatureDeserializer);
-    typedef HRESULT (*PFN_D3D12SerializeVersionedRootSignature)(D3D12_VERSIONED_ROOT_SIGNATURE_DESC_L* pRootSignature,
-                                                                ID3DBlob** ppBlob, ID3DBlob** ppErrorBlob);
-    typedef HRESULT (*PFN_D3D12CreateVersionedRootSignatureDeserializer)(LPCVOID pSrcData, SIZE_T SrcDataSizeInBytes,
-                                                                         REFIID pRootSignatureDeserializerInterface,
-                                                                         void** ppRootSignatureDeserializer);
-    typedef HRESULT (*PFN_D3D12GetDebugInterface)(REFIID, void**);
-    typedef HRESULT (*PFN_D3D12EnableExperimentalFeatures)(UINT NumFeatures, const IID* pIIDs,
-                                                           void* pConfigurationStructs,
-                                                           UINT* pConfigurationStructSizes);
-    typedef HRESULT (*PFN_D3D12GetInterface)(REFCLSID, REFIID, void**);
+    typedef decltype(&D3D12CreateDevice) PFN_D3D12CreateDevice;
+    typedef decltype(&D3D12SerializeRootSignature) PFN_D3D12SerializeRootSignature;
+    typedef decltype(&D3D12CreateRootSignatureDeserializer) PFN_D3D12CreateRootSignatureDeserializer;
+    typedef decltype(&D3D12SerializeVersionedRootSignature) PFN_D3D12SerializeVersionedRootSignature;
+    typedef decltype(&D3D12CreateVersionedRootSignatureDeserializer) PFN_D3D12CreateVersionedRootSignatureDeserializer;
+    typedef decltype(&D3D12GetDebugInterface) PFN_D3D12GetDebugInterface;
+    typedef decltype(&D3D12EnableExperimentalFeatures) PFN_D3D12EnableExperimentalFeatures;
+    typedef decltype(&D3D12GetInterface) PFN_D3D12GetInterface;
 
     static void Init(HMODULE module = nullptr)
     {

OptiScaler/proxies/D3D12_Proxy.h

@@ -416,7 +416,7 @@ class IGDExtProxy
     }
 
     static D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfo(UINT visibleMask, UINT numResourceDescs,
-                                                                    D3D12_RESOURCE_DESC* pResourceDescs)
+                                                                    const D3D12_RESOURCE_DESC* pResourceDescs)
     {
         if (_context == nullptr)
             return {};
@@ -431,7 +431,8 @@ class IGDExtProxy
             return {};
 
         INTC_D3D12_RESOURCE_DESC_0001 localDesc {};
-        localDesc.pD3D12Desc = pResourceDescs;
+        D3D12_RESOURCE_DESC localD3D12Desc = *pResourceDescs;
+        localDesc.pD3D12Desc = &localD3D12Desc;
         localDesc.EmulatedTyped64bitAtomics = true;
 
         auto result = _INTC_D3D12_GetResourceAllocationInfo(_context, visibleMask, numResourceDescs, &localDesc);