From 62c251ef6d95b06b45ec8c053f10006c44ffad37 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sat, 7 Dec 2019 04:30:26 -0800 Subject: [PATCH] ams_mitm: implement hbl_html redirection --- .../fssystem/fssystem_directory_redirection_filesystem.hpp | 2 +- .../fssystem/fssystem_subdirectory_filesystem.hpp | 2 +- .../fssystem/impl/fssystem_path_resolution_filesystem.hpp | 2 +- source/fssystem/fssystem_directory_redirection_filesystem.cpp | 4 ++-- source/fssystem/fssystem_directory_savedata_filesystem.cpp | 2 +- source/fssystem/fssystem_subdirectory_filesystem.cpp | 4 ++-- source/pm/pm_ams.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp b/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp index daa7babb..80c1d1e3 100644 --- a/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp +++ b/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp @@ -30,7 +30,7 @@ namespace ams::fssystem { size_t after_dir_len; public: DirectoryRedirectionFileSystem(std::shared_ptr fs, const char *before, const char *after, bool unc = false); - DirectoryRedirectionFileSystem(std::unique_ptr &&fs, const char *before, const char *after, bool unc = false); + DirectoryRedirectionFileSystem(std::unique_ptr fs, const char *before, const char *after, bool unc = false); virtual ~DirectoryRedirectionFileSystem(); protected: diff --git a/include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp b/include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp index 99a8213c..549ceac6 100644 --- a/include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp +++ b/include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp @@ -28,7 +28,7 @@ namespace ams::fssystem { size_t base_path_len; public: SubDirectoryFileSystem(std::shared_ptr fs, const char *bp, bool unc = false); - SubDirectoryFileSystem(std::unique_ptr &&fs, const char *bp, bool unc = false); + SubDirectoryFileSystem(std::unique_ptr fs, const char *bp, bool unc = false); virtual ~SubDirectoryFileSystem(); protected: diff --git a/include/stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp b/include/stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp index 4797ab77..1ba6a388 100644 --- a/include/stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp +++ b/include/stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp @@ -35,7 +35,7 @@ namespace ams::fssystem::impl { /* ... */ } - IPathResolutionFileSystem(std::unique_ptr &&fs, bool unc = false) : unique_fs(std::move(fs)), unc_preserved(unc), base_fs(unique_fs.get()) { + IPathResolutionFileSystem(std::unique_ptr fs, bool unc = false) : unique_fs(std::move(fs)), unc_preserved(unc), base_fs(unique_fs.get()) { /* ... */ } diff --git a/source/fssystem/fssystem_directory_redirection_filesystem.cpp b/source/fssystem/fssystem_directory_redirection_filesystem.cpp index 0da78f51..94f5b5ec 100644 --- a/source/fssystem/fssystem_directory_redirection_filesystem.cpp +++ b/source/fssystem/fssystem_directory_redirection_filesystem.cpp @@ -25,8 +25,8 @@ namespace ams::fssystem { R_ASSERT(this->Initialize(before, after)); } - DirectoryRedirectionFileSystem::DirectoryRedirectionFileSystem(std::unique_ptr &&fs, const char *before, const char *after, bool unc) - : PathResolutionFileSystem(std::forward>(fs), unc) + DirectoryRedirectionFileSystem::DirectoryRedirectionFileSystem(std::unique_ptr fs, const char *before, const char *after, bool unc) + : PathResolutionFileSystem(std::move(fs), unc) { this->before_dir = nullptr; this->after_dir = nullptr; diff --git a/source/fssystem/fssystem_directory_savedata_filesystem.cpp b/source/fssystem/fssystem_directory_savedata_filesystem.cpp index 1be30c3f..9376b317 100644 --- a/source/fssystem/fssystem_directory_savedata_filesystem.cpp +++ b/source/fssystem/fssystem_directory_savedata_filesystem.cpp @@ -80,7 +80,7 @@ namespace ams::fssystem { } DirectorySaveDataFileSystem::DirectorySaveDataFileSystem(std::unique_ptr fs) - : PathResolutionFileSystem(std::forward>(fs)), open_writable_files(0) + : PathResolutionFileSystem(std::move(fs)), open_writable_files(0) { /* ... */ } diff --git a/source/fssystem/fssystem_subdirectory_filesystem.cpp b/source/fssystem/fssystem_subdirectory_filesystem.cpp index f359b10f..4d64091e 100644 --- a/source/fssystem/fssystem_subdirectory_filesystem.cpp +++ b/source/fssystem/fssystem_subdirectory_filesystem.cpp @@ -24,8 +24,8 @@ namespace ams::fssystem { R_ASSERT(this->Initialize(bp)); } - SubDirectoryFileSystem::SubDirectoryFileSystem(std::unique_ptr &&fs, const char *bp, bool unc) - : PathResolutionFileSystem(std::forward>(fs), unc) + SubDirectoryFileSystem::SubDirectoryFileSystem(std::unique_ptr fs, const char *bp, bool unc) + : PathResolutionFileSystem(std::move(fs), unc) { this->base_path = nullptr; R_ASSERT(this->Initialize(bp)); diff --git a/source/pm/pm_ams.c b/source/pm/pm_ams.c index 858cae2a..02029445 100644 --- a/source/pm/pm_ams.c +++ b/source/pm/pm_ams.c @@ -34,7 +34,7 @@ Result pminfoAtmosphereGetProcessInfo(NcmProgramLocation *loc_out, CfgOverrideSt CfgOverrideStatus status; } out; - Result rc = serviceDispatchInOut(pmdmntGetServiceSession(), 65002, pid, out); + Result rc = serviceDispatchInOut(pminfoGetServiceSession(), 65002, pid, out); if (R_SUCCEEDED(rc)) { if (loc_out) *loc_out = out.loc;