The-Homebrew-Cloud/WiiUPluginLoaderBackend
2
0
Fork 0
mirror of https://github.com/wiiu-env/WiiUPluginLoaderBackend.git synced 2024-11-22 04:39:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiling with latest wut, Update Dockerfile

Browse Source
This commit is contained in:
Maschell 2023-07-15 13:10:23 +02:00
parent cb527add76
commit 64667d6169
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -1,9 +1,9 @@
FROM ghcr.io/wiiu-env/devkitppc:20221228 FROM ghcr.io/wiiu-env/devkitppc:20230621
COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20230106 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20230622 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20230215 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20230622 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230108 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libmappedmemory:20220904 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/libmappedmemory:20230621 /artifacts $DEVKITPRO
COPY --from=ghcr.io/wiiu-env/libwupsbackend:20230217 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/libwupsbackend:20230621 /artifacts $DEVKITPRO
WORKDIR project WORKDIR project

8
source/PluginManagement.cpp
View File

@ -25,15 +25,15 @@ bool PluginManagement::doRelocation(const std::vector<std::unique_ptr<Relocation
if (functionName == "MEMAllocFromDefaultHeap") { if (functionName == "MEMAllocFromDefaultHeap") {
OSDynLoad_Module rplHandle; OSDynLoad_Module rplHandle;
OSDynLoad_Acquire("homebrew_memorymapping", &rplHandle); OSDynLoad_Acquire("homebrew_memorymapping", &rplHandle);
OSDynLoad_FindExport(rplHandle, 1, "MEMAllocFromMappedMemory", (void **) &functionAddress); OSDynLoad_FindExport(rplHandle, OS_DYNLOAD_EXPORT_DATA, "MEMAllocFromMappedMemory", (void **) &functionAddress);
} else if (functionName == "MEMAllocFromDefaultHeapEx") { } else if (functionName == "MEMAllocFromDefaultHeapEx") {
OSDynLoad_Module rplHandle; OSDynLoad_Module rplHandle;
OSDynLoad_Acquire("homebrew_memorymapping", &rplHandle); OSDynLoad_Acquire("homebrew_memorymapping", &rplHandle);
OSDynLoad_FindExport(rplHandle, 1, "MEMAllocFromMappedMemoryEx", (void **) &functionAddress); OSDynLoad_FindExport(rplHandle, OS_DYNLOAD_EXPORT_DATA, "MEMAllocFromMappedMemoryEx", (void **) &functionAddress);
} else if (functionName == "MEMFreeToDefaultHeap") { } else if (functionName == "MEMFreeToDefaultHeap") {
OSDynLoad_Module rplHandle; OSDynLoad_Module rplHandle;
OSDynLoad_Acquire("homebrew_memorymapping", &rplHandle); OSDynLoad_Acquire("homebrew_memorymapping", &rplHandle);
OSDynLoad_FindExport(rplHandle, 1, "MEMFreeToMappedMemory", (void **) &functionAddress); OSDynLoad_FindExport(rplHandle, OS_DYNLOAD_EXPORT_DATA, "MEMFreeToMappedMemory", (void **) &functionAddress);
} }
if (functionAddress == 0) { if (functionAddress == 0) {
@ -56,7 +56,7 @@ bool PluginManagement::doRelocation(const std::vector<std::unique_ptr<Relocation
rplHandle = usedRPls[rplName]; rplHandle = usedRPls[rplName];
} }
OSDynLoad_FindExport(rplHandle, isData, functionName.c_str(), (void **) &functionAddress); OSDynLoad_FindExport(rplHandle, (OSDynLoad_ExportType) isData, functionName.c_str(), (void **) &functionAddress);
} }
if (functionAddress == 0) { if (functionAddress == 0) {

2
source/hooks.cpp
View File

@ -2,8 +2,6 @@
#include "plugin/PluginContainer.h" #include "plugin/PluginContainer.h"
#include "utils/StorageUtils.h" #include "utils/StorageUtils.h"
#include "utils/logger.h" #include "utils/logger.h"
#include <memory>
#include <vector>
static const char **hook_names = (const char *[]){ static const char **hook_names = (const char *[]){
"WUPS_LOADER_HOOK_INIT_WUT_MALLOC", "WUPS_LOADER_HOOK_INIT_WUT_MALLOC",