Various fixes, new NACP+icon cache system, and more

Author: XorTroll

libs/Atmosphere-libs

@@ -29,7 +29,7 @@ ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIC -ftls-model=local-exec
 
 CFLAGS	:=	-g -Wall -Werror -O2 -ffunction-sections -fdata-sections $(ARCH) $(INCLUDE) -D__SWITCH__ $(UL_DEFS)
 
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++20
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++23
 
 ASFLAGS	:=	-g $(ARCH)
 

libs/Plutonium

@@ -63,9 +63,9 @@ namespace ul::fs {
     inline bool WriteFile(const S &path, const void *data, const size_t size, const bool overwrite) {
         auto f = fopen(util::GetCString(path), overwrite ? "wb" : "ab+");
         if(f) {
-            fwrite(data, size, 1, f);
+            const auto written = fwrite(data, size, 1, f);
             fclose(f);
-            return true;
+            return written == 1;
         }
         else {
             return false;
@@ -85,6 +85,27 @@ namespace ul::fs {
         }
     }
 
+    template<typename S>
+    inline bool ReadAllFile(const S &path, void *data, const size_t size, size_t &out_actual_size) {
+        auto f = fopen(util::GetCString(path), "rb");
+        if(f) {
+            fseek(f, 0, SEEK_END);
+            const size_t file_size = ftell(f);
+            rewind(f);
+            if(file_size > size) {
+                fclose(f);
+                return false;
+            } 
+            out_actual_size = file_size;
+            const auto ok = fread(data, file_size, 1, f) == 1;
+            fclose(f);
+            return ok;
+        }
+        else {
+            return false;
+        }
+    }
+
     template<typename S>
     inline bool ReadFileAtOffset(const S &path, const size_t offset, void *data, const size_t size) {
         auto f = fopen(util::GetCString(path), "rb");

libs/libnx-ext

@@ -28,7 +28,7 @@ namespace ul::menu {
         SpecialEntryAmiibo
     };
 
-    using NacpLoadFunction = Result(*)(const u64 app_id, NacpStruct *out_nacp);
+    using ControlEntryLoadFunction = bool(*)(const u64 app_id, std::string &out_name, std::string &out_author, std::string &out_version);
 
     struct EntryApplicationInfo {
         u64 app_id;
@@ -145,7 +145,7 @@ namespace ul::menu {
     std::vector<Entry> LoadEntries(const std::string &path);
     const std::string &GetActiveMenuPath();
 
-    void SetNacpLoadFunction(NacpLoadFunction func);
+    void SetControlEntryLoadFunction(ControlEntryLoadFunction func);
 
     void EnsureApplicationEntry(const NsExtApplicationRecord &app_record, const std::string &menu_path = "");
     Entry CreateFolderEntry(const std::string &base_path, const std::string &folder_name, const s32 index = -1);

libs/uCommon/Makefile

@@ -3,7 +3,6 @@
 
 namespace ul::sf {
 
-    constexpr const char PrivateServiceName[] = "ulsf:p";
     constexpr const char PublicServiceName[] = "ulsf:u";
 
 }

libs/uCommon/include/ul/fs/fs_Stdio.hpp

@@ -0,0 +1,15 @@
+
+#pragma once
+#include <ul/ul_Include.hpp>
+
+namespace ul::smi::sf {
+
+    constexpr const char PrivateServiceName[] = "ulsf:p";
+
+    struct NacpMetadata {
+        char name[sizeof(NacpLanguageEntry::name)];
+        char author[sizeof(NacpLanguageEntry::author)];
+        char display_version[sizeof(NacpStruct::display_version)];
+    };
+
+}

libs/uCommon/include/ul/menu/menu_Entries.hpp

@@ -25,6 +25,7 @@ namespace ul {
 
     constexpr const char RootCachePath[] = "sdmc:/ulaunch/cache";
     constexpr const char HomebrewCachePath[] = "sdmc:/ulaunch/cache/hb";
+    constexpr const char ApplicationCachePath[] = "sdmc:/ulaunch/cache/app";
     constexpr const char ThemePreviewCachePath[] = "sdmc:/ulaunch/cache/preview";
     constexpr const char ActiveThemeCachePath[] = "sdmc:/ulaunch/cache/active";
 
@@ -77,11 +78,7 @@ namespace ul {
             }
 
             inline bool IsLocked() {
-                if(this->TryLock()) {
-                    this->Unlock();
-                    return false;
-                }
-                return true;
+                return mutexIsLockedByCurrentThread(&this->mutex);
             }
     };
 

libs/uCommon/include/ul/sf/sf_Base.hpp libs/uCommon/include/ul/sf/sf_Public.hpplibs/uCommon/include/ul/sf/sf_Base.hpp renamed to libs/uCommon/include/ul/sf/sf_Public.hpp

@@ -18,6 +18,7 @@ namespace ulaunch {
     R_DEFINE_ERROR_RESULT(NoMessagesAvailable, 202);
     R_DEFINE_ERROR_RESULT(ApplicationCacheBusy, 203);
     R_DEFINE_ERROR_RESULT(ApplicationNotCached, 204);
+    R_DEFINE_ERROR_RESULT(InsufficientIconSize, 205);
 
     R_DEFINE_ERROR_RANGE(Loader, 301, 399);
     R_DEFINE_ERROR_RESULT(InvalidProcessType, 301);