2016-03-04 23:04:30 +00:00
|
|
|
#include "nod/DiscBase.hpp"
|
2015-06-26 20:01:15 +00:00
|
|
|
|
2017-12-29 07:57:54 +00:00
|
|
|
#include <cerrno>
|
2019-08-30 07:52:22 +00:00
|
|
|
#include <cstddef>
|
|
|
|
#include <cstdint>
|
|
|
|
#include <memory>
|
|
|
|
#include <unordered_map>
|
|
|
|
|
|
|
|
#include "nod/DirectoryEnumerator.hpp"
|
|
|
|
#include "nod/IFileIO.hpp"
|
|
|
|
#include "nod/nod.hpp"
|
|
|
|
#include "nod/Util.hpp"
|
2016-01-24 05:06:54 +00:00
|
|
|
|
2015-06-30 19:38:51 +00:00
|
|
|
#ifndef _WIN32
|
|
|
|
#include <unistd.h>
|
2016-01-25 02:13:09 +00:00
|
|
|
#else
|
2019-08-30 07:52:22 +00:00
|
|
|
|
|
|
|
#include <logvisor/logvisor.hpp>
|
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
static void* memmem(const void* haystack, size_t hlen, const void* needle, size_t nlen) {
|
|
|
|
int needle_first;
|
|
|
|
const uint8_t* p = static_cast<const uint8_t*>(haystack);
|
|
|
|
size_t plen = hlen;
|
2016-01-25 02:13:09 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
if (!nlen)
|
|
|
|
return NULL;
|
2016-01-25 02:13:09 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
needle_first = *(unsigned char*)needle;
|
2016-01-25 02:13:09 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
while (plen >= nlen && (p = static_cast<const uint8_t*>(memchr(p, needle_first, plen - nlen + 1)))) {
|
|
|
|
if (!memcmp(p, needle, nlen))
|
|
|
|
return (void*)p;
|
2016-01-25 02:13:09 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
p++;
|
|
|
|
plen = hlen - (p - static_cast<const uint8_t*>(haystack));
|
|
|
|
}
|
2016-01-25 02:13:09 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
return NULL;
|
2016-01-25 02:13:09 +00:00
|
|
|
}
|
2015-06-30 19:38:51 +00:00
|
|
|
#endif
|
|
|
|
|
2016-01-21 06:30:37 +00:00
|
|
|
#include <algorithm>
|
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
namespace nod {
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
const char* getKindString(PartitionKind kind) {
|
2018-12-08 05:21:47 +00:00
|
|
|
switch (kind) {
|
|
|
|
case PartitionKind::Data:
|
2021-06-22 19:16:56 +00:00
|
|
|
return "DATA";
|
2018-12-08 05:21:47 +00:00
|
|
|
case PartitionKind::Update:
|
2021-06-22 19:16:56 +00:00
|
|
|
return "UPDATE";
|
2018-12-08 05:21:47 +00:00
|
|
|
case PartitionKind::Channel:
|
2021-06-22 19:16:56 +00:00
|
|
|
return "CHANNEL";
|
2018-12-08 05:21:47 +00:00
|
|
|
default:
|
|
|
|
return nullptr;
|
|
|
|
}
|
2017-07-02 05:39:41 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
void IPartition::parseFST(IPartReadStream& s) {
|
|
|
|
std::unique_ptr<uint8_t[]> fst(new uint8_t[m_fstSz]);
|
|
|
|
s.seek(m_fstOff);
|
|
|
|
s.read(fst.get(), m_fstSz);
|
|
|
|
|
|
|
|
const FSTNode* nodes = (FSTNode*)fst.get();
|
|
|
|
|
|
|
|
/* Root node indicates the count of all contained nodes */
|
|
|
|
uint32_t nodeCount = nodes[0].getLength();
|
|
|
|
const char* names = (char*)fst.get() + 12 * nodeCount;
|
|
|
|
m_nodes.clear();
|
|
|
|
m_nodes.reserve(nodeCount);
|
|
|
|
|
|
|
|
/* Construct nodes */
|
|
|
|
for (uint32_t n = 0; n < nodeCount; ++n) {
|
|
|
|
const FSTNode& node = nodes[n];
|
|
|
|
m_nodes.emplace_back(*this, node, n ? names + node.getNameOffset() : "");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Setup dir-child iterators */
|
|
|
|
for (std::vector<Node>::iterator it = m_nodes.begin(); it != m_nodes.end(); ++it) {
|
|
|
|
Node& node = *it;
|
|
|
|
if (node.m_kind == Node::Kind::Directory) {
|
|
|
|
node.m_childrenBegin = it + 1;
|
|
|
|
node.m_childrenEnd = m_nodes.begin() + node.m_discLength;
|
|
|
|
}
|
|
|
|
}
|
2015-06-29 05:35:25 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
void IPartition::parseDOL(IPartReadStream& s) {
|
|
|
|
/* Read Dol header */
|
|
|
|
DOLHeader dolHeader;
|
|
|
|
s.read(&dolHeader, sizeof(DOLHeader));
|
2015-07-10 03:11:30 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Calculate Dol size */
|
|
|
|
uint32_t dolSize = SBig(dolHeader.textOff[0]);
|
|
|
|
for (uint32_t i = 0; i < 7; i++)
|
|
|
|
dolSize += SBig(dolHeader.textSizes[i]);
|
|
|
|
for (uint32_t i = 0; i < 11; i++)
|
|
|
|
dolSize += SBig(dolHeader.dataSizes[i]);
|
2015-09-27 17:10:40 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
m_dolSz = dolSize;
|
2015-07-10 03:11:30 +00:00
|
|
|
}
|
|
|
|
|
2017-12-29 07:57:54 +00:00
|
|
|
Node::Node(const IPartition& parent, const FSTNode& node, std::string_view name)
|
2018-12-08 05:21:47 +00:00
|
|
|
: m_parent(parent)
|
|
|
|
, m_kind(node.isDir() ? Kind::Directory : Kind::File)
|
|
|
|
, m_discOffset(parent.normalizeOffset(node.getOffset()))
|
|
|
|
, m_discLength(node.getLength())
|
|
|
|
, m_name(name) {}
|
|
|
|
|
|
|
|
std::unique_ptr<IPartReadStream> Node::beginReadStream(uint64_t offset) const {
|
|
|
|
if (m_kind != Kind::File) {
|
2020-04-11 22:45:06 +00:00
|
|
|
LogModule.report(logvisor::Error, FMT_STRING("unable to stream a non-file {}"), m_name);
|
2018-12-08 05:21:47 +00:00
|
|
|
return std::unique_ptr<IPartReadStream>();
|
|
|
|
}
|
|
|
|
return m_parent.beginReadStream(m_discOffset + offset);
|
2017-12-29 07:57:54 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
std::unique_ptr<uint8_t[]> Node::getBuf() const {
|
|
|
|
if (m_kind != Kind::File) {
|
2020-04-11 22:45:06 +00:00
|
|
|
LogModule.report(logvisor::Error, FMT_STRING("unable to buffer a non-file {}"), m_name);
|
2019-08-30 09:02:35 +00:00
|
|
|
return nullptr;
|
2018-12-08 05:21:47 +00:00
|
|
|
}
|
2019-08-30 09:02:35 +00:00
|
|
|
|
|
|
|
auto buf = std::unique_ptr<uint8_t[]>(new uint8_t[m_discLength]);
|
|
|
|
beginReadStream()->read(buf.get(), m_discLength);
|
|
|
|
return buf;
|
2017-12-29 07:57:54 +00:00
|
|
|
}
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
bool Node::extractToDirectory(std::string_view basePath, const ExtractionContext& ctx) const {
|
|
|
|
SJISToUTF8 nameView(getName());
|
|
|
|
std::string path = std::string(basePath) + '/' + nameView.str().data();
|
2015-06-30 06:46:19 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
if (m_kind == Kind::Directory) {
|
|
|
|
++m_parent.m_curNodeIdx;
|
|
|
|
if (ctx.progressCB && !getName().empty())
|
2021-06-22 19:16:56 +00:00
|
|
|
ctx.progressCB(nameView.str(), m_parent.m_curNodeIdx / float(m_parent.getNodeCount()));
|
2018-12-08 05:21:47 +00:00
|
|
|
if (Mkdir(path.c_str(), 0755) && errno != EEXIST) {
|
2021-06-22 19:16:56 +00:00
|
|
|
LogModule.report(logvisor::Error, FMT_STRING("unable to mkdir '{}'"), path);
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
2017-06-30 10:30:10 +00:00
|
|
|
}
|
2018-12-08 05:21:47 +00:00
|
|
|
for (Node& subnode : *this)
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!subnode.extractToDirectory(path, ctx))
|
2017-07-09 08:25:43 +00:00
|
|
|
return false;
|
2018-12-08 05:21:47 +00:00
|
|
|
} else if (m_kind == Kind::File) {
|
|
|
|
Sstat theStat;
|
|
|
|
if (ctx.progressCB)
|
2021-06-22 19:16:56 +00:00
|
|
|
ctx.progressCB(nameView.str(), m_parent.m_curNodeIdx / float(m_parent.getNodeCount()));
|
2017-07-09 08:25:43 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
if (ctx.force || Stat(path.c_str(), &theStat)) {
|
|
|
|
std::unique_ptr<IPartReadStream> rs = beginReadStream();
|
|
|
|
std::unique_ptr<IFileIO::IWriteStream> ws = NewFileIO(path)->beginWriteStream();
|
|
|
|
if (!rs || !ws)
|
2017-07-09 08:25:43 +00:00
|
|
|
return false;
|
2018-12-08 05:21:47 +00:00
|
|
|
ws->copyFromDisc(*rs, m_discLength, [&](float prog) {
|
|
|
|
if (ctx.progressCB)
|
2021-06-22 19:16:56 +00:00
|
|
|
ctx.progressCB(nameView.str(), (m_parent.m_curNodeIdx + prog) / float(m_parent.getNodeCount()));
|
2018-12-08 05:21:47 +00:00
|
|
|
});
|
2017-07-09 08:25:43 +00:00
|
|
|
}
|
2018-12-08 05:21:47 +00:00
|
|
|
++m_parent.m_curNodeIdx;
|
|
|
|
}
|
|
|
|
return true;
|
2017-07-09 08:25:43 +00:00
|
|
|
}
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
bool IPartition::extractToDirectory(std::string_view path, const ExtractionContext& ctx) {
|
2018-12-08 05:21:47 +00:00
|
|
|
m_curNodeIdx = 0;
|
|
|
|
if (Mkdir(path.data(), 0755) && errno != EEXIST) {
|
2021-06-22 19:16:56 +00:00
|
|
|
LogModule.report(logvisor::Error, FMT_STRING("unable to mkdir '{}'"), path);
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
2017-07-09 08:25:43 +00:00
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string basePath = m_isWii ? std::string(path) + "/" + getKindString(m_kind) : std::string(path);
|
2018-12-08 05:21:47 +00:00
|
|
|
if (m_isWii) {
|
|
|
|
if (Mkdir(basePath.c_str(), 0755) && errno != EEXIST) {
|
2021-06-22 19:16:56 +00:00
|
|
|
LogModule.report(logvisor::Error, FMT_STRING("unable to mkdir '{}'"), basePath);
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
2015-06-30 19:38:51 +00:00
|
|
|
}
|
2018-12-08 05:21:47 +00:00
|
|
|
}
|
2015-06-30 19:38:51 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Extract Disc Files */
|
|
|
|
if (!m_parent.extractDiscHeaderFiles(basePath, ctx))
|
|
|
|
return false;
|
2015-07-03 03:49:31 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Extract Crypto Files */
|
|
|
|
if (!extractCryptoFiles(basePath, ctx))
|
|
|
|
return false;
|
2017-06-30 10:30:10 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
if (!extractSysFiles(basePath, ctx))
|
|
|
|
return false;
|
2017-06-30 10:30:10 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Extract Filesystem */
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string fsPath = basePath + "/files";
|
2018-12-08 05:21:47 +00:00
|
|
|
if (Mkdir(fsPath.c_str(), 0755) && errno != EEXIST) {
|
2021-06-22 19:16:56 +00:00
|
|
|
LogModule.report(logvisor::Error, FMT_STRING("unable to mkdir '{}'"), fsPath);
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
2017-07-01 23:36:16 +00:00
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
return m_nodes[0].extractToDirectory(fsPath, ctx);
|
2015-06-30 19:38:51 +00:00
|
|
|
}
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
bool IPartition::extractSysFiles(std::string_view basePath, const ExtractionContext& ctx) const {
|
|
|
|
std::string basePathStr(basePath);
|
|
|
|
if (Mkdir((basePathStr + "/sys").c_str(), 0755) && errno != EEXIST) {
|
|
|
|
LogModule.report(logvisor::Error, FMT_STRING("unable to mkdir '{}/sys'"), basePath);
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
Sstat theStat;
|
|
|
|
/* Extract Apploader */
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string apploaderPath = basePathStr + "/sys/apploader.img";
|
2018-12-08 05:21:47 +00:00
|
|
|
if (ctx.force || Stat(apploaderPath.c_str(), &theStat)) {
|
|
|
|
if (ctx.progressCB)
|
2021-06-22 19:16:56 +00:00
|
|
|
ctx.progressCB("apploader.bin", 0.f);
|
2018-12-08 05:21:47 +00:00
|
|
|
std::unique_ptr<uint8_t[]> buf = getApploaderBuf();
|
|
|
|
auto ws = NewFileIO(apploaderPath)->beginWriteStream();
|
|
|
|
if (!ws)
|
|
|
|
return false;
|
|
|
|
ws->write(buf.get(), m_apploaderSz);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Extract Dol */
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string dolPath = basePathStr + "/sys/main.dol";
|
2018-12-08 05:21:47 +00:00
|
|
|
if (ctx.force || Stat(dolPath.c_str(), &theStat)) {
|
|
|
|
if (ctx.progressCB)
|
2021-06-22 19:16:56 +00:00
|
|
|
ctx.progressCB("main.dol", 0.f);
|
2018-12-08 05:21:47 +00:00
|
|
|
std::unique_ptr<uint8_t[]> buf = getDOLBuf();
|
|
|
|
auto ws = NewFileIO(dolPath)->beginWriteStream();
|
|
|
|
if (!ws)
|
|
|
|
return false;
|
|
|
|
ws->write(buf.get(), m_dolSz);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Extract Boot info */
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string bootPath = basePathStr + "/sys/boot.bin";
|
2018-12-08 05:21:47 +00:00
|
|
|
if (ctx.force || Stat(bootPath.c_str(), &theStat)) {
|
|
|
|
if (ctx.progressCB)
|
2021-06-22 19:16:56 +00:00
|
|
|
ctx.progressCB("boot.bin", 0.f);
|
2018-12-08 05:21:47 +00:00
|
|
|
auto ws = NewFileIO(bootPath)->beginWriteStream();
|
|
|
|
if (!ws)
|
|
|
|
return false;
|
|
|
|
m_header.write(*ws.get());
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Extract BI2 info */
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string bi2Path = basePathStr + "/sys/bi2.bin";
|
2018-12-08 05:21:47 +00:00
|
|
|
if (ctx.force || Stat(bi2Path.c_str(), &theStat)) {
|
|
|
|
if (ctx.progressCB)
|
2021-06-22 19:16:56 +00:00
|
|
|
ctx.progressCB("bi2.bin", 0.f);
|
2018-12-08 05:21:47 +00:00
|
|
|
|
|
|
|
auto ws = NewFileIO(bi2Path)->beginWriteStream();
|
|
|
|
if (!ws)
|
|
|
|
return false;
|
|
|
|
m_bi2Header.write(*ws);
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
2016-01-23 03:39:38 +00:00
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
static bool IsSystemFile(std::string_view name, bool& isDol) {
|
2018-12-08 05:21:47 +00:00
|
|
|
isDol = false;
|
|
|
|
if (name.size() < 4)
|
2016-01-23 03:39:38 +00:00
|
|
|
return false;
|
2018-12-08 05:21:47 +00:00
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!StrCaseCmp((&*(name.cend() - 4)), ".dol")) {
|
2018-12-08 05:21:47 +00:00
|
|
|
isDol = true;
|
|
|
|
return true;
|
|
|
|
}
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!StrCaseCmp((&*(name.cend() - 4)), ".rel"))
|
2018-12-08 05:21:47 +00:00
|
|
|
return true;
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!StrCaseCmp((&*(name.cend() - 4)), ".rso"))
|
2018-12-08 05:21:47 +00:00
|
|
|
return true;
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!StrCaseCmp((&*(name.cend() - 4)), ".sel"))
|
2018-12-08 05:21:47 +00:00
|
|
|
return true;
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!StrCaseCmp((&*(name.cend() - 4)), ".bnr"))
|
2018-12-08 05:21:47 +00:00
|
|
|
return true;
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!StrCaseCmp((&*(name.cend() - 4)), ".elf"))
|
2018-12-08 05:21:47 +00:00
|
|
|
return true;
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!StrCaseCmp((&*(name.cend() - 4)), ".wad"))
|
2018-12-08 05:21:47 +00:00
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
2016-01-23 03:39:38 +00:00
|
|
|
}
|
|
|
|
|
2016-01-25 02:00:02 +00:00
|
|
|
/** Patches out pesky #001 integrity check performed by game's OSInit.
|
|
|
|
* This is required for multi-DOL games, but doesn't harm functionality otherwise */
|
2018-12-08 05:21:47 +00:00
|
|
|
static void PatchDOL(std::unique_ptr<uint8_t[]>& buf, size_t sz, bool& patched) {
|
|
|
|
patched = false;
|
|
|
|
uint8_t* found = static_cast<uint8_t*>(memmem(buf.get(), sz,
|
|
|
|
"\x3C\x03\xF8\x00\x28\x00\x00\x00\x40\x82\x00\x0C"
|
|
|
|
"\x38\x60\x00\x01\x48\x00\x02\x44\x38\x61\x00\x18\x48",
|
|
|
|
25));
|
|
|
|
if (found) {
|
|
|
|
found[11] = '\x04';
|
|
|
|
patched = true;
|
|
|
|
}
|
2017-02-05 06:19:34 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
static size_t PatchDOL(IFileIO::IReadStream& in, IPartWriteStream& out, size_t sz, bool& patched) {
|
|
|
|
std::unique_ptr<uint8_t[]> buf(new uint8_t[sz]);
|
|
|
|
sz = in.read(buf.get(), sz);
|
|
|
|
PatchDOL(buf, sz, patched);
|
|
|
|
return out.write(buf.get(), sz);
|
2016-01-25 02:00:02 +00:00
|
|
|
}
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
void DiscBuilderBase::PartitionBuilderBase::recursiveBuildNodesPre(std::string_view filesIn) {
|
2018-12-08 05:21:47 +00:00
|
|
|
DirectoryEnumerator dEnum(filesIn, DirectoryEnumerator::Mode::DirsThenFilesSorted, false, false, true);
|
|
|
|
for (const DirectoryEnumerator::Entry& e : dEnum) {
|
|
|
|
if (e.m_isDir)
|
|
|
|
recursiveBuildNodesPre(e.m_path.c_str());
|
|
|
|
else
|
|
|
|
++m_parent.m_progressTotal;
|
|
|
|
}
|
2017-05-22 03:12:48 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
bool DiscBuilderBase::PartitionBuilderBase::recursiveBuildNodes(IPartWriteStream& ws, bool system,
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string_view filesIn) {
|
2018-12-08 05:21:47 +00:00
|
|
|
DirectoryEnumerator dEnum(filesIn, DirectoryEnumerator::Mode::DirsThenFilesSorted, false, false, true);
|
|
|
|
for (const DirectoryEnumerator::Entry& e : dEnum) {
|
|
|
|
if (e.m_isDir) {
|
|
|
|
if (!recursiveBuildNodes(ws, system, e.m_path.c_str()))
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
bool isDol;
|
|
|
|
bool isSys = IsSystemFile(e.m_name, isDol);
|
|
|
|
if (system ^ isSys)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
size_t fileSz = ROUND_UP_32(e.m_fileSz);
|
|
|
|
uint64_t fileOff = userAllocate(fileSz, ws);
|
2019-06-10 02:49:17 +00:00
|
|
|
if (fileOff == UINT64_MAX)
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
m_fileOffsetsSizes[e.m_path] = std::make_pair(fileOff, fileSz);
|
|
|
|
std::unique_ptr<IFileIO::IReadStream> rs = NewFileIO(e.m_path)->beginReadStream();
|
|
|
|
if (!rs)
|
|
|
|
return false;
|
|
|
|
size_t xferSz = 0;
|
|
|
|
if (isDol) {
|
|
|
|
bool patched;
|
|
|
|
xferSz = PatchDOL(*rs, ws, e.m_fileSz, patched);
|
|
|
|
m_parent.m_progressCB(m_parent.getProgressFactor(),
|
2021-06-22 19:16:56 +00:00
|
|
|
e.m_name + (patched ? " [PATCHED]" : ""), xferSz);
|
2018-12-08 05:21:47 +00:00
|
|
|
++m_parent.m_progressIdx;
|
|
|
|
} else {
|
|
|
|
char buf[0x8000];
|
|
|
|
while (xferSz < e.m_fileSz) {
|
|
|
|
size_t rdSz = rs->read(buf, nod::min(size_t(0x8000ul), e.m_fileSz - xferSz));
|
|
|
|
if (!rdSz)
|
|
|
|
break;
|
|
|
|
ws.write(buf, rdSz);
|
|
|
|
xferSz += rdSz;
|
|
|
|
m_parent.m_progressCB(m_parent.getProgressFactorMidFile(xferSz, e.m_fileSz), e.m_name, xferSz);
|
2016-01-23 03:39:38 +00:00
|
|
|
}
|
2018-12-08 05:21:47 +00:00
|
|
|
++m_parent.m_progressIdx;
|
|
|
|
}
|
|
|
|
for (size_t i = 0; i < fileSz - xferSz; ++i)
|
|
|
|
ws.write("\xff", 1);
|
2016-01-23 03:39:38 +00:00
|
|
|
}
|
2018-12-08 05:21:47 +00:00
|
|
|
}
|
2017-02-05 06:19:34 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
return true;
|
2016-01-23 03:39:38 +00:00
|
|
|
}
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
bool DiscBuilderBase::PartitionBuilderBase::recursiveBuildFST(std::string_view filesIn,
|
2017-07-12 05:13:44 +00:00
|
|
|
std::function<void(void)> incParents,
|
2018-12-08 05:21:47 +00:00
|
|
|
size_t parentDirIdx) {
|
|
|
|
DirectoryEnumerator dEnum(filesIn, DirectoryEnumerator::Mode::DirsThenFilesSorted, false, false, true);
|
|
|
|
for (const DirectoryEnumerator::Entry& e : dEnum) {
|
|
|
|
if (e.m_isDir) {
|
|
|
|
size_t dirNodeIdx = m_buildNodes.size();
|
|
|
|
m_buildNodes.emplace_back(true, m_buildNameOff, parentDirIdx, dirNodeIdx + 1);
|
|
|
|
addBuildName(e.m_name);
|
|
|
|
incParents();
|
|
|
|
if (!recursiveBuildFST(e.m_path.c_str(),
|
|
|
|
[&]() {
|
|
|
|
m_buildNodes[dirNodeIdx].incrementLength();
|
|
|
|
incParents();
|
|
|
|
},
|
|
|
|
dirNodeIdx))
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
std::pair<uint64_t, uint64_t> fileOffSz = m_fileOffsetsSizes.at(e.m_path);
|
|
|
|
m_buildNodes.emplace_back(false, m_buildNameOff, packOffset(fileOffSz.first), fileOffSz.second);
|
|
|
|
addBuildName(e.m_name);
|
|
|
|
incParents();
|
2016-01-21 06:30:37 +00:00
|
|
|
}
|
2018-12-08 05:21:47 +00:00
|
|
|
}
|
2017-02-05 06:19:34 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
return true;
|
2017-02-05 06:19:34 +00:00
|
|
|
}
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
void DiscBuilderBase::PartitionBuilderBase::recursiveMergeNodesPre(const Node* nodeIn, std::string_view dirIn) {
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Build map of existing nodes to write-through later */
|
|
|
|
std::unordered_map<std::string, const Node*> fileNodes;
|
|
|
|
std::unordered_map<std::string, const Node*> dirNodes;
|
|
|
|
if (nodeIn) {
|
|
|
|
fileNodes.reserve(nodeIn->size());
|
|
|
|
dirNodes.reserve(nodeIn->size());
|
|
|
|
for (const Node& ch : *nodeIn) {
|
|
|
|
if (ch.getKind() == Node::Kind::File)
|
|
|
|
fileNodes.insert(std::make_pair(ch.getName(), &ch));
|
|
|
|
else if (ch.getKind() == Node::Kind::Directory)
|
|
|
|
dirNodes.insert(std::make_pair(ch.getName(), &ch));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge this directory's files */
|
|
|
|
if (!dirIn.empty()) {
|
|
|
|
DirectoryEnumerator dEnum(dirIn, DirectoryEnumerator::Mode::DirsThenFilesSorted, false, false, true);
|
|
|
|
for (const DirectoryEnumerator::Entry& e : dEnum) {
|
2021-06-22 19:16:56 +00:00
|
|
|
UTF8ToSJIS nameView(e.m_name);
|
2018-12-08 05:21:47 +00:00
|
|
|
if (e.m_isDir) {
|
2021-06-22 19:16:56 +00:00
|
|
|
auto search = dirNodes.find(nameView.str());
|
2018-12-08 05:21:47 +00:00
|
|
|
if (search != dirNodes.cend()) {
|
|
|
|
recursiveMergeNodesPre(search->second, e.m_path.c_str());
|
|
|
|
dirNodes.erase(search);
|
|
|
|
} else {
|
|
|
|
recursiveMergeNodesPre(nullptr, e.m_path.c_str());
|
2017-05-22 03:12:48 +00:00
|
|
|
}
|
2018-12-08 05:21:47 +00:00
|
|
|
} else {
|
2021-06-22 19:16:56 +00:00
|
|
|
fileNodes.erase(nameView.str());
|
2018-12-08 05:21:47 +00:00
|
|
|
++m_parent.m_progressTotal;
|
|
|
|
}
|
2017-05-22 03:12:48 +00:00
|
|
|
}
|
2018-12-08 05:21:47 +00:00
|
|
|
}
|
2017-05-22 03:12:48 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Write-through remaining dir nodes */
|
|
|
|
for (const auto& p : dirNodes) {
|
2019-06-20 22:45:35 +00:00
|
|
|
recursiveMergeNodesPre(p.second, {});
|
2018-12-08 05:21:47 +00:00
|
|
|
}
|
2017-05-22 03:12:48 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Write-through remaining file nodes */
|
|
|
|
m_parent.m_progressTotal += fileNodes.size();
|
2017-05-22 03:12:48 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
bool DiscBuilderBase::PartitionBuilderBase::recursiveMergeNodes(IPartWriteStream& ws, bool system, const Node* nodeIn,
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string_view dirIn, std::string_view keyPath) {
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Build map of existing nodes to write-through later */
|
|
|
|
std::unordered_map<std::string, const Node*> fileNodes;
|
|
|
|
std::unordered_map<std::string, const Node*> dirNodes;
|
|
|
|
if (nodeIn) {
|
|
|
|
fileNodes.reserve(nodeIn->size());
|
|
|
|
dirNodes.reserve(nodeIn->size());
|
|
|
|
for (const Node& ch : *nodeIn) {
|
|
|
|
if (ch.getKind() == Node::Kind::File)
|
|
|
|
fileNodes.insert(std::make_pair(ch.getName(), &ch));
|
|
|
|
else if (ch.getKind() == Node::Kind::Directory)
|
|
|
|
dirNodes.insert(std::make_pair(ch.getName(), &ch));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge this directory's files */
|
|
|
|
if (!dirIn.empty()) {
|
|
|
|
DirectoryEnumerator dEnum(dirIn, DirectoryEnumerator::Mode::DirsThenFilesSorted, false, false, true);
|
|
|
|
for (const DirectoryEnumerator::Entry& e : dEnum) {
|
2021-06-22 19:16:56 +00:00
|
|
|
UTF8ToSJIS nameView(e.m_name);
|
|
|
|
std::string chKeyPath = std::string(keyPath) + '/' + e.m_name;
|
2018-12-08 05:21:47 +00:00
|
|
|
|
|
|
|
if (e.m_isDir) {
|
2021-06-22 19:16:56 +00:00
|
|
|
auto search = dirNodes.find(nameView.str());
|
2018-12-08 05:21:47 +00:00
|
|
|
if (search != dirNodes.cend()) {
|
|
|
|
if (!recursiveMergeNodes(ws, system, search->second, e.m_path.c_str(), chKeyPath))
|
2017-02-05 06:19:34 +00:00
|
|
|
return false;
|
2018-12-08 05:21:47 +00:00
|
|
|
dirNodes.erase(search);
|
|
|
|
} else {
|
|
|
|
if (!recursiveMergeNodes(ws, system, nullptr, e.m_path.c_str(), chKeyPath))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} else {
|
2017-02-05 06:19:34 +00:00
|
|
|
bool isDol;
|
2018-12-08 05:21:47 +00:00
|
|
|
bool isSys = IsSystemFile(e.m_name, isDol);
|
2017-02-05 06:19:34 +00:00
|
|
|
if (system ^ isSys)
|
2018-12-08 05:21:47 +00:00
|
|
|
continue;
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
fileNodes.erase(nameView.str());
|
2017-02-05 06:19:34 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
size_t fileSz = ROUND_UP_32(e.m_fileSz);
|
2017-02-05 06:19:34 +00:00
|
|
|
uint64_t fileOff = userAllocate(fileSz, ws);
|
2019-06-10 02:49:17 +00:00
|
|
|
if (fileOff == UINT64_MAX)
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
2017-02-05 06:19:34 +00:00
|
|
|
m_fileOffsetsSizes[chKeyPath] = std::make_pair(fileOff, fileSz);
|
2018-12-08 05:21:47 +00:00
|
|
|
std::unique_ptr<IFileIO::IReadStream> rs = NewFileIO(e.m_path)->beginReadStream();
|
2017-02-05 06:19:34 +00:00
|
|
|
if (!rs)
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
2017-02-05 06:19:34 +00:00
|
|
|
size_t xferSz = 0;
|
2018-12-08 05:21:47 +00:00
|
|
|
if (isDol) {
|
|
|
|
bool patched;
|
|
|
|
xferSz = PatchDOL(*rs, ws, e.m_fileSz, patched);
|
|
|
|
m_parent.m_progressCB(m_parent.getProgressFactor(),
|
2021-06-22 19:16:56 +00:00
|
|
|
e.m_name + (patched ? " [PATCHED]" : ""), xferSz);
|
2018-12-08 05:21:47 +00:00
|
|
|
++m_parent.m_progressIdx;
|
|
|
|
} else {
|
|
|
|
char buf[0x8000];
|
|
|
|
while (xferSz < e.m_fileSz) {
|
|
|
|
size_t rdSz = rs->read(buf, nod::min(size_t(0x8000ul), e.m_fileSz - xferSz));
|
|
|
|
if (!rdSz)
|
|
|
|
break;
|
|
|
|
ws.write(buf, rdSz);
|
|
|
|
xferSz += rdSz;
|
|
|
|
m_parent.m_progressCB(m_parent.getProgressFactorMidFile(xferSz, e.m_fileSz), e.m_name, xferSz);
|
|
|
|
}
|
|
|
|
++m_parent.m_progressIdx;
|
2017-02-05 06:19:34 +00:00
|
|
|
}
|
2018-12-08 05:21:47 +00:00
|
|
|
for (size_t i = 0; i < fileSz - xferSz; ++i)
|
|
|
|
ws.write("\xff", 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write-through remaining dir nodes */
|
|
|
|
for (const auto& p : dirNodes) {
|
2021-06-22 19:16:56 +00:00
|
|
|
SJISToUTF8 sysName(p.second->getName());
|
|
|
|
std::string chKeyPath = std::string(keyPath) + '/' + sysName.str();
|
2019-06-20 22:45:35 +00:00
|
|
|
if (!recursiveMergeNodes(ws, system, p.second, {}, chKeyPath))
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write-through remaining file nodes */
|
|
|
|
for (const auto& p : fileNodes) {
|
|
|
|
const Node& ch = *p.second;
|
2021-06-22 19:16:56 +00:00
|
|
|
SJISToUTF8 sysName(ch.getName());
|
|
|
|
std::string chKeyPath = std::string(keyPath) + '/' + sysName.str();
|
2018-12-08 05:21:47 +00:00
|
|
|
|
|
|
|
bool isDol;
|
2021-06-22 19:16:56 +00:00
|
|
|
bool isSys = IsSystemFile(ch.getName(), isDol);
|
2018-12-08 05:21:47 +00:00
|
|
|
if (system ^ isSys)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
size_t fileSz = ROUND_UP_32(ch.size());
|
|
|
|
uint64_t fileOff = userAllocate(fileSz, ws);
|
2019-06-10 02:49:17 +00:00
|
|
|
if (fileOff == UINT64_MAX)
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
m_fileOffsetsSizes[chKeyPath] = std::make_pair(fileOff, fileSz);
|
|
|
|
std::unique_ptr<IPartReadStream> rs = ch.beginReadStream();
|
|
|
|
if (!rs)
|
|
|
|
return false;
|
|
|
|
size_t xferSz = 0;
|
|
|
|
if (isDol) {
|
|
|
|
xferSz = ch.size();
|
|
|
|
std::unique_ptr<uint8_t[]> dolBuf = ch.getBuf();
|
|
|
|
bool patched;
|
|
|
|
PatchDOL(dolBuf, xferSz, patched);
|
|
|
|
ws.write(dolBuf.get(), xferSz);
|
|
|
|
m_parent.m_progressCB(m_parent.getProgressFactor(),
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string(ch.getName()) + (patched ? " [PATCHED]" : ""),
|
2018-12-08 05:21:47 +00:00
|
|
|
xferSz);
|
|
|
|
++m_parent.m_progressIdx;
|
|
|
|
} else {
|
|
|
|
char buf[0x8000];
|
|
|
|
while (xferSz < ch.size()) {
|
|
|
|
size_t rdSz = rs->read(buf, nod::min(size_t(0x8000), size_t(ch.size() - xferSz)));
|
|
|
|
if (!rdSz)
|
|
|
|
break;
|
|
|
|
ws.write(buf, rdSz);
|
|
|
|
xferSz += rdSz;
|
2021-06-22 19:16:56 +00:00
|
|
|
m_parent.m_progressCB(m_parent.getProgressFactorMidFile(xferSz, ch.size()), ch.getName(), xferSz);
|
2018-12-08 05:21:47 +00:00
|
|
|
}
|
|
|
|
++m_parent.m_progressIdx;
|
|
|
|
}
|
|
|
|
for (size_t i = 0; i < fileSz - xferSz; ++i)
|
|
|
|
ws.write("\xff", 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
2017-02-05 06:19:34 +00:00
|
|
|
}
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
bool DiscBuilderBase::PartitionBuilderBase::recursiveMergeFST(const Node* nodeIn, std::string_view dirIn,
|
2017-02-05 06:19:34 +00:00
|
|
|
std::function<void(void)> incParents,
|
2021-06-22 19:16:56 +00:00
|
|
|
size_t parentDirIdx, std::string_view keyPath) {
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Build map of existing nodes to write-through later */
|
|
|
|
std::unordered_map<std::string, const Node*> fileNodes;
|
|
|
|
std::unordered_map<std::string, const Node*> dirNodes;
|
|
|
|
if (nodeIn) {
|
|
|
|
fileNodes.reserve(nodeIn->size());
|
|
|
|
dirNodes.reserve(nodeIn->size());
|
|
|
|
for (const Node& ch : *nodeIn) {
|
|
|
|
if (ch.getKind() == Node::Kind::File)
|
|
|
|
fileNodes.insert(std::make_pair(ch.getName(), &ch));
|
|
|
|
else if (ch.getKind() == Node::Kind::Directory)
|
|
|
|
dirNodes.insert(std::make_pair(ch.getName(), &ch));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge this directory's files */
|
|
|
|
if (!dirIn.empty()) {
|
|
|
|
DirectoryEnumerator dEnum(dirIn, DirectoryEnumerator::Mode::DirsThenFilesSorted, false, false, true);
|
|
|
|
for (const DirectoryEnumerator::Entry& e : dEnum) {
|
2021-06-22 19:16:56 +00:00
|
|
|
UTF8ToSJIS nameView(e.m_name);
|
|
|
|
std::string chKeyPath = std::string(keyPath) + '/' + e.m_name;
|
2018-12-08 05:21:47 +00:00
|
|
|
|
|
|
|
if (e.m_isDir) {
|
2017-02-05 06:19:34 +00:00
|
|
|
size_t dirNodeIdx = m_buildNodes.size();
|
The Encoding Update
While Nintendo's own documents claim GameCube and Wii disc file symbol tables only support 7-bit ASCII, this is far from the truth. Indeed, even some first-party Nintendo games shipped with Shift-JIS encoded file symbol tables. My guess? The locale of whatever Windows machine mastered a GameCube or Wii disc influenced how wide character strings (UCS-2) were converted to narrow character strings. To account for all possibilites, this update adds extensible multi-byte character set options to NOD-Tool.
A rundown of notable changes:
- "-c XXXXX" option added to set the encoding of the GameCube / Wii ISO(s) being processed.
- "SystemStringConv" renamed to "DiscLocToSystemConv"
- "SystemUTF8Conv" renamed to "SystemToDiscLocConv"
- Help message updated with new info.
- Bugfix: AddBuildName had a logic error wherein the length of the SystemString was being used instead of length of the disc locale string. This would corrupt the File Symbol Table if the disc locale string's length was greater than the SystemString's length.
- Bugfix: recursiveMergeFST was not keeping track of parent indexes at all, meaning nested folders and their contents would be corrupted. I simply copied the way recursiveBuildFST did things to fix this.
- Bugfix (Windows): On Windows, for some reason, Sstat was a typedef for _stat (32-bit) instead of _stat64 (64-bit). This is confounding, because untrimmed Wii ISOs will always be larger than the unsigned 32-bit integer limit (4,699,979,776 bytes vs 4,294,967,295 bytes), meaning the MergeWii errand has never worked for untrimmed ISOs on Windows. Was this never tested??
- Bugfix (Windows): Did you know Windows Command Prompt fully supports Unicode? Stdio streams are now in _O_U16TEXT mode for Windows only. Previously, attempting to print any character that could not be narrowed to your locale's encoding would either silently fail (std functions), or throw an exception (fmt functions). As a minor drawback, narrow character print functions can no longer be used when stdio is in _O_U16TEXT mode, necessitating my PR for Logvisor here: (AxioDL/logvisor#7)
- ExtractionContext::progressCB now uses SystemStringView because widechar printing works correctly on Windows now.
- progFunc lambda no longer throws exceptions when printing unicode because widechar printing works correctly on Windows now.
- Top-level constructors and functions with a Codepage_t parameter have also signatures that default to the US-ASCII codepage.
- DiscGCN constructor
- DiscBuilderGCN constructor
- DiscBuilderGCN::CalculateTotalSizeRequired
- DiscMergerGCN constructor
- DiscMergerGCN::CalculateTotalSizeRequired
- DiscWii constructor
- DiscBuilderWii constructor
- DiscBuilderWii::CalculateTotalSizeRequired
- DiscMergerWii constructor
- DiscMergerWii::CalculateTotalSizeRequired
- OpenDiscFromImage
- Conversion between system encoding and disc locale encoding has checks in place to warn the user if string conversion goes awry.
2021-06-27 08:26:20 +00:00
|
|
|
m_buildNodes.emplace_back(true, m_buildNameOff, parentDirIdx, dirNodeIdx + 1);
|
2018-12-08 05:21:47 +00:00
|
|
|
addBuildName(e.m_name);
|
2017-02-05 06:19:34 +00:00
|
|
|
incParents();
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
auto search = dirNodes.find(nameView.str());
|
2018-12-08 05:21:47 +00:00
|
|
|
if (search != dirNodes.cend()) {
|
|
|
|
if (!recursiveMergeFST(search->second, e.m_path.c_str(),
|
|
|
|
[&]() {
|
|
|
|
m_buildNodes[dirNodeIdx].incrementLength();
|
|
|
|
incParents();
|
|
|
|
},
|
The Encoding Update
While Nintendo's own documents claim GameCube and Wii disc file symbol tables only support 7-bit ASCII, this is far from the truth. Indeed, even some first-party Nintendo games shipped with Shift-JIS encoded file symbol tables. My guess? The locale of whatever Windows machine mastered a GameCube or Wii disc influenced how wide character strings (UCS-2) were converted to narrow character strings. To account for all possibilites, this update adds extensible multi-byte character set options to NOD-Tool.
A rundown of notable changes:
- "-c XXXXX" option added to set the encoding of the GameCube / Wii ISO(s) being processed.
- "SystemStringConv" renamed to "DiscLocToSystemConv"
- "SystemUTF8Conv" renamed to "SystemToDiscLocConv"
- Help message updated with new info.
- Bugfix: AddBuildName had a logic error wherein the length of the SystemString was being used instead of length of the disc locale string. This would corrupt the File Symbol Table if the disc locale string's length was greater than the SystemString's length.
- Bugfix: recursiveMergeFST was not keeping track of parent indexes at all, meaning nested folders and their contents would be corrupted. I simply copied the way recursiveBuildFST did things to fix this.
- Bugfix (Windows): On Windows, for some reason, Sstat was a typedef for _stat (32-bit) instead of _stat64 (64-bit). This is confounding, because untrimmed Wii ISOs will always be larger than the unsigned 32-bit integer limit (4,699,979,776 bytes vs 4,294,967,295 bytes), meaning the MergeWii errand has never worked for untrimmed ISOs on Windows. Was this never tested??
- Bugfix (Windows): Did you know Windows Command Prompt fully supports Unicode? Stdio streams are now in _O_U16TEXT mode for Windows only. Previously, attempting to print any character that could not be narrowed to your locale's encoding would either silently fail (std functions), or throw an exception (fmt functions). As a minor drawback, narrow character print functions can no longer be used when stdio is in _O_U16TEXT mode, necessitating my PR for Logvisor here: (AxioDL/logvisor#7)
- ExtractionContext::progressCB now uses SystemStringView because widechar printing works correctly on Windows now.
- progFunc lambda no longer throws exceptions when printing unicode because widechar printing works correctly on Windows now.
- Top-level constructors and functions with a Codepage_t parameter have also signatures that default to the US-ASCII codepage.
- DiscGCN constructor
- DiscBuilderGCN constructor
- DiscBuilderGCN::CalculateTotalSizeRequired
- DiscMergerGCN constructor
- DiscMergerGCN::CalculateTotalSizeRequired
- DiscWii constructor
- DiscBuilderWii constructor
- DiscBuilderWii::CalculateTotalSizeRequired
- DiscMergerWii constructor
- DiscMergerWii::CalculateTotalSizeRequired
- OpenDiscFromImage
- Conversion between system encoding and disc locale encoding has checks in place to warn the user if string conversion goes awry.
2021-06-27 08:26:20 +00:00
|
|
|
dirNodeIdx, chKeyPath))
|
2017-02-05 06:19:34 +00:00
|
|
|
return false;
|
2018-12-08 05:21:47 +00:00
|
|
|
dirNodes.erase(search);
|
|
|
|
} else {
|
|
|
|
if (!recursiveMergeFST(nullptr, e.m_path.c_str(),
|
|
|
|
[&]() {
|
|
|
|
m_buildNodes[dirNodeIdx].incrementLength();
|
|
|
|
incParents();
|
|
|
|
},
|
The Encoding Update
While Nintendo's own documents claim GameCube and Wii disc file symbol tables only support 7-bit ASCII, this is far from the truth. Indeed, even some first-party Nintendo games shipped with Shift-JIS encoded file symbol tables. My guess? The locale of whatever Windows machine mastered a GameCube or Wii disc influenced how wide character strings (UCS-2) were converted to narrow character strings. To account for all possibilites, this update adds extensible multi-byte character set options to NOD-Tool.
A rundown of notable changes:
- "-c XXXXX" option added to set the encoding of the GameCube / Wii ISO(s) being processed.
- "SystemStringConv" renamed to "DiscLocToSystemConv"
- "SystemUTF8Conv" renamed to "SystemToDiscLocConv"
- Help message updated with new info.
- Bugfix: AddBuildName had a logic error wherein the length of the SystemString was being used instead of length of the disc locale string. This would corrupt the File Symbol Table if the disc locale string's length was greater than the SystemString's length.
- Bugfix: recursiveMergeFST was not keeping track of parent indexes at all, meaning nested folders and their contents would be corrupted. I simply copied the way recursiveBuildFST did things to fix this.
- Bugfix (Windows): On Windows, for some reason, Sstat was a typedef for _stat (32-bit) instead of _stat64 (64-bit). This is confounding, because untrimmed Wii ISOs will always be larger than the unsigned 32-bit integer limit (4,699,979,776 bytes vs 4,294,967,295 bytes), meaning the MergeWii errand has never worked for untrimmed ISOs on Windows. Was this never tested??
- Bugfix (Windows): Did you know Windows Command Prompt fully supports Unicode? Stdio streams are now in _O_U16TEXT mode for Windows only. Previously, attempting to print any character that could not be narrowed to your locale's encoding would either silently fail (std functions), or throw an exception (fmt functions). As a minor drawback, narrow character print functions can no longer be used when stdio is in _O_U16TEXT mode, necessitating my PR for Logvisor here: (AxioDL/logvisor#7)
- ExtractionContext::progressCB now uses SystemStringView because widechar printing works correctly on Windows now.
- progFunc lambda no longer throws exceptions when printing unicode because widechar printing works correctly on Windows now.
- Top-level constructors and functions with a Codepage_t parameter have also signatures that default to the US-ASCII codepage.
- DiscGCN constructor
- DiscBuilderGCN constructor
- DiscBuilderGCN::CalculateTotalSizeRequired
- DiscMergerGCN constructor
- DiscMergerGCN::CalculateTotalSizeRequired
- DiscWii constructor
- DiscBuilderWii constructor
- DiscBuilderWii::CalculateTotalSizeRequired
- DiscMergerWii constructor
- DiscMergerWii::CalculateTotalSizeRequired
- OpenDiscFromImage
- Conversion between system encoding and disc locale encoding has checks in place to warn the user if string conversion goes awry.
2021-06-27 08:26:20 +00:00
|
|
|
dirNodeIdx, chKeyPath))
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} else {
|
2021-06-22 19:16:56 +00:00
|
|
|
fileNodes.erase(nameView.str());
|
2018-12-08 05:21:47 +00:00
|
|
|
std::pair<uint64_t, uint64_t> fileOffSz = m_fileOffsetsSizes.at(chKeyPath);
|
2017-02-05 06:19:34 +00:00
|
|
|
m_buildNodes.emplace_back(false, m_buildNameOff, packOffset(fileOffSz.first), fileOffSz.second);
|
2018-12-08 05:21:47 +00:00
|
|
|
addBuildName(e.m_name);
|
2017-02-05 06:19:34 +00:00
|
|
|
incParents();
|
2018-12-08 05:21:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write-through remaining dir nodes */
|
|
|
|
for (const auto& p : dirNodes) {
|
2021-06-22 19:16:56 +00:00
|
|
|
SJISToUTF8 sysName(p.second->getName());
|
|
|
|
std::string chKeyPath = std::string(keyPath) + '/' + sysName.str();
|
2018-12-08 05:21:47 +00:00
|
|
|
|
|
|
|
size_t dirNodeIdx = m_buildNodes.size();
|
The Encoding Update
While Nintendo's own documents claim GameCube and Wii disc file symbol tables only support 7-bit ASCII, this is far from the truth. Indeed, even some first-party Nintendo games shipped with Shift-JIS encoded file symbol tables. My guess? The locale of whatever Windows machine mastered a GameCube or Wii disc influenced how wide character strings (UCS-2) were converted to narrow character strings. To account for all possibilites, this update adds extensible multi-byte character set options to NOD-Tool.
A rundown of notable changes:
- "-c XXXXX" option added to set the encoding of the GameCube / Wii ISO(s) being processed.
- "SystemStringConv" renamed to "DiscLocToSystemConv"
- "SystemUTF8Conv" renamed to "SystemToDiscLocConv"
- Help message updated with new info.
- Bugfix: AddBuildName had a logic error wherein the length of the SystemString was being used instead of length of the disc locale string. This would corrupt the File Symbol Table if the disc locale string's length was greater than the SystemString's length.
- Bugfix: recursiveMergeFST was not keeping track of parent indexes at all, meaning nested folders and their contents would be corrupted. I simply copied the way recursiveBuildFST did things to fix this.
- Bugfix (Windows): On Windows, for some reason, Sstat was a typedef for _stat (32-bit) instead of _stat64 (64-bit). This is confounding, because untrimmed Wii ISOs will always be larger than the unsigned 32-bit integer limit (4,699,979,776 bytes vs 4,294,967,295 bytes), meaning the MergeWii errand has never worked for untrimmed ISOs on Windows. Was this never tested??
- Bugfix (Windows): Did you know Windows Command Prompt fully supports Unicode? Stdio streams are now in _O_U16TEXT mode for Windows only. Previously, attempting to print any character that could not be narrowed to your locale's encoding would either silently fail (std functions), or throw an exception (fmt functions). As a minor drawback, narrow character print functions can no longer be used when stdio is in _O_U16TEXT mode, necessitating my PR for Logvisor here: (AxioDL/logvisor#7)
- ExtractionContext::progressCB now uses SystemStringView because widechar printing works correctly on Windows now.
- progFunc lambda no longer throws exceptions when printing unicode because widechar printing works correctly on Windows now.
- Top-level constructors and functions with a Codepage_t parameter have also signatures that default to the US-ASCII codepage.
- DiscGCN constructor
- DiscBuilderGCN constructor
- DiscBuilderGCN::CalculateTotalSizeRequired
- DiscMergerGCN constructor
- DiscMergerGCN::CalculateTotalSizeRequired
- DiscWii constructor
- DiscBuilderWii constructor
- DiscBuilderWii::CalculateTotalSizeRequired
- DiscMergerWii constructor
- DiscMergerWii::CalculateTotalSizeRequired
- OpenDiscFromImage
- Conversion between system encoding and disc locale encoding has checks in place to warn the user if string conversion goes awry.
2021-06-27 08:26:20 +00:00
|
|
|
m_buildNodes.emplace_back(true, m_buildNameOff, parentDirIdx, dirNodeIdx + 1);
|
2021-06-22 19:16:56 +00:00
|
|
|
addBuildName(sysName.str());
|
2018-12-08 05:21:47 +00:00
|
|
|
incParents();
|
|
|
|
|
2019-06-20 22:45:35 +00:00
|
|
|
if (!recursiveMergeFST(p.second, {},
|
2018-12-08 05:21:47 +00:00
|
|
|
[&]() {
|
|
|
|
m_buildNodes[dirNodeIdx].incrementLength();
|
|
|
|
incParents();
|
|
|
|
},
|
The Encoding Update
While Nintendo's own documents claim GameCube and Wii disc file symbol tables only support 7-bit ASCII, this is far from the truth. Indeed, even some first-party Nintendo games shipped with Shift-JIS encoded file symbol tables. My guess? The locale of whatever Windows machine mastered a GameCube or Wii disc influenced how wide character strings (UCS-2) were converted to narrow character strings. To account for all possibilites, this update adds extensible multi-byte character set options to NOD-Tool.
A rundown of notable changes:
- "-c XXXXX" option added to set the encoding of the GameCube / Wii ISO(s) being processed.
- "SystemStringConv" renamed to "DiscLocToSystemConv"
- "SystemUTF8Conv" renamed to "SystemToDiscLocConv"
- Help message updated with new info.
- Bugfix: AddBuildName had a logic error wherein the length of the SystemString was being used instead of length of the disc locale string. This would corrupt the File Symbol Table if the disc locale string's length was greater than the SystemString's length.
- Bugfix: recursiveMergeFST was not keeping track of parent indexes at all, meaning nested folders and their contents would be corrupted. I simply copied the way recursiveBuildFST did things to fix this.
- Bugfix (Windows): On Windows, for some reason, Sstat was a typedef for _stat (32-bit) instead of _stat64 (64-bit). This is confounding, because untrimmed Wii ISOs will always be larger than the unsigned 32-bit integer limit (4,699,979,776 bytes vs 4,294,967,295 bytes), meaning the MergeWii errand has never worked for untrimmed ISOs on Windows. Was this never tested??
- Bugfix (Windows): Did you know Windows Command Prompt fully supports Unicode? Stdio streams are now in _O_U16TEXT mode for Windows only. Previously, attempting to print any character that could not be narrowed to your locale's encoding would either silently fail (std functions), or throw an exception (fmt functions). As a minor drawback, narrow character print functions can no longer be used when stdio is in _O_U16TEXT mode, necessitating my PR for Logvisor here: (AxioDL/logvisor#7)
- ExtractionContext::progressCB now uses SystemStringView because widechar printing works correctly on Windows now.
- progFunc lambda no longer throws exceptions when printing unicode because widechar printing works correctly on Windows now.
- Top-level constructors and functions with a Codepage_t parameter have also signatures that default to the US-ASCII codepage.
- DiscGCN constructor
- DiscBuilderGCN constructor
- DiscBuilderGCN::CalculateTotalSizeRequired
- DiscMergerGCN constructor
- DiscMergerGCN::CalculateTotalSizeRequired
- DiscWii constructor
- DiscBuilderWii constructor
- DiscBuilderWii::CalculateTotalSizeRequired
- DiscMergerWii constructor
- DiscMergerWii::CalculateTotalSizeRequired
- OpenDiscFromImage
- Conversion between system encoding and disc locale encoding has checks in place to warn the user if string conversion goes awry.
2021-06-27 08:26:20 +00:00
|
|
|
dirNodeIdx, chKeyPath))
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write-through remaining file nodes */
|
|
|
|
for (const auto& p : fileNodes) {
|
|
|
|
const Node& ch = *p.second;
|
2021-06-22 19:16:56 +00:00
|
|
|
SJISToUTF8 sysName(ch.getName());
|
|
|
|
std::string chKeyPath = std::string(keyPath) + '/' + sysName.str();
|
2018-12-08 05:21:47 +00:00
|
|
|
|
|
|
|
std::pair<uint64_t, uint64_t> fileOffSz = m_fileOffsetsSizes.at(chKeyPath);
|
|
|
|
m_buildNodes.emplace_back(false, m_buildNameOff, packOffset(fileOffSz.first), fileOffSz.second);
|
2021-06-22 19:16:56 +00:00
|
|
|
addBuildName(ch.getName());
|
2018-12-08 05:21:47 +00:00
|
|
|
incParents();
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
2017-02-05 06:19:34 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
bool DiscBuilderBase::PartitionBuilderBase::RecursiveCalculateTotalSize(uint64_t& totalSz, const Node* nodeIn,
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string_view dirIn) {
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Build map of existing nodes to write-through later */
|
|
|
|
std::unordered_map<std::string, const Node*> fileNodes;
|
|
|
|
std::unordered_map<std::string, const Node*> dirNodes;
|
|
|
|
if (nodeIn) {
|
|
|
|
fileNodes.reserve(nodeIn->size());
|
|
|
|
dirNodes.reserve(nodeIn->size());
|
|
|
|
for (const Node& ch : *nodeIn) {
|
|
|
|
if (ch.getKind() == Node::Kind::File)
|
|
|
|
fileNodes.insert(std::make_pair(ch.getName(), &ch));
|
|
|
|
else if (ch.getKind() == Node::Kind::Directory)
|
|
|
|
dirNodes.insert(std::make_pair(ch.getName(), &ch));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge this directory's files */
|
|
|
|
if (!dirIn.empty()) {
|
|
|
|
DirectoryEnumerator dEnum(dirIn, DirectoryEnumerator::Mode::DirsThenFilesSorted, false, false, true);
|
|
|
|
for (const DirectoryEnumerator::Entry& e : dEnum) {
|
2021-06-22 19:16:56 +00:00
|
|
|
UTF8ToSJIS nameView(e.m_name);
|
2018-12-08 05:21:47 +00:00
|
|
|
|
|
|
|
if (e.m_isDir) {
|
2021-06-22 19:16:56 +00:00
|
|
|
auto search = dirNodes.find(nameView.str());
|
2018-12-08 05:21:47 +00:00
|
|
|
if (search != dirNodes.cend()) {
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!RecursiveCalculateTotalSize(totalSz, search->second, e.m_path))
|
2017-02-05 06:19:34 +00:00
|
|
|
return false;
|
2018-12-08 05:21:47 +00:00
|
|
|
dirNodes.erase(search);
|
|
|
|
} else {
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!RecursiveCalculateTotalSize(totalSz, nullptr, e.m_path))
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} else {
|
2021-06-22 19:16:56 +00:00
|
|
|
fileNodes.erase(nameView.str());
|
2018-12-08 05:21:47 +00:00
|
|
|
totalSz += ROUND_UP_32(e.m_fileSz);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write-through remaining dir nodes */
|
|
|
|
for (const auto& p : dirNodes) {
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!RecursiveCalculateTotalSize(totalSz, p.second, {}))
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write-through remaining file nodes */
|
|
|
|
for (const auto& p : fileNodes) {
|
|
|
|
const Node& ch = *p.second;
|
|
|
|
totalSz += ROUND_UP_32(ch.size());
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
2016-01-21 06:30:37 +00:00
|
|
|
}
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
bool DiscBuilderBase::PartitionBuilderBase::buildFromDirectory(IPartWriteStream& ws, std::string_view dirIn) {
|
2018-12-08 05:21:47 +00:00
|
|
|
if (dirIn.empty()) {
|
2021-06-22 19:16:56 +00:00
|
|
|
LogModule.report(logvisor::Error, FMT_STRING("all arguments must be supplied to buildFromDirectory()"));
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
2016-01-21 06:30:37 +00:00
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string dirStr(dirIn);
|
|
|
|
std::string basePath = m_isWii ? dirStr + "/" + getKindString(m_kind) : dirStr;
|
|
|
|
std::string dolIn = basePath + "/sys/main.dol";
|
|
|
|
std::string filesIn = basePath + "/files";
|
2017-07-01 23:36:16 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* 1st pass - Tally up total progress steps */
|
|
|
|
m_parent.m_progressTotal += 2; /* Prep and DOL */
|
|
|
|
recursiveBuildNodesPre(filesIn.c_str());
|
2017-05-22 03:12:48 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Clear file */
|
2021-06-22 19:16:56 +00:00
|
|
|
m_parent.m_progressCB(m_parent.getProgressFactor(), "Preparing output image", -1);
|
2018-12-08 05:21:47 +00:00
|
|
|
++m_parent.m_progressIdx;
|
2016-01-21 06:30:37 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Add root node */
|
|
|
|
m_buildNodes.emplace_back(true, m_buildNameOff, 0, 1);
|
2021-06-22 19:16:56 +00:00
|
|
|
addBuildName("<root>");
|
2016-01-21 06:30:37 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Write Boot DOL first (first thing seeked to after Apploader) */
|
|
|
|
{
|
|
|
|
Sstat dolStat;
|
|
|
|
if (Stat(dolIn.c_str(), &dolStat)) {
|
2021-06-22 19:16:56 +00:00
|
|
|
LogModule.report(logvisor::Error, FMT_STRING("unable to stat {}"), dolIn);
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
size_t fileSz = ROUND_UP_32(dolStat.st_size);
|
|
|
|
uint64_t fileOff = userAllocate(fileSz, ws);
|
2019-06-10 02:49:17 +00:00
|
|
|
if (fileOff == UINT64_MAX)
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
m_dolOffset = fileOff;
|
|
|
|
m_dolSize = fileSz;
|
|
|
|
std::unique_ptr<IFileIO::IReadStream> rs = NewFileIO(dolIn.c_str())->beginReadStream();
|
|
|
|
if (!rs)
|
|
|
|
return false;
|
|
|
|
bool patched;
|
|
|
|
size_t xferSz = PatchDOL(*rs, ws, dolStat.st_size, patched);
|
2021-06-22 19:16:56 +00:00
|
|
|
m_parent.m_progressCB(m_parent.getProgressFactor(), dolIn + (patched ? " [PATCHED]" : ""),
|
2018-12-08 05:21:47 +00:00
|
|
|
xferSz);
|
|
|
|
++m_parent.m_progressIdx;
|
|
|
|
for (size_t i = 0; i < fileSz - xferSz; ++i)
|
|
|
|
ws.write("\xff", 1);
|
|
|
|
}
|
2016-01-21 06:30:37 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Gather files in root directory */
|
|
|
|
if (!recursiveBuildNodes(ws, true, filesIn.c_str()))
|
|
|
|
return false;
|
|
|
|
if (!recursiveBuildNodes(ws, false, filesIn.c_str()))
|
|
|
|
return false;
|
|
|
|
if (!recursiveBuildFST(filesIn.c_str(), [&]() { m_buildNodes[0].incrementLength(); }, 0))
|
|
|
|
return false;
|
2016-01-22 23:45:58 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
return true;
|
2016-01-21 06:30:37 +00:00
|
|
|
}
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
std::optional<uint64_t> DiscBuilderBase::PartitionBuilderBase::CalculateTotalSizeBuild(std::string_view dirIn,
|
|
|
|
PartitionKind kind, bool isWii) {
|
|
|
|
std::string dirStr(dirIn);
|
|
|
|
std::string basePath = isWii ? dirStr + "/" + getKindString(kind) : dirStr;
|
|
|
|
std::string dolIn = basePath + "/sys/main.dol";
|
|
|
|
std::string filesIn = basePath + "/files";
|
2018-12-08 05:21:47 +00:00
|
|
|
|
|
|
|
Sstat dolStat;
|
|
|
|
if (Stat(dolIn.c_str(), &dolStat)) {
|
2021-06-22 19:16:56 +00:00
|
|
|
LogModule.report(logvisor::Error, FMT_STRING("unable to stat {}"), dolIn);
|
2018-07-21 04:03:59 +00:00
|
|
|
return std::nullopt;
|
2018-12-08 05:21:47 +00:00
|
|
|
}
|
|
|
|
uint64_t totalSz = ROUND_UP_32(dolStat.st_size);
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!RecursiveCalculateTotalSize(totalSz, nullptr, filesIn))
|
2018-07-21 04:03:59 +00:00
|
|
|
return std::nullopt;
|
2018-12-08 05:21:47 +00:00
|
|
|
return totalSz;
|
2017-02-05 06:19:34 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
bool DiscBuilderBase::PartitionBuilderBase::mergeFromDirectory(IPartWriteStream& ws, const IPartition* partIn,
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string_view dirIn) {
|
2018-12-08 05:21:47 +00:00
|
|
|
if (dirIn.empty()) {
|
2021-06-22 19:16:56 +00:00
|
|
|
LogModule.report(logvisor::Error, FMT_STRING("all arguments must be supplied to mergeFromDirectory()"));
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string dirStr(dirIn);
|
|
|
|
std::string basePath = m_isWii ? dirStr + "/" + getKindString(m_kind) : dirStr;
|
|
|
|
std::string filesIn = basePath + "/files";
|
2018-12-08 05:21:47 +00:00
|
|
|
|
|
|
|
/* 1st pass - Tally up total progress steps */
|
|
|
|
m_parent.m_progressTotal += 2; /* Prep and DOL */
|
|
|
|
recursiveMergeNodesPre(&partIn->getFSTRoot(), filesIn.c_str());
|
|
|
|
|
|
|
|
/* Clear file */
|
2021-06-22 19:16:56 +00:00
|
|
|
m_parent.m_progressCB(m_parent.getProgressFactor(), "Preparing output image", -1);
|
2018-12-08 05:21:47 +00:00
|
|
|
++m_parent.m_progressIdx;
|
|
|
|
|
|
|
|
/* Add root node */
|
|
|
|
m_buildNodes.emplace_back(true, m_buildNameOff, 0, 1);
|
2021-06-22 19:16:56 +00:00
|
|
|
addBuildName("<root>");
|
2018-12-08 05:21:47 +00:00
|
|
|
|
|
|
|
/* Write Boot DOL first (first thing seeked to after Apploader) */
|
|
|
|
{
|
|
|
|
size_t xferSz = partIn->getDOLSize();
|
|
|
|
size_t fileSz = ROUND_UP_32(xferSz);
|
|
|
|
uint64_t fileOff = userAllocate(fileSz, ws);
|
2019-06-10 02:49:17 +00:00
|
|
|
if (fileOff == UINT64_MAX)
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
|
|
|
m_dolOffset = fileOff;
|
|
|
|
m_dolSize = fileSz;
|
|
|
|
std::unique_ptr<uint8_t[]> dolBuf = partIn->getDOLBuf();
|
|
|
|
bool patched;
|
|
|
|
PatchDOL(dolBuf, xferSz, patched);
|
|
|
|
ws.write(dolBuf.get(), xferSz);
|
|
|
|
m_parent.m_progressCB(m_parent.getProgressFactor(),
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string("<boot-dol>") + (patched ? " [PATCHED]" : ""),
|
2018-12-08 05:21:47 +00:00
|
|
|
xferSz);
|
2017-02-05 06:19:34 +00:00
|
|
|
++m_parent.m_progressIdx;
|
2018-12-08 05:21:47 +00:00
|
|
|
for (size_t i = 0; i < fileSz - xferSz; ++i)
|
|
|
|
ws.write("\xff", 1);
|
|
|
|
}
|
2017-02-05 06:19:34 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
/* Gather files in root directory */
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string keyPath;
|
2018-12-08 05:21:47 +00:00
|
|
|
if (!recursiveMergeNodes(ws, true, &partIn->getFSTRoot(), filesIn.c_str(), keyPath))
|
|
|
|
return false;
|
|
|
|
if (!recursiveMergeNodes(ws, false, &partIn->getFSTRoot(), filesIn.c_str(), keyPath))
|
|
|
|
return false;
|
The Encoding Update
While Nintendo's own documents claim GameCube and Wii disc file symbol tables only support 7-bit ASCII, this is far from the truth. Indeed, even some first-party Nintendo games shipped with Shift-JIS encoded file symbol tables. My guess? The locale of whatever Windows machine mastered a GameCube or Wii disc influenced how wide character strings (UCS-2) were converted to narrow character strings. To account for all possibilites, this update adds extensible multi-byte character set options to NOD-Tool.
A rundown of notable changes:
- "-c XXXXX" option added to set the encoding of the GameCube / Wii ISO(s) being processed.
- "SystemStringConv" renamed to "DiscLocToSystemConv"
- "SystemUTF8Conv" renamed to "SystemToDiscLocConv"
- Help message updated with new info.
- Bugfix: AddBuildName had a logic error wherein the length of the SystemString was being used instead of length of the disc locale string. This would corrupt the File Symbol Table if the disc locale string's length was greater than the SystemString's length.
- Bugfix: recursiveMergeFST was not keeping track of parent indexes at all, meaning nested folders and their contents would be corrupted. I simply copied the way recursiveBuildFST did things to fix this.
- Bugfix (Windows): On Windows, for some reason, Sstat was a typedef for _stat (32-bit) instead of _stat64 (64-bit). This is confounding, because untrimmed Wii ISOs will always be larger than the unsigned 32-bit integer limit (4,699,979,776 bytes vs 4,294,967,295 bytes), meaning the MergeWii errand has never worked for untrimmed ISOs on Windows. Was this never tested??
- Bugfix (Windows): Did you know Windows Command Prompt fully supports Unicode? Stdio streams are now in _O_U16TEXT mode for Windows only. Previously, attempting to print any character that could not be narrowed to your locale's encoding would either silently fail (std functions), or throw an exception (fmt functions). As a minor drawback, narrow character print functions can no longer be used when stdio is in _O_U16TEXT mode, necessitating my PR for Logvisor here: (AxioDL/logvisor#7)
- ExtractionContext::progressCB now uses SystemStringView because widechar printing works correctly on Windows now.
- progFunc lambda no longer throws exceptions when printing unicode because widechar printing works correctly on Windows now.
- Top-level constructors and functions with a Codepage_t parameter have also signatures that default to the US-ASCII codepage.
- DiscGCN constructor
- DiscBuilderGCN constructor
- DiscBuilderGCN::CalculateTotalSizeRequired
- DiscMergerGCN constructor
- DiscMergerGCN::CalculateTotalSizeRequired
- DiscWii constructor
- DiscBuilderWii constructor
- DiscBuilderWii::CalculateTotalSizeRequired
- DiscMergerWii constructor
- DiscMergerWii::CalculateTotalSizeRequired
- OpenDiscFromImage
- Conversion between system encoding and disc locale encoding has checks in place to warn the user if string conversion goes awry.
2021-06-27 08:26:20 +00:00
|
|
|
if (!recursiveMergeFST(&partIn->getFSTRoot(), filesIn.c_str(), [&]() { m_buildNodes[0].incrementLength(); }, 0, keyPath))
|
2018-12-08 05:21:47 +00:00
|
|
|
return false;
|
2017-02-05 06:19:34 +00:00
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
return true;
|
2017-02-05 06:19:34 +00:00
|
|
|
}
|
|
|
|
|
2018-07-21 04:03:59 +00:00
|
|
|
std::optional<uint64_t> DiscBuilderBase::PartitionBuilderBase::CalculateTotalSizeMerge(const IPartition* partIn,
|
2021-06-22 19:16:56 +00:00
|
|
|
std::string_view dirIn) {
|
|
|
|
std::string dirStr(dirIn);
|
|
|
|
std::string basePath = partIn->isWii() ? dirStr + "/" + getKindString(partIn->getKind()) : dirStr;
|
|
|
|
std::string filesIn = basePath + "/files";
|
2018-12-08 05:21:47 +00:00
|
|
|
|
|
|
|
uint64_t totalSz = ROUND_UP_32(partIn->getDOLSize());
|
2021-06-22 19:16:56 +00:00
|
|
|
if (!RecursiveCalculateTotalSize(totalSz, &partIn->getFSTRoot(), filesIn))
|
2018-07-21 04:03:59 +00:00
|
|
|
return std::nullopt;
|
2018-12-08 05:21:47 +00:00
|
|
|
return totalSz;
|
2017-02-05 06:19:34 +00:00
|
|
|
}
|
|
|
|
|
2018-12-08 05:21:47 +00:00
|
|
|
} // namespace nod
|