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

strat: go all in on ncm::TitleId

Browse Source
This commit is contained in:
Michael Scire
2019-07-02 20:54:16 -07:00
committed by SciresM
parent c916a7db88
commit 2d0c881ffe
33 changed files with 191 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stratosphere/ams_mitm/source/ns_mitm/nsmitm_am_service.cpp
View File

@@ -30,7 +30,7 @@ Result NsAmMitmService::GetApplicationContentPath(OutBuffer<u8> out_path, u64 ap
Result NsAmMitmService::ResolveApplicationContentPath(u64 title_id, u8 storage_type) {
/* Always succeed for web applet asking about HBL. */
if (Utils::IsWebAppletTid(this->title_id) && Utils::IsHblTid(title_id)) {
if (Utils::IsWebAppletTid(static_cast<u64>(this->title_id)) && Utils::IsHblTid(title_id)) {
nsamResolveApplicationContentPathFwd(this->forward_service.get(), title_id, static_cast<FsStorageId>(storage_type));
return ResultSuccess;
}

4
stratosphere/ams_mitm/source/ns_mitm/nsmitm_am_service.hpp
View File

@@ -32,11 +32,11 @@ class NsAmMitmService : public IMitmServiceObject {
/* ... */
}
static bool ShouldMitm(u64 pid, u64 tid) {
static bool ShouldMitm(u64 pid, sts::ncm::TitleId tid) {
/* We will mitm:
* - web applets, to facilitate hbl web browser launching.
*/
return Utils::IsWebAppletTid(tid);
return Utils::IsWebAppletTid(static_cast<u64>(tid));
}
static void PostProcess(IMitmServiceObject *obj, IpcResponseContext *ctx);

4
stratosphere/ams_mitm/source/ns_mitm/nsmitm_web_service.cpp
View File

@@ -29,7 +29,7 @@ Result NsWebMitmService::GetDocumentInterface(Out<std::shared_ptr<NsDocumentServ
R_TRY(nsGetDocumentInterfaceFwd(this->forward_service.get(), &doc));
/* Set output interface. */
out_intf.SetValue(std::move(std::make_shared<NsDocumentService>(this->title_id, doc)));
out_intf.SetValue(std::move(std::make_shared<NsDocumentService>(static_cast<u64>(this->title_id), doc)));
if (out_intf.IsDomain()) {
out_intf.ChangeObjectId(doc.s.object_id);
}
@@ -43,7 +43,7 @@ Result NsDocumentService::GetApplicationContentPath(OutBuffer<u8> out_path, u64
Result NsDocumentService::ResolveApplicationContentPath(u64 title_id, u8 storage_type) {
/* Always succeed for web applet asking about HBL. */
if (Utils::IsWebAppletTid(this->title_id) && Utils::IsHblTid(title_id)) {
if (Utils::IsWebAppletTid(static_cast<u64>(this->title_id)) && Utils::IsHblTid(title_id)) {
nswebResolveApplicationContentPath(this->srv.get(), title_id, static_cast<FsStorageId>(storage_type));
return ResultSuccess;
}

4
stratosphere/ams_mitm/source/ns_mitm/nsmitm_web_service.hpp
View File

@@ -71,11 +71,11 @@ class NsWebMitmService : public IMitmServiceObject {
/* ... */
}
static bool ShouldMitm(u64 pid, u64 tid) {
static bool ShouldMitm(u64 pid, sts::ncm::TitleId tid) {
/* We will mitm:
* - web applets, to facilitate hbl web browser launching.
*/
return Utils::IsWebAppletTid(tid);
return Utils::IsWebAppletTid(static_cast<u64>(tid));
}
static void PostProcess(IMitmServiceObject *obj, IpcResponseContext *ctx);