Fix compiling with latest wut, Update Dockerfile

wiiu-env · Jul 18, 2023 · 64667d6 · 64667d6
1 parent cb527ad
commit 64667d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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/wiiupluginsystem:20230215 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230108 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/libmappedmemory:20220904 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/libwupsbackend:20230217 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20230622 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20230622 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libmappedmemory:20230621 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libwupsbackend:20230621 /artifacts $DEVKITPRO
 
 WORKDIR project
diff --git a/source/PluginManagement.cpp b/source/PluginManagement.cpp
@@ -25,15 +25,15 @@ bool PluginManagement::doRelocation(const std::vector<std::unique_ptr<Relocation
         if (functionName == "MEMAllocFromDefaultHeap") {
             OSDynLoad_Module 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") {
             OSDynLoad_Module 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") {
             OSDynLoad_Module 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) {
@@ -56,7 +56,7 @@ bool PluginManagement::doRelocation(const std::vector<std::unique_ptr<Relocation
                 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) {

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