early-access version 3994

CMakeLists.txt

@@ -290,6 +290,7 @@ find_package(lz4 REQUIRED)
 find_package(nlohmann_json 3.8 REQUIRED)
 find_package(Opus 1.3 MODULE)
 find_package(RenderDoc MODULE)
+find_package(SimpleIni MODULE)
 find_package(stb MODULE)
 find_package(VulkanMemoryAllocator CONFIG)
 find_package(ZLIB 1.2 REQUIRED)

CMakeModules/FindSimpleIni.cmake

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+find_path(SimpleIni_INCLUDE_DIR SimpleIni.h)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SimpleIni
+    REQUIRED_VARS SimpleIni_INCLUDE_DIR
+)
+
+if (SimpleIni_FOUND AND NOT TARGET SimpleIni::SimpleIni)
+    add_library(SimpleIni::SimpleIni INTERFACE IMPORTED)
+    set_target_properties(SimpleIni::SimpleIni PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${SimpleIni_INCLUDE_DIR}"
+    )
+endif()
+
+mark_as_advanced(SimpleIni_INCLUDE_DIR)

README.md

@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 3993.
+This is the source code for early-access 3994.
 
 ## Legal Notice
 

externals/CMakeLists.txt

@@ -292,4 +292,6 @@ if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
 endif()
 
 # SimpleIni
-add_subdirectory(simpleini)
+if (NOT TARGET SimpleIni::SimpleIni)
+    add_subdirectory(simpleini)
+endif()

src/core/hle/service/am/applets/applet_cabinet.cpp

@@ -122,7 +122,8 @@ void Cabinet::DisplayCompleted(bool apply_changes, std::string_view amiibo_name)
         Service::NFP::RegisterInfoPrivate register_info{};
         std::memcpy(register_info.amiibo_name.data(), amiibo_name.data(),
                     std::min(amiibo_name.size(), register_info.amiibo_name.size() - 1));
-
+        register_info.mii_store_data.BuildRandom(Mii::Age::All, Mii::Gender::All, Mii::Race::All);
+        register_info.mii_store_data.SetNickname({u'y', u'u', u'z', u'u'});
         nfp_device->SetRegisterInfoPrivate(register_info);
         break;
     }
@@ -130,7 +131,7 @@ void Cabinet::DisplayCompleted(bool apply_changes, std::string_view amiibo_name)
         nfp_device->DeleteApplicationArea();
         break;
     case Service::NFP::CabinetMode::StartRestorer:
-        nfp_device->RestoreAmiibo();
+        nfp_device->Restore();
         break;
     case Service::NFP::CabinetMode::StartFormatter:
         nfp_device->Format();

src/core/hle/service/mii/types/ver3_store_data.cpp

@@ -98,7 +98,7 @@ void Ver3StoreData::BuildToStoreData(StoreData& out_store_data) const {
 }
 
 void Ver3StoreData::BuildFromStoreData(const StoreData& store_data) {
-    version = 1;
+    version = 3;
     mii_information.gender.Assign(static_cast<u8>(store_data.GetGender()));
     mii_information.favorite_color.Assign(static_cast<u8>(store_data.GetFavoriteColor()));
     height = store_data.GetHeight();

src/core/hle/service/nfc/common/device.cpp

@@ -401,6 +401,12 @@ Result NfcDevice::SendCommandByPassThrough(const Time::Clock::TimeSpanType& time
 }
 
 Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target_) {
+    bool is_corrupted = false;
+
+    if (model_type != NFP::ModelType::Amiibo) {
+        return ResultInvalidArgument;
+    }
+
     if (device_state != DeviceState::TagFound) {
         LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
         return ResultWrongDeviceState;
@@ -420,26 +426,32 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target
     if (is_plain_amiibo) {
         std::vector<u8> data(sizeof(NFP::NTAG215File));
         memcpy(data.data(), &tag_data, sizeof(tag_data));
-        WriteBackupData(tag_data.uid, data);
-
-        device_state = DeviceState::TagMounted;
-        mount_target = mount_target_;
-        return ResultSuccess;
     }
 
-    if (!NFP::AmiiboCrypto::DecodeAmiibo(encrypted_tag_data, tag_data)) {
-        bool has_backup = HasBackup(encrypted_tag_data.uuid).IsSuccess();
-        LOG_ERROR(Service_NFP, "Can't decode amiibo, has_backup= {}", has_backup);
-        return has_backup ? ResultCorruptedDataWithBackup : ResultCorruptedData;
+    if (!is_plain_amiibo && !NFP::AmiiboCrypto::DecodeAmiibo(encrypted_tag_data, tag_data)) {
+        LOG_ERROR(Service_NFP, "Can't decode amiibo");
+        is_corrupted = true;
     }
 
-    std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File));
-    memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data));
-    WriteBackupData(encrypted_tag_data.uuid, data);
+    if (tag_data.settings.settings.amiibo_initialized && !tag_data.owner_mii.IsValid()) {
+        LOG_ERROR(Service_NFP, "Invalid mii data");
+        is_corrupted = true;
+    }
+
+    if (!is_corrupted) {
+        std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File));
+        memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data));
+        WriteBackupData(encrypted_tag_data.uuid, data);
+    }
 
     device_state = DeviceState::TagMounted;
     mount_target = mount_target_;
 
