mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-08-07 08:39:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved handling for appletNotifyRunning().

Browse Source
This commit is contained in:
yellows8 2017-12-24 23:31:58 -05:00
parent ec594bfbcf
commit 1fccd4a1bb
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ Result appletInitialize(void);
void appletExit(void); void appletExit(void);
Result appletGetAppletResourceUserId(u64 *out); Result appletGetAppletResourceUserId(u64 *out);
void appletNotifyRunning(u8 *out);
Result appletCreateManagedDisplayLayer(u64 *out); Result appletCreateManagedDisplayLayer(u64 *out);
/** /**

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

@ -26,6 +26,8 @@ static u8 g_appletOperationMode;
static u32 g_appletPerformanceMode; static u32 g_appletPerformanceMode;
static u8 g_appletFocusState; static u8 g_appletFocusState;
static bool g_appletNotifiedRunning = 0;
static appletHookCookie appletFirstHook; static appletHookCookie appletFirstHook;
void appletExit(void); void appletExit(void);
@ -34,7 +36,6 @@ static Result _appletGetSession(Handle sessionhandle, Handle* handle_out, u64 cm
static Result _appletGetSessionProxy(Handle sessionhandle, Handle* handle_out, u64 cmd_id, Handle prochandle, u8 *AppletAttribute); static Result _appletGetSessionProxy(Handle sessionhandle, Handle* handle_out, u64 cmd_id, Handle prochandle, u8 *AppletAttribute);
static Result _appletGetAppletResourceUserId(u64 *out); static Result _appletGetAppletResourceUserId(u64 *out);
static Result _appletNotifyRunning(u8 *out);
static Result appletSetFocusHandlingMode(u32 mode); static Result appletSetFocusHandlingMode(u32 mode);
@ -61,6 +62,7 @@ Result appletInitialize(void) {
if (__nx_applet_type==APPLET_TYPE_None) return 0; if (__nx_applet_type==APPLET_TYPE_None) return 0;
g_appletResourceUserId = 0; g_appletResourceUserId = 0;
g_appletNotifiedRunning = 0;
if (__nx_applet_type==APPLET_TYPE_Default) __nx_applet_type = APPLET_TYPE_Application; if (__nx_applet_type==APPLET_TYPE_Default) __nx_applet_type = APPLET_TYPE_Application;
@ -141,7 +143,7 @@ Result appletInitialize(void) {
if (R_SUCCEEDED(rc)) rc = appletSetFocusHandlingMode(0); if (R_SUCCEEDED(rc)) rc = appletSetFocusHandlingMode(0);
} }
if (R_SUCCEEDED(rc) && __nx_applet_auto_notifyrunning && __nx_applet_type==APPLET_TYPE_Application) rc = _appletNotifyRunning(NULL); if (R_SUCCEEDED(rc) && __nx_applet_auto_notifyrunning) appletNotifyRunning(NULL);
if (R_SUCCEEDED(rc)) rc = _appletGetOperationMode(&g_appletOperationMode); if (R_SUCCEEDED(rc)) rc = _appletGetOperationMode(&g_appletOperationMode);
if (R_SUCCEEDED(rc)) rc = _appletGetPerformanceMode(&g_appletPerformanceMode); if (R_SUCCEEDED(rc)) rc = _appletGetPerformanceMode(&g_appletPerformanceMode);
@ -439,10 +441,13 @@ Result appletGetAppletResourceUserId(u64 *out) {
return 0; return 0;
} }
static Result _appletNotifyRunning(u8 *out) { void appletNotifyRunning(u8 *out) {
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
if (__nx_applet_type!=APPLET_TYPE_Application || g_appletNotifiedRunning) return;
g_appletNotifiedRunning = 1;
struct { struct {
u64 magic; u64 magic;
u64 cmd_id; u64 cmd_id;
@ -472,7 +477,7 @@ static Result _appletNotifyRunning(u8 *out) {
} }
} }
return rc; if (R_FAILED(rc)) fatalSimple(rc);
} }
static Result _appletReceiveMessage(u32 *out) { static Result _appletReceiveMessage(u32 *out) {