moonpower/azahar-UWP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: backport some ResultCode updates (#6645)

Browse Source 
Co-authored-by: Lioncash <mathew1800@gmail.com>
Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com>
This commit is contained in:
GPUCode
2023-07-03 03:23:53 +03:00
committed by GitHub
parent 0b37c1da57
commit 2126c240cd
34 changed files with 1204 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/hle/service/ldr_ro/cro_helper.cpp
View File

@@ -301,7 +301,7 @@ ResultVal<VAddr> CROHelper::RebaseSegmentTable(u32 cro_size, VAddr data_segment_
}
SetEntry(system.Memory(), i, segment);
}
return MakeResult<u32>(prev_data_segment + module_address);
return prev_data_segment + module_address;
}
ResultCode CROHelper::RebaseExportNamedSymbolTable() {
@@ -776,10 +776,10 @@ ResultCode CROHelper::ApplyImportNamedSymbol(VAddr crs_address) {
return result;
}
return MakeResult<bool>(false);
return false;
}
return MakeResult<bool>(true);
return true;
});
if (result.IsError()) {
return result;
@@ -897,9 +897,9 @@ ResultCode CROHelper::ApplyModuleImport(VAddr crs_address) {
return result;
}
}
return MakeResult<bool>(false);
return false;
}
return MakeResult<bool>(true);
return true;
});
if (result.IsError()) {
return result;
@@ -1090,10 +1090,10 @@ ResultCode CROHelper::ApplyExitRelocations(VAddr crs_address) {
return result;
}
return MakeResult<bool>(false);
return false;
}
return MakeResult<bool>(true);
return true;
});
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error applying exit relocation {:08X}", result.raw);
@@ -1317,7 +1317,7 @@ ResultCode CROHelper::Link(VAddr crs_address, bool link_on_load_bug_fix) {
if (result.IsError())
return result;
return MakeResult<bool>(true);
return true;
});
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error applying export {:08X}", result.raw);
@@ -1362,7 +1362,7 @@ ResultCode CROHelper::Unlink(VAddr crs_address) {
if (result.IsError())
return result;
return MakeResult<bool>(true);
return true;
});
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error resetting export {:08X}", result.raw);