ams_mitm: implement hbl_html redirection

stratosphere/libstratosphere/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::fsa::IFileSystem> fs, const char *before, const char *after, bool unc = false);
-            DirectoryRedirectionFileSystem(std::unique_ptr<fs::fsa::IFileSystem> &&fs, const char *before, const char *after, bool unc = false);
+            DirectoryRedirectionFileSystem(std::unique_ptr<fs::fsa::IFileSystem> fs, const char *before, const char *after, bool unc = false);
 
             virtual ~DirectoryRedirectionFileSystem();
         protected:

stratosphere/libstratosphere/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::fsa::IFileSystem> fs, const char *bp, bool unc = false);
-            SubDirectoryFileSystem(std::unique_ptr<fs::fsa::IFileSystem> &&fs, const char *bp, bool unc = false);
+            SubDirectoryFileSystem(std::unique_ptr<fs::fsa::IFileSystem> fs, const char *bp, bool unc = false);
 
             virtual ~SubDirectoryFileSystem();
         protected:

stratosphere/libstratosphere/include/stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp

@@ -35,7 +35,7 @@ namespace ams::fssystem::impl {
                 /* ... */
             }
 
-            IPathResolutionFileSystem(std::unique_ptr<fs::fsa::IFileSystem> &&fs, bool unc = false) : unique_fs(std::move(fs)), unc_preserved(unc), base_fs(unique_fs.get())  {
+            IPathResolutionFileSystem(std::unique_ptr<fs::fsa::IFileSystem> fs, bool unc = false) : unique_fs(std::move(fs)), unc_preserved(unc), base_fs(unique_fs.get())  {
                 /* ... */
             }
 

stratosphere/libstratosphere/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::fsa::IFileSystem> &&fs, const char *before, const char *after, bool unc)
-        : PathResolutionFileSystem(std::forward<std::unique_ptr<fs::fsa::IFileSystem>>(fs), unc)
+    DirectoryRedirectionFileSystem::DirectoryRedirectionFileSystem(std::unique_ptr<fs::fsa::IFileSystem> fs, const char *before, const char *after, bool unc)
+        : PathResolutionFileSystem(std::move(fs), unc)
     {
         this->before_dir = nullptr;
         this->after_dir = nullptr;

stratosphere/libstratosphere/source/fssystem/fssystem_directory_savedata_filesystem.cpp

@@ -80,7 +80,7 @@ namespace ams::fssystem {
     }
 
     DirectorySaveDataFileSystem::DirectorySaveDataFileSystem(std::unique_ptr<fs::fsa::IFileSystem> fs)
-        : PathResolutionFileSystem(std::forward<std::unique_ptr<fs::fsa::IFileSystem>>(fs)), open_writable_files(0)
+        : PathResolutionFileSystem(std::move(fs)), open_writable_files(0)
     {
         /* ... */
     }

stratosphere/libstratosphere/source/fssystem/fssystem_subdirectory_filesystem.cpp

@@ -24,8 +24,8 @@ namespace ams::fssystem {
         R_ASSERT(this->Initialize(bp));
     }
 
-    SubDirectoryFileSystem::SubDirectoryFileSystem(std::unique_ptr<fs::fsa::IFileSystem> &&fs, const char *bp, bool unc)
-        : PathResolutionFileSystem(std::forward<std::unique_ptr<fs::fsa::IFileSystem>>(fs), unc)
+    SubDirectoryFileSystem::SubDirectoryFileSystem(std::unique_ptr<fs::fsa::IFileSystem> fs, const char *bp, bool unc)
+        : PathResolutionFileSystem(std::move(fs), unc)
     {
         this->base_path = nullptr;
         R_ASSERT(this->Initialize(bp));

stratosphere/libstratosphere/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;