replace minhook with safetyhook

ThirteenAG · Jan 29, 2024 · 8988c3b · 8988c3b
1 parent ed78e82
commit 8988c3b
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 43 deletions.
diff --git a/external/FusionDxHook b/external/FusionDxHook
diff --git a/external/inireader b/external/inireader
diff --git a/premake5.lua b/premake5.lua
@@ -25,13 +25,9 @@ workspace "XboxRainDroplets"
    includedirs { "external/hooking" }
    includedirs { "external/injector/include" }
    includedirs { "external/FusionDxHook/includes" }
-   includedirs { "external/FusionDxHook/minhook" }
-   includedirs { "external/FusionDxHook/minhook/include" }
-   includedirs { "external/FusionDxHook/minhook/src" }
+   includedirs { "external/FusionDxHook/includes/safetyhook" }
    includedirs { "external/sire" }
-   files { "external/FusionDxHook/includes/minhook/include/*.*" }
-   files { "external/FusionDxHook/includes/minhook/src/*.*" }
-   files { "external/FusionDxHook/includes/minhook/src/hde/*.*" }
+   files { "external/FusionDxHook/includes/safetyhook/*.*" }
    files { "external/sire/sire.h" }
    local dxsdk = os.getenv "DXSDK_DIR"
    if dxsdk then
@@ -73,10 +69,10 @@ workspace "XboxRainDroplets"
       targetdir ("bin")
    end
 
-	prebuildcommands {
-		"for /R \"../source/resources/shaders/ps/\" %%f in (*.hlsl) do (\"../source/dxsdk/lib/x86/fxc.exe\" /T ps_3_0 /nologo /E main /Fo \"../source/resources/%%~nf.cso\" %%f)",
-		"for /R \"../source/resources/shaders/vs/\" %%f in (*.hlsl) do (\"../source/dxsdk/lib/x86/fxc.exe\" /T vs_3_0 /nologo /E main /Fo \"../source/resources/%%~nf.cso\" %%f)",
-	}
+    prebuildcommands {
+        "for /R \"../source/resources/shaders/ps/\" %%f in (*.hlsl) do (\"../source/dxsdk/lib/x86/fxc.exe\" /T ps_3_0 /nologo /E main /Fo \"../source/resources/%%~nf.cso\" %%f)",
+        "for /R \"../source/resources/shaders/vs/\" %%f in (*.hlsl) do (\"../source/dxsdk/lib/x86/fxc.exe\" /T vs_3_0 /nologo /E main /Fo \"../source/resources/%%~nf.cso\" %%f)",
+    }
 
    filter "configurations:Debug"
       defines { "DEBUG" }
@@ -148,16 +144,12 @@ workspace "XboxRainDropletsWrapper"
    includedirs { "external/hooking" }
    includedirs { "external/injector/include" }
    includedirs { "external/FusionDxHook/includes" }
-   includedirs { "external/FusionDxHook/minhook" }
-   includedirs { "external/FusionDxHook/minhook/include" }
-   includedirs { "external/FusionDxHook/minhook/src" }
+   includedirs { "external/FusionDxHook/includes/safetyhook" }
    includedirs { "external/sire" }
    includedirs { "source/dxsdk/dx8" }
    libdirs { "source/dxsdk/dx8" }
 
-   files { "external/FusionDxHook/includes/minhook/include/*.*" }
-   files { "external/FusionDxHook/includes/minhook/src/*.*" }
-   files { "external/FusionDxHook/includes/minhook/src/hde/*.*" }
+   files { "external/FusionDxHook/includes/safetyhook/*.*" }
    files { "external/sire/sire.h" }
 
 
@@ -171,14 +163,14 @@ workspace "XboxRainDropletsWrapper"
 
    filter "platforms:Win32"
       architecture "x32"
-	  includedirs { "source/dxsdk" }
-	  libdirs { "source/dxsdk/lib/x86" }
+      includedirs { "source/dxsdk" }
+      libdirs { "source/dxsdk/lib/x86" }
 
    filter "platforms:Win64"
       architecture "x64"
       targetname "%{prj.name}64"
-	  includedirs { "source/dxsdk" }
-	  libdirs { "source/dxsdk/lib/x64" }
+      includedirs { "source/dxsdk" }
+      libdirs { "source/dxsdk/lib/x64" }
 
 project "XboxRainDropletsWrapper"
    setpaths("Z:/WFP/Games/PPSSPP/", "PPSSPPWindows.exe")

