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

applet: Minor internal improvements. Updated param type for appletRequestLaunchApplicationWithUserAndArgumentForDebug. Clear IPC in-struct padding, improved bool handling, and use serviceAssumeDomain when closing Service objects outside of _appletCleanup.

Browse Source
This commit is contained in:
yellows8 2019-10-25 19:24:56 -04:00
parent 04179b286d
commit e833257b65
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
2 changed files with 165 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2216,7 +2216,7 @@ Result appletInvalidateTransitionLayer(void);
* @param[in] buffer Buffer containing the above storage data. * @param[in] buffer Buffer containing the above storage data.
* @param[in] size Size of the storage buffer. * @param[in] size Size of the storage buffer.
*/ */
Result appletRequestLaunchApplicationWithUserAndArgumentForDebug(u64 titleID, const AccountUid *userIDs, size_t total_userIDs, bool flag, const void* buffer, size_t size); Result appletRequestLaunchApplicationWithUserAndArgumentForDebug(u64 titleID, const AccountUid *userIDs, s32 total_userIDs, bool flag, const void* buffer, size_t size);
/** /**
* @brief Gets the \ref AppletResourceUsageInfo. * @brief Gets the \ref AppletResourceUsageInfo.

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

@ -78,9 +78,9 @@ static ApmCpuBoostMode g_appletCpuBoostMode = ApmCpuBoostMode_Disabled;
static AppletInfo g_appletInfo; static AppletInfo g_appletInfo;
static bool g_appletInfoInitialized; static bool g_appletInfoInitialized;
static Result _appletGetHandle(Service* srv, Handle* handle_out, u32 cmd_id); static Result _appletCmdGetHandle(Service* srv, Handle* handle_out, u32 cmd_id);
static Result _appletGetEvent(Service* srv, Event* out_event, bool autoclear, u32 cmd_id); static Result _appletCmdGetEvent(Service* srv, Event* out_event, bool autoclear, u32 cmd_id);
static Result _appletGetSession(Service* srv, Service* srv_out, u32 cmd_id); static Result _appletCmdGetSession(Service* srv, Service* srv_out, u32 cmd_id);
static Result _appletOpenLibraryAppletProxy(Service* srv_out, Handle prochandle, const AppletAttribute *attr); static Result _appletOpenLibraryAppletProxy(Service* srv_out, Handle prochandle, const AppletAttribute *attr);
static Result _appletGetSessionProxy(Service* srv_out, Handle prochandle, u32 cmd_id); static Result _appletGetSessionProxy(Service* srv_out, Handle prochandle, u32 cmd_id);
@ -191,56 +191,56 @@ Result _appletInitialize(void) {
// [7.0.0+] GetAppletCommonFunctions // [7.0.0+] GetAppletCommonFunctions
if (R_SUCCEEDED(rc) && hosversionAtLeast(7,0,0)) { if (R_SUCCEEDED(rc) && hosversionAtLeast(7,0,0)) {
if (__nx_applet_type == AppletType_SystemApplet || __nx_applet_type == AppletType_LibraryApplet || __nx_applet_type == AppletType_OverlayApplet) { if (__nx_applet_type == AppletType_SystemApplet || __nx_applet_type == AppletType_LibraryApplet || __nx_applet_type == AppletType_OverlayApplet) {
rc = _appletGetSession(&g_appletProxySession, &g_appletIAppletCommonFunctions, __nx_applet_type == AppletType_SystemApplet ? 23 : 21); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletIAppletCommonFunctions, __nx_applet_type == AppletType_SystemApplet ? 23 : 21);
} }
} }
// Get*Functions // Get*Functions
if (R_SUCCEEDED(rc) && __nx_applet_type != AppletType_LibraryApplet) if (R_SUCCEEDED(rc) && __nx_applet_type != AppletType_LibraryApplet)
rc = _appletGetSession(&g_appletProxySession, &g_appletIFunctions, 20); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletIFunctions, 20);
if (R_SUCCEEDED(rc) && __nx_applet_type == AppletType_SystemApplet) { if (R_SUCCEEDED(rc) && __nx_applet_type == AppletType_SystemApplet) {
//GetGlobalStateController //GetGlobalStateController
rc = _appletGetSession(&g_appletProxySession, &g_appletIGlobalStateController, 21); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletIGlobalStateController, 21);
//GetApplicationCreator //GetApplicationCreator
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = _appletGetSession(&g_appletProxySession, &g_appletIApplicationCreator, 22); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletIApplicationCreator, 22);
} }
if (R_SUCCEEDED(rc) && __nx_applet_type == AppletType_LibraryApplet) { if (R_SUCCEEDED(rc) && __nx_applet_type == AppletType_LibraryApplet) {
//GetLibraryAppletSelfAccessor //GetLibraryAppletSelfAccessor
rc = _appletGetSession(&g_appletProxySession, &g_appletILibraryAppletSelfAccessor, 20); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletILibraryAppletSelfAccessor, 20);
//GetProcessWindingController //GetProcessWindingController
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = _appletGetSession(&g_appletProxySession, &g_appletIProcessWindingController, 10); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletIProcessWindingController, 10);
} }
// GetLibraryAppletCreator // GetLibraryAppletCreator
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = _appletGetSession(&g_appletProxySession, &g_appletILibraryAppletCreator, 11); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletILibraryAppletCreator, 11);
// GetCommonStateGetter // GetCommonStateGetter
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = _appletGetSession(&g_appletProxySession, &g_appletICommonStateGetter, 0); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletICommonStateGetter, 0);
// GetSelfController // GetSelfController
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = _appletGetSession(&g_appletProxySession, &g_appletISelfController, 1); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletISelfController, 1);
// GetWindowController // GetWindowController
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = _appletGetSession(&g_appletProxySession, &g_appletIWindowController, 2); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletIWindowController, 2);
// Get AppletResourceUserId. // Get AppletResourceUserId.
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = _appletGetAppletResourceUserId(&g_appletResourceUserId); rc = _appletGetAppletResourceUserId(&g_appletResourceUserId);
// GetAudioController // GetAudioController
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = _appletGetSession(&g_appletProxySession, &g_appletIAudioController, 3); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletIAudioController, 3);
// GetDisplayController // GetDisplayController
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = _appletGetSession(&g_appletProxySession, &g_appletIDisplayController, 4); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletIDisplayController, 4);
// GetDebugFunctions // GetDebugFunctions
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = _appletGetSession(&g_appletProxySession, &g_appletIDebugFunctions, 1000); rc = _appletCmdGetSession(&g_appletProxySession, &g_appletIDebugFunctions, 1000);
Result rc2 = _appletGetAccumulatedSuspendedTickChangedEvent(&g_appletSuspendedTickEvent); Result rc2 = _appletGetAccumulatedSuspendedTickChangedEvent(&g_appletSuspendedTickEvent);
if (R_SUCCEEDED(rc2)) { if (R_SUCCEEDED(rc2)) {
@ -251,7 +251,7 @@ Result _appletInitialize(void) {
// ICommonStateGetter::GetEventHandle // ICommonStateGetter::GetEventHandle
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = _appletGetEvent(&g_appletICommonStateGetter, &g_appletMessageEvent, false, 0); rc = _appletCmdGetEvent(&g_appletICommonStateGetter, &g_appletMessageEvent, false, 0);
if (R_SUCCEEDED(rc) && (__nx_applet_type == AppletType_Application)) if (R_SUCCEEDED(rc) && (__nx_applet_type == AppletType_Application))
{ {
@ -620,7 +620,7 @@ proto { \
return func((_s), ##__VA_ARGS__, (_rid)); \ return func((_s), ##__VA_ARGS__, (_rid)); \
} }
static Result _appletGetHandle(Service* srv, Handle* handle_out, u32 cmd_id) { static Result _appletCmdGetHandle(Service* srv, Handle* handle_out, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return serviceDispatch(srv, cmd_id, return serviceDispatch(srv, cmd_id,
.out_handle_attrs = { SfOutHandleAttr_HipcCopy }, .out_handle_attrs = { SfOutHandleAttr_HipcCopy },
@ -628,16 +628,16 @@ static Result _appletGetHandle(Service* srv, Handle* handle_out, u32 cmd_id) {
); );
} }
static Result _appletGetEvent(Service* srv, Event* out_event, bool autoclear, u32 cmd_id) { static Result _appletCmdGetEvent(Service* srv, Event* out_event, bool autoclear, u32 cmd_id) {
Handle tmp_handle = INVALID_HANDLE; Handle tmp_handle = INVALID_HANDLE;
Result rc = 0; Result rc = 0;
rc = _appletGetHandle(srv, &tmp_handle, cmd_id); rc = _appletCmdGetHandle(srv, &tmp_handle, cmd_id);
if (R_SUCCEEDED(rc)) eventLoadRemote(out_event, tmp_handle, autoclear); if (R_SUCCEEDED(rc)) eventLoadRemote(out_event, tmp_handle, autoclear);
return rc; return rc;
} }
static Result _appletGetSession(Service* srv, Service* srv_out, u32 cmd_id) { static Result _appletCmdGetSession(Service* srv, Service* srv_out, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return serviceDispatch(srv, cmd_id, return serviceDispatch(srv, cmd_id,
.out_num_objects = 1, .out_num_objects = 1,
@ -671,7 +671,7 @@ static Result _appletGetSessionProxy(Service* srv_out, Handle prochandle, u32 cm
); );
} }
static Result _appletGetSessionIn64(Service* srv, Service* srv_out, u64 inval, u32 cmd_id) { static Result _appletCmdGetSessionInU64(Service* srv, Service* srv_out, u64 inval, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return serviceDispatchIn(srv, cmd_id, inval, return serviceDispatchIn(srv, cmd_id, inval,
.out_num_objects = 1, .out_num_objects = 1,
@ -679,7 +679,7 @@ static Result _appletGetSessionIn64(Service* srv, Service* srv_out, u64 inval, u
); );
} }
static Result _appletGetSessionIn32(Service* srv, Service* srv_out, u32 inval, u32 cmd_id) { static Result _appletCmdGetSessionInU32(Service* srv, Service* srv_out, u32 inval, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return serviceDispatchIn(srv, cmd_id, inval, return serviceDispatchIn(srv, cmd_id, inval,
.out_num_objects = 1, .out_num_objects = 1,
@ -692,12 +692,12 @@ static Result _appletCmdNoIO(Service* srv, u32 cmd_id) {
return serviceDispatch(srv, cmd_id); return serviceDispatch(srv, cmd_id);
} }
static Result _appletCmdNoInOut64(Service* srv, u64 *out, u32 cmd_id) { static Result _appletCmdNoInOutU64(Service* srv, u64 *out, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return serviceDispatchOut(srv, cmd_id, *out); return serviceDispatchOut(srv, cmd_id, *out);
} }
static Result _appletCmdNoInOut32(Service* srv, u32 *out, u32 cmd_id) { static Result _appletCmdNoInOutU32(Service* srv, u32 *out, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return serviceDispatchOut(srv, cmd_id, *out); return serviceDispatchOut(srv, cmd_id, *out);
} }
@ -709,33 +709,31 @@ static Result _appletCmdNoInOutU8(Service* srv, u8 *out, u32 cmd_id) {
static Result _appletCmdNoInOutBool(Service* srv, bool *out, u32 cmd_id) { static Result _appletCmdNoInOutBool(Service* srv, bool *out, u32 cmd_id) {
u8 tmp=0; u8 tmp=0;
serviceAssumeDomain(srv);
Result rc = _appletCmdNoInOutU8(srv, &tmp, cmd_id); Result rc = _appletCmdNoInOutU8(srv, &tmp, cmd_id);
if (R_SUCCEEDED(rc) && out) *out = tmp!=0; if (R_SUCCEEDED(rc) && out) *out = tmp & 1;
return rc; return rc;
} }
static Result _appletCmdInU8(Service* srv, u8 inval, u64 cmd_id) { static Result _appletCmdInU8NoOut(Service* srv, u8 inval, u64 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return serviceDispatchIn(srv, cmd_id, inval); return serviceDispatchIn(srv, cmd_id, inval);
} }
static Result _appletCmdInU32(Service* srv, u32 inval, u32 cmd_id) { static Result _appletCmdInU32NoOut(Service* srv, u32 inval, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return serviceDispatchIn(srv, cmd_id, inval); return serviceDispatchIn(srv, cmd_id, inval);
} }
static Result _appletCmdInU64(Service* srv, u64 inval, u32 cmd_id) { static Result _appletCmdInU64NoOut(Service* srv, u64 inval, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return serviceDispatchIn(srv, cmd_id, inval); return serviceDispatchIn(srv, cmd_id, inval);
} }
static Result _appletCmdInBool(Service* srv, bool inval, u32 cmd_id) { static Result _appletCmdInBoolNoOut(Service* srv, bool inval, u32 cmd_id) {
serviceAssumeDomain(srv); return _appletCmdInU8NoOut(srv, inval!=0, cmd_id);
return _appletCmdInU8(srv, inval!=0, cmd_id);
} }
static Result _appletCmdInHandle64NoOut(Service* srv, Handle handle, u64 inval, u32 cmd_id) { static Result _appletCmdInHandleU64NoOut(Service* srv, Handle handle, u64 inval, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return serviceDispatchIn(srv, cmd_id, inval, return serviceDispatchIn(srv, cmd_id, inval,
.in_num_handles = 1, .in_num_handles = 1,
@ -743,7 +741,7 @@ static Result _appletCmdInHandle64NoOut(Service* srv, Handle handle, u64 inval,
); );
} }
static Result _appletCmdInHandle64OutSession(Service* srv, Service* srv_out, Handle handle, u64 inval, u32 cmd_id) { static Result _appletCmdInHandleU64OutSession(Service* srv, Service* srv_out, Handle handle, u64 inval, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return serviceDispatchIn(srv, cmd_id, inval, return serviceDispatchIn(srv, cmd_id, inval,
.in_num_handles = 1, .in_num_handles = 1,
@ -755,12 +753,12 @@ static Result _appletCmdInHandle64OutSession(Service* srv, Service* srv_out, Han
static Result _appletCmdInTmemNoOut(Service* srv, TransferMemory *tmem, u32 cmd_id) { static Result _appletCmdInTmemNoOut(Service* srv, TransferMemory *tmem, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return _appletCmdInHandle64NoOut(srv, tmem->handle, tmem->size, cmd_id); return _appletCmdInHandleU64NoOut(srv, tmem->handle, tmem->size, cmd_id);
} }
static Result _appletCmdInTmemOutSession(Service* srv, Service* srv_out, TransferMemory *tmem, u32 cmd_id) { static Result _appletCmdInTmemOutSession(Service* srv, Service* srv_out, TransferMemory *tmem, u32 cmd_id) {
serviceAssumeDomain(srv); serviceAssumeDomain(srv);
return _appletCmdInHandle64OutSession(srv, srv_out, tmem->handle, tmem->size, cmd_id); return _appletCmdInHandleU64OutSession(srv, srv_out, tmem->handle, tmem->size, cmd_id);
} }
static Result _appletCmdInSession(Service* srv, Service* srv_in, u32 cmd_id) { static Result _appletCmdInSession(Service* srv, Service* srv_in, u32 cmd_id) {
@ -772,22 +770,17 @@ static Result _appletCmdInSession(Service* srv, Service* srv_in, u32 cmd_id) {
} }
static Result _appletCmdInStorage(Service* srv, AppletStorage* s, u32 cmd_id) { static Result _appletCmdInStorage(Service* srv, AppletStorage* s, u32 cmd_id) {
Result rc=0;
if (!serviceIsActive(&s->s)) if (!serviceIsActive(&s->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
serviceAssumeDomain(srv); Result rc =_appletCmdInSession(srv, &s->s, cmd_id);
rc =_appletCmdInSession(srv, &s->s, cmd_id);
appletStorageClose(s); appletStorageClose(s);
return rc; return rc;
} }
static Result _appletCmdNoInOutStorage(Service* srv, AppletStorage* s, u32 cmd_id) { static Result _appletCmdNoInOutStorage(Service* srv, AppletStorage* s, u32 cmd_id) {
memset(s, 0, sizeof(AppletStorage)); memset(s, 0, sizeof(AppletStorage));
serviceAssumeDomain(srv); return _appletCmdGetSession(srv, &s->s, cmd_id);
return _appletGetSession(srv, &s->s, cmd_id);
} }
static Result _appletCmdSendBufNoOut(Service* srv, const void* buffer, size_t size, u32 cmd_id) { static Result _appletCmdSendBufNoOut(Service* srv, const void* buffer, size_t size, u32 cmd_id) {
@ -831,10 +824,10 @@ static Result _appletGetResolution(Service* srv, s32 *width, s32 *height, u32 cm
// ICommonStateGetter // ICommonStateGetter
IPC_MAKE_CMD_IMPL(static Result _appletReceiveMessage(u32 *out), &g_appletICommonStateGetter, 1, _appletCmdNoInOut32, out) IPC_MAKE_CMD_IMPL(static Result _appletReceiveMessage(u32 *out), &g_appletICommonStateGetter, 1, _appletCmdNoInOutU32, out)
IPC_MAKE_CMD_IMPL(static Result _appletGetOperationMode(u8 *out), &g_appletICommonStateGetter, 5, _appletCmdNoInOutU8, out) IPC_MAKE_CMD_IMPL(static Result _appletGetOperationMode(u8 *out), &g_appletICommonStateGetter, 5, _appletCmdNoInOutU8, out)
IPC_MAKE_CMD_IMPL(static Result _appletGetPerformanceMode(u32 *out), &g_appletICommonStateGetter, 6, _appletCmdNoInOut32, out) IPC_MAKE_CMD_IMPL(static Result _appletGetPerformanceMode(u32 *out), &g_appletICommonStateGetter, 6, _appletCmdNoInOutU32, out)
IPC_MAKE_CMD_IMPL( Result appletGetCradleStatus(u8 *status), &g_appletICommonStateGetter, 7, _appletCmdNoInOutU8, status) IPC_MAKE_CMD_IMPL( Result appletGetCradleStatus(u8 *status), &g_appletICommonStateGetter, 7, _appletCmdNoInOutU8, status)
Result appletGetBootMode(PmBootMode *mode) { Result appletGetBootMode(PmBootMode *mode) {
u8 tmp=0; u8 tmp=0;
@ -844,7 +837,7 @@ Result appletGetBootMode(PmBootMode *mode) {
} }
IPC_MAKE_CMD_IMPL(static Result _appletGetCurrentFocusState(u8 *out), &g_appletICommonStateGetter, 9, _appletCmdNoInOutU8, out) IPC_MAKE_CMD_IMPL(static Result _appletGetCurrentFocusState(u8 *out), &g_appletICommonStateGetter, 9, _appletCmdNoInOutU8, out)
IPC_MAKE_CMD_IMPL(static Result _appletGetAcquiredSleepLockEvent(Event *out_event), &g_appletICommonStateGetter, 13, _appletGetEvent, out_event, false) IPC_MAKE_CMD_IMPL(static Result _appletGetAcquiredSleepLockEvent(Event *out_event), &g_appletICommonStateGetter, 13, _appletCmdGetEvent, out_event, false)
static Result _appletWaitAcquiredSleepLockEvent(void) { static Result _appletWaitAcquiredSleepLockEvent(void) {
Result rc=0; Result rc=0;
@ -873,24 +866,30 @@ Result appletReleaseSleepLockTransiently(void) {
IPC_MAKE_CMD_IMPL(Result appletPushToGeneralChannel(AppletStorage *s), &g_appletICommonStateGetter, 20, _appletCmdInStorage, s) IPC_MAKE_CMD_IMPL(Result appletPushToGeneralChannel(AppletStorage *s), &g_appletICommonStateGetter, 20, _appletCmdInStorage, s)
static Result _appletGetHomeButtonRwLockAccessor(Service* srv, AppletLockAccessor *a, u32 cmd_id) { static Result _appletGetHomeButtonRwLockAccessor(Service* srv, AppletLockAccessor *a, u32 cmd_id) {
Result rc = _appletGetSession(srv, &a->s, cmd_id); Result rc = _appletCmdGetSession(srv, &a->s, cmd_id);
if (R_FAILED(rc)) if (R_FAILED(rc))
return rc; return rc;
rc = _appletGetEvent(&a->s, &a->event, false, 3); rc = _appletCmdGetEvent(&a->s, &a->event, false, 3);
if (R_FAILED(rc)) serviceClose(&a->s); if (R_FAILED(rc)) {
serviceAssumeDomain(&a->s);
serviceClose(&a->s);
}
return rc; return rc;
} }
IPC_MAKE_CMD_IMPL(Result appletGetHomeButtonReaderLockAccessor(AppletLockAccessor *a), &g_appletICommonStateGetter, 30, _appletGetHomeButtonRwLockAccessor, a) IPC_MAKE_CMD_IMPL(Result appletGetHomeButtonReaderLockAccessor(AppletLockAccessor *a), &g_appletICommonStateGetter, 30, _appletGetHomeButtonRwLockAccessor, a)
static Result _appletGetRwLockAccessor(Service* srv, AppletLockAccessor *a, s32 inval, u32 cmd_id) { static Result _appletGetRwLockAccessor(Service* srv, AppletLockAccessor *a, s32 inval, u32 cmd_id) {
Result rc = _appletGetSessionIn32(srv, &a->s, inval, cmd_id); Result rc = _appletCmdGetSessionInU32(srv, &a->s, inval, cmd_id);
if (R_FAILED(rc)) if (R_FAILED(rc))
return rc; return rc;
rc = _appletGetEvent(&a->s, &a->event, false, 3); rc = _appletCmdGetEvent(&a->s, &a->event, false, 3);
if (R_FAILED(rc)) serviceClose(&a->s); if (R_FAILED(rc)) {
serviceAssumeDomain(&a->s);
serviceClose(&a->s);
}
return rc; return rc;
} }
@ -936,18 +935,18 @@ Result appletSetVrModeEnabled(bool flag) {
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
if (hosversionBefore(7,0,0)) if (hosversionBefore(7,0,0))
return _appletCmdInBool(&g_appletICommonStateGetter, flag, 51); return _appletCmdInBoolNoOut(&g_appletICommonStateGetter, flag, 51);
return _appletCmdNoIO(&g_appletICommonStateGetter, flag ? 53 : 54); return _appletCmdNoIO(&g_appletICommonStateGetter, flag ? 53 : 54);
} }
IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetLcdBacklightOffEnabled(bool flag), &g_appletICommonStateGetter, 52, _appletCmdInBool, (4,0,0), flag) IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetLcdBacklightOffEnabled(bool flag), &g_appletICommonStateGetter, 52, _appletCmdInBoolNoOut, (4,0,0), flag)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletIsInControllerFirmwareUpdateSection(bool *out), &g_appletICommonStateGetter, 55, _appletCmdNoInOutBool, (3,0,0), out) IPC_MAKE_CMD_IMPL_HOSVER(Result appletIsInControllerFirmwareUpdateSection(bool *out), &g_appletICommonStateGetter, 55, _appletCmdNoInOutBool, (3,0,0), out)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetDefaultDisplayResolution(s32 *width, s32 *height), &g_appletICommonStateGetter, 60, _appletGetResolution, (3,0,0), width, height) IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetDefaultDisplayResolution(s32 *width, s32 *height), &g_appletICommonStateGetter, 60, _appletGetResolution, (3,0,0), width, height)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetDefaultDisplayResolutionChangeEvent(Event *out_event), &g_appletICommonStateGetter, 61, _appletGetEvent, (3,0,0), out_event, true) IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetDefaultDisplayResolutionChangeEvent(Event *out_event), &g_appletICommonStateGetter, 61, _appletCmdGetEvent, (3,0,0), out_event, true)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetHdcpAuthenticationState(s32 *state), &g_appletICommonStateGetter, 62, _appletCmdNoInOut32, (4,0,0), (u32*)state) IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetHdcpAuthenticationState(s32 *state), &g_appletICommonStateGetter, 62, _appletCmdNoInOutU32, (4,0,0), (u32*)state)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetHdcpAuthenticationStateChangeEvent(Event *out_event), &g_appletICommonStateGetter, 63, _appletGetEvent, (4,0,0), out_event, true) IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetHdcpAuthenticationStateChangeEvent(Event *out_event), &g_appletICommonStateGetter, 63, _appletCmdGetEvent, (4,0,0), out_event, true)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetTvPowerStateMatchingMode(AppletTvPowerStateMatchingMode mode), &g_appletICommonStateGetter, 64, _appletCmdInU32, (5,0,0), mode) IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetTvPowerStateMatchingMode(AppletTvPowerStateMatchingMode mode), &g_appletICommonStateGetter, 64, _appletCmdInU32NoOut, (5,0,0), mode)
Result appletGetApplicationIdByContentActionName(u64 *titleID, const char *name) { Result appletGetApplicationIdByContentActionName(u64 *titleID, const char *name) {
if (hosversionBefore(5,1,0)) if (hosversionBefore(5,1,0))
@ -965,15 +964,15 @@ Result appletSetCpuBoostMode(ApmCpuBoostMode mode) {
if (hosversionBefore(7,0,0)) if (hosversionBefore(7,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
rc = _appletCmdInU32(&g_appletICommonStateGetter, mode, 66); rc = _appletCmdInU32NoOut(&g_appletICommonStateGetter, mode, 66);
if (R_SUCCEEDED(rc)) g_appletCpuBoostMode = mode; if (R_SUCCEEDED(rc)) g_appletCpuBoostMode = mode;
return rc; return rc;
} }
IPC_MAKE_CMD_IMPL_HOSVER(Result appletPerformSystemButtonPressingIfInFocus(AppletSystemButtonType type), &g_appletICommonStateGetter, 80, _appletCmdInU32, (6,0,0), type) IPC_MAKE_CMD_IMPL_HOSVER(Result appletPerformSystemButtonPressingIfInFocus(AppletSystemButtonType type), &g_appletICommonStateGetter, 80, _appletCmdInU32NoOut, (6,0,0), type)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetPerformanceConfigurationChangedNotification(bool flag), &g_appletICommonStateGetter, 90, _appletCmdInBool, (7,0,0), flag) IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetPerformanceConfigurationChangedNotification(bool flag), &g_appletICommonStateGetter, 90, _appletCmdInBoolNoOut, (7,0,0), flag)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetCurrentPerformanceConfiguration(u32 *PerformanceConfiguration), &g_appletICommonStateGetter, 91, _appletCmdNoInOut32, (7,0,0), PerformanceConfiguration) IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetCurrentPerformanceConfiguration(u32 *PerformanceConfiguration), &g_appletICommonStateGetter, 91, _appletCmdNoInOutU32, (7,0,0), PerformanceConfiguration)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetOperationModeSystemInfo(u32 *info), &g_appletICommonStateGetter, 200, _appletCmdNoInOut32, (7,0,0), info) IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetOperationModeSystemInfo(u32 *info), &g_appletICommonStateGetter, 200, _appletCmdNoInOutU32, (7,0,0), info)
// ISelfController // ISelfController
@ -987,16 +986,16 @@ static Result _appletWaitLibraryAppletLaunchableEvent(void) {
Result rc=0; Result rc=0;
if (!eventActive(&g_appletLibraryAppletLaunchableEvent)) if (!eventActive(&g_appletLibraryAppletLaunchableEvent))
rc = _appletGetEvent(&g_appletISelfController, &g_appletLibraryAppletLaunchableEvent, false, 9); rc = _appletCmdGetEvent(&g_appletISelfController, &g_appletLibraryAppletLaunchableEvent, false, 9);
if (R_SUCCEEDED(rc)) rc = eventWait(&g_appletLibraryAppletLaunchableEvent, U64_MAX); if (R_SUCCEEDED(rc)) rc = eventWait(&g_appletLibraryAppletLaunchableEvent, U64_MAX);
return rc; return rc;
} }
IPC_MAKE_CMD_IMPL( Result appletSetScreenShotPermission(AppletScreenShotPermission permission), &g_appletISelfController, 10, _appletCmdInU32, permission) IPC_MAKE_CMD_IMPL( Result appletSetScreenShotPermission(AppletScreenShotPermission permission), &g_appletISelfController, 10, _appletCmdInU32NoOut, permission)
IPC_MAKE_CMD_IMPL(static Result _appletSetOperationModeChangedNotification(bool flag), &g_appletISelfController, 11, _appletCmdInBool, flag) IPC_MAKE_CMD_IMPL(static Result _appletSetOperationModeChangedNotification(bool flag), &g_appletISelfController, 11, _appletCmdInBoolNoOut, flag)
IPC_MAKE_CMD_IMPL(static Result _appletSetPerformanceModeChangedNotification(bool flag), &g_appletISelfController, 12, _appletCmdInBool, flag) IPC_MAKE_CMD_IMPL(static Result _appletSetPerformanceModeChangedNotification(bool flag), &g_appletISelfController, 12, _appletCmdInBoolNoOut, flag)
static Result _appletSetFocusHandlingMode(bool inval0, bool inval1, bool inval2) { static Result _appletSetFocusHandlingMode(bool inval0, bool inval1, bool inval2) {
const struct { const struct {
@ -1009,7 +1008,7 @@ static Result _appletSetFocusHandlingMode(bool inval0, bool inval1, bool inval2)
return serviceDispatchIn(&g_appletISelfController, 13, in); return serviceDispatchIn(&g_appletISelfController, 13, in);
} }
IPC_MAKE_CMD_IMPL(Result appletSetRestartMessageEnabled(bool flag), &g_appletISelfController, 14, _appletCmdInBool, flag) IPC_MAKE_CMD_IMPL(Result appletSetRestartMessageEnabled(bool flag), &g_appletISelfController, 14, _appletCmdInBoolNoOut, flag)
Result appletSetScreenShotAppletIdentityInfo(AppletIdentityInfo *info) { Result appletSetScreenShotAppletIdentityInfo(AppletIdentityInfo *info) {
if (hosversionBefore(3,0,0)) if (hosversionBefore(3,0,0))
@ -1019,13 +1018,13 @@ Result appletSetScreenShotAppletIdentityInfo(AppletIdentityInfo *info) {
return serviceDispatchIn(&g_appletISelfController, 15, *info); return serviceDispatchIn(&g_appletISelfController, 15, *info);
} }
IPC_MAKE_CMD_IMPL(static Result _appletSetOutOfFocusSuspendingEnabled(bool flag), &g_appletISelfController, 16, _appletCmdInBool, flag) IPC_MAKE_CMD_IMPL(static Result _appletSetOutOfFocusSuspendingEnabled(bool flag), &g_appletISelfController, 16, _appletCmdInBoolNoOut, flag)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetControllerFirmwareUpdateSection(bool flag), &g_appletISelfController, 17, _appletCmdInBool, (3,0,0), flag) IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetControllerFirmwareUpdateSection(bool flag), &g_appletISelfController, 17, _appletCmdInBoolNoOut, (3,0,0), flag)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetRequiresCaptureButtonShortPressedMessage(bool flag), &g_appletISelfController, 18, _appletCmdInBool, (3,0,0), flag) IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetRequiresCaptureButtonShortPressedMessage(bool flag), &g_appletISelfController, 18, _appletCmdInBoolNoOut, (3,0,0), flag)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetAlbumImageOrientation(AlbumImageOrientation orientation), &g_appletISelfController, 19, _appletCmdInU32, (3,0,0), orientation) IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetAlbumImageOrientation(AlbumImageOrientation orientation), &g_appletISelfController, 19, _appletCmdInU32NoOut, (3,0,0), orientation)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetDesirableKeyboardLayout(u32 layout), &g_appletISelfController, 20, _appletCmdInU32, (4,0,0), layout) IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetDesirableKeyboardLayout(u32 layout), &g_appletISelfController, 20, _appletCmdInU32NoOut, (4,0,0), layout)
IPC_MAKE_CMD_IMPL( Result appletCreateManagedDisplayLayer(u64 *out), &g_appletISelfController, 40, _appletCmdNoInOut64, out) IPC_MAKE_CMD_IMPL( Result appletCreateManagedDisplayLayer(u64 *out), &g_appletISelfController, 40, _appletCmdNoInOutU64, out)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletIsSystemBufferSharingEnabled(void), &g_appletISelfController, 41, _appletCmdNoIO, (4,0,0)) IPC_MAKE_CMD_IMPL_HOSVER(Result appletIsSystemBufferSharingEnabled(void), &g_appletISelfController, 41, _appletCmdNoIO, (4,0,0))
Result appletGetSystemSharedLayerHandle(u64 *SharedBufferHandle, u64 *SharedLayerHandle) { Result appletGetSystemSharedLayerHandle(u64 *SharedBufferHandle, u64 *SharedLayerHandle) {
if (hosversionBefore(4,0,0)) if (hosversionBefore(4,0,0))
@ -1043,8 +1042,8 @@ Result appletGetSystemSharedLayerHandle(u64 *SharedBufferHandle, u64 *SharedLaye
return rc; return rc;
} }
IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetSystemSharedBufferHandle(u64 *SharedBufferHandle) , &g_appletISelfController, 43, _appletCmdNoInOut64, (5,0,0), SharedBufferHandle) IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetSystemSharedBufferHandle(u64 *SharedBufferHandle) , &g_appletISelfController, 43, _appletCmdNoInOutU64, (5,0,0), SharedBufferHandle)
IPC_MAKE_CMD_IMPL( Result appletSetHandlesRequestToDisplay(bool flag), &g_appletISelfController, 50, _appletCmdInBool, flag) IPC_MAKE_CMD_IMPL( Result appletSetHandlesRequestToDisplay(bool flag), &g_appletISelfController, 50, _appletCmdInBoolNoOut, flag)
IPC_MAKE_CMD_IMPL( Result appletApproveToDisplay(void), &g_appletISelfController, 51, _appletCmdNoIO) IPC_MAKE_CMD_IMPL( Result appletApproveToDisplay(void), &g_appletISelfController, 51, _appletCmdNoIO)
Result appletOverrideAutoSleepTimeAndDimmingTime(s32 inval0, s32 inval1, s32 inval2, s32 inval3) { Result appletOverrideAutoSleepTimeAndDimmingTime(s32 inval0, s32 inval1, s32 inval2, s32 inval3) {
@ -1059,10 +1058,10 @@ Result appletOverrideAutoSleepTimeAndDimmingTime(s32 inval0, s32 inval1, s32 inv
return serviceDispatchIn(&g_appletISelfController, 60, in); return serviceDispatchIn(&g_appletISelfController, 60, in);
} }
IPC_MAKE_CMD_IMPL( Result appletSetIdleTimeDetectionExtension(AppletIdleTimeDetectionExtension ext), &g_appletISelfController, 62, _appletCmdInU32, ext) IPC_MAKE_CMD_IMPL( Result appletSetIdleTimeDetectionExtension(AppletIdleTimeDetectionExtension ext), &g_appletISelfController, 62, _appletCmdInU32NoOut, ext)
IPC_MAKE_CMD_IMPL( Result appletGetIdleTimeDetectionExtension(AppletIdleTimeDetectionExtension *ext), &g_appletISelfController, 63, _appletCmdNoInOut32, ext) IPC_MAKE_CMD_IMPL( Result appletGetIdleTimeDetectionExtension(AppletIdleTimeDetectionExtension *ext), &g_appletISelfController, 63, _appletCmdNoInOutU32, ext)
IPC_MAKE_CMD_IMPL( Result appletSetInputDetectionSourceSet(u32 val), &g_appletISelfController, 64, _appletCmdInU32, val) IPC_MAKE_CMD_IMPL( Result appletSetInputDetectionSourceSet(u32 val), &g_appletISelfController, 64, _appletCmdInU32NoOut, val)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletReportUserIsActive(void), &g_appletISelfController, 65, _appletCmdNoIO, (2,0,0)) IPC_MAKE_CMD_IMPL_HOSVER(Result appletReportUserIsActive(void), &g_appletISelfController, 65, _appletCmdNoIO, (2,0,0))
Result appletGetCurrentIlluminance(float *fLux) { Result appletGetCurrentIlluminance(float *fLux) {
if (hosversionBefore(3,0,0)) if (hosversionBefore(3,0,0))
@ -1073,7 +1072,7 @@ Result appletGetCurrentIlluminance(float *fLux) {
} }
IPC_MAKE_CMD_IMPL_HOSVER(Result appletIsIlluminanceAvailable(bool *out), &g_appletISelfController, 67, _appletCmdNoInOutBool, (3,0,0), out) IPC_MAKE_CMD_IMPL_HOSVER(Result appletIsIlluminanceAvailable(bool *out), &g_appletISelfController, 67, _appletCmdNoInOutBool, (3,0,0), out)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetAutoSleepDisabled(bool flag), &g_appletISelfController, 68, _appletCmdInBool, (5,0,0), flag) IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetAutoSleepDisabled(bool flag), &g_appletISelfController, 68, _appletCmdInBoolNoOut, (5,0,0), flag)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletIsAutoSleepDisabled(bool *out), &g_appletISelfController, 69, _appletCmdNoInOutBool, (5,0,0), out) IPC_MAKE_CMD_IMPL_HOSVER(Result appletIsAutoSleepDisabled(bool *out), &g_appletISelfController, 69, _appletCmdNoInOutBool, (5,0,0), out)
Result appletGetCurrentIlluminanceEx(bool *bOverLimit, float *fLux) { Result appletGetCurrentIlluminanceEx(bool *bOverLimit, float *fLux) {
@ -1087,14 +1086,14 @@ Result appletGetCurrentIlluminanceEx(bool *bOverLimit, float *fLux) {
serviceAssumeDomain(&g_appletISelfController); serviceAssumeDomain(&g_appletISelfController);
Result rc = serviceDispatchOut(&g_appletISelfController, 71, out); Result rc = serviceDispatchOut(&g_appletISelfController, 71, out);
if (R_SUCCEEDED(rc) && bOverLimit) *bOverLimit = out.bOverLimit!=0; if (R_SUCCEEDED(rc) && bOverLimit) *bOverLimit = out.bOverLimit & 1;
if (R_SUCCEEDED(rc) && fLux) *fLux = out.fLux; if (R_SUCCEEDED(rc) && fLux) *fLux = out.fLux;
return rc; return rc;
} }
IPC_MAKE_CMD_IMPL_HOSVER( Result appletSetWirelessPriorityMode(AppletWirelessPriorityMode mode), &g_appletISelfController, 80, _appletCmdInU32, (4,0,0), mode) IPC_MAKE_CMD_IMPL_HOSVER( Result appletSetWirelessPriorityMode(AppletWirelessPriorityMode mode), &g_appletISelfController, 80, _appletCmdInU32NoOut, (4,0,0), mode)
IPC_MAKE_CMD_IMPL_HOSVER(static Result _appletGetAccumulatedSuspendedTickValue(u64 *tick), &g_appletISelfController, 90, _appletCmdNoInOut64, (6,0,0), tick) IPC_MAKE_CMD_IMPL_HOSVER(static Result _appletGetAccumulatedSuspendedTickValue(u64 *tick), &g_appletISelfController, 90, _appletCmdNoInOutU64, (6,0,0), tick)
IPC_MAKE_CMD_IMPL_HOSVER(static Result _appletGetAccumulatedSuspendedTickChangedEvent(Event *out_event), &g_appletISelfController, 91, _appletGetEvent, (6,0,0), out_event, true) IPC_MAKE_CMD_IMPL_HOSVER(static Result _appletGetAccumulatedSuspendedTickChangedEvent(Event *out_event), &g_appletISelfController, 91, _appletCmdGetEvent, (6,0,0), out_event, true)
Result appletGetProgramTotalActiveTime(u64 *activeTime) { Result appletGetProgramTotalActiveTime(u64 *activeTime) {
if (!g_appletSuspendedTickInitialized) if (!g_appletSuspendedTickInitialized)
@ -1115,7 +1114,7 @@ Result appletGetProgramTotalActiveTime(u64 *activeTime) {
return rc; return rc;
} }
IPC_MAKE_CMD_IMPL_HOSVER( Result appletSetAlbumImageTakenNotificationEnabled(bool flag), &g_appletISelfController, 100, _appletCmdInBool, (7,0,0), flag) IPC_MAKE_CMD_IMPL_HOSVER( Result appletSetAlbumImageTakenNotificationEnabled(bool flag), &g_appletISelfController, 100, _appletCmdInBoolNoOut, (7,0,0), flag)
Result appletSetApplicationAlbumUserData(const void* buffer, size_t size) { Result appletSetApplicationAlbumUserData(const void* buffer, size_t size) {
if (hosversionBefore(8,0,0)) if (hosversionBefore(8,0,0))
@ -1130,7 +1129,7 @@ Result appletSetApplicationAlbumUserData(const void* buffer, size_t size) {
// IWindowController // IWindowController
IPC_MAKE_CMD_IMPL(static Result _appletGetAppletResourceUserId(u64 *out), &g_appletIWindowController, 1, _appletCmdNoInOut64, out) IPC_MAKE_CMD_IMPL(static Result _appletGetAppletResourceUserId(u64 *out), &g_appletIWindowController, 1, _appletCmdNoInOutU64, out)
Result appletGetAppletResourceUserId(u64 *out) { Result appletGetAppletResourceUserId(u64 *out) {
if (!serviceIsActive(&g_appletSrv)) if (!serviceIsActive(&g_appletSrv))
@ -1140,10 +1139,10 @@ Result appletGetAppletResourceUserId(u64 *out) {
return 0; return 0;
} }
IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetAppletResourceUserIdOfCallerApplet(u64 *out), &g_appletIWindowController, 2, _appletCmdNoInOut64, (6,0,0), out) IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetAppletResourceUserIdOfCallerApplet(u64 *out), &g_appletIWindowController, 2, _appletCmdNoInOutU64, (6,0,0), out)
IPC_MAKE_CMD_IMPL(static Result _appletAcquireForegroundRights(void), &g_appletIWindowController, 10, _appletCmdNoIO) IPC_MAKE_CMD_IMPL(static Result _appletAcquireForegroundRights(void), &g_appletIWindowController, 10, _appletCmdNoIO)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetAppletWindowVisibility(bool flag), &g_appletIWindowController, 20, _appletCmdInBool, (7,0,0), flag) IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetAppletWindowVisibility(bool flag), &g_appletIWindowController, 20, _appletCmdInBoolNoOut, (7,0,0), flag)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetAppletGpuTimeSlice(s64 val), &g_appletIWindowController, 21, _appletCmdInU64, (7,0,0), val) IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetAppletGpuTimeSlice(s64 val), &g_appletIWindowController, 21, _appletCmdInU64NoOut, (7,0,0), val)
// IAudioController // IAudioController
@ -1160,8 +1159,8 @@ Result appletSetExpectedMasterVolume(float mainAppletVolume, float libraryApplet
Result appletGetExpectedMasterVolume(float *mainAppletVolume, float *libraryAppletVolume) { Result appletGetExpectedMasterVolume(float *mainAppletVolume, float *libraryAppletVolume) {
Result rc=0; Result rc=0;
if (mainAppletVolume) rc = _appletCmdNoInOut32(&g_appletIAudioController, (u32*)mainAppletVolume, 1); // GetMainAppletExpectedMasterVolume if (mainAppletVolume) rc = _appletCmdNoInOutU32(&g_appletIAudioController, (u32*)mainAppletVolume, 1); // GetMainAppletExpectedMasterVolume
if (R_SUCCEEDED(rc) && libraryAppletVolume) rc = _appletCmdNoInOut32(&g_appletIAudioController, (u32*)libraryAppletVolume, 2); // GetLibraryAppletExpectedMasterVolume if (R_SUCCEEDED(rc) && libraryAppletVolume) rc = _appletCmdNoInOutU32(&g_appletIAudioController, (u32*)libraryAppletVolume, 2); // GetLibraryAppletExpectedMasterVolume
return rc; return rc;
} }
@ -1193,7 +1192,7 @@ static Result _appletGetCaptureImageEx(void* buffer, size_t size, bool *flag, u3
.buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out }, .buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
.buffers = { { buffer, size } }, .buffers = { { buffer, size } },
); );
if (R_SUCCEEDED(rc) && flag) *flag = tmp!=0; if (R_SUCCEEDED(rc) && flag) *flag = tmp & 1;
return rc; return rc;
} }
@ -1241,15 +1240,16 @@ Result appletClearCaptureBuffer(bool flag, AppletCaptureSharedBuffer captureBuf,
const struct { const struct {
u8 flag; u8 flag;
u8 pad[3];
s32 captureBuf; s32 captureBuf;
u32 color; u32 color;
} in = { flag!=0, captureBuf, color }; } in = { flag!=0, {0}, captureBuf, color };
serviceAssumeDomain(&g_appletIDisplayController); serviceAssumeDomain(&g_appletIDisplayController);
return serviceDispatchIn(&g_appletIDisplayController, 20, in); return serviceDispatchIn(&g_appletIDisplayController, 20, in);
} }
IPC_MAKE_CMD_IMPL_HOSVER(Result appletClearAppletTransitionBuffer(u32 color), &g_appletIDisplayController, 21, _appletCmdInU32, (3,0,0), color) IPC_MAKE_CMD_IMPL_HOSVER(Result appletClearAppletTransitionBuffer(u32 color), &g_appletIDisplayController, 21, _appletCmdInU32NoOut, (3,0,0), color)
static Result _appletAcquireCaptureSharedBuffer(bool *flag, s32 *id, u64 cmd_id) { static Result _appletAcquireCaptureSharedBuffer(bool *flag, s32 *id, u64 cmd_id) {
struct { struct {
@ -1259,7 +1259,7 @@ static Result _appletAcquireCaptureSharedBuffer(bool *flag, s32 *id, u64 cmd_id)
serviceAssumeDomain(&g_appletIDisplayController); serviceAssumeDomain(&g_appletIDisplayController);
Result rc = serviceDispatchOut(&g_appletIDisplayController, cmd_id, out); Result rc = serviceDispatchOut(&g_appletIDisplayController, cmd_id, out);
if (R_SUCCEEDED(rc) && flag) *flag = out.flag!=0; if (R_SUCCEEDED(rc) && flag) *flag = out.flag & 1;
if (R_SUCCEEDED(rc) && id) *id = out.id; if (R_SUCCEEDED(rc) && id) *id = out.id;
return rc; return rc;
} }
@ -1331,6 +1331,7 @@ IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(static Result _appletReserveToStartAndWait(App
// LockAccessor // LockAccessor
void appletLockAccessorClose(AppletLockAccessor *a) { void appletLockAccessorClose(AppletLockAccessor *a) {
eventClose(&a->event); eventClose(&a->event);
serviceAssumeDomain(&a->s);
serviceClose(&a->s); serviceClose(&a->s);
} }
@ -1343,7 +1344,7 @@ static Result _appletLockAccessorTryLock(AppletLockAccessor *a, bool get_handle,
.out_handle_attrs = { SfOutHandleAttr_HipcCopy }, .out_handle_attrs = { SfOutHandleAttr_HipcCopy },
.out_handles = &tmphandle, .out_handles = &tmphandle,
); );
if (R_SUCCEEDED(rc) && outflag) *outflag = tmpout!=0; if (R_SUCCEEDED(rc) && outflag) *outflag = tmpout & 1;
if (R_SUCCEEDED(rc) && handle_out) *handle_out = tmphandle; if (R_SUCCEEDED(rc) && handle_out) *handle_out = tmphandle;
return rc; return rc;
} }
@ -1411,7 +1412,7 @@ static Result _appletHolderCreateState(AppletHolder *h, LibAppletMode mode, bool
h->mode = mode; h->mode = mode;
h->creating_self = creating_self; h->creating_self = creating_self;
if (R_SUCCEEDED(rc)) rc = _appletGetEvent(&h->s, &h->StateChangedEvent, false, 0);//GetAppletStateChangedEvent if (R_SUCCEEDED(rc)) rc = _appletCmdGetEvent(&h->s, &h->StateChangedEvent, false, 0);//GetAppletStateChangedEvent
if (R_SUCCEEDED(rc) && hosversionAtLeast(2,0,0) && h->mode == LibAppletMode_BackgroundIndirect) rc = _appletGetIndirectLayerConsumerHandle(&h->s, &h->layer_handle); if (R_SUCCEEDED(rc) && hosversionAtLeast(2,0,0) && h->mode == LibAppletMode_BackgroundIndirect) rc = _appletGetIndirectLayerConsumerHandle(&h->s, &h->layer_handle);
@ -1441,7 +1442,7 @@ static Result _appletOpenExistingLibraryApplet(AppletHolder *h, Service* srv, u3
memset(h, 0, sizeof(AppletHolder)); memset(h, 0, sizeof(AppletHolder));
rc = _appletGetSession(srv, &h->s, cmd_id); rc = _appletCmdGetSession(srv, &h->s, cmd_id);
if (R_SUCCEEDED(rc)) rc = appletHolderGetLibraryAppletInfo(h, &info); if (R_SUCCEEDED(rc)) rc = appletHolderGetLibraryAppletInfo(h, &info);
@ -1469,6 +1470,7 @@ void appletHolderClose(AppletHolder *h) {
eventClose(&h->PopInteractiveOutDataEvent); eventClose(&h->PopInteractiveOutDataEvent);
eventClose(&h->StateChangedEvent); eventClose(&h->StateChangedEvent);
serviceAssumeDomain(&h->s);
serviceClose(&h->s); serviceClose(&h->s);
memset(h, 0, sizeof(AppletHolder)); memset(h, 0, sizeof(AppletHolder));
} }
@ -1543,7 +1545,7 @@ static Result _appletAccessorRequestExitOrTerminate(Service* srv, u64 timeout) {
if (!serviceIsActive(srv)) if (!serviceIsActive(srv))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
rc = _appletGetEvent(srv, &StateChangedEvent, false, 0);//GetAppletStateChangedEvent rc = _appletCmdGetEvent(srv, &StateChangedEvent, false, 0);//GetAppletStateChangedEvent
if (R_SUCCEEDED(rc)) rc = _appletCmdNoIO(srv, 20);//RequestExit if (R_SUCCEEDED(rc)) rc = _appletCmdNoIO(srv, 20);//RequestExit
@ -1593,12 +1595,12 @@ u32 appletHolderGetExitReason(AppletHolder *h) {
return h->exitreason; return h->exitreason;
} }
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletHolderSetOutOfFocusApplicationSuspendingEnabled(AppletHolder *h, bool flag), &h->s, 50, _appletCmdInBool, !_appletIsApplication(), flag) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletHolderSetOutOfFocusApplicationSuspendingEnabled(AppletHolder *h, bool flag), &h->s, 50, _appletCmdInBoolNoOut, !_appletIsApplication(), flag)
static Result _appletHolderGetPopInteractiveOutDataEvent(AppletHolder *h) { static Result _appletHolderGetPopInteractiveOutDataEvent(AppletHolder *h) {
if (eventActive(&h->PopInteractiveOutDataEvent)) return 0; if (eventActive(&h->PopInteractiveOutDataEvent)) return 0;
return _appletGetEvent(&h->s, &h->PopInteractiveOutDataEvent, false, 106); return _appletCmdGetEvent(&h->s, &h->PopInteractiveOutDataEvent, false, 106);
} }
bool appletHolderWaitInteractiveOut(AppletHolder *h) { bool appletHolderWaitInteractiveOut(AppletHolder *h) {
@ -1626,7 +1628,7 @@ IPC_MAKE_CMD_IMPL(Result appletHolderGetLibraryAppletInfo(AppletHolder *h, LibAp
Result appletCreateStorage(AppletStorage *s, s64 size) { Result appletCreateStorage(AppletStorage *s, s64 size) {
memset(s, 0, sizeof(AppletStorage)); memset(s, 0, sizeof(AppletStorage));
return _appletGetSessionIn64(&g_appletILibraryAppletCreator, &s->s, size, 10); return _appletCmdGetSessionInU64(&g_appletILibraryAppletCreator, &s->s, size, 10);
} }
static Result _appletCreateTransferMemoryStorage(Service* srv_out, TransferMemory *tmem, bool writable) { static Result _appletCreateTransferMemoryStorage(Service* srv_out, TransferMemory *tmem, bool writable) {
@ -1663,7 +1665,7 @@ Result appletCreateHandleStorage(AppletStorage *s, s64 inval, Handle handle) {
if (hosversionBefore(2,0,0)) if (hosversionBefore(2,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
return _appletCmdInHandle64OutSession(&g_appletILibraryAppletCreator, &s->s, handle, inval, 12); return _appletCmdInHandleU64OutSession(&g_appletILibraryAppletCreator, &s->s, handle, inval, 12);
} }
Result appletCreateHandleStorageTmem(AppletStorage *s, void* buffer, s64 size) { Result appletCreateHandleStorageTmem(AppletStorage *s, void* buffer, s64 size) {
@ -1682,6 +1684,7 @@ Result appletCreateHandleStorageTmem(AppletStorage *s, void* buffer, s64 size) {
} }
void appletStorageClose(AppletStorage *s) { void appletStorageClose(AppletStorage *s) {
serviceAssumeDomain(&s->s);
serviceClose(&s->s); serviceClose(&s->s);
} }
@ -1704,10 +1707,11 @@ Result appletStorageGetSize(AppletStorage *s, s64 *size) {
if (!serviceIsActive(&s->s)) if (!serviceIsActive(&s->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
rc = _appletGetSession(&s->s, &tmp_srv, 0);//Open rc = _appletCmdGetSession(&s->s, &tmp_srv, 0);//Open
if (R_FAILED(rc)) return rc; if (R_FAILED(rc)) return rc;
rc = _appletCmdNoInOut64(&tmp_srv, (u64*)size, 0); rc = _appletCmdNoInOutU64(&tmp_srv, (u64*)size, 0);
serviceAssumeDomain(&tmp_srv);
serviceClose(&tmp_srv); serviceClose(&tmp_srv);
return rc; return rc;
@ -1720,10 +1724,11 @@ static Result _appletStorageRW(AppletStorage *s, s64 offset, void* buffer, size_
if (!serviceIsActive(&s->s)) if (!serviceIsActive(&s->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
rc = _appletGetSession(&s->s, &tmp_srv, 0);//Open rc = _appletCmdGetSession(&s->s, &tmp_srv, 0);//Open
if (R_FAILED(rc)) return rc; if (R_FAILED(rc)) return rc;
if (R_SUCCEEDED(rc)) rc = _appletStorageAccessorRW(&tmp_srv, tmp_srv.pointer_buffer_size, offset, buffer, size, rw); if (R_SUCCEEDED(rc)) rc = _appletStorageAccessorRW(&tmp_srv, tmp_srv.pointer_buffer_size, offset, buffer, size, rw);
serviceAssumeDomain(&tmp_srv);
serviceClose(&tmp_srv); serviceClose(&tmp_srv);
return rc; return rc;
@ -1758,10 +1763,11 @@ Result appletStorageGetHandle(AppletStorage *s, s64 *out, Handle *handle) {
if (hosversionBefore(2,0,0)) if (hosversionBefore(2,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
rc = _appletGetSession(&s->s, &tmp_srv, 1);//OpenTransferStorage rc = _appletCmdGetSession(&s->s, &tmp_srv, 1);//OpenTransferStorage
if (R_FAILED(rc)) return rc; if (R_FAILED(rc)) return rc;
rc = _appletStorageGetHandle(&tmp_srv, out, handle); rc = _appletStorageGetHandle(&tmp_srv, out, handle);
serviceAssumeDomain(&tmp_srv);
serviceClose(&tmp_srv); serviceClose(&tmp_srv);
return rc; return rc;
@ -1824,7 +1830,7 @@ static Result _appletCreateApplicationAndPushAndRequestToStartForQuest(u64 title
} }
static Result _appletCreateApplicationAndRequestToStart(u64 titleID) { // [4.0.0+] static Result _appletCreateApplicationAndRequestToStart(u64 titleID) { // [4.0.0+]
return _appletCmdInU64(&g_appletIFunctions, titleID, 12); return _appletCmdInU64NoOut(&g_appletIFunctions, titleID, 12);
} }
static Result _appletCreateApplicationAndRequestToStartForQuest(u64 titleID, const AppletApplicationAttributeForQuest *attr) { // [4.0.0+] static Result _appletCreateApplicationAndRequestToStartForQuest(u64 titleID, const AppletApplicationAttributeForQuest *attr) { // [4.0.0+]
@ -1931,8 +1937,8 @@ Result appletRequestLaunchApplicationForQuest(u64 titleID, AppletStorage* s, con
return rc; return rc;
} }
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletGetDesiredLanguage(u64 *LanguageCode), &g_appletIFunctions, 21, _appletCmdNoInOut64, !_appletIsApplication(), LanguageCode) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletGetDesiredLanguage(u64 *LanguageCode), &g_appletIFunctions, 21, _appletCmdNoInOutU64, !_appletIsApplication(), LanguageCode)
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletSetTerminateResult(Result res), &g_appletIFunctions, 22, _appletCmdInU32, !_appletIsApplication(), res) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletSetTerminateResult(Result res), &g_appletIFunctions, 22, _appletCmdInU32NoOut, !_appletIsApplication(), res)
Result appletGetDisplayVersion(char *displayVersion) { Result appletGetDisplayVersion(char *displayVersion) {
char out[0x10]={0}; char out[0x10]={0};
@ -1969,10 +1975,10 @@ Result appletGetLaunchStorageInfoForDebug(FsStorageId *app_storageId, FsStorageI
return rc; return rc;
} }
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletBeginBlockingHomeButtonShortAndLongPressed(s64 val), &g_appletIFunctions, 30, _appletCmdInU64, !_appletIsApplication(), val) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletBeginBlockingHomeButtonShortAndLongPressed(s64 val), &g_appletIFunctions, 30, _appletCmdInU64NoOut, !_appletIsApplication(), val)
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletEndBlockingHomeButtonShortAndLongPressed(void), &g_appletIFunctions, 31, _appletCmdNoIO, !_appletIsApplication()) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletEndBlockingHomeButtonShortAndLongPressed(void), &g_appletIFunctions, 31, _appletCmdNoIO, !_appletIsApplication())
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletBeginBlockingHomeButton(s64 val), &g_appletIFunctions, 32, _appletCmdInU64, !_appletIsApplication(), val) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletBeginBlockingHomeButton(s64 val), &g_appletIFunctions, 32, _appletCmdInU64NoOut, !_appletIsApplication(), val)
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletEndBlockingHomeButton(void), &g_appletIFunctions, 33, _appletCmdNoIO, !_appletIsApplication()) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletEndBlockingHomeButton(void), &g_appletIFunctions, 33, _appletCmdNoIO, !_appletIsApplication())
void appletNotifyRunning(bool *out) { void appletNotifyRunning(bool *out) {
if (__nx_applet_type!=AppletType_Application || g_appletNotifiedRunning) return; if (__nx_applet_type!=AppletType_Application || g_appletNotifiedRunning) return;
@ -1998,14 +2004,14 @@ Result appletSetMediaPlaybackState(bool state) {
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
if (!_appletIsApplication()) if (!_appletIsApplication())
return _appletCmdInBool(&g_appletISelfController, state, 61);//SetMediaPlaybackState return _appletCmdInBoolNoOut(&g_appletISelfController, state, 61);//SetMediaPlaybackState
return _appletCmdInBool(&g_appletIFunctions, state, 60);//SetMediaPlaybackStateForApplication return _appletCmdInBoolNoOut(&g_appletIFunctions, state, 60);//SetMediaPlaybackStateForApplication
} }
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER( Result appletIsGamePlayRecordingSupported(bool *flag), &g_appletIFunctions, 65, _appletCmdNoInOutBool, !_appletIsRegularApplication(), (3,0,0), flag) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER( Result appletIsGamePlayRecordingSupported(bool *flag), &g_appletIFunctions, 65, _appletCmdNoInOutBool, !_appletIsRegularApplication(), (3,0,0), flag)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(static Result _appletInitializeGamePlayRecording(TransferMemory *tmem), &g_appletIFunctions, 66, _appletCmdInTmemNoOut, !_appletIsRegularApplication(), (3,0,0), tmem) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(static Result _appletInitializeGamePlayRecording(TransferMemory *tmem), &g_appletIFunctions, 66, _appletCmdInTmemNoOut, !_appletIsRegularApplication(), (3,0,0), tmem)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER( Result appletSetGamePlayRecordingState(bool state), &g_appletIFunctions, 67, _appletCmdInU32, !_appletIsRegularApplication() || g_appletRecordingInitialized==0, (3,0,0), state!=0) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER( Result appletSetGamePlayRecordingState(bool state), &g_appletIFunctions, 67, _appletCmdInU32NoOut, !_appletIsRegularApplication() || g_appletRecordingInitialized==0, (3,0,0), state!=0)
Result appletInitializeGamePlayRecording(void) { Result appletInitializeGamePlayRecording(void) {
Result rc=0; Result rc=0;
@ -2145,7 +2151,7 @@ Result appletSetApplicationCopyrightVisibility(bool visible) {
if (hosversionBefore(5,0,0)) if (hosversionBefore(5,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
return _appletCmdInBool(&g_appletIFunctions, visible, 102); return _appletCmdInBoolNoOut(&g_appletIFunctions, visible, 102);
} }
//Official sw has these under 'pdm'. //Official sw has these under 'pdm'.
@ -2243,8 +2249,8 @@ Result appletRestartProgram(const void* buffer, size_t size) {
return _appletExecuteProgram(AppletProgramSpecifyKind_RestartProgram, 0, buffer, size); return _appletExecuteProgram(AppletProgramSpecifyKind_RestartProgram, 0, buffer, size);
} }
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetPreviousProgramIndex(s32 *programIndex), &g_appletIFunctions, 123, _appletCmdNoInOut32, !_appletIsApplication(), (5,0,0), (u32*)programIndex) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetPreviousProgramIndex(s32 *programIndex), &g_appletIFunctions, 123, _appletCmdNoInOutU32, !_appletIsApplication(), (5,0,0), (u32*)programIndex)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetGpuErrorDetectedSystemEvent(Event *out_event), &g_appletIFunctions, 130, _appletGetEvent, !_appletIsApplication(), (8,0,0), out_event, false) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetGpuErrorDetectedSystemEvent(Event *out_event), &g_appletIFunctions, 130, _appletCmdGetEvent, !_appletIsApplication(), (8,0,0), out_event, false)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletCreateMovieMaker(Service* srv_out, TransferMemory *tmem), &g_appletIFunctions, 1000, _appletCmdInTmemOutSession, !_appletIsApplication(), (5,0,0), srv_out, tmem) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletCreateMovieMaker(Service* srv_out, TransferMemory *tmem), &g_appletIFunctions, 1000, _appletCmdInTmemOutSession, !_appletIsApplication(), (5,0,0), srv_out, tmem)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletPrepareForJit(void), &g_appletIFunctions, 1001, _appletCmdNoIO, !_appletIsApplication(), (5,0,0)) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletPrepareForJit(void), &g_appletIFunctions, 1001, _appletCmdNoIO, !_appletIsApplication(), (5,0,0))
@ -2254,7 +2260,7 @@ IPC_MAKE_CMD_IMPL_INITEXPR(Result appletRequestToGetForeground(void),
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletLockForeground(void), &g_appletIFunctions, 11, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletLockForeground(void), &g_appletIFunctions, 11, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet)
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletUnlockForeground(void), &g_appletIFunctions, 12, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletUnlockForeground(void), &g_appletIFunctions, 12, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet)
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletPopFromGeneralChannel(AppletStorage *s), &g_appletIFunctions, 20, _appletCmdNoInOutStorage, __nx_applet_type != AppletType_SystemApplet, s) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletPopFromGeneralChannel(AppletStorage *s), &g_appletIFunctions, 20, _appletCmdNoInOutStorage, __nx_applet_type != AppletType_SystemApplet, s)
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletGetPopFromGeneralChannelEvent(Event *out_event), &g_appletIFunctions, 21, _appletGetEvent, __nx_applet_type != AppletType_SystemApplet, out_event, false) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletGetPopFromGeneralChannelEvent(Event *out_event), &g_appletIFunctions, 21, _appletCmdGetEvent, __nx_applet_type != AppletType_SystemApplet, out_event, false)
IPC_MAKE_CMD_IMPL_INITEXPR(Result appletGetHomeButtonWriterLockAccessor(AppletLockAccessor *a), &g_appletIFunctions, 30, _appletGetHomeButtonRwLockAccessor, __nx_applet_type != AppletType_SystemApplet, a) IPC_MAKE_CMD_IMPL_INITEXPR(Result appletGetHomeButtonWriterLockAccessor(AppletLockAccessor *a), &g_appletIFunctions, 30, _appletGetHomeButtonRwLockAccessor, __nx_applet_type != AppletType_SystemApplet, a)
Result appletPopRequestLaunchApplicationForDebug(AccountUid *userIDs, s32 count, u64 *titleID, s32 *total_out) { Result appletPopRequestLaunchApplicationForDebug(AccountUid *userIDs, s32 count, u64 *titleID, s32 *total_out) {
@ -2293,21 +2299,21 @@ Result appletLaunchDevMenu(void) {
// IGlobalStateController // IGlobalStateController
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletStartSleepSequence(bool flag), &g_appletIGlobalStateController, 2, _appletCmdInBool, __nx_applet_type != AppletType_SystemApplet, flag) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletStartSleepSequence(bool flag), &g_appletIGlobalStateController, 2, _appletCmdInBoolNoOut, __nx_applet_type != AppletType_SystemApplet, flag)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletStartShutdownSequence(void), &g_appletIGlobalStateController, 3, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletStartShutdownSequence(void), &g_appletIGlobalStateController, 3, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletStartRebootSequence(void), &g_appletIGlobalStateController, 4, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletStartRebootSequence(void), &g_appletIGlobalStateController, 4, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletIsAutoPowerDownRequested(bool *out), &g_appletIGlobalStateController, 9, _appletCmdNoInOutBool, __nx_applet_type != AppletType_SystemApplet, (7,0,0), out) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletIsAutoPowerDownRequested(bool *out), &g_appletIGlobalStateController, 9, _appletCmdNoInOutBool, __nx_applet_type != AppletType_SystemApplet, (7,0,0), out)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletLoadAndApplyIdlePolicySettings(void), &g_appletIGlobalStateController, 10, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletLoadAndApplyIdlePolicySettings(void), &g_appletIGlobalStateController, 10, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletNotifyCecSettingsChanged(void), &g_appletIGlobalStateController, 11, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet, (2,0,0)) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletNotifyCecSettingsChanged(void), &g_appletIGlobalStateController, 11, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet, (2,0,0))
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletSetDefaultHomeButtonLongPressTime(s64 val), &g_appletIGlobalStateController, 12, _appletCmdInU64, __nx_applet_type != AppletType_SystemApplet, (3,0,0), val) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletSetDefaultHomeButtonLongPressTime(s64 val), &g_appletIGlobalStateController, 12, _appletCmdInU64NoOut, __nx_applet_type != AppletType_SystemApplet, (3,0,0), val)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletUpdateDefaultDisplayResolution(void), &g_appletIGlobalStateController, 13, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet, (3,0,0)) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletUpdateDefaultDisplayResolution(void), &g_appletIGlobalStateController, 13, _appletCmdNoIO, __nx_applet_type != AppletType_SystemApplet, (3,0,0))
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletShouldSleepOnBoot(bool *out), &g_appletIGlobalStateController, 14, _appletCmdNoInOutBool, __nx_applet_type != AppletType_SystemApplet, (3,0,0), out) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletShouldSleepOnBoot(bool *out), &g_appletIGlobalStateController, 14, _appletCmdNoInOutBool, __nx_applet_type != AppletType_SystemApplet, (3,0,0), out)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetHdcpAuthenticationFailedEvent(Event *out_event), &g_appletIGlobalStateController, 15, _appletGetEvent, __nx_applet_type != AppletType_SystemApplet, (4,0,0), out_event, false) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetHdcpAuthenticationFailedEvent(Event *out_event), &g_appletIGlobalStateController, 15, _appletCmdGetEvent, __nx_applet_type != AppletType_SystemApplet, (4,0,0), out_event, false)
// IApplicationCreator // IApplicationCreator
static Result _appletApplicationCreateState(AppletApplication *a) { static Result _appletApplicationCreateState(AppletApplication *a) {
return _appletGetEvent(&a->s, &a->StateChangedEvent, false, 0);//GetAppletStateChangedEvent return _appletCmdGetEvent(&a->s, &a->StateChangedEvent, false, 0);//GetAppletStateChangedEvent
} }
static Result _appletApplicationCreate(Service* srv, AppletApplication *a, u32 cmd_id) { static Result _appletApplicationCreate(Service* srv, AppletApplication *a, u32 cmd_id) {
@ -2315,7 +2321,7 @@ static Result _appletApplicationCreate(Service* srv, AppletApplication *a, u32 c
memset(a, 0, sizeof(AppletApplication)); memset(a, 0, sizeof(AppletApplication));
rc = _appletGetSession(srv, &a->s, cmd_id); rc = _appletCmdGetSession(srv, &a->s, cmd_id);
if (R_SUCCEEDED(rc)) rc = _appletApplicationCreateState(a); if (R_SUCCEEDED(rc)) rc = _appletApplicationCreateState(a);
@ -2327,7 +2333,7 @@ static Result _appletApplicationCreateIn64(Service* srv, AppletApplication *a, u
memset(a, 0, sizeof(AppletApplication)); memset(a, 0, sizeof(AppletApplication));
rc = _appletGetSessionIn64(srv, &a->s, val, cmd_id); rc = _appletCmdGetSessionInU64(srv, &a->s, val, cmd_id);
if (R_SUCCEEDED(rc)) rc = _appletApplicationCreateState(a); if (R_SUCCEEDED(rc)) rc = _appletApplicationCreateState(a);
@ -2343,6 +2349,7 @@ IPC_MAKE_CMD_IMPL_INITEXPR(Result appletPopFloatingApplicationForDevelopment(App
void appletApplicationClose(AppletApplication *a) { void appletApplicationClose(AppletApplication *a) {
eventClose(&a->StateChangedEvent); eventClose(&a->StateChangedEvent);
serviceAssumeDomain(&a->s);
serviceClose(&a->s); serviceClose(&a->s);
memset(a, 0, sizeof(AppletApplication)); memset(a, 0, sizeof(AppletApplication));
} }
@ -2399,14 +2406,15 @@ Result appletApplicationRequestExitLibraryAppletOrTerminate(AppletApplication *a
if (!serviceIsActive(&a->s)) if (!serviceIsActive(&a->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
rc = _appletGetSession(&a->s, &srv, 112);//GetCurrentLibraryApplet rc = _appletCmdGetSession(&a->s, &srv, 112);//GetCurrentLibraryApplet
if (R_SUCCEEDED(rc)) rc = _appletAccessorRequestExitOrTerminate(&srv, timeout); if (R_SUCCEEDED(rc)) rc = _appletAccessorRequestExitOrTerminate(&srv, timeout);
serviceAssumeDomain(&srv);
serviceClose(&srv); serviceClose(&srv);
return rc; return rc;
} }
IPC_MAKE_CMD_IMPL_HOSVER(Result appletApplicationGetApplicationId(AppletApplication *a, u64 *titleID), &a->s, 120, _appletCmdNoInOut64, (6,0,0), titleID) IPC_MAKE_CMD_IMPL_HOSVER(Result appletApplicationGetApplicationId(AppletApplication *a, u64 *titleID), &a->s, 120, _appletCmdNoInOutU64, (6,0,0), titleID)
Result appletApplicationPushLaunchParameter(AppletApplication *a, AppletLaunchParameterKind kind, AppletStorage* s) { Result appletApplicationPushLaunchParameter(AppletApplication *a, AppletLaunchParameterKind kind, AppletStorage* s) {
if (!serviceIsActive(&a->s)) if (!serviceIsActive(&a->s))
@ -2452,7 +2460,7 @@ Result appletApplicationSetUsers(AppletApplication *a, const AccountUid *userIDs
} }
IPC_MAKE_CMD_IMPL_HOSVER(Result appletApplicationCheckRightsEnvironmentAvailable(AppletApplication *a, bool *out), &a->s, 131, _appletCmdNoInOutBool, (6,0,0), out) IPC_MAKE_CMD_IMPL_HOSVER(Result appletApplicationCheckRightsEnvironmentAvailable(AppletApplication *a, bool *out), &a->s, 131, _appletCmdNoInOutBool, (6,0,0), out)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletApplicationGetNsRightsEnvironmentHandle(AppletApplication *a, u64 *handle), &a->s, 132, _appletCmdNoInOut64, (6,0,0), handle) IPC_MAKE_CMD_IMPL_HOSVER(Result appletApplicationGetNsRightsEnvironmentHandle(AppletApplication *a, u64 *handle), &a->s, 132, _appletCmdNoInOutU64, (6,0,0), handle)
Result appletApplicationGetDesirableUids(AppletApplication *a, AccountUid *userIDs, s32 count, s32 *total_out) { Result appletApplicationGetDesirableUids(AppletApplication *a, AccountUid *userIDs, s32 count, s32 *total_out) {
if (!serviceIsActive(&a->s)) if (!serviceIsActive(&a->s))
@ -2479,7 +2487,7 @@ Result appletApplicationHasSaveDataAccessPermission(AppletApplication *a, u64 ti
u8 tmpout=0; u8 tmpout=0;
serviceAssumeDomain(&a->s); serviceAssumeDomain(&a->s);
Result rc = serviceDispatchInOut(&a->s, 170, titleID, tmpout); Result rc = serviceDispatchInOut(&a->s, 170, titleID, tmpout);
if (R_SUCCEEDED(rc) && out) *out = tmpout!=0; if (R_SUCCEEDED(rc) && out) *out = tmpout & 1;
return rc; return rc;
} }
@ -2489,8 +2497,8 @@ IPC_MAKE_CMD_IMPL_INITEXPR( Result appletPopInData(AppletStorage *s),
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletPushOutData(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 1, _appletCmdInStorage, __nx_applet_type != AppletType_LibraryApplet, s) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletPushOutData(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 1, _appletCmdInStorage, __nx_applet_type != AppletType_LibraryApplet, s)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletPopInteractiveInData(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 2, _appletCmdNoInOutStorage, __nx_applet_type != AppletType_LibraryApplet, s) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletPopInteractiveInData(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 2, _appletCmdNoInOutStorage, __nx_applet_type != AppletType_LibraryApplet, s)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletPushInteractiveOutData(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 3, _appletCmdInStorage, __nx_applet_type != AppletType_LibraryApplet, s) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletPushInteractiveOutData(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 3, _appletCmdInStorage, __nx_applet_type != AppletType_LibraryApplet, s)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetPopInDataEvent(Event *out_event), &g_appletILibraryAppletSelfAccessor, 5, _appletGetEvent, __nx_applet_type != AppletType_LibraryApplet, out_event, false) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetPopInDataEvent(Event *out_event), &g_appletILibraryAppletSelfAccessor, 5, _appletCmdGetEvent, __nx_applet_type != AppletType_LibraryApplet, out_event, false)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetPopInteractiveInDataEvent(Event *out_event), &g_appletILibraryAppletSelfAccessor, 6, _appletGetEvent, __nx_applet_type != AppletType_LibraryApplet, out_event, false) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetPopInteractiveInDataEvent(Event *out_event), &g_appletILibraryAppletSelfAccessor, 6, _appletCmdGetEvent, __nx_applet_type != AppletType_LibraryApplet, out_event, false)
IPC_MAKE_CMD_IMPL_INITEXPR(static Result _appletExitProcessAndReturn(void), &g_appletILibraryAppletSelfAccessor, 10, _appletCmdNoIO, __nx_applet_type != AppletType_LibraryApplet) IPC_MAKE_CMD_IMPL_INITEXPR(static Result _appletExitProcessAndReturn(void), &g_appletILibraryAppletSelfAccessor, 10, _appletCmdNoIO, __nx_applet_type != AppletType_LibraryApplet)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetLibraryAppletInfo(LibAppletInfo *info), &g_appletILibraryAppletSelfAccessor, 11, _appletGetLibraryAppletInfo, __nx_applet_type != AppletType_LibraryApplet, info) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetLibraryAppletInfo(LibAppletInfo *info), &g_appletILibraryAppletSelfAccessor, 11, _appletGetLibraryAppletInfo, __nx_applet_type != AppletType_LibraryApplet, info)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetMainAppletIdentityInfo(AppletIdentityInfo *info), &g_appletILibraryAppletSelfAccessor, 12, _appletGetIdentityInfo, __nx_applet_type != AppletType_LibraryApplet, info) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetMainAppletIdentityInfo(AppletIdentityInfo *info), &g_appletILibraryAppletSelfAccessor, 12, _appletGetIdentityInfo, __nx_applet_type != AppletType_LibraryApplet, info)
@ -2526,14 +2534,14 @@ Result appletGetCallerAppletIdentityInfoStack(AppletIdentityInfo *stack, s32 cou
} }
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetNextReturnDestinationAppletIdentityInfo(AppletIdentityInfo *info), &g_appletILibraryAppletSelfAccessor, 18, _appletGetIdentityInfo, __nx_applet_type != AppletType_LibraryApplet, (4,0,0), info) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetNextReturnDestinationAppletIdentityInfo(AppletIdentityInfo *info), &g_appletILibraryAppletSelfAccessor, 18, _appletGetIdentityInfo, __nx_applet_type != AppletType_LibraryApplet, (4,0,0), info)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetDesirableKeyboardLayout(u32 *layout), &g_appletILibraryAppletSelfAccessor, 19, _appletCmdNoInOut32, __nx_applet_type != AppletType_LibraryApplet, (4,0,0), layout) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetDesirableKeyboardLayout(u32 *layout), &g_appletILibraryAppletSelfAccessor, 19, _appletCmdNoInOutU32, __nx_applet_type != AppletType_LibraryApplet, (4,0,0), layout)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletPopExtraStorage(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 20, _appletCmdNoInOutStorage, __nx_applet_type != AppletType_LibraryApplet, s) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletPopExtraStorage(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 20, _appletCmdNoInOutStorage, __nx_applet_type != AppletType_LibraryApplet, s)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetPopExtraStorageEvent(Event *out_event), &g_appletILibraryAppletSelfAccessor, 25, _appletGetEvent, __nx_applet_type != AppletType_LibraryApplet, out_event, false) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetPopExtraStorageEvent(Event *out_event), &g_appletILibraryAppletSelfAccessor, 25, _appletCmdGetEvent, __nx_applet_type != AppletType_LibraryApplet, out_event, false)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletUnpopInData(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 30, _appletCmdInStorage, __nx_applet_type != AppletType_LibraryApplet, s) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletUnpopInData(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 30, _appletCmdInStorage, __nx_applet_type != AppletType_LibraryApplet, s)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletUnpopExtraStorage(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 31, _appletCmdInStorage, __nx_applet_type != AppletType_LibraryApplet, s) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletUnpopExtraStorage(AppletStorage *s), &g_appletILibraryAppletSelfAccessor, 31, _appletCmdInStorage, __nx_applet_type != AppletType_LibraryApplet, s)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetIndirectLayerProducerHandle(u64 *out), &g_appletILibraryAppletSelfAccessor, 40, _appletCmdNoInOut64, __nx_applet_type != AppletType_LibraryApplet, (2,0,0), out) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetIndirectLayerProducerHandle(u64 *out), &g_appletILibraryAppletSelfAccessor, 40, _appletCmdNoInOutU64, __nx_applet_type != AppletType_LibraryApplet, (2,0,0), out)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetMainAppletApplicationDesiredLanguage(u64 *LanguageCode), &g_appletILibraryAppletSelfAccessor, 60, _appletCmdNoInOut64, __nx_applet_type != AppletType_LibraryApplet, (4,0,0), LanguageCode) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetMainAppletApplicationDesiredLanguage(u64 *LanguageCode), &g_appletILibraryAppletSelfAccessor, 60, _appletCmdNoInOutU64, __nx_applet_type != AppletType_LibraryApplet, (4,0,0), LanguageCode)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetCurrentApplicationId(u64 *titleID), &g_appletILibraryAppletSelfAccessor, 70, _appletCmdNoInOut64, __nx_applet_type != AppletType_LibraryApplet, (8,0,0), titleID) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletGetCurrentApplicationId(u64 *titleID), &g_appletILibraryAppletSelfAccessor, 70, _appletCmdNoInOutU64, __nx_applet_type != AppletType_LibraryApplet, (8,0,0), titleID)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletRequestExitToSelf(void), &g_appletILibraryAppletSelfAccessor, 80, _appletCmdNoIO, __nx_applet_type != AppletType_LibraryApplet, (6,0,0)) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletRequestExitToSelf(void), &g_appletILibraryAppletSelfAccessor, 80, _appletCmdNoIO, __nx_applet_type != AppletType_LibraryApplet, (6,0,0))
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletCreateGameMovieTrimmer(Service* srv_out, TransferMemory *tmem), &g_appletILibraryAppletSelfAccessor, 100, _appletCmdInTmemOutSession, __nx_applet_type != AppletType_LibraryApplet, (4,0,0), srv_out, tmem) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletCreateGameMovieTrimmer(Service* srv_out, TransferMemory *tmem), &g_appletILibraryAppletSelfAccessor, 100, _appletCmdInTmemOutSession, __nx_applet_type != AppletType_LibraryApplet, (4,0,0), srv_out, tmem)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletReserveResourceForMovieOperation(void), &g_appletILibraryAppletSelfAccessor, 101, _appletCmdNoIO, __nx_applet_type != AppletType_LibraryApplet, (5,0,0)) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletReserveResourceForMovieOperation(void), &g_appletILibraryAppletSelfAccessor, 101, _appletCmdNoIO, __nx_applet_type != AppletType_LibraryApplet, (5,0,0))
@ -2555,20 +2563,20 @@ Result appletGetMainAppletAvailableUsers(AccountUid *userIDs, s32 count, bool *f
.buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out }, .buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
.buffers = { { userIDs, count*sizeof(AccountUid) } }, .buffers = { { userIDs, count*sizeof(AccountUid) } },
); );
if (R_SUCCEEDED(rc) && flag) *flag = out.flag!=0; if (R_SUCCEEDED(rc) && flag) *flag = out.flag & 1;
if (R_SUCCEEDED(rc) && total_out) *total_out = out.total_out; if (R_SUCCEEDED(rc) && total_out) *total_out = out.total_out;
return rc; return rc;
} }
// IOverlayFunctions // IOverlayFunctions
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletBeginToWatchShortHomeButtonMessage(void), &g_appletIFunctions, 0, _appletCmdNoIO, __nx_applet_type != AppletType_OverlayApplet) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletBeginToWatchShortHomeButtonMessage(void), &g_appletIFunctions, 0, _appletCmdNoIO, __nx_applet_type != AppletType_OverlayApplet)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletEndToWatchShortHomeButtonMessage(void), &g_appletIFunctions, 1, _appletCmdNoIO, __nx_applet_type != AppletType_OverlayApplet) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletEndToWatchShortHomeButtonMessage(void), &g_appletIFunctions, 1, _appletCmdNoIO, __nx_applet_type != AppletType_OverlayApplet)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetApplicationIdForLogo(u64 *titleID), &g_appletIFunctions, 2, _appletCmdNoInOut64, __nx_applet_type != AppletType_OverlayApplet, titleID) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletGetApplicationIdForLogo(u64 *titleID), &g_appletIFunctions, 2, _appletCmdNoInOutU64, __nx_applet_type != AppletType_OverlayApplet, titleID)
IPC_MAKE_CMD_IMPL_INITEXPR( Result appletSetGpuTimeSliceBoost(u64 val), &g_appletIFunctions, 3, _appletCmdInU64, __nx_applet_type != AppletType_OverlayApplet, val) IPC_MAKE_CMD_IMPL_INITEXPR( Result appletSetGpuTimeSliceBoost(u64 val), &g_appletIFunctions, 3, _appletCmdInU64NoOut, __nx_applet_type != AppletType_OverlayApplet, val)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletSetAutoSleepTimeAndDimmingTimeEnabled(bool flag), &g_appletIFunctions, 4, _appletCmdInBool, __nx_applet_type != AppletType_OverlayApplet, (2,0,0), flag) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletSetAutoSleepTimeAndDimmingTimeEnabled(bool flag), &g_appletIFunctions, 4, _appletCmdInBoolNoOut, __nx_applet_type != AppletType_OverlayApplet, (2,0,0), flag)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletTerminateApplicationAndSetReason(Result reason), &g_appletIFunctions, 5, _appletCmdInU32, __nx_applet_type != AppletType_OverlayApplet, (2,0,0), reason) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletTerminateApplicationAndSetReason(Result reason), &g_appletIFunctions, 5, _appletCmdInU32NoOut, __nx_applet_type != AppletType_OverlayApplet, (2,0,0), reason)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletSetScreenShotPermissionGlobally(bool flag), &g_appletIFunctions, 6, _appletCmdInBool, __nx_applet_type != AppletType_OverlayApplet, (3,0,0), flag) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletSetScreenShotPermissionGlobally(bool flag), &g_appletIFunctions, 6, _appletCmdInBoolNoOut, __nx_applet_type != AppletType_OverlayApplet, (3,0,0), flag)
Result appletStartShutdownSequenceForOverlay(void) { Result appletStartShutdownSequenceForOverlay(void) {
Result rc=0; Result rc=0;
@ -2596,8 +2604,8 @@ Result appletStartRebootSequenceForOverlay(void) {
return rc; return rc;
} }
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletSetHandlingHomeButtonShortPressedEnabled(bool flag), &g_appletIFunctions, 20, _appletCmdInBool, __nx_applet_type != AppletType_OverlayApplet, (8,0,0), flag) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletSetHandlingHomeButtonShortPressedEnabled(bool flag), &g_appletIFunctions, 20, _appletCmdInBoolNoOut, __nx_applet_type != AppletType_OverlayApplet, (8,0,0), flag)
IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletBeginToObserveHidInputForDevelop(void), &g_appletIFunctions, 101, _appletCmdNoIO, __nx_applet_type != AppletType_OverlayApplet, (5,0,0)) IPC_MAKE_CMD_IMPL_INITEXPR_HOSVER(Result appletBeginToObserveHidInputForDevelop(void), &g_appletIFunctions, 101, _appletCmdNoIO, __nx_applet_type != AppletType_OverlayApplet, (5,0,0))
// IAppletCommonFunctions // IAppletCommonFunctions
@ -2642,16 +2650,16 @@ Result appletSetDisplayMagnification(float x, float y, float width, float height
return serviceDispatchIn(&g_appletIAppletCommonFunctions, 42, in); return serviceDispatchIn(&g_appletIAppletCommonFunctions, 42, in);
} }
IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetHomeButtonDoubleClickEnabled(bool flag), &g_appletIAppletCommonFunctions, 50, _appletCmdInBool, (8,0,0), flag) IPC_MAKE_CMD_IMPL_HOSVER(Result appletSetHomeButtonDoubleClickEnabled(bool flag), &g_appletIAppletCommonFunctions, 50, _appletCmdInBoolNoOut, (8,0,0), flag)
IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetHomeButtonDoubleClickEnabled(bool *out), &g_appletIAppletCommonFunctions, 51, _appletCmdNoInOutBool, (8,0,0), out) IPC_MAKE_CMD_IMPL_HOSVER(Result appletGetHomeButtonDoubleClickEnabled(bool *out), &g_appletIAppletCommonFunctions, 51, _appletCmdNoInOutBool, (8,0,0), out)
// IDebugFunctions // IDebugFunctions
IPC_MAKE_CMD_IMPL(Result appletOpenMainApplication(AppletApplication *a), &g_appletIDebugFunctions, 1, _appletApplicationCreate, a) IPC_MAKE_CMD_IMPL(Result appletOpenMainApplication(AppletApplication *a), &g_appletIDebugFunctions, 1, _appletApplicationCreate, a)
IPC_MAKE_CMD_IMPL(Result appletPerformSystemButtonPressing(AppletSystemButtonType type), &g_appletIDebugFunctions, 10, _appletCmdInU32, type) IPC_MAKE_CMD_IMPL(Result appletPerformSystemButtonPressing(AppletSystemButtonType type), &g_appletIDebugFunctions, 10, _appletCmdInU32NoOut, type)
IPC_MAKE_CMD_IMPL(Result appletInvalidateTransitionLayer(void), &g_appletIDebugFunctions, 20, _appletCmdNoIO) IPC_MAKE_CMD_IMPL(Result appletInvalidateTransitionLayer(void), &g_appletIDebugFunctions, 20, _appletCmdNoIO)
Result appletRequestLaunchApplicationWithUserAndArgumentForDebug(u64 titleID, const AccountUid *userIDs, size_t total_userIDs, bool flag, const void* buffer, size_t size) { Result appletRequestLaunchApplicationWithUserAndArgumentForDebug(u64 titleID, const AccountUid *userIDs, s32 total_userIDs, bool flag, const void* buffer, size_t size) {
if (hosversionBefore(6,0,0)) if (hosversionBefore(6,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);