From ef4a2f806fee2972928e9f57128edf7c7a524c27 Mon Sep 17 00:00:00 2001 From: IcePixelx <41352111+PixieCore@users.noreply.github.com> Date: Fri, 13 Aug 2021 15:37:43 +0200 Subject: [PATCH 1/2] Fixed fullscreen issue with dx hook. Fixed tables crash. --- r5dev/src/CCompanion.cpp | 4 ++-- r5dev/src/id3dx.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/r5dev/src/CCompanion.cpp b/r5dev/src/CCompanion.cpp index c9a6f732..ba7c2dfb 100644 --- a/r5dev/src/CCompanion.cpp +++ b/r5dev/src/CCompanion.cpp @@ -213,7 +213,7 @@ void CCompanion::ServerBrowserSection() const float FooterHeight = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing(); ImGui::BeginChild("ServerListChild", { 0, -FooterHeight }, true, ImGuiWindowFlags_AlwaysVerticalScrollbar); { - ImGui::BeginTable("##ServerBrowser_ServerList", 4, ImGuiTableFlags_Resizable); + if (ImGui::BeginTable("##ServerBrowser_ServerList", 4, ImGuiTableFlags_Resizable)) { ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthStretch, 35); ImGui::TableSetupColumn("Map", ImGuiTableColumnFlags_WidthStretch, 25); @@ -251,8 +251,8 @@ void CCompanion::ServerBrowserSection() } } } + ImGui::EndTable(); } - ImGui::EndTable(); } ImGui::EndChild(); diff --git a/r5dev/src/id3dx.cpp b/r5dev/src/id3dx.cpp index 31d176e4..2536008f 100644 --- a/r5dev/src/id3dx.cpp +++ b/r5dev/src/id3dx.cpp @@ -484,14 +484,14 @@ void InstallDXHooks() /////////////////////////////////////////////////////////////////////////////// // Hook SwapChain MH_CreateHook(g_fnIDXGISwapChainPresent, &Present, reinterpret_cast(&originalPresent)); - MH_CreateHook(g_oResizeBuffers, &GetResizeBuffers, reinterpret_cast(&originalResizeBuffers)); +// MH_CreateHook(g_oResizeBuffers, &GetResizeBuffers, reinterpret_cast(&originalResizeBuffers)); /////////////////////////////////////////////////////////////////////////////// // Enable hooks MH_EnableHook(PostMessageA); MH_EnableHook(PostMessageW); MH_EnableHook(g_fnIDXGISwapChainPresent); - MH_EnableHook(g_oResizeBuffers); +// MH_EnableHook(g_oResizeBuffers); } void RemoveDXHooks() From 2ec2ace1b65614e28916d9fcbf162c1dc59c3e84 Mon Sep 17 00:00:00 2001 From: IcePixelx <41352111+PixieCore@users.noreply.github.com> Date: Fri, 13 Aug 2021 15:39:16 +0200 Subject: [PATCH 2/2] Forgot to add unhook comment. --- r5dev/src/id3dx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r5dev/src/id3dx.cpp b/r5dev/src/id3dx.cpp index 2536008f..c09b3492 100644 --- a/r5dev/src/id3dx.cpp +++ b/r5dev/src/id3dx.cpp @@ -512,7 +512,7 @@ void RemoveDXHooks() /////////////////////////////////////////////////////////////////////////////// // Unhook SwapChain MH_RemoveHook(g_fnIDXGISwapChainPresent); - MH_RemoveHook(g_oResizeBuffers); +// MH_RemoveHook(g_oResizeBuffers); /////////////////////////////////////////////////////////////////////////////// // Shutdown ImGui