ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7988 from JosJuice/fix-wii-save-import 

Fix importing Wii save files with sizes not divisible by 64
This commit is contained in:
JosJuice 2019-04-14 17:17:00 +02:00 committed by GitHub
parent 0f8e5ab207 4f915760e8
commit d7b5270348
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/HW/WiiSave.cpp
View File

@ -311,17 +311,20 @@ public:
std::string{file_hdr.name.data(), strnlen(file_hdr.name.data(), file_hdr.name.size())}; std::string{file_hdr.name.data(), strnlen(file_hdr.name.data(), file_hdr.name.size())};
if (type == SaveFile::Type::File) if (type == SaveFile::Type::File)
{ {
const u32 rounded_size = Common::AlignUp<u32>(file_hdr.size, BLOCK_SZ); const u32 size = file_hdr.size;
const u32 rounded_size = Common::AlignUp<u32>(size, BLOCK_SZ);
const u64 pos = m_file.Tell(); const u64 pos = m_file.Tell();
std::array<u8, 0x10> iv = file_hdr.iv; std::array<u8, 0x10> iv = file_hdr.iv;
save_file.data = [this, rounded_size, iv, pos]() mutable -> std::optional<std::vector<u8>> { save_file.data = [this, size, rounded_size, iv,
pos]() mutable -> std::optional<std::vector<u8>> {
std::vector<u8> file_data(rounded_size); std::vector<u8> file_data(rounded_size);
if (!m_file.Seek(pos, SEEK_SET) || !m_file.ReadBytes(file_data.data(), rounded_size)) if (!m_file.Seek(pos, SEEK_SET) || !m_file.ReadBytes(file_data.data(), rounded_size))
return {}; return {};
m_iosc.Decrypt(IOS::HLE::IOSC::HANDLE_SD_KEY, iv.data(), file_data.data(), rounded_size, m_iosc.Decrypt(IOS::HLE::IOSC::HANDLE_SD_KEY, iv.data(), file_data.data(), rounded_size,
file_data.data(), IOS::PID_ES); file_data.data(), IOS::PID_ES);
file_data.resize(size);
return file_data; return file_data;
}; };
m_file.Seek(pos + rounded_size, SEEK_SET); m_file.Seek(pos + rounded_size, SEEK_SET);