Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 22:25:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert 3DSX NCCH changes

Browse source 
Co-Authored-By: Théo B. <16072534+LiquidFenrir@users.noreply.github.com>
This commit is contained in:
wheremyfoodat 2023-09-03 16:45:23 +03:00
parent a00375cc51
commit bdfdc5af62
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/fs/archive_ncch.hpp
View file

@ -18,8 +18,7 @@ public:
// Returns whether the cart has a RomFS // Returns whether the cart has a RomFS
bool hasRomFS() { bool hasRomFS() {
auto cxi = mem.getCXI(); auto cxi = mem.getCXI();
auto hb3dsx = mem.get3DSX(); return (cxi != nullptr && cxi->hasRomFS());
return (cxi != nullptr && cxi->hasRomFS()) || (hb3dsx != nullptr && hb3dsx->hasRomFs());
} }
// Returns whether the cart has an ExeFS (All executable carts should have an ExeFS. This is just here to be safe) // Returns whether the cart has an ExeFS (All executable carts should have an ExeFS. This is just here to be safe)

11
src/core/fs/archive_ncch.cpp
View file

@ -131,16 +131,12 @@ std::optional<u32> NCCHArchive::readFile(FileSession* file, u64 offset, u32 size
} }
auto cxi = mem.getCXI(); auto cxi = mem.getCXI();
auto hb3dsx = mem.get3DSX();
// If isCXI is true then we've loaded a CXI/3DS file, else it's 3DSX
bool isCXI = cxi != nullptr;
// Seek to file offset depending on if we're reading from RomFS, ExeFS, etc // Seek to file offset depending on if we're reading from RomFS, ExeFS, etc
switch (type) { switch (type) {
case PathType::RomFS: { case PathType::RomFS: {
const u64 romFSSize = isCXI ? cxi->romFS.size : hb3dsx->romFSSize; const u64 romFSSize = cxi->romFS.size;
const u64 romFSOffset = isCXI ? cxi->romFS.offset : hb3dsx->romFSOffset; const u64 romFSOffset = cxi->romFS.offset;
if ((offset >> 32) || (offset >= romFSSize) || (offset + size >= romFSSize)) { if ((offset >> 32) || (offset >= romFSSize) || (offset + size >= romFSSize)) {
Helpers::panic("Tried to read from NCCH with too big of an offset"); Helpers::panic("Tried to read from NCCH with too big of an offset");
} }
@ -154,8 +150,7 @@ std::optional<u32> NCCHArchive::readFile(FileSession* file, u64 offset, u32 size
} }
std::unique_ptr<u8[]> data(new u8[size]); std::unique_ptr<u8[]> data(new u8[size]);
auto [success, bytesRead] = auto [success, bytesRead] = cxi->readFromFile(mem.CXIFile, cxi->romFS, &data[0], offset, size);
isCXI ? cxi->readFromFile(mem.CXIFile, cxi->romFS, &data[0], offset, size) : hb3dsx->readRomFSBytes(&data[0], offset, size);
if (!success) { if (!success) {
Helpers::panic("Failed to read from NCCH archive"); Helpers::panic("Failed to read from NCCH archive");