LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge pull request #3 from AuroraWright/master

Browse Source 
Merge 10.0.1
This commit is contained in:
PabloMK7 2019-07-06 09:37:41 +02:00 committed by GitHub
commit f1b787c7d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysmodules/loader/source/patcher.c
View File

@ -536,7 +536,7 @@ static inline bool patchLayeredFs(u64 progId, u8 *code, u32 size, u32 textSize,
romfsRedirPatchFsMountArchive = 0x100000 + fsMountArchive; romfsRedirPatchFsMountArchive = 0x100000 + fsMountArchive;
romfsRedirPatchFsRegisterArchive = 0x100000 + fsRegisterArchive; romfsRedirPatchFsRegisterArchive = 0x100000 + fsRegisterArchive;
romfsRedirPatchArchiveId = archiveId; romfsRedirPatchArchiveId = archiveId;
memcpy(&romfsRedirPatchRomFsMount, updateRomFsMounts[updateRomFsIndex], 4); memcpy(&romfsRedirPatchUpdateRomFsMount, updateRomFsMounts[updateRomFsIndex], 4);
memcpy(payload, romfsRedirPatch, romfsRedirPatchSize); memcpy(payload, romfsRedirPatch, romfsRedirPatchSize);

3
sysmodules/pm/source/info.c
View File

@ -11,6 +11,9 @@ Result registerProgram(u64 *programHandle, const FS_ProgramInfo *programInfo, co
Result res = 0; Result res = 0;
if (IS_N3DS) { if (IS_N3DS) {
if (pi.programId >> 48 == 0xFFFF) {
return LOADER_RegisterProgram(programHandle, &pi, &piu);
}
pi.programId = (pi.programId & ~N3DS_TID_MASK) | N3DS_TID_BIT; pi.programId = (pi.programId & ~N3DS_TID_MASK) | N3DS_TID_BIT;
piu.programId = (piu.programId & ~N3DS_TID_MASK) | N3DS_TID_BIT; piu.programId = (piu.programId & ~N3DS_TID_MASK) | N3DS_TID_BIT;
res = LOADER_RegisterProgram(programHandle, &pi, &piu); res = LOADER_RegisterProgram(programHandle, &pi, &piu);

2
sysmodules/pm/source/manager.c
View File

@ -49,7 +49,7 @@ Result UnregisterProcess(u64 titleId)
ProcessData *foundProcess = NULL; ProcessData *foundProcess = NULL;
ProcessList_Lock(&g_manager.processList); ProcessList_Lock(&g_manager.processList);
foundProcess = ProcessList_FindProcessByTitleId(&g_manager.processList, titleId); foundProcess = ProcessList_FindProcessByTitleId(&g_manager.processList, titleId & ~N3DS_TID_MASK);
if (foundProcess != NULL) { if (foundProcess != NULL) {
if (foundProcess == g_manager.runningApplicationData) { if (foundProcess == g_manager.runningApplicationData) {
g_manager.runningApplicationData = NULL; g_manager.runningApplicationData = NULL;

2
sysmodules/rosalina/source/menus/process_list.c
View File

@ -262,7 +262,7 @@ static void ProcessListMenu_MemoryViewer(const ProcessInfo *info)
u32 max; u32 max;
} MenuData; } MenuData;
bool editing; bool editing = false;
MenuData menus[MENU_MODE_MAX] = {0}; MenuData menus[MENU_MODE_MAX] = {0};
int menuMode = MENU_MODE_NORMAL; int menuMode = MENU_MODE_NORMAL;