From 79244078a68e795c914d87180c96fcb122089b48 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Fri, 22 Mar 2019 16:54:37 -0800 Subject: [PATCH] fs.mitm: make HBL web content work (verified on hw) --- Makefile | 1 + .../defaults/hbl_html/accessible-urls/accessible-urls.txt | 1 + stratosphere/ams_mitm/source/fs_mitm/fs_ifilesystem.hpp | 6 ------ 3 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 common/defaults/hbl_html/accessible-urls/accessible-urls.txt diff --git a/Makefile b/Makefile index 97c78053d..1ebf1c635 100644 --- a/Makefile +++ b/Makefile @@ -64,6 +64,7 @@ dist: all cp common/defaults/loader.ini atmosphere-$(AMSVER)/atmosphere/loader.ini cp common/defaults/system_settings.ini atmosphere-$(AMSVER)/atmosphere/system_settings.ini cp -r common/defaults/kip_patches atmosphere-$(AMSVER)/atmosphere/kip_patches + cp -r common/defaults/hbl_html atmosphere-$(AMSVER)/atmosphere/hbl_html cp stratosphere/creport/creport.nsp atmosphere-$(AMSVER)/atmosphere/titles/0100000000000036/exefs.nsp cp stratosphere/fatal/fatal.nsp atmosphere-$(AMSVER)/atmosphere/titles/0100000000000034/exefs.nsp cp stratosphere/eclct.stub/eclct.stub.nsp atmosphere-$(AMSVER)/atmosphere/titles/0100000000000032/exefs.nsp diff --git a/common/defaults/hbl_html/accessible-urls/accessible-urls.txt b/common/defaults/hbl_html/accessible-urls/accessible-urls.txt new file mode 100644 index 000000000..c13735f70 --- /dev/null +++ b/common/defaults/hbl_html/accessible-urls/accessible-urls.txt @@ -0,0 +1 @@ +^http* diff --git a/stratosphere/ams_mitm/source/fs_mitm/fs_ifilesystem.hpp b/stratosphere/ams_mitm/source/fs_mitm/fs_ifilesystem.hpp index 6e8d1211f..803f1916c 100644 --- a/stratosphere/ams_mitm/source/fs_mitm/fs_ifilesystem.hpp +++ b/stratosphere/ams_mitm/source/fs_mitm/fs_ifilesystem.hpp @@ -92,9 +92,6 @@ class IFileSystem { } Result OpenFile(std::unique_ptr &out_file, FsPath &path, OpenMode mode) { - if (out_file == nullptr) { - return ResultFsNullptrArgument; - } if (!(mode & OpenMode_ReadWrite)) { return ResultFsInvalidArgument; } @@ -105,9 +102,6 @@ class IFileSystem { } Result OpenDirectory(std::unique_ptr &out_dir, FsPath &path, DirectoryOpenMode mode) { - if (out_dir == nullptr) { - return ResultFsNullptrArgument; - } if (!(mode & DirectoryOpenMode_All)) { return ResultFsInvalidArgument; }