Merge pull request #97 from LNH-team/feature/homebrew-return-to-loader

Homebrew return to loader

arm7/source/loader/NdsLoader.cpp

@@ -352,6 +352,7 @@ void NdsLoader::Load(BootMode bootMode)
     if (isHomebrew)
     {
         InsertArgv();
+        HandleHomebrewPatching();
     }
 
     HandleDldiPatching();
@@ -437,6 +438,26 @@ void NdsLoader::InsertArgv()
     HOMEBREW_ARGV->length = argSize;
 }
 
+void NdsLoader::HandleHomebrewPatching()
+{
+    if (_launcherPath != nullptr && _launcherPath[0] != 0)
+    {
+        sendToArm9(IPC_COMMAND_ARM9_SETUP_HOMEBREW_BOOTSTUB);
+        sendToArm9(16 * 1024); // required dldi space
+        void* dldiSpace = (void*)receiveFromArm9();
+        char* launcherPath = (char*)receiveFromArm9();
+        if (dldiSpace != nullptr)
+        {
+            dldi_copyTo(dldiSpace);
+        }
+        if (launcherPath != nullptr)
+        {
+            strncpy(launcherPath, _launcherPath, 256);
+            launcherPath[255] = 0;
+        }
+    }
+}
+
 void NdsLoader::ApplyArm7Patches()
 {
     sendToArm9(IPC_COMMAND_ARM9_APPLY_ARM7_PATCHES);

arm7/source/loader/NdsLoader.h

@@ -26,6 +26,13 @@ public:
         _savePath = savePath;
     }
 
+    /// @brief Sets the \p launcherPath to use.
+    /// @param launcherPath The launcher path to use.
+    void SetLauncherPath(const TCHAR* launcherPath)
+    {
+        _launcherPath = launcherPath;
+    }
+
     /// @brief Sets the argv arguments to pass to the rom.
     /// @param arguments The argv arguments.
     /// @param argumentsLength The length of the argv arguments.
@@ -41,8 +48,9 @@ public:
 
 private:
     FIL _romFile;
-    const TCHAR* _romPath;
-    const TCHAR* _savePath;
+    const TCHAR* _romPath = nullptr;
+    const TCHAR* _savePath = nullptr;
+    const TCHAR* _launcherPath = nullptr;
     u32 _argumentsLength = 0;
     const char* _arguments = nullptr;
     nds_header_twl_t _romHeader;
@@ -71,6 +79,7 @@ private:
         char driveLetter, const char* deviceName, const char* path, u8 flags, u8 accessRights);
     void SetupDsiDeviceList();
     void InsertArgv();
+    void HandleHomebrewPatching();
     bool TrySetupDsiWareSave();
     bool TryDecryptSecureArea();
     void HandleIQueRegionFreePatching();

arm7/source/loader/dldiHeader.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "common.h"
 
 #define DLDI_MAGIC              0xBF8DA5ED
 #define DLDI_DRIVER_MAGIC_NONE  0x49444C44