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

Improved internal web applet launching/exit handling.

Browse Source
This commit is contained in:
yellows8 2019-02-20 18:34:16 -05:00
parent d61c2d07b6
commit 425df41e7e
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
nx/source/applets/web.c
View File

@ -6,6 +6,23 @@
#include "applets/libapplet.h" #include "applets/libapplet.h"
#include "applets/web.h" #include "applets/web.h"
static Result _webLaunch(AppletHolder* holder, AppletId id, u32 version, void* arg, size_t arg_size) {
Result rc=0;
rc = appletCreateLibraryApplet(holder, id, LibAppletMode_AllForeground);
if (R_FAILED(rc)) return rc;
LibAppletArgs commonargs;
libappletArgsCreate(&commonargs, version);
rc = libappletArgsPush(&commonargs, holder);
if (R_SUCCEEDED(rc)) rc = libappletPushInData(holder, arg, arg_size);
if (R_SUCCEEDED(rc)) rc = appletHolderStart(holder);
return rc;
}
static Result _webHandleExit(AppletHolder* holder, void* reply_buffer, size_t reply_size) { static Result _webHandleExit(AppletHolder* holder, void* reply_buffer, size_t reply_size) {
Result rc=0; Result rc=0;
size_t transfer_size=0; size_t transfer_size=0;
@ -25,6 +42,19 @@ static Result _webHandleExit(AppletHolder* holder, void* reply_buffer, size_t re
return rc; return rc;
} }
static Result _webShow(AppletId id, u32 version, void* arg, size_t arg_size, void* reply_buffer, size_t reply_size) {
Result rc = 0;
AppletHolder holder;
rc = _webLaunch(&holder, id, version, arg, arg_size);
if (R_SUCCEEDED(rc)) rc = _webHandleExit(&holder, reply_buffer, reply_size);
appletHolderClose(&holder);
return rc;
}
void webWifiCreate(WebWifiConfig* config, const char* conntest_url, const char* initial_url, u128 userID, u32 unk) { void webWifiCreate(WebWifiConfig* config, const char* conntest_url, const char* initial_url, u128 userID, u32 unk) {
memset(config, 0, sizeof(WebWifiConfig)); memset(config, 0, sizeof(WebWifiConfig));
@ -38,23 +68,6 @@ void webWifiCreate(WebWifiConfig* config, const char* conntest_url, const char*
} }
Result webWifiShow(WebWifiConfig* config, WebWifiReturnValue *out) { Result webWifiShow(WebWifiConfig* config, WebWifiReturnValue *out) {
Result rc = 0; return _webShow(AppletId_wifiWebAuth, 0, &config->arg, sizeof(config->arg), out, sizeof(*out));
AppletHolder holder;
rc = appletCreateLibraryApplet(&holder, AppletId_wifiWebAuth, LibAppletMode_AllForeground);
if (R_FAILED(rc)) return rc;
LibAppletArgs commonargs;
libappletArgsCreate(&commonargs, 0);
rc = libappletArgsPush(&commonargs, &holder);
if (R_SUCCEEDED(rc)) rc = libappletPushInData(&holder, &config->arg, sizeof(config->arg));
if (R_SUCCEEDED(rc)) rc = appletHolderStart(&holder);
if (R_SUCCEEDED(rc)) rc = _webHandleExit(&holder, out, sizeof(*out));
appletHolderClose(&holder);
return rc;
} }