Mirror/Luma3DS
1
0
Fork 0
mirror of https://github.com/LumaTeam/Luma3DS.git synced 2026-02-22 01:44:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

plgldr: Allow loading plugins on homebrew if flag set in 3gx

Browse Source
This commit is contained in:
PabloMK7 2024-12-23 14:37:54 +01:00 committed by TuxSH
parent 60b244d6a3
commit 1399d7ef3b
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sysmodules/loader/source/loader.c
View File

@ -272,7 +272,7 @@ Result PLGLDR__IsPluginLoaderEnabled(bool *isEnabled)
} }
// Try to load a plugin for the game // Try to load a plugin for the game
static Result PLGLDR_LoadPlugin(u32 processID) static Result PLGLDR_LoadPlugin(u32 processID, bool isHomebrew)
{ {
// Special case handling: games rebooting the 3DS on old models // Special case handling: games rebooting the 3DS on old models
if (!isN3DS && g_exheaderInfo.aci.local_caps.core_info.o3ds_system_mode > 0) if (!isN3DS && g_exheaderInfo.aci.local_caps.core_info.o3ds_system_mode > 0)
@ -288,8 +288,9 @@ static Result PLGLDR_LoadPlugin(u32 processID)
u32* cmdbuf = getThreadCommandBuffer(); u32* cmdbuf = getThreadCommandBuffer();
cmdbuf[0] = IPC_MakeHeader(1, 1, 0); cmdbuf[0] = IPC_MakeHeader(1, 2, 0);
cmdbuf[1] = processID; cmdbuf[1] = processID;
cmdbuf[2] = isHomebrew;
return svcSendSyncRequest(plgldrHandle); return svcSendSyncRequest(plgldrHandle);
} }
@ -452,12 +453,12 @@ static Result LoadProcessImpl(Handle *outProcessHandle, const ExHeader_Info *exh
res = R_SUCCEEDED(res) ? 0 : res; res = R_SUCCEEDED(res) ? 0 : res;
// check for plugin // check for plugin
if (!res && !isHomebrew && ((u32)((titleId >> 0x20) & 0xFFFFFFEDULL) == 0x00040000)) if (!res && ((u32)((titleId >> 0x20) & 0xFFFFFFEDULL) == 0x00040000))
{ {
u32 processID; u32 processID;
assertSuccess(svcGetProcessId(&processID, *outProcessHandle)); assertSuccess(svcGetProcessId(&processID, *outProcessHandle));
assertSuccess(plgldrInit()); assertSuccess(plgldrInit());
assertSuccess(PLGLDR_LoadPlugin(processID)); assertSuccess(PLGLDR_LoadPlugin(processID, isHomebrew));
plgldrExit(); plgldrExit();
} }
} }

3
sysmodules/rosalina/include/plugin/3gx.h
View File

@ -24,7 +24,8 @@ typedef struct CTR_PACKED
u32 eventsSelfManaged : 1; u32 eventsSelfManaged : 1;
u32 swapNotNeeded : 1; u32 swapNotNeeded : 1;
u32 usePrivateMemory : 1; u32 usePrivateMemory : 1;
u32 unused : 23; u32 allowHomebrewLoad : 1;
u32 unused : 22;
}; };
}; };
u32 exeLoadChecksum; u32 exeLoadChecksum;

2
sysmodules/rosalina/include/plugin/plgloader.h
View File

@ -34,7 +34,7 @@ u32 saveSwapFunc(void* startAddr, void* endAddr, void* args);
u32 loadSwapFunc(void* startAddr, void* endAddr, void* args); u32 loadSwapFunc(void* startAddr, void* endAddr, void* args);
u32 loadExeFunc(void* startAddr, void* endAddr, void* args); u32 loadExeFunc(void* startAddr, void* endAddr, void* args);
bool TryToLoadPlugin(Handle process); bool TryToLoadPlugin(Handle process, bool isHomebrew);
void PLG__NotifyEvent(PLG_Event event, bool signal); void PLG__NotifyEvent(PLG_Event event, bool signal);
void PLG__SetConfigMemoryStatus(u32 status); void PLG__SetConfigMemoryStatus(u32 status);
u32 PLG__GetConfigMemoryStatus(void); u32 PLG__GetConfigMemoryStatus(void);

11
sysmodules/rosalina/source/plugin/file_loader.c
View File

@ -142,7 +142,7 @@ static Result CheckPluginCompatibility(_3gx_Header *header, u32 processTitle)
return -1; return -1;
} }
bool TryToLoadPlugin(Handle process) bool TryToLoadPlugin(Handle process, bool isHomebrew)
{ {
u64 tid; u64 tid;
u64 fileSize; u64 fileSize;
@ -208,7 +208,14 @@ bool TryToLoadPlugin(Handle process)
// Check compatibility // Check compatibility
if (!res && fileHeader.infos.compatibility == PLG_COMPAT_EMULATOR) { if (!res && fileHeader.infos.compatibility == PLG_COMPAT_EMULATOR) {
ctx->error.message = "Plugin is only compatible with emulators"; ctx->error.message = "Plugin is only compatible with emulators";
return false; res = -1;
}
// Check if plugin can load on homebrew
if (!res && (isHomebrew && !fileHeader.infos.allowHomebrewLoad)) {
// Do not display message as this is a common case
ctx->error.message = NULL;
res = -1;
} }
// Flags // Flags

4
sysmodules/rosalina/source/plugin/plgloader.c
View File

@ -151,7 +151,7 @@ void PluginLoader__HandleCommands(void *_ctx)
{ {
case 1: // Load plugin case 1: // Load plugin
{ {
if (cmdbuf[0] != IPC_MakeHeader(1, 1, 0)) if (cmdbuf[0] != IPC_MakeHeader(1, 2, 0))
{ {
error(cmdbuf, 0xD9001830); error(cmdbuf, 0xD9001830);
break; break;
@ -164,7 +164,7 @@ void PluginLoader__HandleCommands(void *_ctx)
TaskRunner_RunTask(j_PluginLoader__SetMode3AppMode, NULL, 0); TaskRunner_RunTask(j_PluginLoader__SetMode3AppMode, NULL, 0);
bool flash = !(ctx->useUserLoadParameters && ctx->userLoadParameters.noFlash); bool flash = !(ctx->useUserLoadParameters && ctx->userLoadParameters.noFlash);
if (ctx->isEnabled && TryToLoadPlugin(ctx->target)) if (ctx->isEnabled && TryToLoadPlugin(ctx->target, cmdbuf[2]))
{ {
if (flash) if (flash)
{ {