Use function start signature instead of function call (#1878)

goatcorp · Jul 2, 2024 · 87de538 · 87de538
1 parent a042ec9
commit 87de538
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs b/Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs
@@ -73,9 +73,23 @@ protected override unsafe void Setup64Bit(ISigScanner sig)
                 // var p = processModule.BaseAddress + 0x82C7E0; // DXGISwapChain::Present
                 // var p = processModule.BaseAddress + 0x82FAC0; // DXGISwapChain::runtime_present
                 // DXGISwapChain::handle_device_loss =>df DXGISwapChain::Present => DXGISwapChain::runtime_present
+                // 5.2+ - F6 C2 01 0F 85
+                // 6.0+ - F6 C2 01 0F 85 88
 
                 var scanner = new SigScanner(processModule);
-                var runtimePresentSig = "E8 ?? ?? ?? ?? 44 0F B6 55 ??"; // NOTE: This sig is from reshade's DLL, normally dxgi.dll.
+                var runtimePresentSig = "F6 C2 01 0F 85"; // NOTE: This sig is from reshade's DLL, normally dxgi.dll.
+
+                try
+                {
+                    if (fileInfo.FileVersion.StartsWith("6."))
+                    {
+                        runtimePresentSig = "F6 C2 01 0F 85 88";
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex, "Failed to get reshade version info - falling back to 5.x signature");
+                }
 
                 try
                 {