Update SDKs, more bug fixes

user-grinch · Jun 22, 2024 · 638ef32 · 638ef32
1 parent 81f4af3
commit 638ef32
Show file tree

Hide file tree

Showing 11 changed files with 850 additions and 90 deletions.
diff --git a/include/cleo/CLEO.h b/include/cleo/CLEO.h
diff --git a/include/cleo/CLEO_Utils.h b/include/cleo/CLEO_Utils.h
diff --git a/include/cleo/cleo_redux_sdk.h b/include/cleo/cleo_redux_sdk.h
@@ -151,5 +151,8 @@ extern "C" {
 	/// since v6
 	/// Is end of arguments reached
 	bool IsEndOfArguments(Context ctx);
+	/// since v7
+	/// Triggers an event with the given name and data
+	void TriggerEvent(const char* name, const char* data);
 }
 
diff --git a/lib/CLEO.lib b/lib/CLEO.lib
diff --git a/lib/cleo_redux.lib b/lib/cleo_redux.lib
diff --git a/lib/cleo_redux64.lib b/lib/cleo_redux64.lib
diff --git a/src/dllmain.cpp b/src/dllmain.cpp
@@ -2,10 +2,9 @@
 #include <windows.h>
 #include "opcodemgr.h"
 #include "hook.h"
-
-#ifdef RUNTIME_REDUX
 #include "wrapper.hpp"
-#else
+
+#ifdef RUNTIME_CLEO
 #include "MinHook.h"
 #include "injector.hpp"
 
@@ -84,6 +83,8 @@ BOOL WINAPI DllMain(HINSTANCE hDllHandle, DWORD nReason, LPVOID Reserved) {
         if (id == HostId::SA_UNREAL) gGameVer = eGameVer::SA_DE;
         if (id == HostId::BULLY) gGameVer = eGameVer::BullySE;
 #endif
+        wOnGameLoadEvent(ScriptExData::Clear);
+
         OpcodeMgr::RegisterCommands();
         CreateThread(nullptr, NULL, (LPTHREAD_START_ROUTINE)&ImGuiThread, nullptr, NULL, nullptr);
     }

