The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

DirectoryBlob: Remove m_root_directory from DirectoryBlob

Browse Source
This commit is contained in:
JosJuice 2017-06-10 20:11:58 +02:00
parent e15b957d53
commit 955ab72b1d
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,10 +157,9 @@ std::unique_ptr<DirectoryBlobReader> DirectoryBlobReader::Create(const std::stri
return std::unique_ptr<DirectoryBlobReader>(new DirectoryBlobReader(root_directory)); return std::unique_ptr<DirectoryBlobReader>(new DirectoryBlobReader(root_directory));
} }
DirectoryBlobReader::DirectoryBlobReader(const std::string& root_directory) DirectoryBlobReader::DirectoryBlobReader(const std::string& game_partition_root)
: m_root_directory(root_directory)
{ {
DirectoryBlobPartition game_partition(root_directory, {}); DirectoryBlobPartition game_partition(game_partition_root, {});
m_is_wii = game_partition.IsWii(); m_is_wii = game_partition.IsWii();
if (!m_is_wii) if (!m_is_wii)
@ -170,7 +169,7 @@ DirectoryBlobReader::DirectoryBlobReader(const std::string& root_directory)
} }
else else
{ {
SetNonpartitionDiscHeader(game_partition.GetHeader()); SetNonpartitionDiscHeader(game_partition.GetHeader(), game_partition_root);
const u64 unaligned_data_size = VolumeWii::PartitionOffsetToRawOffset( const u64 unaligned_data_size = VolumeWii::PartitionOffsetToRawOffset(
game_partition.GetDataSize(), Partition(GAME_PARTITION_ADDRESS)); game_partition.GetDataSize(), Partition(GAME_PARTITION_ADDRESS));
@ -179,8 +178,8 @@ DirectoryBlobReader::DirectoryBlobReader(const std::string& root_directory)
m_partitions.emplace(GAME_PARTITION_ADDRESS, std::move(game_partition)); m_partitions.emplace(GAME_PARTITION_ADDRESS, std::move(game_partition));
SetPartitionTable(); SetPartitionTable();
SetWiiRegionData(); SetWiiRegionData(game_partition_root);
SetTMDAndTicket(); SetTMDAndTicket(game_partition_root);
} }
} }
@ -258,14 +257,15 @@ u64 DirectoryBlobReader::GetDataSize() const
return m_data_size; return m_data_size;
} }
void DirectoryBlobReader::SetNonpartitionDiscHeader(const std::vector<u8>& partition_header) void DirectoryBlobReader::SetNonpartitionDiscHeader(const std::vector<u8>& partition_header,
const std::string& game_partition_root)
{ {
constexpr u64 NONPARTITION_DISKHEADER_ADDRESS = 0; constexpr u64 NONPARTITION_DISKHEADER_ADDRESS = 0;
constexpr u64 NONPARTITION_DISKHEADER_SIZE = 0x100; constexpr u64 NONPARTITION_DISKHEADER_SIZE = 0x100;
m_disk_header_nonpartition.resize(NONPARTITION_DISKHEADER_SIZE); m_disk_header_nonpartition.resize(NONPARTITION_DISKHEADER_SIZE);
const size_t header_bin_bytes_read = const size_t header_bin_bytes_read =
ReadFileToVector(m_root_directory + "disc/header.bin", &m_disk_header_nonpartition); ReadFileToVector(game_partition_root + "disc/header.bin", &m_disk_header_nonpartition);
// If header.bin is missing or smaller than expected, use the content of sys/boot.bin instead // If header.bin is missing or smaller than expected, use the content of sys/boot.bin instead
std::copy(partition_header.data() + header_bin_bytes_read, std::copy(partition_header.data() + header_bin_bytes_read,
@ -293,7 +293,7 @@ void DirectoryBlobReader::SetPartitionTable()
reinterpret_cast<const u8*>(PARTITION_TABLE.data())); reinterpret_cast<const u8*>(PARTITION_TABLE.data()));
} }
void DirectoryBlobReader::SetWiiRegionData() void DirectoryBlobReader::SetWiiRegionData(const std::string& game_partition_root)
{ {
m_wii_region_data.resize(0x10, 0x00); m_wii_region_data.resize(0x10, 0x00);
m_wii_region_data.resize(0x20, 0x80); m_wii_region_data.resize(0x20, 0x80);
@ -302,7 +302,7 @@ void DirectoryBlobReader::SetWiiRegionData()
constexpr u32 INVALID_REGION = 0xFF; constexpr u32 INVALID_REGION = 0xFF;
Write32(INVALID_REGION, 0, &m_wii_region_data); Write32(INVALID_REGION, 0, &m_wii_region_data);
const std::string region_bin_path = m_root_directory + "disc/region.bin"; const std::string region_bin_path = game_partition_root + "disc/region.bin";
const size_t bytes_read = ReadFileToVector(region_bin_path, &m_wii_region_data); const size_t bytes_read = ReadFileToVector(region_bin_path, &m_wii_region_data);
if (bytes_read < 0x4) if (bytes_read < 0x4)
ERROR_LOG(DISCIO, "Couldn't read region from %s", region_bin_path.c_str()); ERROR_LOG(DISCIO, "Couldn't read region from %s", region_bin_path.c_str());
@ -315,15 +315,15 @@ void DirectoryBlobReader::SetWiiRegionData()
m_wii_region_data.data()); m_wii_region_data.data());
} }
void DirectoryBlobReader::SetTMDAndTicket() void DirectoryBlobReader::SetTMDAndTicket(const std::string& partition_root)
{ {
constexpr u32 TICKET_OFFSET = 0x0; constexpr u32 TICKET_OFFSET = 0x0;
constexpr u32 TICKET_SIZE = 0x2a4; constexpr u32 TICKET_SIZE = 0x2a4;
constexpr u32 TMD_OFFSET = 0x2c0; constexpr u32 TMD_OFFSET = 0x2c0;
constexpr u32 MAX_TMD_SIZE = 0x49e4; constexpr u32 MAX_TMD_SIZE = 0x49e4;
AddFileToContents(&m_nonpartition_contents, m_root_directory + "ticket.bin", AddFileToContents(&m_nonpartition_contents, partition_root + "ticket.bin",
GAME_PARTITION_ADDRESS + TICKET_OFFSET, TICKET_SIZE); GAME_PARTITION_ADDRESS + TICKET_OFFSET, TICKET_SIZE);
const DiscContent& tmd = AddFileToContents(&m_nonpartition_contents, m_root_directory + "tmd.bin", const DiscContent& tmd = AddFileToContents(&m_nonpartition_contents, partition_root + "tmd.bin",
GAME_PARTITION_ADDRESS + TMD_OFFSET, MAX_TMD_SIZE); GAME_PARTITION_ADDRESS + TMD_OFFSET, MAX_TMD_SIZE);
m_tmd_header = {Common::swap32(static_cast<u32>(tmd.GetSize())), Common::swap32(TMD_OFFSET >> 2)}; m_tmd_header = {Common::swap32(static_cast<u32>(tmd.GetSize())), Common::swap32(TMD_OFFSET >> 2)};
m_nonpartition_contents.emplace(GAME_PARTITION_ADDRESS + TICKET_SIZE, sizeof(m_tmd_header), m_nonpartition_contents.emplace(GAME_PARTITION_ADDRESS + TICKET_SIZE, sizeof(m_tmd_header),

11
Source/Core/DiscIO/DirectoryBlob.h
View File

@ -120,16 +120,15 @@ public:
u64 GetDataSize() const override; u64 GetDataSize() const override;
private: private:
explicit DirectoryBlobReader(const std::string& root_directory); explicit DirectoryBlobReader(const std::string& game_partition_root);
bool ReadInternal(u64 offset, u64 length, u8* buffer, const std::set<DiscContent>& contents); bool ReadInternal(u64 offset, u64 length, u8* buffer, const std::set<DiscContent>& contents);
void SetNonpartitionDiscHeader(const std::vector<u8>& partition_header); void SetNonpartitionDiscHeader(const std::vector<u8>& partition_header,
const std::string& game_partition_root);
void SetPartitionTable(); void SetPartitionTable();
void SetWiiRegionData(); void SetWiiRegionData(const std::string& game_partition_root);
void SetTMDAndTicket(); void SetTMDAndTicket(const std::string& partition_root);
std::string m_root_directory;
// For GameCube: // For GameCube:
DirectoryBlobPartition m_gamecube_pseudopartition; DirectoryBlobPartition m_gamecube_pseudopartition;