diff --git a/Source/Core/DiscIO/TGCBlob.cpp b/Source/Core/DiscIO/TGCBlob.cpp index 8533e38df7..b14e0017b1 100644 --- a/Source/Core/DiscIO/TGCBlob.cpp +++ b/Source/Core/DiscIO/TGCBlob.cpp @@ -4,59 +4,43 @@ #include "DiscIO/TGCBlob.h" +#include #include #include +#include #include +#include #include "Common/File.h" #include "Common/Swap.h" namespace { -template -struct Interval -{ - T start; - T length; - - T End() const { return start + length; } - bool IsEmpty() const { return length == 0; } -}; - -template -void SplitInterval(T split_point, Interval interval, Interval* out_1, Interval* out_2) -{ - if (interval.start < split_point) - *out_1 = {interval.start, std::min(interval.length, split_point - interval.start)}; - else - *out_1 = {0, 0}; - - if (interval.End() > split_point) - { - *out_2 = {std::max(interval.start, split_point), - std::min(interval.length, interval.End() - split_point)}; - } - else - { - *out_2 = {0, 0}; - } -} - u32 SubtractBE32(u32 minuend_be, u32 subtrahend_le) { return Common::swap32(Common::swap32(minuend_be) - subtrahend_le); } -void Replace8(u64 offset, u64 nbytes, u8* out_ptr, u64 replace_offset, u8 replace_value) +void Replace(u64 offset, u64 size, u8* out_ptr, u64 replace_offset, u64 replace_size, + const u8* replace_ptr) { - if (offset <= replace_offset && offset + nbytes > replace_offset) - out_ptr[replace_offset - offset] = replace_value; + const u64 replace_start = std::max(offset, replace_offset); + const u64 replace_end = std::min(offset + size, replace_offset + replace_size); + + if (replace_end > replace_start) + { + std::copy(replace_ptr + (replace_start - replace_offset), + replace_ptr + (replace_end - replace_offset), out_ptr + (replace_start - offset)); + } } -void Replace32(u64 offset, u64 nbytes, u8* out_ptr, u64 replace_offset, u32 replace_value) +template +void Replace(u64 offset, u64 size, u8* out_ptr, u64 replace_offset, const T& replace_value) { - for (size_t i = 0; i < sizeof(u32); ++i) - Replace8(offset, nbytes, out_ptr, replace_offset + i, reinterpret_cast(&replace_value)[i]); + static_assert(std::is_trivially_copyable_v); + + const u8* replace_ptr = reinterpret_cast(&replace_value); + Replace(offset, size, out_ptr, replace_offset, sizeof(T), replace_ptr); } } // namespace @@ -75,70 +59,59 @@ TGCFileReader::TGCFileReader(File::IOFile file) : m_file(std::move(file)) { m_file.Seek(0, SEEK_SET); m_file.ReadArray(&m_header, 1); - u32 header_size = Common::swap32(m_header.tgc_header_size); + m_size = m_file.GetSize(); - m_file_area_shift = static_cast(Common::swap32(m_header.file_area_virtual_offset)) - - Common::swap32(m_header.file_area_real_offset) + header_size; + + const u32 fst_offset = Common::swap32(m_header.fst_real_offset); + const u32 fst_size = Common::swap32(m_header.fst_size); + m_fst.resize(fst_size); + if (!m_file.Seek(fst_offset, SEEK_SET) || !m_file.ReadBytes(m_fst.data(), m_fst.size())) + m_fst.clear(); + + constexpr size_t FST_ENTRY_SIZE = 12; + if (m_fst.size() < FST_ENTRY_SIZE) + return; + + // This calculation can overflow, but this is not a problem, because in that case + // the old_offset + file_area_shift calculation later also overflows, cancelling it out + const u32 file_area_shift = Common::swap32(m_header.file_area_real_offset) - + Common::swap32(m_header.file_area_virtual_offset) - + Common::swap32(m_header.tgc_header_size); + + const size_t claimed_fst_entries = Common::swap32(m_fst.data() + 8); + const size_t fst_entries = std::min(claimed_fst_entries, m_fst.size() / FST_ENTRY_SIZE); + for (size_t i = 0; i < fst_entries; ++i) + { + // If this is a file (as opposed to a directory)... + if (m_fst[i * FST_ENTRY_SIZE] == 0) + { + // ...change its offset + const u32 old_offset = Common::swap32(m_fst.data() + i * FST_ENTRY_SIZE + 4); + const u32 new_offset = Common::swap32(old_offset + file_area_shift); + Replace(0, m_fst.size(), m_fst.data(), i * FST_ENTRY_SIZE + 4, new_offset); + } + } } u64 TGCFileReader::GetDataSize() const { - return m_size + Common::swap32(m_header.file_area_virtual_offset) - - Common::swap32(m_header.file_area_real_offset); + return m_size - Common::swap32(m_header.tgc_header_size); } bool TGCFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) -{ - Interval first_part = {0, 0}; - Interval empty_part = {0, 0}; - Interval file_part = {0, 0}; - - const u32 tgc_header_size = Common::swap32(m_header.tgc_header_size); - const u64 split_point = Common::swap32(m_header.file_area_real_offset) - tgc_header_size; - SplitInterval(split_point, Interval{offset, nbytes}, &first_part, &file_part); - if (m_file_area_shift > tgc_header_size) - { - SplitInterval(static_cast(m_file_area_shift - tgc_header_size), file_part, &empty_part, - &file_part); - } - - // Offsets in the initial areas of the disc are unshifted - // (except for InternalRead's constant shift by tgc_header_size). - if (!first_part.IsEmpty()) - { - if (!InternalRead(first_part.start, first_part.length, out_ptr + (first_part.start - offset))) - return false; - } - - // The data between the file area and the area that precedes it is treated as all zeroes. - // The game normally won't attempt to access this part of the virtual disc, but let's not return - // an error if it gets accessed, in case someone wants to copy or hash the whole virtual disc. - if (!empty_part.IsEmpty()) - std::fill_n(out_ptr + (empty_part.start - offset), empty_part.length, 0); - - // Offsets in the file area are shifted by m_file_area_shift. - if (!file_part.IsEmpty()) - { - if (!InternalRead(file_part.start - m_file_area_shift, file_part.length, - out_ptr + (file_part.start - offset))) - { - return false; - } - } - - return true; -} - -bool TGCFileReader::InternalRead(u64 offset, u64 nbytes, u8* out_ptr) { const u32 tgc_header_size = Common::swap32(m_header.tgc_header_size); if (m_file.Seek(offset + tgc_header_size, SEEK_SET) && m_file.ReadBytes(out_ptr, nbytes)) { - Replace32(offset, nbytes, out_ptr, 0x420, - SubtractBE32(m_header.dol_real_offset, tgc_header_size)); - Replace32(offset, nbytes, out_ptr, 0x424, - SubtractBE32(m_header.fst_real_offset, tgc_header_size)); + const u32 replacement_dol_offset = SubtractBE32(m_header.dol_real_offset, tgc_header_size); + const u32 replacement_fst_offset = SubtractBE32(m_header.fst_real_offset, tgc_header_size); + + Replace(offset, nbytes, out_ptr, 0x0420, replacement_dol_offset); + Replace(offset, nbytes, out_ptr, 0x0424, replacement_fst_offset); + Replace(offset, nbytes, out_ptr, Common::swap32(replacement_fst_offset), m_fst.size(), + m_fst.data()); + return true; } diff --git a/Source/Core/DiscIO/TGCBlob.h b/Source/Core/DiscIO/TGCBlob.h index 101e969c89..302a0926f4 100644 --- a/Source/Core/DiscIO/TGCBlob.h +++ b/Source/Core/DiscIO/TGCBlob.h @@ -4,9 +4,9 @@ #pragma once -#include #include #include +#include #include "Common/CommonTypes.h" #include "Common/File.h" @@ -57,12 +57,10 @@ public: private: TGCFileReader(File::IOFile file); - bool InternalRead(u64 offset, u64 nbytes, u8* out_ptr); - File::IOFile m_file; u64 m_size; - s64 m_file_area_shift; + std::vector m_fst; // Stored as big endian in memory, regardless of the host endianness TGCHeader m_header = {}; diff --git a/Source/Core/DolphinQt/GameList/GameList.cpp b/Source/Core/DolphinQt/GameList/GameList.cpp index 0b1d480375..7acc5c468a 100644 --- a/Source/Core/DolphinQt/GameList/GameList.cpp +++ b/Source/Core/DolphinQt/GameList/GameList.cpp @@ -263,18 +263,13 @@ void GameList::ShowContextMenu(const QPoint&) QMenu* menu = new QMenu(this); - const auto can_convert = [](const std::shared_ptr& game) { - // Converting from TGC is temporarily disabled because PR #8738 was merged prematurely. - // The TGC check will be removed by PR #8644. - return DiscIO::IsDisc(game->GetPlatform()) && game->IsVolumeSizeAccurate() && - game->GetBlobType() != DiscIO::BlobType::TGC; - }; - if (HasMultipleSelected()) { const auto selected_games = GetSelectedGames(); - if (std::all_of(selected_games.begin(), selected_games.end(), can_convert)) + if (std::all_of(selected_games.begin(), selected_games.end(), [](const auto& game) { + return DiscIO::IsDisc(game->GetPlatform()) && game->IsVolumeSizeAccurate(); + })) { menu->addAction(tr("Convert Selected Files..."), this, &GameList::ConvertFile); menu->addSeparator(); @@ -306,7 +301,7 @@ void GameList::ShowContextMenu(const QPoint&) { menu->addAction(tr("Set as &Default ISO"), this, &GameList::SetDefaultISO); - if (can_convert(game)) + if (game->IsVolumeSizeAccurate()) menu->addAction(tr("Convert File..."), this, &GameList::ConvertFile); QAction* change_disc = menu->addAction(tr("Change &Disc"), this, &GameList::ChangeDisc);