::max();
newest_slot_time = 0;
@@ -1602,13 +1618,33 @@ void GMainWindow::UpdateSaveStates() {
auto savestates = Core::ListSaveStates(title_id, movie.GetCurrentMovieID());
for (u32 i = 0; i < Core::SaveStateSlotCount; ++i) {
actions_load_state[i]->setEnabled(false);
- actions_load_state[i]->setText(tr("Slot %1").arg(i + 1));
- actions_save_state[i]->setText(tr("Slot %1").arg(i + 1));
+ if (i == 0) {
+ actions_load_state[i]->setText(tr("Quick Load"));
+ actions_save_state[i]->setText(tr("Quick Save"));
+ } else {
+ actions_load_state[i]->setText(tr("Slot %1").arg(i));
+ actions_save_state[i]->setText(tr("Slot %1").arg(i));
+ }
}
for (const auto& savestate : savestates) {
+ if (savestate.slot >= Core::SaveStateSlotCount) {
+ continue;
+ }
const bool display_name =
savestate.status == Core::SaveStateInfo::ValidationStatus::RevisionDismatch &&
!savestate.build_name.empty();
+ actions_load_state[savestate.slot]->setEnabled(true);
+ if (savestate.slot == 0) {
+ const auto text = tr("%2 %3")
+ .arg(QDateTime::fromSecsSinceEpoch(savestate.time)
+ .toString(QStringLiteral("yyyy-MM-dd hh:mm:ss")))
+ .arg(display_name ? QString::fromStdString(savestate.build_name)
+ : QLatin1String())
+ .trimmed();
+ ui->action_Quick_Save->setText(tr("Quick Save - %1").arg(text).trimmed());
+ ui->action_Quick_Load->setText(tr("Quick Load - %1").arg(text).trimmed());
+ continue;
+ }
const auto text =
tr("Slot %1 - %2 %3")
.arg(savestate.slot)
@@ -1617,12 +1653,10 @@ void GMainWindow::UpdateSaveStates() {
.arg(display_name ? QString::fromStdString(savestate.build_name) : QLatin1String())
.trimmed();
- actions_load_state[savestate.slot - 1]->setEnabled(true);
- actions_load_state[savestate.slot - 1]->setText(text);
- actions_save_state[savestate.slot - 1]->setText(text);
+ actions_load_state[savestate.slot]->setText(text);
+ actions_save_state[savestate.slot]->setText(text);
ui->action_Load_from_Newest_Slot->setEnabled(true);
-
if (savestate.time > newest_slot_time) {
newest_slot = savestate.slot;
newest_slot_time = savestate.time;
@@ -1632,10 +1666,11 @@ void GMainWindow::UpdateSaveStates() {
oldest_slot_time = savestate.time;
}
}
- for (u32 i = 0; i < Core::SaveStateSlotCount; ++i) {
+ // Value as 1 because quicksave slot is not used for this calculation
+ for (u32 i = 1; i < Core::SaveStateSlotCount; ++i) {
if (!actions_load_state[i]->isEnabled()) {
// Prefer empty slot
- oldest_slot = i + 1;
+ oldest_slot = i;
oldest_slot_time = 0;
break;
}
@@ -2112,15 +2147,18 @@ void GMainWindow::OnMenuSetUpSystemFiles() {
QVBoxLayout layout(&dialog);
QLabel label_description(
- tr("Azahar needs files from a real console to be able to use some of its features.
"
- "You can get such files with the Azahar needs console unique data and firmware files from a real console to be "
+ "able to use some of its features.
Such files and data can be set up with the Azahar "
- "Artic Setup Tool
Notes:
- This operation will install console unique "
- "files "
- "to Azahar, do not share your user or nand folders
after performing the setup "
- "process! - Old 3DS setup is needed for the New 3DS setup to "
- "work.
- Both setup modes will work regardless of the model of the console "
- "running the setup tool.
"),
+ "Artic Setup Tool
Notes:- This operation will install console unique "
+ "data to Azahar, do not share your user or nand folders
after performing the setup "
+ "process! - While doing the setup process, Azahar will link to the console "
+ "running the setup tool. You can unlink the
console later from the System tab in the "
+ "emulator configuration menu. - Do not go online with both Azahar and your 3DS "
+ "console at the same time after setting up system files,
as it could cause "
+ "issues. - Old 3DS setup is needed for the New 3DS setup to work (doing both "
+ "setup modes is recommended).
- Both setup modes will work regardless of the "
+ "model of the console running the setup tool.
"),
&dialog);
label_description.setOpenExternalLinks(true);
layout.addWidget(&label_description);
@@ -2417,6 +2455,8 @@ void GMainWindow::OnPauseContinueGame() {
}
void GMainWindow::OnStopGame() {
+ SetTurboEnabled(false);
+
play_time_manager->Stop();
// Update game list to show new play time
game_list->PopulateAsync(UISettings::values.game_dirs);
@@ -2568,6 +2608,50 @@ void GMainWindow::ChangeSmallScreenPosition() {
UpdateSecondaryWindowVisibility();
}
+bool GMainWindow::IsTurboEnabled() {
+ return turbo_mode_active;
+}
+
+void GMainWindow::SetTurboEnabled(bool state) {
+ turbo_mode_active = state;
+ GMainWindow::ReloadTurbo();
+}
+
+void GMainWindow::ReloadTurbo() {
+ if (IsTurboEnabled()) {
+ Settings::temporary_frame_limit = Settings::values.turbo_limit.GetValue();
+ Settings::is_temporary_frame_limit = true;
+ } else {
+ Settings::is_temporary_frame_limit = false;
+ }
+
+ UpdateStatusBar();
+}
+
+// TODO: This should probably take in something more descriptive than a bool. -OS
+void GMainWindow::AdjustSpeedLimit(bool increase) {
+ const int SPEED_LIMIT_STEP = 5;
+ auto active_limit =
+ IsTurboEnabled() ? &Settings::values.turbo_limit : &Settings::values.frame_limit;
+ const auto active_limit_value = active_limit->GetValue();
+
+ if (increase) {
+ if (active_limit_value < 995) {
+ active_limit->SetValue(active_limit_value + SPEED_LIMIT_STEP);
+ }
+ } else {
+ if (active_limit_value > SPEED_LIMIT_STEP) {
+ active_limit->SetValue(active_limit_value - SPEED_LIMIT_STEP);
+ }
+ }
+
+ if (IsTurboEnabled()) {
+ ReloadTurbo();
+ }
+
+ UpdateStatusBar();
+}
+
void GMainWindow::ToggleScreenLayout() {
const Settings::LayoutOption new_layout = []() {
switch (Settings::values.layout_option.GetValue()) {
@@ -2685,6 +2769,7 @@ void GMainWindow::OnConfigure() {
} else {
setMouseTracking(false);
}
+ ReloadTurbo();
UpdateSecondaryWindowVisibility();
UpdateBootHomeMenuState();
UpdateStatusButtons();
@@ -2908,7 +2993,7 @@ void GMainWindow::ShowFFmpegErrorMessage() {
message_box.setText(
tr("FFmpeg could not be loaded. Make sure you have a compatible version installed."
#ifdef _WIN32
- "\n\nTo install FFmpeg to Lime, press Open and select your FFmpeg directory."
+ "\n\nTo install FFmpeg to Azahar, press Open and select your FFmpeg directory."
#endif
"\n\nTo view a guide on how to install FFmpeg, press Help."));
message_box.setStandardButtons(QMessageBox::Ok | QMessageBox::Help
@@ -3642,6 +3727,18 @@ void GMainWindow::OnEmulatorUpdateAvailable() {
}
#endif
+void GMainWindow::OnSwitchDiskResources(VideoCore::LoadCallbackStage stage, std::size_t value,
+ std::size_t total) {
+ if (stage == VideoCore::LoadCallbackStage::Prepare) {
+ loading_shaders_label->setText(QString());
+ loading_shaders_label->setVisible(true);
+ } else if (stage == VideoCore::LoadCallbackStage::Complete) {
+ loading_shaders_label->setVisible(false);
+ } else {
+ loading_shaders_label->setText(loading_screen->GetStageTranslation(stage, value, total));
+ }
+}
+
void GMainWindow::UpdateWindowTitle() {
const QString full_name = QString::fromUtf8(Common::g_build_fullname);
@@ -3812,7 +3909,9 @@ void LaunchQtFrontend(int argc, char* argv[]) {
// Init settings params
QCoreApplication::setOrganizationName(QStringLiteral("Azahar Developers"));
+ QCoreApplication::setOrganizationDomain(QStringLiteral("azahar_emu.org"));
QCoreApplication::setApplicationName(QStringLiteral("Azahar"));
+ QGuiApplication::setDesktopFileName(QStringLiteral("org.azahar_emu.Azahar"));
auto rounding_policy = GetHighDpiRoundingPolicy();
QApplication::setHighDpiScaleFactorRoundingPolicy(rounding_policy);
diff --git a/src/citra_qt/citra_qt.h b/src/citra_qt/citra_qt.h
index 1c5184928..c8d74a131 100644
--- a/src/citra_qt/citra_qt.h
+++ b/src/citra_qt/citra_qt.h
@@ -24,6 +24,7 @@
#include "citra_qt/user_data_migration.h"
#include "core/core.h"
#include "core/savestate.h"
+#include "video_core/rasterizer_interface.h"
// Needs to be included at the end due to https://bugreports.qt.io/browse/QTBUG-73263
#include
@@ -260,6 +261,10 @@ private slots:
void ToggleSecondaryFullscreen();
void ChangeScreenLayout();
void ChangeSmallScreenPosition();
+ bool IsTurboEnabled();
+ void SetTurboEnabled(bool);
+ void ReloadTurbo();
+ void AdjustSpeedLimit(bool increase);
void UpdateSecondaryWindowVisibility();
void ToggleScreenLayout();
void OnSwapScreens();
@@ -295,6 +300,8 @@ private slots:
#ifdef ENABLE_QT_UPDATE_CHECKER
void OnEmulatorUpdateAvailable();
#endif
+ void OnSwitchDiskResources(VideoCore::LoadCallbackStage stage, std::size_t value,
+ std::size_t total);
private:
Q_INVOKABLE void OnMoviePlaybackCompleted();
@@ -330,6 +337,7 @@ private:
QProgressBar* progress_bar = nullptr;
QLabel* message_label = nullptr;
bool show_artic_label = false;
+ QLabel* loading_shaders_label = nullptr;
QLabel* artic_traffic_label = nullptr;
QLabel* emu_speed_label = nullptr;
QLabel* game_fps_label = nullptr;
@@ -348,6 +356,9 @@ private:
UserDataMigrator user_data_migrator;
std::unique_ptr config;
+ // Hotkeys
+ bool turbo_mode_active = false;
+
// Whether emulation is currently running in Citra.
bool emulation_running = false;
std::unique_ptr emu_thread;
diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp
index c72810b37..426600bdc 100644
--- a/src/citra_qt/configuration/config.cpp
+++ b/src/citra_qt/configuration/config.cpp
@@ -54,7 +54,7 @@ const std::array, Settings::NativeAnalog::NumAnalogs> QtConfi
// This must be in alphabetical order according to action name as it must have the same order as
// UISetting::values.shortcuts, which is alphabetically ordered.
// clang-format off
-const std::array QtConfig::default_hotkeys {{
+const std::array QtConfig::default_hotkeys {{
{QStringLiteral("Advance Frame"), QStringLiteral("Main Window"), {QStringLiteral(""), Qt::ApplicationShortcut}},
{QStringLiteral("Audio Mute/Unmute"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+M"), Qt::WindowShortcut}},
{QStringLiteral("Audio Volume Down"), QStringLiteral("Main Window"), {QStringLiteral(""), Qt::WindowShortcut}},
@@ -70,26 +70,29 @@ const std::array QtConfig::default_hotkeys {{
{QStringLiteral("Increase Speed Limit"), QStringLiteral("Main Window"), {QStringLiteral("+"), Qt::ApplicationShortcut}},
{QStringLiteral("Load Amiibo"), QStringLiteral("Main Window"), {QStringLiteral("F2"), Qt::WidgetWithChildrenShortcut}},
{QStringLiteral("Load File"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+O"), Qt::WidgetWithChildrenShortcut}},
- {QStringLiteral("Load from Newest Slot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+V"), Qt::WindowShortcut}},
- {QStringLiteral("Multiplayer Browse Public Lobby"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+B"), Qt::ApplicationShortcut}},
+ {QStringLiteral("Load from Newest Non-Quicksave Slot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+V"), Qt::WindowShortcut}},
+ {QStringLiteral("Multiplayer Browse Public Rooms"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+B"), Qt::ApplicationShortcut}},
{QStringLiteral("Multiplayer Create Room"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+N"), Qt::ApplicationShortcut}},
{QStringLiteral("Multiplayer Direct Connect to Room"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Shift"), Qt::ApplicationShortcut}},
{QStringLiteral("Multiplayer Leave Room"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+L"), Qt::ApplicationShortcut}},
{QStringLiteral("Multiplayer Show Current Room"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+R"), Qt::ApplicationShortcut}},
+ {QStringLiteral("Quick Save"), QStringLiteral("Main Window"), {QStringLiteral(""), Qt::WindowShortcut}},
+ {QStringLiteral("Quick Load"), QStringLiteral("Main Window"), {QStringLiteral(""), Qt::WindowShortcut}},
{QStringLiteral("Remove Amiibo"), QStringLiteral("Main Window"), {QStringLiteral("F3"), Qt::ApplicationShortcut}},
{QStringLiteral("Restart Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F6"), Qt::WindowShortcut}},
{QStringLiteral("Rotate Screens Upright"), QStringLiteral("Main Window"), {QStringLiteral("F8"), Qt::WindowShortcut}},
- {QStringLiteral("Save to Oldest Slot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+C"), Qt::WindowShortcut}},
+ {QStringLiteral("Save to Oldest Non-Quicksave Slot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+C"), Qt::WindowShortcut}},
{QStringLiteral("Stop Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F5"), Qt::WindowShortcut}},
{QStringLiteral("Swap Screens"), QStringLiteral("Main Window"), {QStringLiteral("F9"), Qt::WindowShortcut}},
{QStringLiteral("Toggle 3D"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+3"), Qt::ApplicationShortcut}},
{QStringLiteral("Toggle Custom Textures"), QStringLiteral("Main Window"), {QStringLiteral("F7"), Qt::ApplicationShortcut}},
{QStringLiteral("Toggle Filter Bar"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+F"), Qt::WindowShortcut}},
{QStringLiteral("Toggle Frame Advancing"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+A"), Qt::ApplicationShortcut}},
- {QStringLiteral("Toggle Per-Application Speed"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Z"), Qt::ApplicationShortcut}},
+ {QStringLiteral("Toggle Per-Application Speed"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Z"), Qt::ApplicationShortcut}},
{QStringLiteral("Toggle Screen Layout"), QStringLiteral("Main Window"), {QStringLiteral("F10"), Qt::WindowShortcut}},
{QStringLiteral("Toggle Status Bar"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+S"), Qt::WindowShortcut}},
{QStringLiteral("Toggle Texture Dumping"), QStringLiteral("Main Window"), {QStringLiteral(""), Qt::ApplicationShortcut}},
+ {QStringLiteral("Toggle Turbo Mode"), QStringLiteral("Main Window"), {QStringLiteral(""), Qt::ApplicationShortcut}},
}};
// clang-format on
@@ -519,6 +522,7 @@ void QtConfig::ReadLayoutValues() {
ReadGlobalSetting(Settings::values.swap_screen);
ReadGlobalSetting(Settings::values.upright_screen);
ReadGlobalSetting(Settings::values.large_screen_proportion);
+ ReadGlobalSetting(Settings::values.screen_gap);
ReadGlobalSetting(Settings::values.small_screen_position);
if (global) {
@@ -681,6 +685,7 @@ void QtConfig::ReadRendererValues() {
ReadGlobalSetting(Settings::values.use_vsync_new);
ReadGlobalSetting(Settings::values.resolution_factor);
ReadGlobalSetting(Settings::values.frame_limit);
+ ReadGlobalSetting(Settings::values.turbo_limit);
ReadGlobalSetting(Settings::values.bg_red);
ReadGlobalSetting(Settings::values.bg_green);
@@ -1078,6 +1083,7 @@ void QtConfig::SaveLayoutValues() {
WriteGlobalSetting(Settings::values.swap_screen);
WriteGlobalSetting(Settings::values.upright_screen);
WriteGlobalSetting(Settings::values.large_screen_proportion);
+ WriteGlobalSetting(Settings::values.screen_gap);
WriteGlobalSetting(Settings::values.small_screen_position);
if (global) {
WriteBasicSetting(Settings::values.mono_render_option);
@@ -1206,6 +1212,7 @@ void QtConfig::SaveRendererValues() {
WriteGlobalSetting(Settings::values.use_vsync_new);
WriteGlobalSetting(Settings::values.resolution_factor);
WriteGlobalSetting(Settings::values.frame_limit);
+ WriteGlobalSetting(Settings::values.turbo_limit);
WriteGlobalSetting(Settings::values.bg_red);
WriteGlobalSetting(Settings::values.bg_green);
diff --git a/src/citra_qt/configuration/config.h b/src/citra_qt/configuration/config.h
index d1a7abfcf..2c9039dde 100644
--- a/src/citra_qt/configuration/config.h
+++ b/src/citra_qt/configuration/config.h
@@ -26,7 +26,7 @@ public:
static const std::array default_buttons;
static const std::array, Settings::NativeAnalog::NumAnalogs> default_analogs;
- static const std::array default_hotkeys;
+ static const std::array default_hotkeys;
private:
void Initialize(const std::string& config_name);
diff --git a/src/citra_qt/configuration/configure_dialog.cpp b/src/citra_qt/configuration/configure_dialog.cpp
index 6c5a78e11..0f0fe2e71 100644
--- a/src/citra_qt/configuration/configure_dialog.cpp
+++ b/src/citra_qt/configuration/configure_dialog.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
diff --git a/src/citra_qt/configuration/configure_enhancements.ui b/src/citra_qt/configuration/configure_enhancements.ui
index a496d35f5..b69676d02 100644
--- a/src/citra_qt/configuration/configure_enhancements.ui
+++ b/src/citra_qt/configuration/configure_enhancements.ui
@@ -276,7 +276,7 @@
0
- 100
+ 255
0
@@ -285,6 +285,13 @@
+ -
+
+
+ Note: Depth values over 100% are not possible on real hardware and may cause graphical issues
+
+
+
-
-
diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp
index cf091ec3c..9a2d58a68 100644
--- a/src/citra_qt/configuration/configure_general.cpp
+++ b/src/citra_qt/configuration/configure_general.cpp
@@ -26,9 +26,14 @@ static constexpr int SettingsToSlider(int value) {
ConfigureGeneral::ConfigureGeneral(QWidget* parent)
: QWidget(parent), ui(std::make_unique()) {
-
ui->setupUi(this);
+ connect(ui->turbo_limit, &QSlider::valueChanged, this, [&](double value) {
+ Settings::values.turbo_limit.SetValue(SliderToSettings(value));
+ ui->turbo_limit_display_label->setText(
+ QStringLiteral("%1%").arg(Settings::values.turbo_limit.GetValue()));
+ });
+
// Set a minimum width for the label to prevent the slider from changing size.
// This scales across DPIs, and is acceptable for uncapitalized strings.
const auto width = static_cast(tr("unthrottled").size() * 6);
@@ -60,12 +65,14 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
});
connect(ui->change_screenshot_dir, &QToolButton::clicked, this, [this] {
+ ui->change_screenshot_dir->setEnabled(false);
const QString dir_path = QFileDialog::getExistingDirectory(
this, tr("Select Screenshot Directory"), ui->screenshot_dir_path->text(),
QFileDialog::ShowDirsOnly);
if (!dir_path.isEmpty()) {
ui->screenshot_dir_path->setText(dir_path);
}
+ ui->change_screenshot_dir->setEnabled(true);
});
}
@@ -73,6 +80,10 @@ ConfigureGeneral::~ConfigureGeneral() = default;
void ConfigureGeneral::SetConfiguration() {
if (Settings::IsConfiguringGlobal()) {
+ ui->turbo_limit->setValue(SettingsToSlider(Settings::values.turbo_limit.GetValue()));
+ ui->turbo_limit_display_label->setText(
+ QStringLiteral("%1%").arg(Settings::values.turbo_limit.GetValue()));
+
ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing.GetValue());
ui->toggle_background_pause->setChecked(
UISettings::values.pause_when_in_background.GetValue());
@@ -121,16 +132,6 @@ void ConfigureGeneral::SetConfiguration() {
!UISettings::values.screenshot_path.UsingGlobal());
ConfigurationShared::SetHighlight(ui->emulation_speed_layout,
!Settings::values.frame_limit.UsingGlobal());
- ConfigurationShared::SetHighlight(ui->widget_region,
- !Settings::values.region_value.UsingGlobal());
- const bool is_region_global = Settings::values.region_value.UsingGlobal();
- ui->region_combobox->setCurrentIndex(
- is_region_global ? ConfigurationShared::USE_GLOBAL_INDEX
- : static_cast(Settings::values.region_value.GetValue()) +
- ConfigurationShared::USE_GLOBAL_OFFSET + 1);
- } else {
- // The first item is "auto-select" with actual value -1, so plus one here will do the trick
- ui->region_combobox->setCurrentIndex(Settings::values.region_value.GetValue() + 1);
}
UISettings::values.screenshot_path.SetGlobal(ui->screenshot_combo->currentIndex() ==
@@ -145,12 +146,14 @@ void ConfigureGeneral::SetConfiguration() {
}
void ConfigureGeneral::ResetDefaults() {
+ ui->button_reset_defaults->setEnabled(false);
QMessageBox::StandardButton answer = QMessageBox::question(
this, tr("Azahar"),
tr("Are you sure you want to reset your settings and close Azahar?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if (answer == QMessageBox::No) {
+ ui->button_reset_defaults->setEnabled(true);
return;
}
@@ -160,9 +163,6 @@ void ConfigureGeneral::ResetDefaults() {
}
void ConfigureGeneral::ApplyConfiguration() {
- ConfigurationShared::ApplyPerGameSetting(&Settings::values.region_value, ui->region_combobox,
- [](s32 index) { return index - 1; });
-
ConfigurationShared::ApplyPerGameSetting(
&Settings::values.frame_limit, ui->emulation_speed_combo, [this](s32) {
const bool is_maximum = ui->frame_limit->value() == ui->frame_limit->maximum();
@@ -191,7 +191,6 @@ void ConfigureGeneral::RetranslateUI() {
void ConfigureGeneral::SetupPerGameUI() {
if (Settings::IsConfiguringGlobal()) {
- ui->region_combobox->setEnabled(Settings::values.region_value.UsingGlobal());
ui->frame_limit->setEnabled(Settings::values.frame_limit.UsingGlobal());
return;
}
@@ -208,12 +207,9 @@ void ConfigureGeneral::SetupPerGameUI() {
ConfigurationShared::SetHighlight(ui->widget_screenshot, index == 1);
});
+ ui->turbo_limit->setVisible(false);
ui->general_group->setVisible(false);
ui->button_reset_defaults->setVisible(false);
ui->toggle_gamemode->setVisible(false);
ui->toggle_update_checker->setVisible(false);
-
- ConfigurationShared::SetColoredComboBox(
- ui->region_combobox, ui->widget_region,
- static_cast(Settings::values.region_value.GetValue(true) + 1));
}
diff --git a/src/citra_qt/configuration/configure_general.h b/src/citra_qt/configuration/configure_general.h
index 3c6cef219..93a855387 100644
--- a/src/citra_qt/configuration/configure_general.h
+++ b/src/citra_qt/configuration/configure_general.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
diff --git a/src/citra_qt/configuration/configure_general.ui b/src/citra_qt/configuration/configure_general.ui
index 4b6b0adf6..741b898c3 100644
--- a/src/citra_qt/configuration/configure_general.ui
+++ b/src/citra_qt/configuration/configure_general.ui
@@ -73,75 +73,6 @@
Emulation
- -
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Region:
-
-
-
- -
-
-
-
-
- Auto-select
-
-
- -
-
- JPN
-
-
- -
-
- USA
-
-
- -
-
- EUR
-
-
- -
-
- AUS
-
-
- -
-
- CHN
-
-
- -
-
- KOR
-
-
- -
-
- TWN
-
-
-
-
-
-
-
-
@@ -216,6 +147,82 @@
+ -
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Turbo Speed Limit:
+
+
+
+ -
+
+
+ 0
+
+
+ 198
+
+
+ 5
+
+
+ 15
+
+
+ 19
+
+
+ Qt::Horizontal
+
+
+ QSlider::TicksBelow
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 32
+ 20
+
+
+
+
+ -
+
+
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+
diff --git a/src/citra_qt/configuration/configure_graphics.ui b/src/citra_qt/configuration/configure_graphics.ui
index cb0a7323c..b2ee3c279 100644
--- a/src/citra_qt/configuration/configure_graphics.ui
+++ b/src/citra_qt/configuration/configure_graphics.ui
@@ -258,7 +258,7 @@
-
- <html><head/><body><p>Overrides the sampling filter used by applications. This can be useful in certain cases with poorly behaved applications when upscaling. If unsure set this to Application Controlled</p></body></html>
+ <html><head/><body><p>Overrides the sampling filter used by applications. This can be useful in certain cases with poorly behaved applications when upscaling. If unsure, set this to Application Controlled</p></body></html>
Texture Sampling
diff --git a/src/citra_qt/configuration/configure_hotkeys.cpp b/src/citra_qt/configuration/configure_hotkeys.cpp
index 6ac0dcd8a..ecaed462b 100644
--- a/src/citra_qt/configuration/configure_hotkeys.cpp
+++ b/src/citra_qt/configuration/configure_hotkeys.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -98,6 +98,38 @@ void ConfigureHotkeys::Configure(QModelIndex index) {
}
const auto [key_sequence_used, used_action] = IsUsedKey(key_sequence);
+ // Check for turbo/per-game speed conflict. Needed to prevent the user from binding both hotkeys
+ // to the same action. Which cuases problems resetting the frame limit.to the inititla value.
+ const QString current_action =
+ model->data(model->index(index.row(), 0, index.parent())).toString();
+ const bool is_turbo = current_action == tr("Toggle Turbo Mode");
+ const bool is_per_game = current_action == tr("Toggle Per-Application Speed");
+
+ if (is_turbo || is_per_game) {
+ QString other_action =
+ is_turbo ? tr("Toggle Per-Application Speed") : tr("Toggle Turbo Mode");
+ QKeySequence other_sequence;
+
+ for (int r = 0; r < model->rowCount(); ++r) {
+ const QStandardItem* const parent = model->item(r, 0);
+ for (int r2 = 0; r2 < parent->rowCount(); ++r2) {
+ if (parent->child(r2, 0)->text() == other_action) {
+ other_sequence = QKeySequence::fromString(
+ parent->child(r2, hotkey_column)->text(), QKeySequence::NativeText);
+ break;
+ }
+ }
+ }
+
+ // Show warning if either hotkey is already set
+ if (!key_sequence.isEmpty() && !other_sequence.isEmpty()) {
+ QMessageBox::warning(this, tr("Conflicting Key Sequence"),
+ tr("The per-application speed and turbo speed hotkeys cannot be "
+ "bound at the same time."));
+ return;
+ }
+ }
+
if (key_sequence_used && key_sequence != QKeySequence(previous_key.toString())) {
QMessageBox::warning(
this, tr("Conflicting Key Sequence"),
diff --git a/src/citra_qt/configuration/configure_input.cpp b/src/citra_qt/configuration/configure_input.cpp
index 502c5caba..2cc319968 100644
--- a/src/citra_qt/configuration/configure_input.cpp
+++ b/src/citra_qt/configuration/configure_input.cpp
@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Lime3DS Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -377,8 +377,10 @@ ConfigureInput::ConfigureInput(Core::System& _system, QWidget* parent)
});
connect(ui->buttonMotionTouch, &QPushButton::clicked, this, [this] {
+ ui->buttonMotionTouch->setEnabled(false);
QDialog* motion_touch_dialog = new ConfigureMotionTouch(this);
- return motion_touch_dialog->exec();
+ motion_touch_dialog->exec();
+ ui->buttonMotionTouch->setEnabled(true);
});
ui->buttonDelete->setEnabled(ui->profile->count() > 1);
@@ -580,9 +582,11 @@ void ConfigureInput::MapFromButton(const Common::ParamPackage& params) {
}
void ConfigureInput::AutoMap() {
+ ui->buttonAutoMap->setEnabled(false);
if (QMessageBox::information(this, tr("Information"),
tr("After pressing OK, press any button on your joystick"),
QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Cancel) {
+ ui->buttonAutoMap->setEnabled(true);
return;
}
input_setter = [this](const Common::ParamPackage& params) {
@@ -597,6 +601,7 @@ void ConfigureInput::AutoMap() {
}
timeout_timer->start(5000); // Cancel after 5 seconds
poll_timer->start(200); // Check for new inputs every 200ms
+ ui->buttonAutoMap->setEnabled(true);
}
void ConfigureInput::HandleClick(QPushButton* button,
@@ -671,13 +676,16 @@ void ConfigureInput::RetranslateUI() {
}
void ConfigureInput::NewProfile() {
+ ui->buttonNew->setEnabled(false);
const QString name =
QInputDialog::getText(this, tr("New Profile"), tr("Enter the name for the new profile."));
if (name.isEmpty()) {
+ ui->buttonNew->setEnabled(true);
return;
}
if (IsProfileNameDuplicate(name)) {
WarnProposedProfileNameIsDuplicate();
+ ui->buttonNew->setEnabled(true);
return;
}
@@ -688,12 +696,15 @@ void ConfigureInput::NewProfile() {
ui->profile->setCurrentIndex(Settings::values.current_input_profile_index);
LoadConfiguration();
ui->buttonDelete->setEnabled(ui->profile->count() > 1);
+ ui->buttonNew->setEnabled(true);
}
void ConfigureInput::DeleteProfile() {
+ ui->buttonDelete->setEnabled(false);
const auto answer = QMessageBox::question(
this, tr("Delete Profile"), tr("Delete profile %1?").arg(ui->profile->currentText()));
if (answer != QMessageBox::Yes) {
+ ui->buttonDelete->setEnabled(true);
return;
}
const int index = ui->profile->currentIndex();
@@ -705,18 +716,22 @@ void ConfigureInput::DeleteProfile() {
}
void ConfigureInput::RenameProfile() {
+ ui->buttonRename->setEnabled(false);
const QString new_name = QInputDialog::getText(this, tr("Rename Profile"), tr("New name:"));
if (new_name.isEmpty()) {
+ ui->buttonRename->setEnabled(true);
return;
}
if (IsProfileNameDuplicate(new_name)) {
WarnProposedProfileNameIsDuplicate();
+ ui->buttonRename->setEnabled(true);
return;
}
ui->profile->setItemText(ui->profile->currentIndex(), new_name);
Settings::RenameCurrentProfile(new_name.toStdString());
Settings::SaveProfile(ui->profile->currentIndex());
+ ui->buttonRename->setEnabled(true);
}
bool ConfigureInput::IsProfileNameDuplicate(const QString& name) const {
diff --git a/src/citra_qt/configuration/configure_layout.cpp b/src/citra_qt/configuration/configure_layout.cpp
index cc78d8948..58a0e66da 100644
--- a/src/citra_qt/configuration/configure_layout.cpp
+++ b/src/citra_qt/configuration/configure_layout.cpp
@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Lime3DS Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -98,8 +98,10 @@ ConfigureLayout::ConfigureLayout(QWidget* parent)
#endif
connect(ui->bg_button, &QPushButton::clicked, this, [this] {
+ ui->bg_button->setEnabled(false);
const QColor new_bg_color = QColorDialog::getColor(bg_color);
if (!new_bg_color.isValid()) {
+ ui->bg_button->setEnabled(true);
return;
}
bg_color = new_bg_color;
@@ -107,6 +109,7 @@ ConfigureLayout::ConfigureLayout(QWidget* parent)
pixmap.fill(bg_color);
const QIcon color_icon(pixmap);
ui->bg_button->setIcon(color_icon);
+ ui->bg_button->setEnabled(true);
});
}
@@ -124,6 +127,7 @@ void ConfigureLayout::SetConfiguration() {
ui->toggle_swap_screen->setChecked(Settings::values.swap_screen.GetValue());
ui->toggle_upright_screen->setChecked(Settings::values.upright_screen.GetValue());
+ ui->screen_gap->setValue(Settings::values.screen_gap.GetValue());
ui->large_screen_proportion->setValue(Settings::values.large_screen_proportion.GetValue());
ui->small_screen_position_combobox->setCurrentIndex(
static_cast(Settings::values.small_screen_position.GetValue()));
@@ -163,6 +167,7 @@ void ConfigureLayout::RetranslateUI() {
void ConfigureLayout::ApplyConfiguration() {
Settings::values.large_screen_proportion = ui->large_screen_proportion->value();
+ Settings::values.screen_gap = ui->screen_gap->value();
Settings::values.small_screen_position = static_cast(
ui->small_screen_position_combobox->currentIndex());
Settings::values.custom_top_x = ui->custom_top_x->value();
diff --git a/src/citra_qt/configuration/configure_layout.ui b/src/citra_qt/configuration/configure_layout.ui
index 3b564515b..33ef4fc68 100644
--- a/src/citra_qt/configuration/configure_layout.ui
+++ b/src/citra_qt/configuration/configure_layout.ui
@@ -107,6 +107,44 @@
+ -
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Screen Gap
+
+
+
+ -
+
+
+ 0.0
+
+
+ 720.0
+
+
+ 0.0
+
+
+
+
+
+
-
diff --git a/src/citra_qt/configuration/configure_per_game.cpp b/src/citra_qt/configuration/configure_per_game.cpp
index 88709df16..1a943d732 100644
--- a/src/citra_qt/configuration/configure_per_game.cpp
+++ b/src/citra_qt/configuration/configure_per_game.cpp
@@ -1,5 +1,10 @@
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright Citra Emulator Project / Azahar Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
#include
#include
diff --git a/src/citra_qt/configuration/configure_storage.cpp b/src/citra_qt/configuration/configure_storage.cpp
index d46cb0614..2346f06c2 100644
--- a/src/citra_qt/configuration/configure_storage.cpp
+++ b/src/citra_qt/configuration/configure_storage.cpp
@@ -1,4 +1,4 @@
-// Copyright 2021 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -21,6 +21,7 @@ ConfigureStorage::ConfigureStorage(bool is_powered_on_, QWidget* parent)
});
connect(ui->change_nand_dir, &QPushButton::clicked, this, [this]() {
+ ui->change_nand_dir->setEnabled(false);
const QString dir_path = QFileDialog::getExistingDirectory(
this, tr("Select NAND Directory"),
QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir)),
@@ -29,6 +30,7 @@ ConfigureStorage::ConfigureStorage(bool is_powered_on_, QWidget* parent)
FileUtil::UpdateUserPath(FileUtil::UserPath::NANDDir, dir_path.toStdString());
SetConfiguration();
}
+ ui->change_nand_dir->setEnabled(true);
});
connect(ui->open_sdmc_dir, &QPushButton::clicked, []() {
@@ -37,6 +39,7 @@ ConfigureStorage::ConfigureStorage(bool is_powered_on_, QWidget* parent)
});
connect(ui->change_sdmc_dir, &QPushButton::clicked, this, [this]() {
+ ui->change_sdmc_dir->setEnabled(false);
const QString dir_path = QFileDialog::getExistingDirectory(
this, tr("Select SDMC Directory"),
QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::SDMCDir)),
@@ -45,6 +48,7 @@ ConfigureStorage::ConfigureStorage(bool is_powered_on_, QWidget* parent)
FileUtil::UpdateUserPath(FileUtil::UserPath::SDMCDir, dir_path.toStdString());
SetConfiguration();
}
+ ui->change_sdmc_dir->setEnabled(true);
});
connect(ui->toggle_virtual_sd, &QCheckBox::clicked, this, [this]() {
diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/citra_qt/configuration/configure_system.cpp
index 005ebe394..fb9f6d7bb 100644
--- a/src/citra_qt/configuration/configure_system.cpp
+++ b/src/citra_qt/configuration/configure_system.cpp
@@ -238,6 +238,16 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent)
connect(ui->button_regenerate_console_id, &QPushButton::clicked, this,
&ConfigureSystem::RefreshConsoleID);
connect(ui->button_regenerate_mac, &QPushButton::clicked, this, &ConfigureSystem::RefreshMAC);
+ connect(ui->button_unlink_console, &QPushButton::clicked, this,
+ &ConfigureSystem::UnlinkConsole);
+ connect(ui->combo_country, qOverload(&QComboBox::currentIndexChanged), this,
+ [this](int index) {
+ CheckCountryValid(static_cast(ui->combo_country->itemData(index).toInt()));
+ });
+ connect(ui->region_combobox, qOverload(&QComboBox::currentIndexChanged), this,
+ [this]([[maybe_unused]] int index) {
+ CheckCountryValid(static_cast(ui->combo_country->currentData().toInt()));
+ });
connect(ui->button_secure_info, &QPushButton::clicked, this, [this] {
ui->button_secure_info->setEnabled(false);
@@ -278,6 +288,8 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent)
ui->combo_country->addItem(tr(country_names.at(i)), i);
}
}
+ ui->label_country_invalid->setVisible(false);
+ ui->label_country_invalid->setStyleSheet(QStringLiteral("QLabel { color: #ff3333; }"));
SetupPerGameUI();
ConfigureTime();
@@ -288,6 +300,19 @@ ConfigureSystem::~ConfigureSystem() = default;
void ConfigureSystem::SetConfiguration() {
enabled = !system.IsPoweredOn();
+ if (!Settings::IsConfiguringGlobal()) {
+ ConfigurationShared::SetHighlight(ui->region_label,
+ !Settings::values.region_value.UsingGlobal());
+ const bool is_region_global = Settings::values.region_value.UsingGlobal();
+ ui->region_combobox->setCurrentIndex(
+ is_region_global ? ConfigurationShared::USE_GLOBAL_INDEX
+ : static_cast(Settings::values.region_value.GetValue()) +
+ ConfigurationShared::USE_GLOBAL_OFFSET + 1);
+ } else {
+ // The first item is "auto-select" with actual value -1, so plus one here will do the trick
+ ui->region_combobox->setCurrentIndex(Settings::values.region_value.GetValue() + 1);
+ }
+
ui->combo_init_clock->setCurrentIndex(static_cast(Settings::values.init_clock.GetValue()));
QDateTime date_time;
date_time.setSecsSinceEpoch(Settings::values.init_time.GetValue());
@@ -349,6 +374,7 @@ void ConfigureSystem::ReadSystemSettings() {
// set the country code
country_code = cfg->GetCountryCode();
ui->combo_country->setCurrentIndex(ui->combo_country->findData(country_code));
+ CheckCountryValid(country_code);
// set whether system setup is needed
system_setup = cfg->IsSystemSetupNeeded();
@@ -371,6 +397,10 @@ void ConfigureSystem::ReadSystemSettings() {
void ConfigureSystem::ApplyConfiguration() {
if (enabled) {
+ ConfigurationShared::ApplyPerGameSetting(&Settings::values.region_value,
+ ui->region_combobox,
+ [](s32 index) { return index - 1; });
+
bool modified = false;
// apply username
@@ -527,15 +557,17 @@ void ConfigureSystem::UpdateInitTicks(int init_ticks_type) {
}
void ConfigureSystem::RefreshConsoleID() {
+ ui->button_regenerate_console_id->setEnabled(false);
QMessageBox::StandardButton reply;
QString warning_text =
tr("This will replace your current virtual 3DS console ID with a new one. "
"Your current virtual 3DS console ID will not be recoverable. "
"This might have unexpected effects in applications. This might fail "
"if you use an outdated config save. Continue?");
- reply = QMessageBox::critical(this, tr("Warning"), warning_text,
- QMessageBox::No | QMessageBox::Yes);
+ reply =
+ QMessageBox::warning(this, tr("Warning"), warning_text, QMessageBox::No | QMessageBox::Yes);
if (reply == QMessageBox::No) {
+ ui->button_regenerate_console_id->setEnabled(true);
return;
}
@@ -544,9 +576,11 @@ void ConfigureSystem::RefreshConsoleID() {
cfg->UpdateConfigNANDSavegame();
ui->label_console_id->setText(
tr("Console ID: 0x%1").arg(QString::number(console_id, 16).toUpper()));
+ ui->button_regenerate_console_id->setEnabled(true);
}
void ConfigureSystem::RefreshMAC() {
+ ui->button_regenerate_mac->setEnabled(false);
QMessageBox::StandardButton reply;
QString warning_text = tr("This will replace your current MAC address with a new one. "
"It is not recommended to do this if you got the MAC address from "
@@ -554,11 +588,61 @@ void ConfigureSystem::RefreshMAC() {
reply =
QMessageBox::warning(this, tr("Warning"), warning_text, QMessageBox::No | QMessageBox::Yes);
if (reply == QMessageBox::No) {
+ ui->button_regenerate_mac->setEnabled(true);
return;
}
mac_address = Service::CFG::GenerateRandomMAC();
ui->label_mac->setText(tr("MAC: %1").arg(QString::fromStdString(mac_address)));
+ ui->button_regenerate_mac->setEnabled(true);
+}
+
+void ConfigureSystem::UnlinkConsole() {
+ ui->button_unlink_console->setEnabled(false);
+ QMessageBox::StandardButton reply;
+ QString warning_text =
+ tr("This action will unlink your real console from Azahar, with the following "
+ "consequences:
- Your OTP, SecureInfo and LocalFriendCodeSeed will be removed "
+ "from Azahar.
- Your friend list will reset and you will be logged out of your "
+ "NNID/PNID account.
- System files and eshop titles obtained through Azahar will "
+ "become inaccessible until the same console is linked again (save data will not be "
+ "lost).
Continue?");
+ reply =
+ QMessageBox::warning(this, tr("Warning"), warning_text, QMessageBox::No | QMessageBox::Yes);
+ if (reply == QMessageBox::No) {
+ ui->button_unlink_console->setEnabled(true);
+ return;
+ }
+
+ HW::UniqueData::UnlinkConsole();
+ RefreshSecureDataStatus();
+ ui->button_unlink_console->setEnabled(true);
+}
+
+void ConfigureSystem::CheckCountryValid(u8 country) {
+ // TODO(PabloMK7): Make this per-game compatible
+ if (!Settings::IsConfiguringGlobal())
+ return;
+
+ s32 region = ui->region_combobox->currentIndex() - 1;
+ QString label_text;
+
+ if (region != Settings::REGION_VALUE_AUTO_SELECT &&
+ !cfg->IsValidRegionCountry(static_cast(region), country)) {
+ label_text = tr("Invalid country for configured region");
+ }
+ if (HW::UniqueData::GetSecureInfoA().IsValid()) {
+ region = static_cast(cfg->GetRegionValue(true));
+ if (!cfg->IsValidRegionCountry(static_cast(region), country)) {
+ if (!label_text.isEmpty()) {
+ label_text += QString::fromStdString("\n");
+ }
+ label_text += tr("Invalid country for console unique data");
+ }
+ }
+
+ ui->label_country_invalid->setText(label_text);
+ ui->label_country_invalid->setVisible(!label_text.isEmpty());
}
void ConfigureSystem::InstallSecureData(const std::string& from_path, const std::string& to_path) {
@@ -578,29 +662,36 @@ void ConfigureSystem::RefreshSecureDataStatus() {
auto status_to_str = [](HW::UniqueData::SecureDataLoadStatus status) {
switch (status) {
case HW::UniqueData::SecureDataLoadStatus::Loaded:
- return "Loaded";
+ return tr("Status: Loaded");
case HW::UniqueData::SecureDataLoadStatus::InvalidSignature:
- return "Loaded (Invalid Signature)";
+ return tr("Status: Loaded (Invalid Signature)");
+ case HW::UniqueData::SecureDataLoadStatus::RegionChanged:
+ return tr("Status: Loaded (Region Changed)");
case HW::UniqueData::SecureDataLoadStatus::NotFound:
- return "Not Found";
+ return tr("Status: Not Found");
case HW::UniqueData::SecureDataLoadStatus::Invalid:
- return "Invalid";
+ return tr("Status: Invalid");
case HW::UniqueData::SecureDataLoadStatus::IOError:
- return "IO Error";
+ return tr("Status: IO Error");
default:
- return "";
+ return QString();
}
};
- ui->label_secure_info_status->setText(
- tr((std::string("Status: ") + status_to_str(HW::UniqueData::LoadSecureInfoA())).c_str()));
+ ui->label_secure_info_status->setText(status_to_str(HW::UniqueData::LoadSecureInfoA()));
ui->label_friend_code_seed_status->setText(
- tr((std::string("Status: ") + status_to_str(HW::UniqueData::LoadLocalFriendCodeSeedB()))
- .c_str()));
- ui->label_otp_status->setText(
- tr((std::string("Status: ") + status_to_str(HW::UniqueData::LoadOTP())).c_str()));
- ui->label_movable_status->setText(
- tr((std::string("Status: ") + status_to_str(HW::UniqueData::LoadMovable())).c_str()));
+ status_to_str(HW::UniqueData::LoadLocalFriendCodeSeedB()));
+ ui->label_otp_status->setText(status_to_str(HW::UniqueData::LoadOTP()));
+ ui->label_movable_status->setText(status_to_str(HW::UniqueData::LoadMovable()));
+
+ if (HW::UniqueData::IsFullConsoleLinked()) {
+ ui->linked_console->setVisible(true);
+ ui->button_otp->setEnabled(false);
+ ui->button_secure_info->setEnabled(false);
+ ui->button_friend_code_seed->setEnabled(false);
+ } else {
+ ui->linked_console->setVisible(false);
+ }
}
void ConfigureSystem::RetranslateUI() {
@@ -614,6 +705,7 @@ void ConfigureSystem::SetupPerGameUI() {
ui->toggle_lle_applets->setEnabled(Settings::values.lle_applets.UsingGlobal());
ui->enable_required_online_lle_modules->setEnabled(
Settings::values.enable_required_online_lle_modules.UsingGlobal());
+ ui->region_combobox->setEnabled(Settings::values.region_value.UsingGlobal());
return;
}
@@ -625,6 +717,7 @@ void ConfigureSystem::SetupPerGameUI() {
ui->label_init_ticks_type->setVisible(false);
ui->label_init_ticks_value->setVisible(false);
ui->label_console_id->setVisible(false);
+ ui->label_mac->setVisible(false);
ui->label_sound->setVisible(false);
ui->label_language->setVisible(false);
ui->label_country->setVisible(false);
@@ -646,6 +739,7 @@ void ConfigureSystem::SetupPerGameUI() {
ui->edit_init_ticks_value->setVisible(false);
ui->toggle_system_setup->setVisible(false);
ui->button_regenerate_console_id->setVisible(false);
+ ui->button_regenerate_mac->setVisible(false);
// Apps can change the state of the plugin loader, so plugins load
// to a chainloaded app with specific parameters. Don't allow
// the plugin loader state to be configured per-game as it may
@@ -653,6 +747,7 @@ void ConfigureSystem::SetupPerGameUI() {
ui->label_plugin_loader->setVisible(false);
ui->plugin_loader->setVisible(false);
ui->allow_plugin_loader->setVisible(false);
+ ui->group_real_console_unique_data->setVisible(false);
ConfigurationShared::SetColoredTristate(ui->toggle_new_3ds, Settings::values.is_new_3ds,
is_new_3ds);
@@ -661,4 +756,7 @@ void ConfigureSystem::SetupPerGameUI() {
ConfigurationShared::SetColoredTristate(ui->enable_required_online_lle_modules,
Settings::values.enable_required_online_lle_modules,
required_online_lle_modules);
+ ConfigurationShared::SetColoredComboBox(
+ ui->region_combobox, ui->region_label,
+ static_cast(Settings::values.region_value.GetValue(true) + 1));
}
diff --git a/src/citra_qt/configuration/configure_system.h b/src/citra_qt/configuration/configure_system.h
index 086b84a22..af7c81200 100644
--- a/src/citra_qt/configuration/configure_system.h
+++ b/src/citra_qt/configuration/configure_system.h
@@ -52,6 +52,8 @@ private:
void UpdateInitTicks(int init_ticks_type);
void RefreshConsoleID();
void RefreshMAC();
+ void UnlinkConsole();
+ void CheckCountryValid(u8 country);
void InstallSecureData(const std::string& from_path, const std::string& to_path);
void RefreshSecureDataStatus();
diff --git a/src/citra_qt/configuration/configure_system.ui b/src/citra_qt/configuration/configure_system.ui
index 97e4b4654..244fb3c5f 100644
--- a/src/citra_qt/configuration/configure_system.ui
+++ b/src/citra_qt/configuration/configure_system.ui
@@ -64,30 +64,82 @@
System Settings
- -
+
-
Enable New 3DS mode
- -
+
-
Use LLE applets (if installed)
- -
+
-
- Enable required LLE modules for online features (if installed)
+ Enable required LLE modules for
+online features (if installed)
Enables the LLE modules needed for online multiplayer, eShop access, etc.
+ -
+
+
+ Region:
+
+
+
+ -
+
+
-
+
+ Auto-select
+
+
+ -
+
+ JPN
+
+
+ -
+
+ USA
+
+
+ -
+
+ EUR
+
+
+ -
+
+ AUS
+
+
+ -
+
+ CHN
+
+
+ -
+
+ KOR
+
+
+ -
+
+ TWN
+
+
+
+
-
@@ -296,14 +348,21 @@
-
- -
+
-
+
+
+
+
+
+
+ -
Clock
- -
+
-
-
@@ -317,28 +376,28 @@
- -
+
-
Startup time
- -
+
-
yyyy-MM-ddTHH:mm:ss
- -
+
-
Offset time
- -
+
-
-
@@ -362,14 +421,14 @@
- -
+
-
Initial System Ticks
- -
+
-
-
@@ -383,14 +442,14 @@
- -
+
-
Initial System Ticks Override
- -
+
-
@@ -403,21 +462,21 @@
- -
+
-
Play Coins
- -
+
-
300
- -
+
-
<html><head/><body><p>Number of steps per hour reported by the pedometer. Range from 0 to 65,535.</p></body></html>
@@ -427,28 +486,28 @@
- -
+
-
9999
- -
+
-
Run System Setup when Home Menu is launched
- -
+
-
Console ID:
- -
+
-
@@ -464,14 +523,14 @@
- -
+
-
MAC:
- -
+
-
@@ -487,21 +546,21 @@
- -
+
-
3GX Plugin Loader:
- -
+
-
Enable 3GX plugin loader
- -
+
-
Allow applications to change plugin loader state
@@ -517,122 +576,157 @@
Real Console Unique Data
+
-
+
+
+
-
+
+
+
-
+
+
+ Your real console is linked to Azahar.
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::RightToLeft
+
+
+ Unlink
+
+
+
+
+
+
+ -
+
+
+ OTP
+
+
+
+ -
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::RightToLeft
+
+
+ Choose
+
+
+
+
+
+
+ -
+
+
+ SecureInfo_A/B
+
+
+
+ -
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::RightToLeft
+
+
+ Choose
+
+
+
+
+
+
+ -
+
+
+ LocalFriendCodeSeed_A/B
+
+
+
+ -
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::RightToLeft
+
+
+ Choose
+
+
+
+
+
+
+
+
+
-
-
-
- SecureInfo_A/B
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::RightToLeft
-
-
- Choose
-
-
-
-
-
-
- -
-
-
- LocalFriendCodeSeed_A/B
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::RightToLeft
-
-
- Choose
-
-
-
-
-
-
- -
-
-
- OTP
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::RightToLeft
-
-
- Choose
-
-
-
-
-
-
- -
movable.sed
- -
+
-
-
diff --git a/src/citra_qt/loading_screen.cpp b/src/citra_qt/loading_screen.cpp
index 2135b7db1..ba2fdcaa6 100644
--- a/src/citra_qt/loading_screen.cpp
+++ b/src/citra_qt/loading_screen.cpp
@@ -1,4 +1,4 @@
-// Copyright 2020 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -184,14 +184,7 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size
}
// update labels and progress bar
- const auto& stg = tr(stage_translations.at(stage));
- if (stage == VideoCore::LoadCallbackStage::Decompile ||
- stage == VideoCore::LoadCallbackStage::Build ||
- stage == VideoCore::LoadCallbackStage::Preload) {
- ui->stage->setText(stg.arg(value).arg(total));
- } else {
- ui->stage->setText(stg);
- }
+ ui->stage->setText(GetStageTranslation(stage, value, total));
ui->value->setText(estimate);
ui->progress_bar->setValue(static_cast(value));
previous_time = now;
@@ -205,4 +198,16 @@ void LoadingScreen::paintEvent(QPaintEvent* event) {
QWidget::paintEvent(event);
}
+QString LoadingScreen::GetStageTranslation(VideoCore::LoadCallbackStage stage, std::size_t value,
+ std::size_t total) {
+ const auto& stg = tr(stage_translations.at(stage));
+ if (stage == VideoCore::LoadCallbackStage::Decompile ||
+ stage == VideoCore::LoadCallbackStage::Build ||
+ stage == VideoCore::LoadCallbackStage::Preload) {
+ return stg.arg(value).arg(total);
+ } else {
+ return stg;
+ }
+}
+
void LoadingScreen::Clear() {}
diff --git a/src/citra_qt/loading_screen.h b/src/citra_qt/loading_screen.h
index 98d18e243..a6bfc7d09 100644
--- a/src/citra_qt/loading_screen.h
+++ b/src/citra_qt/loading_screen.h
@@ -1,4 +1,4 @@
-// Copyright 2020 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -49,6 +49,9 @@ public:
// See https://wiki.qt.io/How_to_Change_the_Background_Color_of_QWidget
void paintEvent(QPaintEvent* event) override;
+ QString GetStageTranslation(VideoCore::LoadCallbackStage stage, std::size_t value,
+ std::size_t total);
+
signals:
void LoadProgress(VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total);
/// Signals that this widget is completely hidden now and should be replaced with the other
diff --git a/src/citra_qt/main.ui b/src/citra_qt/main.ui
index 7cd7fdc4e..70f1915b4 100644
--- a/src/citra_qt/main.ui
+++ b/src/citra_qt/main.ui
@@ -100,6 +100,7 @@
Save State
+
@@ -343,11 +345,21 @@
Save to Oldest Slot
+
+
+ Quick Save
+
+
Load from Newest Slot
+
+
+ Quick Load
+
+
Configure...
diff --git a/src/citra_qt/update_checker.cpp b/src/citra_qt/update_checker.cpp
index a8a3955d7..b4d34344c 100644
--- a/src/citra_qt/update_checker.cpp
+++ b/src/citra_qt/update_checker.cpp
@@ -9,47 +9,74 @@
#include "common/logging/log.h"
#include "update_checker.h"
-std::optional UpdateChecker::CheckForUpdate() {
- constexpr auto UPDATE_CHECK_URL = "http://api.github.com";
- constexpr auto UPDATE_CHECK_PATH = "/repos/azahar-emu/azahar/releases/latest";
- constexpr std::size_t UPDATE_CHECK_TIMEOUT_SECONDS = 15;
+std::optional GetResponse(std::string url, std::string path) {
+ constexpr std::size_t timeout_seconds = 15;
- std::unique_ptr client = std::make_unique(UPDATE_CHECK_URL);
- client->set_connection_timeout(UPDATE_CHECK_TIMEOUT_SECONDS);
- client->set_read_timeout(UPDATE_CHECK_TIMEOUT_SECONDS);
- client->set_write_timeout(UPDATE_CHECK_TIMEOUT_SECONDS);
+ std::unique_ptr client = std::make_unique(url);
+ client->set_connection_timeout(timeout_seconds);
+ client->set_read_timeout(timeout_seconds);
+ client->set_write_timeout(timeout_seconds);
if (client == nullptr) {
- LOG_ERROR(Frontend, "Invalid URL {}{}", UPDATE_CHECK_URL, UPDATE_CHECK_PATH);
+ LOG_ERROR(Frontend, "Invalid URL {}{}", url, path);
return {};
}
httplib::Request request{
.method = "GET",
- .path = UPDATE_CHECK_PATH,
+ .path = path,
};
client->set_follow_location(true);
const auto result = client->send(request);
if (!result) {
- LOG_ERROR(Frontend, "GET to {}{} returned null", UPDATE_CHECK_URL, UPDATE_CHECK_PATH);
+ LOG_ERROR(Frontend, "GET to {}{} returned null", url, path);
return {};
}
const auto& response = result.value();
if (response.status >= 400) {
- LOG_ERROR(Frontend, "GET to {}{} returned error status code: {}", UPDATE_CHECK_URL,
- UPDATE_CHECK_PATH, response.status);
+ LOG_ERROR(Frontend, "GET to {}{} returned error status code: {}", url, path,
+ response.status);
return {};
}
if (!response.headers.contains("content-type")) {
- LOG_ERROR(Frontend, "GET to {}{} returned no content", UPDATE_CHECK_URL, UPDATE_CHECK_PATH);
+ LOG_ERROR(Frontend, "GET to {}{} returned no content", url, path);
return {};
}
+ return response.body;
+}
+
+std::optional UpdateChecker::GetLatestRelease(bool include_prereleases) {
+ constexpr auto update_check_url = "http://api.github.com";
+ std::string update_check_path = "/repos/azahar-emu/azahar/releases";
try {
- return nlohmann::json::parse(response.body).at("tag_name");
+ if (include_prereleases) {
+ // This can return either a prerelease or a normal release, whichever is more recent
+ const auto response = GetResponse(update_check_url, update_check_path);
+ if (!response)
+ return {};
+ return nlohmann::json::parse(response.value()).at(0).at("tag_name");
+ } else {
+ update_check_path += "/latest";
+ const auto response = GetResponse(update_check_url, update_check_path);
+ if (!response)
+ return {};
+ return nlohmann::json::parse(response.value()).at("tag_name");
+ }
+
} catch (nlohmann::detail::out_of_range&) {
+ LOG_ERROR(Frontend,
+ "Parsing JSON response from {}{} failed during update check: "
+ "nlohmann::detail::out_of_range",
+ update_check_url, update_check_path);
+ return {};
+ } catch (nlohmann::detail::type_error&) {
+ LOG_ERROR(Frontend,
+ "Parsing JSON response from {}{} failed during update check: "
+ "nlohmann::detail::type_error",
+ update_check_url, update_check_path);
return {};
}
}
diff --git a/src/citra_qt/update_checker.h b/src/citra_qt/update_checker.h
index b416503e7..843b5a1cb 100644
--- a/src/citra_qt/update_checker.h
+++ b/src/citra_qt/update_checker.h
@@ -8,5 +8,5 @@
#include
namespace UpdateChecker {
-std::optional CheckForUpdate();
+std::optional GetLatestRelease(bool);
}
diff --git a/src/citra_qt/util/util.cpp b/src/citra_qt/util/util.cpp
index 413e94abc..9c234ec37 100644
--- a/src/citra_qt/util/util.cpp
+++ b/src/citra_qt/util/util.cpp
@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Lime3DS Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -174,4 +174,20 @@ const std::string GetApplicationsDirectory() {
#else
return QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation).toStdString();
#endif
-}
\ No newline at end of file
+}
+
+QImage GetMirroredImage(QImage source_image, bool flip_horizontal, bool flip_vertical) {
+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0) // Fallback, uses deprecated method
+ return source_image.mirrored(flip_horizontal, flip_vertical);
+#else // New method
+ auto orientation_horizontal = static_cast(0x0);
+ auto orientation_vertical = static_cast(0x0);
+
+ if (flip_horizontal)
+ orientation_horizontal = Qt::Horizontal;
+ if (flip_vertical)
+ orientation_vertical = Qt::Vertical;
+
+ return source_image.flipped(orientation_horizontal | orientation_vertical);
+#endif
+}
diff --git a/src/citra_qt/util/util.h b/src/citra_qt/util/util.h
index 428d69ffd..fff56166f 100644
--- a/src/citra_qt/util/util.h
+++ b/src/citra_qt/util/util.h
@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Lime3DS Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -41,3 +41,11 @@ QPixmap GetQPixmapFromSMDH(const std::vector& smdh_data);
* @return The user’s applications directory
*/
[[nodiscard]] const std::string GetApplicationsDirectory();
+
+/**
+ * Imitates the deprecated `QImage::mirrored` function in a forwards-compatible manner
+ * @param flip_horizontal Whether the image should be flipped horizontally
+ * @param flip_vertical Whether the image should be flipped vertically
+ * @return QImage The mirrored image
+ */
+QImage GetMirroredImage(QImage source_image, bool flip_horizontal, bool flip_vertical);
diff --git a/src/citra_room/CMakeLists.txt b/src/citra_room/CMakeLists.txt
index 203dd7d69..28ac50748 100644
--- a/src/citra_room/CMakeLists.txt
+++ b/src/citra_room/CMakeLists.txt
@@ -1,13 +1,12 @@
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
-add_executable(citra_room
+add_library(citra_room STATIC EXCLUDE_FROM_ALL
precompiled_headers.h
citra_room.cpp
+ citra_room.h
citra_room.rc
)
-set_target_properties(citra_room PROPERTIES OUTPUT_NAME "azahar-room")
-
create_target_directory_groups(citra_room)
target_link_libraries(citra_room PRIVATE citra_common network)
diff --git a/src/citra_room/citra_room.cpp b/src/citra_room/citra_room.cpp
index defd4d956..b956003f9 100644
--- a/src/citra_room/citra_room.cpp
+++ b/src/citra_room/citra_room.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -161,11 +161,16 @@ static void InitializeLogging(const std::string& log_file) {
}
/// Application entry point
-int main(int argc, char** argv) {
+void LaunchRoom(int argc, char** argv, bool called_by_option) {
Common::DetachedTasks detached_tasks;
int option_index = 0;
char* endarg;
+ char* new_argv0 = argv[0];
+ if (called_by_option) {
+ strcat(new_argv0, " --room");
+ }
+
std::string room_name;
std::string room_description;
std::string password;
@@ -199,6 +204,8 @@ int main(int argc, char** argv) {
// Removed options
{"preferred-game", optional_argument, 0, 'g'},
{"preferred-game-id", optional_argument, 0, 0},
+ // Entry option
+ {"room", 0, 0, 0},
{0, 0, 0, 0},
};
@@ -248,17 +255,17 @@ int main(int argc, char** argv) {
break;
case 'h':
PrintHelp(argv[0]);
- return 0;
+ exit(0);
case 'v':
PrintVersion();
- return 0;
+ exit(0);
case 'g':
PrintRemovedOptionWarning(argv[0], "--preferred-game/-g");
- return 255;
+ exit(255);
case 0:
if (strcmp(long_options[option_index].name, "preferred-game-id") == 0) {
PrintRemovedOptionWarning(argv[0], "--preferred-game-id");
- return 255;
+ exit(255);
}
}
}
@@ -267,12 +274,12 @@ int main(int argc, char** argv) {
if (room_name.empty()) {
std::cout << "room name is empty!\n\n";
PrintHelp(argv[0]);
- return -1;
+ exit(-1);
}
if (preferred_game.empty()) {
std::cout << "preferred application is empty!\n\n";
PrintHelp(argv[0]);
- return -1;
+ exit(-1);
}
if (preferred_game_id == 0) {
std::cout
@@ -283,12 +290,12 @@ int main(int argc, char** argv) {
std::cout << "max_members needs to be in the range 2 - "
<< Network::MaxConcurrentConnections << "!\n\n";
PrintHelp(argv[0]);
- return -1;
+ exit(-1);
}
if (port > 65535) {
std::cout << "port needs to be in the range 0 - 65535!\n\n";
PrintHelp(argv[0]);
- return -1;
+ exit(-1);
}
if (ban_list_file.empty()) {
std::cout << "Ban list file not set!\nThis should get set to load and save room ban "
@@ -350,7 +357,7 @@ int main(int argc, char** argv) {
preferred_game, preferred_game_id, std::move(verify_backend), ban_list,
enable_citra_mods)) {
std::cout << "Failed to create room: \n\n";
- return -1;
+ exit(-1);
}
std::cout << "Room is open. Close with Q+Enter...\n\n";
auto announce_session = std::make_unique();
@@ -377,5 +384,4 @@ int main(int argc, char** argv) {
}
Network::Shutdown();
detached_tasks.WaitForAllTasks();
- return 0;
}
diff --git a/src/citra_room/citra_room.h b/src/citra_room/citra_room.h
new file mode 100644
index 000000000..3d9b8749c
--- /dev/null
+++ b/src/citra_room/citra_room.h
@@ -0,0 +1,7 @@
+// Copyright Citra Emulator Project / Azahar Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+void LaunchRoom(int argc, char** argv, bool called_by_option);
diff --git a/src/citra_room_standalone/CMakeLists.txt b/src/citra_room_standalone/CMakeLists.txt
new file mode 100644
index 000000000..e48051469
--- /dev/null
+++ b/src/citra_room_standalone/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_executable(citra_room_standalone
+ citra_room_standalone.cpp
+)
+
+set_target_properties(citra_room_standalone PROPERTIES OUTPUT_NAME "azahar-room")
+
+target_link_libraries(citra_room_standalone PRIVATE citra_room)
+
+if(UNIX AND NOT APPLE)
+ install(TARGETS citra_room_standalone RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
+endif()
diff --git a/src/citra_room_standalone/citra_room_standalone.cpp b/src/citra_room_standalone/citra_room_standalone.cpp
new file mode 100644
index 000000000..d06e53e0a
--- /dev/null
+++ b/src/citra_room_standalone/citra_room_standalone.cpp
@@ -0,0 +1,9 @@
+// Copyright Citra Emulator Project / Azahar Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "citra_room/citra_room.h"
+
+int main(int argc, char* argv[]) {
+ LaunchRoom(argc, argv, false);
+}
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 1ed74bd51..5d1b184fa 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -4,6 +4,7 @@
// Copyright Dolphin Emulator Project
// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
#include
#include
diff --git a/src/common/file_util.h b/src/common/file_util.h
index a4881b57b..ef36ce02f 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -4,6 +4,7 @@
// Copyright Dolphin Emulator Project
// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
#pragma once
diff --git a/src/common/hacks/hack_list.cpp b/src/common/hacks/hack_list.cpp
index eb88bccde..c5702df5e 100644
--- a/src/common/hacks/hack_list.cpp
+++ b/src/common/hacks/hack_list.cpp
@@ -108,5 +108,53 @@ HackManager hack_manager = {
},
}},
+ {HackType::REGION_FROM_SECURE,
+ HackEntry{
+ .mode = HackAllowMode::FORCE,
+ .affected_title_ids =
+ {
+ // eShop
+ 0x0004001000020900, // JPN
+ 0x0004001000021900, // USA
+ 0x0004001000022900, // EUR
+ 0x0004001000027900, // KOR
+ 0x0004001000028900, // TWN
+
+ // System Settings
+ 0x0004001000020000, // JPN
+ 0x0004001000021000, // USA
+ 0x0004001000022000, // EUR
+ 0x0004001000026000, // CHN
+ 0x0004001000027000, // KOR
+ 0x0004001000028000, // TWN
+
+ // Nintendo Network ID Settings
+ 0x000400100002BF00, // JPN
+ 0x000400100002C000, // USA
+ 0x000400100002C100, // EUR
+
+ // System Settings
+ 0x0004003000008202, // JPN
+ 0x0004003000008F02, // USA
+ 0x0004003000009802, // EUR
+ 0x000400300000A102, // CHN
+ 0x000400300000A902, // KOR
+ 0x000400300000B102, // TWN
+
+ // NIM
+ 0x0004013000002C02, // Normal
+ 0x0004013000002C03, // Safe mode
+ 0x0004013020002C03, // New 3DS safe mode
+
+ // ACT
+ 0x0004013000003802, // Normal
+
+ // FRD
+ 0x0004013000003202, // Normal
+ 0x0004013000003203, // Safe mode
+ 0x0004013020003203, // New 3DS safe mode
+ },
+ }},
+
}};
}
\ No newline at end of file
diff --git a/src/common/hacks/hack_list.h b/src/common/hacks/hack_list.h
index 1a21a0575..43d7ea409 100644
--- a/src/common/hacks/hack_list.h
+++ b/src/common/hacks/hack_list.h
@@ -13,6 +13,7 @@ enum class HackType : int {
ACCURATE_MULTIPLICATION,
DECRYPTION_AUTHORIZED,
ONLINE_LLE_REQUIRED,
+ REGION_FROM_SECURE,
};
class UserHackData {};
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index c26771018..08af05e88 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -115,6 +115,7 @@ void LogSettings() {
log_setting("Layout_PortraitLayoutOption", values.portrait_layout_option.GetValue());
log_setting("Layout_SwapScreen", values.swap_screen.GetValue());
log_setting("Layout_UprightScreen", values.upright_screen.GetValue());
+ log_setting("Layout_ScreenGap", values.screen_gap.GetValue());
log_setting("Layout_LargeScreenProportion", values.large_screen_proportion.GetValue());
log_setting("Layout_SmallScreenPosition", values.small_screen_position.GetValue());
log_setting("Utility_DumpTextures", values.dump_textures.GetValue());
@@ -208,6 +209,7 @@ void RestoreGlobalState(bool is_powered_on) {
values.swap_screen.SetGlobal(true);
values.upright_screen.SetGlobal(true);
values.large_screen_proportion.SetGlobal(true);
+ values.screen_gap.SetGlobal(true);
values.small_screen_position.SetGlobal(true);
values.bg_red.SetGlobal(true);
values.bg_green.SetGlobal(true);
diff --git a/src/common/settings.h b/src/common/settings.h
index c09021e60..d061add3c 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -51,6 +51,7 @@ enum class PortraitLayoutOption : u32 {
// formerly mobile portrait
PortraitTopFullWidth,
PortraitCustomLayout,
+ PortraitOriginal
};
/** Defines where the small screen will appear relative to the large screen
@@ -497,6 +498,7 @@ struct Values {
Setting use_shader_jit{true, "use_shader_jit"};
SwitchableSetting resolution_factor{1, 0, 10, "resolution_factor"};
SwitchableSetting frame_limit{100, 0, 1000, "frame_limit"};
+ SwitchableSetting turbo_limit{200, 0, 1000, "turbo_limit"};
SwitchableSetting texture_filter{TextureFilter::NoFilter, "texture_filter"};
SwitchableSetting texture_sampling{TextureSampling::GameControlled,
"texture_sampling"};
@@ -508,6 +510,7 @@ struct Values {
SwitchableSetting upright_screen{false, "upright_screen"};
SwitchableSetting large_screen_proportion{4.f, 1.f, 16.f,
"large_screen_proportion"};
+ SwitchableSetting screen_gap{0, "screen_gap"};
SwitchableSetting small_screen_position{SmallScreenPosition::BottomRight,
"small_screen_position"};
Setting custom_top_x{0, "custom_top_x"};
diff --git a/src/core/cheats/cheat_base.h b/src/core/cheats/cheat_base.h
index d8a5924cd..634b1643c 100644
--- a/src/core/cheats/cheat_base.h
+++ b/src/core/cheats/cheat_base.h
@@ -1,10 +1,11 @@
-// Copyright 2018 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#pragma once
#include
+#include "common/common_types.h"
namespace Core {
class System;
@@ -14,7 +15,7 @@ namespace Cheats {
class CheatBase {
public:
virtual ~CheatBase();
- virtual void Execute(Core::System& system) const = 0;
+ virtual void Execute(Core::System& system, u32 process_id) const = 0;
virtual bool IsEnabled() const = 0;
virtual void SetEnabled(bool enabled) = 0;
diff --git a/src/core/cheats/cheats.cpp b/src/core/cheats/cheats.cpp
index 30b8e56cc..2cdb75ad1 100644
--- a/src/core/cheats/cheats.cpp
+++ b/src/core/cheats/cheats.cpp
@@ -1,4 +1,4 @@
-// Copyright 2018 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -25,7 +25,8 @@ CheatEngine::~CheatEngine() {
}
}
-void CheatEngine::Connect() {
+void CheatEngine::Connect(u32 process_id) {
+ this->process_id = process_id;
event = system.CoreTiming().RegisterEvent(
"CheatCore::run_event",
[this](u64 thread_id, s64 cycle_late) { RunCallback(thread_id, cycle_late); });
@@ -107,7 +108,7 @@ void CheatEngine::RunCallback([[maybe_unused]] std::uintptr_t user_data, s64 cyc
std::shared_lock lock{cheats_list_mutex};
for (const auto& cheat : cheats_list) {
if (cheat->IsEnabled()) {
- cheat->Execute(system);
+ cheat->Execute(system, process_id);
}
}
}
diff --git a/src/core/cheats/cheats.h b/src/core/cheats/cheats.h
index 8f8127d74..c3a9e840c 100644
--- a/src/core/cheats/cheats.h
+++ b/src/core/cheats/cheats.h
@@ -1,4 +1,4 @@
-// Copyright 2018 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -30,7 +30,7 @@ public:
~CheatEngine();
/// Registers the cheat execution callback.
- void Connect();
+ void Connect(u32 process_id);
/// Returns a span of the currently active cheats.
std::span> GetCheats() const;
@@ -50,6 +50,10 @@ public:
/// Saves currently active cheats to file for the specified title id.
void SaveCheatFile(u64 title_id) const;
+ u32 GetConnectedPID() const {
+ return process_id;
+ }
+
private:
/// The cheat execution callback.
void RunCallback(std::uintptr_t user_data, s64 cycles_late);
@@ -58,6 +62,7 @@ private:
Core::System& system;
Core::TimingEventType* event;
std::optional loaded_title_id;
+ u32 process_id = 0xFFFFFFFF;
std::vector> cheats_list;
mutable std::shared_mutex cheats_list_mutex;
};
diff --git a/src/core/cheats/gateway_cheat.cpp b/src/core/cheats/gateway_cheat.cpp
index b30fda542..176264b7d 100644
--- a/src/core/cheats/gateway_cheat.cpp
+++ b/src/core/cheats/gateway_cheat.cpp
@@ -56,10 +56,10 @@ static inline std::enable_if_t> CompOp(const GatewayCheat:
}
}
-static inline void LoadOffsetOp(Memory::MemorySystem& memory, const GatewayCheat::CheatLine& line,
- State& state) {
+static inline void LoadOffsetOp(Memory::MemorySystem& memory, const Kernel::Process& process,
+ const GatewayCheat::CheatLine& line, State& state) {
u32 addr = line.address + state.offset;
- state.offset = memory.Read32(addr);
+ state.offset = memory.Read32(process, addr);
}
static inline void LoopOp(const GatewayCheat::CheatLine& line, State& state) {
@@ -145,6 +145,7 @@ static inline void JokerOp(const GatewayCheat::CheatLine& line, State& state,
}
static inline void PatchOp(const GatewayCheat::CheatLine& line, State& state, Core::System& system,
+ const Kernel::Process& process,
std::span cheat_lines) {
if (state.if_flag > 0) {
// Skip over the additional patch lines
@@ -166,7 +167,7 @@ static inline void PatchOp(const GatewayCheat::CheatLine& line, State& state, Co
state.current_line_nr++;
}
first = !first;
- system.Memory().Write32(addr, tmp);
+ system.Memory().Write32(process, addr, tmp);
addr += 4;
num_bytes -= 4;
}
@@ -174,7 +175,7 @@ static inline void PatchOp(const GatewayCheat::CheatLine& line, State& state, Co
u32 tmp = (first ? cheat_lines[state.current_line_nr].first
: cheat_lines[state.current_line_nr].value) >>
bit_offset;
- system.Memory().Write8(addr, static_cast(tmp));
+ system.Memory().Write8(process, addr, static_cast(tmp));
addr += 1;
num_bytes -= 1;
bit_offset += 8;
@@ -229,16 +230,27 @@ GatewayCheat::GatewayCheat(std::string name_, std::string code, std::string comm
GatewayCheat::~GatewayCheat() = default;
-void GatewayCheat::Execute(Core::System& system) const {
+void GatewayCheat::Execute(Core::System& system, u32 process_id) const {
State state;
Memory::MemorySystem& memory = system.Memory();
- auto Read8 = [&memory](VAddr addr) { return memory.Read8(addr); };
- auto Read16 = [&memory](VAddr addr) { return memory.Read16(addr); };
- auto Read32 = [&memory](VAddr addr) { return memory.Read32(addr); };
- auto Write8 = [&memory](VAddr addr, u8 value) { memory.Write8(addr, value); };
- auto Write16 = [&memory](VAddr addr, u16 value) { memory.Write16(addr, value); };
- auto Write32 = [&memory](VAddr addr, u32 value) { memory.Write32(addr, value); };
+ std::shared_ptr process = system.Kernel().GetProcessById(process_id);
+ if (!process) {
+ return;
+ }
+
+ auto Read8 = [&memory, &process](VAddr addr) { return memory.Read8(*process, addr); };
+ auto Read16 = [&memory, &process](VAddr addr) { return memory.Read16(*process, addr); };
+ auto Read32 = [&memory, &process](VAddr addr) { return memory.Read32(*process, addr); };
+ auto Write8 = [&memory, &process](VAddr addr, u8 value) {
+ memory.Write8(*process, addr, value);
+ };
+ auto Write16 = [&memory, &process](VAddr addr, u16 value) {
+ memory.Write16(*process, addr, value);
+ };
+ auto Write32 = [&memory, &process](VAddr addr, u32 value) {
+ memory.Write32(*process, addr, value);
+ };
for (state.current_line_nr = 0; state.current_line_nr < cheat_lines.size();
state.current_line_nr++) {
@@ -261,7 +273,7 @@ void GatewayCheat::Execute(Core::System& system) const {
// EXXXXXXX YYYYYYYY
// Copies YYYYYYYY bytes from (current code location + 8) to [XXXXXXXX + offset].
// We need to call this here to skip the additional patch lines
- PatchOp(line, state, system, cheat_lines);
+ PatchOp(line, state, system, *process, cheat_lines);
break;
case CheatType::Terminator:
// D0000000 00000000 - ENDIF
@@ -336,7 +348,7 @@ void GatewayCheat::Execute(Core::System& system) const {
break;
case CheatType::LoadOffset:
// BXXXXXXX 00000000 - offset = word[XXXXXXX+offset]
- LoadOffsetOp(system.Memory(), line, state);
+ LoadOffsetOp(system.Memory(), *process, line, state);
break;
case CheatType::Loop: {
// C0000000 YYYYYYYY - LOOP next block YYYYYYYY times
@@ -417,7 +429,7 @@ void GatewayCheat::Execute(Core::System& system) const {
case CheatType::Patch: {
// EXXXXXXX YYYYYYYY
// Copies YYYYYYYY bytes from (current code location + 8) to [XXXXXXXX + offset].
- PatchOp(line, state, system, cheat_lines);
+ PatchOp(line, state, system, *process, cheat_lines);
break;
}
}
diff --git a/src/core/cheats/gateway_cheat.h b/src/core/cheats/gateway_cheat.h
index ff200af59..dadfd2042 100644
--- a/src/core/cheats/gateway_cheat.h
+++ b/src/core/cheats/gateway_cheat.h
@@ -1,4 +1,4 @@
-// Copyright 2018 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -59,7 +59,7 @@ public:
GatewayCheat(std::string name, std::string code, std::string comments);
~GatewayCheat();
- void Execute(Core::System& system) const override;
+ void Execute(Core::System& system, u32 process_id) const override;
bool IsEnabled() const override;
void SetEnabled(bool enabled) override;
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 321e72646..98ac85eba 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -394,7 +394,7 @@ System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::st
}
cheat_engine.LoadCheatFile(title_id);
- cheat_engine.Connect();
+ cheat_engine.Connect(process->process_id);
perf_stats = std::make_unique(title_id);
@@ -473,7 +473,7 @@ System::ResultStatus System::Init(Frontend::EmuWindow& emu_window,
#else
for (u32 i = 0; i < num_cores; ++i) {
cpu_cores.push_back(
- std::make_shared(this, *memory, USER32MODE, i, timing->GetTimer(i)));
+ std::make_shared(*this, *memory, USER32MODE, i, timing->GetTimer(i)));
}
LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available");
#endif
@@ -814,9 +814,11 @@ void System::serialize(Archive& ar, const unsigned int file_version) {
// This needs to be set from somewhere - might as well be here!
if (Archive::is_loading::value) {
+ u32 cheats_pid;
+ ar & cheats_pid;
timing->UnlockEventQueue();
memory->SetDSP(*dsp_core);
- cheat_engine.Connect();
+ cheat_engine.Connect(cheats_pid);
gpu->Sync();
// Re-register gpu callback, because gsp service changed after service_manager got
@@ -824,6 +826,9 @@ void System::serialize(Archive& ar, const unsigned int file_version) {
auto gsp = service_manager->GetService("gsp::Gpu");
gpu->SetInterruptHandler(
[gsp](Service::GSP::InterruptId interrupt_id) { gsp->SignalInterrupt(interrupt_id); });
+ } else {
+ u32 cheats_pid = cheat_engine.GetConnectedPID();
+ ar & cheats_pid;
}
save_state_status = SaveStateStatus::NONE;
diff --git a/src/core/file_sys/archive_ncch.cpp b/src/core/file_sys/archive_ncch.cpp
index 54d4639c5..fb0be5640 100644
--- a/src/core/file_sys/archive_ncch.cpp
+++ b/src/core/file_sys/archive_ncch.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -133,6 +133,9 @@ ResultVal> NCCHArchive::OpenFile(const Path& path,
constexpr u32 region_manifest = 0x00010402;
constexpr u32 ng_word_list = 0x00010302;
constexpr u32 shared_font = 0x00014002;
+ constexpr u32 shared_font_CHN = 0x00014102;
+ constexpr u32 shared_font_KOR = 0x00014202;
+ constexpr u32 shared_font_TWN = 0x00014302;
u32 high = static_cast(title_id >> 32);
u32 low = static_cast(title_id & 0xFFFFFFFF);
@@ -158,6 +161,11 @@ ResultVal> NCCHArchive::OpenFile(const Path& path,
"Shared Font file missing. Loading open source replacement from memory");
archive_data =
std::vector(std::begin(SHARED_FONT_DATA), std::end(SHARED_FONT_DATA));
+ } else if (low == shared_font_CHN || low == shared_font_KOR || low == shared_font_TWN) {
+ LOG_ERROR(Service_FS, "CHN/KOR/TWN shared font file missing. Loading open source "
+ "replacement, but text will not display properly");
+ archive_data =
+ std::vector(std::begin(SHARED_FONT_DATA), std::end(SHARED_FONT_DATA));
}
} else if (high == system_data_archive) {
if (low == ng_word_list) {
diff --git a/src/core/file_sys/cia_container.cpp b/src/core/file_sys/cia_container.cpp
index 3297b96b0..957c541b3 100644
--- a/src/core/file_sys/cia_container.cpp
+++ b/src/core/file_sys/cia_container.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -13,11 +13,11 @@
namespace FileSys {
Loader::ResultStatus CIAContainer::Load(const FileBackend& backend) {
- std::vector header_data(sizeof(Header));
+ std::vector header_data(sizeof(CIAHeader));
// Load the CIA Header
- ResultVal read_result = backend.Read(0, sizeof(Header), header_data.data());
- if (read_result.Failed() || *read_result != sizeof(Header))
+ ResultVal read_result = backend.Read(0, sizeof(CIAHeader), header_data.data());
+ if (read_result.Failed() || *read_result != sizeof(CIAHeader))
return Loader::ResultStatus::Error;
Loader::ResultStatus result = LoadHeader(header_data);
@@ -65,8 +65,8 @@ Loader::ResultStatus CIAContainer::Load(const std::string& filepath) {
return Loader::ResultStatus::Error;
// Load CIA Header
- std::vector header_data(sizeof(Header));
- if (file.ReadBytes(header_data.data(), sizeof(Header)) != sizeof(Header))
+ std::vector header_data(sizeof(CIAHeader));
+ if (file.ReadBytes(header_data.data(), sizeof(CIAHeader)) != sizeof(CIAHeader))
return Loader::ResultStatus::Error;
Loader::ResultStatus result = LoadHeader(header_data);
@@ -134,11 +134,12 @@ Loader::ResultStatus CIAContainer::Load(std::span file_data) {
}
Loader::ResultStatus CIAContainer::LoadHeader(std::span header_data, std::size_t offset) {
- if (header_data.size() - offset < sizeof(Header)) {
+ if (header_data.size() - offset < sizeof(CIAHeader)) {
return Loader::ResultStatus::Error;
}
- std::memcpy(&cia_header, header_data.data(), sizeof(Header));
+ std::memcpy(&cia_header, header_data.data(), sizeof(CIAHeader));
+ has_header = true;
return Loader::ResultStatus::Success;
}
@@ -157,6 +158,11 @@ Loader::ResultStatus CIAContainer::LoadTitleMetadata(std::span tmd_dat
return cia_tmd.Load(tmd_data, offset);
}
+Loader::ResultStatus CIAContainer::LoadTitleMetadata(const TitleMetadata& tmd) {
+ cia_tmd = tmd;
+ return Loader::ResultStatus::Success;
+}
+
Loader::ResultStatus CIAContainer::LoadMetadata(std::span meta_data, std::size_t offset) {
if (meta_data.size() - offset < sizeof(Metadata)) {
return Loader::ResultStatus::Error;
@@ -167,7 +173,7 @@ Loader::ResultStatus CIAContainer::LoadMetadata(std::span meta_data, s
return Loader::ResultStatus::Success;
}
-const Ticket& CIAContainer::GetTicket() const {
+Ticket& CIAContainer::GetTicket() {
return cia_ticket;
}
@@ -260,4 +266,7 @@ void CIAContainer::Print() const {
LOG_DEBUG(Service_FS, "Content {:x} Offset: 0x{:08x} bytes", i, GetContentOffset(i));
}
}
+const CIAHeader* CIAContainer::GetHeader() {
+ return has_header ? &cia_header : nullptr;
+}
} // namespace FileSys
diff --git a/src/core/file_sys/cia_container.h b/src/core/file_sys/cia_container.h
index d7fa46dad..e562dc9be 100644
--- a/src/core/file_sys/cia_container.h
+++ b/src/core/file_sys/cia_container.h
@@ -1,4 +1,4 @@
-// Copyright 2017 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -28,6 +28,30 @@ constexpr std::size_t CIA_DEPENDENCY_SIZE = 0x300;
constexpr std::size_t CIA_METADATA_SIZE = 0x400;
constexpr u32 CIA_SECTION_ALIGNMENT = 0x40;
+struct CIAHeader {
+ u32_le header_size;
+ u16_le type;
+ u16_le version;
+ u32_le cert_size;
+ u32_le tik_size;
+ u32_le tmd_size;
+ u32_le meta_size;
+ u64_le content_size;
+ std::array content_present;
+
+ bool IsContentPresent(std::size_t index) const {
+ // The content_present is a bit array which defines which content in the TMD
+ // is included in the CIA, so check the bit for this index and add if set.
+ // The bits in the content index are arranged w/ index 0 as the MSB, 7 as the LSB, etc.
+ return (content_present[index >> 3] & (0x80 >> (index & 7))) != 0;
+ }
+ void SetContentPresent(u16 index) {
+ content_present[index >> 3] |= (0x80 >> (index & 7));
+ }
+};
+
+static_assert(sizeof(CIAHeader) == CIA_HEADER_SIZE, "CIA Header structure size is wrong");
+
/**
* Helper which implements an interface to read and write CTR Installable Archive (CIA) files.
* Data can either be loaded from a FileBackend, a string path, or from a data array. Data can
@@ -46,9 +70,11 @@ public:
Loader::ResultStatus LoadTicket(std::span ticket_data, std::size_t offset = 0);
Loader::ResultStatus LoadTicket(const Ticket& ticket);
Loader::ResultStatus LoadTitleMetadata(std::span tmd_data, std::size_t offset = 0);
+ Loader::ResultStatus LoadTitleMetadata(const TitleMetadata& tmd);
Loader::ResultStatus LoadMetadata(std::span meta_data, std::size_t offset = 0);
- const Ticket& GetTicket() const;
+ const CIAHeader* GetHeader();
+ Ticket& GetTicket();
const TitleMetadata& GetTitleMetadata() const;
std::array& GetDependencies();
u32 GetCoreVersion() const;
@@ -68,30 +94,6 @@ public:
void Print() const;
- struct Header {
- u32_le header_size;
- u16_le type;
- u16_le version;
- u32_le cert_size;
- u32_le tik_size;
- u32_le tmd_size;
- u32_le meta_size;
- u64_le content_size;
- std::array content_present;
-
- bool IsContentPresent(std::size_t index) const {
- // The content_present is a bit array which defines which content in the TMD
- // is included in the CIA, so check the bit for this index and add if set.
- // The bits in the content index are arranged w/ index 0 as the MSB, 7 as the LSB, etc.
- return (content_present[index >> 3] & (0x80 >> (index & 7))) != 0;
- }
- void SetContentPresent(u16 index) {
- content_present[index >> 3] |= (0x80 >> (index & 7));
- }
- };
-
- static_assert(sizeof(Header) == CIA_HEADER_SIZE, "CIA Header structure size is wrong");
-
private:
struct Metadata {
std::array dependencies;
@@ -102,7 +104,8 @@ private:
static_assert(sizeof(Metadata) == CIA_METADATA_SIZE, "CIA Metadata structure size is wrong");
- Header cia_header;
+ bool has_header = false;
+ CIAHeader cia_header;
Metadata cia_metadata;
Ticket cia_ticket;
TitleMetadata cia_tmd;
diff --git a/src/core/file_sys/ticket.cpp b/src/core/file_sys/ticket.cpp
index 1979755a7..76c4cbae5 100644
--- a/src/core/file_sys/ticket.cpp
+++ b/src/core/file_sys/ticket.cpp
@@ -100,8 +100,11 @@ Loader::ResultStatus Ticket::Load(std::span file_data, std::size_t off
if (total_size < content_index_end)
return Loader::ResultStatus::Error;
- content_index.resize(content_index_size);
- std::memcpy(content_index.data(), &file_data[offset + content_index_start], content_index_size);
+ std::vector content_index_vec;
+ content_index_vec.resize(content_index_size);
+ std::memcpy(content_index_vec.data(), &file_data[offset + content_index_start],
+ content_index_size);
+ content_index.Load(this, content_index_vec);
return Loader::ResultStatus::Success;
}
@@ -132,7 +135,7 @@ std::vector Ticket::Serialize() const {
reinterpret_cast(&ticket_body) + sizeof(ticket_body)};
ret.insert(ret.end(), body_span.begin(), body_span.end());
- ret.insert(ret.end(), content_index.begin(), content_index.end());
+ ret.insert(ret.end(), content_index.GetRaw().cbegin(), content_index.GetRaw().cend());
return ret;
}
@@ -167,7 +170,7 @@ std::optional> Ticket::GetTitleKey() const {
return title_key;
}
-bool Ticket::IsPersonal() {
+bool Ticket::IsPersonal() const {
if (ticket_body.console_id == 0u) {
// Common ticket
return false;
@@ -182,4 +185,88 @@ bool Ticket::IsPersonal() {
return ticket_body.console_id == otp.GetDeviceID();
}
+void Ticket::ContentIndex::Initialize() {
+ if (!parent || initialized) {
+ return;
+ }
+
+ if (content_index.size() < sizeof(MainHeader)) {
+ LOG_ERROR(Service_FS, "Ticket content index is too small");
+ return;
+ }
+ MainHeader* main_header = reinterpret_cast(content_index.data());
+ if (main_header->always1 != 1 || main_header->header_size != sizeof(MainHeader) ||
+ main_header->context_index_size != content_index.size() ||
+ main_header->index_header_size != sizeof(IndexHeader)) {
+ u16 always1 = main_header->always1;
+ u16 header_size = main_header->header_size;
+ u32 context_index_size = main_header->context_index_size;
+ u16 index_header_size = main_header->index_header_size;
+ LOG_ERROR(Service_FS,
+ "Ticket content index has unexpected parameters title_id={}, ticket_id={}, "
+ "always1={}, header_size={}, "
+ "size={}, index_header_size={}",
+ parent->GetTitleID(), parent->GetTicketID(), always1, header_size,
+ context_index_size, index_header_size);
+ return;
+ }
+ for (u32 i = 0; i < main_header->index_headers_count; i++) {
+ IndexHeader* curr_header = reinterpret_cast(
+ content_index.data() + main_header->index_headers_offset +
+ main_header->index_header_size * i);
+ if (curr_header->type != 3 || curr_header->entry_size != sizeof(RightsField)) {
+ u16 type = curr_header->type;
+ LOG_WARNING(Service_FS,
+ "Found unsupported index header type, skiping... title_id={}, "
+ "ticket_id={}, type={}",
+ parent->GetTitleID(), parent->GetTicketID(), type);
+ continue;
+ }
+ for (u32 j = 0; j < curr_header->entry_count; j++) {
+ RightsField* field = reinterpret_cast(
+ content_index.data() + curr_header->data_offset + curr_header->entry_size * j);
+ rights.push_back(*field);
+ }
+ }
+ initialized = true;
+}
+
+bool Ticket::ContentIndex::HasRights(u16 content_index) {
+ if (!initialized) {
+ Initialize();
+ if (!initialized)
+ return false;
+ }
+ // From:
+ // https://github.com/d0k3/GodMode9/blob/4424c37a89337ffb074c80807da1e80f358779b7/arm9/source/game/ticket.c#L198
+ if (rights.empty()) {
+ return content_index < 256; // when no fields, true if below 256
+ }
+
+ bool has_right = false;
+
+ // it loops until one of these happens:
+ // - we run out of bit fields
+ // - at the first encounter of an index offset field that's bigger than index
+ // - at the first encounter of a positive indicator of content rights
+ for (u32 i = 0; i < rights.size(); i++) {
+ u16 start_index = rights[i].start_index;
+ if (content_index < start_index) {
+ break;
+ }
+
+ u16 bit_pos = content_index - start_index;
+ if (bit_pos >= 1024) {
+ continue; // not in this field
+ }
+
+ if (rights[i].rights[bit_pos / 8] & (1 << (bit_pos % 8))) {
+ has_right = true;
+ break;
+ }
+ }
+
+ return has_right;
+}
+
} // namespace FileSys
diff --git a/src/core/file_sys/ticket.h b/src/core/file_sys/ticket.h
index ed6d379c0..db97cf09f 100644
--- a/src/core/file_sys/ticket.h
+++ b/src/core/file_sys/ticket.h
@@ -19,6 +19,12 @@ enum class ResultStatus;
namespace FileSys {
class Ticket {
+ struct LimitEntry {
+ u32_be type; // 4 -> Play times?
+ u32_be value;
+ };
+ static_assert(sizeof(LimitEntry) == 0x8, "LimitEntry structure size is wrong");
+
public:
#pragma pack(push, 1)
struct Body {
@@ -42,7 +48,7 @@ public:
INSERT_PADDING_BYTES(1);
u8 audit;
INSERT_PADDING_BYTES(0x42);
- std::array limits;
+ std::array limits;
};
static_assert(sizeof(Body) == 0x164, "Ticket body structure size is wrong");
#pragma pack(pop)
@@ -67,13 +73,66 @@ public:
return serialized_size;
}
- bool IsPersonal();
+ bool IsPersonal() const;
+
+ bool HasRights(u16 index) {
+ return content_index.HasRights(index);
+ }
+
+ class ContentIndex {
+ public:
+ struct MainHeader {
+ u16_be always1;
+ u16_be header_size;
+ u32_be context_index_size;
+ u32_be index_headers_offset;
+ u16_be index_headers_count;
+ u16_be index_header_size;
+ u32_be padding;
+ };
+
+ struct IndexHeader {
+ u32_be data_offset;
+ u32_be entry_count;
+ u32_be entry_size;
+ u32_be total_size;
+ u16_be type;
+ u16_be padding;
+ };
+
+ struct RightsField {
+ u16_be unknown;
+ u16_be start_index;
+ std::array rights;
+ };
+
+ ContentIndex() {}
+
+ void Load(Ticket* p, const std::vector& data) {
+ parent = p;
+ content_index = data;
+ }
+
+ const std::vector& GetRaw() const {
+ return content_index;
+ }
+
+ bool HasRights(u16 content_index);
+
+ private:
+ void Initialize();
+
+ bool initialized = false;
+ std::vector content_index;
+ std::vector rights;
+ Ticket* parent = nullptr;
+ };
private:
Body ticket_body;
u32_be signature_type;
std::vector ticket_signature;
- std::vector content_index;
+ ContentIndex content_index;
size_t serialized_size = 0;
};
diff --git a/src/core/file_sys/title_metadata.cpp b/src/core/file_sys/title_metadata.cpp
index 794a14398..d0cc2838e 100644
--- a/src/core/file_sys/title_metadata.cpp
+++ b/src/core/file_sys/title_metadata.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -6,6 +6,7 @@
#include "common/alignment.h"
#include "common/file_util.h"
#include "common/logging/log.h"
+#include "core/file_sys/cia_container.h"
#include "core/file_sys/signature.h"
#include "core/file_sys/title_metadata.h"
#include "core/loader/loader.h"
@@ -175,15 +176,24 @@ u64 TitleMetadata::GetContentSizeByIndex(std::size_t index) const {
return tmd_chunks[index].size;
}
+bool TitleMetadata::GetContentOptional(std::size_t index) const {
+ return (static_cast(tmd_chunks[index].type) & FileSys::TMDContentTypeFlag::Optional) != 0;
+}
+
std::array TitleMetadata::GetContentCTRByIndex(std::size_t index) const {
std::array ctr{};
std::memcpy(ctr.data(), &tmd_chunks[index].index, sizeof(u16));
return ctr;
}
-bool TitleMetadata::HasEncryptedContent() const {
- return std::any_of(tmd_chunks.begin(), tmd_chunks.end(), [](auto& chunk) {
- return (static_cast(chunk.type) & FileSys::TMDContentTypeFlag::Encrypted) != 0;
+bool TitleMetadata::HasEncryptedContent(const CIAHeader* header) const {
+ return std::any_of(tmd_chunks.begin(), tmd_chunks.end(), [header](auto& chunk) {
+ bool is_crypted =
+ (static_cast(chunk.type) & FileSys::TMDContentTypeFlag::Encrypted) != 0;
+ if (header) {
+ is_crypted = is_crypted && header->IsContentPresent(static_cast(chunk.index));
+ }
+ return is_crypted;
});
}
diff --git a/src/core/file_sys/title_metadata.h b/src/core/file_sys/title_metadata.h
index 620988568..d1ca730a6 100644
--- a/src/core/file_sys/title_metadata.h
+++ b/src/core/file_sys/title_metadata.h
@@ -1,4 +1,4 @@
-// Copyright 2017 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -17,6 +17,8 @@ enum class ResultStatus;
namespace FileSys {
+struct CIAHeader;
+
enum TMDContentTypeFlag : u16 {
Encrypted = 1 << 0,
Disc = 1 << 2,
@@ -97,8 +99,9 @@ public:
u32 GetContentIDByIndex(std::size_t index) const;
u16 GetContentTypeByIndex(std::size_t index) const;
u64 GetContentSizeByIndex(std::size_t index) const;
+ bool GetContentOptional(std::size_t index) const;
std::array GetContentCTRByIndex(std::size_t index) const;
- bool HasEncryptedContent() const;
+ bool HasEncryptedContent(const CIAHeader* header = nullptr) const;
void SetTitleID(u64 title_id);
void SetTitleType(u32 type);
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp
index 6c2811cf0..85abe0959 100644
--- a/src/core/frontend/emu_window.cpp
+++ b/src/core/frontend/emu_window.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -94,17 +94,24 @@ bool EmuWindow::IsWithinTouchscreen(const Layout::FramebufferLayout& layout, uns
std::tuple EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) const {
Settings::StereoRenderOption render_3d_mode = Settings::values.render_3d.GetValue();
+ bool separate_win = false;
+#ifndef ANDROID
+ separate_win =
+ (Settings::values.layout_option.GetValue() == Settings::LayoutOption::SeparateWindows);
+#endif
if (new_x >= framebuffer_layout.width / 2) {
- if (render_3d_mode == Settings::StereoRenderOption::SideBySide ||
- render_3d_mode == Settings::StereoRenderOption::ReverseSideBySide)
+ if ((render_3d_mode == Settings::StereoRenderOption::SideBySide ||
+ render_3d_mode == Settings::StereoRenderOption::ReverseSideBySide) &&
+ !separate_win)
new_x -= framebuffer_layout.width / 2;
else if (render_3d_mode == Settings::StereoRenderOption::CardboardVR)
new_x -=
(framebuffer_layout.width / 2) - (framebuffer_layout.cardboard.user_x_shift * 2);
}
- if (render_3d_mode == Settings::StereoRenderOption::SideBySide ||
- render_3d_mode == Settings::StereoRenderOption::ReverseSideBySide) {
+ if ((render_3d_mode == Settings::StereoRenderOption::SideBySide ||
+ render_3d_mode == Settings::StereoRenderOption::ReverseSideBySide) &&
+ !separate_win) {
new_x = std::max(new_x, framebuffer_layout.bottom_screen.left / 2);
new_x = std::min(new_x, framebuffer_layout.bottom_screen.right / 2 - 1);
} else {
@@ -130,21 +137,28 @@ void EmuWindow::CreateTouchState() {
bool EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) {
Settings::StereoRenderOption render_3d_mode = Settings::values.render_3d.GetValue();
+ bool separate_win = false;
+#ifndef ANDROID
+ separate_win =
+ (Settings::values.layout_option.GetValue() == Settings::LayoutOption::SeparateWindows);
+#endif
if (!IsWithinTouchscreen(framebuffer_layout, framebuffer_x, framebuffer_y))
return false;
if (framebuffer_x >= framebuffer_layout.width / 2) {
- if (render_3d_mode == Settings::StereoRenderOption::SideBySide ||
- render_3d_mode == Settings::StereoRenderOption::ReverseSideBySide)
+ if ((render_3d_mode == Settings::StereoRenderOption::SideBySide ||
+ render_3d_mode == Settings::StereoRenderOption::ReverseSideBySide) &&
+ !separate_win)
framebuffer_x -= framebuffer_layout.width / 2;
else if (render_3d_mode == Settings::StereoRenderOption::CardboardVR)
framebuffer_x -=
(framebuffer_layout.width / 2) - (framebuffer_layout.cardboard.user_x_shift * 2);
}
std::scoped_lock guard(touch_state->mutex);
- if (render_3d_mode == Settings::StereoRenderOption::SideBySide ||
- render_3d_mode == Settings::StereoRenderOption::ReverseSideBySide) {
+ if ((render_3d_mode == Settings::StereoRenderOption::SideBySide ||
+ render_3d_mode == Settings::StereoRenderOption::ReverseSideBySide) &&
+ !separate_win) {
touch_state->touch_x =
static_cast(framebuffer_x - framebuffer_layout.bottom_screen.left / 2) /
(framebuffer_layout.bottom_screen.right / 2 -
@@ -207,6 +221,10 @@ void EmuWindow::UpdateCurrentFramebufferLayout(u32 width, u32 height, bool is_po
layout = Layout::CustomFrameLayout(
width, height, Settings::values.swap_screen.GetValue(), is_portrait_mode);
break;
+ case Settings::PortraitLayoutOption::PortraitOriginal:
+ layout = Layout::PortraitOriginalLayout(width, height,
+ Settings::values.swap_screen.GetValue());
+ break;
}
} else {
switch (layout_option) {
diff --git a/src/core/frontend/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp
index 7cf52a29c..8b284b30c 100644
--- a/src/core/frontend/framebuffer_layout.cpp
+++ b/src/core/frontend/framebuffer_layout.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -51,6 +51,18 @@ FramebufferLayout PortraitTopFullFrameLayout(u32 width, u32 height, bool swapped
return res;
}
+FramebufferLayout PortraitOriginalLayout(u32 width, u32 height, bool swapped) {
+ ASSERT(width > 0);
+ ASSERT(height > 0);
+ const float scale_factor = 1;
+ FramebufferLayout res = LargeFrameLayout(width, height, swapped, false, scale_factor,
+ Settings::SmallScreenPosition::BelowLarge);
+ const int shiftY = -(int)(swapped ? res.bottom_screen.top : res.top_screen.top);
+ res.top_screen = res.top_screen.TranslateY(shiftY);
+ res.bottom_screen = res.bottom_screen.TranslateY(shiftY);
+ return res;
+}
+
FramebufferLayout SingleFrameLayout(u32 width, u32 height, bool swapped, bool upright) {
ASSERT(width > 0);
ASSERT(height > 0);
@@ -115,7 +127,7 @@ FramebufferLayout LargeFrameLayout(u32 width, u32 height, bool swapped, bool upr
// To do that, find the total emulation box and maximize that based on window size
const float window_aspect_ratio = static_cast(height) / width;
float emulation_aspect_ratio;
-
+ u32 gap = (u32)(Settings::values.screen_gap.GetValue() * scale_factor);
float large_height =
swapped ? Core::kScreenBottomHeight * scale_factor : Core::kScreenTopHeight * scale_factor;
float small_height =
@@ -129,9 +141,9 @@ FramebufferLayout LargeFrameLayout(u32 width, u32 height, bool swapped, bool upr
if (vertical) {
// width is just the larger size at this point
emulation_width = std::max(large_width, small_width);
- emulation_height = large_height + small_height;
+ emulation_height = large_height + small_height + gap;
} else {
- emulation_width = large_width + small_width;
+ emulation_width = large_width + small_width + gap;
emulation_height = std::max(large_height, small_height);
}
@@ -156,47 +168,48 @@ FramebufferLayout LargeFrameLayout(u32 width, u32 height, bool swapped, bool upr
// shift the large screen so it is at the top position of the bounding rectangle
large_screen = large_screen.TranslateY((height - total_rect.GetHeight()) / 2);
}
+ gap = static_cast(static_cast(gap) * scale_amount);
switch (small_screen_position) {
case Settings::SmallScreenPosition::TopRight:
// Shift the small screen to the top right corner
- small_screen = small_screen.TranslateX(large_screen.right);
+ small_screen = small_screen.TranslateX(large_screen.right + gap);
small_screen = small_screen.TranslateY(large_screen.top);
break;
case Settings::SmallScreenPosition::MiddleRight:
// Shift the small screen to the center right
- small_screen = small_screen.TranslateX(large_screen.right);
+ small_screen = small_screen.TranslateX(large_screen.right + gap);
small_screen = small_screen.TranslateY(
((large_screen.GetHeight() - small_screen.GetHeight()) / 2) + large_screen.top);
break;
case Settings::SmallScreenPosition::BottomRight:
// Shift the small screen to the bottom right corner
- small_screen = small_screen.TranslateX(large_screen.right);
+ small_screen = small_screen.TranslateX(large_screen.right + gap);
small_screen = small_screen.TranslateY(large_screen.bottom - small_screen.GetHeight());
break;
case Settings::SmallScreenPosition::TopLeft:
// shift the small screen to the upper left then shift the large screen to its right
small_screen = small_screen.TranslateX(large_screen.left);
- large_screen = large_screen.TranslateX(small_screen.GetWidth());
+ large_screen = large_screen.TranslateX(small_screen.GetWidth() + gap);
small_screen = small_screen.TranslateY(large_screen.top);
break;
case Settings::SmallScreenPosition::MiddleLeft:
// shift the small screen to the middle left and shift the large screen to its right
small_screen = small_screen.TranslateX(large_screen.left);
- large_screen = large_screen.TranslateX(small_screen.GetWidth());
+ large_screen = large_screen.TranslateX(small_screen.GetWidth() + gap);
small_screen = small_screen.TranslateY(
((large_screen.GetHeight() - small_screen.GetHeight()) / 2) + large_screen.top);
break;
case Settings::SmallScreenPosition::BottomLeft:
// shift the small screen to the bottom left and shift the large screen to its right
small_screen = small_screen.TranslateX(large_screen.left);
- large_screen = large_screen.TranslateX(small_screen.GetWidth());
+ large_screen = large_screen.TranslateX(small_screen.GetWidth() + gap);
small_screen = small_screen.TranslateY(large_screen.bottom - small_screen.GetHeight());
break;
case Settings::SmallScreenPosition::AboveLarge:
// shift the large screen down and the bottom screen above it
small_screen = small_screen.TranslateY(large_screen.top);
- large_screen = large_screen.TranslateY(small_screen.GetHeight());
+ large_screen = large_screen.TranslateY(small_screen.GetHeight() + gap);
// If the "large screen" is actually smaller, center it
if (large_screen.GetWidth() < total_rect.GetWidth()) {
large_screen =
@@ -212,7 +225,7 @@ FramebufferLayout LargeFrameLayout(u32 width, u32 height, bool swapped, bool upr
large_screen =
large_screen.TranslateX((total_rect.GetWidth() - large_screen.GetWidth()) / 2);
}
- small_screen = small_screen.TranslateY(large_screen.bottom);
+ small_screen = small_screen.TranslateY(large_screen.bottom + gap);
small_screen = small_screen.TranslateX(large_screen.left + large_screen.GetWidth() / 2 -
small_screen.GetWidth() / 2);
break;
@@ -346,7 +359,8 @@ FramebufferLayout CustomFrameLayout(u32 width, u32 height, bool is_swapped, bool
FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale, bool is_secondary,
bool is_portrait) {
- int width, height;
+ u32 width, height, gap;
+ gap = (int)(Settings::values.screen_gap.GetValue()) * res_scale;
if (is_portrait) {
auto layout_option = Settings::values.portrait_layout_option.GetValue();
switch (layout_option) {
@@ -363,9 +377,16 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale, bool is_secondar
Settings::values.swap_screen.GetValue(), is_portrait);
case Settings::PortraitLayoutOption::PortraitTopFullWidth:
width = Core::kScreenTopWidth * res_scale;
- height = (Core::kScreenTopHeight + Core::kScreenBottomHeight) * res_scale;
+ // clang-format off
+ height = (static_cast(Core::kScreenTopHeight + Core::kScreenBottomHeight * 1.25) *
+ res_scale) + gap;
+ // clang-format on
return PortraitTopFullFrameLayout(width, height,
Settings::values.swap_screen.GetValue());
+ case Settings::PortraitLayoutOption::PortraitOriginal:
+ width = Core::kScreenTopWidth * res_scale;
+ height = (Core::kScreenTopHeight + Core::kScreenBottomHeight) * res_scale;
+ return PortraitOriginalLayout(width, height, Settings::values.swap_screen.GetValue());
}
} else {
auto layout_option = Settings::values.layout_option.GetValue();
@@ -418,9 +439,9 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale, bool is_secondar
Settings::SmallScreenPosition::BelowLarge) {
// vertical, so height is sum of heights, width is larger of widths
width = std::max(largeWidth, smallWidth) * res_scale;
- height = (largeHeight + smallHeight) * res_scale;
+ height = (largeHeight + smallHeight) * res_scale + gap;
} else {
- width = (largeWidth + smallWidth) * res_scale;
+ width = (largeWidth + smallWidth) * res_scale + gap;
height = std::max(largeHeight, smallHeight) * res_scale;
}
@@ -433,7 +454,7 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale, bool is_secondar
Settings::values.small_screen_position.GetValue());
}
case Settings::LayoutOption::SideScreen:
- width = (Core::kScreenTopWidth + Core::kScreenBottomWidth) * res_scale;
+ width = (Core::kScreenTopWidth + Core::kScreenBottomWidth) * res_scale + gap;
height = Core::kScreenTopHeight * res_scale;
if (Settings::values.upright_screen.GetValue()) {
@@ -443,10 +464,28 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale, bool is_secondar
Settings::values.upright_screen.GetValue(), 1,
Settings::SmallScreenPosition::MiddleRight);
+ case Settings::LayoutOption::HybridScreen:
+ height = Core::kScreenTopHeight * res_scale;
+
+ if (Settings::values.swap_screen.GetValue()) {
+ width = Core::kScreenBottomWidth;
+ } else {
+ width = Core::kScreenTopWidth;
+ }
+ // 2.25f comes from HybridScreenLayout's scale_factor value.
+ width = static_cast((width + (Core::kScreenTopWidth / 2.25f)) * res_scale);
+
+ if (Settings::values.upright_screen.GetValue()) {
+ std::swap(width, height);
+ }
+
+ return HybridScreenLayout(width, height, Settings::values.swap_screen.GetValue(),
+ Settings::values.upright_screen.GetValue());
+
case Settings::LayoutOption::Default:
default:
width = Core::kScreenTopWidth * res_scale;
- height = (Core::kScreenTopHeight + Core::kScreenBottomHeight) * res_scale;
+ height = (Core::kScreenTopHeight + Core::kScreenBottomHeight) * res_scale + gap;
if (Settings::values.upright_screen.GetValue()) {
std::swap(width, height);
@@ -479,6 +518,7 @@ FramebufferLayout GetCardboardSettings(const FramebufferLayout& layout) {
if (is_portrait) {
switch (Settings::values.portrait_layout_option.GetValue()) {
case Settings::PortraitLayoutOption::PortraitTopFullWidth:
+ case Settings::PortraitLayoutOption::PortraitOriginal:
cardboard_screen_width = top_screen_width;
cardboard_screen_height = top_screen_height + bottom_screen_height;
bottom_screen_left += (top_screen_width - bottom_screen_width) / 2;
diff --git a/src/core/frontend/framebuffer_layout.h b/src/core/frontend/framebuffer_layout.h
index adcf26630..81501decd 100644
--- a/src/core/frontend/framebuffer_layout.h
+++ b/src/core/frontend/framebuffer_layout.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -62,8 +62,8 @@ FramebufferLayout reverseLayout(FramebufferLayout layout);
FramebufferLayout DefaultFrameLayout(u32 width, u32 height, bool is_swapped, bool upright);
/**
- * Factory method for constructing the mobile Full Width Top layout
- * Two screens at top, full width, no gap between them
+ * Factory method for constructing the mobile Full Width (Default) layout
+ * Two screens at top, full width (so different heights)
* @param width Window framebuffer width in pixels
* @param height Window framebuffer height in pixels
* @param is_swapped if true, the bottom screen will be displayed above the top screen
@@ -71,6 +71,16 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height, bool is_swapped, boo
*/
FramebufferLayout PortraitTopFullFrameLayout(u32 width, u32 height, bool is_swapped);
+/**
+ * Factory method for constructing the mobile Original layout
+ * Two screens at top, equal heights
+ * @param width Window framebuffer width in pixels
+ * @param height Window framebuffer height in pixels
+ * @param is_swapped if true, the bottom screen will be displayed above the top screen
+ * @return Newly created FramebufferLayout object with mobile portrait screen regions initialized
+ */
+FramebufferLayout PortraitOriginalLayout(u32 width, u32 height, bool is_swapped);
+
/**
* Factory method for constructing a FramebufferLayout with only the top or bottom screen
* @param width Window framebuffer width in pixels
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 50b5a6b25..ffbd11c4a 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -425,8 +425,8 @@ CIAFile::CIAFile(Core::System& system_, Service::FS::MediaType media_type, bool
// If data is being installing from CDN, provide a fake header to the container so that
// it's not uninitialized.
if (from_cdn) {
- FileSys::CIAContainer::Header fake_header{
- .header_size = sizeof(FileSys::CIAContainer::Header),
+ FileSys::CIAHeader fake_header{
+ .header_size = sizeof(FileSys::CIAHeader),
.type = 0,
.version = 0,
.cert_size = 0,
@@ -509,51 +509,7 @@ Result CIAFile::WriteTitleMetadata(std::span tmd_data, std::size_t off
return FileSys::ResultFileNotFound;
}
- // Create any other .app folders which may not exist yet
- std::string app_folder;
- auto main_content_path = GetTitleContentPath(media_type, tmd.GetTitleID(),
- FileSys::TMDContentIndex::Main, is_update);
- Common::SplitPath(main_content_path, &app_folder, nullptr, nullptr);
- FileUtil::CreateFullPath(app_folder);
-
- auto content_count = container.GetTitleMetadata().GetContentCount();
- content_written.resize(content_count);
-
- current_content_file.reset();
- current_content_index = -1;
- content_file_paths.clear();
- for (std::size_t i = 0; i < content_count; i++) {
- auto path = GetTitleContentPath(media_type, tmd.GetTitleID(), i, is_update);
- content_file_paths.emplace_back(path);
- }
-
- if (container.GetTitleMetadata().HasEncryptedContent()) {
- if (!decryption_authorized) {
- LOG_ERROR(Service_AM, "Blocked unauthorized encrypted CIA installation.");
- return {ErrorDescription::NotAuthorized, ErrorModule::AM, ErrorSummary::InvalidState,
- ErrorLevel::Permanent};
- } else {
- if (auto title_key = container.GetTicket().GetTitleKey()) {
- decryption_state->content.resize(content_count);
- for (std::size_t i = 0; i < content_count; ++i) {
- auto ctr = tmd.GetContentCTRByIndex(i);
- decryption_state->content[i].SetKeyWithIV(title_key->data(), title_key->size(),
- ctr.data());
- }
- } else {
- LOG_ERROR(Service_AM, "Could not read title key from ticket for encrypted CIA.");
- // TODO: Correct error code.
- return FileSys::ResultFileNotFound;
- }
- }
- } else {
- LOG_INFO(Service_AM,
- "Title has no encrypted content, skipping initializing decryption state.");
- }
-
- install_state = CIAInstallState::TMDLoaded;
-
- return ResultSuccess;
+ return PrepareToImportContent(tmd);
}
ResultVal CIAFile::WriteContentData(u64 offset, std::size_t length, const u8* buffer) {
@@ -592,6 +548,11 @@ ResultVal CIAFile::WriteContentData(u64 offset, std::size_t length,
buffer + (range_min - offset) + available_to_write);
if ((tmd.GetContentTypeByIndex(i) & FileSys::TMDContentTypeFlag::Encrypted) != 0) {
+ if (!decryption_authorized) {
+ LOG_ERROR(Service_AM, "Blocked unauthorized encrypted CIA installation.");
+ return Result(ErrorDescription::NotAuthorized, ErrorModule::AM,
+ ErrorSummary::InvalidState, ErrorLevel::Permanent);
+ }
decryption_state->content[i].ProcessData(temp.data(), temp.data(), temp.size());
}
@@ -687,6 +648,56 @@ ResultVal CIAFile::Write(u64 offset, std::size_t length, bool flush
return length;
}
+Result CIAFile::PrepareToImportContent(const FileSys::TitleMetadata& tmd) {
+
+ // Create any other .app folders which may not exist yet
+ std::string app_folder;
+ auto main_content_path = GetTitleContentPath(media_type, tmd.GetTitleID(),
+ FileSys::TMDContentIndex::Main, is_update);
+ Common::SplitPath(main_content_path, &app_folder, nullptr, nullptr);
+ FileUtil::CreateFullPath(app_folder);
+
+ auto content_count = container.GetTitleMetadata().GetContentCount();
+ content_written.resize(content_count);
+
+ current_content_file.reset();
+ current_content_index = -1;
+ content_file_paths.clear();
+ for (std::size_t i = 0; i < content_count; i++) {
+ auto path = GetTitleContentPath(media_type, tmd.GetTitleID(), i, is_update);
+ content_file_paths.emplace_back(path);
+ }
+
+ if (container.GetTitleMetadata().HasEncryptedContent(from_cdn ? nullptr
+ : container.GetHeader())) {
+ if (!decryption_authorized) {
+ LOG_ERROR(Service_AM, "Blocked unauthorized encrypted CIA installation.");
+ return {ErrorDescription::NotAuthorized, ErrorModule::AM, ErrorSummary::InvalidState,
+ ErrorLevel::Permanent};
+ } else {
+ if (auto title_key = container.GetTicket().GetTitleKey()) {
+ decryption_state->content.resize(content_count);
+ for (std::size_t i = 0; i < content_count; ++i) {
+ auto ctr = tmd.GetContentCTRByIndex(i);
+ decryption_state->content[i].SetKeyWithIV(title_key->data(), title_key->size(),
+ ctr.data());
+ }
+ } else {
+ LOG_ERROR(Service_AM, "Could not read title key from ticket for encrypted CIA.");
+ // TODO: Correct error code.
+ return FileSys::ResultFileNotFound;
+ }
+ }
+ } else {
+ LOG_INFO(Service_AM,
+ "Title has no encrypted content, skipping initializing decryption state.");
+ }
+
+ install_state = CIAInstallState::TMDLoaded;
+
+ return ResultSuccess;
+}
+
Result CIAFile::ProvideTicket(const FileSys::Ticket& ticket) {
// There is no need to write the ticket to nand, as that will
ASSERT_MSG(from_cdn, "This method should only be used when installing from CDN");
@@ -703,10 +714,37 @@ Result CIAFile::ProvideTicket(const FileSys::Ticket& ticket) {
return ResultSuccess;
}
+Result CIAFile::ProvideTMDForAdditionalContent(const FileSys::TitleMetadata& tmd) {
+ ASSERT_MSG(from_cdn, "This method should only be used when installing from CDN");
+
+ if (install_state != CIAInstallState::TicketLoaded) {
+ LOG_ERROR(Service_AM, "Ticket not provided yet");
+ // TODO: Correct result code.
+ return {ErrCodes::InvalidImportState, ErrorModule::AM, ErrorSummary::InvalidArgument,
+ ErrorLevel::Permanent};
+ }
+
+ auto load_result = container.LoadTitleMetadata(tmd);
+ if (load_result != Loader::ResultStatus::Success) {
+ LOG_ERROR(Service_AM, "Could not read ticket from CIA.");
+ // TODO: Correct result code.
+ return {ErrCodes::InvalidCIAHeader, ErrorModule::AM, ErrorSummary::InvalidArgument,
+ ErrorLevel::Permanent};
+ }
+
+ is_additional_content = true;
+
+ return PrepareToImportContent(container.GetTitleMetadata());
+}
+
const FileSys::TitleMetadata& CIAFile::GetTMD() {
return container.GetTitleMetadata();
}
+FileSys::Ticket& CIAFile::GetTicket() {
+ return container.GetTicket();
+}
+
ResultVal CIAFile::WriteContentDataIndexed(u16 content_index, u64 offset,
std::size_t length, const u8* buffer) {
@@ -728,6 +766,11 @@ ResultVal CIAFile::WriteContentDataIndexed(u16 content_index, u64 o
std::vector temp(buffer, buffer + std::min(static_cast(length), remaining_to_write));
if ((tmd.GetContentTypeByIndex(content_index) & FileSys::TMDContentTypeFlag::Encrypted) != 0) {
+ if (!decryption_authorized) {
+ LOG_ERROR(Service_AM, "Blocked unauthorized encrypted CIA installation.");
+ return Result(ErrorDescription::NotAuthorized, ErrorModule::AM,
+ ErrorSummary::InvalidState, ErrorLevel::Permanent);
+ }
decryption_state->content[content_index].ProcessData(temp.data(), temp.data(), temp.size());
}
@@ -771,8 +814,10 @@ bool CIAFile::Close() {
// Install aborted
if (!complete) {
LOG_ERROR(Service_AM, "CIAFile closed prematurely, aborting install...");
- FileUtil::DeleteDirRecursively(
- GetTitlePath(media_type, container.GetTitleMetadata().GetTitleID()));
+ if (!is_additional_content) {
+ FileUtil::DeleteDirRecursively(
+ GetTitlePath(media_type, container.GetTitleMetadata().GetTitleID()));
+ }
return true;
}
@@ -964,7 +1009,7 @@ InstallStatus InstallCIA(const std::string& path,
Core::System::GetInstance(),
Service::AM::GetTitleMediaType(container.GetTitleMetadata().GetTitleID()));
- if (container.GetTitleMetadata().HasEncryptedContent()) {
+ if (container.GetTitleMetadata().HasEncryptedContent(container.GetHeader())) {
LOG_ERROR(Service_AM, "File {} is encrypted! Aborting...", path);
return InstallStatus::ErrorEncrypted;
}
@@ -1427,57 +1472,111 @@ void Module::Interface::FindDLCContentInfos(Kernel::HLERequestContext& ctx) {
true);
} else {
- auto& content_info_out = rp.PopMappedBuffer();
+ struct AsyncData {
+ Service::FS::MediaType media_type;
+ u64 title_id;
+ std::vector content_requested;
- // Validate that only DLC TIDs are passed in
- u32 tid_high = static_cast(title_id >> 32);
- if (tid_high != TID_HIGH_DLC) {
- IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
- rb.Push(Result(ErrCodes::InvalidTIDInList, ErrorModule::AM,
- ErrorSummary::InvalidArgument, ErrorLevel::Usage));
- return;
- }
+ Result res{0};
+ std::vector out_vec;
+ Kernel::MappedBuffer* content_info_out;
+ };
+ auto async_data = std::make_shared();
+ async_data->media_type = media_type;
+ async_data->title_id = title_id;
+ async_data->content_requested.resize(content_count);
+ content_requested_in.Read(async_data->content_requested.data(), 0,
+ content_count * sizeof(u16));
+ async_data->content_info_out = &rp.PopMappedBuffer();
- std::vector content_requested(content_count);
- content_requested_in.Read(content_requested.data(), 0, content_count * sizeof(u16));
-
- std::string tmd_path = GetTitleMetadataPath(media_type, title_id);
-
- FileSys::TitleMetadata tmd;
- if (tmd.Load(tmd_path) == Loader::ResultStatus::Success) {
- std::size_t write_offset = 0;
- // Get info for each content index requested
- for (std::size_t i = 0; i < content_count; i++) {
- if (content_requested[i] >= tmd.GetContentCount()) {
- LOG_ERROR(Service_AM,
- "Attempted to get info for non-existent content index {:04x}.",
- content_requested[i]);
-
- IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
- rb.Push(-1); // TODO(Steveice10): Find the right error code
- return;
+ ctx.RunAsync(
+ [this, async_data](Kernel::HLERequestContext& ctx) {
+ // Validate that only DLC TIDs are passed in
+ u32 tid_high = static_cast(async_data->title_id >> 32);
+ if (tid_high != TID_HIGH_DLC) {
+ async_data->res = Result(ErrCodes::InvalidTIDInList, ErrorModule::AM,
+ ErrorSummary::InvalidArgument, ErrorLevel::Usage);
+ return 0;
}
- ContentInfo content_info = {};
- content_info.index = content_requested[i];
- content_info.type = tmd.GetContentTypeByIndex(content_requested[i]);
- content_info.content_id = tmd.GetContentIDByIndex(content_requested[i]);
- content_info.size = tmd.GetContentSizeByIndex(content_requested[i]);
- content_info.ownership =
- OWNERSHIP_OWNED; // TODO(Steveice10): Pull this from the ticket.
+ std::string tmd_path =
+ GetTitleMetadataPath(async_data->media_type, async_data->title_id);
- if (FileUtil::Exists(
- GetTitleContentPath(media_type, title_id, content_requested[i]))) {
- content_info.ownership |= OWNERSHIP_DOWNLOADED;
+ // In normal circumstances, if there is no ticket we shouldn't be able to have
+ // any contents either. However to keep compatibility with older emulator builds,
+ // we give rights anyway if the ticket is not installed.
+ bool has_ticket = false;
+ FileSys::Ticket ticket;
+ std::scoped_lock lock(am->am_lists_mutex);
+ auto entries = am->am_ticket_list.find(async_data->title_id);
+ if (entries != am->am_ticket_list.end() &&
+ ticket.Load(async_data->title_id, (*entries).second) ==
+ Loader::ResultStatus::Success) {
+ has_ticket = true;
}
- content_info_out.Write(&content_info, write_offset, sizeof(ContentInfo));
- write_offset += sizeof(ContentInfo);
- }
- }
+ FileSys::TitleMetadata tmd;
+ if (tmd.Load(tmd_path) == Loader::ResultStatus::Success) {
+ // Get info for each content index requested
+ for (std::size_t i = 0; i < async_data->content_requested.size(); i++) {
+ u16_le index = async_data->content_requested[i];
+ if (index >= tmd.GetContentCount()) {
+ LOG_ERROR(
+ Service_AM,
+ "Attempted to get info for non-existent content index {:04x}.",
+ index);
- IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
- rb.Push(ResultSuccess);
+ async_data->res = Result(0xFFFFFFFF);
+ return 0;
+ }
+
+ ContentInfo content_info = {};
+ content_info.index = index;
+ content_info.type = tmd.GetContentTypeByIndex(index);
+ content_info.content_id = tmd.GetContentIDByIndex(index);
+ content_info.size = tmd.GetContentSizeByIndex(index);
+ content_info.ownership =
+ (!has_ticket || ticket.HasRights(index)) ? OWNERSHIP_OWNED : 0;
+
+ if (FileUtil::Exists(GetTitleContentPath(async_data->media_type,
+ async_data->title_id, index))) {
+ bool pending = false;
+ for (auto& import_ctx : am->import_content_contexts) {
+ if (import_ctx.first == async_data->title_id &&
+ import_ctx.second.index == index &&
+ (import_ctx.second.state ==
+ ImportTitleContextState::WAITING_FOR_IMPORT ||
+ import_ctx.second.state ==
+ ImportTitleContextState::WAITING_FOR_COMMIT ||
+ import_ctx.second.state ==
+ ImportTitleContextState::RESUMABLE)) {
+ LOG_DEBUG(Service_AM, "content pending commit index={:016X}",
+ i);
+ pending = true;
+ break;
+ }
+ }
+ if (!pending) {
+ content_info.ownership |= OWNERSHIP_DOWNLOADED;
+ }
+ }
+
+ async_data->out_vec.push_back(content_info);
+ }
+ }
+
+ return 0;
+ },
+ [async_data](Kernel::HLERequestContext& ctx) {
+ IPC::RequestBuilder rb(ctx, 2, 0);
+ rb.Push(async_data->res);
+ if (async_data->res.IsSuccess()) {
+ async_data->content_info_out->Write(async_data->out_vec.data(), 0,
+ async_data->out_vec.size() *
+ sizeof(ContentInfo));
+ }
+ },
+ true);
}
}
@@ -1553,48 +1652,102 @@ void Module::Interface::ListDLCContentInfos(Kernel::HLERequestContext& ctx) {
true);
} else {
- auto& content_info_out = rp.PopMappedBuffer();
+ struct AsyncData {
+ Service::FS::MediaType media_type;
+ u64 title_id;
+ u32 content_count;
+ u32 start_index;
- // Validate that only DLC TIDs are passed in
- u32 tid_high = static_cast(title_id >> 32);
- if (tid_high != TID_HIGH_DLC) {
- IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
- rb.Push(Result(ErrCodes::InvalidTIDInList, ErrorModule::AM,
- ErrorSummary::InvalidArgument, ErrorLevel::Usage));
- rb.Push(0);
- return;
- }
+ Result res{0};
+ std::vector out_vec;
+ Kernel::MappedBuffer* content_info_out;
+ };
+ auto async_data = std::make_shared();
+ async_data->media_type = media_type;
+ async_data->title_id = title_id;
+ async_data->content_count = content_count;
+ async_data->start_index = start_index;
+ async_data->content_info_out = &rp.PopMappedBuffer();
- std::string tmd_path = GetTitleMetadataPath(media_type, title_id);
-
- u32 copied = 0;
- FileSys::TitleMetadata tmd;
- if (tmd.Load(tmd_path) == Loader::ResultStatus::Success) {
- u32 end_index =
- std::min(start_index + content_count, static_cast(tmd.GetContentCount()));
- std::size_t write_offset = 0;
- for (u32 i = start_index; i < end_index; i++) {
- ContentInfo content_info = {};
- content_info.index = static_cast(i);
- content_info.type = tmd.GetContentTypeByIndex(i);
- content_info.content_id = tmd.GetContentIDByIndex(i);
- content_info.size = tmd.GetContentSizeByIndex(i);
- content_info.ownership =
- OWNERSHIP_OWNED; // TODO(Steveice10): Pull this from the ticket.
-
- if (FileUtil::Exists(GetTitleContentPath(media_type, title_id, i))) {
- content_info.ownership |= OWNERSHIP_DOWNLOADED;
+ ctx.RunAsync(
+ [this, async_data](Kernel::HLERequestContext& ctx) {
+ // Validate that only DLC TIDs are passed in
+ u32 tid_high = static_cast(async_data->title_id >> 32);
+ if (tid_high != TID_HIGH_DLC) {
+ async_data->res = Result(ErrCodes::InvalidTIDInList, ErrorModule::AM,
+ ErrorSummary::InvalidArgument, ErrorLevel::Usage);
+ return 0;
}
- content_info_out.Write(&content_info, write_offset, sizeof(ContentInfo));
- write_offset += sizeof(ContentInfo);
- copied++;
- }
- }
+ std::string tmd_path =
+ GetTitleMetadataPath(async_data->media_type, async_data->title_id);
- IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
- rb.Push(ResultSuccess);
- rb.Push(copied);
+ // In normal circumstances, if there is no ticket we shouldn't be able to have
+ // any contents either. However to keep compatibility with older emulator builds,
+ // we give rights anyway if the ticket is not installed.
+ bool has_ticket = false;
+ FileSys::Ticket ticket;
+ std::scoped_lock lock(am->am_lists_mutex);
+ auto entries = am->am_ticket_list.find(async_data->title_id);
+ if (entries != am->am_ticket_list.end() &&
+ ticket.Load(async_data->title_id, (*entries).second) ==
+ Loader::ResultStatus::Success) {
+ has_ticket = true;
+ }
+
+ FileSys::TitleMetadata tmd;
+ if (tmd.Load(tmd_path) == Loader::ResultStatus::Success) {
+ u32 end_index = std::min(async_data->start_index + async_data->content_count,
+ static_cast(tmd.GetContentCount()));
+ for (u32 i = async_data->start_index; i < end_index; i++) {
+ ContentInfo content_info = {};
+ content_info.index = static_cast(i);
+ content_info.type = tmd.GetContentTypeByIndex(i);
+ content_info.content_id = tmd.GetContentIDByIndex(i);
+ content_info.size = tmd.GetContentSizeByIndex(i);
+ content_info.ownership =
+ (!has_ticket || ticket.HasRights(static_cast(i))) ? OWNERSHIP_OWNED
+ : 0;
+
+ if (FileUtil::Exists(GetTitleContentPath(async_data->media_type,
+ async_data->title_id, i))) {
+ bool pending = false;
+ for (auto& import_ctx : am->import_content_contexts) {
+ if (import_ctx.first == async_data->title_id &&
+ import_ctx.second.index == i &&
+ (import_ctx.second.state ==
+ ImportTitleContextState::WAITING_FOR_IMPORT ||
+ import_ctx.second.state ==
+ ImportTitleContextState::WAITING_FOR_COMMIT ||
+ import_ctx.second.state ==
+ ImportTitleContextState::RESUMABLE)) {
+ LOG_DEBUG(Service_AM, "content pending commit index={:016X}",
+ i);
+ pending = true;
+ break;
+ }
+ }
+ if (!pending) {
+ content_info.ownership |= OWNERSHIP_DOWNLOADED;
+ }
+ }
+
+ async_data->out_vec.push_back(content_info);
+ }
+ }
+ return 0;
+ },
+ [async_data](Kernel::HLERequestContext& ctx) {
+ IPC::RequestBuilder rb(ctx, 2, 0);
+ rb.Push(async_data->res);
+ rb.Push(static_cast(async_data->out_vec.size()));
+ if (async_data->res.IsSuccess()) {
+ async_data->content_info_out->Write(async_data->out_vec.data(), 0,
+ async_data->out_vec.size() *
+ sizeof(ContentInfo));
+ }
+ },
+ true);
}
}
@@ -2104,7 +2257,7 @@ void Module::Interface::GetPatchTitleInfos(Kernel::HLERequestContext& ctx) {
std::vector title_id_list;
Result res{0};
- std::vector out;
+ std::vector out;
Kernel::MappedBuffer* title_id_list_buffer;
Kernel::MappedBuffer* title_info_out;
};
@@ -2144,7 +2297,7 @@ void Module::Interface::GetPatchTitleInfos(Kernel::HLERequestContext& ctx) {
return 0;
}
- async_data->out.resize(title_infos->second);
+ async_data->out.resize(title_infos->second / sizeof(TitleInfo));
memcpy(async_data->out.data(), title_infos->first, title_infos->second);
return 0;
},
@@ -2156,7 +2309,7 @@ void Module::Interface::GetPatchTitleInfos(Kernel::HLERequestContext& ctx) {
rb.PushMappedBuffer(*async_data->title_info_out);
} else {
async_data->title_info_out->Write(async_data->out.data(), 0,
- async_data->out.size());
+ async_data->out.size() * sizeof(TitleInfo));
IPC::RequestBuilder rb(ctx, 1, 4);
rb.Push(async_data->res);
@@ -2301,27 +2454,43 @@ void Module::Interface::ListDataTitleTicketInfos(Kernel::HLERequestContext& ctx)
},
true);
} else {
- auto& ticket_info_out = rp.PopMappedBuffer();
+ LOG_DEBUG(Service_AM, "(STUBBED) called, ticket_count={}", ticket_count);
- std::size_t write_offset = 0;
- for (u32 i = 0; i < ticket_count; i++) {
- TicketInfo ticket_info = {};
- ticket_info.title_id = title_id;
- ticket_info.version = 0; // TODO
- ticket_info.size = 0; // TODO
-
- ticket_info_out.Write(&ticket_info, write_offset, sizeof(TicketInfo));
- write_offset += sizeof(TicketInfo);
+ u32 tid_high = static_cast(title_id >> 32);
+ if (tid_high != 0x0004008C && tid_high != 0x0004000D) {
+ LOG_ERROR(Service_AM, "Tried to get infos for non-data title title_id={:016X}",
+ title_id);
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(Result(60, ErrorModule::AM, ErrorSummary::InvalidArgument, ErrorLevel::Usage));
}
- IPC::RequestBuilder rb = rp.MakeBuilder(2, 2);
- rb.Push(ResultSuccess);
- rb.Push(ticket_count);
- rb.PushMappedBuffer(ticket_info_out);
+ auto& out_buffer = rp.PopMappedBuffer();
- LOG_WARNING(Service_AM,
- "(STUBBED) ticket_count=0x{:08X}, title_id=0x{:016x}, start_index=0x{:08X}",
- ticket_count, title_id, start_index);
+ std::scoped_lock lock(am->am_lists_mutex);
+ auto range = am->am_ticket_list.equal_range(title_id);
+ auto it = range.first;
+ std::advance(it, std::min(static_cast(start_index),
+ static_cast(std::distance(range.first, range.second))));
+
+ u32 written = 0;
+ for (; it != range.second && written < ticket_count; it++) {
+ FileSys::Ticket ticket;
+ if (ticket.Load(title_id, it->second) != Loader::ResultStatus::Success)
+ continue;
+
+ TicketInfo info = {};
+ info.title_id = ticket.GetTitleID();
+ info.ticket_id = ticket.GetTicketID();
+ info.version = ticket.GetVersion();
+ info.size = static_cast(ticket.GetSerializedSize());
+
+ out_buffer.Write(&info, written * sizeof(TicketInfo), sizeof(TicketInfo));
+ written++;
+ }
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
+ rb.Push(ResultSuccess); // No error
+ rb.Push(written);
}
}
@@ -2719,7 +2888,8 @@ void Module::Interface::NeedsCleanup(Kernel::HLERequestContext& ctx) {
bool needs_cleanup = false;
for (auto& import_ctx : am->import_title_contexts) {
- if (import_ctx.second.state == ImportTitleContextState::NEEDS_CLEANUP) {
+ if (import_ctx.second.state == ImportTitleContextState::RESUMABLE ||
+ import_ctx.second.state == ImportTitleContextState::WAITING_FOR_IMPORT) {
needs_cleanup = true;
break;
}
@@ -2727,7 +2897,8 @@ void Module::Interface::NeedsCleanup(Kernel::HLERequestContext& ctx) {
if (!needs_cleanup) {
for (auto& import_ctx : am->import_content_contexts) {
- if (import_ctx.second.state == ImportTitleContextState::NEEDS_CLEANUP) {
+ if (import_ctx.second.state == ImportTitleContextState::RESUMABLE ||
+ import_ctx.second.state == ImportTitleContextState::WAITING_FOR_IMPORT) {
needs_cleanup = true;
}
}
@@ -2745,7 +2916,9 @@ void Module::Interface::DoCleanup(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_AM, "(STUBBED) called, media_type={:#02x}", media_type);
for (auto it = am->import_content_contexts.begin(); it != am->import_content_contexts.end();) {
- if (it->second.state == ImportTitleContextState::NEEDS_CLEANUP) {
+ if (it->second.state == ImportTitleContextState::RESUMABLE ||
+ it->second.state == ImportTitleContextState::WAITING_FOR_IMPORT ||
+ it->second.state == ImportTitleContextState::NEEDS_CLEANUP) {
it = am->import_content_contexts.erase(it);
} else {
it++;
@@ -2753,7 +2926,16 @@ void Module::Interface::DoCleanup(Kernel::HLERequestContext& ctx) {
}
for (auto it = am->import_title_contexts.begin(); it != am->import_title_contexts.end();) {
- if (it->second.state == ImportTitleContextState::NEEDS_CLEANUP) {
+ if (it->second.state == ImportTitleContextState::RESUMABLE ||
+ it->second.state == ImportTitleContextState::WAITING_FOR_IMPORT ||
+ it->second.state == ImportTitleContextState::NEEDS_CLEANUP) {
+ if (am->importing_title) {
+ if (am->importing_title->title_id == it->second.title_id &&
+ am->importing_title->media_type ==
+ static_cast(media_type)) {
+ am->importing_title.reset();
+ }
+ }
it = am->import_title_contexts.erase(it);
} else {
it++;
@@ -2865,16 +3047,22 @@ void Module::Interface::CheckContentRights(Kernel::HLERequestContext& ctx) {
u64 tid = rp.Pop();
u16 content_index = rp.Pop();
- // TODO(shinyquagsire23): Read tickets for this instead?
- bool has_rights =
- FileUtil::Exists(GetTitleContentPath(Service::FS::MediaType::NAND, tid, content_index)) ||
- FileUtil::Exists(GetTitleContentPath(Service::FS::MediaType::SDMC, tid, content_index));
+ bool has_ticket = false;
+ FileSys::Ticket ticket;
+ std::scoped_lock lock(am->am_lists_mutex);
+ auto entries = am->am_ticket_list.find(tid);
+ if (entries != am->am_ticket_list.end() &&
+ ticket.Load(tid, (*entries).second) == Loader::ResultStatus::Success) {
+ has_ticket = true;
+ }
+
+ bool has_rights = (!has_ticket || ticket.HasRights(content_index));
IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
rb.Push(ResultSuccess); // No error
rb.Push(has_rights);
- LOG_WARNING(Service_AM, "(STUBBED) tid={:016x}, content_index={}", tid, content_index);
+ LOG_DEBUG(Service_AM, "tid={:016x}, content_index={}", tid, content_index);
}
void Module::Interface::CheckContentRightsIgnorePlatform(Kernel::HLERequestContext& ctx) {
@@ -2882,15 +3070,22 @@ void Module::Interface::CheckContentRightsIgnorePlatform(Kernel::HLERequestConte
u64 tid = rp.Pop();
u16 content_index = rp.Pop();
- // TODO(shinyquagsire23): Read tickets for this instead?
- bool has_rights =
- FileUtil::Exists(GetTitleContentPath(Service::FS::MediaType::SDMC, tid, content_index));
+ bool has_ticket = false;
+ FileSys::Ticket ticket;
+ std::scoped_lock lock(am->am_lists_mutex);
+ auto entries = am->am_ticket_list.find(tid);
+ if (entries != am->am_ticket_list.end() &&
+ ticket.Load(tid, (*entries).second) == Loader::ResultStatus::Success) {
+ has_ticket = true;
+ }
+
+ bool has_rights = (!has_ticket || ticket.HasRights(content_index));
IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
rb.Push(ResultSuccess); // No error
rb.Push(has_rights);
- LOG_WARNING(Service_AM, "(STUBBED) tid={:016x}, content_index={}", tid, content_index);
+ LOG_DEBUG(Service_AM, "tid={:016x}, content_index={}", tid, content_index);
}
void Module::Interface::BeginImportProgram(Kernel::HLERequestContext& ctx) {
@@ -3298,10 +3493,10 @@ void Module::Interface::CommitImportTitlesImpl(Kernel::HLERequestContext& ctx,
IPC::RequestParser rp(ctx);
const auto media_type = static_cast(rp.Pop());
[[maybe_unused]] u32 count = rp.Pop();
- [[maybe_unused]] u8 database = rp.Pop();
+ bool cleanup = rp.Pop();
- LOG_WARNING(Service_AM, "(STUBBED) update_firm_auto={} is_titles={}", is_update_firm_auto,
- is_titles);
+ LOG_WARNING(Service_AM, "(STUBBED) update_firm_auto={} is_titles={} cleanup={}",
+ is_update_firm_auto, is_titles, cleanup);
auto& title_id_buf = rp.PopMappedBuffer();
@@ -3323,6 +3518,29 @@ void Module::Interface::CommitImportTitlesImpl(Kernel::HLERequestContext& ctx,
}
}
+ if (cleanup) {
+ for (auto it = am->import_content_contexts.begin();
+ it != am->import_content_contexts.end();) {
+ if (it->second.state == ImportTitleContextState::RESUMABLE ||
+ it->second.state == ImportTitleContextState::WAITING_FOR_IMPORT ||
+ it->second.state == ImportTitleContextState::NEEDS_CLEANUP) {
+ it = am->import_content_contexts.erase(it);
+ } else {
+ it++;
+ }
+ }
+
+ for (auto it = am->import_title_contexts.begin(); it != am->import_title_contexts.end();) {
+ if (it->second.state == ImportTitleContextState::RESUMABLE ||
+ it->second.state == ImportTitleContextState::WAITING_FOR_IMPORT ||
+ it->second.state == ImportTitleContextState::NEEDS_CLEANUP) {
+ it = am->import_title_contexts.erase(it);
+ } else {
+ it++;
+ }
+ }
+ }
+
am->ScanForTitles(media_type);
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
@@ -3670,7 +3888,7 @@ void Module::Interface::EndImportTmd(Kernel::HLERequestContext& ctx) {
if (tmd_file.Succeeded()) {
struct AsyncData {
Service::AM::TMDFile* tmd_file;
- bool create_context;
+ [[maybe_unused]] bool create_context;
Result res{0};
};
@@ -3687,7 +3905,8 @@ void Module::Interface::EndImportTmd(Kernel::HLERequestContext& ctx) {
IPC::RequestBuilder rb(ctx, 1, 0);
rb.Push(async_data->res);
- if (async_data->create_context) {
+ if (async_data->res.IsSuccess()) {
+ am->importing_title->tmd_provided = true;
const FileSys::TitleMetadata& tmd_info = am->importing_title->cia_file.GetTMD();
ImportTitleContext& context = am->import_title_contexts[tmd_info.GetTitleID()];
@@ -3697,6 +3916,9 @@ void Module::Interface::EndImportTmd(Kernel::HLERequestContext& ctx) {
context.state = ImportTitleContextState::WAITING_FOR_IMPORT;
context.size = 0;
for (size_t i = 0; i < tmd_info.GetContentCount(); i++) {
+ if (tmd_info.GetContentOptional(i)) {
+ continue;
+ }
ImportContentContext content_context;
content_context.content_id = tmd_info.GetContentIDByIndex(i);
content_context.index = static_cast(i);
@@ -3724,13 +3946,68 @@ void Module::Interface::CreateImportContentContexts(Kernel::HLERequestContext& c
const u32 content_count = rp.Pop();
auto content_buf = rp.PopMappedBuffer();
- std::vector content_indices(content_count);
- content_buf.Read(content_indices.data(), 0, content_buf.GetSize());
+ LOG_DEBUG(Service_AM, "");
- IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
- rb.Push(ResultSuccess);
+ if (!am->importing_title) {
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(Result(ErrCodes::InvalidImportState, ErrorModule::AM, ErrorSummary::InvalidState,
+ ErrorLevel::Permanent));
+ return;
+ }
- LOG_WARNING(Service_AM, "(STUBBED)");
+ struct AsyncData {
+ std::vector content_indices;
+
+ Result res{0};
+ };
+ std::shared_ptr async_data = std::make_shared();
+ async_data->content_indices.resize(content_count);
+ content_buf.Read(async_data->content_indices.data(), 0, content_buf.GetSize());
+
+ ctx.RunAsync(
+ [this, async_data](Kernel::HLERequestContext& ctx) {
+ if (!am->importing_title->tmd_provided) {
+ std::string tmd_path = GetTitleMetadataPath(am->importing_title->media_type,
+ am->importing_title->title_id);
+ FileSys::TitleMetadata tmd;
+ if (tmd.Load(tmd_path) != Loader::ResultStatus::Success) {
+ LOG_ERROR(Service_AM, "Couldn't load TMD for title_id={:016X}, mediatype={}",
+ am->importing_title->title_id, am->importing_title->media_type);
+
+ async_data->res =
+ Result(0xFFFFFFFF); // TODO(PabloMK7): Find the right error code
+ return 0;
+ }
+ am->importing_title->cia_file.ProvideTMDForAdditionalContent(tmd);
+ am->importing_title->tmd_provided = true;
+ }
+ const FileSys::TitleMetadata& tmd = am->importing_title->cia_file.GetTMD();
+ for (size_t i = 0; i < async_data->content_indices.size(); i++) {
+ u16 index = async_data->content_indices[i];
+ if (index > tmd.GetContentCount()) {
+ LOG_ERROR(Service_AM,
+ "Tried to create context for invalid index title_id={:016x} index={}",
+ am->importing_title->title_id, index);
+ async_data->res =
+ Result(0xFFFFFFFF); // TODO(PabloMK7): Find the right error code
+ return 0;
+ }
+ ImportContentContext content_context;
+ content_context.content_id = tmd.GetContentIDByIndex(index);
+ content_context.index = static_cast(index);
+ content_context.state = ImportTitleContextState::WAITING_FOR_IMPORT;
+ content_context.size = tmd.GetContentSizeByIndex(index);
+ content_context.current_size = 0;
+ am->import_content_contexts.insert(
+ std::make_pair(am->importing_title->title_id, content_context));
+ }
+ return 0;
+ },
+ [async_data](Kernel::HLERequestContext& ctx) {
+ IPC::RequestBuilder rb(ctx, 1, 0);
+ rb.Push(async_data->res);
+ },
+ true);
}
void Module::Interface::BeginImportContent(Kernel::HLERequestContext& ctx) {
@@ -4145,6 +4422,255 @@ void Module::Interface::ListTicketInfos(Kernel::HLERequestContext& ctx) {
rb.Push(written);
}
+void Module::Interface::GetNumCurrentContentInfos(Kernel::HLERequestContext& ctx) {
+ IPC::RequestParser rp(ctx);
+
+ LOG_DEBUG(Service_AM, "");
+
+ if (!am->importing_title) {
+ // Not importing a title
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(ResultUnknown);
+ return;
+ }
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
+ rb.Push(ResultSuccess); // No error
+ rb.Push(static_cast(am->importing_title->cia_file.GetTMD().GetContentCount()));
+}
+
+void Module::Interface::FindCurrentContentInfos(Kernel::HLERequestContext& ctx) {
+ IPC::RequestParser rp(ctx);
+
+ LOG_DEBUG(Service_AM, "");
+
+ if (!am->importing_title) {
+ // Not importing a title
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(ResultUnknown);
+ return;
+ }
+
+ struct AsyncData {
+ u32 content_count;
+ std::vector content_requested;
+
+ std::vector out_vec;
+ Kernel::MappedBuffer* content_info_out;
+ Result res{0};
+ };
+ auto async_data = std::make_shared();
+ async_data->content_count = rp.Pop();
+
+ auto& content_requested_in = rp.PopMappedBuffer();
+ async_data->content_requested.resize(async_data->content_count);
+ content_requested_in.Read(async_data->content_requested.data(), 0,
+ async_data->content_count * sizeof(u16));
+ async_data->content_info_out = &rp.PopMappedBuffer();
+
+ ctx.RunAsync(
+ [this, async_data](Kernel::HLERequestContext& ctx) {
+ const FileSys::TitleMetadata& tmd = am->importing_title->cia_file.GetTMD();
+ FileSys::Ticket& ticket = am->importing_title->cia_file.GetTicket();
+ // Get info for each content index requested
+ for (std::size_t i = 0; i < async_data->content_count; i++) {
+ u16_le index = async_data->content_requested[i];
+ if (index >= tmd.GetContentCount()) {
+ LOG_ERROR(Service_AM,
+ "Attempted to get info for non-existent content index {:04x}.",
+ index);
+
+ async_data->res = Result(0xFFFFFFFF);
+ return 0;
+ }
+
+ ContentInfo content_info = {};
+ content_info.index = index;
+ content_info.type = tmd.GetContentTypeByIndex(index);
+ content_info.content_id = tmd.GetContentIDByIndex(index);
+ content_info.size = tmd.GetContentSizeByIndex(index);
+ content_info.ownership = ticket.HasRights(index) ? OWNERSHIP_OWNED : 0;
+
+ if (FileUtil::Exists(GetTitleContentPath(am->importing_title->media_type,
+ am->importing_title->title_id, index))) {
+ bool pending = false;
+ for (auto& import_ctx : am->import_content_contexts) {
+ if (import_ctx.first == am->importing_title->title_id &&
+ import_ctx.second.index == index &&
+ (import_ctx.second.state ==
+ ImportTitleContextState::WAITING_FOR_IMPORT ||
+ import_ctx.second.state ==
+ ImportTitleContextState::WAITING_FOR_COMMIT ||
+ import_ctx.second.state == ImportTitleContextState::RESUMABLE)) {
+ LOG_DEBUG(Service_AM, "content pending commit index={:016X}", index);
+ pending = true;
+ break;
+ }
+ }
+ if (!pending) {
+ content_info.ownership |= OWNERSHIP_DOWNLOADED;
+ }
+ }
+ async_data->out_vec.push_back(content_info);
+ }
+ return 0;
+ },
+ [async_data](Kernel::HLERequestContext& ctx) {
+ IPC::RequestBuilder rb(ctx, 1, 0);
+ rb.Push(async_data->res);
+ if (async_data->res.IsSuccess()) {
+ async_data->content_info_out->Write(async_data->out_vec.data(), 0,
+ async_data->out_vec.size() *
+ sizeof(ContentInfo));
+ }
+ },
+ true);
+}
+
+void Module::Interface::ListCurrentContentInfos(Kernel::HLERequestContext& ctx) {
+ IPC::RequestParser rp(ctx);
+
+ LOG_DEBUG(Service_AM, "");
+
+ if (!am->importing_title) {
+ // Not importing a title
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(ResultUnknown);
+ return;
+ }
+
+ struct AsyncData {
+ u32 content_count;
+ u32 start_index;
+
+ std::vector out_vec;
+ Kernel::MappedBuffer* content_info_out;
+ Result res{0};
+ };
+ auto async_data = std::make_shared();
+ async_data->content_count = rp.Pop();
+ async_data->start_index = rp.Pop();
+
+ async_data->content_info_out = &rp.PopMappedBuffer();
+
+ ctx.RunAsync(
+ [this, async_data](Kernel::HLERequestContext& ctx) {
+ const FileSys::TitleMetadata& tmd = am->importing_title->cia_file.GetTMD();
+ FileSys::Ticket& ticket = am->importing_title->cia_file.GetTicket();
+ u32 end_index = std::min(async_data->start_index + async_data->content_count,
+ static_cast(tmd.GetContentCount()));
+ for (u32 i = async_data->start_index; i < end_index; i++) {
+ ContentInfo content_info = {};
+ content_info.index = static_cast(i);
+ content_info.type = tmd.GetContentTypeByIndex(i);
+ content_info.content_id = tmd.GetContentIDByIndex(i);
+ content_info.size = tmd.GetContentSizeByIndex(i);
+ content_info.ownership =
+ ticket.HasRights(static_cast(i)) ? OWNERSHIP_OWNED : 0;
+
+ if (FileUtil::Exists(GetTitleContentPath(am->importing_title->media_type,
+ am->importing_title->title_id, i))) {
+ bool pending = false;
+ for (auto& import_ctx : am->import_content_contexts) {
+ if (import_ctx.first == am->importing_title->title_id &&
+ import_ctx.second.index == i &&
+ (import_ctx.second.state ==
+ ImportTitleContextState::WAITING_FOR_IMPORT ||
+ import_ctx.second.state ==
+ ImportTitleContextState::WAITING_FOR_COMMIT ||
+ import_ctx.second.state == ImportTitleContextState::RESUMABLE)) {
+ LOG_DEBUG(Service_AM, "content pending commit index={:016X}", i);
+ pending = true;
+ break;
+ }
+ }
+ if (!pending) {
+ content_info.ownership |= OWNERSHIP_DOWNLOADED;
+ }
+ }
+
+ async_data->out_vec.push_back(content_info);
+ }
+ return 0;
+ },
+ [async_data](Kernel::HLERequestContext& ctx) {
+ IPC::RequestBuilder rb(ctx, 2, 0);
+ rb.Push(async_data->res);
+ rb.Push(static_cast(async_data->out_vec.size()));
+ if (async_data->res.IsSuccess()) {
+ async_data->content_info_out->Write(async_data->out_vec.data(), 0,
+ async_data->out_vec.size() *
+ sizeof(ContentInfo));
+ }
+ },
+ true);
+}
+
+void Module::Interface::CalculateContextRequiredSize(Kernel::HLERequestContext& ctx) {
+ IPC::RequestParser rp(ctx);
+
+ LOG_DEBUG(Service_AM, "");
+
+ auto media_type = static_cast(rp.Pop());
+ u64 title_id = rp.Pop();
+ u32 content_count = rp.Pop();
+ auto& content_requested_in = rp.PopMappedBuffer();
+
+ std::vector content_requested(content_count);
+ content_requested_in.Read(content_requested.data(), 0, content_count * sizeof(u16));
+
+ std::string tmd_path = GetTitleMetadataPath(media_type, title_id);
+ FileSys::TitleMetadata tmd;
+ if (tmd.Load(tmd_path) != Loader::ResultStatus::Success) {
+ LOG_ERROR(Service_AM, "Couldn't load TMD for title_id={:016X}, mediatype={}", title_id,
+ media_type);
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(-1); // TODO(PabloMK7): Find the right error code
+ return;
+ }
+ u64 size_out = 0;
+ // Get info for each content index requested
+ for (std::size_t i = 0; i < content_count; i++) {
+ if (content_requested[i] >= tmd.GetContentCount()) {
+ LOG_ERROR(Service_AM, "Attempted to get info for non-existent content index {:04x}.",
+ content_requested[i]);
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(-1); // TODO(PabloMK7): Find the right error code
+ return;
+ }
+ if (!tmd.GetContentOptional(content_requested[i])) {
+ LOG_ERROR(Service_AM, "Attempted to get info for non-optional content index {:04x}.",
+ content_requested[i]);
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(-1); // TODO(PabloMK7): Find the right error code
+ return;
+ }
+
+ size_out += tmd.GetContentSizeByIndex(content_requested[i]);
+ }
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(3, 0);
+ rb.Push(ResultSuccess);
+ rb.Push(size_out);
+}
+
+void Module::Interface::UpdateImportContentContexts(Kernel::HLERequestContext& ctx) {
+ IPC::RequestParser rp(ctx);
+ const u32 content_count = rp.Pop();
+ auto content_buf = rp.PopMappedBuffer();
+
+ std::vector content_indices(content_count);
+ content_buf.Read(content_indices.data(), 0, content_buf.GetSize());
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(ResultSuccess);
+
+ LOG_WARNING(Service_AM, "(STUBBED)");
+}
+
void Module::Interface::ExportTicketWrapped(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp(ctx);
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h
index afac4dae5..9585f96e3 100644
--- a/src/core/hle/service/am/am.h
+++ b/src/core/hle/service/am/am.h
@@ -181,8 +181,11 @@ public:
ResultVal Write(u64 offset, std::size_t length, bool flush, bool update_timestamp,
const u8* buffer) override;
+ Result PrepareToImportContent(const FileSys::TitleMetadata& tmd);
Result ProvideTicket(const FileSys::Ticket& ticket);
+ Result ProvideTMDForAdditionalContent(const FileSys::TitleMetadata& tmd);
const FileSys::TitleMetadata& GetTMD();
+ FileSys::Ticket& GetTicket();
CIAInstallState GetCiaInstallState() {
return install_state;
}
@@ -208,6 +211,7 @@ private:
bool decryption_authorized;
bool is_done = false;
bool is_closed = false;
+ bool is_additional_content = false;
// Whether it's installing an update, and what step of installation it is at
bool is_update = false;
@@ -233,11 +237,13 @@ class CurrentImportingTitle {
public:
explicit CurrentImportingTitle(Core::System& system_, u64 title_id_,
Service::FS::MediaType media_type_)
- : cia_file(system_, media_type_, true), title_id(title_id_), media_type(media_type_) {}
+ : cia_file(system_, media_type_, true), title_id(title_id_), media_type(media_type_),
+ tmd_provided(false) {}
CIAFile cia_file;
u64 title_id;
Service::FS::MediaType media_type;
+ bool tmd_provided;
};
// A file handled returned for Tickets to be written into and subsequently installed.
@@ -1005,6 +1011,16 @@ public:
void ListTicketInfos(Kernel::HLERequestContext& ctx);
+ void GetNumCurrentContentInfos(Kernel::HLERequestContext& ctx);
+
+ void FindCurrentContentInfos(Kernel::HLERequestContext& ctx);
+
+ void ListCurrentContentInfos(Kernel::HLERequestContext& ctx);
+
+ void CalculateContextRequiredSize(Kernel::HLERequestContext& ctx);
+
+ void UpdateImportContentContexts(Kernel::HLERequestContext& ctx);
+
void ExportTicketWrapped(Kernel::HLERequestContext& ctx);
protected:
diff --git a/src/core/hle/service/am/am_net.cpp b/src/core/hle/service/am/am_net.cpp
index 4c39cf62b..1ed88ea8b 100644
--- a/src/core/hle/service/am/am_net.cpp
+++ b/src/core/hle/service/am/am_net.cpp
@@ -113,11 +113,11 @@ AM_NET::AM_NET(std::shared_ptr am) : Module::Interface(std::move(am), "a
{0x081F, &AM_NET::GetNumTicketsOfProgram, "GetNumTicketsOfProgram"},
{0x0820, &AM_NET::ListTicketInfos, "ListTicketInfos"},
{0x0821, nullptr, "GetRightsOnlyTicketData"},
- {0x0822, nullptr, "GetNumCurrentContentInfos"},
- {0x0823, nullptr, "FindCurrentContentInfos"},
- {0x0824, nullptr, "ListCurrentContentInfos"},
- {0x0825, nullptr, "CalculateContextRequiredSize"},
- {0x0826, nullptr, "UpdateImportContentContexts"},
+ {0x0822, &AM_NET::GetNumCurrentContentInfos, "GetNumCurrentContentInfos"},
+ {0x0823, &AM_NET::FindCurrentContentInfos, "FindCurrentContentInfos"},
+ {0x0824, &AM_NET::ListCurrentContentInfos, "ListCurrentContentInfos"},
+ {0x0825, &AM_NET::CalculateContextRequiredSize, "CalculateContextRequiredSize"},
+ {0x0826, &AM_NET::UpdateImportContentContexts, "UpdateImportContentContexts"},
{0x0827, nullptr, "DeleteAllDemoLaunchInfos"},
{0x0828, nullptr, "BeginImportTitleForOverWrite"},
{0x0829, &AM_NET::ExportTicketWrapped, "ExportTicketWrapped"},
diff --git a/src/core/hle/service/apt/applet_manager.cpp b/src/core/hle/service/apt/applet_manager.cpp
index 368d2b7ae..2d21f9ae8 100644
--- a/src/core/hle/service/apt/applet_manager.cpp
+++ b/src/core/hle/service/apt/applet_manager.cpp
@@ -1,4 +1,4 @@
-// Copyright 2018 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -573,9 +573,11 @@ Result AppletManager::PrepareToStartLibraryApplet(AppletId applet_id) {
capture_buffer_info.reset();
if (Settings::values.lle_applets) {
+ bool is_setup = system.GetAppLoader().DoingInitialSetup();
auto cfg = Service::CFG::GetModule(system);
- auto process = NS::LaunchTitle(system, FS::MediaType::NAND,
- GetTitleIdForApplet(applet_id, cfg->GetRegionValue()));
+ auto process =
+ NS::LaunchTitle(system, FS::MediaType::NAND,
+ GetTitleIdForApplet(applet_id, cfg->GetRegionValue(is_setup)));
if (process) {
return ResultSuccess;
}
@@ -602,9 +604,11 @@ Result AppletManager::PreloadLibraryApplet(AppletId applet_id) {
last_prepared_library_applet = applet_id;
if (Settings::values.lle_applets) {
+ bool is_setup = system.GetAppLoader().DoingInitialSetup();
auto cfg = Service::CFG::GetModule(system);
- auto process = NS::LaunchTitle(system, FS::MediaType::NAND,
- GetTitleIdForApplet(applet_id, cfg->GetRegionValue()));
+ auto process =
+ NS::LaunchTitle(system, FS::MediaType::NAND,
+ GetTitleIdForApplet(applet_id, cfg->GetRegionValue(is_setup)));
if (process) {
return ResultSuccess;
}
@@ -814,9 +818,11 @@ Result AppletManager::StartSystemApplet(AppletId applet_id, std::shared_ptrregistered) {
+ bool is_setup = system.GetAppLoader().DoingInitialSetup();
auto cfg = Service::CFG::GetModule(system);
- auto process = NS::LaunchTitle(system, FS::MediaType::NAND,
- GetTitleIdForApplet(applet_id, cfg->GetRegionValue()));
+ auto process =
+ NS::LaunchTitle(system, FS::MediaType::NAND,
+ GetTitleIdForApplet(applet_id, cfg->GetRegionValue(is_setup)));
if (!process) {
// TODO: Find the right error code.
return {ErrorDescription::NotFound, ErrorModule::Applet, ErrorSummary::NotSupported,
@@ -1422,7 +1428,7 @@ void AppletManager::EnsureHomeMenuLoaded() {
}
auto cfg = Service::CFG::GetModule(system);
- auto menu_title_id = GetTitleIdForApplet(AppletId::HomeMenu, cfg->GetRegionValue());
+ auto menu_title_id = GetTitleIdForApplet(AppletId::HomeMenu, cfg->GetRegionValue(false));
auto process = NS::LaunchTitle(system, FS::MediaType::NAND, menu_title_id);
if (!process) {
LOG_WARNING(Service_APT,
diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp
index 39aa3f5df..002bd3728 100644
--- a/src/core/hle/service/apt/apt.cpp
+++ b/src/core/hle/service/apt/apt.cpp
@@ -196,7 +196,7 @@ static u32 DecompressLZ11(const u8* in, u8* out) {
bool Module::LoadSharedFont() {
auto cfg = Service::CFG::GetModule(system);
u8 font_region_code;
- switch (cfg->GetRegionValue()) {
+ switch (cfg->GetRegionValue(false)) {
case 4: // CHN
font_region_code = 2;
break;
@@ -229,10 +229,18 @@ bool Module::LoadSharedFont() {
const char16_t* file_name[4] = {u"cbf_std.bcfnt.lz", u"cbf_zh-Hans-CN.bcfnt.lz",
u"cbf_ko-Hang-KR.bcfnt.lz", u"cbf_zh-Hant-TW.bcfnt.lz"};
- const RomFS::RomFSFile font_file =
+ RomFS::RomFSFile font_file =
RomFS::GetFile(romfs_buffer.data(), {file_name[font_region_code - 1]});
- if (font_file.Data() == nullptr)
- return false;
+ if (font_file.Data() == nullptr) {
+ if (font_region_code != 1) {
+ font_file = RomFS::GetFile(romfs_buffer.data(), {file_name[0]});
+ if (font_file.Data() == nullptr) {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
struct {
u32_le status;
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index f2d0ad770..4d04af017 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -12,6 +12,7 @@
#include
#include "common/archives.h"
#include "common/file_util.h"
+#include "common/hacks/hack_manager.h"
#include "common/logging/log.h"
#include "common/settings.h"
#include "common/string_util.h"
@@ -21,6 +22,7 @@
#include "core/file_sys/errors.h"
#include "core/file_sys/file_backend.h"
#include "core/hle/ipc_helpers.h"
+#include "core/hle/kernel/process.h"
#include "core/hle/result.h"
#include "core/hle/service/cfg/cfg.h"
#include "core/hle/service/cfg/cfg_defaults.h"
@@ -84,30 +86,227 @@ static constexpr u16 C(const char code[2]) {
}
static const std::array country_codes = {{
- 0, C("JP"), 0, 0, 0, 0, 0, 0, // 0-7
- C("AI"), C("AG"), C("AR"), C("AW"), C("BS"), C("BB"), C("BZ"), C("BO"), // 8-15
- C("BR"), C("VG"), C("CA"), C("KY"), C("CL"), C("CO"), C("CR"), C("DM"), // 16-23
- C("DO"), C("EC"), C("SV"), C("GF"), C("GD"), C("GP"), C("GT"), C("GY"), // 24-31
- C("HT"), C("HN"), C("JM"), C("MQ"), C("MX"), C("MS"), C("AN"), C("NI"), // 32-39
- C("PA"), C("PY"), C("PE"), C("KN"), C("LC"), C("VC"), C("SR"), C("TT"), // 40-47
- C("TC"), C("US"), C("UY"), C("VI"), C("VE"), 0, 0, 0, // 48-55
- 0, 0, 0, 0, 0, 0, 0, 0, // 56-63
- C("AL"), C("AU"), C("AT"), C("BE"), C("BA"), C("BW"), C("BG"), C("HR"), // 64-71
- C("CY"), C("CZ"), C("DK"), C("EE"), C("FI"), C("FR"), C("DE"), C("GR"), // 72-79
- C("HU"), C("IS"), C("IE"), C("IT"), C("LV"), C("LS"), C("LI"), C("LT"), // 80-87
- C("LU"), C("MK"), C("MT"), C("ME"), C("MZ"), C("NA"), C("NL"), C("NZ"), // 88-95
- C("NO"), C("PL"), C("PT"), C("RO"), C("RU"), C("RS"), C("SK"), C("SI"), // 96-103
- C("ZA"), C("ES"), C("SZ"), C("SE"), C("CH"), C("TR"), C("GB"), C("ZM"), // 104-111
- C("ZW"), C("AZ"), C("MR"), C("ML"), C("NE"), C("TD"), C("SD"), C("ER"), // 112-119
- C("DJ"), C("SO"), C("AD"), C("GI"), C("GG"), C("IM"), C("JE"), C("MC"), // 120-127
- C("TW"), 0, 0, 0, 0, 0, 0, 0, // 128-135
- C("KR"), 0, 0, 0, 0, 0, 0, 0, // 136-143
- C("HK"), C("MO"), 0, 0, 0, 0, 0, 0, // 144-151
- C("ID"), C("SG"), C("TH"), C("PH"), C("MY"), 0, 0, 0, // 152-159
- C("CN"), 0, 0, 0, 0, 0, 0, 0, // 160-167
- C("AE"), C("IN"), C("EG"), C("OM"), C("QA"), C("KW"), C("SA"), C("SY"), // 168-175
- C("BH"), C("JO"), 0, 0, 0, 0, 0, 0, // 176-183
- C("SM"), C("VA"), C("BM"), // 184-186
+ // 0-7 Japan
+ 0,
+ C("JP"),
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+
+ // 8-15 America
+ C("AI"),
+ C("AG"),
+ C("AR"),
+ C("AW"),
+ C("BS"),
+ C("BB"),
+ C("BZ"),
+ C("BO"),
+ // 16-23 America
+ C("BR"),
+ C("VG"),
+ C("CA"),
+ C("KY"),
+ C("CL"),
+ C("CO"),
+ C("CR"),
+ C("DM"),
+ // 24-31 America
+ C("DO"),
+ C("EC"),
+ C("SV"),
+ C("GF"),
+ C("GD"),
+ C("GP"),
+ C("GT"),
+ C("GY"),
+ // 32-39 America
+ C("HT"),
+ C("HN"),
+ C("JM"),
+ C("MQ"),
+ C("MX"),
+ C("MS"),
+ C("AN"),
+ C("NI"),
+ // 40-47 America
+ C("PA"),
+ C("PY"),
+ C("PE"),
+ C("KN"),
+ C("LC"),
+ C("VC"),
+ C("SR"),
+ C("TT"),
+ // 48-55 America
+ C("TC"),
+ C("US"),
+ C("UY"),
+ C("VI"),
+ C("VE"),
+ 0,
+ 0,
+ 0,
+
+ // 56-63 Invalid
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+
+ // 64-71 Europe
+ C("AL"),
+ C("AU"),
+ C("AT"),
+ C("BE"),
+ C("BA"),
+ C("BW"),
+ C("BG"),
+ C("HR"),
+ // 72-79 Europe
+ C("CY"),
+ C("CZ"),
+ C("DK"),
+ C("EE"),
+ C("FI"),
+ C("FR"),
+ C("DE"),
+ C("GR"),
+ // 80-87 Europe
+ C("HU"),
+ C("IS"),
+ C("IE"),
+ C("IT"),
+ C("LV"),
+ C("LS"),
+ C("LI"),
+ C("LT"),
+ // 88-95 Europe
+ C("LU"),
+ C("MK"),
+ C("MT"),
+ C("ME"),
+ C("MZ"),
+ C("NA"),
+ C("NL"),
+ C("NZ"),
+ // 96-103 Europe
+ C("NO"),
+ C("PL"),
+ C("PT"),
+ C("RO"),
+ C("RU"),
+ C("RS"),
+ C("SK"),
+ C("SI"),
+ // 104-111 Europe
+ C("ZA"),
+ C("ES"),
+ C("SZ"),
+ C("SE"),
+ C("CH"),
+ C("TR"),
+ C("GB"),
+ C("ZM"),
+ // 112-119 Europe
+ C("ZW"),
+ C("AZ"),
+ C("MR"),
+ C("ML"),
+ C("NE"),
+ C("TD"),
+ C("SD"),
+ C("ER"),
+ // 120-127 Europe
+ C("DJ"),
+ C("SO"),
+ C("AD"),
+ C("GI"),
+ C("GG"),
+ C("IM"),
+ C("JE"),
+ C("MC"),
+
+ // 128-135 Taiwan
+ C("TW"),
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+
+ // 136-143 Korea
+ C("KR"),
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+
+ // 144-151 China? (Hong Kong & Macao)
+ C("HK"),
+ C("MO"),
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+
+ // 152-159 Southeast Asia
+ C("ID"),
+ C("SG"), // USA
+ C("TH"),
+ C("PH"),
+ C("MY"), // USA
+ 0,
+ 0,
+ 0,
+
+ // 160-167 China
+ C("CN"),
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+
+ // 168-175 Middle East
+ C("AE"), // USA
+ C("IN"), // EUR
+ C("EG"),
+ C("OM"),
+ C("QA"),
+ C("KW"),
+ C("SA"), // USA
+ C("SY"),
+ // 176-183 Middle East
+ C("BH"),
+ C("JO"),
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+
+ // 184-186 European Microstates
+ C("SM"),
+ C("VA"),
+ C("BM"),
}};
// Based on PKHeX's lists of subregions at
@@ -200,7 +399,14 @@ void Module::Interface::GetCountryCodeID(Kernel::HLERequestContext& ctx) {
rb.Push(country_code_id);
}
-u32 Module::GetRegionValue() {
+u32 Module::GetRegionValue(bool from_secure_info) {
+ if (from_secure_info) {
+ auto& sec_info = HW::UniqueData::GetSecureInfoA();
+ if (sec_info.IsValid()) {
+ return sec_info.body.region;
+ }
+ }
+
if (Settings::values.region_value.GetValue() == Settings::REGION_VALUE_AUTO_SELECT) {
UpdatePreferredRegionCode();
return preferred_region_code;
@@ -209,12 +415,39 @@ u32 Module::GetRegionValue() {
return Settings::values.region_value.GetValue();
}
+bool Module::IsValidRegionCountry(u32 region, u8 country_code) {
+ switch (region) {
+ case 0: // JPN
+ return country_code == 1;
+ case 1: // USA
+ return (country_code >= 8 && country_code <= 52) || country_code == 153 ||
+ country_code == 156 || country_code == 168 || country_code == 174;
+ case 2: // EUR
+ case 3: // AUS
+ return (country_code >= 64 && country_code <= 127) ||
+ (country_code >= 184 && country_code <= 186) || country_code == 169;
+ case 4: // CHN
+ return country_code == 144 || country_code == 145 || country_code == 160;
+ case 5: // KOR
+ return country_code == 136;
+ case 6: // TWN
+ return country_code == 128;
+ default:
+ break;
+ }
+ return false;
+}
+
void Module::Interface::GetRegion(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp(ctx);
+ u64 caller_tid = ctx.ClientThread()->owner_process.lock()->codeset->program_id;
+ bool from_secure_info = Common::Hacks::hack_manager.OverrideBooleanSetting(
+ Common::Hacks::HackType::REGION_FROM_SECURE, caller_tid, false);
+
IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
rb.Push(ResultSuccess);
- rb.Push(static_cast(cfg->GetRegionValue()));
+ rb.Push(static_cast(cfg->GetRegionValue(from_secure_info)));
}
void Module::Interface::SecureInfoGetByte101(Kernel::HLERequestContext& ctx) {
@@ -319,8 +552,12 @@ void Module::Interface::IsCoppacsSupported(Kernel::HLERequestContext& ctx) {
rb.Push(ResultSuccess);
+ u64 caller_tid = ctx.ClientThread()->owner_process.lock()->codeset->program_id;
+ bool from_secure_info = Common::Hacks::hack_manager.OverrideBooleanSetting(
+ Common::Hacks::HackType::REGION_FROM_SECURE, caller_tid, false);
+
u8 canada_or_usa = 1;
- if (canada_or_usa == cfg->GetRegionValue()) {
+ if (canada_or_usa == cfg->GetRegionValue(from_secure_info)) {
rb.Push(true);
} else {
rb.Push(false);
diff --git a/src/core/hle/service/cfg/cfg.h b/src/core/hle/service/cfg/cfg.h
index 32b1dd40c..7536680c0 100644
--- a/src/core/hle/service/cfg/cfg.h
+++ b/src/core/hle/service/cfg/cfg.h
@@ -484,7 +484,9 @@ private:
void LoadMCUConfig();
public:
- u32 GetRegionValue();
+ u32 GetRegionValue(bool from_secure_info);
+
+ static bool IsValidRegionCountry(u32 region, u8 country_code);
// Utilities for frontend to set config data.
// Note: UpdateConfigNANDSavegame should be called after making changes to config data.
diff --git a/src/core/hle/service/fs/file.cpp b/src/core/hle/service/fs/file.cpp
index 21834b20d..7ba13f935 100644
--- a/src/core/hle/service/fs/file.cpp
+++ b/src/core/hle/service/fs/file.cpp
@@ -1,4 +1,4 @@
-// Copyright 2018 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -79,13 +79,13 @@ void File::Read(Kernel::HLERequestContext& ctx) {
if (!backend->AllowsCachedReads()) {
auto& buffer = rp.PopMappedBuffer();
IPC::RequestBuilder rb = rp.MakeBuilder(2, 2);
- std::unique_ptr data = std::make_unique(static_cast(operator new(length)));
- const auto read = backend->Read(offset, length, *data);
+ std::unique_ptr data = std::make_unique_for_overwrite(length);
+ const auto read = backend->Read(offset, length, data.get());
if (read.Failed()) {
rb.Push(read.Code());
rb.Push(0);
} else {
- buffer.Write(*data, 0, *read);
+ buffer.Write(data.get(), 0, *read);
rb.Push(ResultSuccess);
rb.Push(static_cast(*read));
}
@@ -106,7 +106,7 @@ void File::Read(Kernel::HLERequestContext& ctx) {
// Output
Result ret{0};
Kernel::MappedBuffer* buffer;
- std::unique_ptr data;
+ std::unique_ptr data;
std::size_t read_size;
};
@@ -122,10 +122,9 @@ void File::Read(Kernel::HLERequestContext& ctx) {
// LOG_DEBUG(Service_FS, "cache={}, offset={}, length={}", cache_ready, offset, length);
ctx.RunAsync(
[this, async_data](Kernel::HLERequestContext& ctx) {
- async_data->data =
- std::make_unique(static_cast(operator new(async_data->length)));
+ async_data->data = std::make_unique_for_overwrite(async_data->length);
const auto read =
- backend->Read(async_data->offset, async_data->length, *async_data->data);
+ backend->Read(async_data->offset, async_data->length, async_data->data.get());
if (read.Failed()) {
async_data->ret = read.Code();
async_data->read_size = 0;
@@ -156,7 +155,7 @@ void File::Read(Kernel::HLERequestContext& ctx) {
rb.Push(async_data->ret);
rb.Push(0);
} else {
- async_data->buffer->Write(*async_data->data, 0, async_data->read_size);
+ async_data->buffer->Write(async_data->data.get(), 0, async_data->read_size);
rb.Push(ResultSuccess);
rb.Push(static_cast(async_data->read_size));
}
@@ -170,6 +169,7 @@ void File::Write(Kernel::HLERequestContext& ctx) {
u64 offset = rp.Pop();
u32 length = rp.Pop();
u32 flags = rp.Pop();
+ auto& buffer = rp.PopMappedBuffer();
LOG_TRACE(Service_FS, "Write {}: offset=0x{:x} length={}, flags=0x{:x}", GetName(), offset,
length, flags);
@@ -181,14 +181,13 @@ void File::Write(Kernel::HLERequestContext& ctx) {
if (file->subfile) {
rb.Push(FileSys::ResultUnsupportedOpenFlags);
rb.Push(0);
- rb.PushMappedBuffer(rp.PopMappedBuffer());
+ rb.PushMappedBuffer(buffer);
return;
}
bool flush = (flags & 0xFF) != 0, update_timestamp = (flags & 0xFF00) != 0;
if (!backend->AllowsCachedReads()) {
std::vector data(length);
- auto& buffer = rp.PopMappedBuffer();
buffer.Read(data.data(), 0, data.size());
ResultVal written =
backend->Write(offset, data.size(), flush, update_timestamp, data.data());
@@ -224,7 +223,7 @@ void File::Write(Kernel::HLERequestContext& ctx) {
async_data->offset = offset;
async_data->flush = flush;
async_data->update_timestamp = update_timestamp;
- async_data->buffer = &rp.PopMappedBuffer();
+ async_data->buffer = &buffer;
async_data->file = file;
ctx.RunAsync(
diff --git a/src/core/hle/service/gsp/gsp_gpu.cpp b/src/core/hle/service/gsp/gsp_gpu.cpp
index 8f07c22e6..6887de663 100644
--- a/src/core/hle/service/gsp/gsp_gpu.cpp
+++ b/src/core/hle/service/gsp/gsp_gpu.cpp
@@ -21,6 +21,7 @@
#include "video_core/gpu.h"
#include "video_core/gpu_debugger.h"
#include "video_core/pica/regs_lcd.h"
+#include "video_core/renderer_base.h"
#include "video_core/right_eye_disabler.h"
SERIALIZE_EXPORT_IMPL(Service::GSP::SessionData)
@@ -613,6 +614,8 @@ Result GSP_GPU::AcquireGpuRight(const Kernel::HLERequestContext& ctx,
ErrorLevel::Success};
}
+ gpu.Renderer().Rasterizer()->SwitchDiskResources(process->codeset->program_id);
+
if (blocking) {
// TODO: The thread should be put to sleep until acquired.
ASSERT_MSG(active_thread_id == std::numeric_limits::max(),
diff --git a/src/core/hw/unique_data.cpp b/src/core/hw/unique_data.cpp
index 3f11da2a7..8d7ac9035 100644
--- a/src/core/hw/unique_data.cpp
+++ b/src/core/hw/unique_data.cpp
@@ -5,6 +5,7 @@
#include
#include "common/common_paths.h"
#include "common/logging/log.h"
+#include "core/file_sys/archive_systemsavedata.h"
#include "core/file_sys/certificate.h"
#include "core/file_sys/otp.h"
#include "core/hw/aes/key.h"
@@ -17,6 +18,7 @@ namespace HW::UniqueData {
static SecureInfoA secure_info_a;
static bool secure_info_a_signature_valid = false;
+static bool secure_info_a_region_changed = false;
static LocalFriendCodeSeedB local_friend_code_seed_b;
static bool local_friend_code_seed_b_signature_valid = false;
static FileSys::OTP otp;
@@ -40,8 +42,10 @@ bool MovableSed::VerifySignature() const {
SecureDataLoadStatus LoadSecureInfoA() {
if (secure_info_a.IsValid()) {
- return secure_info_a_signature_valid ? SecureDataLoadStatus::Loaded
- : SecureDataLoadStatus::InvalidSignature;
+ return secure_info_a_signature_valid
+ ? SecureDataLoadStatus::Loaded
+ : (secure_info_a_region_changed ? SecureDataLoadStatus::RegionChanged
+ : SecureDataLoadStatus::InvalidSignature);
}
std::string file_path = GetSecureInfoAPath();
if (!FileUtil::Exists(file_path)) {
@@ -60,13 +64,31 @@ SecureDataLoadStatus LoadSecureInfoA() {
}
HW::AES::InitKeys();
+ secure_info_a_region_changed = false;
secure_info_a_signature_valid = secure_info_a.VerifySignature();
if (!secure_info_a_signature_valid) {
- LOG_WARNING(HW, "SecureInfo_A signature check failed");
+ // Check if the file has been region changed
+ SecureInfoA copy = secure_info_a;
+ for (u8 orig_reg = 0; orig_reg < Region::COUNT; orig_reg++) {
+ if (orig_reg == secure_info_a.body.region) {
+ continue;
+ }
+ copy.body.region = orig_reg;
+ if (copy.VerifySignature()) {
+ secure_info_a_region_changed = true;
+ LOG_WARNING(HW, "SecureInfo_A is region changed and its signature invalid");
+ break;
+ }
+ }
+ if (!secure_info_a_region_changed) {
+ LOG_WARNING(HW, "SecureInfo_A signature check failed");
+ }
}
- return secure_info_a_signature_valid ? SecureDataLoadStatus::Loaded
- : SecureDataLoadStatus::InvalidSignature;
+ return secure_info_a_signature_valid
+ ? SecureDataLoadStatus::Loaded
+ : (secure_info_a_region_changed ? SecureDataLoadStatus::RegionChanged
+ : SecureDataLoadStatus::InvalidSignature);
}
SecureDataLoadStatus LoadLocalFriendCodeSeedB() {
@@ -262,4 +284,30 @@ std::unique_ptr OpenUniqueCryptoFile(const std::string& filena
return std::make_unique(filename, openmode, key, ctr, flags);
}
+bool IsFullConsoleLinked() {
+ return GetOTP().Valid() && GetSecureInfoA().IsValid() && GetLocalFriendCodeSeedB().IsValid();
+}
+
+void UnlinkConsole() {
+ // Remove all console unique data, as well as the act, nim and frd savefiles
+ const std::string system_save_data_path =
+ FileSys::GetSystemSaveDataContainerPath(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir));
+ constexpr std::array, 3> save_data_ids{{
+ {0x00, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x01, 0x00},
+ {0x00, 0x00, 0x00, 0x00, 0x32, 0x00, 0x01, 0x00},
+ {0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x01, 0x00},
+ }};
+
+ for (auto& id : save_data_ids) {
+ const std::string final_path = FileSys::GetSystemSaveDataPath(system_save_data_path, id);
+ FileUtil::DeleteDirRecursively(final_path, 2);
+ }
+
+ FileUtil::Delete(GetOTPPath());
+ FileUtil::Delete(GetSecureInfoAPath());
+ FileUtil::Delete(GetLocalFriendCodeSeedBPath());
+
+ InvalidateSecureData();
+}
+
} // namespace HW::UniqueData
diff --git a/src/core/hw/unique_data.h b/src/core/hw/unique_data.h
index 294484ffa..dd3a4bb8b 100644
--- a/src/core/hw/unique_data.h
+++ b/src/core/hw/unique_data.h
@@ -17,6 +17,19 @@ class OTP;
namespace HW::UniqueData {
+struct Region {
+ enum : u8 {
+ JPN,
+ USA,
+ EUR,
+ AUS,
+ CHN,
+ KOR,
+ TWN,
+ };
+ static constexpr u8 COUNT = TWN + 1;
+};
+
struct SecureInfoA {
std::array signature;
struct {
@@ -122,6 +135,7 @@ static_assert(sizeof(MovableSedFull) == 0x140);
enum class SecureDataLoadStatus {
Loaded = 0,
InvalidSignature = 1,
+ RegionChanged = 2,
NotFound = -1,
Invalid = -2,
@@ -154,4 +168,7 @@ void InvalidateSecureData();
std::unique_ptr OpenUniqueCryptoFile(const std::string& filename,
const char openmode[], UniqueCryptoFileID id,
int flags = 0);
+
+bool IsFullConsoleLinked();
+void UnlinkConsole();
} // namespace HW::UniqueData
\ No newline at end of file
diff --git a/src/core/loader/artic.cpp b/src/core/loader/artic.cpp
index 5f4bb28f9..9d8aa240c 100644
--- a/src/core/loader/artic.cpp
+++ b/src/core/loader/artic.cpp
@@ -342,7 +342,8 @@ void Apploader_Artic::EnsureClientConnected() {
if (is_initial_setup) {
// Ensure we are running the initial setup app in the correct version
- auto req = client->NewRequest("System_IsAzaharInitialSetup");
+ auto req = client->NewRequest("System_ArticSetupVersion");
+ req.AddParameterU32(SETUP_TOOL_VERSION);
auto resp = client->Send(req);
if (!resp.has_value()) {
client_connected = false;
@@ -355,7 +356,15 @@ void Apploader_Artic::EnsureClientConnected() {
return;
}
- client_connected = *reinterpret_cast(ret_buf->first) == INITIAL_SETUP_APP_VERSION;
+ if (*reinterpret_cast