Mirrors/uLaunch
2
0
Fork 0
mirror of https://github.com/XorTroll/uLaunch synced 2024-11-10 06:24:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix first title launches, more minor changes

Browse source
This commit is contained in:
xor 2022-01-22 01:48:14 +01:00
parent 21dcf8ec22
commit 0db7fe9122
5 changed files with 46 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Atmosphere-libs

@ -1 +1 @@
Subproject commit cf765c0946cc5c828364ae6bfccddc4041304f28
Subproject commit 0d161b8588aa6482b84f3c44dd001055b01a047f

2
Plutonium

@ -1 +1 @@
Subproject commit fe5a9b96e52b70eceea493def38418fe021d2e74
Subproject commit 470139aaedd7d1051d9f7abdffb8536347daa7aa

70
uDaemon/source/Main.cpp
View file

@ -16,9 +16,22 @@
extern "C" {
extern u32 __nx_applet_type;
bool __nx_fsdev_support_cwd = false;
u32 __nx_fsdev_direntry_cache_size = 0;
// Needed by libnx's usbcomms to allocate internal buffers...
void *__libnx_alloc(size_t size) {
return operator new(size);
}
void *__libnx_aligned_alloc(size_t align, size_t size) {
return operator new(size, std::align_val_t(align));
}
void __libnx_free(void *ptr) {
return operator delete(ptr);
}
}
// Note: these are placed outside of an anonymous namespace since they are accessed by IPC
@ -57,7 +70,8 @@ namespace {
constexpr size_t UsbPacketSize = RawRGBAScreenBufferSize + sizeof(UsbMode);
alignas(ams::os::MemoryPageSize) constinit u8 g_HeapBuffer[10_MB];
constexpr size_t HeapSize = 10_MB;
alignas(ams::os::MemoryPageSize) constinit u8 g_HeapBuffer[HeapSize];
}
@ -116,9 +130,7 @@ namespace {
Result HandleGeneralChannel() {
AppletStorage sams_st;
R_TRY(appletPopFromGeneralChannel(&sams_st));
UL_ON_SCOPE_EXIT({
appletStorageClose(&sams_st);
});
UL_ON_SCOPE_EXIT({ appletStorageClose(&sams_st); });
os::SystemAppletMessage sams = {};
R_TRY(appletStorageRead(&sams_st, 0, &sams, sizeof(sams)));
@ -173,6 +185,7 @@ namespace {
}
case os::AppletMessage::SdCardOut: {
// Power off, since uMenu's UI relies on the SD card, so trying to use uMenu without the SD is quite risky...
// TODO: handle this in a better way?
appletStartShutdownSequence();
break;
}
@ -358,6 +371,7 @@ namespace {
// A valid version will always be >= 0x20000
if(g_WebAppletLaunchFlag.version > 0) {
if(!am::LibraryAppletIsActive()) {
// TODO: applet startup sound?
UL_ASSERT(am::WebAppletStart(&g_WebAppletLaunchFlag));
sth_done = true;
@ -375,8 +389,11 @@ namespace {
}
if(g_AlbumAppletLaunchFlag) {
if(!am::LibraryAppletIsActive()) {
u8 albumflag = 2;
UL_ASSERT(am::LibraryAppletStart(AppletId_LibraryAppletPhotoViewer, 0x10000, &albumflag, sizeof(albumflag)));
const struct {
u8 album_arg;
} album_data = { AlbumLaArg_ShowAllAlbumFilesForHomeMenu };
// TODO: applet startup sound?
UL_ASSERT(am::LibraryAppletStart(AppletId_LibraryAppletPhotoViewer, 0x10000, &album_data, sizeof(album_data)));
sth_done = true;
g_AlbumAppletLaunchFlag = false;
@ -392,26 +409,8 @@ namespace {
g_HbTargetApplicationLaunchFlag.nro_path[0] = '\0';
}
else {
/*
// Test
auto verify_buf = new (std::align_val_t(0x1000)) u8[0x100000]();
NsProgressAsyncResult async_rc;
UL_ASSERT(nsRequestVerifyApplication(&async_rc, g_ApplicationLaunchFlag, 0x7, verify_buf, 0x100000));
const auto async_rc_rc = nsProgressAsyncResultGet(&async_rc);
const auto async_rc_det_rc = nsProgressAsyncResultGetDetailResult(&async_rc);
nsProgressAsyncResultClose(&async_rc);
auto f = fopen(("sdmc:/" + std::to_string(g_ApplicationLaunchFlag) + ".verify.bin").c_str(), "wb");
if(f) {
fwrite(verify_buf, 1, 0x100000, f);
fclose(f);
}
delete[] verify_buf;
UL_ASSERT(async_rc_rc);
UL_ASSERT(async_rc_det_rc);
*/
// Ensure the application is launchable
UL_ASSERT(nsTouchApplication(g_ApplicationLaunchFlag));
UL_ASSERT(am::ApplicationStart(g_ApplicationLaunchFlag, false, g_SelectedUser));
}
sth_done = true;
@ -444,9 +443,15 @@ namespace {
const auto prev_applet_active = g_AppletActive;
g_AppletActive = am::LibraryAppletIsActive();
if(!sth_done && !prev_applet_active) {
// If nothing was done, but nothing is active... An application or applet might have crashed, terminated, failed to launch...
// No matter what is it, we reopen Menu in launch-error mode.
// If nothing was done but nothing is active. an application or applet might have crashed, terminated, failed to launch...
if(!am::ApplicationIsActive() && !am::LibraryAppletIsActive()) {
// Throw the application's result if it actually ended with a result
auto terminate_rc = ResultSuccess;
if(R_SUCCEEDED(nsGetApplicationTerminateResult(am::ApplicationGetId(), &terminate_rc))) {
UL_ASSERT(terminate_rc);
}
// Reopen uMenu in launch-error mode
auto status = CreateStatus();
UL_ASSERT(LaunchMenu(dmi::MenuStartMode::MenuLaunchFailure, status));
g_HbTargetOpenedAsApplication = false;
@ -560,14 +565,15 @@ namespace ams {
fsdevMountSdmc();
// TODO: disabling this doesn't really avoid ams aborting with new fws, shall we try to avoid that in a different way?
/* ams::CheckApiVersion(); */
}
void FinalizeSystemModule() { /* ... */ }
void FinalizeSystemModule() {}
void Startup() {
/* Initialize the global malloc allocator. */
init::InitializeAllocator(g_HeapBuffer, sizeof(g_HeapBuffer));
// Initialize the global malloc-free/new-delete allocator
init::InitializeAllocator(g_HeapBuffer, HeapSize);
}
}

10
uLaunch/source/am/am_LibraryApplet.cpp
View file

@ -68,10 +68,10 @@ namespace am {
LibraryAppletTerminate();
}
appletHolderClose(&g_AppletHolder);
LibAppletArgs largs;
libappletArgsCreate(&largs, la_version);
LibAppletArgs la_args;
libappletArgsCreate(&la_args, la_version);
R_TRY(appletCreateLibraryApplet(&g_AppletHolder, id, LibAppletMode_AllForeground));
R_TRY(libappletArgsPush(&largs, &g_AppletHolder));
R_TRY(libappletArgsPush(&la_args, &g_AppletHolder));
if(in_size > 0) {
R_TRY(LibraryAppletSend(in_data, in_size));
}
@ -119,10 +119,10 @@ namespace am {
}
AppletId LibraryAppletGetId() {
auto idcopy = g_LastAppletId;
auto last_id_copy = g_LastAppletId;
if(!LibraryAppletIsActive()) {
g_LastAppletId = AppletId_None;
}
return idcopy;
return last_id_copy;
}
}

2
uMenu/Makefile
View file

@ -27,7 +27,7 @@ EXEFS_SRC := exefs_src
#---------------------------------------------------------------------------------
# options for code generation
#---------------------------------------------------------------------------------
ARCH := -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE $(UL_APM_WRAPS) -Wl,-wrap,libappletStart -Wl,-wrap,libappletLaunch
ARCH := -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -Wl,-wrap,libappletStart -Wl,-wrap,libappletLaunch
CFLAGS := -g -Wall -O2 -ffunction-sections \
$(ARCH) $(DEFINES)