diff --git a/source/MaxPayne3.XboxRainDroplets.cpp b/source/MaxPayne3.XboxRainDroplets.cpp
@@ -11,7 +11,7 @@
 #define FUSIONDXHOOK_INCLUDE_D3D10    1
 #define FUSIONDXHOOK_INCLUDE_D3D10_1  1
 #define FUSIONDXHOOK_INCLUDE_D3D11    1
-#define FUSIONDXHOOK_USE_MINHOOK      1
+#define FUSIONDXHOOK_USE_SAFETYHOOK   1
 #define DELAYED_BIND 2000ms
 #include "FusionDxHook.h"
 

diff --git a/source/PCSX2F.XboxRainDroplets.cpp b/source/PCSX2F.XboxRainDroplets.cpp
@@ -7,7 +7,7 @@
 #define FUSIONDXHOOK_INCLUDE_D3D12    1
 #define FUSIONDXHOOK_INCLUDE_OPENGL   0
 #define FUSIONDXHOOK_INCLUDE_VULKAN   0
-#define FUSIONDXHOOK_USE_MINHOOK      1
+#define FUSIONDXHOOK_USE_SAFETYHOOK   1
 #define DELAYED_BIND 2000ms
 #include "FusionDxHook.h"
 

diff --git a/source/PPSSPP.XboxRainDroplets.cpp b/source/PPSSPP.XboxRainDroplets.cpp
@@ -7,7 +7,7 @@
 #define FUSIONDXHOOK_INCLUDE_D3D12    0
 #define FUSIONDXHOOK_INCLUDE_OPENGL   1
 #define FUSIONDXHOOK_INCLUDE_VULKAN   1
-#define FUSIONDXHOOK_USE_MINHOOK      1
+#define FUSIONDXHOOK_USE_SAFETYHOOK   1
 #define DELAYED_BIND 2000ms
 #include "FusionDxHook.h"
 
