From 3014dadfa8c2065f81009895ecf81396de5120bc Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 21 Mar 2019 22:20:23 +0100 Subject: DiscIO: Add way of checking whether blob data size is accurate --- Source/Core/DiscIO/VolumeGC.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Source/Core/DiscIO/VolumeGC.cpp') diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index e3db29c1f5..67cf71072e 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -179,6 +179,11 @@ u64 VolumeGC::GetSize() const return m_reader->GetDataSize(); } +bool VolumeGC::IsSizeAccurate() const +{ + return m_reader->IsDataSizeAccurate(); +} + u64 VolumeGC::GetRawSize() const { return m_reader->GetRawSize(); -- cgit v1.2.3 From c885fed9da6f6b0c5862b99904bbb5edbba144fe Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 22 Mar 2019 20:47:05 +0100 Subject: DiscIO: Make Korean GC checks in Enums.cpp less fragile --- Source/Core/DiscIO/VolumeGC.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Source/Core/DiscIO/VolumeGC.cpp') diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 67cf71072e..6d9a48cd0e 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -97,11 +97,12 @@ Country VolumeGC::GetCountry(const Partition& partition) const // The 0 that we use as a default value is mapped to Country::Unknown and Region::Unknown const u8 country = ReadSwapped(3, partition).value_or(0); const Region region = GetRegion(); + const std::optional revision = GetRevision(); - if (CountryCodeToRegion(country, Platform::GameCubeDisc, region) != region) + if (CountryCodeToRegion(country, Platform::GameCubeDisc, region, revision) != region) return TypicalCountryForRegion(region); - return CountryCodeToCountry(country, Platform::GameCubeDisc, region); + return CountryCodeToCountry(country, Platform::GameCubeDisc, region, revision); } std::string VolumeGC::GetMakerID(const Partition& partition) const -- cgit v1.2.3