midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HLE/FS: Use IPCHelper in RenameFile.

Browse Source
This commit is contained in:
Subv 2017-12-09 12:46:37 -05:00
parent a6c69bfca0
commit b631f77d11
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/hle/service/fs/fs_user.cpp
View File

@ -203,17 +203,17 @@ static void DeleteFile(Service::Interface* self) {
* 1 : Result of function, 0 on success, otherwise error code * 1 : Result of function, 0 on success, otherwise error code
*/ */
static void RenameFile(Service::Interface* self) { static void RenameFile(Service::Interface* self) {
u32* cmd_buff = Kernel::GetCommandBuffer(); IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x805, 9, 4);
rp.Skip(1, false); // TransactionId
ArchiveHandle src_archive_handle = MakeArchiveHandle(cmd_buff[2], cmd_buff[3]); ArchiveHandle src_archive_handle = rp.PopRaw<ArchiveHandle>();
auto src_filename_type = static_cast<FileSys::LowPathType>(cmd_buff[4]); auto src_filename_type = rp.PopEnum<FileSys::LowPathType>();
u32 src_filename_size = cmd_buff[5]; u32 src_filename_size = rp.Pop<u32>();
ArchiveHandle dest_archive_handle = MakeArchiveHandle(cmd_buff[6], cmd_buff[7]); ArchiveHandle dest_archive_handle = rp.PopRaw<ArchiveHandle>();
; auto dest_filename_type = rp.PopEnum<FileSys::LowPathType>();
auto dest_filename_type = static_cast<FileSys::LowPathType>(cmd_buff[8]); u32 dest_filename_size = rp.Pop<u32>();
u32 dest_filename_size = cmd_buff[9]; u32 src_filename_ptr = rp.PopStaticBuffer(nullptr);
u32 src_filename_ptr = cmd_buff[11]; u32 dest_filename_ptr = rp.PopStaticBuffer(nullptr);
u32 dest_filename_ptr = cmd_buff[13];
FileSys::Path src_file_path(src_filename_type, src_filename_size, src_filename_ptr); FileSys::Path src_file_path(src_filename_type, src_filename_size, src_filename_ptr);
FileSys::Path dest_file_path(dest_filename_type, dest_filename_size, dest_filename_ptr); FileSys::Path dest_file_path(dest_filename_type, dest_filename_size, dest_filename_ptr);
@ -224,9 +224,9 @@ static void RenameFile(Service::Interface* self) {
src_file_path.DebugStr().c_str(), static_cast<u32>(dest_filename_type), src_file_path.DebugStr().c_str(), static_cast<u32>(dest_filename_type),
dest_filename_size, dest_file_path.DebugStr().c_str()); dest_filename_size, dest_file_path.DebugStr().c_str());
cmd_buff[1] = RenameFileBetweenArchives(src_archive_handle, src_file_path, dest_archive_handle, IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
dest_file_path) rb.Push(RenameFileBetweenArchives(src_archive_handle, src_file_path, dest_archive_handle,
.raw; dest_file_path));
} }
/* /*