diff --git a/src/hook.cpp b/src/hook.cpp
@@ -48,15 +48,17 @@ void Hook::SetMouseState(bool state) {
 }
 
 LRESULT Hook::hkWndProc(const HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-    ImGui_ImplWin32_WndProcHandler(hWnd, uMsg, wParam, lParam);
+    if (m_bInitialized) {
+        ImGui_ImplWin32_WndProcHandler(hWnd, uMsg, wParam, lParam);
 
-    if (ImGui::GetIO().WantTextInput || (gGameVer > eGameVer::SA && mouseVisible)) {
-#ifndef _WIN64
-        if (gGameVer == eGameVer::SA) {
-            reinterpret_cast<void(__cdecl*)()>(0x53F1E0)(); // CPad::ClearKeyboardHistory
+        if (ImGui::GetIO().WantTextInput || (gGameVer > eGameVer::SA && mouseVisible)) {
+    #ifndef _WIN64
+            if (gGameVer == eGameVer::SA) {
+                reinterpret_cast<void(__cdecl*)()>(0x53F1E0)(); // CPad::ClearKeyboardHistory
+            }
+    #endif
+            return 1;
         }
-#endif
-        return 1;
     }
 
     return CallWindowProc(oWndProc, hWnd, uMsg, wParam, lParam);
@@ -69,8 +71,7 @@ HRESULT Hook::hkReset(IDirect3DDevice9* pDevice, D3DPRESENT_PARAMETERS* pPresent
 }
 
 void Hook::ProcessFrame(void* ptr) {
-    static bool init;
-    if (init) {
+    if (m_bInitialized) {
         ProcessMouse();
 
         // Scale the menu if game resolution changed
@@ -224,7 +225,7 @@ void Hook::ProcessFrame(void* ptr) {
         io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad | ImGuiConfigFlags_NoMouseCursorChange;
 
         oWndProc = (WNDPROC)SetWindowLongPtr(hwnd, -4, (LRESULT)hkWndProc); // GWL_WNDPROC = -4
-        init = true;
+        m_bInitialized = true;
     }
 }
 

diff --git a/src/hook.h b/src/hook.h
@@ -58,6 +58,7 @@ class Hook {
     static void InputWatcher();
 
   public:
+    static inline bool m_bInitialized = false;
 
     Hook() = delete;
     Hook(Hook const&) = delete;

diff --git a/src/scriptextender.hpp b/src/scriptextender.hpp
@@ -9,9 +9,11 @@
 #include <tuple>
 #include "opcodemgr.h"
 #include "notifypopup.h"
+#include "imgui_internal.h"
 
 extern enum class eGameVer;
 extern eGameVer gGameVer;
+extern ImGuiContext* GImGui;
 
 class ScriptExData
 {
@@ -106,7 +108,7 @@ class ScriptExData
     * Due to some limitations we can't run the ImGui realtime with the script
     * We run the ImGui frames independent of the script and cache the returns to return back to script
     */
-    Table<std::string, std::vector<ComData>> frameData;
+    static inline Table<std::string, std::vector<ComData>> frameData;
     static inline std::vector<ScriptExData*> scripts; // ptr to all the scripts using ImGui
     static inline bool showCursor; // global cursor state flag
     static inline std::string curScriptID; // current script identifier
@@ -207,4 +209,46 @@ class ScriptExData
         Hook::SetMouseState(showCursor);
         m_nFramerate = (size_t)ImGui::GetIO().Framerate;
     }
+
+    // Clears all the internal stuff
+    static void Clear() {
+        scripts.clear();
+        frameData.Clear();
+
+        // Clear ImGui internal states here
+        auto e = ImGui::GetCurrentContext();
+        if (Hook::m_bInitialized && e) {
+            e->Windows.clear_delete();
+            e->WindowsFocusOrder.clear();
+            e->WindowsTempSortBuffer.clear();
+            e->CurrentWindow = NULL;
+            e->CurrentWindowStack.clear();
+            e->WindowsById.Clear();
+            e->NavWindow = NULL;
+            e->HoveredWindow = e->HoveredWindowUnderMovingWindow = NULL;
+            e->ActiveIdWindow = e->ActiveIdPreviousFrameWindow = NULL;
+            e->MovingWindow = NULL;
+            e->ColorStack.clear();
+            e->StyleVarStack.clear();
+            e->OpenPopupStack.clear();
+            e->BeginPopupStack.clear();
+
+            e->TabBars.Clear();
+            e->CurrentTabBarStack.clear();
+            e->ShrinkWidthBuffer.clear();
+
+            e->ClipperTempData.clear_destruct();
+
+            e->Tables.Clear();
+            e->TablesTempData.clear_destruct();
+            e->DrawChannelsTempMergeBuffer.clear();
+
+            e->ClipboardHandlerData.clear();
+            e->MenusIdSubmittedThisFrame.clear();
+            e->InputTextState.ClearFreeMemory();
+
+            e->SettingsWindows.clear();
+            e->SettingsHandlers.clear();
+        }
+    }
 };
diff --git a/src/wrapper.hpp b/src/wrapper.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "pch.h"
-
 #ifdef RUNTIME_CLEO
 #include "../include/cleo/CLEO.h"
 #define RTN_CONTINUE CLEO::OR_CONTINUE
@@ -22,6 +21,14 @@
 #define RUNTIME_STR_LEN 128
 
 
+static void wOnGameLoadEvent(void* func) {
+#ifdef RUNTIME_CLEO
+    CLEO::CLEO_RegisterCallback(CLEO::eCallbackId::GameBegin, func);
+#else
+    OnRuntimeInit((OnRuntimeInitCallback)func);
+#endif
+}
+
 static void wGetStringParam(RUNTIME_CONTEXT ctx, char* label, unsigned char length) {
 #ifdef RUNTIME_CLEO
     CLEO_ReadStringOpcodeParam(ctx, label, length);