diff --git a/Hogwarts Legacy/dllmain.cpp b/Hogwarts Legacy/dllmain.cpp index 33aaf39..12eab97 100644 --- a/Hogwarts Legacy/dllmain.cpp +++ b/Hogwarts Legacy/dllmain.cpp @@ -1,10 +1,5 @@ #include "CommonHeaders.h" -#include "UEngine.hpp" -#include "UETools.hpp" -#include "UEVars.hpp" -#include "Logger.hpp" -#include "SDK/Basic.hpp" -#include "SDK/Engine_classes.hpp" +#include "CommonUEHeaders.h" #include "Phoenix_classes.hpp" #include "SDK/UI_BP_PhoenixHUDWidget_classes.hpp" #include "SDK/UI_BP_AsyncLoadWrapper_classes.hpp" @@ -23,29 +18,26 @@ std::shared_ptr logger; // Screen informations static int screenWidth = GetSystemMetrics(SM_CXSCREEN); static int screenHeight = GetSystemMetrics(SM_CYSCREEN); -static float aspectRatio = (float)screenWidth / screenHeight; // Plugin states static bool AOBScanDone = false; -static bool g_fix_enabled = false; -static bool g_fov_fix_enabled = false; -static bool g_ultrawide_fix_enabled = false; -static bool g_HUD_fix_enabled = false; -static bool g_camera_fix_enabled = false; -static bool g_DOF_fix_enabled = false; -static bool g_CA_fix_enabled = false; -static bool g_Vignetting_fix_enabled = false; -static bool g_Fog_fix_enabled = false; -static bool g_TimeDilation_fix_enabled = false; -static bool g_GodMide_fix_enabled = false; -static bool g_Stealth_fix_enabled = false; +static std::atomic g_fix_enabled = false; +static std::atomic g_fov_fix_enabled = false; +static std::atomic g_ultrawide_fix_enabled = false; +static std::atomic g_HUD_fix_enabled = false; +static std::atomic g_camera_fix_enabled = false; +static std::atomic g_DOF_fix_enabled = false; +static std::atomic g_CA_fix_enabled = false; +static std::atomic g_Vignetting_fix_enabled = false; +static std::atomic g_Fog_fix_enabled = false; +static std::atomic g_TimeDilation_fix_enabled = false; +static std::atomic g_GodMide_fix_enabled = false; +static std::atomic g_Stealth_fix_enabled = false; static int g_AdditionalFOVValue = 0; static float g_CameraMultiplier = 1.f; static float g_WorldTimeDilationValue = 1.f; static float g_AITimeDilationValue = 1.f; -static int g_HUDOffsets = 0.f; -static bool g_Console = true; -static bool user_inputs_logged = false; +static float g_HUDOffsets = 0.f; // Shared values static float g_FOV_In = 67.85f; @@ -57,17 +49,12 @@ static float g_Camera_Out = 360.f; static uint8_t* FOVaddress = nullptr; static uint8_t* ConstrainAspectaddress = nullptr; static uint8_t* Cameraaddress = nullptr; -static uint8_t* DOFaddress = nullptr; -static uint8_t* CAaddress = nullptr; -static uint8_t* Vignettingaddress = nullptr; -static uint8_t* Fogaddress = nullptr; static uint8_t* WorldTimedilationaddress = nullptr; static uint8_t* timedilationaddress = nullptr; // Hooking static SafetyHookMid FOVHook{}; static SafetyHookMid CameraHook{}; -static SafetyHookMid FogHook{}; static SafetyHookMid PEHook{}; static SafetyHookMid WorldTimeDilationHook{}; static SafetyHookMid TimeDilationHook{}; @@ -76,12 +63,7 @@ static SafetyHookMid TimeDilationHook{}; static void FOVFixEnabled(); static void UltraWideFixEnabled(); static void CameraFixEnabled(); -static void DOFFixEnabled(); -static void CAFixEnabled(); -static void VignettingFixEnabled(); -static void FogFixEnabled(); static void EnableConsole(); -static void ProcessEvent(); static void HUDFixEnabled(); static void ProcessEvent(); static void EnableCheats(Cheat cheat); @@ -89,15 +71,15 @@ static void LogHUD(); extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) { g_fix_enabled = enabled; + if (init) { + logger = InitializeLogger("Hogwarts Legacy", PLUGIN_LOG); + logger->info("Plugin {} loaded.", PLUGIN_NAME); + } if (!AOBScanDone) { // Unreal Engine 4.27.2 - uint8_t* baseModule = reinterpret_cast(GetModuleHandleA(nullptr)); // Get game base address logger->info("--------------- AOB scan started ---------------"); + uint8_t* baseModule = reinterpret_cast(GetModuleHandleA(nullptr)); // Get game base address constexpr auto FOVStringObfuscated = make_obfuscated<0x4A>("EB ?? F3 0F ?? ?? ?? ?? ?? ?? F3 0F ?? ?? ?? 8B 83"); constexpr auto CameraStringObfuscated = make_obfuscated<0x4A>("F3 0F ?? ?? C8 ?? ?? ?? E8 ?? ?? ?? ?? 4C 8D ?? ?? ?? ?? ?? 48"); - constexpr auto DOFStringObfuscated = make_obfuscated<0x4A>("8B ?? ?? E8 ?? ?? ?? ?? 8B ?? E8 ?? ?? ?? ?? 84 ?? 74 ?? 48"); - constexpr auto CAStringObfuscated = make_obfuscated<0x4A>("7F ?? 89 B3 ?? ?? ?? ?? 41 ?? ?? ?? 39 05 ?? ?? ?? ?? 7E"); - constexpr auto VignettingStringObfuscated = make_obfuscated<0x4A>("8B ?? 83 ?? ?? 7D ?? 89 B3 ?? ?? ?? ?? 89 B3 ?? ?? ?? ?? 89 B3"); - constexpr auto FogStringObfuscated = make_obfuscated<0x4A>("83 ?? ?? ?? 75 ?? B3 ?? EB ?? 32 ?? 48 8B ?? ?? ?? 48 ?? ?? 74 ?? E8"); constexpr auto WorldTimeDilationStringObfuscated = make_obfuscated<0x59>("F3 0F 10 81 ?? ?? ?? ?? F3 0F 59 81 ?? ?? ?? ?? F3 0F 59 81 ?? ?? ?? ?? C3"); constexpr auto timeDilationObfuscated = make_obfuscated<0xB4>("F3 0F ?? ?? ?? ?? ?? ?? EB ?? F3 0F ?? ?? ?? ?? ?? ?? 48 8B ?? ?? 4C 8B ?? F3 0F ?? ?? 44 8B"); using AOBScan::Make; @@ -106,18 +88,13 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) { std::vector signatures = { Make(&FOVaddress, FOVStringObfuscated, "FOV"), Make(&Cameraaddress, CameraStringObfuscated, "Camera distance"), - Make(&DOFaddress, DOFStringObfuscated, "DOF"), - Make(&CAaddress, CAStringObfuscated, "Chromatic aberrations"), - Make(&Vignettingaddress, VignettingStringObfuscated, "Vignetting"), - Make(&Fogaddress, FogStringObfuscated, "Fog"), Make(&WorldTimedilationaddress, WorldTimeDilationStringObfuscated, "World time dilation"), Make(&timedilationaddress, timeDilationObfuscated, "Time dilation"), }; // Scan all signature in a batch Memory::AOBScanBatch(signatures, logger); if (FOVaddress) ConstrainAspectaddress = FOVaddress + 0x18; - if (FOVaddress && ConstrainAspectaddress && Cameraaddress && DOFaddress && CAaddress && - Vignettingaddress && Fogaddress && WorldTimedilationaddress && timedilationaddress) + if (FOVaddress && ConstrainAspectaddress && Cameraaddress && WorldTimedilationaddress && timedilationaddress) logger->info("All AOB signatures found. Ready to patch..."); if (!GObjectsaddress || !AppendStringaddress || !ProcessEventaddress) { @@ -143,36 +120,27 @@ extern "C" __declspec(dllexport) void SetFixEnabled(bool enabled, bool init) { AOBScanDone = true; } - if (!init && FOVaddress) FOVFixEnabled(); - if (!init && ConstrainAspectaddress) UltraWideFixEnabled(); - if (!init && Cameraaddress) CameraFixEnabled(); - if (!init && DOFaddress) DOFFixEnabled(); - if (!init && CAaddress) CAFixEnabled(); - if (!init && Vignettingaddress) VignettingFixEnabled(); - if (!init && Fogaddress) FogFixEnabled(); - if (!init && GObjectsaddress && AppendStringaddress && ProcessEventaddress) EnableConsole(); - if (!init) { - HUDFixEnabled(); - LogHUD(); - } - if (!init && WorldTimedilationaddress) { - EnableCheats(Cheat::TimeDilation); - EnableCheats(Cheat::GodMode); - EnableCheats(Cheat::Stealth); - } ProcessEvent(); + if (init) return; + FOVFixEnabled(); + UltraWideFixEnabled(); + CameraFixEnabled(); + HUDFixEnabled(); + LogHUD(); + SetAllEffectsToBeToggled(); + LogFixToggle(GameFixes::None, g_fix_enabled); } // Setters for Reshade addon call extern "C" __declspec(dllexport) void SetFixesEnabled(GameFixes fix, bool enabled) { - if (fix == GameFixes::DevConsole) { g_Console = enabled; EnableConsole(); }; + bool bVisual = g_fix_enabled && enabled; if (fix == GameFixes::FOV) { g_fov_fix_enabled = enabled; FOVFixEnabled(); } if (fix == GameFixes::UltraWide) { g_ultrawide_fix_enabled = enabled; UltraWideFixEnabled(); } if (fix == GameFixes::Camera) { g_camera_fix_enabled = enabled; CameraFixEnabled(); } - if (fix == GameFixes::DOF) { g_DOF_fix_enabled = enabled; DOFFixEnabled(); } - if (fix == GameFixes::ChromaticAberrations) { g_CA_fix_enabled = enabled; CAFixEnabled(); } - if (fix == GameFixes::Vignetting) { g_Vignetting_fix_enabled = enabled; VignettingFixEnabled(); } - if (fix == GameFixes::Fog) { g_Fog_fix_enabled = enabled; FogFixEnabled(); } + if (fix == GameFixes::DOF) { g_DOF_fix_enabled = enabled; gPendingDOF = true; LogFixToggle(fix, bVisual); } + if (fix == GameFixes::ChromaticAberrations) { g_CA_fix_enabled = enabled; gPendingCA = true; LogFixToggle(fix, bVisual); } + if (fix == GameFixes::Vignetting) { g_Vignetting_fix_enabled = enabled; gPendingVignetting = true; LogFixToggle(fix, bVisual); } + if (fix == GameFixes::Fog) { g_Fog_fix_enabled = enabled; gPendingFog = true; LogFixToggle(fix, bVisual); } if (fix == GameFixes::HUD) { g_HUD_fix_enabled = enabled; HUDFixEnabled(); LogHUD(); } if (fix == GameFixes::TimeDilation) { g_TimeDilation_fix_enabled = enabled; EnableCheats(Cheat::TimeDilation); } if (fix == GameFixes::GodMode) { g_GodMide_fix_enabled = enabled; EnableCheats(Cheat::GodMode); } @@ -183,7 +151,7 @@ extern "C" __declspec(dllexport) void SetValues(GameSetting setting, float value if (setting == GameSetting::FOV) g_AdditionalFOVValue = (int)(value); if (setting == GameSetting::CameraDistance) g_CameraMultiplier = value; if (setting == GameSetting::HUD) { - g_HUDOffsets = ((int)value * screenWidth) / 100; + g_HUDOffsets = (value * screenWidth) / 100; HUDFixEnabled(); } if (setting == GameSetting::WorldTimeDilation) g_WorldTimeDilationValue = value; @@ -210,19 +178,24 @@ static void ProcessEvent() { [](SafetyHookContext& ctx) { UObject* object = (UObject*)ctx.rcx; UFunction* function = (UFunction*)ctx.rdx; + if (!object || !function) return; - std::string funcName = function->GetName(); - std::string objectName = object->GetName(); + if (object->IsA(UUserWidget::StaticClass())) { + std::string funcName = function->GetName(); + std::string objectName = object->Class->GetName(); + if (objectName == "UI_BP_Title_C" && funcName == "Construct") + EnableConsole(); // Enable console when title screen is loaded to ensure it will work - if (g_HUD_fix_enabled && objectName.contains("UI_BP_PhoenixHUDWidget_C")) { - if (funcName == "OnShowEnemyInfo") { - UUI_BP_PhoenixHUDWidget_C* phoenixHUDWidget = reinterpret_cast(ctx.rcx); - if (phoenixHUDWidget && phoenixHUDWidget->Class && phoenixHUDWidget->IsA(UUserWidget::StaticClass())) { - gPhoenixHUDWidget = phoenixHUDWidget; // Store UUI_BP_PhoenixHUDWidget_C pointer - HUDFixEnabled(); // Enable live offsets modifications + if (object->IsA(UUI_BP_PhoenixHUDWidget_C::StaticClass())) { + if (funcName == "OnShowEnemyInfo") { + auto* phoenixHUDWidget = static_cast(object); + if (phoenixHUDWidget && phoenixHUDWidget->Class) { + gPhoenixHUDWidget = phoenixHUDWidget; // Store UUI_BP_PhoenixHUDWidget_C pointer + HUDFixEnabled(); // Enable live offsets modifications + } } + else if (funcName == "Destruct") gPhoenixHUDWidget = nullptr; } - if (funcName == "Destruct") gPhoenixHUDWidget = nullptr; } }); } @@ -241,7 +214,7 @@ static void HUDFixEnabled() { slot->SetOffsets(offsets); }}; - float rootOffset = g_HUD_fix_enabled ? (float)g_HUDOffsets : 0.f; + float rootOffset = g_HUD_fix_enabled ? g_HUDOffsets : 0.f; ApplyCanvas(gPhoenixHUDWidget->Root, rootOffset, rootOffset); // Position main HUD ApplyCanvas(gPhoenixHUDWidget->AsyncReticule, -rootOffset); // Fix Reticle shift ApplyCanvas(gPhoenixHUDWidget->BeaconHUDPanel, -rootOffset); // Fix marker shift @@ -253,7 +226,8 @@ static void LogHUD() { // Log toggle state } static void FOVFixEnabled() { - if (g_fix_enabled && g_fov_fix_enabled && FOVaddress) { + if (!FOVaddress) return; + if (g_fix_enabled && g_fov_fix_enabled) { if (!FOVHook) { // Hook only once FOVHook = safetyhook::create_mid(FOVaddress + 0xa, [](SafetyHookContext& ctx) { @@ -263,16 +237,15 @@ static void FOVFixEnabled() { }); } else FOVHook.enable(); - logger->info("FOV fix enabled"); - } - if (!(g_fix_enabled && g_fov_fix_enabled) && FOVaddress) { - if (FOVHook) FOVHook.disable(); - logger->info("FOV fix disabled"); } + else if (FOVHook) FOVHook.disable(); + + logger->info("FOV fix {}", g_fix_enabled && g_fov_fix_enabled ? "enabled" : "disabled"); } static void CameraFixEnabled() { - if (g_fix_enabled && g_camera_fix_enabled && Cameraaddress) { + if (!Cameraaddress) return; + if (g_fix_enabled && g_camera_fix_enabled) { if (!CameraHook) { // Hook only once CameraHook = safetyhook::create_mid(Cameraaddress + 0x8, [](SafetyHookContext& ctx) { @@ -282,37 +255,29 @@ static void CameraFixEnabled() { }); } else CameraHook.enable(); - logger->info("Camera fix enabled"); } - if (!(g_fix_enabled && g_camera_fix_enabled) && Cameraaddress) { - if (CameraHook) CameraHook.disable(); - logger->info("Camera fix disabled"); - } -} + else if (CameraHook) CameraHook.disable(); -static void FogFixEnabled() { - if (g_fix_enabled && g_Fog_fix_enabled && Fogaddress) { - if (!FogHook) { - FogHook = safetyhook::create_mid(Fogaddress, - [](SafetyHookContext& ctx) { - if (!ctx.rax) return; - *reinterpret_cast(ctx.rax + 0x4) = g_fix_enabled && g_Fog_fix_enabled ? 0 : 1; // r.Fog = 0 - }); - } - logger->info("Fog fix enabled"); - } - if (!(g_fix_enabled && g_Fog_fix_enabled) && Fogaddress) - logger->info("Fog fix disabled"); + logger->info("Camera fix {}", g_fix_enabled && g_camera_fix_enabled ? "enabled" : "disabled"); } // Cheats -static UWorld* LastWorld = nullptr; static void EnableCheats(Cheat cheat) { if (WorldTimedilationaddress && !WorldTimeDilationHook) { WorldTimeDilationHook = safetyhook::create_mid(WorldTimedilationaddress + 0x10, [](SafetyHookContext& ctx) { // From AWorldSettings retrieved from world->K2_GetWorldSettings() ctx.xmm0.f32[0] *= g_TimeDilation_fix_enabled ? g_WorldTimeDilationValue : 1.f; + // Apply visual effects only in hook main thread to ensure they will be applied correctly + if (!g_Console_Enabled) return; // It relies on dev console being reactivated + if (gPendingFog.exchange(false)) + ApplyVisualEffect(GameFixes::Fog, g_fix_enabled && g_Fog_fix_enabled); + if (gPendingDOF.exchange(false)) + ApplyVisualEffect(GameFixes::DOF, g_fix_enabled && g_DOF_fix_enabled); + if (gPendingCA.exchange(false)) + ApplyVisualEffect(GameFixes::ChromaticAberrations, g_fix_enabled && g_CA_fix_enabled); + if (gPendingVignetting.exchange(false)) + ApplyVisualEffect(GameFixes::Vignetting, g_fix_enabled && g_Vignetting_fix_enabled); }); } if (timedilationaddress && !TimeDilationHook) { @@ -348,58 +313,18 @@ static void EnableCheats(Cheat cheat) { // Memory patch fixes static void UltraWideFixEnabled() { - if (g_fix_enabled && g_ultrawide_fix_enabled && ConstrainAspectaddress) { + if (!ConstrainAspectaddress) return; + if (g_fix_enabled && g_ultrawide_fix_enabled) Memory::PatchBytes(ConstrainAspectaddress, "\x31\xC9\x90\x90\x90\x90\x90", 7); // bConstrainAspectRatio = 0 - logger->info("Ultra wide fix enabled"); - } - if (!(g_fix_enabled && g_ultrawide_fix_enabled) && ConstrainAspectaddress) { - Memory::RestoreBytes(ConstrainAspectaddress); - logger->info("Ultra wide fix disabled"); - } -} + else Memory::RestoreBytes(ConstrainAspectaddress); -static void DOFFixEnabled() { - if (g_fix_enabled && g_DOF_fix_enabled && DOFaddress) { - Memory::PatchBytes(DOFaddress, "\x31\xFF\x90", 3); // xor edi,edi r.DepthOfFieldQuality = 0 - logger->info("Depth of field fix enabled"); - } - if (!(g_fix_enabled && g_DOF_fix_enabled) && DOFaddress) { - Memory::RestoreBytes(DOFaddress); - logger->info("Depth of field fix disabled"); - } -} - -static void CAFixEnabled() { - if (g_fix_enabled && g_CA_fix_enabled && CAaddress) { - Memory::PatchBytes(CAaddress, "\x90\x90", 2); // NOP jg "HellIsUs-Win64-Shipping.exe"+3D73BD5 r.SceneColorFringeQuality = 0 - logger->info("Chromatic aberrations fix enabled"); - } - if (!(g_fix_enabled && g_CA_fix_enabled) && CAaddress) { - Memory::RestoreBytes(CAaddress); - logger->info("Chromatic aberrations fix disabled"); - } -} - -static void VignettingFixEnabled() { - if (g_fix_enabled && g_Vignetting_fix_enabled && Vignettingaddress) { - Memory::PatchBytes(Vignettingaddress, "\x31\xC9", 2); // xor ecx,ecx r.Tonemapper.Quality=0 - logger->info("Vignetting fix enabled"); - } - if (!(g_fix_enabled && g_Vignetting_fix_enabled) && Vignettingaddress) { - Memory::RestoreBytes(Vignettingaddress); - logger->info("Vignetting fix disabled"); - } + logger->info("Ultra wide fix {}", g_fix_enabled && g_ultrawide_fix_enabled ? "enabled" : "disabled"); } // UE Console creation static void EnableConsole() { - if (g_Console_Enabled || !g_Console || !GObjectsaddress || !AppendStringaddress || !ProcessEventaddress) { - if (!g_Console && !user_inputs_logged) { - logger->info("------------------ User inputs ------------------"); - user_inputs_logged = true; - } + if (g_Console_Enabled || !GObjectsaddress || !AppendStringaddress || !ProcessEventaddress) return; - } logger->info("-------------- Console re-enabling --------------"); ReactivateDevConsole(logger); @@ -407,11 +332,7 @@ static void EnableConsole() { // Standard dll entry BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID) { - if (reason == DLL_PROCESS_ATTACH) { - logger = InitializeLogger("Hogwarts Legacy", PLUGIN_LOG); - logger->info("Plugin {} loaded.", PLUGIN_NAME); - } - else if (reason == DLL_PROCESS_DETACH) { + if (reason == DLL_PROCESS_DETACH) { logger->info("Plugin {} unloaded.", PLUGIN_NAME); spdlog::drop_all(); }