From bdaac718acf553da4b5f32d77886e212b4bc8967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Sat, 27 Feb 2021 21:13:29 +0100
Subject: [PATCH] IOS/FS: Expose some more ioctls for internal Dolphin use

---
 Source/Core/Core/IOS/FS/FileSystemProxy.cpp | 52 ++++++++++++++++-----
 Source/Core/Core/IOS/FS/FileSystemProxy.h   |  6 +++
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/Source/Core/Core/IOS/FS/FileSystemProxy.cpp b/Source/Core/Core/IOS/FS/FileSystemProxy.cpp
index bc6c400288..1f8b017abb 100644
--- a/Source/Core/Core/IOS/FS/FileSystemProxy.cpp
+++ b/Source/Core/Core/IOS/FS/FileSystemProxy.cpp
@@ -610,15 +610,35 @@ IPCReply FSDevice::GetAttribute(const Handle& handle, const IOCtlRequest& reques
   return GetFSReply(IPC_SUCCESS, ticks);
 }
 
+FS::ResultCode FSDevice::DeleteFile(FS::Uid uid, FS::Gid gid, const std::string& path, Ticks ticks)
+{
+  ticks.Add(IPC_OVERHEAD_TICKS);
+
+  const ResultCode result = m_ios.GetFS()->Delete(uid, gid, path);
+  ticks.Add(GetSuperblockWriteTbTicks(m_ios.GetVersion()));
+  LogResult(result, "Delete({})", path);
+  return result;
+}
+
 IPCReply FSDevice::DeleteFile(const Handle& handle, const IOCtlRequest& request)
 {
   if (request.buffer_in_size < 64)
     return GetFSReply(ConvertResult(ResultCode::Invalid));
 
   const std::string path = Memory::GetString(request.buffer_in, 64);
-  const ResultCode result = m_ios.GetFS()->Delete(handle.uid, handle.gid, path);
-  LogResult(result, "Delete({})", path);
-  return GetReplyForSuperblockOperation(m_ios.GetVersion(), result);
+  return MakeIPCReply(
+      [&](Ticks ticks) { return ConvertResult(DeleteFile(handle.uid, handle.gid, path, ticks)); });
+}
+
+FS::ResultCode FSDevice::RenameFile(FS::Uid uid, FS::Gid gid, const std::string& old_path,
+                                    const std::string& new_path, Ticks ticks)
+{
+  ticks.Add(IPC_OVERHEAD_TICKS);
+
+  const ResultCode result = m_ios.GetFS()->Rename(uid, gid, old_path, new_path);
+  ticks.Add(GetSuperblockWriteTbTicks(m_ios.GetVersion()));
+  LogResult(result, "Rename({}, {})", old_path, new_path);
+  return result;
 }
 
 IPCReply FSDevice::RenameFile(const Handle& handle, const IOCtlRequest& request)
@@ -628,9 +648,20 @@ IPCReply FSDevice::RenameFile(const Handle& handle, const IOCtlRequest& request)
 
   const std::string old_path = Memory::GetString(request.buffer_in, 64);
   const std::string new_path = Memory::GetString(request.buffer_in + 64, 64);
-  const ResultCode result = m_ios.GetFS()->Rename(handle.uid, handle.gid, old_path, new_path);
-  LogResult(result, "Rename({}, {})", old_path, new_path);
-  return GetReplyForSuperblockOperation(m_ios.GetVersion(), result);
+  return MakeIPCReply([&](Ticks ticks) {
+    return ConvertResult(RenameFile(handle.uid, handle.gid, old_path, new_path, ticks));
+  });
+}
+
+FS::ResultCode FSDevice::CreateFile(FS::Uid uid, FS::Gid gid, const std::string& path,
+                                    FS::FileAttribute attribute, FS::Modes modes, Ticks ticks)
+{
+  ticks.Add(IPC_OVERHEAD_TICKS);
+
+  const ResultCode result = m_ios.GetFS()->CreateFile(uid, gid, path, attribute, modes);
+  ticks.Add(GetSuperblockWriteTbTicks(m_ios.GetVersion()));
+  LogResult(result, "CreateFile({})", path);
+  return result;
 }
 
 IPCReply FSDevice::CreateFile(const Handle& handle, const IOCtlRequest& request)
@@ -638,11 +669,10 @@ IPCReply FSDevice::CreateFile(const Handle& handle, const IOCtlRequest& request)
   const auto params = GetParams<ISFSParams>(request);
   if (!params)
     return GetFSReply(ConvertResult(params.Error()));
-
-  const ResultCode result = m_ios.GetFS()->CreateFile(handle.uid, handle.gid, params->path,
-                                                      params->attribute, params->modes);
-  LogResult(result, "CreateFile({})", params->path);
-  return GetReplyForSuperblockOperation(m_ios.GetVersion(), result);
+  return MakeIPCReply([&](Ticks ticks) {
+    return ConvertResult(
+        CreateFile(handle.uid, handle.gid, params->path, params->attribute, params->modes));
+  });
 }
 
 IPCReply FSDevice::SetFileVersionControl(const Handle& handle, const IOCtlRequest& request)
diff --git a/Source/Core/Core/IOS/FS/FileSystemProxy.h b/Source/Core/Core/IOS/FS/FileSystemProxy.h
index 101dbdffc2..450422d1b1 100644
--- a/Source/Core/Core/IOS/FS/FileSystemProxy.h
+++ b/Source/Core/Core/IOS/FS/FileSystemProxy.h
@@ -35,7 +35,13 @@ public:
   s32 Write(u64 fd, const u8* data, u32 size, std::optional<u32> ipc_buffer_addr = {},
             Ticks ticks = {});
   s32 Seek(u64 fd, u32 offset, FS::SeekMode mode, Ticks ticks = {});
+
   FS::Result<FS::FileStatus> GetFileStatus(u64 fd, Ticks ticks = {});
+  FS::ResultCode RenameFile(FS::Uid uid, FS::Gid gid, const std::string& old_path,
+                            const std::string& new_path, Ticks ticks = {});
+  FS::ResultCode DeleteFile(FS::Uid uid, FS::Gid gid, const std::string& path, Ticks ticks = {});
+  FS::ResultCode CreateFile(FS::Uid uid, FS::Gid gid, const std::string& path,
+                            FS::FileAttribute attribute, FS::Modes modes, Ticks ticks = {});
 
   template <typename T>
   s32 Read(u64 fd, T* data, size_t count, Ticks ticks = {})