The-Homebrew-Cloud
/
FunctionPatcherModule
mirror of https://github.com/wiiu-env/FunctionPatcherModule.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix patching dynamic function in WUMS_INITIALIZE hooks

This commit is contained in:
Maschell 2022-08-19 14:47:19 +02:00
parent 5b87a89650
commit ced1e27b53
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/main.cpp
View File

@ -11,7 +11,6 @@
WUMS_MODULE_EXPORT_NAME("homebrew_functionpatcher"); WUMS_MODULE_EXPORT_NAME("homebrew_functionpatcher");
WUMS_MODULE_INIT_BEFORE_RELOCATION_DONE_HOOK(); WUMS_MODULE_INIT_BEFORE_RELOCATION_DONE_HOOK();
void UpdateFunctionPointer() { void UpdateFunctionPointer() {
// We need the real MEMAllocFromDefaultHeapEx/MEMFreeToDefaultHeap function pointer to force-allocate memory on the default heap. // We need the real MEMAllocFromDefaultHeapEx/MEMFreeToDefaultHeap function pointer to force-allocate memory on the default heap.
// Our custom heap doesn't work (yet) for threads and causes an app panic. // Our custom heap doesn't work (yet) for threads and causes an app panic.
@ -38,9 +37,14 @@ void UpdateFunctionPointer() {
OSDynLoad_Release(coreinitModule); OSDynLoad_Release(coreinitModule);
} }
uint32_t gDoFunctionResets;
WUMS_INITIALIZE() { WUMS_INITIALIZE() {
UpdateFunctionPointer(); UpdateFunctionPointer();
// don't reset the patch status on the first launch.
gDoFunctionResets = false;
memset(gJumpHeapData, 0, JUMP_HEAP_DATA_SIZE); memset(gJumpHeapData, 0, JUMP_HEAP_DATA_SIZE);
gJumpHeapHandle = MEMCreateExpHeapEx((void *) (gJumpHeapData), JUMP_HEAP_DATA_SIZE, 1); gJumpHeapHandle = MEMCreateExpHeapEx((void *) (gJumpHeapData), JUMP_HEAP_DATA_SIZE, 1);
if (gJumpHeapHandle == nullptr) { if (gJumpHeapHandle == nullptr) {
@ -81,24 +85,34 @@ WUMS_APPLICATION_STARTS() {
std::lock_guard<std::mutex> lock(gPatchedFunctionsMutex); std::lock_guard<std::mutex> lock(gPatchedFunctionsMutex);
DEBUG_FUNCTION_LINE_VERBOSE("Reset patch status"); // Avoid resetting the patch status of function on the first start.
// Reset all dynamic functions // WUMS_INITIALIZE & WUMS_APPLICATION_STARTS are called during the same application => the .rpl won't get reloaded.
for (auto &cur : gPatchedFunctions) { // If the .rpl won't get reloaded, old patches will still be present. This can be an issue if a module patches a
if (cur->isDynamicFunction()) { // dynamic function in WUMS_INITIALIZE, which is called right before the first time this function will be called.
if (cur->functionName) { // This reset code would mark it as unpatched, while the code is actually still patched, leading to patching an
DEBUG_FUNCTION_LINE_VERBOSE("%s is dynamic, reset patched status", cur->functionName->c_str()); // already patched function.
// To avoid this issues, the need to skip the reset status part the first time.
if (gDoFunctionResets) {
DEBUG_FUNCTION_LINE_VERBOSE("Reset patch status");
// Reset all dynamic functions
for (auto &cur : gPatchedFunctions) {
if (cur->isDynamicFunction()) {
if (cur->functionName) {
DEBUG_FUNCTION_LINE_VERBOSE("%s is dynamic, reset patched status", cur->functionName->c_str());
} else {
DEBUG_FUNCTION_LINE_VERBOSE("is dynamic, reset patched status");
}
cur->isPatched = false;
} else { } else {
DEBUG_FUNCTION_LINE_VERBOSE("is dynamic, reset patched status"); if (cur->functionName) {
} DEBUG_FUNCTION_LINE_VERBOSE("Skip %s for targetProcess %d", cur->functionName->c_str(), cur->targetProcess);
cur->isPatched = false; } else {
} else { DEBUG_FUNCTION_LINE_VERBOSE("Skip %08X for targetProcess %d", cur->realEffectiveFunctionAddress, cur->targetProcess);
if (cur->functionName) { }
DEBUG_FUNCTION_LINE_VERBOSE("Skip %s for targetProcess %d", cur->functionName->c_str(), cur->targetProcess);
} else {
DEBUG_FUNCTION_LINE_VERBOSE("Skip %08X for targetProcess %d", cur->realEffectiveFunctionAddress, cur->targetProcess);
} }
} }
} }
gDoFunctionResets = true;
OSMemoryBarrier(); OSMemoryBarrier();