ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1165 from marzent/icmp-close-fix

Browse source
This commit is contained in:
goat 2023-03-26 00:42:36 +01:00 • committed by GitHub
commit 84eaa9081d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Dalamud.Boot/xivfixes.cpp
View file

@ -6,6 +6,8 @@
#include "hooks.h"
#include "logging.h"
#include "utils.h"
#include <iphlpapi.h>
#include <icmpapi.h>
template<typename T>
static std::span<T> assume_nonempty_span(std::span<T> t, const char* descr) {
@ -554,6 +556,40 @@ void xivfixes::clr_failfast_hijack(bool bApply)
}
}
void xivfixes::prevent_icmphandle_crashes(bool bApply) {
static const char* LogTag = "[xivfixes:prevent_icmphandle_crashes]";
static std::optional<hooks::import_hook<decltype(IcmpCloseHandle)>> s_hookIcmpCloseHandle;
if (bApply) {
if (!g_startInfo.BootEnabledGameFixes.contains("prevent_icmphandle_crashes")) {
logging::I("{} Turned off via environment variable.", LogTag);
return;
}
s_hookIcmpCloseHandle.emplace("iphlpapi.dll!IcmpCloseHandle (import, prevent_icmphandle_crashes)", "iphlpapi.dll", "IcmpCloseHandle", 0);
s_hookIcmpCloseHandle->set_detour([](HANDLE IcmpHandle) noexcept {
// this is exactly how windows behaves, however calling IcmpCloseHandle with
// an invalid handle will segfault on wine...
if (IcmpHandle == INVALID_HANDLE_VALUE) {
logging::W("{} IcmpCloseHandle was called with INVALID_HANDLE_VALUE", LogTag);
return FALSE;
}
return s_hookIcmpCloseHandle->call_original(IcmpHandle);
});
logging::I("{} Enable", LogTag);
}
else {
if (s_hookIcmpCloseHandle) {
logging::I("{} Disable", LogTag);
s_hookIcmpCloseHandle.reset();
}
}
}
void xivfixes::apply_all(bool bApply) {
for (const auto& [taskName, taskFunction] : std::initializer_list<std::pair<const char*, void(*)(bool)>>
{
@ -562,7 +598,8 @@ void xivfixes::apply_all(bool bApply) {
{ "disable_game_openprocess_access_check", &disable_game_openprocess_access_check },
{ "redirect_openprocess", &redirect_openprocess },
{ "backup_userdata_save", &backup_userdata_save },
{ "clr_failfast_hijack", &clr_failfast_hijack }
{ "clr_failfast_hijack", &clr_failfast_hijack },
{ "prevent_icmphandle_crashes", &prevent_icmphandle_crashes }
}
) {
try {

1
Dalamud.Boot/xivfixes.h
View file

@ -7,6 +7,7 @@ namespace xivfixes {
void redirect_openprocess(bool bApply);
void backup_userdata_save(bool bApply);
void clr_failfast_hijack(bool bApply);
void prevent_icmphandle_crashes(bool bApply);
void apply_all(bool bApply);
}

2
Dalamud.Injector/EntryPoint.cs
View file

@ -325,7 +325,7 @@ namespace Dalamud.Injector
startInfo.BootShowConsole = args.Contains("--console");
startInfo.BootEnableEtw = args.Contains("--etw");
startInfo.BootLogPath = GetLogPath("dalamud.boot", startInfo.LogName);
startInfo.BootEnabledGameFixes = new List<string> { "prevent_devicechange_crashes", "disable_game_openprocess_access_check", "redirect_openprocess", "backup_userdata_save", "clr_failfast_hijack" };
startInfo.BootEnabledGameFixes = new List<string> { "prevent_devicechange_crashes", "disable_game_openprocess_access_check", "redirect_openprocess", "backup_userdata_save", "clr_failfast_hijack", "prevent_icmphandle_crashes" };
startInfo.BootDotnetOpenProcessHookMode = 0;
startInfo.BootWaitMessageBox |= args.Contains("--msgbox1") ? 1 : 0;
startInfo.BootWaitMessageBox |= args.Contains("--msgbox2") ? 2 : 0;