summaryrefslogtreecommitdiff
path: root/src/core/loader/nro.cpp
diff options
context:
space:
mode:
authorGravatar Zach Hilman2018-08-09 21:06:44 -0400
committerGravatar Zach Hilman2018-08-09 21:06:59 -0400
commitec3bef7b4c21931918f3a84ad79a53d31b02aeaf (patch)
treee9da97be14d9474910faa1cfde851aa5b2383bc0 /src/core/loader/nro.cpp
parentMerge pull request #995 from bunnei/gl-buff-bounds (diff)
downloadyuzu-ec3bef7b4c21931918f3a84ad79a53d31b02aeaf.tar.gz
yuzu-ec3bef7b4c21931918f3a84ad79a53d31b02aeaf.tar.xz
yuzu-ec3bef7b4c21931918f3a84ad79a53d31b02aeaf.zip
loader: Add more descriptive errors
Full list of new errors and descriptions in core/loader/loader.h
Diffstat (limited to 'src/core/loader/nro.cpp')
-rw-r--r--src/core/loader/nro.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp
index dc053cdad..908d91eab 100644
--- a/src/core/loader/nro.cpp
+++ b/src/core/loader/nro.cpp
@@ -182,7 +182,7 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
182 static constexpr VAddr base_addr{Memory::PROCESS_IMAGE_VADDR}; 182 static constexpr VAddr base_addr{Memory::PROCESS_IMAGE_VADDR};
183 183
184 if (!LoadNro(file, base_addr)) { 184 if (!LoadNro(file, base_addr)) {
185 return ResultStatus::ErrorInvalidFormat; 185 return ResultStatus::ErrorLoadingNRO;
186 } 186 }
187 187
188 process->svc_access_mask.set(); 188 process->svc_access_mask.set();
@@ -197,7 +197,7 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
197 197
198ResultStatus AppLoader_NRO::ReadIcon(std::vector<u8>& buffer) { 198ResultStatus AppLoader_NRO::ReadIcon(std::vector<u8>& buffer) {
199 if (icon_data.empty()) { 199 if (icon_data.empty()) {
200 return ResultStatus::ErrorNotUsed; 200 return ResultStatus::ErrorNoIcon;
201 } 201 }
202 202
203 buffer = icon_data; 203 buffer = icon_data;
@@ -206,7 +206,7 @@ ResultStatus AppLoader_NRO::ReadIcon(std::vector<u8>& buffer) {
206 206
207ResultStatus AppLoader_NRO::ReadProgramId(u64& out_program_id) { 207ResultStatus AppLoader_NRO::ReadProgramId(u64& out_program_id) {
208 if (nacp == nullptr) { 208 if (nacp == nullptr) {
209 return ResultStatus::ErrorNotUsed; 209 return ResultStatus::ErrorNoControl;
210 } 210 }
211 211
212 out_program_id = nacp->GetTitleId(); 212 out_program_id = nacp->GetTitleId();
@@ -215,7 +215,7 @@ ResultStatus AppLoader_NRO::ReadProgramId(u64& out_program_id) {
215 215
216ResultStatus AppLoader_NRO::ReadRomFS(FileSys::VirtualFile& dir) { 216ResultStatus AppLoader_NRO::ReadRomFS(FileSys::VirtualFile& dir) {
217 if (romfs == nullptr) { 217 if (romfs == nullptr) {
218 return ResultStatus::ErrorNotUsed; 218 return ResultStatus::ErrorNoRomFS;
219 } 219 }
220 220
221 dir = romfs; 221 dir = romfs;
@@ -224,7 +224,7 @@ ResultStatus AppLoader_NRO::ReadRomFS(FileSys::VirtualFile& dir) {
224 224
225ResultStatus AppLoader_NRO::ReadTitle(std::string& title) { 225ResultStatus AppLoader_NRO::ReadTitle(std::string& title) {
226 if (nacp == nullptr) { 226 if (nacp == nullptr) {
227 return ResultStatus::ErrorNotUsed; 227 return ResultStatus::ErrorNoControl;
228 } 228 }
229 229
230 title = nacp->GetApplicationName(); 230 title = nacp->GetApplicationName();