Merge 0f1c3732df into 1ae0b23265

Source/Core/DiscIO/DirectoryBlob.h

@@ -310,7 +310,7 @@ private:
   void SetPartitions(std::vector<PartitionWithType>&& partitions);
   void SetPartitionHeader(DirectoryBlobPartition* partition, u64 partition_address);
 
-  DiscIO::VolumeDisc* GetWrappedVolume() { return m_wrapped_volume.get(); }
+  DiscIO::VolumeDisc* GetWrappedVolume() const { return m_wrapped_volume.get(); }
 
   // For GameCube:
   DirectoryBlobPartition m_gamecube_pseudopartition;

Source/Core/DiscIO/NANDImporter.cpp

@@ -168,7 +168,7 @@ void NANDImporter::ProcessEntry(u16 entry_number, const std::string& parent_path
   }
 }
 
-std::vector<u8> NANDImporter::GetEntryData(const NANDFSTEntry& entry)
+std::vector<u8> NANDImporter::GetEntryData(const NANDFSTEntry& entry) const
 {
   constexpr size_t NAND_FAT_BLOCK_SIZE = 0x4000;
 
@@ -198,7 +198,7 @@ std::vector<u8> NANDImporter::GetEntryData(const NANDFSTEntry& entry)
   return data;
 }
 
-bool NANDImporter::ExtractCertificates()
+bool NANDImporter::ExtractCertificates() const
 {
   const std::string content_dir = m_nand_root + "/title/00000001/0000000d/content/";
 

Source/Core/DiscIO/NANDImporter.h

@@ -28,7 +28,7 @@ public:
   // get_otp_dump_path will be called to get a path to it.
   void ImportNANDBin(const std::string& path_to_bin, std::function<void()> update_callback,
                      std::function<std::string()> get_otp_dump_path);
-  bool ExtractCertificates();
+  bool ExtractCertificates() const;
 
   enum class Type
   {
@@ -69,7 +69,7 @@ private:
   std::string GetPath(const NANDFSTEntry& entry, const std::string& parent_path);
   std::string FormatDebugString(const NANDFSTEntry& entry);
   void ProcessEntry(u16 entry_number, const std::string& parent_path);
-  std::vector<u8> GetEntryData(const NANDFSTEntry& entry);
+  std::vector<u8> GetEntryData(const NANDFSTEntry& entry) const;
   void ExportKeys();
 
   std::string m_nand_root;

Source/Core/DiscIO/NFSBlob.cpp

@@ -184,7 +184,7 @@ u64 NFSFileReader::GetRawSize() const
   return m_raw_size;
 }
 
-u64 NFSFileReader::ToPhysicalBlockIndex(u64 logical_block_index)
+u64 NFSFileReader::ToPhysicalBlockIndex(u64 logical_block_index) const
 {
   u64 physical_blocks_so_far = 0;
 

Source/Core/DiscIO/NFSBlob.h

@@ -73,7 +73,7 @@ private:
   NFSFileReader(std::vector<NFSLBARange> lba_ranges, std::vector<File::IOFile> files, Key key,
                 u64 raw_size);
 
-  u64 ToPhysicalBlockIndex(u64 logical_block_index);
+  u64 ToPhysicalBlockIndex(u64 logical_block_index) const;
   bool ReadEncryptedBlock(u64 physical_block_index);
   void DecryptBlock(u64 logical_block_index);
   bool ReadAndDecryptBlock(u64 logical_block_index);

Source/Core/DiscIO/RiivolutionPatcher.cpp

@@ -57,7 +57,7 @@ FileDataLoaderHostFS::FileDataLoaderHostFS(std::string sd_root, const std::strin
 }
 
 std::optional<std::string>
-FileDataLoaderHostFS::MakeAbsoluteFromRelative(std::string_view external_relative_path)
+FileDataLoaderHostFS::MakeAbsoluteFromRelative(std::string_view external_relative_path) const
 {
 #ifdef _WIN32
   // Riivolution treats a backslash as just a standard filename character, but we can't replicate

Source/Core/DiscIO/RiivolutionPatcher.h

@@ -65,7 +65,8 @@ public:
   ResolveSavegameRedirectPath(std::string_view external_relative_path) override;
 
 private:
-  std::optional<std::string> MakeAbsoluteFromRelative(std::string_view external_relative_path);
+  std::optional<std::string>
+  MakeAbsoluteFromRelative(std::string_view external_relative_path) const;
 
   std::string m_sd_root;
   std::string m_patch_root;

Source/Core/DiscIO/WbfsBlob.h

@@ -44,7 +44,7 @@ private:
   bool ReadHeader();
 
   File::IOFile& SeekToCluster(u64 offset, u64* available);
-  bool IsGood() { return m_good; }
+  bool IsGood() const { return m_good; }
   struct FileEntry
   {
     FileEntry(File::IOFile file_, u64 base_address_, u64 size_)