Created a whitelist of system archives to prevent false positives creating dialogs.

9 files changed, 70 insertions, 35 deletions

diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h
index b12b37132..4b3a3b3cc 100644
--- a/src/citra_qt/bootmanager.h
+++ b/src/citra_qt/bootmanager.h
@@ -99,7 +99,7 @@ signals:
      */
     void DebugModeLeft();
 
-    void ErrorThrown(Core::System::ResultStatus, boost::optional<std::string>);
+    void ErrorThrown(Core::System::ResultStatus, std::string);
 };
 
 class GRenderWindow : public QWidget, public EmuWindow {
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 1688e55cd..e3b296188 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -553,10 +553,9 @@ void GMainWindow::OnMenuRecentFile() {
 void GMainWindow::OnStartGame() {
     emu_thread->SetRunning(true);
     qRegisterMetaType<Core::System::ResultStatus>("Core::System::ResultStatus");
-    qRegisterMetaType<boost::optional<std::string>>("boost::optional<std::string>");
-    connect(emu_thread.get(),
-            SIGNAL(ErrorThrown(Core::System::ResultStatus, boost::optional<std::string>)), this,
-            SLOT(OnCoreError(Core::System::ResultStatus, boost::optional<std::string>)));
+    qRegisterMetaType<std::string>("std::string");
+    connect(emu_thread.get(), SIGNAL(ErrorThrown(Core::System::ResultStatus, std::string)), this,
+            SLOT(OnCoreError(Core::System::ResultStatus, std::string)));
 
     ui.action_Start->setEnabled(false);
     ui.action_Start->setText(tr("Continue"));
@@ -649,8 +648,7 @@ void GMainWindow::UpdateStatusBar() {
     emu_frametime_label->setVisible(true);
 }
 
-void GMainWindow::OnCoreError(Core::System::ResultStatus result,
-                              boost::optional<std::string> details) {
+void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string details) {
     QMessageBox::StandardButton answer;
     QString status_message;
     const QString common_message =
@@ -664,8 +662,8 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result,
     switch (result) {
     case Core::System::ResultStatus::ErrorSystemFiles: {
         QString message = "Citra was unable to locate a 3DS system archive";
-        if (details)
-            message.append(tr(": %1. ").arg(details.get().c_str()));
+        if (details != std::string())
+            message.append(tr(": %1. ").arg(details.c_str()));
         else
             message.append(". ");
         message.append(common_message);
@@ -693,7 +691,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result,
                "<a href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>How to "
                "Upload the Log File</a>.<br/><br/>Would you like to quit back to the game list?"),
             QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
-        status_message = "Fatal Error encountered.";
+        status_message = "Fatal Error encountered";
         break;
     }
 
diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index eb2b055f6..952a50974 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -8,6 +8,7 @@
 #include <memory>
 #include <QMainWindow>
 #include <QTimer>
+#include "core/core.h"
 #include "ui_main.h"
 
 class Config;
@@ -125,7 +126,7 @@ private slots:
     void OnDisplayTitleBars(bool);
     void ToggleWindowMode();
     void OnCreateGraphicsSurfaceViewer();
-    void OnCoreError(Core::System::ResultStatus, boost::optional<std::string>);
+    void OnCoreError(Core::System::ResultStatus, std::string);
 
 private:
     void UpdateStatusBar();
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 2a9664cb4..2456d8aa2 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -4,9 +4,6 @@
 
 #include <memory>
 #include <utility>
-
-#include <boost/optional.hpp>
-
 #include "audio_core/audio_core.h"
 #include "common/logging/log.h"
 #include "core/arm/arm_interface.h"
@@ -81,7 +78,8 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file
         app_loader->LoadKernelSystemMode();
 
     if (system_mode.second != Loader::ResultStatus::Success) {
-        LOG_CRITICAL(Core, "Failed to determine system mode (Error %i)!", system_mode.second);
+        LOG_CRITICAL(Core, "Failed to determine system mode (Error %i)!",
+                     static_cast<int>(system_mode.second));
         System::Shutdown();
 
         switch (system_mode.second) {
diff --git a/src/core/core.h b/src/core/core.h
index bc363ed97..6e555f954 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -6,9 +6,6 @@
 
 #include <memory>
 #include <string>
-
-#include <boost/optional.hpp>
-
 #include "common/common_types.h"
 #include "core/memory.h"
 #include "core/perf_stats.h"
@@ -117,13 +114,10 @@ public:
 
     void SetStatus(ResultStatus new_status, std::string details = std::string()) {
         status = new_status;
-        if (details == std::string())
-            status_details = boost::none;
-        else
-            status_details = details;
+        status_details = details;
     }
 
-    boost::optional<std::string> GetStatusDetails() {
+    std::string GetStatusDetails() {
         return status_details;
     }
 
@@ -154,7 +148,7 @@ private:
     static System s_instance;
 
     ResultStatus status;
-    boost::optional<std::string> status_details;
+    std::string status_details;
 };
 
 inline ARM_Interface& CPU() {
diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp
index a92abb58f..4c587e3c8 100644
--- a/src/core/hle/service/apt/apt.cpp
+++ b/src/core/hle/service/apt/apt.cpp
@@ -281,9 +281,8 @@ void CancelParameter(Service::Interface* self) {
     rb.Push(RESULT_SUCCESS); // No error
     rb.Push(true);           // Set to Success
 
-    LOG_WARNING(Service_APT,
-                "(STUBBED) called check_sender=0x%08X, sender_appid=0x%08X, "
-                "check_receiver=0x%08X, receiver_appid=0x%08X",
+    LOG_WARNING(Service_APT, "(STUBBED) called check_sender=0x%08X, sender_appid=0x%08X, "
+                             "check_receiver=0x%08X, receiver_appid=0x%08X",
                 check_sender, sender_appid, check_receiver, receiver_appid);
 }
 
diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp
index 0538ffc9c..c65d46238 100644
--- a/src/core/hle/service/fs/fs_user.cpp
+++ b/src/core/hle/service/fs/fs_user.cpp
@@ -130,14 +130,61 @@ static void OpenFileDirectly(Service::Interface* self) {
 
     ResultVal<ArchiveHandle> archive_handle = OpenArchive(archive_id, archive_path);
     if (archive_handle.Failed()) {
-        LOG_ERROR(Service_FS,
-                  "failed to get a handle for archive archive_id=0x%08X archive_path=%s",
-                  static_cast<u32>(archive_id), archive_path.DebugStr().c_str());
         cmd_buff[1] = archive_handle.Code().raw;
         cmd_buff[3] = 0;
+
         if (static_cast<FS::ArchiveIdCode>(archive_id) == ArchiveIdCode::NCCH) {
-            Core::System::GetInstance().SetStatus(Core::System::ResultStatus::ErrorSystemFiles);
+            // High Title ID of the archive: The category (https://3dbrew.org/wiki/Title_list).
+            // (Note: The values there are big endian, these must be little endian.)
+            const std::vector<u8> shared_data_archive = {0x9B, 0x00, 0x04, 0x00};
+            const std::vector<u8> system_data_archive = {0xDB, 0x00, 0x04, 0x00};
+
+            // Low Title IDs.
+            const std::vector<u8> mii_data = {0x02, 0x02, 0x01, 0x00};
+            const std::vector<u8> region_manifest = {0x02, 0x04, 0x01, 0x00};
+            const std::vector<u8> ng_word_list = {0x02, 0x03, 0x01, 0x00};
+
+            // Make a copy of the binary path because reusing AsBinary() for creating category
+            // results in bad_alloc being thrown.
+            std::vector<u8> binary_archive_path = archive_path.AsBinary();
+            std::vector<u8> category(binary_archive_path.begin() + 4,
+                                     binary_archive_path.begin() + 8);
+            std::vector<u8> path(binary_archive_path.begin(), binary_archive_path.begin() + 4);
+
+            if (category == shared_data_archive) {
+                if (path == mii_data) {
+                    LOG_ERROR(Service_FS,
+                              "Failed to get a handle for shared data archive: Mii data. "
+                              "Archive ID=0x%08X Archive Path=%s",
+                              static_cast<u32>(archive_id), archive_path.DebugStr().c_str());
+                    Core::System::GetInstance().SetStatus(
+                        Core::System::ResultStatus::ErrorSystemFiles, "Mii data");
+                    return;
+                } else if (path == region_manifest) {
+                    LOG_ERROR(Service_FS,
+                              "Failed to get a handle for shared data archive: region manifest. "
+                              "Archive ID=0x%08X Archive Path=%s",
+                              static_cast<u32>(archive_id), archive_path.DebugStr().c_str());
+                    Core::System::GetInstance().SetStatus(
+                        Core::System::ResultStatus::ErrorSystemFiles, "Region manifest");
+                    return;
+                }
+            } else if (category == system_data_archive) {
+                if (path == ng_word_list) {
+                    LOG_ERROR(Service_FS,
+                              "Failed to get a handle for system data archive: NG bad word list. "
+                              "Archive ID=0x%08X Archive Path=%s",
+                              static_cast<u32>(archive_id), archive_path.DebugStr().c_str());
+                    Core::System::GetInstance().SetStatus(
+                        Core::System::ResultStatus::ErrorSystemFiles, "NG bad word list");
+                    return;
+                }
+            }
         }
+
+        LOG_ERROR(Service_FS,
+                  "Failed to get a handle for archive archive_id=0x%08X archive_path=%s",
+                  static_cast<u32>(archive_id), archive_path.DebugStr().c_str());
         return;
     }
     SCOPE_EXIT({ CloseArchive(*archive_handle); });
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 0a2d4a10e..adb3ffdcf 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -10,9 +10,7 @@
 #include <string>
 #include <utility>
 #include <vector>
-
 #include <boost/optional.hpp>
-
 #include "common/common_types.h"
 #include "common/file_util.h"
 
@@ -103,7 +101,7 @@ public:
      * Loads the system mode that this application needs.
      * This function defaults to 2 (96MB allocated to the application) if it can't read the
      * information.
-     * @return A pair with the system mode (If found) and the result.
+     * @returns a pair of Optional with the kernel system mode and ResultStatus.
      */
     virtual std::pair<boost::optional<u32>, ResultStatus> LoadKernelSystemMode() {
         // 96MB allocated to the application.
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index 712d496a4..507da7550 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -179,7 +179,7 @@ public:
 
     /**
      * Loads the Exheader and returns the system mode for this application.
-     * @return A pair with the system mode (If found) and the result.
+     * @returns a pair of Optional with the kernel system mode and ResultStatus
      */
     std::pair<boost::optional<u32>, ResultStatus> LoadKernelSystemMode() override;