mirror of
https://github.com/wiiu-env/FunctionPatcherModule.git
synced 2025-01-08 08:00:46 +01:00
Rename toRemoved to toBeRemoved
This commit is contained in:
parent
ecc109af50
commit
9485cc7e15
@ -55,11 +55,11 @@ FunctionPatcherStatus FPRemoveFunctionPatch(PatchedFunctionHandle handle) {
|
|||||||
std::vector<std::shared_ptr<PatchedFunctionData>> toBeTempRestored;
|
std::vector<std::shared_ptr<PatchedFunctionData>> toBeTempRestored;
|
||||||
bool found = false;
|
bool found = false;
|
||||||
int32_t erasePosition = 0;
|
int32_t erasePosition = 0;
|
||||||
std::shared_ptr<PatchedFunctionData> toRemoved;
|
std::shared_ptr<PatchedFunctionData> toBeRemoved;
|
||||||
for (auto &cur : gPatchedFunctions) {
|
for (auto &cur : gPatchedFunctions) {
|
||||||
if (cur->getHandle() == handle) {
|
if (cur->getHandle() == handle) {
|
||||||
toRemoved = cur;
|
toBeRemoved = cur;
|
||||||
found = true;
|
found = true;
|
||||||
if (!cur->isPatched) {
|
if (!cur->isPatched) {
|
||||||
// Early return if the function is not patched.
|
// Early return if the function is not patched.
|
||||||
break;
|
break;
|
||||||
@ -68,7 +68,7 @@ FunctionPatcherStatus FPRemoveFunctionPatch(PatchedFunctionHandle handle) {
|
|||||||
}
|
}
|
||||||
// Check if something else patched the same function afterwards.
|
// Check if something else patched the same function afterwards.
|
||||||
if (found) {
|
if (found) {
|
||||||
if (cur->realPhysicalFunctionAddress == toRemoved->realPhysicalFunctionAddress) {
|
if (cur->realPhysicalFunctionAddress == toBeRemoved->realPhysicalFunctionAddress) {
|
||||||
toBeTempRestored.push_back(cur);
|
toBeTempRestored.push_back(cur);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -80,19 +80,19 @@ FunctionPatcherStatus FPRemoveFunctionPatch(PatchedFunctionHandle handle) {
|
|||||||
return FUNCTION_PATCHER_RESULT_PATCH_NOT_FOUND;
|
return FUNCTION_PATCHER_RESULT_PATCH_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (toRemoved->isPatched) {
|
if (toBeRemoved->isPatched) {
|
||||||
// Restore function patches that were done after the patch we actually want to restore.
|
// Restore function patches that were done after the patch we actually want to restore.
|
||||||
for (auto &cur : std::ranges::reverse_view(toBeTempRestored)) {
|
for (auto &cur : std::ranges::reverse_view(toBeTempRestored)) {
|
||||||
RestoreFunction(cur);
|
RestoreFunction(cur);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Restore the function we actually want to restore
|
// Restore the function we actually want to restore
|
||||||
RestoreFunction(toRemoved);
|
RestoreFunction(toBeRemoved);
|
||||||
}
|
}
|
||||||
|
|
||||||
gPatchedFunctions.erase(gPatchedFunctions.begin() + erasePosition);
|
gPatchedFunctions.erase(gPatchedFunctions.begin() + erasePosition);
|
||||||
|
|
||||||
if (toRemoved->isPatched) {
|
if (toBeRemoved->isPatched) {
|
||||||
// Apply the other patches again
|
// Apply the other patches again
|
||||||
for (auto &cur : toBeTempRestored) {
|
for (auto &cur : toBeTempRestored) {
|
||||||
PatchFunction(cur);
|
PatchFunction(cur);
|
||||||
|
Loading…
Reference in New Issue
Block a user