mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-16 05:42:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5574 from leoetlino/fix-dol-export

Browse Source 
DiscIO: Use the correct offset shift for DOL exports
This commit is contained in:
JosJuice 2017-06-07 22:48:37 +02:00 committed by GitHub
commit d7faba58cc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DiscIO/FileSystemGCWii.cpp
View File

@ -77,10 +77,10 @@ u64 FileSystemGCWii::ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _
u64 read_length = std::min(_MaxBufferSize, pFileInfo->m_FileSize - _OffsetInFile); u64 read_length = std::min(_MaxBufferSize, pFileInfo->m_FileSize - _OffsetInFile);
DEBUG_LOG( DEBUG_LOG(DISCIO, "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64
DISCIO, " Size: %" PRIx64,
"Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 " Size: %" PRIx64, read_length, _OffsetInFile, _rFullPath.c_str(), pFileInfo->m_Offset,
read_length, _OffsetInFile, _rFullPath.c_str(), pFileInfo->m_Offset, pFileInfo->m_FileSize); pFileInfo->m_FileSize);
m_rVolume->Read(pFileInfo->m_Offset + _OffsetInFile, read_length, _pBuffer, m_partition); m_rVolume->Read(pFileInfo->m_Offset + _OffsetInFile, read_length, _pBuffer, m_partition);
return read_length; return read_length;
@ -155,7 +155,7 @@ bool FileSystemGCWii::ExportApploader(const std::string& _rExportFolder) const
std::optional<u64> FileSystemGCWii::GetBootDOLOffset() const std::optional<u64> FileSystemGCWii::GetBootDOLOffset() const
{ {
std::optional<u32> offset = m_rVolume->ReadSwapped<u32>(0x420, m_partition); std::optional<u32> offset = m_rVolume->ReadSwapped<u32>(0x420, m_partition);
return offset ? static_cast<u64>(*offset) << 2 : std::optional<u64>(); return offset ? static_cast<u64>(*offset) << m_offset_shift : std::optional<u64>();
} }
std::optional<u32> FileSystemGCWii::GetBootDOLSize(u64 dol_offset) const std::optional<u32> FileSystemGCWii::GetBootDOLSize(u64 dol_offset) const