+    if (is_corrupted) {
+        bool has_backup = HasBackup(encrypted_tag_data.uuid).IsSuccess();
+        return has_backup ? ResultCorruptedDataWithBackup : ResultCorruptedData;
+    }
+
     return ResultSuccess;
 }
 
@@ -606,6 +618,17 @@ Result NfcDevice::Restore() {
         }
     }
 
+    // Restore mii data in case is corrupted by previous instances of yuzu
+    if (tag_data.settings.settings.amiibo_initialized && !tag_data.owner_mii.IsValid()) {
+        LOG_ERROR(Service_NFP, "Regenerating mii data");
+        Mii::StoreData new_mii{};
+        new_mii.BuildRandom(Mii::Age::All, Mii::Gender::All, Mii::Race::All);
+        new_mii.SetNickname({u'y', u'u', u'z', u'u', u'\0'});
+
+        tag_data.owner_mii.BuildFromStoreData(new_mii);
+        tag_data.mii_extension.SetFromStoreData(new_mii);
+    }
+
     // Overwrite tag contents with backup and mount the tag
     tag_data = temporary_tag_data;
     encrypted_tag_data = temporary_encrypted_tag_data;
@@ -851,25 +874,6 @@ Result NfcDevice::SetRegisterInfoPrivate(const NFP::RegisterInfoPrivate& registe
     return Flush();
 }
 
-Result NfcDevice::RestoreAmiibo() {
-    if (device_state != DeviceState::TagMounted) {
-        LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
-        if (device_state == DeviceState::TagRemoved) {
-            return ResultTagRemoved;
-        }
-        return ResultWrongDeviceState;
-    }
-
-    if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) {
-        LOG_ERROR(Service_NFP, "Amiibo is read only", device_state);
-        return ResultWrongDeviceState;
-    }
-
-    // TODO: Load amiibo from backup on system
-    LOG_ERROR(Service_NFP, "Not Implemented");
-    return ResultSuccess;
-}
-
 Result NfcDevice::Format() {
     Result result = ResultSuccess;
 
@@ -877,7 +881,9 @@ Result NfcDevice::Format() {
         result = Mount(NFP::ModelType::Amiibo, NFP::MountTarget::All);
     }
 
-    if (result.IsError()) {
+    // We are formatting all data. Corruption is not an issue.
+    if (result.IsError() &&
+        (result != ResultCorruptedData && result != ResultCorruptedDataWithBackup)) {
         return result;
     }
 

src/core/hle/service/nfc/common/device.h

@@ -68,7 +68,6 @@ public:
 
     Result DeleteRegisterInfo();
     Result SetRegisterInfoPrivate(const NFP::RegisterInfoPrivate& register_info);
-    Result RestoreAmiibo();
     Result Format();
 
     Result OpenApplicationArea(u32 access_id);

src/frontend_common/CMakeLists.txt

@@ -7,4 +7,4 @@ add_library(frontend_common STATIC
 )
 
 create_target_directory_groups(frontend_common)
-target_link_libraries(frontend_common PUBLIC core SimpleIni PRIVATE common Boost::headers)
+target_link_libraries(frontend_common PUBLIC core SimpleIni::SimpleIni PRIVATE common Boost::headers)

src/frontend_common/config.h

@@ -7,6 +7,7 @@
 #include <string>
 #include "common/settings.h"
 
+#define SI_NO_CONVERSION
 #include <SimpleIni.h>
 #include <boost/algorithm/string/replace.hpp>