@@ -63,10 +63,17 @@ struct XRData {
 #ifdef __cplusplus
     bool Enabled(uint64_t ptr)
     {
-        if (p_enabled)
-            return *(uint32_t*)(ptr + p_enabled);
-        else
-            return ms_enabled != 0;
+        __try
+        {
+            if (p_enabled)
+                return *(uint32_t*)(ptr + p_enabled);
+            else
+                return ms_enabled != 0;
+        }
+        __except ((GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
+        {
+        }
+        return false;
     }
 
     float GetRainIntensity(uint64_t ptr)
@@ -196,8 +203,15 @@ void RenderDroplets()
 
         static XRData* pXRData = nullptr;
 
-        if (SendMessage(hWndPPSSPP, WM_USER_GET_EMULATION_STATE, 0, 0))
+        DWORD_PTR dwResult = 0;
+        if (SendMessageTimeout(hWndPPSSPP, WM_USER_GET_EMULATION_STATE, 0, 0, SMTO_NORMAL, 10L, &dwResult))
         {
+            if (!dwResult)
+            {
+                pXRData = nullptr;
+                return;
+            }
+
             enum
             {
                 lo,   // Lower 32 bits of pointer to the base of emulated memory
@@ -206,8 +220,9 @@ void RenderDroplets()
                 p_hi, // Upper 32 bits of pointer to the pointer to the base of emulated memory
             };
 
-            uint32_t high = SendMessage(hWndPPSSPP, WM_USER_GET_BASE_POINTER, 0, hi);
-            uint32_t low = SendMessage(hWndPPSSPP, WM_USER_GET_BASE_POINTER, 0, lo);
+            DWORD_PTR high, low = 0;
+            SendMessageTimeout(hWndPPSSPP, WM_USER_GET_BASE_POINTER, 0, hi, SMTO_NORMAL, 10L, &high);
+            SendMessageTimeout(hWndPPSSPP, WM_USER_GET_BASE_POINTER, 0, lo, SMTO_NORMAL, 10L, &low);
             uint64_t ptr = (uint64_t(high) << 32 | low); // +0x08804000;
 
             if (ptr)

diff --git a/source/XboxRainDropletsWrapper.cpp b/source/XboxRainDropletsWrapper.cpp
@@ -7,7 +7,7 @@
 #define FUSIONDXHOOK_INCLUDE_D3D12    1
 #define FUSIONDXHOOK_INCLUDE_OPENGL   1
 #define FUSIONDXHOOK_INCLUDE_VULKAN   1
-#define FUSIONDXHOOK_USE_MINHOOK      1
+#define FUSIONDXHOOK_USE_SAFETYHOOK   1
 #define DELAYED_BIND 2000ms
 #include "FusionDxHook.h"
 

diff --git a/source/xrd11.h b/source/xrd11.h
@@ -10,6 +10,7 @@
 #include <map>
 #include <iomanip>
 #include <random>
+#include <stacktrace>
 #include "inireader/IniReader.h"
 #include "Hooking.Patterns.h"
 #include "includes/ModuleList.hpp"
@@ -930,16 +931,20 @@ class CallbackHandler
     static inline std::map<std::wstring, std::function<void()>> functions;
 };
 
-bool IsUALPresent()
+bool IsModuleUAL(HMODULE mod)
 {
-    ModuleList dlls;
-    dlls.Enumerate(ModuleList::SearchLocation::LocalOnly);
-    for (auto& e : dlls.m_moduleList)
-    {
-        if (GetProcAddress(std::get<HMODULE>(e), "DirectInput8Create") != NULL &&
-            GetProcAddress(std::get<HMODULE>(e), "DirectSoundCreate8") != NULL &&
-            GetProcAddress(std::get<HMODULE>(e), "InternetOpenA") != NULL)
-            return true;
-    }
+    if (GetProcAddress(mod, "IsUltimateASILoader") != NULL || (GetProcAddress(mod, "DirectInput8Create") != NULL && GetProcAddress(mod, "DirectSoundCreate8") != NULL && GetProcAddress(mod, "InternetOpenA") != NULL))
+        return true;
     return false;
 }
+
+bool IsUALPresent() {
+    for (const auto& entry : std::stacktrace::current()) {
+        HMODULE hModule = NULL;
+        if (GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, (LPCSTR)entry.native_handle(), &hModule)) {
+            if (IsModuleUAL(hModule))
+                return true;
+        }
+    }
+    return false;
+}
+0 −3		.gitmodules
+23 −23		includes/fusiondxhook.h
+0 −1		includes/minhook
+23 −0		includes/safetyhook/LICENSE.txt
+54,198 −0		includes/safetyhook/Zydis.c
+11,885 −0		includes/safetyhook/Zydis.h
+1,287 −0		includes/safetyhook/safetyhook.cpp
+981 −0		includes/safetyhook/safetyhook.hpp
+2 −2		premake5.lua
+1 −1		source/FusionDxHook.cpp
+0 −15		.gitattributes
+39 −0		.github/workflows/msbuild.yml
+338 −4		.gitignore
+122 −0		IniReader.cpp
+135 −334		IniReader.h
+21 −0		LICENSE
+0 −23		LICENSE.txt
+3 −46		README.md
+0 −382		ini_parser.hpp
+7 −0		mINI/.gitignore
+54 −0		mINI/CHANGELOG.md
+19 −0		mINI/LICENSE
+333 −0		mINI/README.md
+ −		mINI/icon.png
+885 −0		mINI/src/mini/ini.h
+7 −0		mINI/tests/build.bat
+6 −0		mINI/tests/build.sh
+25 −0		mINI/tests/building.txt
+3 −0		mINI/tests/clean.bat
+3 −0		mINI/tests/clean.sh
+23 −0		mINI/tests/lest/LICENSE.txt
+1,485 −0		mINI/tests/lest/lest.hpp
+7 −0		mINI/tests/run.bat
+6 −0		mINI/tests/run.sh
+100 −0		mINI/tests/testcasesens.cpp
+77 −0		mINI/tests/testcopy.cpp
+287 −0		mINI/tests/testgenerate.cpp
+59 −0		mINI/tests/testhuge.cpp
+457 −0		mINI/tests/testread.cpp
+141 −0		mINI/tests/testutf8.cpp
+747 −0		mINI/tests/testwrite.cpp
+1 −0		premake5.bat
+ −		premake5.exe
+43 −0		premake5.lua
+290 −0		tests/SplinterCell.in
+11 −0		tests/SplinterCell.in2
+3 −0		tests/test.bat