Skip to content

Revert "Fix Crash on Bootup if Save Directory does not exist." #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Delta-473 merged 1 commit into from
Feb 25, 2026
+0 −54
Merged

Revert "Fix Crash on Bootup if Save Directory does not exist." #1253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions OpenKh.Research.Panacea/Panacea.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#include "bass.h"
#include "bass_vgmstream.h"
#include <set>
#include <filesystem>
#include <Psapi.h>

bool ENSURE_DIRECTORY = false;

template <class TFunc>
class Hook
Expand Down Expand Up @@ -290,29 +286,6 @@ void LoadDLLs(const std::wstring& folder)
f(folder.c_str());
}

char* FetchPattern(const char* pattern, const char* patvalid)
{
HINSTANCE g_hInstance = GetModuleHandle(NULL);
MODULEINFO moduleInfo;
GetModuleInformation(GetCurrentProcess(), g_hInstance, &moduleInfo, sizeof(MODULEINFO));
const void* endAddress = (const char*)g_hInstance + moduleInfo.SizeOfImage;

for (char* addr = (char*)g_hInstance; addr < (char*)endAddress - 0x10; addr += 0x10)
{
size_t patlen = strlen(patvalid);

int i = 0;
for (; i < patlen; i++)
if (patvalid[i] != '?' && pattern[i] != addr[i])
break;

if (i == patlen)
return addr;
}

return nullptr;
}

void Panacea::Initialize()
{
ULONG_PTR baseImage = (ULONG_PTR)GetModuleHandle(nullptr);
Expand Down Expand Up @@ -1164,33 +1137,6 @@ long __cdecl Panacea::LoadFileWithSize(Axa::CFileMan* _this, const char* filenam

void* __cdecl Panacea::LoadFileWithMalloc(Axa::CFileMan* _this, const char* filename, int* sizePtr, bool useHdAsset, const char* filename2)
{
if (!ENSURE_DIRECTORY)
{
char _stringBuffer[256];
bool(*_fetchFunc)(const char* str, char* buff, char* a3) = reinterpret_cast<bool(*)(const char*, char*, char*)>(FetchPattern("\x48\x89\x5C\x24\x20\x55\x56\x57\x48\x81\xEC\x60\x01\x00\x00", "xxxxxxxxxxxxxxx"));

if (!_fetchFunc)
{
_fetchFunc = reinterpret_cast<bool(*)(const char*, char*, char*)>(FetchPattern("\x48\x89\x5C\x24\x20\x55\x56\x57\x48\x81\xEC\x40\x01\x00\x00", "xxxxxxxxxxxxxxx"));

if (!_fetchFunc)
{
ENSURE_DIRECTORY = true;
goto CONTINUE_FUNC;
}

_fetchFunc("KINGDOM HEARTS HD 1.5+2.5 ReMIX\\Epic Games Store", _stringBuffer, nullptr);
}

else
_fetchFunc("KINGDOM HEARTS HD 1.5+2.5 ReMIX\\Steam", _stringBuffer, nullptr);

std::filesystem::create_directories(_stringBuffer);
ENSURE_DIRECTORY = true;
}

CONTINUE_FUNC:

wchar_t path[MAX_PATH];
if (GetRawFile(path, sizeof(path), filename))
{
Expand Down
Loading