From 5d6324dc6da3bd7c50f9b31a1afde213da35bc3d Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Wed, 5 Oct 2022 15:53:35 +0200
Subject: [PATCH] Call OSDynLoad_Release for RPLs acquired by aroma modules on
 exit

---
 Dockerfile                                     | 4 ++--
 source/sdrefcount/sd_function_replacements.cpp | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 74d8ddd..e89c2a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM wiiuenv/devkitppc:20220806
+FROM wiiuenv/devkitppc:20220917
 
 COPY --from=wiiuenv/libfunctionpatcher:20220904 /artifacts $DEVKITPRO
-COPY --from=wiiuenv/wiiumodulesystem:20220904 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/wiiumodulesystem:20221005 /artifacts $DEVKITPRO
 
 WORKDIR project
diff --git a/source/sdrefcount/sd_function_replacements.cpp b/source/sdrefcount/sd_function_replacements.cpp
index 99bf8b1..29c021d 100644
--- a/source/sdrefcount/sd_function_replacements.cpp
+++ b/source/sdrefcount/sd_function_replacements.cpp
@@ -2,6 +2,7 @@
 #include "applicationendshook/applicationends_function_replacements.h"
 #include "globals.h"
 #include "logger.h"
+#include <coreinit/dynload.h>
 #include <coreinit/filesystem_fsa.h>
 #include <string_view>
 
@@ -17,6 +18,14 @@ DECL_FUNCTION(void, __PPCExit, uint32_t u1) {
         }
         gSDMountRefCount = 0;
     }
+
+    if (gModuleData->number_acquired_rpls > 0) {
+        DEBUG_FUNCTION_LINE_VERBOSE("Release RPLs acquired by modules");
+        for (uint32_t i = 0; i < gModuleData->number_acquired_rpls; i++) {
+            DEBUG_FUNCTION_LINE_VERBOSE("OSDynLoad_Release(0x%08)", gModuleData->acquired_rpls[i]);
+            OSDynLoad_Release((void *) gModuleData->acquired_rpls[i]);
+        }
+    }
     real___PPCExit(u1);
 }