some initial fw20 related fixes for qlaunch

src/core/hle/service/am/service/library_applet_creator.cpp

@@ -175,6 +175,7 @@ ILibraryAppletCreator::ILibraryAppletCreator(Core::System& system_, std::shared_
         {0, D<&ILibraryAppletCreator::CreateLibraryApplet>, "CreateLibraryApplet"},
         {1, nullptr, "TerminateAllLibraryApplets"},
         {2, nullptr, "AreAnyLibraryAppletsLeft"},
+        {3, D<&ILibraryAppletCreator::CreateLibraryAppletEx>, "CreateLibraryAppletEx"},
         {10, D<&ILibraryAppletCreator::CreateStorage>, "CreateStorage"},
         {11, D<&ILibraryAppletCreator::CreateTransferMemoryStorage>, "CreateTransferMemoryStorage"},
         {12, D<&ILibraryAppletCreator::CreateHandleStorage>, "CreateHandleStorage"},
@@ -210,6 +211,32 @@ Result ILibraryAppletCreator::CreateLibraryApplet(
     R_SUCCEED();
 }
 
+Result ILibraryAppletCreator::CreateLibraryAppletEx(
+    Out<SharedPointer<ILibraryAppletAccessor>> out_library_applet_accessor, AppletId applet_id,
+    LibraryAppletMode library_applet_mode, u64 thread_id) {
+    LOG_DEBUG(Service_AM, "called with applet_id={} applet_mode={} thread_id={}", applet_id,
+              library_applet_mode, thread_id);
+
+    std::shared_ptr<ILibraryAppletAccessor> library_applet;
+    if (ShouldCreateGuestApplet(applet_id)) {
+        library_applet =
+            CreateGuestApplet(system, m_window_system, m_applet, applet_id, library_applet_mode);
+    }
+    if (!library_applet) {
+        library_applet =
+            CreateFrontendApplet(system, m_window_system, m_applet, applet_id, library_applet_mode);
+    }
+    if (!library_applet) {
+        LOG_ERROR(Service_AM, "Applet doesn't exist! applet_id={}", applet_id);
+        R_THROW(ResultUnknown);
+    }
+
+    // Applet is created, can now be launched.
+    m_applet->library_applet_launchable_event.Signal();
+    *out_library_applet_accessor = library_applet;
+    R_SUCCEED();
+}
+
 Result ILibraryAppletCreator::CreateStorage(Out<SharedPointer<IStorage>> out_storage, s64 size) {
     LOG_DEBUG(Service_AM, "called, size={}", size);
 

src/core/hle/service/am/service/library_applet_creator.h

@@ -24,6 +24,9 @@ private:
     Result CreateLibraryApplet(
         Out<SharedPointer<ILibraryAppletAccessor>> out_library_applet_accessor, AppletId applet_id,
         LibraryAppletMode library_applet_mode);
+    Result CreateLibraryAppletEx(
+        Out<SharedPointer<ILibraryAppletAccessor>> out_library_applet_accessor, AppletId applet_id,
+        LibraryAppletMode library_applet_mode, u64 thread_id);
     Result CreateStorage(Out<SharedPointer<IStorage>> out_storage, s64 size);
     Result CreateTransferMemoryStorage(
         Out<SharedPointer<IStorage>> out_storage, bool is_writable, s64 size,

src/core/hle/service/ns/application_manager_interface.cpp

@@ -128,6 +128,7 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_
         {406, nullptr, "GetApplicationControlProperty"},
         {407, nullptr, "ListApplicationTitle"},
         {408, nullptr, "ListApplicationIcon"},
+        {419, D<&IApplicationManagerInterface::RequestDownloadApplicationControlDataInBackground>, "RequestDownloadApplicationControlDataInBackground"},
         {502, nullptr, "RequestCheckGameCardRegistration"},
         {503, nullptr, "RequestGameCardRegistrationGoldPoint"},
         {504, nullptr, "RequestRegisterGameCard"},
@@ -210,6 +211,7 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_
         {1703, nullptr, "GetApplicationViewDownloadErrorContext"},
         {1704, D<&IApplicationManagerInterface::GetApplicationViewWithPromotionInfo>, "GetApplicationViewWithPromotionInfo"},
         {1705, nullptr, "IsPatchAutoDeletableApplication"},
+        {1706, D<&IApplicationManagerInterface::Unknown1706>, "Unknown1706"},
         {1800, nullptr, "IsNotificationSetupCompleted"},
         {1801, nullptr, "GetLastNotificationInfoCount"},
         {1802, nullptr, "ListLastNotificationInfo"},
@@ -309,6 +311,7 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_
         {4022, D<&IApplicationManagerInterface::Unknown4022>, "Unknown4022"},
         {4023, D<&IApplicationManagerInterface::Unknown4023>, "Unknown4023"},
         {4088, D<&IApplicationManagerInterface::Unknown4022>, "Unknown4088"},
+        {4053, D<&IApplicationManagerInterface::Unknown4053>, "Unknown4053"},
         {9999, nullptr, "GetApplicationCertificate"},
     };
     // clang-format on
@@ -526,6 +529,37 @@ Result IApplicationManagerInterface::GetApplicationTerminateResult(Out<Result> o
     R_SUCCEED();
 }
 
+Result IApplicationManagerInterface::RequestDownloadApplicationControlDataInBackground(
+    u64 unk, u64 application_id) {
+    LOG_WARNING(Service_NS, "(STUBBED), app={:016X} unk={}", application_id, unk);
+    R_SUCCEED();
+}
+
+Result IApplicationManagerInterface::Unknown1706(
+    OutBuffer<BufferAttr_HipcAutoSelect> out_buffer_58,
+    InBuffer<BufferAttr_HipcMapAlias> in_buffer_8) {
+    LOG_WARNING(Service_NS, "(STUBBED) Unknown1706 called: out_size={} in_size={}",
+                out_buffer_58.size(), in_buffer_8.size());
+
+    if (out_buffer_58.size() < 0x58 || in_buffer_8.size() < 0x8) {
+        R_THROW(ResultUnknown);
+    }
+
+    u64 application_id = 0;
+    std::memcpy(&application_id, in_buffer_8.data(), sizeof(u64));
+
+    ApplicationView view{};
+    view.application_id = application_id;
+    view.unk = 0x70000;
+    view.flags = 0x401f17;
+
+    std::memset(out_buffer_58.data(), 0, out_buffer_58.size());
+    std::memcpy(out_buffer_58.data(), &view, sizeof(ApplicationView));
+
+
+    R_SUCCEED();
+}
+
 Result IApplicationManagerInterface::Unknown4022(
     OutCopyHandle<Kernel::KReadableEvent> out_event) {
     LOG_WARNING(Service_NS, "(STUBBED) called");
@@ -539,4 +573,9 @@ Result IApplicationManagerInterface::Unknown4023(Out<u64> out_result) {
     R_SUCCEED();
 }
 
+Result IApplicationManagerInterface::Unknown4053() {
+    LOG_WARNING(Service_NS, "(STUBBED) called.");
+    R_SUCCEED();
+}
+
 } // namespace Service::NS

src/core/hle/service/ns/application_manager_interface.h

@@ -55,6 +55,12 @@ public:
     Result GetApplicationTerminateResult(Out<Result> out_result, u64 application_id);
     Result Unknown4022(OutCopyHandle<Kernel::KReadableEvent> out_event);
     Result Unknown4023(Out<u64> out_result);
+    Result Unknown4053();
+
+    Result RequestDownloadApplicationControlDataInBackground(u64 unk,
+                                                             u64 application_id);
+    Result Unknown1706(OutBuffer<BufferAttr_HipcAutoSelect> out_buffer_58,
+                       InBuffer<BufferAttr_HipcMapAlias> in_buffer_8);
 
 private:
     KernelHelpers::ServiceContext service_context;

src/core/hle/service/ns/ns_types.h

@@ -81,10 +81,11 @@ static_assert(sizeof(PromotionInfo) == 0x20, "PromotionInfo has incorrect size."
 
 /// NsApplicationViewWithPromotionInfo
 struct ApplicationViewWithPromotionInfo {
-    ApplicationView view;    ///< \ref NsApplicationView
-    PromotionInfo promotion; ///< \ref NsPromotionInfo
+    ApplicationView view;           ///< \ref NsApplicationView
+    PromotionInfo promotion;        ///< \ref NsPromotionInfo
+    std::array<u8, 0x8> padding{};  ///< Extra padding for newer HOS versions
 };
-static_assert(sizeof(ApplicationViewWithPromotionInfo) == 0x70,
+static_assert(sizeof(ApplicationViewWithPromotionInfo) == 0x78,
               "ApplicationViewWithPromotionInfo has incorrect size.");
 
 struct ApplicationOccupiedSizeEntity {
@@ -113,4 +114,10 @@ struct Uid {
 };
 static_assert(sizeof(Uid) == 0x10, "Uid has incorrect size.");
 
+struct ApplicationDisplayData {
+    std::array<char, 0x200> application_name;
+    std::array<char, 0x100> developer_name;
+};
+static_assert(sizeof(ApplicationDisplayData) == 0x300, "ApplicationDisplayData has incorrect size.");
+
 } // namespace Service::NS

src/core/hle/service/ns/read_only_application_control_data_interface.cpp

@@ -7,6 +7,7 @@
 #include "core/file_sys/vfs/vfs.h"
 #include "core/hle/service/cmif_serialization.h"
 #include "core/hle/service/ns/language.h"
+#include "core/hle/service/ns/ns_types.h"
 #include "core/hle/service/ns/ns_results.h"
 #include "core/hle/service/ns/read_only_application_control_data_interface.h"
 #include "core/hle/service/set/settings_server.h"
@@ -23,6 +24,7 @@ IReadOnlyApplicationControlDataInterface::IReadOnlyApplicationControlDataInterfa
         {2, D<&IReadOnlyApplicationControlDataInterface::ConvertApplicationLanguageToLanguageCode>, "ConvertApplicationLanguageToLanguageCode"},
         {3, nullptr, "ConvertLanguageCodeToApplicationLanguage"},
         {4, nullptr, "SelectApplicationDesiredLanguage"},
+        {5, D<&IReadOnlyApplicationControlDataInterface::GetApplicationDisplayData>, "GetApplicationDisplayData"},
     };
     // clang-format on
 
@@ -119,4 +121,33 @@ Result IReadOnlyApplicationControlDataInterface::ConvertApplicationLanguageToLan
     R_SUCCEED();
 }
 
+Result IReadOnlyApplicationControlDataInterface::GetApplicationDisplayData(
+    OutBuffer<BufferAttr_HipcMapAlias> out_buffer, Out<u64> out_size, u64 language_code,
+    u64 application_id) {
+    LOG_INFO(Service_NS, "called with application_id={:016X}, language_code={:016X}",
+             application_id, language_code);
+
+    constexpr u64 payload_size = sizeof(ApplicationDisplayData);
+
+    if (out_buffer.size() < payload_size) {
+        LOG_ERROR(Service_NS, "output buffer is too small! (actual={}, expected_min={})",
+                  out_buffer.size(), payload_size);
+        R_THROW(ResultUnknown);
+    }
+
+    const FileSys::PatchManager pm{application_id, system.GetFileSystemController(),
+                                   system.GetContentProvider()};
+    const auto control = pm.GetControlMetadata();
+
+    ApplicationDisplayData display_data{};
+
+    std::memset(display_data.application_name.data(), 0, display_data.application_name.size());
+    std::memset(display_data.developer_name.data(), 0, display_data.developer_name.size());
+
+    std::memcpy(out_buffer.data(), &display_data, payload_size);
+    *out_size = payload_size;
+
+    R_SUCCEED();
+}
+
 } // namespace Service::NS

src/core/hle/service/ns/read_only_application_control_data_interface.h

@@ -4,9 +4,9 @@
 #pragma once
 
 #include "core/hle/service/cmif_types.h"
+#include "core/hle/service/service.h"
 #include "core/hle/service/ns/language.h"
 #include "core/hle/service/ns/ns_types.h"
-#include "core/hle/service/service.h"
 
 namespace Service::NS {
 
@@ -16,7 +16,6 @@ public:
     explicit IReadOnlyApplicationControlDataInterface(Core::System& system_);
     ~IReadOnlyApplicationControlDataInterface() override;
 
-public:
     Result GetApplicationControlData(OutBuffer<BufferAttr_HipcMapAlias> out_buffer,
                                      Out<u32> out_actual_size,
                                      ApplicationControlSource application_control_source,
@@ -25,6 +24,10 @@ public:
                                          u32 supported_languages);
     Result ConvertApplicationLanguageToLanguageCode(Out<u64> out_language_code,
                                                     ApplicationLanguage application_language);
+
+    Result GetApplicationDisplayData(OutBuffer<BufferAttr_HipcMapAlias> out_buffer,
+                                     Out<u64> out_size, u64 language_code,
+                                     u64 application_id);
 };
 
 } // namespace Service::NS

