The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-03 11:32:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Save folder memory card header to disk

Browse Source 
This way the memory card won't be recognized as a completely different memory card every game session, which can matter for some save files that use this information as copy protection.

This likely works around https://bugs.dolphin-emu.org/issues/12781 for saves created after this change only, though I have not verified this.
This commit is contained in:
Admiral H. Curtiss 2024-12-22 19:17:14 +01:00
parent 1ba8541da9
commit c5f1961587
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
View File

@ -38,7 +38,7 @@
#include "Core/HW/Sram.h" #include "Core/HW/Sram.h"
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"
static const char* MC_HDR = "MC_SYSTEM_AREA"; static constexpr char HEADER_FILENAME[] = "header.bin";
static std::string GenerateDefaultGCIFilename(const Memcard::DEntry& entry, static std::string GenerateDefaultGCIFilename(const Memcard::DEntry& entry,
bool card_encoding_is_shift_jis) bool card_encoding_is_shift_jis)
@ -186,7 +186,21 @@ GCMemcardDirectory::GCMemcardDirectory(const std::string& directory, ExpansionIn
{ {
// Use existing header data if available // Use existing header data if available
{ {
File::IOFile((m_save_directory + MC_HDR), "rb").ReadBytes(&m_hdr, Memcard::BLOCK_SIZE); File::IOFile header_file(m_save_directory + HEADER_FILENAME, "rb");
if (header_file.IsOpen())
{
Memcard::Header tmp_hdr;
if (header_file.ReadBytes(&tmp_hdr, Memcard::BLOCK_SIZE))
{
m_hdr = tmp_hdr;
// Overwrite the memory card size and encoding so that always matches what we want, even if
// the header on disk has something different.
m_hdr.m_data.m_size_mb = header_data.m_size_mb;
m_hdr.m_data.m_encoding = header_data.m_encoding;
m_hdr.FixChecksums();
}
}
} }
const bool current_game_only = Config::Get(Config::SESSION_GCI_FOLDER_CURRENT_GAME_ONLY); const bool current_game_only = Config::Get(Config::SESSION_GCI_FOLDER_CURRENT_GAME_ONLY);
@ -709,12 +723,18 @@ void GCMemcardDirectory::FlushToFile()
save.m_save_data.clear(); save.m_save_data.clear();
} }
} }
#if _WRITE_MC_HEADER
u8 mc[BLOCK_SIZE * MC_FST_BLOCKS]; std::string header_filename = m_save_directory + HEADER_FILENAME;
Read(0, BLOCK_SIZE * MC_FST_BLOCKS, mc); File::IOFile header_file(header_filename, "wb");
File::IOFile hdrfile(m_save_directory + MC_HDR, "wb"); if (!header_file.IsOpen())
hdrfile.WriteBytes(mc, BLOCK_SIZE * MC_FST_BLOCKS); {
#endif ERROR_LOG_FMT(EXPANSIONINTERFACE, "Failed to open file at {} for writing", header_filename);
return;
}
if (!header_file.WriteBytes(&m_hdr, Memcard::BLOCK_SIZE))
{
ERROR_LOG_FMT(EXPANSIONINTERFACE, "Failed to write header to {}", header_filename);
}
} }
void GCMemcardDirectory::DoState(PointerWrap& p) void GCMemcardDirectory::DoState(PointerWrap& p)

2
Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.h
View File

@ -14,8 +14,6 @@
#include "Core/HW/GCMemcard/GCMemcardBase.h" #include "Core/HW/GCMemcard/GCMemcardBase.h"
#include "DiscIO/Enums.h" #include "DiscIO/Enums.h"
// Uncomment this to write the system data of the memorycard from directory to disc
//#define _WRITE_MC_HEADER 1
void MigrateFromMemcardFile(const std::string& directory_name, ExpansionInterface::Slot card_slot, void MigrateFromMemcardFile(const std::string& directory_name, ExpansionInterface::Slot card_slot,
DiscIO::Region region); DiscIO::Region region);