RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-01-27 02:44:36 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ISO: Modify game boot for ISOs

Browse source 
This commit modifies code in System.cpp to allow games to boot from ISO
images. Game data is loaded by leveraging fs::set_virtual_device, and
setting the m_path to the ISO device location.

This commit also modifies the resolve_path callback to return the path
it was given if it wasn't found in the OS. This is necessary as
Emulator::GetFakeCat will return "HG" on disc games, making games
unplayable through ISO.
This commit is contained in:
Functionable 2025-12-08 20:33:05 +00:00 committed by Elad
parent 6c083d6184
commit 990e002782
2 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
rpcs3/Emu/System.cpp
View file

@ -34,6 +34,7 @@
#include "Loader/PSF.h"
#include "Loader/TAR.h"
#include "Loader/ISO.h"
#include "Loader/ELF.h"
#include "Loader/disc.h"
@ -1078,6 +1079,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
sys_log.notice("Path: %s", m_path);
std::string inherited_ps3_game_path;
bool launching_from_disc_archive = false;
{
Init();
@ -1421,6 +1423,28 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
}
const std::string resolved_path = GetCallbacks().resolve_path(m_path);
if (is_file_iso(m_path))
{
load_iso(m_path);
std::string path = iso_device::virtual_device_name + "/";
vfs::mount("/dev_bdvd/"sv, path);
// ISOs that are install discs will error if set to EBOOT.BIN
// so this should cover both of them
if (fs::exists(path + "PS3_GAME/USRDIR/EBOOT.BIN"))
{
path = path + "PS3_GAME/USRDIR/EBOOT.BIN";
}
m_path = path;
m_dir = "/dev_bdvd/PS3_GAME/";
m_cat = "DG"sv;
launching_from_disc_archive = true;
}
const std::string elf_dir = fs::get_parent_dir(m_path);
@ -1595,8 +1619,14 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
}
}
// ISO PKG INSTALL HACK!
if (!m_path.ends_with("EBOOT.BIN") && launching_from_disc_archive)
{
bdvd_dir = m_path;
}
// Special boot mode (directory scan)
if (fs::is_dir(m_path))
if (fs::is_dir(m_path) && !launching_from_disc_archive)
{
m_state = system_state::ready;
GetCallbacks().on_ready();
@ -2076,6 +2106,13 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
}
}
// ISO has no USRDIR/EBOOT.BIN, and we've examined its PKGDIR and extras.
// time to wrap up
if (!m_path.ends_with("EBOOT.BIN") && launching_from_disc_archive)
{
return game_boot_result::nothing_to_boot;
}
// Check firmware version
if (const std::string_view game_fw_version = psf::get_string(_psf, "PS3_SYSTEM_VER", ""); !game_fw_version.empty())
{

3
rpcs3/main_application.cpp
View file

@ -345,7 +345,8 @@ EmuCallbacks main_application::CreateCallbacks()
callbacks.resolve_path = [](std::string_view sv)
{
// May result in an empty string if path does not exist
return QFileInfo(QString::fromUtf8(sv.data(), static_cast<int>(sv.size()))).canonicalFilePath().toStdString();
std::string result = QFileInfo(QString::fromUtf8(sv.data(), static_cast<int>(sv.size()))).canonicalFilePath().toStdString();
return !result.empty() ? result : std::string(sv);
};
callbacks.get_font_dirs = []()