mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-06-29 14:32:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

strat: fixes for compat with latest libnx

Browse Source
This commit is contained in:
Michael Scire 2019-10-27 15:57:30 -07:00
parent 8da7ecb197
commit e7450d5340
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/pm/pm_dmnt_api.cpp
View File

@ -25,16 +25,16 @@ namespace ams::pm::dmnt {
} }
Result GetProcessId(os::ProcessId *out_process_id, const ncm::TitleId title_id) { Result GetProcessId(os::ProcessId *out_process_id, const ncm::TitleId title_id) {
return pmdmntGetTitlePid(reinterpret_cast<u64 *>(out_process_id), static_cast<u64>(title_id)); return pmdmntGetProcessId(reinterpret_cast<u64 *>(out_process_id), static_cast<u64>(title_id));
} }
Result GetApplicationProcessId(os::ProcessId *out_process_id) { Result GetApplicationProcessId(os::ProcessId *out_process_id) {
return pmdmntGetApplicationPid(reinterpret_cast<u64 *>(out_process_id)); return pmdmntGetApplicationProcessId(reinterpret_cast<u64 *>(out_process_id));
} }
Result HookToCreateApplicationProcess(Handle *out_handle) { Result HookToCreateApplicationProcess(Handle *out_handle) {
Event evt; Event evt;
R_TRY(pmdmntEnableDebugForApplication(&evt)); R_TRY(pmdmntHookToCreateApplicationProcess(&evt));
*out_handle = evt.revent; *out_handle = evt.revent;
return ResultSuccess(); return ResultSuccess();
} }

2
source/pm/pm_info_api.cpp
View File

@ -30,7 +30,7 @@ namespace ams::pm::info {
Result GetTitleId(ncm::TitleId *out_title_id, os::ProcessId process_id) { Result GetTitleId(ncm::TitleId *out_title_id, os::ProcessId process_id) {
std::scoped_lock lk(g_info_lock); std::scoped_lock lk(g_info_lock);
return pminfoGetTitleId(reinterpret_cast<u64 *>(out_title_id), static_cast<u64>(process_id)); return pminfoGetProgramId(reinterpret_cast<u64 *>(out_title_id), static_cast<u64>(process_id));
} }
Result GetProcessId(os::ProcessId *out_process_id, ncm::TitleId title_id) { Result GetProcessId(os::ProcessId *out_process_id, ncm::TitleId title_id) {

4
source/pm/pm_shell_api.cpp
View File

@ -19,7 +19,9 @@ namespace ams::pm::shell {
/* Shell API. */ /* Shell API. */
Result WEAK LaunchTitle(os::ProcessId *out_process_id, const ncm::TitleLocation &loc, u32 launch_flags) { Result WEAK LaunchTitle(os::ProcessId *out_process_id, const ncm::TitleLocation &loc, u32 launch_flags) {
return pmshellLaunchProcess(launch_flags, static_cast<u64>(loc.title_id), loc.storage_id, reinterpret_cast<u64 *>(out_process_id)); static_assert(sizeof(ncm::TitleLocation) == sizeof(NcmProgramLocation));
static_assert(alignof(ncm::TitleLocation) == alignof(NcmProgramLocation));
return pmshellLaunchProgram(launch_flags, reinterpret_cast<const NcmProgramLocation *>(&loc), reinterpret_cast<u64 *>(out_process_id));
} }
} }

2
source/result/result_on_assertion.cpp
View File

@ -30,7 +30,7 @@ namespace ams::result::impl {
AMS_ASSERT((ams::result::CallFatalOnResultAssertion)); AMS_ASSERT((ams::result::CallFatalOnResultAssertion));
/* TODO: ams::fatal:: */ /* TODO: ams::fatal:: */
fatalSimple(result.GetValue()); fatalThrow(result.GetValue());
while (true) { /* ... */ } while (true) { /* ... */ }
} }

8
source/updater/updater_api.cpp
View File

@ -149,10 +149,10 @@ namespace ams::updater {
NcmContentMetaKey *records = reinterpret_cast<NcmContentMetaKey *>(work_buffer); NcmContentMetaKey *records = reinterpret_cast<NcmContentMetaKey *>(work_buffer);
const auto title_type = GetNcmContentMetaType(mode); const auto title_type = GetNcmContentMetaType(mode);
u32 written_entries; s32 written_entries;
u32 total_entries; s32 total_entries;
R_TRY(ncmContentMetaDatabaseList(&meta_db, &total_entries, &written_entries, records, MaxContentMetas * sizeof(*records), title_type, 0, 0, UINT64_MAX, NcmContentInstallType_Full)); R_TRY(ncmContentMetaDatabaseList(&meta_db, &total_entries, &written_entries, records, MaxContentMetas * sizeof(*records), title_type, 0, 0, UINT64_MAX, NcmContentInstallType_Full));
if (total_entries == 0) { if (total_entries <= 0) {
return ResultBootImagePackageNotFound(); return ResultBootImagePackageNotFound();
} }
@ -160,7 +160,7 @@ namespace ams::updater {
/* Output is sorted, return the lowest valid exfat entry. */ /* Output is sorted, return the lowest valid exfat entry. */
if (total_entries > 1) { if (total_entries > 1) {
for (size_t i = 0; i < total_entries; i++) { for (size_t i = 0; i < size_t(total_entries); i++) {
u8 attr; u8 attr;
R_TRY(ncmContentMetaDatabaseGetAttributes(&meta_db, &records[i], &attr)); R_TRY(ncmContentMetaDatabaseGetAttributes(&meta_db, &records[i], &attr));