The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 15:01:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1700 from JosJuice/discio-clear-error

Browse Source 
DiscIO: Clear error status when reading file
This commit is contained in:
skidau 2014-12-16 13:09:03 +11:00
commit 7b5b76caa4
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DiscIO/CISOBlob.cpp
View File

@ -66,7 +66,10 @@ bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
u64 const file_off = CISO_HEADER_SIZE + m_ciso_map[block] * (u64)m_block_size + data_offset; u64 const file_off = CISO_HEADER_SIZE + m_ciso_map[block] * (u64)m_block_size + data_offset;
if (!(m_file.Seek(file_off, SEEK_SET) && m_file.ReadArray(out_ptr, bytes_to_read))) if (!(m_file.Seek(file_off, SEEK_SET) && m_file.ReadArray(out_ptr, bytes_to_read)))
{
m_file.Clear();
return false; return false;
}
} }
else else
{ {

11
Source/Core/DiscIO/FileBlob.cpp
View File

@ -25,8 +25,15 @@ PlainFileReader* PlainFileReader::Create(const std::string& filename)
bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
{ {
m_file.Seek(offset, SEEK_SET); if (m_file.Seek(offset, SEEK_SET) && m_file.ReadBytes(out_ptr, nbytes))
return m_file.ReadBytes(out_ptr, nbytes); {
return true;
}
else
{
m_file.Clear();
return false;
}
} }
} // namespace } // namespace

6
Source/Core/DiscIO/WbfsBlob.cpp
View File

@ -130,7 +130,11 @@ bool WbfsFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
File::IOFile& data_file = SeekToCluster(offset, &read_size); File::IOFile& data_file = SeekToCluster(offset, &read_size);
read_size = (read_size > nbytes) ? nbytes : read_size; read_size = (read_size > nbytes) ? nbytes : read_size;
data_file.ReadBytes(out_ptr, read_size); if (!data_file.ReadBytes(out_ptr, read_size))
{
data_file.Clear();
return false;
}
out_ptr += read_size; out_ptr += read_size;
nbytes -= read_size; nbytes -= read_size;