Merge 4457f20472 into 3a5f70dceb

libraries/libstratosphere/include/stratosphere/fssystem/fssystem_crypto_configuration.hpp

@@ -16,7 +16,7 @@
 #pragma once
 #include <vapours.hpp>
 #include <stratosphere/fssystem/fssystem_nca_file_system_driver.hpp>
-#include <stratosphere/ldr/ldr_platform_id.hpp>
+#include <stratosphere/ncm/ncm_content_meta_platform.hpp>
 
 namespace ams::fssystem {
 
@@ -26,10 +26,10 @@ namespace ams::fssystem {
 
     void InvalidateHardwareAesKey();
 
-    bool IsValidSignatureKeyGeneration(ldr::PlatformId platform, size_t key_generation);
+    bool IsValidSignatureKeyGeneration(ncm::ContentMetaPlatform platform, size_t key_generation);
 
-    const u8 *GetAcidSignatureKeyModulus(ldr::PlatformId platform, bool prod, size_t key_generation, bool unk_unused);
+    const u8 *GetAcidSignatureKeyModulus(ncm::ContentMetaPlatform platform, bool prod, size_t key_generation, bool unk_unused);
-    size_t GetAcidSignatureKeyModulusSize(ldr::PlatformId platform, bool unk_unused);
+    size_t GetAcidSignatureKeyModulusSize(ncm::ContentMetaPlatform platform, bool unk_unused);
 
     const u8 *GetAcidSignatureKeyPublicExponent();
 

libraries/libstratosphere/include/stratosphere/ldr/ldr_platform_id.hpp

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Atmosphère-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include <vapours.hpp>
-
-namespace ams::ldr {
-
-    /* TODO: Is this really a FS type? What namespace does this actually live inside? */
-    enum PlatformId {
-        PlatformId_Nx = 0,
-    };
-
-}

libraries/libstratosphere/include/stratosphere/ldr/ldr_types.hpp

@@ -19,7 +19,7 @@
 #include <stratosphere/ncm/ncm_ids.hpp>
 #include <stratosphere/ncm/ncm_program_location.hpp>
 #include <stratosphere/sf/sf_buffer_tags.hpp>
-#include <stratosphere/ldr/ldr_platform_id.hpp>
+#include <stratosphere/ncm/ncm_content_meta_platform.hpp>
 
 namespace ams::ldr {
 

libraries/libstratosphere/libstratosphere.mk

@@ -154,12 +154,14 @@ spl_secure_monitor_api.os.generic.o: CXXFLAGS += -I$(ATMOSPHERE_LIBRARIES_DIR)/l
 fs_id_string_impl.os.generic.o: CXXFLAGS += -I$(ATMOSPHERE_LIBRARIES_DIR)/libexosphere/include
 
 ifeq ($(ATMOSPHERE_OS_NAME),windows)
-# I do not remember why these had fno-lto, but it appears to
+# Audit builds fail when these have lto disabled.
-# work without no-lto (2023/03/09), so I am disabling these. I may regret this later.
+# Noting 10/29/24:
-#os_%.o: CXXFLAGS += -fno-lto
+# In member function '__ct ':
-#fssystem_%.o: CXXFLAGS += -fno-lto
+# internal compiler error: in binds_to_current_def_p, at symtab.cc:2589
-#fssrv_%.o: CXXFLAGS += -fno-lto
+os_%.o: CXXFLAGS += -fno-lto
-#fs_%.o: CXXFLAGS += -fno-lto
+fssystem_%.o: CXXFLAGS += -fno-lto
+fssrv_%.o: CXXFLAGS += -fno-lto
+fs_%.o: CXXFLAGS += -fno-lto
 endif
 
 #---------------------------------------------------------------------------------

libraries/libstratosphere/source/erpt/srv/erpt_srv_reporter.cpp

@@ -537,6 +537,8 @@ namespace ams::erpt::srv {
             /* NOTE: Nintendo ignores the result of this call. */
             SubmitFsInfo();
         }
+        #else
+        AMS_UNUSED(flags);
         #endif
 
 

libraries/libstratosphere/source/fssystem/fssystem_crypto_configuration.cpp

@@ -297,20 +297,20 @@ namespace ams::fssystem {
         }
     }
 
-    bool IsValidSignatureKeyGeneration(ldr::PlatformId platform, size_t key_generation) {
+    bool IsValidSignatureKeyGeneration(ncm::ContentMetaPlatform platform, size_t key_generation) {
         switch (platform) {
-            case ldr::PlatformId_Nx:
+            case ncm::ContentMetaPlatform::Nx:
                 return key_generation <= NxAcidSignatureKeyGenerationMax;
             AMS_UNREACHABLE_DEFAULT_CASE();
         }
     }
 
-    const u8 *GetAcidSignatureKeyModulus(ldr::PlatformId platform, bool prod, size_t key_generation, bool unk_unused) {
+    const u8 *GetAcidSignatureKeyModulus(ncm::ContentMetaPlatform platform, bool prod, size_t key_generation, bool unk_unused) {
         AMS_ASSERT(IsValidSignatureKeyGeneration(platform, key_generation));
         AMS_UNUSED(unk_unused);
 
         switch (platform) {
-            case ldr::PlatformId_Nx:
+            case ncm::ContentMetaPlatform::Nx:
                 {
                     const size_t used_keygen = (key_generation % (NxAcidSignatureKeyGenerationMax + 1));
                     return prod ? NxAcidSignatureKeyModulusProd[used_keygen] : NxAcidSignatureKeyModulusDev[used_keygen];
@@ -319,11 +319,11 @@ namespace ams::fssystem {
         }
     }
 
-    size_t GetAcidSignatureKeyModulusSize(ldr::PlatformId platform, bool unk_unused) {
+    size_t GetAcidSignatureKeyModulusSize(ncm::ContentMetaPlatform platform, bool unk_unused) {
         AMS_UNUSED(unk_unused);
 
         switch (platform) {
-            case ldr::PlatformId_Nx:
+            case ncm::ContentMetaPlatform::Nx:
                 return NxAcidSignatureKeyModulusSize;
             AMS_UNREACHABLE_DEFAULT_CASE();
         }

libraries/libstratosphere/source/fssystem/fssystem_local_file_system.cpp

@@ -1346,7 +1346,7 @@ namespace ams::fssystem {
                 R_UNLESS(::GetLastError() == ERROR_ACCESS_DENIED, last_error_result);
 
                 /* Check if we tried to open a directory. */
-                fs::DirectoryEntryType type;
+                fs::DirectoryEntryType type{};
                 R_TRY(GetEntryTypeImpl(std::addressof(type), native_path.get()));
 
                 /* If the type is anything other than directory, perform generic result conversion. */
@@ -1459,7 +1459,7 @@ namespace ams::fssystem {
         R_TRY(this->ResolveFullPath(std::addressof(native_new_path), new_path, MaxFilePathLength, 0, false));
 
         /* Check that the old path is a file. */
-        fs::DirectoryEntryType type;
+        fs::DirectoryEntryType type{};
         R_TRY(GetEntryTypeImpl(std::addressof(type), native_old_path.get()));
         R_UNLESS(type == fs::DirectoryEntryType_File, fs::ResultPathNotFound());
 
@@ -1509,7 +1509,7 @@ namespace ams::fssystem {
         R_TRY(this->ResolveFullPath(std::addressof(native_new_path), new_path, MaxDirectoryPathLength, 0, false));
 
         /* Check that the old path is a file. */
-        fs::DirectoryEntryType type;
+        fs::DirectoryEntryType type{};
         R_TRY(GetEntryTypeImpl(std::addressof(type), native_old_path.get()));
         R_UNLESS(type == fs::DirectoryEntryType_Directory, fs::ResultPathNotFound());
 
@@ -1577,7 +1577,7 @@ namespace ams::fssystem {
                 R_UNLESS(::GetLastError() == ERROR_ACCESS_DENIED, last_error_result);
 
                 /* Check if we tried to open a directory. */
-                fs::DirectoryEntryType type;
+                fs::DirectoryEntryType type{};
                 R_TRY(GetEntryTypeImpl(std::addressof(type), native_path.get()));
 
                 /* If the type isn't file, return path not found. */
@@ -1623,7 +1623,7 @@ namespace ams::fssystem {
             ON_RESULT_FAILURE { ::CloseHandle(dir_handle); };
 
             /* Check that we tried to open a directory. */
-            fs::DirectoryEntryType type;
+            fs::DirectoryEntryType type{};
             R_TRY(GetEntryTypeImpl(std::addressof(type), native_path.get()));
 
             /* If the type isn't directory, return path not found. */

stratosphere/loader/source/ldr_content_management.cpp

@@ -25,11 +25,11 @@ namespace ams::ldr {
     }
 
     /* ScopedCodeMount functionality. */
-    ScopedCodeMount::ScopedCodeMount(const ncm::ProgramLocation &loc, PlatformId platform) : m_lk(g_scoped_code_mount_lock), m_has_status(false), m_mounted_ams(false), m_mounted_sd_or_code(false), m_mounted_code(false) {
+    ScopedCodeMount::ScopedCodeMount(const ncm::ProgramLocation &loc, ncm::ContentMetaPlatform platform) : m_lk(g_scoped_code_mount_lock), m_has_status(false), m_mounted_ams(false), m_mounted_sd_or_code(false), m_mounted_code(false) {
         m_result = this->Initialize(loc, platform);
     }
 
-    ScopedCodeMount::ScopedCodeMount(const ncm::ProgramLocation &loc, const cfg::OverrideStatus &o, PlatformId platform) : m_lk(g_scoped_code_mount_lock), m_override_status(o), m_has_status(true), m_mounted_ams(false), m_mounted_sd_or_code(false), m_mounted_code(false) {
+    ScopedCodeMount::ScopedCodeMount(const ncm::ProgramLocation &loc, const cfg::OverrideStatus &o, ncm::ContentMetaPlatform platform) : m_lk(g_scoped_code_mount_lock), m_override_status(o), m_has_status(true), m_mounted_ams(false), m_mounted_sd_or_code(false), m_mounted_code(false) {
         m_result = this->Initialize(loc, platform);
     }
 
@@ -46,7 +46,7 @@ namespace ams::ldr {
         }
     }
 
-    Result ScopedCodeMount::Initialize(const ncm::ProgramLocation &loc, PlatformId platform) {
+    Result ScopedCodeMount::Initialize(const ncm::ProgramLocation &loc, ncm::ContentMetaPlatform platform) {
         /* Capture override status, if necessary. */
         this->EnsureOverrideStatus(loc);
         AMS_ABORT_UNLESS(m_has_status);
@@ -83,7 +83,7 @@ namespace ams::ldr {
     }
 
     /* Redirection API. */
-    Result GetProgramPath(char *out_path, size_t out_size, const ncm::ProgramLocation &loc, PlatformId platform) {
+    Result GetProgramPath(char *out_path, size_t out_size, const ncm::ProgramLocation &loc, ncm::ContentMetaPlatform platform) {
         /* Check for storage id none. */
         if (static_cast<ncm::StorageId>(loc.storage_id) == ncm::StorageId::None) {
             std::memset(out_path, 0, out_size);
@@ -166,9 +166,9 @@ namespace ams::ldr {
         R_SUCCEED();
     }
 
-    fs::ContentAttributes GetPlatformContentAttributes(PlatformId platform) {
+    fs::ContentAttributes GetPlatformContentAttributes(ncm::ContentMetaPlatform platform) {
         switch (platform) {
-            case PlatformId_Nx:
+            case ncm::ContentMetaPlatform::Nx:
                 return fs::ContentAttributes_None;
             AMS_UNREACHABLE_DEFAULT_CASE();
         }

stratosphere/loader/source/ldr_content_management.hpp

@@ -34,8 +34,8 @@ namespace ams::ldr {
             bool m_mounted_sd_or_code;
             bool m_mounted_code;
         public:
-            ScopedCodeMount(const ncm::ProgramLocation &loc, PlatformId platform);
+            ScopedCodeMount(const ncm::ProgramLocation &loc, ncm::ContentMetaPlatform platform);
-            ScopedCodeMount(const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status, PlatformId platform);
+            ScopedCodeMount(const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status, ncm::ContentMetaPlatform platform);
             ~ScopedCodeMount();
 
             Result GetResult() const {
@@ -59,7 +59,7 @@ namespace ams::ldr {
                 return m_base_code_verification_data;
             }
         private:
-            Result Initialize(const ncm::ProgramLocation &loc, PlatformId platform);
+            Result Initialize(const ncm::ProgramLocation &loc, ncm::ContentMetaPlatform platform);
             void EnsureOverrideStatus(const ncm::ProgramLocation &loc);
     };
 
@@ -76,10 +76,10 @@ namespace ams::ldr {
     #define ENCODE_CMPT_PATH(relative) "cmpt:" relative
 
     /* Redirection API. */
-    Result GetProgramPath(char *out_path, size_t out_size, const ncm::ProgramLocation &loc, PlatformId platform);
+    Result GetProgramPath(char *out_path, size_t out_size, const ncm::ProgramLocation &loc, ncm::ContentMetaPlatform platform);
     Result RedirectProgramPath(const char *path, size_t size, const ncm::ProgramLocation &loc);
     Result RedirectHtmlDocumentPathForHbl(const ncm::ProgramLocation &loc);
 
-    fs::ContentAttributes GetPlatformContentAttributes(PlatformId platform);
+    fs::ContentAttributes GetPlatformContentAttributes(ncm::ContentMetaPlatform platform);
 
 }

stratosphere/loader/source/ldr_loader_service.cpp

@@ -27,11 +27,11 @@ namespace ams::ldr {
 
         constinit ArgumentStore g_argument_store;
 
-        bool IsValidPlatform(PlatformId platform) {
+        bool IsValidPlatform(ncm::ContentMetaPlatform platform) {
-            return platform == PlatformId_Nx;
+            return platform == ncm::ContentMetaPlatform::Nx;
         }
 
-        Result CreateProcessByPlatform(os::NativeHandle *out, PinId pin_id, u32 flags, os::NativeHandle resource_limit, PlatformId platform) {
+        Result CreateProcessByPlatform(os::NativeHandle *out, PinId pin_id, u32 flags, os::NativeHandle resource_limit, ncm::ContentMetaPlatform platform) {
             /* Check that the platform is valid. */
             R_UNLESS(IsValidPlatform(platform), ldr::ResultInvalidPlatformId());
 
@@ -49,7 +49,7 @@ namespace ams::ldr {
             R_RETURN(ldr::CreateProcess(out, pin_id, loc, override_status, path, g_argument_store.Get(loc.program_id), flags, resource_limit, platform));
         }
 
-        Result GetProgramInfoByPlatform(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc, PlatformId platform) {
+        Result GetProgramInfoByPlatform(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc, ncm::ContentMetaPlatform platform) {
             /* Check that the platform is valid. */
             R_UNLESS(IsValidPlatform(platform), ldr::ResultInvalidPlatformId());
 
@@ -88,11 +88,11 @@ namespace ams::ldr {
 
 
     Result LoaderService::CreateProcess(os::NativeHandle *out, PinId pin_id, u32 flags, os::NativeHandle resource_limit) {
-        R_RETURN(CreateProcessByPlatform(out, pin_id, flags, resource_limit, PlatformId_Nx));
+        R_RETURN(CreateProcessByPlatform(out, pin_id, flags, resource_limit, ncm::ContentMetaPlatform::Nx));
     }
 
     Result LoaderService::GetProgramInfo(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc) {
-        R_RETURN(GetProgramInfoByPlatform(out, out_status, loc, PlatformId_Nx));
+        R_RETURN(GetProgramInfoByPlatform(out, out_status, loc, ncm::ContentMetaPlatform::Nx));
     }
 
     Result LoaderService::PinProgram(PinId *out, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &status) {

stratosphere/loader/source/ldr_meta.cpp

@@ -103,15 +103,15 @@ namespace ams::ldr {
             R_SUCCEED();
         }
 
-        const u8 *GetAcidSignatureModulus(PlatformId platform, u8 key_generation, bool unk_unused) {
+        const u8 *GetAcidSignatureModulus(ncm::ContentMetaPlatform platform, u8 key_generation, bool unk_unused) {
             return fssystem::GetAcidSignatureKeyModulus(platform, !IsDevelopmentForAcidSignatureCheck(), key_generation, unk_unused);
         }
 
-        size_t GetAcidSignatureModulusSize(PlatformId platform, bool unk_unused) {
+        size_t GetAcidSignatureModulusSize(ncm::ContentMetaPlatform platform, bool unk_unused) {
             return fssystem::GetAcidSignatureKeyModulusSize(platform, unk_unused);
         }
 
-        Result ValidateAcidSignature(Meta *meta, PlatformId platform, bool unk_unused) {
+        Result ValidateAcidSignature(Meta *meta, ncm::ContentMetaPlatform platform, bool unk_unused) {
             /* Loader did not check signatures prior to 10.0.0. */
             if (hos::GetVersion() < hos::Version_10_0_0) {
                 meta->check_verification_data = false;
@@ -190,7 +190,7 @@ namespace ams::ldr {
     }
 
     /* API. */
-    Result LoadMeta(Meta *out_meta, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &status, PlatformId platform, bool unk_unused) {
+    Result LoadMeta(Meta *out_meta, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &status, ncm::ContentMetaPlatform platform, bool unk_unused) {
         /* Set the cached program id back to zero. */
         g_cached_program_id = {};
 
@@ -282,7 +282,7 @@ namespace ams::ldr {
         R_SUCCEED();
     }
 
-    Result LoadMetaFromCache(Meta *out_meta, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &status, PlatformId platform) {
+    Result LoadMetaFromCache(Meta *out_meta, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &status, ncm::ContentMetaPlatform platform) {
         if (g_cached_program_id != loc.program_id || g_cached_override_status != status) {
             R_RETURN(LoadMeta(out_meta, loc, status, platform, false));
         }

stratosphere/loader/source/ldr_meta.hpp

@@ -36,8 +36,8 @@ namespace ams::ldr {
     };
 
     /* Meta API. */
-    Result LoadMeta(Meta *out_meta, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &status, PlatformId platform, bool unk_unused);
+    Result LoadMeta(Meta *out_meta, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &status, ncm::ContentMetaPlatform platform, bool unk_unused);
-    Result LoadMetaFromCache(Meta *out_meta, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &status, PlatformId platform);
+    Result LoadMetaFromCache(Meta *out_meta, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &status, ncm::ContentMetaPlatform platform);
     void   InvalidateMetaCache();
 
 }

stratosphere/loader/source/ldr_process_creation.cpp

@@ -212,8 +212,8 @@ namespace ams::ldr {
             { 0x010049900F546001 }, /* Super Mario 3D All-Stars: Super Mario 64 */
             { 0x010057D00ECE4000 }, /* Nintendo Switch Online (Nintendo 64) [for Japan] */
             { 0x01006F8002326000 }, /* Animal Crossing: New Horizons */
-            { 0x01006FB00F50E000 }, /* [???] */
+            { 0x01006FB00F50E000 }, /* 宝可梦 走吧！伊布 [Pokemon: Let's Go, Eevee! for China] */
-            { 0x010070300F50C000 }, /* [???] */
+            { 0x010070300F50C000 }, /* 宝可梦 走吧！皮卡丘 [Pokemon: Let's Go, Pikachu! for China] */
             { 0x010075100E8EC000 }, /* 马力欧卡丁车8 豪华版 [Mario Kart 8 Deluxe for China] */
             { 0x01008DB008C2C000 }, /* Pokemon Shield */
             { 0x01009AD008C4C000 }, /* Pokemon: Let's Go, Pikachu! [Kiosk] */
@@ -664,7 +664,7 @@ namespace ams::ldr {
     }
 
     /* Process Creation API. */
-    Result CreateProcess(os::NativeHandle *out, PinId pin_id, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status, const char *path, const ArgumentStore::Entry *argument, u32 flags, os::NativeHandle resource_limit, PlatformId platform) {
+    Result CreateProcess(os::NativeHandle *out, PinId pin_id, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status, const char *path, const ArgumentStore::Entry *argument, u32 flags, os::NativeHandle resource_limit, ncm::ContentMetaPlatform platform) {
         /* Mount code. */
         AMS_UNUSED(path);
         ScopedCodeMount mount(loc, override_status, platform);
@@ -720,7 +720,7 @@ namespace ams::ldr {
         R_SUCCEED();
     }
 
-    Result GetProgramInfo(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc, const char *path, PlatformId platform) {
+    Result GetProgramInfo(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc, const char *path, ncm::ContentMetaPlatform platform) {
         Meta meta;
 
         /* Load Meta. */

stratosphere/loader/source/ldr_process_creation.hpp

@@ -19,8 +19,8 @@
 namespace ams::ldr {
 
     /* Process Creation API. */
-    Result CreateProcess(os::NativeHandle *out, PinId pin_id, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status, const char *path, const ArgumentStore::Entry *argument, u32 flags, os::NativeHandle resource_limit, PlatformId platform);
+    Result CreateProcess(os::NativeHandle *out, PinId pin_id, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status, const char *path, const ArgumentStore::Entry *argument, u32 flags, os::NativeHandle resource_limit, ncm::ContentMetaPlatform platform);
-    Result GetProgramInfo(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc, const char *path, PlatformId platform);
+    Result GetProgramInfo(ProgramInfo *out, cfg::OverrideStatus *out_status, const ncm::ProgramLocation &loc, const char *path, ncm::ContentMetaPlatform platform);
 
     Result PinProgram(PinId *out_id, const ncm::ProgramLocation &loc, const cfg::OverrideStatus &override_status);
     Result UnpinProgram(PinId id);