OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libstrat: namespace remaining non-namespaced code. more new-ipc updates

Browse Source
This commit is contained in:
Michael Scire
2019-10-19 17:42:53 -07:00
committed by SciresM
parent ae2fa2fa60
commit 0b22af1206
68 changed files with 1257 additions and 2118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
stratosphere/ro/source/impl/ro_service_impl.cpp
View File

@@ -93,8 +93,7 @@ namespace sts::ro::impl {
R_ASSERT(svcGetInfo(&title_id.value, InfoType_TitleId, process_h, 0));
} else {
/* 1.0.0-2.3.0: We're not inside loader, so ask pm. */
os::ProcessId process_id = os::InvalidProcessId;
R_ASSERT(svcGetProcessId(&process_id.value, process_h));
os::ProcessId process_id = os::GetProcessId(process_h);
R_ASSERT(pminfoGetTitleId(&title_id.value, process_id.value));
}
return title_id;
@@ -335,7 +334,7 @@ namespace sts::ro::impl {
os::ProcessId handle_pid = os::InvalidProcessId;
/* Validate handle is a valid process handle. */
if (R_FAILED(svcGetProcessId(&handle_pid.value, process_handle))) {
if (R_FAILED(os::TryGetProcessId(&handle_pid, process_handle))) {
return ResultRoInvalidProcess;
}

15
stratosphere/ro/source/ro_main.cpp
View File

@@ -44,8 +44,13 @@ extern "C" {
void __appExit(void);
}
/* Exception handling. */
sts::ncm::TitleId __stratosphere_title_id = sts::ncm::TitleId::Ro;
namespace sts::ams {
ncm::TitleId StratosphereTitleId = ncm::TitleId::Ro;
}
using namespace sts;
void __libnx_initheap(void) {
void* addr = nx_inner_heap;
@@ -59,12 +64,10 @@ void __libnx_initheap(void) {
fake_heap_end = (char*)addr + size;
}
using namespace sts;
void __appInit(void) {
hos::SetVersionForLibnx();
DoWithSmSession([&]() {
sm::DoWithSession([&]() {
R_ASSERT(setsysInitialize());
R_ASSERT(fsInitialize());
R_ASSERT(splInitialize());
@@ -75,7 +78,7 @@ void __appInit(void) {
R_ASSERT(fsdevMountSdmc());
CheckAtmosphereVersion(CURRENT_ATMOSPHERE_VERSION);
ams::CheckApiVersion();
}
void __appExit(void) {