praydog · praydog · Mar 29, 2023 · Mar 29, 2023
diff --git a/.gitmodules b/.gitmodules
@@ -9,4 +9,4 @@
 	url = https://github.com/gabime/spdlog.git
 [submodule "dependencies/glm"]
 	path = dependencies/glm
-	url = https://github.com/g-truc/glm
+	url = https://github.com/g-truc/glm.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -117,10 +117,10 @@ if(REF_BUILD_DEPENDENCIES AND CMAKE_SIZEOF_VOID_P EQUAL 8) # build-framework-dep
 
 	list(APPEND spdlog_SOURCES
 		"dependencies/spdlog/src/async.cpp"
+		"dependencies/spdlog/src/bundled_fmtlib_format.cpp"
 		"dependencies/spdlog/src/cfg.cpp"
 		"dependencies/spdlog/src/color_sinks.cpp"
 		"dependencies/spdlog/src/file_sinks.cpp"
-		"dependencies/spdlog/src/fmt.cpp"
 		"dependencies/spdlog/src/spdlog.cpp"
 		"dependencies/spdlog/src/stdout_sinks.cpp"
 	)

diff --git a/dependencies/glm b/dependencies/glm
diff --git a/dependencies/imgui b/dependencies/imgui
diff --git a/dependencies/imguizmo/GraphEditor.cpp b/dependencies/imguizmo/GraphEditor.cpp
@@ -24,8 +24,8 @@
 // SOFTWARE.
 //
 
-#include "imgui.h"
 #define IMGUI_DEFINE_MATH_OPERATORS
+#include "imgui.h"
 #include "imgui_internal.h"
 #include <math.h>
 #include <vector>

diff --git a/dependencies/imguizmo/ImGuizmo.cpp b/dependencies/imguizmo/ImGuizmo.cpp
@@ -26,10 +26,8 @@
 
 #include <cstdint>
 
-#include "imgui.h"
-#ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
-#endif
+#include "imgui.h"
 #include "imgui_internal.h"
 #include "ImGuizmo.h"
 

diff --git a/dependencies/imnodes/imnodes.cpp b/dependencies/imnodes/imnodes.cpp
@@ -6,10 +6,10 @@
 // [SECTION] render helpers
 // [SECTION] API implementation
 
+#define IMGUI_DEFINE_MATH_OPERATORS
 #include "imnodes.h"
 #include "imnodes_internal.h"
 
-#define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui_internal.h>
 
 // Check minimum ImGui version

