fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[VFS/STFS] Check fread return values, add SVOD local structs

Browse Source 
A few minor improvements to StfsContainerDevice too, and now StfsContainerFile::ReadSync will set out_bytes_read to the actual
number of bytes read
This commit is contained in:
emoose
2021-05-11 03:33:33 +01:00
committed by Rick Gibbed
parent 478bb90922
commit 422fc4f24e
3 changed files with 151 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/vfs/devices/stfs_container_file.cc
View File

@@ -37,8 +37,8 @@ X_STATUS StfsContainerFile::ReadSync(void* buffer, size_t buffer_length,
uint8_t* p = reinterpret_cast<uint8_t*>(buffer);
size_t remaining_length =
std::min(buffer_length, entry_->size() - byte_offset);
*out_bytes_read = remaining_length;
*out_bytes_read = 0;
for (size_t i = 0; i < entry_->block_list().size(); i++) {
auto& record = entry_->block_list()[i];
if (src_offset + record.length <= byte_offset) {
@@ -54,9 +54,10 @@ X_STATUS StfsContainerFile::ReadSync(void* buffer, size_t buffer_length,
auto& file = entry_->files()->at(record.file);
xe::filesystem::Seek(file, record.offset + read_offset, SEEK_SET);
fread(p, 1, read_length, file);
auto num_read = fread(p, 1, read_length, file);
p += read_length;
*out_bytes_read += num_read;
p += num_read;
src_offset += record.length;
remaining_length -= read_length;
if (remaining_length == 0) {