7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix the fix of the messagebox fix

Browse source
This commit is contained in:
dankmeme01 2024-06-28 20:47:39 +02:00
parent 69bb63087a
commit 09c188a157
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
loader/src/hooks/MessageBoxFix.cpp
View file

@ -13,7 +13,7 @@ using namespace geode::prelude;
// no one knows how this is possible (he passes char* to wchar_t*). // no one knows how this is possible (he passes char* to wchar_t*).
// so anyway, here's a fix for it // so anyway, here's a fix for it
static void __cdecl fixedErrorHandler(int code, char const* description) { static void __cdecl fixedErrorHandler2(int code, char const* description) {
log::error("GLFW Error {}: {}", code, description); log::error("GLFW Error {}: {}", code, description);
MessageBoxA( MessageBoxA(
nullptr, nullptr,
@ -30,6 +30,10 @@ static void __cdecl fixedErrorHandler(int code, char const* description) {
std::abort(); std::abort();
} }
static void __cdecl fixedErrorHandler(CCEGLView*, int code, char const* description) {
fixedErrorHandler2(code, description);
}
$execute { $execute {
// updated for 2.206 // updated for 2.206
// check xrefs to "GLFWError #%d Happen, %s\n", now there's two functions with the same exact // check xrefs to "GLFWError #%d Happen, %s\n", now there's two functions with the same exact
@ -38,8 +42,8 @@ $execute {
if (LoaderImpl::get()->isForwardCompatMode()) return; if (LoaderImpl::get()->isForwardCompatMode()) return;
#if GEODE_COMP_GD_VERSION == 22060 #if GEODE_COMP_GD_VERSION == 22060
const uintptr_t offset1 = 0x75d00; const uintptr_t offset1 = 0x75d00; // member function in CCEGLView
const uintptr_t offset2 = 0x75d60; const uintptr_t offset2 = 0x75d60; // static function
(void) Mod::get()->hook( (void) Mod::get()->hook(
reinterpret_cast<void*>(geode::base::getCocos() + offset1), reinterpret_cast<void*>(geode::base::getCocos() + offset1),
@ -49,7 +53,7 @@ $execute {
(void) Mod::get()->hook( (void) Mod::get()->hook(
reinterpret_cast<void*>(geode::base::getCocos() + offset2), reinterpret_cast<void*>(geode::base::getCocos() + offset2),
fixedErrorHandler, fixedErrorHandler2,
"onGLFWError2" "onGLFWError2"
); );