diff --git a/dependencies/minhook b/dependencies/minhook
diff --git a/dependencies/spdlog b/dependencies/spdlog
diff --git a/src/DInputHook.cpp b/src/DInputHook.cpp
@@ -73,7 +73,7 @@ bool DInputHook::hook() {
     // Get the addresses of the methods we want to hook.
     auto get_device_state = (*(uintptr_t**)device)[9];
 
-    spdlog::info("Got IDirectInputDevice::GetDeviceState {:p}", get_device_state);
+   // spdlog::info("Got IDirectInputDevice::GetDeviceState {:p}", get_device_state);
 
     device->Release();
     dinput->Release();

diff --git a/src/Main.cpp b/src/Main.cpp
@@ -81,7 +81,7 @@ void startup_thread(HMODULE reframework_module) {
 
 BOOL APIENTRY DllMain(HANDLE handle, DWORD reason, LPVOID reserved) {
     if (reason == DLL_PROCESS_ATTACH) {
-        CreateThread(nullptr, 0, (LPTHREAD_START_ROUTINE)startup_thread, handle, 0, nullptr);
+        CreateRemoteThread(INVALID_HANDLE_VALUE, nullptr, 0, (LPTHREAD_START_ROUTINE)startup_thread, handle, 0, nullptr);
     }
 
     return TRUE;

diff --git a/src/mods/Camera.cpp b/src/mods/Camera.cpp
@@ -18,7 +18,7 @@ void Camera::on_config_save(Config& cfg) {
 }
 
 void Camera::on_draw_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
+    ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
     if (!ImGui::CollapsingHeader(get_name().data())) {
         return;
     }

diff --git a/src/mods/FirstPerson.cpp b/src/mods/FirstPerson.cpp
@@ -74,7 +74,7 @@ void FirstPerson::on_frame() {
 }
 
 void FirstPerson::on_draw_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
+    ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
 
     if (!ImGui::CollapsingHeader(get_name().data())) {
         return;

diff --git a/src/mods/FreeCam.cpp b/src/mods/FreeCam.cpp
@@ -34,7 +34,7 @@ void FreeCam::on_frame() {
 }
 
 void FreeCam::on_draw_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
+    ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
 
     if (!ImGui::CollapsingHeader(get_name().data())) {
         return;

diff --git a/src/mods/Graphics.cpp b/src/mods/Graphics.cpp
@@ -16,7 +16,7 @@ void Graphics::on_config_save(utility::Config& cfg) {
 }
 
 void Graphics::on_draw_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
+    ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
     if (!ImGui::CollapsingHeader(get_name().data())) {
         return;
     }

diff --git a/src/mods/ManualFlashlight.cpp b/src/mods/ManualFlashlight.cpp
@@ -22,7 +22,7 @@ void ManualFlashlight::on_frame() {
 }
 
 void ManualFlashlight::on_draw_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
+    ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
     if (!ImGui::CollapsingHeader(get_name().data())) {
         return;
     }

diff --git a/src/mods/PluginLoader.cpp b/src/mods/PluginLoader.cpp
@@ -725,7 +725,7 @@ std::optional<std::string> PluginLoader::on_initialize() {
 }
 
 void PluginLoader::on_draw_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_Once);
+    ImGui::SetNextItemOpen(false, ImGuiCond_Once);
 
     if (ImGui::CollapsingHeader(get_name().data())) {
         std::scoped_lock _{m_mux};

diff --git a/src/mods/Scene.cpp b/src/mods/Scene.cpp
@@ -55,7 +55,7 @@ void SceneMods::on_frame() {
 }
 
 void SceneMods::on_draw_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
+    ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
 
     if (!ImGui::CollapsingHeader(get_name().data())) {
         return;

diff --git a/src/mods/ScriptRunner.cpp b/src/mods/ScriptRunner.cpp
@@ -711,7 +711,7 @@ void ScriptRunner::on_frame() {
 }
 
 void ScriptRunner::on_draw_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_Once);
+    ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_Once);
 
     if (ImGui::CollapsingHeader(get_name().data())) {
         if (ImGui::Button("Run script")) {

diff --git a/src/mods/VR.cpp b/src/mods/VR.cpp
@@ -3584,12 +3584,12 @@ void VR::openvr_input_to_re_engine() {
 void VR::on_draw_ui() {
     // create VR tree entry in menu (imgui)
     if (get_runtime()->loaded) {
-        ImGui::SetNextTreeNodeOpen(m_has_hw_scheduling, ImGuiCond_::ImGuiCond_FirstUseEver);
+        ImGui::SetNextItemOpen(m_has_hw_scheduling, ImGuiCond_::ImGuiCond_FirstUseEver);
     } else {
         if (m_openvr->error && !m_openvr->dll_missing) {
-            ImGui::SetNextTreeNodeOpen(true, ImGuiCond_::ImGuiCond_FirstUseEver);
+            ImGui::SetNextItemOpen(true, ImGuiCond_::ImGuiCond_FirstUseEver);
         } else {
-            ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
+            ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
         }
     }
 

diff --git a/src/mods/bindings/ImGui.cpp b/src/mods/bindings/ImGui.cpp
@@ -867,19 +867,19 @@ Vector2f get_mouse() {
 }
 
 int get_key_index(int imgui_key) {
-    return ImGui::GetKeyIndex(imgui_key);
+    return ImGui::GetKeyIndex((ImGuiKey)imgui_key);
 }
 
 bool is_key_down(int key) {
-    return ImGui::IsKeyDown(key);
+    return ImGui::IsKeyDown((ImGuiKey)key);
 }
 
 bool is_key_pressed(int key) {
-    return ImGui::IsKeyPressed(key);
+    return ImGui::IsKeyPressed((ImGuiKey)key);
 }
 
 bool is_key_released(int key) {
-    return ImGui::IsKeyReleased(key);
+    return ImGui::IsKeyReleased((ImGuiKey)key);
 }
 
 bool is_mouse_down(int button) {

diff --git a/src/mods/tools/ChainViewer.cpp b/src/mods/tools/ChainViewer.cpp
@@ -60,7 +60,7 @@ void ChainViewer::on_config_save(utility::Config& cfg) {
 

 void ChainViewer::on_draw_dev_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_Once);
+    ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_Once);
 
     if (!ImGui::CollapsingHeader(get_name().data())) {
         return;
@@ -317,7 +317,7 @@ void ChainViewer::on_frame() {
                         if (made) {
                             ImGui::PushID(&collider);
 
-                            ImGui::SetNextTreeNodeOpen(true, ImGuiCond_::ImGuiCond_Once);
+                            ImGui::SetNextItemOpen(true, ImGuiCond_::ImGuiCond_Once);
 
                         #if TDB_VER >= 69 && !defined(MHRISE_CHAIN70)
                             if (ImGui::TreeNode(&collider, "Collision %d %d", i, j)) {

diff --git a/src/mods/tools/GameObjectsDisplay.cpp b/src/mods/tools/GameObjectsDisplay.cpp
@@ -38,7 +38,7 @@ void GameObjectsDisplay::on_config_save(utility::Config& cfg) {
 
 
 void GameObjectsDisplay::on_draw_dev_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_Once);
+    ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_Once);
 
     if (!ImGui::CollapsingHeader(get_name().data())) {
         return;

diff --git a/src/mods/tools/ObjectExplorer.cpp b/src/mods/tools/ObjectExplorer.cpp
@@ -331,7 +331,7 @@ ObjectExplorer::ObjectExplorer()
 }
 
 void ObjectExplorer::on_draw_dev_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_Once);
+    ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_Once);
 
     if (m_do_init) {
         init();
@@ -430,7 +430,7 @@ void ObjectExplorer::on_draw_dev_ui() {
                 continue;
             }
 
-            ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_Once);
+            ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_Once);
 
             auto made_node = ImGui::TreeNode(t->name);
             context_menu(obj);
@@ -2065,7 +2065,7 @@ void ObjectExplorer::handle_address(Address address, int32_t offset, Address par
 
 
     if (offset != -1) {
-        ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_Once);
+        ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_Once);
 
         made_node = stretched_tree_node(parent.get(offset), "0x%X:", offset);
         auto is_hovered = ImGui::IsItemHovered();

diff --git a/src/mods/vr/games/RE8VR.cpp b/src/mods/vr/games/RE8VR.cpp
@@ -108,7 +108,7 @@ void RE8VR::on_lua_state_destroyed(sol::state& lua) {
 }
 
 void RE8VR::on_draw_ui() {
-    ImGui::SetNextTreeNodeOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
+    ImGui::SetNextItemOpen(false, ImGuiCond_::ImGuiCond_FirstUseEver);
 
     if (!ImGui::CollapsingHeader(get_name().data())) {
         return;
+3 −3		CMakeLists.txt
+1 −1		build/MinGW/Makefile
+0 −1		build/VC12/libMinHook.vcxproj
+0 −1		build/VC14/libMinHook.vcxproj
+0 −1		build/VC15/libMinHook.vcxproj
+1 −2		build/VC16/libMinHook.vcxproj
+190 −0		build/VC17/MinHook.vcxproj
+41 −0		build/VC17/MinHookVC17.sln
+174 −0		build/VC17/libMinHook.vcxproj
+55 −0		build/VC17/libMinHook.vcxproj.filters
+3 −1		src/hde/hde64.c
+71 −37		src/hook.c
+2 −2		src/trampoline.c