src/core/hle/service/ns/read_only_application_record_interface.cpp

@@ -3,6 +3,8 @@
 
 #include "core/hle/service/cmif_serialization.h"
 #include "core/hle/service/ns/read_only_application_record_interface.h"
+#include "core/hle/service/ns/ns_types.h"
+#include "core/hle/service/ns/application_manager_interface.h"
 
 namespace Service::NS {
 
@@ -13,6 +15,8 @@ IReadOnlyApplicationRecordInterface::IReadOnlyApplicationRecordInterface(Core::S
         {1, nullptr, "NotifyApplicationFailure"},
         {2, D<&IReadOnlyApplicationRecordInterface::IsDataCorruptedResult>,
          "IsDataCorruptedResult"},
+        {3, D<&IReadOnlyApplicationRecordInterface::ListApplicationRecord>,
+         "ListApplicationRecord"},
     };
     // clang-format on
 
@@ -35,4 +39,14 @@ Result IReadOnlyApplicationRecordInterface::IsDataCorruptedResult(
     R_SUCCEED();
 }
 
+Result IReadOnlyApplicationRecordInterface::ListApplicationRecord(
+    OutArray<ApplicationRecord, BufferAttr_HipcMapAlias> out_records, Out<s32> out_count,
+    s32 entry_offset) {
+    LOG_DEBUG(Service_NS, "delegating to IApplicationManagerInterface::ListApplicationRecord, offset={} limit={}",
+              entry_offset, out_records.size());
+
+    R_RETURN(IApplicationManagerInterface(system).ListApplicationRecord(out_records, out_count,
+                                                                        entry_offset));
+}
+
 } // namespace Service::NS

