From 241b5ba6610aad4eabfae06b9d7c32ee342d8e96 Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Tue, 3 Jan 2023 23:13:18 +0100
Subject: [PATCH] Use OSDynLoad_IsModuleLoaded instead of OSDynLoad_Acquire and
 add missing call

---
 wumsloader/src/utils/dynamic.c | 5 ++++-
 wumsloader/src/utils/imports.h | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wumsloader/src/utils/dynamic.c b/wumsloader/src/utils/dynamic.c
index b0822be..59fa884 100644
--- a/wumsloader/src/utils/dynamic.c
+++ b/wumsloader/src/utils/dynamic.c
@@ -33,7 +33,7 @@ void InitFunctionPointers(void) {
     addr_OSDynLoad_FindExport     = (void *) 0x0102B828; // 0200f428 - 0xFE3C00
     addr_OSDynLoad_IsModuleLoaded = (void *) 0x0102A59C; // 0200e19c - 0xFE3C00
 
-    OSDynLoad_Acquire("coreinit.rpl", &handle);
+    OSDynLoad_IsModuleLoaded("coreinit.rpl", &handle);
 
     uint32_t **value = 0;
     OSDynLoad_FindExport(handle, 1, "MEMAllocFromDefaultHeap", (void **) &value);
@@ -43,6 +43,9 @@ void InitFunctionPointers(void) {
     OSDynLoad_FindExport(handle, 1, "MEMFreeToDefaultHeap", (void **) &value);
     MEMFreeToDefaultHeap = *value;
 #include "imports.h"
+
+    OSDynLoad_IsModuleLoaded("coreinit.rpl", &handle);
+
     // override failed __rplwrap_exit find export
     OSDynLoad_FindExport(handle, 0, "exit", (void **) &addr___rplwrap_exit);
 }
diff --git a/wumsloader/src/utils/imports.h b/wumsloader/src/utils/imports.h
index 89b2c2d..db0f9cd 100644
--- a/wumsloader/src/utils/imports.h
+++ b/wumsloader/src/utils/imports.h
@@ -31,8 +31,6 @@ IMPORT(OSSetThreadSpecific);
 IMPORT(OSInitCond);
 IMPORT(OSWaitCond);
 IMPORT(OSSignalCond);
-IMPORT(MEMAllocFromDefaultHeapEx);
-IMPORT(MEMFreeToDefaultHeap);
 IMPORT(OSSwapAtomic);
 IMPORT(OSDynLoad_GetAllocator);
 IMPORT(OSDynLoad_SetAllocator);