From 5c3b03e08055afbbb8a6e6f2c2c25d0a45af51e3 Mon Sep 17 00:00:00 2001 From: cdozdil Date: Sun, 2 Mar 2025 15:14:18 +0300 Subject: [PATCH] fix XeSS double hooking --- OptiScaler/dllmain.cpp | 4 ++-- OptiScaler/proxies/XeSS_Proxy.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OptiScaler/dllmain.cpp b/OptiScaler/dllmain.cpp index fecbc550..185c6ad8 100644 --- a/OptiScaler/dllmain.cpp +++ b/OptiScaler/dllmain.cpp @@ -364,7 +364,7 @@ inline static HMODULE LoadLibraryCheck(std::string lcaseLibName, LPCSTR lpLibFul { auto module = o_LoadLibraryA(lcaseLibName.c_str()); if (module != nullptr) - XeSSProxy::HookXeSS(module); + XeSSProxy::InitXeSS(module); return module; } @@ -608,7 +608,7 @@ inline static HMODULE LoadLibraryCheckW(std::wstring lcaseLibName, LPCWSTR lpLib { auto module = o_LoadLibraryW(lcaseLibName.c_str()); if (module != nullptr) - XeSSProxy::HookXeSS(module); + XeSSProxy::InitXeSS(module); return module; } diff --git a/OptiScaler/proxies/XeSS_Proxy.h b/OptiScaler/proxies/XeSS_Proxy.h index 66836e7b..3a943690 100644 --- a/OptiScaler/proxies/XeSS_Proxy.h +++ b/OptiScaler/proxies/XeSS_Proxy.h @@ -121,7 +121,6 @@ private: return _dll != nullptr; } -public: static bool HookXeSS(HMODULE xessModule) { LOG_INFO("Trying to hook XeSS"); @@ -217,6 +216,7 @@ DetourAttach(&(PVOID&)_##name, name) return true; } +public: static bool InitXeSS(HMODULE xessModule = nullptr) { // if dll already loaded