Use proper NS control data commands, no need for libnxtc

XorTroll · XorTroll · commit f240f53f3797 · 2025-12-21T14:23:56.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -22,6 +22,3 @@
 [submodule "libs/libnx-ext"]
 	path = libs/libnx-ext
 	url = https://github.com/XorTroll/libnx-ext
-[submodule "libs/libnxtc"]
-	path = libs/libnxtc
-	url = https://github.com/DarkMatterCore/libnxtc
diff --git a/libs/libnx-ext b/libs/libnx-ext
@@ -1 +1 @@
-Subproject commit 90c16d7c6b605261b07e26aa1ce7b3f5863ee6a0
+Subproject commit c7a2c68df5bceff4e40735145614bf9c31595f5e
diff --git a/libs/libnxtc b/libs/libnxtc
diff --git a/libs/uCommon/source/ul/menu/menu_Entries.cpp b/libs/uCommon/source/ul/menu/menu_Entries.cpp
@@ -315,10 +315,10 @@ namespace ul::menu {
                 return;
             }
 
-            std::vector<AccountUid> uids;
-            UL_RC_ASSERT(acc::ListAccounts(uids));
+            std::vector<AccountUid> user_ids;
+            UL_RC_ASSERT(acc::ListAccounts(user_ids));
 
-            for(const auto &uid : uids) {
+            for(const auto &uid : user_ids) {
                 const auto menu_path = MakeMenuPath(is_emummc, uid);
                 fs::DeleteDirectory(menu_path);
 
diff --git a/projects/uMenu/Makefile b/projects/uMenu/Makefile
@@ -39,7 +39,6 @@ ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
 LIBUCOMMON		:=	$(CURDIR)/../../libs/uCommon
-LIBNXTC			:=	$(CURDIR)/../../libs/libnxtc
 LIBPU			:=	$(CURDIR)/../../libs/Plutonium/Plutonium
 LIBNX_EXT		:=	$(CURDIR)/../../libs/libnx-ext/libnx-ext
 LIBNX_IPCEXT	:=	$(CURDIR)/../../libs/libnx-ext/libnx-ipcext
@@ -51,7 +50,7 @@ LIBS	:= -lpu -lfreetype -lSDL2_mixer -lopusfile -lopus -lmodplug -lmpg123 -lvorb
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBDIRS	:= $(PORTLIBS) $(LIBNX) $(LIBUCOMMON) $(LIBNXTC) $(LIBPU) $(LIBNX_EXT) $(LIBNX_IPCEXT)
+LIBDIRS	:= $(PORTLIBS) $(LIBNX) $(LIBUCOMMON) $(LIBPU) $(LIBNX_EXT) $(LIBNX_IPCEXT)
 
 
 #---------------------------------------------------------------------------------
@@ -141,15 +140,13 @@ all: $(BUILD)
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
 	@$(MAKE) -C $(LIBUCOMMON)
-	@$(MAKE) -C $(LIBNXTC)
 	@$(MAKE) -C $(LIBPU)
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
 
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
 	@$(MAKE) clean -C $(LIBUCOMMON)
-	@$(MAKE) clean -C $(LIBNXTC)
 	@$(MAKE) clean -C $(LIBPU)
 	@rm -fr $(BUILD) $(TARGET).nsp $(TARGET).npdm $(TARGET).nso $(TARGET).elf
 
diff --git a/projects/uMenu/include/ul/menu/smi/sf/sf_PrivateService.hpp b/projects/uMenu/include/ul/menu/smi/sf/sf_PrivateService.hpp
@@ -13,9 +13,6 @@ namespace ul::menu::smi::sf {
     Result InitializePrivateService();
     void FinalizePrivateService();
 
-    Result QueryApplicationNacpMetadata(const u64 app_id, NacpMetadata *out_nacp_metadata);
-    Result QueryApplicationIcon(const u64 app_id, u8 *out_icon_buf, const size_t icon_size, size_t &out_icon_size);
-
     void RegisterOnMessageDetect(OnMessageCallback callback, const MenuMessage desired_msg = MenuMessage::Invalid);
 
 }
diff --git a/projects/uMenu/source/main.cpp b/projects/uMenu/source/main.cpp
@@ -14,17 +14,23 @@ ul::menu::ui::GlobalSettings g_GlobalSettings;
 
 namespace {
 
+    NsApplicationControlData g_TemporaryControlData;
+
     bool MenuControlEntryLoadFunction(const u64 app_id, std::string &out_name, std::string &out_author, std::string &out_version) {
-        ul::smi::sf::NacpMetadata nacp_metadata;
-        const auto rc = ul::menu::smi::sf::QueryApplicationNacpMetadata(app_id, &nacp_metadata);
-        if(R_FAILED(rc)) {
-            UL_LOG_WARN("Failed to query NACP for application %016lX: %s", app_id, ul::util::FormatResultDisplay(rc).c_str());
+        if(R_FAILED(nsextGetApplicationControlData(NsApplicationControlSource_Storage, app_id, &g_TemporaryControlData, sizeof(NsApplicationControlData), nullptr))) {
+            UL_LOG_WARN("Failed to get application control data for application %016lX", app_id);
+            return false;
+        }
+
+        NacpLanguageEntry *lang_entry = nullptr;
+        if(R_FAILED(nacpGetLanguageEntry(&g_TemporaryControlData.nacp, &lang_entry))) {
+            UL_LOG_WARN("Failed to get NACP language entry for application %016lX", app_id);
             return false;
         }
 
-        out_name = nacp_metadata.name;
-        out_author = nacp_metadata.author;
-        out_version = nacp_metadata.display_version;
+        out_name = lang_entry->name;
+        out_author = lang_entry->author;
+        out_version = g_TemporaryControlData.nacp.display_version;
         return true;
     }
 
diff --git a/projects/uMenu/source/ul/menu/smi/sf/sf_PrivateService.cpp b/projects/uMenu/source/ul/menu/smi/sf/sf_PrivateService.cpp
@@ -20,23 +20,6 @@ namespace ul::menu::smi::sf {
             );
         }
 
-        inline Result psrvQueryApplicationNacp(Service *srv, NacpMetadata *out_nacp_metadata, const u64 app_id) {
-            return serviceDispatchIn(srv, 2, app_id,
-                .buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
-                .buffers = { { out_nacp_metadata, sizeof(NacpMetadata) } },
-            );
-        }
-
-        inline Result psrvQueryApplicationIcon(Service *srv, u8 *out_icon_buf, const size_t icon_size, size_t &out_icon_size, const u64 app_id) {
-            size_t got_icon_size;
-            UL_RC_TRY(serviceDispatchInOut(srv, 3, app_id, got_icon_size,
-                .buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
-                .buffers = { { out_icon_buf, icon_size } }
-            ));
-            out_icon_size = got_icon_size;
-            return ResultSuccess;
-        }
-
         Service g_PrivateService;
 
         Result InitializePrivateServiceImpl() {
@@ -123,14 +106,6 @@ namespace ul::menu::smi::sf {
         g_Initialized = false;
     }
 
-    Result QueryApplicationNacpMetadata(const u64 app_id, NacpMetadata *out_nacp_metadata) {
-        return psrvQueryApplicationNacp(&g_PrivateService, out_nacp_metadata, app_id);
-    }
-
-    Result QueryApplicationIcon(const u64 app_id, u8 *out_icon_buf, const size_t icon_size, size_t &out_icon_size) {
-        return psrvQueryApplicationIcon(&g_PrivateService, out_icon_buf, icon_size, out_icon_size, app_id);
-    }
-
     void RegisterOnMessageDetect(OnMessageCallback callback, const MenuMessage desired_msg) {
         ScopedLock lk(g_CallbackTableLock);
 
diff --git a/projects/uMenu/source/ul/menu/ui/ui_Common.cpp b/projects/uMenu/source/ul/menu/ui/ui_Common.cpp
@@ -57,7 +57,7 @@ namespace ul::menu::ui {
         util::JSON g_ActiveThemeBgmJson;
         util::JSON g_DefaultThemeBgmJson;
 
-        u8 g_TempIconBuffer[sizeof(NsApplicationControlData::icon)] = {};
+        NsApplicationControlData g_TemporaryControlData;
 
     }
 
@@ -268,19 +268,19 @@ namespace ul::menu::ui {
     }
 
     pu::sdl2::TextureHandle::Ref LoadApplicationIconTexture(const u64 app_id) {
-        size_t icon_size;
+        u64 icon_size;
+
         const auto start_tick = armGetSystemTick();
-        const auto rc = smi::sf::QueryApplicationIcon(app_id, g_TempIconBuffer, sizeof(g_TempIconBuffer), icon_size);
+        const auto rc = nsextGetApplicationControlData(NsApplicationControlSource_Storage, app_id, &g_TemporaryControlData, sizeof(NsApplicationControlData), &icon_size);
+        if(R_FAILED(rc)) {
+            UL_LOG_WARN("Failed to get control data for application ID %016lX: %s", app_id, util::FormatResultDisplay(rc).c_str());
+            return nullptr;
+        }
         const auto end_tick = armGetSystemTick();
         const auto elapsed_time_ms = armTicksToNs(end_tick - start_tick) / 1'000'000;
         UL_LOG_INFO("Query application ID %016lX icon (elapsed time: %ld ms)", app_id, elapsed_time_ms);
-        if(R_SUCCEEDED(rc)) {
-            return pu::sdl2::TextureHandle::New(pu::ui::render::LoadImageFromBuffer(g_TempIconBuffer, icon_size));
-        }
-        else {
-            UL_LOG_WARN("Failed to get icon for application ID %016lX: %s", app_id, util::FormatResultDisplay(rc).c_str());
-            return nullptr;
-        }
+
+        return pu::sdl2::TextureHandle::New(pu::ui::render::LoadImageFromBuffer(g_TemporaryControlData.icon, icon_size));
     }
 
     void RebootSystem() {
diff --git a/projects/uSystem/include/ul/system/app/app_ControlCache.hpp b/projects/uSystem/include/ul/system/app/app_ControlCache.hpp
@@ -5,7 +5,7 @@
 
 namespace ul::system::app {
 
-    // NACP fields that nxtc does not cache but we still use (and thus cache ourselves independently)
+    // NACP fields that we care about
 
     struct ApplicationNacpMisc {
         char display_version[0x10];
@@ -28,10 +28,7 @@ namespace ul::system::app {
     void RequestCacheApplication(const u64 app_id);
     void RequestRemoveApplicationCache(const u64 app_id);
 
-    bool QueryApplicationNacp(const u64 app_id, smi::sf::NacpMetadata &out_nacp);
-    bool QueryApplicationIcon(const u64 app_id, u8 *out_icon_buf, const size_t icon_buf_size, size_t &out_actual_icon_size);
     bool QueryApplicationNacpMisc(const u64 app_id, ApplicationNacpMisc &out_nacp_misc);
-
     bool LoopQueryApplicationNacpMisc(const u64 app_id, ApplicationNacpMisc &out_nacp_misc);
 
 }
diff --git a/projects/uSystem/include/ul/system/smi/sf/sf_IPrivateService.hpp b/projects/uSystem/include/ul/system/smi/sf/sf_IPrivateService.hpp
@@ -17,8 +17,6 @@ namespace ul::system::smi::sf {
 #define UL_SYSTEM_SMI_SF_I_PRIVATE_SERVICE_INTERFACE_INFO(C, H) \
     AMS_SF_METHOD_INFO(C, H, 0, Result, Initialize, (const ::ams::sf::ClientProcessId &client_pid), (client_pid)) \
     AMS_SF_METHOD_INFO(C, H, 1, Result, TryPopMessageContext, (::ams::sf::Out<::ul::system::smi::sf::SfMenuMessageContext> &out_msg), (out_msg)) \
-    AMS_SF_METHOD_INFO(C, H, 2, Result, QueryApplicationNacpMetadata, (::ams::sf::Out<::ul::system::smi::sf::SfNacpMetadata> &out_nacp, const u64 app_id), (out_nacp, app_id)) \
-    AMS_SF_METHOD_INFO(C, H, 3, Result, QueryApplicationIcon, (::ams::sf::OutBuffer &out_icon, ::ams::sf::Out<size_t> &out_icon_size, const u64 app_id), (out_icon, out_icon_size, app_id))
 
 AMS_SF_DEFINE_INTERFACE(ams::ul::system::smi::sf, IPrivateService, UL_SYSTEM_SMI_SF_I_PRIVATE_SERVICE_INTERFACE_INFO, 0xCAFEBABE)
 
@@ -33,8 +31,6 @@ namespace ul::system::smi::sf {
 
             ::ams::Result Initialize(const ::ams::sf::ClientProcessId &client_pid);
             ::ams::Result TryPopMessageContext(::ams::sf::Out<SfMenuMessageContext> &out_msg);
-            ::ams::Result QueryApplicationNacpMetadata(::ams::sf::Out<SfNacpMetadata> &out_nacp, const u64 app_id);
-            ::ams::Result QueryApplicationIcon(::ams::sf::OutBuffer &out_icon, ::ams::sf::Out<size_t> &out_icon_size, const u64 app_id);
     };
     static_assert(::ams::ul::system::smi::sf::IsIPrivateService<PrivateService>);
 
diff --git a/projects/uSystem/source/ul/system/app/app_ControlCache.cpp b/projects/uSystem/source/ul/system/app/app_ControlCache.cpp
@@ -61,23 +61,11 @@ namespace ul::system::app {
             }
         }
 
-        inline Result GetApplicationControlData(const u64 app_id, const bool force_ns, NsApplicationControlData *out_data, size_t &out_icon_size) {
+        inline Result GetApplicationControlData(const u64 app_id, NsApplicationControlData *out_data, size_t &out_icon_size) {
             size_t got_size;
-            Result rc;
-            if(!force_ns && hosversionAtLeast(20,0,0)) {
-                SetLanguage lang;
-                rc = ncmextReadApplicationControlDataManual(g_SystemLanguage, app_id, out_data, sizeof(*out_data), &got_size, &lang);
-                if(R_SUCCEEDED(rc)) {
-                    UL_LOG_INFO("[ApplicationControlCache] Read manually application control data for application ID 0x%016lX with language %d", app_id, lang);
-                }
-            }
-            else {
-                rc = nsGetApplicationControlData(NsApplicationControlSource_Storage, app_id, out_data, sizeof(*out_data), &got_size);
-                if(R_SUCCEEDED(rc)) {
-                    UL_LOG_INFO("[ApplicationControlCache] Got from NS application control data for application ID 0x%016lX", app_id);
-                }
-            }
+            const auto rc = nsextGetApplicationControlData(NsApplicationControlSource_Storage, app_id, out_data, sizeof(*out_data), &got_size);
             if(R_SUCCEEDED(rc)) {
+                UL_LOG_INFO("[ApplicationControlCache] Got from legacy NS application control data for application ID 0x%016lX", app_id);
                 UL_ASSERT_TRUE(got_size <= sizeof(*out_data));
                 out_icon_size = got_size - sizeof(NacpStruct);
             }
@@ -89,25 +77,11 @@ namespace ul::system::app {
             return fs::WriteFile(path, icon_buf, icon_buf_size, true);
         }
 
-        bool LoadApplicationIconCache(const u64 app_id, u8 *out_icon_buf, const size_t icon_buf_size, size_t &out_actual_icon_size) {
-            const auto path = fs::JoinPath(ApplicationCachePath, util::FormatProgramId(app_id) + ".jpg");
-            return fs::ReadAllFile(path, out_icon_buf, icon_buf_size, out_actual_icon_size);
-        }
-
         bool CacheApplicationNacpMetadata(const u64 app_id, const smi::sf::NacpMetadata &nacp_metadata) {
             const auto path = fs::JoinPath(ApplicationCachePath, util::FormatProgramId(app_id) + ".nacp.meta");
             return fs::WriteFile(path, &nacp_metadata, sizeof(nacp_metadata), true);
         }
 
-        bool LoadApplicationNacpMetadataCache(const u64 app_id, smi::sf::NacpMetadata &out_nacp_metadata) {
-            const auto path = fs::JoinPath(ApplicationCachePath, util::FormatProgramId(app_id) + ".nacp.meta");
-            size_t dummy;
-            if(!fs::ReadAllFile(path, &out_nacp_metadata, sizeof(out_nacp_metadata), dummy)) {
-                return false;
-            }
-            return dummy == sizeof(out_nacp_metadata);
-        }
-
         void AddNextApplicationCache() {
             ScopedLock lock(g_PendingApplicationCacheQueueLock);
 
@@ -128,7 +102,7 @@ namespace ul::system::app {
                             delete control_data;
                         });
 
-                        const auto rc = GetApplicationControlData(app_id, tries >= 5, control_data, icon_size);
+                        const auto rc = GetApplicationControlData(app_id, control_data, icon_size);
                         const auto end_tick = armGetSystemTick();
                         const auto elapsed_time_ms = armTicksToNs(end_tick - start_tick) / 1'000'000;
                         if(R_FAILED(rc)) {
@@ -154,15 +128,15 @@ namespace ul::system::app {
                             memcpy(meta.author, langentry->author, sizeof(meta.author));
                             memcpy(meta.display_version, control_data->nacp.display_version, sizeof(meta.display_version));
 
-                            // Populate nxtc cache
+                            // Cache icon + NACP
                             if(!CacheApplicationNacpMetadata(app_id, meta)) {
-                                UL_LOG_WARN("[ApplicationControlCache] Failed to add entry to nxtc cache for application ID 0x%016lX", app_id);
+                                UL_LOG_WARN("[ApplicationControlCache] Failed to cache NACP for application ID 0x%016lX", app_id);
                             }
                             else if(!CacheApplicationIcon(app_id, control_data->icon, icon_size)) {
-                                UL_LOG_WARN("[ApplicationControlCache] Failed to cache application icon for application ID 0x%016lX", app_id);
+                                UL_LOG_WARN("[ApplicationControlCache] Failed to cache icon for application ID 0x%016lX", app_id);
                             }
                             else {
-                                UL_LOG_INFO("[ApplicationControlCache] Added entry to nxtc cache for application ID 0x%016lX (icon size: %zu bytes)", app_id, icon_size);
+                                UL_LOG_INFO("[ApplicationControlCache] Made NACP + icon cache for application ID 0x%016lX (icon size: %zu bytes)", app_id, icon_size);
                             }
 
                             // Populate our misc cache
@@ -242,24 +216,6 @@ namespace ul::system::app {
         g_PendingApplicationRemovalCacheQueue->push(app_id);
     }
 
-    // Blazingly fast compared to 20.x NS commands
-
-    bool QueryApplicationNacp(const u64 app_id, smi::sf::NacpMetadata &out_nacp) {
-        if(!LoadApplicationNacpMetadataCache(app_id, out_nacp)) {
-            UL_LOG_WARN("Failed to load NACP metadata cache for application ID 0x%016lX!", app_id);
-            return false;
-        }
-        return true;
-    }
-
-    bool QueryApplicationIcon(const u64 app_id, u8 *out_icon_buf, const size_t icon_buf_size, size_t &out_actual_icon_size) {
-        if(!LoadApplicationIconCache(app_id, out_icon_buf, icon_buf_size, out_actual_icon_size)) {
-            UL_LOG_WARN("Failed to load application icon cache for application ID 0x%016lX!", app_id);
-            return false;
-        }
-        return true;
-    }
-
     bool QueryApplicationNacpMisc(const u64 app_id, ApplicationNacpMisc &out_nacp_misc) {
         ScopedLock lock(g_ApplicationCacheLock);
 
diff --git a/projects/uSystem/source/ul/system/smi/sf/sf_IPrivateService.cpp b/projects/uSystem/source/ul/system/smi/sf/sf_IPrivateService.cpp
@@ -46,60 +46,4 @@ namespace ul::system::smi::sf {
         }
     }
 
-    ::ams::Result PrivateService::QueryApplicationNacpMetadata(::ams::sf::Out<SfNacpMetadata> &out_nacp, const u64 app_id) {
-        if(!this->initialized) {
-            return ResultInvalidProcess;
-        }
-
-        UL_LOG_INFO("PrivateService::QueryApplicationNacpMetadata (app_id: 0x%016lX)", app_id);
-        
-        if(app::IsQueryLocked()) {
-            return ResultApplicationCacheBusy;
-        }
-
-        NacpMetadata meta;
-        if(!app::QueryApplicationNacp(app_id, meta)) {
-            return ResultApplicationNotCached;
-        }
-
-        app::ApplicationNacpMisc nacp_misc;
-        if(!app::QueryApplicationNacpMisc(app_id, nacp_misc)) {
-            return ResultApplicationNotCached;
-        }
-
-        auto out_name = out_nacp.GetPointer()->name;
-        strncpy(out_name, meta.name, sizeof(NacpMetadata::name) - 1);
-        out_name[sizeof(NacpMetadata::name) - 1] = '\0';
-
-        auto out_author = out_nacp.GetPointer()->author;
-        strncpy(out_author, meta.author, sizeof(NacpMetadata::author) - 1);
-        out_author[sizeof(NacpMetadata::author) - 1] = '\0';
-
-        auto out_display_version = out_nacp.GetPointer()->display_version;
-        strncpy(out_display_version, nacp_misc.display_version, sizeof(NacpMetadata::display_version) - 1);
-        out_display_version[sizeof(NacpMetadata::display_version) - 1] = '\0';
-
-        return ResultSuccess;
-    }
-
-    ::ams::Result PrivateService::QueryApplicationIcon(::ams::sf::OutBuffer &out_icon, ::ams::sf::Out<size_t> &out_icon_size, const u64 app_id) {
-        if(!this->initialized) {
-            return ResultInvalidProcess;
-        }
-
-        UL_LOG_INFO("PrivateService::QueryApplicationIcon (app_id: 0x%016lX)", app_id);
-
-        if(app::IsQueryLocked()) {
-            return ResultApplicationCacheBusy;
-        }
-
-        size_t actual_icon_size;
-        if(!app::QueryApplicationIcon(app_id, out_icon.GetPointer(), out_icon.GetSize(), actual_icon_size)) {
-            return ResultApplicationNotCached;
-        }
-        out_icon_size.SetValue(actual_icon_size);
-
-        return ResultSuccess;
-    }
-
 }
diff --git a/projects/uSystem/uSystem.mk b/projects/uSystem/uSystem.mk

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@ namespace ul::menu::smi::sf {`
`13`	`13`	`Result InitializePrivateService();`
`14`	`14`	`void FinalizePrivateService();`
`15`	`15`
`16`		`- Result QueryApplicationNacpMetadata(const u64 app_id, NacpMetadata *out_nacp_metadata);`
`17`		`- Result QueryApplicationIcon(const u64 app_id, u8 *out_icon_buf, const size_t icon_size, size_t &out_icon_size);`
`18`		`-`
`19`	`16`	`void RegisterOnMessageDetect(OnMessageCallback callback, const MenuMessage desired_msg = MenuMessage::Invalid);`
`20`	`17`
`21`	`18`	`}`