Bye bye eShop and parental controls, we only rely on album now!

Author: XorTroll

cur-changelog.md

@@ -8,6 +8,14 @@ Before anything, as always: new language texts were added to reflect the changes
 
 - Fixed issues where some theme files were not properly cache'd and thus would not load
 
+- Now, uLaunch's applet processes (uMenu, aka the visible HOME menu, and uLoader, aka any homebrew launched as applets from uMenu) are loaded over the *album* applet by default
+
+  - Previously, uMenu would run over *eShop* and uLoader over *parental controls* by default... which was a rather arbitrary choice made years ago
+
+  - Now uSystem's code has been adapted so that uLoader, uMenu and other used applets run over the same applet type (now uMenu, uLoader and the regular album all run over the *album* applet process) since that would have caused issues in prior versions
+
+  - This might be speculation, but running our stuff over *album* might probably be safer than using something like *eShop* ;)
+
 - The default string (if all language files failed to load) is now `<unknown>` instead of an empty string.
 
 - Invalid, previously selected homebrew takeover applications are reset (if you selected an application as homebrew takeover and then deleted the application, uLaunch would previously crash trying to launch homebrew over it,but now such invalid setting is automatically cleaned)

docs/udesigner.js

@@ -31,7 +31,7 @@ if (ENVIRONMENT_IS_NODE) {
 
 // --pre-jses are emitted after the Module integration code, so that they can
 // refer to Module (if they choose; they can also define Module)
-// include: /tmp/tmp_tjzxfcs.js
+// include: /tmp/tmpcm8urtic.js
 
   Module['expectedDataFileDownloads'] ??= 0;
   Module['expectedDataFileDownloads']++;
@@ -212,21 +212,21 @@ Module['FS_createPath']("/", "assets", true, true);
 
   })();
 
-// end include: /tmp/tmp_tjzxfcs.js
-// include: /tmp/tmpspovymhz.js
+// end include: /tmp/tmpcm8urtic.js
+// include: /tmp/tmp_ag4218_.js
 
     // All the pre-js content up to here must remain later on, we need to run
     // it.
     if (Module['$ww'] || (typeof ENVIRONMENT_IS_PTHREAD != 'undefined' && ENVIRONMENT_IS_PTHREAD)) Module['preRun'] = [];
     var necessaryPreJSTasks = Module['preRun'].slice();
-  // end include: /tmp/tmpspovymhz.js
-// include: /tmp/tmpqxq69bix.js
+  // end include: /tmp/tmp_ag4218_.js
+// include: /tmp/tmpxlmjqlzd.js
 
     if (!Module['preRun']) throw 'Module.preRun should exist because file support used it; did a pre-js delete it?';
     necessaryPreJSTasks.forEach((task) => {
       if (Module['preRun'].indexOf(task) < 0) throw 'All preRun tasks that exist before user pre-js code should remain after; did you replace Module or modify Module.preRun?';
     });
-  // end include: /tmp/tmpqxq69bix.js
+  // end include: /tmp/tmpxlmjqlzd.js
 
 
 // Sometimes an existing Module object exists with properties

docs/udesigner.wasm

@@ -151,11 +151,13 @@ namespace ul::cfg {
 
         template<typename T>
         inline bool SetEntry(const ConfigEntryId id, const T &t) {
-            for(auto &entry : this->entries) {
-                if(entry.header.id == id) {
-                    return entry.Set(t);
-                }
+            auto entry_it = std::find_if(this->entries.begin(), this->entries.end(), [&](const ConfigEntry &entry) {
+                return entry.header.id == id;
+            });
+            if(entry_it != this->entries.end()) {
+                return entry_it->Set(t);
             }
+
             // Create new entry
             ConfigEntry new_entry = {
                 .header = {
@@ -238,18 +240,19 @@ namespace ul::cfg {
 
         template<typename T>
         inline bool GetEntry(const ConfigEntryId id, T &out_t) const {
-            for(const auto &entry : this->entries) {
-                if(entry.header.id == id) {
-                    return entry.Get(out_t);
-                }
+            auto entry_it = std::find_if(this->entries.begin(), this->entries.end(), [&](const ConfigEntry &entry) {
+                return entry.header.id == id;
+            });
+            if(entry_it != this->entries.end()) {
+                return entry_it->Get(out_t);
             }
 
             // Default values
             switch(id) {
                 case ConfigEntryId::MenuTakeoverProgramId: {
                     if constexpr(std::is_same_v<T, u64>) {
-                        // Take over eShop by default
-                        out_t = 0x010000000000100B;
+                        // Take over Album by default
+                        out_t = 0x010000000000100D;
                         return true;
                     }
                     else {
@@ -258,8 +261,8 @@ namespace ul::cfg {
                 }
                 case ConfigEntryId::HomebrewAppletTakeoverProgramId: {
                     if constexpr(std::is_same_v<T, u64>) {
-                        // Take over parental control applet by default
-                        out_t = 0x0100000000001001;
+                        // Take over Album by default
+                        out_t = 0x010000000000100D;
                         return true;
                     }
                     else {

libs/uCommon/include/ul/cfg/cfg_Config.hpp

@@ -51,7 +51,7 @@ namespace ul {
     #define UL_LOG_WARN(log_fmt, ...) ::ul::LogImpl(::ul::LogKind::Warning, log_fmt, ##__VA_ARGS__)
 
     template<typename ...Args>
-    inline void NX_NORETURN OnAssertionFailed(const Result rc, const char *log_fmt, Args &&...args) {
+    NX_INLINE NX_NORETURN void OnAssertionFailed(const Result rc, const char *log_fmt, Args &&...args) {
         LogImpl(LogKind::Critical, log_fmt, args...);
 
         AbortImpl(rc);

libs/uCommon/include/ul/ul_Result.hpp

@@ -653,6 +653,9 @@ namespace ul::menu {
         // Treat empty menu path argument as to use the active menu path
         const auto actual_menu_path = menu_path.empty() ? g_ActiveMenuPath : menu_path;
 
+        // Menu path must be valid by this point
+        UL_ASSERT_TRUE(!actual_menu_path.empty());
+
         // Just fill enough fields needed to save the path
         const auto entry_idx = FindNextEntryIndex(actual_menu_path);
         Entry app_entry = {

libs/uCommon/source/ul/menu/menu_Entries.cpp

@@ -19,7 +19,6 @@ namespace ul::system::la {
 
     AppletId GetLastAppletId();
 
-    bool IsMenu();
     void SetMenuAppletId(const AppletId id);
     AppletId GetMenuAppletId();