mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added struct AppletAttribute. Use cmd OpenLibraryAppletProxy on [3.0.0+] when running appletInitialize for AppletType_LibraryApplet.

Browse Source
This commit is contained in:
yellows8 2019-08-12 11:14:58 -04:00
parent 37fdcb5726
commit 0137f582da
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nx/include/switch/services/applet.h
View File

@ -209,6 +209,12 @@ typedef struct {
LibAppletExitReason exitreason; ///< Set by \ref appletHolderJoin using the output from cmd GetResult, see \ref LibAppletExitReason.
} AppletHolder;
/// Used by \ref appletInitialize with __nx_applet_AppletAttribute for cmd OpenLibraryAppletProxy (AppletType_LibraryApplet), on [3.0.0+]. The default for this struct is all-zero.
typedef struct {
u8 flag; ///< Flag. When non-zero, two state fields are set to 1.
u8 reserved[0x7F]; ///< Unused.
} AppletAttribute;
/// LibraryAppletInfo
typedef struct {
AppletId appletId; ///< \ref AppletId

17
nx/source/services/applet.c
View File

@ -17,7 +17,7 @@
__attribute__((weak)) u32 __nx_applet_type = AppletType_Default;
__attribute__((weak)) bool __nx_applet_auto_notifyrunning = true;
__attribute__((weak)) u8 __nx_applet_AppletAttribute[0x80];
__attribute__((weak)) AppletAttribute __nx_applet_AppletAttribute;
/// When set, controls the PerformanceConfiguration passed to apmSetPerformanceConfiguration during app startup, where the array index is the PerformanceMode.
__attribute__((weak)) u32 __nx_applet_PerformanceConfiguration[2] = {/*0x92220008*//*0x20004*//*0x92220007*/0, 0};
//// Controls whether to use applet exit cmds during \ref appletExit. 0 (default): Only run exit cmds when running under a NSO. 1: Use exit cmds regardless. >1: Skip exit cmds.
@ -81,7 +81,7 @@ static ApmCpuBoostMode g_appletCpuBoostMode = ApmCpuBoostMode_Disabled;
static Result _appletGetHandle(Service* srv, Handle* handle_out, u64 cmd_id);
static Result _appletGetEvent(Service* srv, Event* out_event, u64 cmd_id, bool autoclear);
static Result _appletGetSession(Service* srv, Service* srv_out, u64 cmd_id);
static Result _appletGetSessionProxy(Service* srv_out, u64 cmd_id, Handle prochandle, u8 *AppletAttribute);
static Result _appletGetSessionProxy(Service* srv_out, u64 cmd_id, Handle prochandle, const AppletAttribute *attr);
static Result _appletGetAppletResourceUserId(u64 *out);
@ -107,6 +107,8 @@ static Result _appletGetAccumulatedSuspendedTickChangedEvent(Event *out_event);
Result appletInitialize(void)
{
AppletAttribute *attr = NULL;
atomicIncrement64(&g_refCnt);
if (serviceIsActive(&g_appletSrv))
@ -157,7 +159,12 @@ Result appletInitialize(void)
default: fatalSimple(MAKERESULT(Module_Libnx, LibnxError_AppletCmdidNotFound));
}
rc = _appletGetSessionProxy(&g_appletProxySession, cmd_id, CUR_PROCESS_HANDLE, NULL);
if (__nx_applet_type == AppletType_LibraryApplet && hosversionAtLeast(3,0,0)) {
cmd_id = 201;
attr = &__nx_applet_AppletAttribute;
}
rc = _appletGetSessionProxy(&g_appletProxySession, cmd_id, CUR_PROCESS_HANDLE, attr);
if (rc == AM_BUSY_ERROR) {
svcSleepThread(10000000);
@ -572,7 +579,7 @@ static Result _appletGetSession(Service* srv, Service* srv_out, u64 cmd_id) {
return rc;
}
static Result _appletGetSessionProxy(Service* srv_out, u64 cmd_id, Handle prochandle, u8 *AppletAttribute) {
static Result _appletGetSessionProxy(Service* srv_out, u64 cmd_id, Handle prochandle, const AppletAttribute *attr) {
IpcCommand c;
ipcInitialize(&c);
@ -584,7 +591,7 @@ static Result _appletGetSessionProxy(Service* srv_out, u64 cmd_id, Handle procha
ipcSendPid(&c);
ipcSendHandleCopy(&c, prochandle);
if (AppletAttribute) ipcAddSendBuffer(&c, AppletAttribute, 0x80, BufferType_Normal);
if (attr) ipcAddSendBuffer(&c, attr, sizeof(AppletAttribute), BufferType_Normal);
raw = serviceIpcPrepareHeader(&g_appletSrv, &c, sizeof(*raw));