piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

DirectoryBlob: Restructure SetApploader

Browse Source
This commit is contained in:
JosJuice
2017-06-10 10:27:46 +02:00
parent 8747b1b6ab
commit 1258d18f21
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Source/Core/DiscIO/DirectoryBlob.cpp
View File

@ -329,35 +329,42 @@ void DirectoryBlobReader::SetWiiRegionData()
bool DirectoryBlobReader::SetApploader(const std::string& apploader) bool DirectoryBlobReader::SetApploader(const std::string& apploader)
{ {
if (!apploader.empty()) bool success = false;
if (apploader.empty())
{
m_apploader.resize(0x20);
// Make sure BS2 HLE doesn't try to run the apploader
Write32(static_cast<u32>(-1), 0x10, &m_apploader);
}
else
{ {
std::string data; std::string data;
if (!File::ReadFileToString(apploader, data)) if (!File::ReadFileToString(apploader, data))
{ {
PanicAlertT("Apploader unable to load from file"); PanicAlertT("Apploader unable to load from file");
return false;
} }
size_t apploader_size = 0x20 + Common::swap32(*(u32*)&data.data()[0x14]) + else
Common::swap32(*(u32*)&data.data()[0x18]);
if (apploader_size != data.size())
{ {
PanicAlertT("Apploader is the wrong size...is it really an apploader?"); const size_t apploader_size = 0x20 + Common::swap32(*(u32*)&data.data()[0x14]) +
return false; Common::swap32(*(u32*)&data.data()[0x18]);
} if (apploader_size != data.size())
m_apploader.resize(apploader_size); {
std::copy(data.begin(), data.end(), m_apploader.begin()); PanicAlertT("Apploader is the wrong size...is it really an apploader?");
}
else
{
m_apploader.resize(apploader_size);
std::copy(data.begin(), data.end(), m_apploader.begin());
// 32byte aligned (plus 0x20 padding) // 32byte aligned (plus 0x20 padding)
m_dol_address = Common::AlignUp(APPLOADER_ADDRESS + m_apploader.size() + 0x20, 0x20ull); m_dol_address = Common::AlignUp(APPLOADER_ADDRESS + m_apploader.size() + 0x20, 0x20ull);
return true; success = true;
} }
else }
{
m_apploader.resize(0x20);
// Make sure BS2 HLE doesn't try to run the apploader
Write32(static_cast<u32>(-1), 0x10, &m_apploader);
return false;
} }
return success;
} }
void DirectoryBlobReader::SetDOL() void DirectoryBlobReader::SetDOL()