prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix puyo regression

Browse Source
This commit is contained in:
Zach Hilman
2018-07-18 14:24:36 -04:00
parent 7f68a2fa12
commit d6a33450bd
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/hle/service/filesystem/fsp_srv.cpp
View File

@@ -110,7 +110,7 @@ private:
IPC::ResponseBuilder rb{ctx, 4}; IPC::ResponseBuilder rb{ctx, 4};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.Push(output.size()); rb.Push(static_cast<u64>(output.size()));
} }
void Write(Kernel::HLERequestContext& ctx) { void Write(Kernel::HLERequestContext& ctx) {
@@ -134,12 +134,23 @@ private:
} }
std::vector<u8> data = ctx.ReadBuffer(); std::vector<u8> data = ctx.ReadBuffer();
data.resize(length); std::vector<u8> actual_data(length);
ASSERT_MSG(
data.size() <= length,
"Attempting to write more data than requested (requested={:016X}, actual={:016X}).",
length, data.size());
std::copy(data.begin(), data.end(), actual_data.begin());
// Write the data to the Storage backend // Write the data to the Storage backend
auto res = MakeResult<size_t>(backend->WriteBytes(data, offset)); auto written = backend->WriteBytes(data, offset);
ASSERT_MSG(written == length,
"Could not write all bytes to file (requested={:016X}, actual={:016X}).", length,
written);
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(res.Code()); rb.Push(RESULT_SUCCESS);
} }
void Flush(Kernel::HLERequestContext& ctx) { void Flush(Kernel::HLERequestContext& ctx) {
@@ -194,6 +205,7 @@ public:
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
// TODO(DarkLordZach): Verify that this is the correct behavior.
// Build entry index now to save time later. // Build entry index now to save time later.
BuildEntryIndex(entries, backend->GetFiles(), FileSys::File); BuildEntryIndex(entries, backend->GetFiles(), FileSys::File);
BuildEntryIndex(entries, backend->GetSubdirectories(), FileSys::Directory); BuildEntryIndex(entries, backend->GetSubdirectories(), FileSys::Directory);