Merge branch 'refs/heads/jtg/fix-195' into dev

src/libretro/config/constants.cpp

@@ -35,18 +35,63 @@ using std::nullopt;
 using std::string;
 using namespace melonDS;
 
+// We verify the filesize of the NAND image and the presence of the no$gba footer (since melonDS needs it)
 bool MelonDsDs::config::IsDsiNandImage(const retro::dirent &file) noexcept {
     ZoneScopedN(TracyFunction);
     ZoneText(file.path, strnlen(file.path, sizeof(file.path)));
 
-    // TODO: Validate the NoCash footer
     if (!file.is_regular_file())
         return false;
 
-    if (find(DSI_NAND_SIZES.begin(), DSI_NAND_SIZES.end(), file.size) == DSI_NAND_SIZES.end())
+    switch (file.size) {
+        case DSI_NAND_SIZES_NOFOOTER[0] + NOCASH_FOOTER_SIZE: // 240MB + no$gba footer
+        case DSI_NAND_SIZES_NOFOOTER[1] + NOCASH_FOOTER_SIZE: // 245.5MB + no$gba footer
+        case DSI_NAND_SIZES_NOFOOTER[0]: // 240MB
+        case DSI_NAND_SIZES_NOFOOTER[1]: // 245.5MB
+            break; // the size is good, let's look for the footer!
+        default:
+            return false;
+    }
+
+    RFILE* stream = filestream_open(file.path, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE);
+    if (!stream)
         return false;
 
-    return true;
+    if (filestream_seek(stream, -static_cast<int64_t>(NOCASH_FOOTER_SIZE), RETRO_VFS_SEEK_POSITION_END) < 0) {
+        filestream_close(stream);
+        return false;
+    }
+
+    std::array<uint8_t , NOCASH_FOOTER_SIZE> footer;
+    if (filestream_read(stream, footer.data(), footer.size()) != NOCASH_FOOTER_SIZE) {
+        filestream_close(stream);
+        return false;
+    }
+
+    if (filestream_seek(stream, NOCASH_FOOTER_OFFSET, RETRO_VFS_SEEK_POSITION_START) < 0) {
+        filestream_close(stream);
+        return false;
+    }
+
+    std::array<uint8_t , NOCASH_FOOTER_SIZE> unusedArea;
+    if (filestream_read(stream, unusedArea.data(), unusedArea.size()) != NOCASH_FOOTER_SIZE) {
+        filestream_close(stream);
+        return false;
+    }
+
+    filestream_close(stream);
+
+    if (memcmp(footer.data(), NOCASH_FOOTER_MAGIC, NOCASH_FOOTER_MAGIC_SIZE) == 0) {
+        // If the no$gba footer is present at the end of the file and correctly starts with the magic bytes...
+        return true;
+    }
+
+    if (memcmp(unusedArea.data(), NOCASH_FOOTER_MAGIC, NOCASH_FOOTER_MAGIC_SIZE) == 0) {
+        // If the no$gba footer is present in a normally-unused section of the DSi NAND, and it starts with the magic bytes...
+        return true;
+    }
+
+    return false;
 }
 
 bool MelonDsDs::config::IsFirmwareImage(const retro::dirent& file, Firmware::FirmwareHeader& header) noexcept {

src/libretro/config/constants.hpp

@@ -241,7 +241,11 @@ namespace MelonDsDs::config {
         static constexpr const char *const UPSIDE_DOWN = "rotate-180";
     }
 
-    constexpr std::array<size_t, 2> DSI_NAND_SIZES = { 251658304, 257425472 };
+    constexpr size_t NOCASH_FOOTER_SIZE = 0x40;
+    constexpr size_t NOCASH_FOOTER_OFFSET = 0xFF800;
+    constexpr std::array<size_t, 2> DSI_NAND_SIZES_NOFOOTER = { 0xF000000, 0xF580000 }; // Taken from GBATek
+    constexpr const char *const NOCASH_FOOTER_MAGIC = "DSi eMMC CID/CPU";
+    constexpr size_t NOCASH_FOOTER_MAGIC_SIZE = 16;
     constexpr std::array<size_t, 3> FIRMWARE_SIZES = { 131072, 262144, 524288 };
 
     bool IsDsiNandImage(const retro::dirent &file) noexcept;

src/libretro/config/definitions/system.hpp

@@ -52,7 +52,7 @@ namespace MelonDsDs::config::definitions {
         nullptr,
         "Determines whether melonDS uses native BIOS/firmware dumps "
         "or its own built-in replacements. "
-        "Only applies to DS mode, as DSi mode requires native BIOS and firmware dumps.\n"
+        "Only applies to DS mode, as DSi mode always requires native BIOS and firmware dumps.\n"
         "\n"
         "Native mode uses BIOS and firmware files from a real DS. "
         "Place your dumps of these in the system directory or its \"melonDS DS\" subdirectory "
@@ -66,8 +66,7 @@ namespace MelonDsDs::config::definitions {
         "Falls back to Built-In if any BIOS/firmware file isn't found.\n"
         "\n"
         "Built-In mode uses melonDS's built-in BIOS and firmware, "
-        "and it suitable for most games. "
-        "Also used as a fallback from Native mode if any required file isn't found.\n"
+        "and is suitable for most games.\n"
         "\n"
         "Changes take effect at next restart.",
         nullptr,
@@ -136,8 +135,8 @@ namespace MelonDsDs::config::definitions {
         "Files are listed here if they:\n"
         "\n"
         "- Are inside the frontend's system directory, or a subdirectory named \"melonDS DS\".\n"
-        "- Are exactly 251,658,304 bytes (240MB) or 257,425,472 bytes (245.5MB) long.\n"
-        "- Contain valid footer data for DSi NAND images.\n"
+        "- Are exactly 251,658,304 bytes (240MB) or 257,425,472 bytes (245.5MB) long with valid footer data, OR;\n"
+        "- Are 64 bytes shorter than these lengths and contain equivalent data at file offset 0xFF800.\n"
         "\n"
         "Changes take effect at next restart.",
         nullptr,