Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-21 13:57:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

properly give targetinput?

Browse source
This commit is contained in:
lizzie 2026-05-20 04:00:54 +00:00
parent c879284dce
commit a05db6251f
3 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/core/hle/service/am/applet_manager.cpp
View file

@ -292,8 +292,32 @@ void AppletManager::SetWindowSystem(WindowSystem* window_system) {
applet->previous_program_index = params.previous_program_index;
// Push UserChannel data from previous application
// Or ulaunch initialization where we push parameters willingly!
if (params.launch_type == LaunchType::ApplicationInitiated) {
applet->user_channel_launch_parameter.swap(m_system.GetUserChannel());
} else if (params.launch_type == LaunchType::FrontendUlaunchInitiated) {
constexpr size_t NroPathSize = 512;
constexpr size_t NroArgvSize = 2048;
constexpr size_t MenuCaptionSize = 1024;
struct UlauncherTargetInput {
u32 magic;
bool target_once;
bool is_auto_game_recording;
std::array<u8, 2> unused;
std::array<char, NroPathSize> nro_path;
std::array<char, NroArgvSize> nro_argv;
std::array<char, MenuCaptionSize> menu_caption;
} target_ipt = {};
static_assert(sizeof(target_ipt) == 3592);
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::memcpy(v.data(), &target_ipt, sizeof(target_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?

2
src/core/hle/service/am/applet_manager.h
View file

@ -26,6 +26,8 @@ class WindowSystem;
enum class LaunchType {
FrontendInitiated,
ApplicationInitiated,
// Special masquerade for AMS + uLaunch CFW
FrontendUlaunchInitiated = 0x800,
};
struct FrontendAppletParameters {

19
src/yuzu/main_window.cpp
View file

@ -586,27 +586,10 @@ MainWindow::MainWindow(bool has_broken_vulkan)
auto const path = (sd_dir / "atmosphere" / "hbl.nsp").string();
BootGame(QString::fromStdString(path), ApplicationAppletParameters());
} else if (should_launch_ulaunch) {
constexpr size_t NroPathSize = 512;
constexpr size_t NroArgvSize = 2048;
constexpr size_t MenuCaptionSize = 1024;
struct UlauncherTargetInput {
u32 magic;
bool target_once;
bool is_auto_game_recording;
std::array<u8, 2> unused;
std::array<char, NroPathSize> nro_path;
std::array<char, NroArgvSize> nro_argv;
std::array<char, MenuCaptionSize> menu_caption;
} target_ipt = {};
target_ipt.magic = 0x49444C55; // "ULDI"
QtCommon::system->GetUserChannel().resize(sizeof(target_ipt));
std::memcpy(QtCommon::system->GetUserChannel().data(), &target_ipt, sizeof(target_ipt));
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 params = ApplicationAppletParameters();
params.launch_type = Service::AM::LaunchType::ApplicationInitiated;
params.launch_type = Service::AM::LaunchType::FrontendUlaunchInitiated;
BootGame(QString::fromStdString(path), params);
}
}