ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5548 from JosJuice/volume-wii-unencrypted 

Reimplement support for unencrypted Wii discs
This commit is contained in:
shuffle2 2017-06-06 01:37:52 -07:00 committed by GitHub
parent 4e0b44a188 69f01bac39
commit 1113b131f2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DiscIO/Volume.cpp
View File

@ -96,13 +96,7 @@ std::unique_ptr<IVolume> CreateVolumeFromFilename(const std::string& filename)
// Check for Wii
const std::optional<u32> wii_magic = reader->ReadSwapped<u32>(0x18);
if (wii_magic == u32(0x5D1C9EA3))
{
const std::optional<u32> wii_container_magic = reader->ReadSwapped<u32>(0x60);
if (wii_container_magic == u32(0))
return std::make_unique<CVolumeWiiCrypted>(std::move(reader));
return std::make_unique<CVolumeGC>(std::move(reader));
}
return std::make_unique<CVolumeWiiCrypted>(std::move(reader));
// Check for WAD
// 0x206962 for boot2 wads

6
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View File

@ -36,6 +36,12 @@ CVolumeWiiCrypted::CVolumeWiiCrypted(std::unique_ptr<IBlobReader> reader)
{
_assert_(m_pReader);
if (m_pReader->ReadSwapped<u32>(0x60) != u32(0))
{
// No partitions - just read unencrypted data like with a GC disc
return;
}
// Get tickets, TMDs, and decryption keys for all partitions
for (u32 partition_group = 0; partition_group < 4; ++partition_group)
{