OS: Implement IAddOnContentManager::ListAddOnContent and IApplicationFunctions::GetDesiredLanguage

Author: N3xoX1

src/nxemu-module-spec/base.h

@@ -16,7 +16,7 @@
 
 enum
 {
-    MODULE_LOADER_SPECS_VERSION = 0x0105,
+    MODULE_LOADER_SPECS_VERSION = 0x0106,
     MODULE_VIDEO_SPECS_VERSION = 0x0102,
     MODULE_CPU_SPECS_VERSION = 0x0102,
     MODULE_OPERATING_SYSTEM_SPECS_VERSION = 0x0104,

src/nxemu-module-spec/system_loader.h

@@ -131,6 +131,7 @@ __interface IRomFsController
 
 __interface IFileSysNACP
 {
+    uint32_t GetSupportedLanguages() const = 0;
     uint32_t GetParentalControlFlag() const = 0;
     bool GetRatingAge(uint8_t * buffer, uint32_t bufferSize) const = 0;
     void Release() = 0;

src/nxemu-os/core/hle/service/am/service/application_functions.cpp

@@ -3,6 +3,7 @@
 
 #include "yuzu_common/settings.h"
 #include "yuzu_common/uuid.h"
+#include "core/file_sys/filesystem_interfaces.h"
 #include "core/hle/kernel/k_transfer_memory.h"
 #include "core/hle/service/am/am_results.h"
 #include "core/hle/service/am/applet.h"
@@ -13,6 +14,15 @@
 #include "core/hle/service/ns/application_manager_interface.h"
 #include "core/hle/service/ns/service_getter_interface.h"
 #include "core/hle/service/sm/sm.h"
+#include <nxemu-module-spec/system_loader.h>
+
+namespace FileSys {
+
+constexpr u64 GetUpdateTitleID(u64 base_title_id) {
+    return base_title_id | 0x800;
+}
+
+}
 
 namespace Service::AM {
 
@@ -126,7 +136,34 @@ Result IApplicationFunctions::GetDesiredLanguage(Out<u64> out_language_code) {
     // TODO(bunnei): This should be configurable
     LOG_DEBUG(Service_AM, "called");
 
-    UNIMPLEMENTED();
+    // Get supported languages from NACP, if possible
+    // Default to 0 (all languages supported)
+    u32 supported_languages = 0;
+
+    ISystemloader & loader = system.GetSystemloader();
+    IFileSysNACPPtr metadata(loader.GetPMControlMetadata(m_applet->program_id));
+    if (!metadata)
+    {
+        metadata = loader.GetPMControlMetadata(FileSys::GetUpdateTitleID(m_applet->program_id));
+    }
+
+    if (metadata) {
+        supported_languages = metadata->GetSupportedLanguages();
+    }
+
+    // Call IApplicationManagerInterface implementation.
+    auto& service_manager = system.ServiceManager();
+    auto ns_am2 = service_manager.GetService<NS::IServiceGetterInterface>("ns:am2");
+
+    std::shared_ptr<NS::IApplicationManagerInterface> app_man;
+    R_TRY(ns_am2->GetApplicationManagerInterface(&app_man));
+
+    // Get desired application language
+    NS::ApplicationLanguage desired_language{};
+    R_TRY(app_man->GetApplicationDesiredLanguage(&desired_language, supported_languages));
+
+    // Convert to settings language code.
+    R_TRY(app_man->ConvertApplicationLanguageToLanguageCode(out_language_code, desired_language));
 
     LOG_DEBUG(Service_AM, "got desired_language={:016X}", *out_language_code);
     R_SUCCEED();

src/nxemu-os/core/hle/service/aoc/addon_content_manager.cpp

@@ -18,6 +18,32 @@
 
 #include <nxemu-module-spec/system_loader.h>
 
+namespace FileSys {
+
+    constexpr u64 AOC_TITLE_ID_MASK = 0x7FF;
+    constexpr u64 BASE_TITLE_ID_MASK = 0xFFFFFFFFFFFFE000;
+
+    /**
+     * Gets the base title ID from a given title ID.
+     *
+     * @param title_id The title ID.
+     * @returns The base title ID.
+     */
+    [[nodiscard]] constexpr u64 GetBaseTitleID(u64 title_id) {
+        return title_id & BASE_TITLE_ID_MASK;
+    }
+
+    /**
+     * Gets the AOC (Add-On Content) ID from a given AOC title ID.
+     *
+     * @param aoc_title_id The AOC title ID.
+     * @returns The AOC ID.
+     */
+    [[nodiscard]] constexpr u64 GetAOCID(u64 aoc_title_id) {
+        return aoc_title_id & AOC_TITLE_ID_MASK;
+    }
+}
+
 namespace Service::AOC {
 
 static bool CheckAOCTitleIDMatchesBase(u64 title_id, u64 base) {
@@ -110,7 +136,31 @@ Result IAddOnContentManager::CountAddOnContent(Out<u32> out_count, ClientProcess
 Result IAddOnContentManager::ListAddOnContent(Out<u32> out_count,
                                               OutBuffer<BufferAttr_HipcMapAlias> out_addons,
                                               u32 offset, u32 count, ClientProcessId process_id) {
-    UNIMPLEMENTED();
+    LOG_DEBUG(Service_AOC, "called with offset={}, count={}, process_id={}", offset, count,
+              process_id.pid);
+
+    const auto current = FileSys::GetBaseTitleID(system.GetApplicationProcessProgramID());
+
+    std::vector<u32> out;
+    const auto& disabled = Settings::values.disabled_addons[current];
+    if (std::find(disabled.begin(), disabled.end(), "DLC") == disabled.end()) {
+        for (u64 content_id : add_on_content) {
+            if (FileSys::GetBaseTitleID(content_id) != current) {
+                continue;
+            }
+
+            out.push_back(static_cast<u32>(FileSys::GetAOCID(content_id)));
+        }
+    }
+
+    // TODO(DarkLordZach): Find the correct error code.
+    R_UNLESS(out.size() >= offset, ResultUnknown);
+
+    *out_count = static_cast<u32>(std::min<size_t>(out.size() - offset, count));
+    std::rotate(out.begin(), out.begin() + offset, out.end());
+
+    std::memcpy(out_addons.data(), out.data(), *out_count * sizeof(u32));
+
     R_SUCCEED();
 }