diff options
| author | 2018-09-25 09:17:14 -0400 | |
|---|---|---|
| committer | 2018-10-05 08:46:31 -0400 | |
| commit | e948fbf5d0211d9aed3d4cd9009e5f0224b75021 (patch) | |
| tree | ccf549021bd7eaeafa5f6e3a24c7a3f72122679f /src/core/loader | |
| parent | Merge pull request #1415 from DarkLordZach/ips (diff) | |
| download | yuzu-e948fbf5d0211d9aed3d4cd9009e5f0224b75021.tar.gz yuzu-e948fbf5d0211d9aed3d4cd9009e5f0224b75021.tar.xz yuzu-e948fbf5d0211d9aed3d4cd9009e5f0224b75021.zip | |
loader: Add ReadRomFSIVFCOffset to NSP, XCI, and NAX loaders
Fixes errors with certain updates
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/nax.cpp | 4 | ||||
| -rw-r--r-- | src/core/loader/nax.h | 1 | ||||
| -rw-r--r-- | src/core/loader/nsp.cpp | 8 | ||||
| -rw-r--r-- | src/core/loader/nsp.h | 3 | ||||
| -rw-r--r-- | src/core/loader/xci.cpp | 7 | ||||
| -rw-r--r-- | src/core/loader/xci.h | 3 |
6 files changed, 20 insertions, 6 deletions
diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp index 073fb9d2f..42f4a777b 100644 --- a/src/core/loader/nax.cpp +++ b/src/core/loader/nax.cpp | |||
| @@ -72,6 +72,10 @@ ResultStatus AppLoader_NAX::ReadRomFS(FileSys::VirtualFile& dir) { | |||
| 72 | return nca_loader->ReadRomFS(dir); | 72 | return nca_loader->ReadRomFS(dir); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | u64 AppLoader_NAX::ReadRomFSIVFCOffset() const { | ||
| 76 | return nca_loader->ReadRomFSIVFCOffset(); | ||
| 77 | } | ||
| 78 | |||
| 75 | ResultStatus AppLoader_NAX::ReadProgramId(u64& out_program_id) { | 79 | ResultStatus AppLoader_NAX::ReadProgramId(u64& out_program_id) { |
| 76 | return nca_loader->ReadProgramId(out_program_id); | 80 | return nca_loader->ReadProgramId(out_program_id); |
| 77 | } | 81 | } |
diff --git a/src/core/loader/nax.h b/src/core/loader/nax.h index fc3c01876..b4d93bd01 100644 --- a/src/core/loader/nax.h +++ b/src/core/loader/nax.h | |||
| @@ -36,6 +36,7 @@ public: | |||
| 36 | ResultStatus Load(Kernel::Process& process) override; | 36 | ResultStatus Load(Kernel::Process& process) override; |
| 37 | 37 | ||
| 38 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; | 38 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; |
| 39 | u64 ReadRomFSIVFCOffset() const override; | ||
| 39 | ResultStatus ReadProgramId(u64& out_program_id) override; | 40 | ResultStatus ReadProgramId(u64& out_program_id) override; |
| 40 | 41 | ||
| 41 | private: | 42 | private: |
diff --git a/src/core/loader/nsp.cpp b/src/core/loader/nsp.cpp index b7ba77ef4..ae1edf9ca 100644 --- a/src/core/loader/nsp.cpp +++ b/src/core/loader/nsp.cpp | |||
| @@ -96,8 +96,12 @@ ResultStatus AppLoader_NSP::Load(Kernel::Process& process) { | |||
| 96 | return ResultStatus::Success; | 96 | return ResultStatus::Success; |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | ResultStatus AppLoader_NSP::ReadRomFS(FileSys::VirtualFile& dir) { | 99 | ResultStatus AppLoader_NSP::ReadRomFS(FileSys::VirtualFile& file) { |
| 100 | return secondary_loader->ReadRomFS(dir); | 100 | return secondary_loader->ReadRomFS(file); |
| 101 | } | ||
| 102 | |||
| 103 | u64 AppLoader_NSP::ReadRomFSIVFCOffset() const { | ||
| 104 | return secondary_loader->ReadRomFSIVFCOffset(); | ||
| 101 | } | 105 | } |
| 102 | 106 | ||
| 103 | ResultStatus AppLoader_NSP::ReadProgramId(u64& out_program_id) { | 107 | ResultStatus AppLoader_NSP::ReadProgramId(u64& out_program_id) { |
diff --git a/src/core/loader/nsp.h b/src/core/loader/nsp.h index eac9b819a..351bbf128 100644 --- a/src/core/loader/nsp.h +++ b/src/core/loader/nsp.h | |||
| @@ -37,7 +37,8 @@ public: | |||
| 37 | 37 | ||
| 38 | ResultStatus Load(Kernel::Process& process) override; | 38 | ResultStatus Load(Kernel::Process& process) override; |
| 39 | 39 | ||
| 40 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; | 40 | ResultStatus ReadRomFS(FileSys::VirtualFile& file) override; |
| 41 | u64 ReadRomFSIVFCOffset() const override; | ||
| 41 | ResultStatus ReadProgramId(u64& out_program_id) override; | 42 | ResultStatus ReadProgramId(u64& out_program_id) override; |
| 42 | ResultStatus ReadIcon(std::vector<u8>& buffer) override; | 43 | ResultStatus ReadIcon(std::vector<u8>& buffer) override; |
| 43 | ResultStatus ReadTitle(std::string& title) override; | 44 | ResultStatus ReadTitle(std::string& title) override; |
diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index eda67a8c8..12d589fab 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp | |||
| @@ -68,10 +68,13 @@ ResultStatus AppLoader_XCI::Load(Kernel::Process& process) { | |||
| 68 | return ResultStatus::Success; | 68 | return ResultStatus::Success; |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | ResultStatus AppLoader_XCI::ReadRomFS(FileSys::VirtualFile& dir) { | 71 | ResultStatus AppLoader_XCI::ReadRomFS(FileSys::VirtualFile& file) { |
| 72 | return nca_loader->ReadRomFS(dir); | 72 | return nca_loader->ReadRomFS(file); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | u64 AppLoader_XCI::ReadRomFSIVFCOffset() const { | ||
| 76 | return nca_loader->ReadRomFSIVFCOffset(); | ||
| 77 | } | ||
| 75 | ResultStatus AppLoader_XCI::ReadProgramId(u64& out_program_id) { | 78 | ResultStatus AppLoader_XCI::ReadProgramId(u64& out_program_id) { |
| 76 | return nca_loader->ReadProgramId(out_program_id); | 79 | return nca_loader->ReadProgramId(out_program_id); |
| 77 | } | 80 | } |
diff --git a/src/core/loader/xci.h b/src/core/loader/xci.h index 17e47b658..4f9a9da48 100644 --- a/src/core/loader/xci.h +++ b/src/core/loader/xci.h | |||
| @@ -37,7 +37,8 @@ public: | |||
| 37 | 37 | ||
| 38 | ResultStatus Load(Kernel::Process& process) override; | 38 | ResultStatus Load(Kernel::Process& process) override; |
| 39 | 39 | ||
| 40 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; | 40 | ResultStatus ReadRomFS(FileSys::VirtualFile& file) override; |
| 41 | u64 ReadRomFSIVFCOffset() const override; | ||
| 41 | ResultStatus ReadProgramId(u64& out_program_id) override; | 42 | ResultStatus ReadProgramId(u64& out_program_id) override; |
| 42 | ResultStatus ReadIcon(std::vector<u8>& buffer) override; | 43 | ResultStatus ReadIcon(std::vector<u8>& buffer) override; |
| 43 | ResultStatus ReadTitle(std::string& title) override; | 44 | ResultStatus ReadTitle(std::string& title) override; |