AxioDL
/
nod
mirror of https://github.com/AxioDL/nod.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Explicitly zero-initialize new image files

This commit is contained in:
Jack Andersen 2017-07-30 16:03:20 -10:00
parent 42ef3a7958
commit fb2a5c91d2
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/DiscGCN.cpp
View File

@ -395,10 +395,14 @@ EBuildResult DiscBuilderGCN::buildFromDirectory(const SystemChar* dirIn)
} }
m_progressCB(getProgressFactor(), _S("Preallocating image"), -1); m_progressCB(getProgressFactor(), _S("Preallocating image"), -1);
++m_progressIdx; ++m_progressIdx;
auto ws = m_fileIO->beginWriteStream(0x57058000 - 1); {
auto ws = m_fileIO->beginWriteStream(0);
if (!ws) if (!ws)
return EBuildResult::Failed; return EBuildResult::Failed;
ws->write("", 1); char zeroBytes[1024] = {};
for (uint64_t i = 0; i < 0x57058000; i += 1024)
ws->write(zeroBytes, 1024);
}
PartitionBuilderGCN& pb = static_cast<PartitionBuilderGCN&>(*m_partitions[0]); PartitionBuilderGCN& pb = static_cast<PartitionBuilderGCN&>(*m_partitions[0]);
return pb.buildFromDirectory(dirIn) ? EBuildResult::Success : EBuildResult::Failed; return pb.buildFromDirectory(dirIn) ? EBuildResult::Success : EBuildResult::Failed;
@ -440,10 +444,14 @@ EBuildResult DiscMergerGCN::mergeFromDirectory(const SystemChar* dirIn)
} }
m_builder.m_progressCB(m_builder.getProgressFactor(), _S("Preallocating image"), -1); m_builder.m_progressCB(m_builder.getProgressFactor(), _S("Preallocating image"), -1);
++m_builder.m_progressIdx; ++m_builder.m_progressIdx;
auto ws = m_builder.m_fileIO->beginWriteStream(0x57058000 - 1); {
auto ws = m_builder.m_fileIO->beginWriteStream(0);
if (!ws) if (!ws)
return EBuildResult::Failed; return EBuildResult::Failed;
ws->write("", 1); char zeroBytes[1024] = {};
for (uint64_t i = 0; i < 0x57058000; i += 1024)
ws->write(zeroBytes, 1024);
}
PartitionBuilderGCN& pb = static_cast<PartitionBuilderGCN&>(*m_builder.m_partitions[0]); PartitionBuilderGCN& pb = static_cast<PartitionBuilderGCN&>(*m_builder.m_partitions[0]);
return pb.mergeFromDirectory(static_cast<PartitionGCN*>(m_sourceDisc.getDataPartition()), dirIn) ? return pb.mergeFromDirectory(static_cast<PartitionGCN*>(m_sourceDisc.getDataPartition()), dirIn) ?

16
lib/DiscWii.cpp
View File

@ -1269,10 +1269,14 @@ EBuildResult DiscBuilderWii::buildFromDirectory(const SystemChar* dirIn)
} }
m_progressCB(getProgressFactor(), _S("Preallocating image"), -1); m_progressCB(getProgressFactor(), _S("Preallocating image"), -1);
++m_progressIdx; ++m_progressIdx;
std::unique_ptr<IFileIO::IWriteStream> ws = m_fileIO->beginWriteStream(m_discCapacity - 1); {
std::unique_ptr<IFileIO::IWriteStream> ws = m_fileIO->beginWriteStream(0);
if (!ws) if (!ws)
return EBuildResult::Failed; return EBuildResult::Failed;
ws->write("", 1); char zeroBytes[1024] = {};
for (uint64_t i = 0; i < m_discCapacity; i += 1024)
ws->write(zeroBytes, 1024);
}
/* Assemble image */ /* Assemble image */
filledSz = pb.buildFromDirectory(dirIn); filledSz = pb.buildFromDirectory(dirIn);
@ -1389,10 +1393,14 @@ EBuildResult DiscMergerWii::mergeFromDirectory(const SystemChar* dirIn)
} }
m_builder.m_progressCB(m_builder.getProgressFactor(), _S("Preallocating image"), -1); m_builder.m_progressCB(m_builder.getProgressFactor(), _S("Preallocating image"), -1);
++m_builder.m_progressIdx; ++m_builder.m_progressIdx;
std::unique_ptr<IFileIO::IWriteStream> ws = m_builder.m_fileIO->beginWriteStream(m_builder.m_discCapacity - 1); {
std::unique_ptr<IFileIO::IWriteStream> ws = m_builder.m_fileIO->beginWriteStream(0);
if (!ws) if (!ws)
return EBuildResult::Failed; return EBuildResult::Failed;
ws->write("", 1); char zeroBytes[1024] = {};
for (uint64_t i = 0; i < m_builder.m_discCapacity; i += 1024)
ws->write(zeroBytes, 1024);
}
/* Assemble image */ /* Assemble image */
filledSz = pb.mergeFromDirectory(static_cast<PartitionWii*>(m_sourceDisc.getDataPartition()), dirIn); filledSz = pb.mergeFromDirectory(static_cast<PartitionWii*>(m_sourceDisc.getDataPartition()), dirIn);