mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-05-22 18:07:05 +02:00
provide proper load params
This commit is contained in:
parent
a05db6251f
commit
efbdc8c9dc
3 changed files with 50 additions and 13 deletions
|
|
@ -295,11 +295,12 @@ void AppletManager::SetWindowSystem(WindowSystem* window_system) {
|
||||||
// Or ulaunch initialization where we push parameters willingly!
|
// Or ulaunch initialization where we push parameters willingly!
|
||||||
if (params.launch_type == LaunchType::ApplicationInitiated) {
|
if (params.launch_type == LaunchType::ApplicationInitiated) {
|
||||||
applet->user_channel_launch_parameter.swap(m_system.GetUserChannel());
|
applet->user_channel_launch_parameter.swap(m_system.GetUserChannel());
|
||||||
} else if (params.launch_type == LaunchType::FrontendUlaunchInitiated) {
|
} else if (params.launch_type == LaunchType::FrontendUlaunchInitiated
|
||||||
|
|| params.launch_type == LaunchType::FrontendUmenuInitiated) {
|
||||||
constexpr size_t NroPathSize = 512;
|
constexpr size_t NroPathSize = 512;
|
||||||
constexpr size_t NroArgvSize = 2048;
|
constexpr size_t NroArgvSize = 2048;
|
||||||
constexpr size_t MenuCaptionSize = 1024;
|
constexpr size_t MenuCaptionSize = 1024;
|
||||||
struct UlauncherTargetInput {
|
struct UloaderTargetInput {
|
||||||
u32 magic;
|
u32 magic;
|
||||||
bool target_once;
|
bool target_once;
|
||||||
bool is_auto_game_recording;
|
bool is_auto_game_recording;
|
||||||
|
|
@ -307,17 +308,42 @@ void AppletManager::SetWindowSystem(WindowSystem* window_system) {
|
||||||
std::array<char, NroPathSize> nro_path;
|
std::array<char, NroPathSize> nro_path;
|
||||||
std::array<char, NroArgvSize> nro_argv;
|
std::array<char, NroArgvSize> nro_argv;
|
||||||
std::array<char, MenuCaptionSize> menu_caption;
|
std::array<char, MenuCaptionSize> menu_caption;
|
||||||
} target_ipt = {};
|
};
|
||||||
static_assert(sizeof(target_ipt) == 3592);
|
static_assert(sizeof(UloaderTargetInput) == 3592);
|
||||||
|
|
||||||
target_ipt.magic = 0x49444C55; // "ULDI"
|
if (params.launch_type == LaunchType::FrontendUlaunchInitiated) {
|
||||||
target_ipt.nro_path = {"sdmc:/hbmenu.nro"};
|
UloaderTargetInput target_ipt = {};
|
||||||
target_ipt.menu_caption = {"Loaded by uLoader v1.2.4 - uLaunch's custom hbloader replacement ;)"};
|
target_ipt.magic = 0x49444C55; // "ULDI"
|
||||||
|
target_ipt.nro_path = {"sdmc:/hbmenu.nro"};
|
||||||
|
target_ipt.menu_caption = {"Loaded by uLoader v1.2.4 - uLaunch's custom hbloader replacement ;)"};
|
||||||
|
|
||||||
std::vector<u8> v(sizeof(target_ipt));
|
std::vector<u8> v(sizeof(target_ipt));
|
||||||
std::memcpy(v.data(), &target_ipt, sizeof(target_ipt));
|
std::memcpy(v.data(), std::addressof(target_ipt), sizeof(target_ipt));
|
||||||
applet->user_channel_launch_parameter.clear();
|
applet->user_channel_launch_parameter.clear();
|
||||||
applet->user_channel_launch_parameter.push_back(std::move(v));
|
applet->user_channel_launch_parameter.push_back(std::move(v));
|
||||||
|
} else {
|
||||||
|
typedef u64 AccountUid;
|
||||||
|
struct UmenuInput {
|
||||||
|
AccountUid selected_user;
|
||||||
|
UloaderTargetInput suspended_hb_target_ipt; // Set if homebrew (launched as an application) is currently suspended
|
||||||
|
u64 suspended_app_id; // Set if any normal application is suspended
|
||||||
|
std::array<char, 0x301> last_menu_fs_path; //FS_MAX_PATH
|
||||||
|
std::array<char, 0x301> last_menu_path;
|
||||||
|
u32 last_menu_index;
|
||||||
|
bool reload_theme_cache;
|
||||||
|
bool warned_about_outdated_theme;
|
||||||
|
u32 last_added_app_count;
|
||||||
|
u32 last_deleted_app_count;
|
||||||
|
u32 in_verify_app_count;
|
||||||
|
};
|
||||||
|
|
||||||
|
UmenuInput target_umenu_ipt = {};
|
||||||
|
|
||||||
|
std::vector<u8> v(sizeof(target_umenu_ipt));
|
||||||
|
std::memcpy(v.data(), std::addressof(target_umenu_ipt), sizeof(target_umenu_ipt));
|
||||||
|
applet->user_channel_launch_parameter.clear();
|
||||||
|
applet->user_channel_launch_parameter.push_back(std::move(v));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Read whether we need a preselected user from NACP?
|
// TODO: Read whether we need a preselected user from NACP?
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||||
|
|
@ -28,6 +28,7 @@ enum class LaunchType {
|
||||||
ApplicationInitiated,
|
ApplicationInitiated,
|
||||||
// Special masquerade for AMS + uLaunch CFW
|
// Special masquerade for AMS + uLaunch CFW
|
||||||
FrontendUlaunchInitiated = 0x800,
|
FrontendUlaunchInitiated = 0x800,
|
||||||
|
FrontendUmenuInitiated,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct FrontendAppletParameters {
|
struct FrontendAppletParameters {
|
||||||
|
|
|
||||||
|
|
@ -515,6 +515,7 @@ MainWindow::MainWindow(bool has_broken_vulkan)
|
||||||
QString game_path;
|
QString game_path;
|
||||||
bool should_launch_qlaunch = false;
|
bool should_launch_qlaunch = false;
|
||||||
bool should_launch_hlaunch = false;
|
bool should_launch_hlaunch = false;
|
||||||
|
bool should_launch_hlaunch_uloader = false;
|
||||||
bool should_launch_ulaunch = false;
|
bool should_launch_ulaunch = false;
|
||||||
bool should_launch_setup = false;
|
bool should_launch_setup = false;
|
||||||
bool has_gamepath = false;
|
bool has_gamepath = false;
|
||||||
|
|
@ -559,6 +560,8 @@ MainWindow::MainWindow(bool has_broken_vulkan)
|
||||||
should_launch_qlaunch = true;
|
should_launch_qlaunch = true;
|
||||||
} else if (args[i] == QStringLiteral("-hlaunch")) {
|
} else if (args[i] == QStringLiteral("-hlaunch")) {
|
||||||
should_launch_hlaunch = true;
|
should_launch_hlaunch = true;
|
||||||
|
} else if (args[i] == QStringLiteral("-hlaunch-uloader")) {
|
||||||
|
should_launch_hlaunch_uloader = true;
|
||||||
} else if (args[i] == QStringLiteral("-ulaunch")) {
|
} else if (args[i] == QStringLiteral("-ulaunch")) {
|
||||||
should_launch_ulaunch = true;
|
should_launch_ulaunch = true;
|
||||||
} else if (args[i] == QStringLiteral("-setup")) {
|
} else if (args[i] == QStringLiteral("-setup")) {
|
||||||
|
|
@ -585,12 +588,19 @@ MainWindow::MainWindow(bool has_broken_vulkan)
|
||||||
std::filesystem::path const sd_dir = Common::FS::GetEdenPathString(Common::FS::EdenPath::SDMCDir);
|
std::filesystem::path const sd_dir = Common::FS::GetEdenPathString(Common::FS::EdenPath::SDMCDir);
|
||||||
auto const path = (sd_dir / "atmosphere" / "hbl.nsp").string();
|
auto const path = (sd_dir / "atmosphere" / "hbl.nsp").string();
|
||||||
BootGame(QString::fromStdString(path), ApplicationAppletParameters());
|
BootGame(QString::fromStdString(path), ApplicationAppletParameters());
|
||||||
} else if (should_launch_ulaunch) {
|
} else if (should_launch_hlaunch_uloader) {
|
||||||
std::filesystem::path const sd_dir = Common::FS::GetEdenPathString(Common::FS::EdenPath::SDMCDir);
|
std::filesystem::path const sd_dir = Common::FS::GetEdenPathString(Common::FS::EdenPath::SDMCDir);
|
||||||
auto const path = (sd_dir / "ulaunch" / "bin" / "uLoader" / "application" / "main").string();
|
auto const path = (sd_dir / "ulaunch" / "bin" / "uLoader" / "application" / "main").string();
|
||||||
auto params = ApplicationAppletParameters();
|
auto params = ApplicationAppletParameters();
|
||||||
params.launch_type = Service::AM::LaunchType::FrontendUlaunchInitiated;
|
params.launch_type = Service::AM::LaunchType::FrontendUlaunchInitiated;
|
||||||
BootGame(QString::fromStdString(path), params);
|
BootGame(QString::fromStdString(path), params);
|
||||||
|
} else if (should_launch_ulaunch) {
|
||||||
|
std::filesystem::path const sd_dir = Common::FS::GetEdenPathString(Common::FS::EdenPath::SDMCDir);
|
||||||
|
auto const path = (sd_dir / "ulaunch" / "bin" / "uMenu" / "main").string();
|
||||||
|
auto const program_id = 0x0100000000010000;
|
||||||
|
auto params = LibraryAppletParameters(u64(program_id), Service::AM::AppletId::Cabinet);
|
||||||
|
params.launch_type = Service::AM::LaunchType::FrontendUmenuInitiated;
|
||||||
|
BootGame(QString::fromStdString(path), params);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue