Update FatFs

.github/ISSUE_TEMPLATE.md

@@ -2,18 +2,12 @@
 #
 # THIS IS NOT A SUPPORT FORUM! For support please go to:
 # Luma3DS GBATemp thread: https://gbatemp.net/threads/luma3ds-noob-proof-3ds-custom-firmware.411110/
-# /r/3dshacks: http://reddit.com/r/3dshacks/
-# Nintendo Hacking: https://discordapp.com/invite/C29hYvh
-# IRC: #3dshacks@rizon
+# Nintendo Hacking: https://discord.gg/MjzatM8y
 #
 # Also check the Wiki (https://github.com/AuroraWright/Luma3DS/wiki) before making an issue.
 #
 # For those with GBA/DSiWare/DS/AGB_FIRM/TWL_FIRM problems: https://3ds.guide/troubleshooting
 #
-# Please make sure to read "Enable region/language emulation and external .code" https://github.com/AuroraWright/Luma3DS/wiki/Options-and-usage before posting any issues about the "Enable region/language emulation and external .code" option(s).
-# Keep in mind that Wiki page only applies to nightly builds. It will NOT WORK with 6.6 Stable Luma3DS.
-# As of 0.02 (https://github.com/Possum/LumaLocaleSwitcher/releases) LumaLocaleSwitcher's path(s) are for 6.6 Stable and won't work with Luma3DS nightly builds newer or equal to https://github.com/AuroraWright/Luma3DS/commit/b5336c81cc82b6c5e8115249342beb5b065cdce9.
-# Use this version for Luma3DS nightlies newer or equal to https://github.com/AuroraWright/Luma3DS/commit/b5336c81cc82b6c5e8115249342beb5b065cdce9 :
-# https://puu.sh/uC5zW/5470adc347.7z (from https://github.com/Possum/LumaLocaleSwitcher/issues/9#issuecomment-285564014)
+# Please make sure to read "Enable game patching" https://github.com/AuroraWright/Luma3DS/wiki/Options-and-usage before posting any issues about the "Enable game patching" option(s).
 #
 -->

haxloader/source/fatfs/ff.c

@@ -2050,7 +2050,8 @@ FRESULT load_obj_dir (
 	dp->obj.fs = obj->fs;
 	dp->obj.sclust = obj->c_scl;
 	dp->obj.stat = (BYTE)obj->c_size;
-	dp->obj.objsize = obj->c_size & 0xFFFFFF00;
+	dp->obj.objsize = obj->c_size & 0xFFFFFF00;
+	dp->obj.n_frag = 0;
 	dp->blk_ofs = obj->c_ofs;
 
 	res = dir_sdi(dp, dp->blk_ofs);	/* Goto object's entry block */
@@ -2326,19 +2327,22 @@ FRESULT dir_register (	/* FR_OK:succeeded, FR_DENIED:no free entry or too many S
 		if (res != FR_OK) return res;
 		dp->blk_ofs = dp->dptr - SZDIRE * (nent - 1);	/* Set the allocated entry block offset */
 
-		if (dp->obj.sclust != 0 && (dp->obj.stat & 4)) {	/* Has the sub-directory been stretched? */
-			dp->obj.objsize += (DWORD)fs->csize * SS(fs);	/* Increase the directory size by cluster size */
-			res = fill_first_frag(&dp->obj);				/* Fill first fragment on the FAT if needed */
-			if (res != FR_OK) return res;
-			res = fill_last_frag(&dp->obj, dp->clust, 0xFFFFFFFF);	/* Fill last fragment on the FAT if needed */
-			if (res != FR_OK) return res;
-			res = load_obj_dir(&dj, &dp->obj);				/* Load the object status */
-			if (res != FR_OK) return res;
-			st_qword(fs->dirbuf + XDIR_FileSize, dp->obj.objsize);		/* Update the allocation status */
-			st_qword(fs->dirbuf + XDIR_ValidFileSize, dp->obj.objsize);
-			fs->dirbuf[XDIR_GenFlags] = dp->obj.stat | 1;
-			res = store_xdir(&dj);							/* Store the object status */
+		if (dp->obj.stat & 4) {			/* Has the directory been stretched? */
+			dp->obj.stat &= ~4;
+			res = fill_first_frag(&dp->obj);	/* Fill the first fragment on the FAT if needed */
 			if (res != FR_OK) return res;
+			res = fill_last_frag(&dp->obj, dp->clust, 0xFFFFFFFF);	/* Fill the last fragment on the FAT if needed */
+			if (res != FR_OK) return res;
+			if (dp->obj.sclust != 0) {		/* Is it a sub directory? */
+				res = load_obj_dir(&dj, &dp->obj);	/* Load the object status */
+				if (res != FR_OK) return res;
+				dp->obj.objsize += (DWORD)fs->csize * SS(fs);			/* Increase the directory size by cluster size */
+				st_qword(fs->dirbuf + XDIR_FileSize, dp->obj.objsize);	/* Update the allocation status */
+				st_qword(fs->dirbuf + XDIR_ValidFileSize, dp->obj.objsize);
+				fs->dirbuf[XDIR_GenFlags] = dp->obj.stat | 1;
+				res = store_xdir(&dj);				/* Store the object status */
+				if (res != FR_OK) return res;
+			}
 		}
 
 		create_xdir(fs->dirbuf, fs->lfnbuf);	/* Create on-memory directory block to be written later */

injector/patches/romfsredir.s

@@ -54,8 +54,6 @@ _start:
         stmfd   sp!, {r0-r12, lr}
         ldrb    r12, [r1]
         cmp     r12, #0x72 ; 'r', should include "rom:", "rom2:" and "rex:"
-        cmpne   r12, #0x70 ; 'p', should include "patch:"
-        cmpne   r12, #0x65 ; 'e', should include "ext:"
         bne 	endRedir
         sub     sp, sp, #0x400
         pathRedir:

injector/source/fsldr.c

@@ -163,19 +163,4 @@ Result FSLDR_OpenDirectory(Handle* out, FS_Archive archive, FS_Path path)
   if(out) *out = cmdbuf[3];
 
   return cmdbuf[1];
-}
-
-Result FSDIRLDR_Close(Handle handle)
-{
-  u32 *cmdbuf = getThreadCommandBuffer();
-
-  cmdbuf[0] = IPC_MakeHeader(0x802,0,0); // 0x8020000
-
-  Result ret = 0;
-  if(R_FAILED(ret = svcSendSyncRequest(handle))) return ret;
-
-  ret = cmdbuf[1];
-  if(R_SUCCEEDED(ret)) ret = svcCloseHandle(handle);
-
-  return ret;
 }

injector/source/fsldr.h

@@ -9,5 +9,4 @@ Result FSLDR_SetPriority(u32 priority);
 Result FSLDR_OpenFileDirectly(Handle* out, FS_ArchiveID archiveId, FS_Path archivePath, FS_Path filePath, u32 openFlags, u32 attributes);
 Result FSLDR_OpenArchive(FS_Archive* archive, FS_ArchiveID id, FS_Path path);
 Result FSLDR_CloseArchive(FS_Archive archive);
-Result FSLDR_OpenDirectory(Handle* out, FS_Archive archive, FS_Path path);
-Result FSDIRLDR_Close(Handle handle);
+Result FSLDR_OpenDirectory(Handle* out, FS_Archive archive, FS_Path path);

injector/source/patcher.c

@@ -13,7 +13,7 @@ static u32 patchMemory(u8 *start, u32 size, const void *pattern, u32 patSize, in
 {
     u32 i;
 
-    for(i = 0; i < count; i++)
+    for(i = 0; !count || i < count; i++)
     {
         u8 *found = memsearch(start, pattern, size, patSize);
 
@@ -52,7 +52,7 @@ static u32 dirCheck(FS_ArchiveID archiveId, const char *path)
     else
     {
         ret = R_SUCCEEDED(FSLDR_OpenDirectory(&handle, archive, dirPath)) ? 0 : 2;
-        if(ret) FSDIRLDR_Close(handle);
+        if(!ret) FSDIR_Close(handle);
         FSLDR_CloseArchive(archive);
     }
 
@@ -87,8 +87,7 @@ static inline void loadCFWInfo(void)
     svcGetCFWInfo(&info);
 
     IFile file;
-    if(LOADERFLAG(ISSAFEMODE) && R_SUCCEEDED(fileOpen(&file, ARCHIVE_SDMC, "/", FS_OPEN_READ))) //Init SD card if SAFE_MODE is being booted
-        IFile_Close(&file);
+    if(LOADERFLAG(ISSAFEMODE)) fileOpen(&file, ARCHIVE_SDMC, "/", FS_OPEN_READ); //Init SD card if SAFE_MODE is being booted
 
     infoLoaded = true;
 }
@@ -187,17 +186,16 @@ static inline u8 *getCfgOffsets(u8 *code, u32 size, u32 *CFGUHandleOffset)
 
     for(u8 *CFGU_GetConfigInfoBlk2_endPos = code; CFGU_GetConfigInfoBlk2_endPos <= code + size - 12; CFGU_GetConfigInfoBlk2_endPos += 4)
     {
-        static const u32 CFGU_GetConfigInfoBlk2_endPattern[] = {0xE8BD8010, 0x00010082};
-
         //There might be multiple implementations of GetConfigInfoBlk2 but let's search for the one we want
         u32 *cmp = (u32 *)CFGU_GetConfigInfoBlk2_endPos;
 
-        if(cmp[0] != CFGU_GetConfigInfoBlk2_endPattern[0] || cmp[1] != CFGU_GetConfigInfoBlk2_endPattern[1]) continue;
+        if(cmp[0] != 0xE8BD8010 || cmp[1] != 0x00010082) continue;
 
         for(u32 i = 0; i < n; i++)
             if(possible[i] == cmp[2])
         {
             *CFGUHandleOffset = cmp[2];
+
             return CFGU_GetConfigInfoBlk2_endPos;
         }
 
@@ -257,14 +255,12 @@ static inline void patchCfgGetRegion(u8 *code, u32 size, u8 regionId, u32 CFGUHa
 {
     for(u8 *cmdPos = code; cmdPos <= code + size - 28; cmdPos += 4)
     {
-        static const u32 cfgSecureInfoGetRegionCmdPattern[] = {0xEE1D0F70, 0xE3A00802};
-
         u32 *cmp = (u32 *)cmdPos;
 
-        if(*cmp != cfgSecureInfoGetRegionCmdPattern[1]) continue;
+        if(*cmp != 0xE3A00802) continue;
 
         for(u32 i = 1; i < 3; i++)
-            if((*(cmp - i) & 0xFFFF0FFF) == cfgSecureInfoGetRegionCmdPattern[0] && *((u16 *)cmdPos + 5) == 0xE59F &&
+            if((*(cmp - i) & 0xFFFF0FFF) == 0xEE1D0F70 && *((u16 *)cmdPos + 5) == 0xE59F &&
                *(u32 *)(cmdPos + 16 + *((u16 *)cmdPos + 4)) == CFGUHandleOffset)
         {
             cmp[3] = 0xE3A00000 | regionId; //mov    r0, =regionId
@@ -291,37 +287,45 @@ static u32 findFunctionStart(u8 *code, u32 pos)
 
 static inline bool findLayeredFsSymbols(u8 *code, u32 size, u32 *fsMountArchive, u32 *fsRegisterArchive, u32 *fsTryOpenFile, u32 *fsOpenFileDirectly)
 {
+    u32 found = 0,
+        *temp = NULL;
+
     for(u32 addr = 0; addr <= size - 4; addr += 4)
     {
-        if(*fsMountArchive == 0xFFFFFFFF)
+        switch(*(u32 *)(code + addr))
         {
-            if(addr <= size - 12 && *(u32 *)(code + addr) == 0xE5970010)
-            {
-                if((*(u32 *)(code + addr + 4) == 0xE1CD20D8) && ((*(u32 *)(code + addr + 8) & 0xFFFFFF) == 0x008D0000))
-                    *fsMountArchive = findFunctionStart(code, addr);
-            } 
-            else if(addr <= size - 16 && *(u32 *)(code + addr) == 0xE24DD028)
-            {
-                if((*(u32 *)(code + addr + 4) == 0xE1A04000) && (*(u32 *)(code + addr + 8) == 0xE59F60A8) && (*(u32 *)(code + addr + 0xC) == 0xE3A0C001))
-                    *fsMountArchive = findFunctionStart(code, addr);
-            }
+            case 0xE5970010:
+                if(addr <= size - 12 && *fsMountArchive == 0xFFFFFFFF && *(u32 *)(code + addr + 4) == 0xE1CD20D8 && (*(u32 *)(code + addr + 8) & 0xFFFFFF) == 0x008D0000) temp = fsMountArchive;
+                break;
+            case 0xE24DD028:
+                if(addr <= size - 16 && *fsMountArchive == 0xFFFFFFFF && *(u32 *)(code + addr + 4) == 0xE1A04000 && *(u32 *)(code + addr + 8) == 0xE59F60A8 && *(u32 *)(code + addr + 0xC) == 0xE3A0C001) temp = fsMountArchive;
+                break;
+            case 0xE3500008:
+                if(addr <= size - 12 && *fsRegisterArchive == 0xFFFFFFFF && (*(u32 *)(code + addr + 4) & 0xFFF00FF0) == 0xE1800400 && (*(u32 *)(code + addr + 8) & 0xFFF00FF0) == 0xE1800FC0) temp = fsRegisterArchive;
+                break;
+            case 0xE351003A:
+                if(addr <= size - 0x40 && *fsTryOpenFile == 0xFFFFFFFF && *(u32 *)(code + addr + 4) == 0x1AFFFFFC && *(u32 *)(code + addr + 0x34) == 0xE590C000 && *(u32 *)(code + addr + 0x3C) == 0xE12FFF3C) temp = fsTryOpenFile;
+                break;
+            case 0x08030204:
+                if(*fsOpenFileDirectly == 0xFFFFFFFF) temp = fsOpenFileDirectly;
+                break;
         }
 
-        if(addr <= size - 12 && *fsRegisterArchive == 0xFFFFFFFF && *(u32 *)(code + addr) == 0xE3500008 &&
-           (*(u32 *)(code + addr + 4) & 0xFFF00FF0) == 0xE1800400 && (*(u32 *)(code + addr + 8) & 0xFFF00FF0) == 0xE1800FC0)
-            *fsRegisterArchive = findFunctionStart(code, addr);
+        if(temp != NULL)
+        {
+            *temp = findFunctionStart(code, addr);
 
-        if(addr <= size - 0x40 && *fsTryOpenFile == 0xFFFFFFFF && *(u32 *)(code + addr + 4) == 0x1AFFFFFC && *(u32 *)(code + addr) == 0xE351003A &&
-           *(u32 *)(code + addr + 0x34) == 0xE590C000 && *(u32 *)(code + addr + 0x3C) == 0xE12FFF3C)
-            *fsTryOpenFile = findFunctionStart(code, addr);
+            if(*temp != 0xFFFFFFFF)
+            {
+                found++;
+                if(found == 4) break;
+            }
 
-        if(*fsOpenFileDirectly == 0xFFFFFFFF && *(u32 *)(code + addr) == 0x08030204)
-            *fsOpenFileDirectly = findFunctionStart(code, addr);
-
-        if(*fsMountArchive != 0xFFFFFFFF && *fsRegisterArchive != 0xFFFFFFFF && *fsTryOpenFile != 0xFFFFFFFF && *fsOpenFileDirectly != 0xFFFFFFFF) return true;
+            temp = NULL;
+        }
     }
 
-    return false;
+    return found == 4;
 }
 
 static inline bool findLayeredFsPayloadOffset(u8 *code, u32 size, u32 *payloadOffset)
@@ -477,13 +481,13 @@ static inline bool loadTitleLocaleConfig(u64 progId, u8 *regionId, u8 *languageI
 
     if(R_FAILED(IFile_Read(&file, &total, buf, fileSize))) goto exit;
 
-    u32 i,
-        j;
+    static const char *regions[] = {"JPN", "USA", "EUR", "AUS", "CHN", "KOR", "TWN"},
+                      *languages[] = {"JP", "EN", "FR", "DE", "IT", "ES", "ZH", "KO", "NL", "PT", "RU", "TW"};
 
-    for(i = 0; i < 7; i++)
+    u32 i;
+
+    for(i = 0; i < sizeof(regions) / sizeof(char *); i++)
     {
-        static const char *regions[] = {"JPN", "USA", "EUR", "AUS", "CHN", "KOR", "TWN"};
-
         if(memcmp(buf, regions[i], 3) == 0)
         {
             *regionId = (u8)i;
@@ -491,26 +495,26 @@ static inline bool loadTitleLocaleConfig(u64 progId, u8 *regionId, u8 *languageI
         }
     }
 
-    for(j = 0; j < 12; j++)
+    if(i != sizeof(regions) / sizeof(char *))
     {
-        static const char *languages[] = {"JP", "EN", "FR", "DE", "IT", "ES", "ZH", "KO", "NL", "PT", "RU", "TW"};
-
-        if(memcmp(buf + 4, languages[j], 2) == 0)
+        for(i = 0; i < sizeof(languages) / sizeof(char *); i++)
         {
-            *languageId = (u8)j;
-            break;
+            if(memcmp(buf + 4, languages[i], 2) == 0)
+            {
+                *languageId = (u8)i;
+                ret = true;
+                break;
+            }
         }
     }
 
-    ret = i != 7 && j != 12;
-
 exit:
     IFile_Close(&file);
 
     return ret;
 }
 
-static inline bool patchLayeredFs(u64 progId, u8 *code, u32 size)
+static inline bool patchLayeredFs(u64 progId, u8 *code, u32 size, u32 textSize)
 {
     /* Here we look for "/luma/titles/[u64 titleID in hex, uppercase]/romfs"
        If it exists it should be a folder containing ROMFS files */
@@ -522,16 +526,29 @@ static inline bool patchLayeredFs(u64 progId, u8 *code, u32 size)
 
     if(!archiveId) return true;
 
-    static const char *archiveName = "lf:";
-
     u32 fsMountArchive = 0xFFFFFFFF,
         fsRegisterArchive = 0xFFFFFFFF,
         fsTryOpenFile = 0xFFFFFFFF,
         fsOpenFileDirectly = 0xFFFFFFFF,
         payloadOffset;
 
-    if(!findLayeredFsSymbols(code, size, &fsMountArchive, &fsRegisterArchive, &fsTryOpenFile, &fsOpenFileDirectly) ||
-       !findLayeredFsPayloadOffset(code, size, &payloadOffset)) return false;
+    if(!findLayeredFsSymbols(code, textSize, &fsMountArchive, &fsRegisterArchive, &fsTryOpenFile, &fsOpenFileDirectly) ||
+       !findLayeredFsPayloadOffset(code, textSize, &payloadOffset)) return false;
+
+    static const char *updateRomFsMounts[] = { "patch:",
+                                               "ext:" },
+                      patch = 'r';
+
+    //Change update RomFS mountpoints to start with "r"
+    for(u32 i = 0, ret = 0; i < sizeof(updateRomFsMounts) / sizeof(char *) && !ret; i++)
+    {
+        ret = patchMemory(code, size,
+                  updateRomFsMounts[i],
+                  strnlen(updateRomFsMounts[i], 255), 0,
+                  &patch,
+                  sizeof(patch), 0
+              );
+    }
 
     //Setup the payload
     u8 *payload = code + payloadOffset;
@@ -541,7 +558,7 @@ static inline bool patchLayeredFs(u64 progId, u8 *code, u32 size)
     u32 *payload32 = (u32 *)payload;
     for(u32 i = 0; i < romfsredir_bin_size / 4; i++)
     {
-        switch (payload32[i])
+        switch(payload32[i])
         {
             case 0xdead0000:
                 payload32[i] = *(u32 *)(code + fsOpenFileDirectly);
@@ -556,7 +573,7 @@ static inline bool patchLayeredFs(u64 progId, u8 *code, u32 size)
                 payload32[i] = MAKE_BRANCH(payloadOffset + i * 4, fsTryOpenFile + 4);
                 break;
             case 0xdead0004:
-                memcpy(payload32 + i, archiveName, 3);
+                memcpy(payload32 + i, "lf:", 3);
                 memcpy((u8 *)(payload32 + i) + 3, path, sizeof(path));
                 break;
             case 0xdead0005:
@@ -840,7 +857,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
         if(!loadTitleCodeSection(progId, code, size) ||
            !applyCodeIpsPatch(progId, code, size) ||
            !loadTitleLocaleConfig(progId, &regionId, &languageId) ||
-           !patchLayeredFs(progId, code, textSize)) goto error;
+           !patchLayeredFs(progId, code, size, textSize)) goto error;
 
         if(regionId != 0xFF)
         {

source/exceptions.c

@@ -155,8 +155,14 @@ void detectAndProcessExceptionDumps(void)
 
     if(dumpHeader->processor == 11 && dumpHeader->additionalDataSize != 0)
     {
-        char processName[] = "Current process:         ";
-        memcpy(processName + sizeof(processName) - 9, (void *)additionalData, 8);
+        char processName[45] = "Current process:         ";
+        memcpy(processName + 17, (void *)additionalData, 8);
+        hexItoa(*(vu32 *)(additionalData + 12), hexString, 8, true);
+        concatenateStrings(processName, " (");
+        concatenateStrings(processName, hexString);
+        hexItoa(*(vu32 *)(additionalData + 8), hexString, 8, true);
+        concatenateStrings(processName, hexString);
+        concatenateStrings(processName, ")");
         posY = drawString(processName, true, 10, posY + SPACING_Y, COLOR_WHITE);
     }
 

source/fatfs/ff.c

@@ -2050,7 +2050,8 @@ FRESULT load_obj_dir (
 	dp->obj.fs = obj->fs;
 	dp->obj.sclust = obj->c_scl;
 	dp->obj.stat = (BYTE)obj->c_size;
-	dp->obj.objsize = obj->c_size & 0xFFFFFF00;
+	dp->obj.objsize = obj->c_size & 0xFFFFFF00;
+	dp->obj.n_frag = 0;
 	dp->blk_ofs = obj->c_ofs;
 
 	res = dir_sdi(dp, dp->blk_ofs);	/* Goto object's entry block */
@@ -2326,19 +2327,22 @@ FRESULT dir_register (	/* FR_OK:succeeded, FR_DENIED:no free entry or too many S
 		if (res != FR_OK) return res;
 		dp->blk_ofs = dp->dptr - SZDIRE * (nent - 1);	/* Set the allocated entry block offset */
 
-		if (dp->obj.sclust != 0 && (dp->obj.stat & 4)) {	/* Has the sub-directory been stretched? */
-			dp->obj.objsize += (DWORD)fs->csize * SS(fs);	/* Increase the directory size by cluster size */
-			res = fill_first_frag(&dp->obj);				/* Fill first fragment on the FAT if needed */
-			if (res != FR_OK) return res;
-			res = fill_last_frag(&dp->obj, dp->clust, 0xFFFFFFFF);	/* Fill last fragment on the FAT if needed */
-			if (res != FR_OK) return res;
-			res = load_obj_dir(&dj, &dp->obj);				/* Load the object status */
-			if (res != FR_OK) return res;
-			st_qword(fs->dirbuf + XDIR_FileSize, dp->obj.objsize);		/* Update the allocation status */
-			st_qword(fs->dirbuf + XDIR_ValidFileSize, dp->obj.objsize);
-			fs->dirbuf[XDIR_GenFlags] = dp->obj.stat | 1;
-			res = store_xdir(&dj);							/* Store the object status */
+		if (dp->obj.stat & 4) {			/* Has the directory been stretched? */
+			dp->obj.stat &= ~4;
+			res = fill_first_frag(&dp->obj);	/* Fill the first fragment on the FAT if needed */
 			if (res != FR_OK) return res;
+			res = fill_last_frag(&dp->obj, dp->clust, 0xFFFFFFFF);	/* Fill the last fragment on the FAT if needed */
+			if (res != FR_OK) return res;
+			if (dp->obj.sclust != 0) {		/* Is it a sub directory? */
+				res = load_obj_dir(&dj, &dp->obj);	/* Load the object status */
+				if (res != FR_OK) return res;
+				dp->obj.objsize += (DWORD)fs->csize * SS(fs);			/* Increase the directory size by cluster size */
+				st_qword(fs->dirbuf + XDIR_FileSize, dp->obj.objsize);	/* Update the allocation status */
+				st_qword(fs->dirbuf + XDIR_ValidFileSize, dp->obj.objsize);
+				fs->dirbuf[XDIR_GenFlags] = dp->obj.stat | 1;
+				res = store_xdir(&dj);				/* Store the object status */
+				if (res != FR_OK) return res;
+			}
 		}
 
 		create_xdir(fs->dirbuf, fs->lfnbuf);	/* Create on-memory directory block to be written later */