Add RomFsController::OpenRomFSCurrentProcess

Author: N3xoX1

src/nxemu-loader/core/file_sys/romfs_factory.cpp

@@ -74,6 +74,12 @@ RomFSFactoryPtr::~RomFSFactoryPtr()
 {
 }
 
+IVirtualFile * RomFSFactoryPtr::OpenCurrentProcess(uint64_t currentProcessTitleId) const
+{
+    UNIMPLEMENTED();
+    return nullptr;
+}
+
 void RomFSFactoryPtr::Release()
 {
     delete this;

src/nxemu-loader/core/file_sys/romfs_factory.h

@@ -79,6 +79,7 @@ class RomFSFactoryPtr :
     operator bool() const;
 
     // IRomFsController
+    IVirtualFile * OpenCurrentProcess(uint64_t currentProcessTitleId) const;
     void Release() override;
 
 private:

src/nxemu-module-spec/base.h

@@ -16,7 +16,7 @@
 
 enum
 {
-    MODULE_LOADER_SPECS_VERSION = 0x0102,
+    MODULE_LOADER_SPECS_VERSION = 0x0103,
     MODULE_VIDEO_SPECS_VERSION = 0x0101,
     MODULE_CPU_SPECS_VERSION = 0x0101,
     MODULE_OPERATING_SYSTEM_SPECS_VERSION = 0x0103,

src/nxemu-module-spec/system_loader.h

@@ -47,6 +47,7 @@ __interface ISaveDataFactory
 
 __interface IRomFsController
 {
+    IVirtualFile * OpenCurrentProcess(uint64_t currentProcessTitleId) const = 0;
     void Release();
 };
 

src/nxemu-os/core/file_sys/filesystem_interfaces.cpp

@@ -69,11 +69,22 @@ IVirtualDirectoryPtr::operator bool() const
     return m_directory != nullptr;
 }
 
+IVirtualFilePtr::IVirtualFilePtr() :
+    m_file(nullptr)
+{
+}
+
 IVirtualFilePtr::IVirtualFilePtr(IVirtualFile * file) :
     m_file(file)
 {
 }
 
+IVirtualFilePtr::IVirtualFilePtr(IVirtualFilePtr && other) noexcept
+{
+    m_file = other.m_file;
+    other.m_file = nullptr;
+}
+
 IVirtualFilePtr::~IVirtualFilePtr()
 {
     if (m_file != nullptr)
@@ -83,6 +94,27 @@ IVirtualFilePtr::~IVirtualFilePtr()
     m_file = nullptr;
 }
 
+IVirtualFilePtr & IVirtualFilePtr::operator=(IVirtualFile * ptr)
+{
+    if (m_file != ptr && m_file != nullptr)
+    {
+        m_file->Release();
+    }
+    m_file = ptr;
+    return *this;
+}
+
+IVirtualFilePtr & IVirtualFilePtr::operator=(IVirtualFilePtr && other) noexcept
+{
+    if (m_file != nullptr)
+    {
+        m_file->Release();
+    }
+    m_file = other.m_file;
+    other.m_file = nullptr;
+    return *this;
+}
+
 IVirtualFile * IVirtualFilePtr::operator->() const
 {
     return m_file;
@@ -240,4 +272,9 @@ IRomFsController ** RomFsControllerPtr::GetAddressForSet()
         m_ptr = nullptr;
     }
     return &m_ptr;
-}
+}
+
+IRomFsController * RomFsControllerPtr::operator->() const
+{
+    return m_ptr;
+}

src/nxemu-os/core/hle/service/filesystem/fsp/fsp_srv.cpp

@@ -235,6 +235,13 @@ Result FSP_SRV::OpenSaveDataTransferProhibiter(
 }
 
 Result FSP_SRV::OpenDataStorageByCurrentProcess(OutInterface<IStorage> out_interface) {
+    LOG_DEBUG(Service_FS, "called");
+
+    if (!romfs) {
+        auto current_romfs = romfs_controller->OpenRomFSCurrentProcess();
+        UNIMPLEMENTED();
+    }
+
     UNIMPLEMENTED();
     R_SUCCEED();
 }

src/nxemu-os/core/hle/service/filesystem/fsp/fsp_srv.h

@@ -7,6 +7,7 @@
 #include "core/hle/service/cmif_types.h"
 #include "core/hle/service/filesystem/fsp/fsp_types.h"
 #include "core/hle/service/service.h"
+#include "core/file_sys/filesystem_interfaces.h"
 
 namespace Core {
 class Reporter;
@@ -76,6 +77,7 @@ class FSP_SRV final : public ServiceFramework<FSP_SRV> {
     Result GetCacheStorageSize(s32 index, Out<s64> out_data_size, Out<s64> out_journal_size);
 
     IFileSystemController & fsc;
+    IVirtualFilePtr romfs;
     u64 current_process_id = 0;
     u32 access_log_program_index = 0;
     AccessLogMode access_log_mode = AccessLogMode::None;

src/nxemu-os/core/hle/service/filesystem/romfs_controller.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/hle/service/filesystem/romfs_controller.h"
+#include <nxemu-module-spec/system_loader.h>
 
 namespace Service::FileSystem {
 
@@ -15,4 +16,8 @@ RomFsController::~RomFsController()
 {
 }
 
+IVirtualFilePtr RomFsController::OpenRomFSCurrentProcess() {
+    return factory->OpenCurrentProcess(program_id);
+}
+
 } // namespace Service::FileSystem

src/nxemu-os/core/hle/service/filesystem/romfs_controller.h

@@ -11,6 +11,8 @@ class RomFsController {
     explicit RomFsController(RomFsControllerPtr && factory_, uint64_t program_id_);
     ~RomFsController();
 
+    IVirtualFilePtr OpenRomFSCurrentProcess();
+
 private:
     const RomFsControllerPtr factory;
     const uint64_t program_id;