Backups/EGameTools
1
0
Fork 0
mirror of https://github.com/EricPlayZ/EGameTools.git synced 2025-07-18 17:37:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

- FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK

Browse Source
This commit is contained in:
EricPlayZ
2025-01-05 05:40:16 +02:00
parent 7b596fc23d
commit 820da8db58
6 changed files with 30 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
EGameSDK/src/Core/Core.cpp
View File

@ -108,16 +108,16 @@ namespace EGSDK::Core {
SetUnhandledExceptionFilter(CrashHandler);
#endif
SPDLOG_WARN("Getting game version");
SPDLOG_INFO("Getting game version");
GameVersionCheck();
SPDLOG_WARN("Initializing hooks");
SPDLOG_INFO("Initializing hooks");
for (auto& hook : (*EGSDK::Utils::Hook::HookBase::GetInstances())[hModule]) {
threads.emplace_back([&hook]() {
maxHookThreads.acquire();
if (hook->IsHooking()) {
SPDLOG_WARN("Hooking \"{}\"", hook->GetName().data());
SPDLOG_INFO("Hooking \"{}\"", hook->GetName().data());
while (hook->IsHooking())
Sleep(10);
@ -126,7 +126,7 @@ namespace EGSDK::Core {
} else if (hook->IsHooked())
SPDLOG_INFO("Hooked \"{}\"!", hook->GetName().data());
else {
SPDLOG_WARN("Hooking \"{}\"", hook->GetName().data());
SPDLOG_INFO("Hooking \"{}\"", hook->GetName().data());
if (hook->HookLoop())
SPDLOG_INFO("Hooked \"{}\"!", hook->GetName().data());
}
@ -135,7 +135,7 @@ namespace EGSDK::Core {
}).detach();
}
SPDLOG_WARN("Sorting Player Variables");
SPDLOG_INFO("Sorting Player Variables");
threads.emplace_back([]() {
if (GamePH::PlayerVariables::SortPlayerVars())
SPDLOG_INFO("Player Variables sorted");
@ -163,9 +163,9 @@ namespace EGSDK::Core {
void Cleanup() {
exiting = true;
SPDLOG_WARN("Game requested exit, running cleanup");
SPDLOG_INFO("Game requested exit, running cleanup");
SPDLOG_WARN("Unhooking everything");
SPDLOG_INFO("Unhooking everything");
MH_DisableHook(MH_ALL_HOOKS);
MH_Uninitialize();
SPDLOG_INFO("Unhooked everything");

2
EGameTools/src/Config/Config.cpp
View File

@ -368,7 +368,7 @@ namespace EGT::Config {
return std::filesystem::exists(configFileName);
}
static void CreateConfig() {
SPDLOG_WARN("{} does not exist (will create now); using default config values", configFileName);
SPDLOG_INFO("{} does not exist (will create now); using default config values", configFileName);
LoadAndWriteDefaultConfig();
}
static void ReadConfig(const bool configUpdate = false) {

24
EGameTools/src/Core/Core.cpp
View File

@ -84,7 +84,7 @@ namespace EGT::Core {
EGT::ImGui_impl::D3D12::Init();
break;
default:
SPDLOG_WARN("Unknown renderer type");
SPDLOG_ERROR("Unknown renderer type");
break;
}
@ -178,7 +178,7 @@ namespace EGT::Core {
}
}
SPDLOG_WARN("Creating symlink \"EGameTools\" for \"Dying Light 2\\ph\\source\\data\\EGameTools\" folder");
SPDLOG_INFO("Creating symlink \"EGameTools\" for \"Dying Light 2\\ph\\source\\data\\EGameTools\" folder");
std::string symlinkPath = EGSDK::Utils::Files::GetCurrentProcDirectory() + "\\EGameTools";
SPDLOG_DEBUG("SymlinkPath: {}", symlinkPath);
@ -286,17 +286,17 @@ namespace EGT::Core {
SetUnhandledExceptionFilter(CrashHandler);
#endif
SPDLOG_WARN("Running game version checks");
SPDLOG_INFO("Running game version checks");
GameVersionCheck();
SPDLOG_WARN("Initializing config");
SPDLOG_INFO("Initializing config");
Config::InitConfig();
threads.emplace_back(Config::ConfigLoop);
SPDLOG_WARN("Setting vftable scanning to: {}", Menu::Debug::disableVftableScanning);
SPDLOG_INFO("Setting vftable scanning to: {}", Menu::Debug::disableVftableScanning);
EGSDK::ClassHelpers::SetIsVftableScanningDisabled(Menu::Debug::disableVftableScanning);
SPDLOG_WARN("Creating symlink for loading files");
SPDLOG_INFO("Creating symlink for loading files");
CreateSymlinkForLoadingFiles();
SPDLOG_INFO("Initializing hooks");
@ -305,7 +305,7 @@ namespace EGT::Core {
maxHookThreads.acquire();
if (hook->IsHooking()) {
SPDLOG_WARN("Hooking \"{}\"", hook->GetName().data());
SPDLOG_INFO("Hooking \"{}\"", hook->GetName().data());
while (hook->IsHooking())
Sleep(10);
@ -314,7 +314,7 @@ namespace EGT::Core {
} else if (hook->IsHooked())
SPDLOG_INFO("Hooked \"{}\"!", hook->GetName().data());
else {
SPDLOG_WARN("Hooking \"{}\"", hook->GetName().data());
SPDLOG_INFO("Hooking \"{}\"", hook->GetName().data());
if (hook->HookLoop())
SPDLOG_INFO("Hooked \"{}\"!", hook->GetName().data());
}
@ -323,7 +323,7 @@ namespace EGT::Core {
}).detach();
}
SPDLOG_WARN("Hooking DX11/DX12 renderer");
SPDLOG_INFO("Hooking DX11/DX12 renderer");
threads.emplace_back([]() {
if (LoopHookRenderer())
SPDLOG_INFO("Hooked \"DX11/DX12 renderer\"!");
@ -351,12 +351,12 @@ namespace EGT::Core {
void Cleanup() {
exiting = true;
SPDLOG_WARN("Game requested exit, running cleanup");
SPDLOG_WARN("Saving config to file");
SPDLOG_INFO("Game requested exit, running cleanup");
SPDLOG_INFO("Saving config to file");
Config::SaveConfig();
SPDLOG_INFO("Config saved to file");
SPDLOG_WARN("Unhooking everything");
SPDLOG_INFO("Unhooking everything");
MH_DisableHook(MH_ALL_HOOKS);
MH_Uninitialize();
SPDLOG_INFO("Unhooked everything");

6
EGameTools/src/Engine/Engine_Hooks.cpp
View File

@ -57,7 +57,7 @@ namespace EGT::Engine {
static std::vector<std::string> cachedUserModDirs{};
static EGSDK::Utils::Time::Timer timeSinceCache{ 0 };
static void CacheUserModDirs() {
SPDLOG_WARN("Recaching user mod directories");
SPDLOG_INFO("Recaching user mod directories");
if (!cachedUserModDirs.empty())
cachedUserModDirs.clear();
@ -104,7 +104,7 @@ namespace EGT::Engine {
finalPath.erase(0, userModFilesFullPath.size() + 1); // erase entire path until mod folder
const char* filePath2 = finalPath.c_str();
SPDLOG_WARN("Loading user mod file \"{}\"", finalPath.c_str());
SPDLOG_INFO("Loading user mod file \"{}\"", finalPath.c_str());
DWORD64 finalAddr = reinterpret_cast<DWORD64>(filePath2);
if (firstByte != 0x0)
@ -172,7 +172,7 @@ namespace EGT::Engine {
pathPtr.pakPath = pakPath.c_str();
pathPtr.fullPakPath = fullPakPath.c_str();
SPDLOG_WARN("Loading user PAK mod file \"{}\"", pakPath.c_str());
SPDLOG_INFO("Loading user PAK mod file \"{}\"", pakPath.c_str());
if (!fs::mount(&pathPtr, 1, nullptr))
SPDLOG_ERROR("fs::mount returned 0! Something went wrong with loading user PAK mod file \"{}\"!\nPlease make sure the path to the file is no longer than 260 characters, and make sure the file is valid!", pakPath.c_str());
}

23
EGameTools/src/ImGui_impl/Win32_impl.cpp
View File

@ -7,22 +7,6 @@
#include <EGT\Menu\Menu.h>
#include <EGT\Menu\Debug.h>
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
// TODO: FIX BOOLEAN LOGIC FOR LOW LEVEL MOUSE HOOK
extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
namespace EGT::ImGui_impl {
@ -158,7 +142,12 @@ namespace EGT::ImGui_impl {
UnhookWindowsHookEx(oMouseProc);
oMouseProc = nullptr;
}
void ToggleMouseHook(bool value) { value ? EnableMouseHook() : DisableMouseHook(); }
void ToggleMouseHook(bool disableLowLevelMouseHook) {
if (disableLowLevelMouseHook)
DisableMouseHook();
else
EnableMouseHook();
}
void Init(HWND hwnd) {
gHwnd = hwnd;

2
EGameTools/src/Menu/Init.cpp
View File

@ -288,7 +288,7 @@ namespace EGT::Menu {
io.FontDefault = io.Fonts->AddFontFromMemoryTTF((void*)g_FontRudaBold, sizeof(g_FontRudaBold), 12.0f + 6.0f, &fontConfig);
io.Fonts->Build();
SPDLOG_WARN("Loading EGameTools logo texture");
SPDLOG_INFO("Loading EGameTools logo texture");
EGTLogoTexture = EGT::Utils::Texture::LoadImGuiTexture(g_EGTWhiteLogo, sizeof(g_EGTWhiteLogo));
SPDLOG_INFO("Loaded EGameTools logo");
}