src/core/hle/service/ns/read_only_application_record_interface.h

@@ -5,6 +5,7 @@
 
 #include "core/hle/service/cmif_types.h"
 #include "core/hle/service/service.h"
+#include "core/hle/service/ns/ns_types.h"
 
 namespace Service::NS {
 
@@ -17,6 +18,9 @@ public:
 private:
     Result HasApplicationRecord(Out<bool> out_has_application_record, u64 program_id);
     Result IsDataCorruptedResult(Out<bool> out_is_data_corrupted_result, Result result);
+    Result ListApplicationRecord(
+        OutArray<ApplicationRecord, BufferAttr_HipcMapAlias> out_records, Out<s32> out_count,
+        s32 entry_offset);
 };
 
 } // namespace Service::NS

src/core/hle/service/pctl/parental_control_service.cpp

@@ -38,6 +38,7 @@ IParentalControlService::IParentalControlService(Core::System& system_, Capabili
         {1016, nullptr, "ConfirmShowNewsPermission"},
         {1017, D<&IParentalControlService::EndFreeCommunication>, "EndFreeCommunication"},
         {1018, D<&IParentalControlService::IsFreeCommunicationAvailable>, "IsFreeCommunicationAvailable"},
+        {1019, D<&IParentalControlService::ConfirmLaunchApplicationPermission>, "ConfirmLaunchApplicationPermission"},
         {1031, D<&IParentalControlService::IsRestrictionEnabled>, "IsRestrictionEnabled"},
         {1032, D<&IParentalControlService::GetSafetyLevel>, "GetSafetyLevel"},
         {1033, nullptr, "SetSafetyLevel"},