Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HLE: Always return empty paths if game content does not exist in GameContentPermit #8956

Merged
merged 1 commit into from Sep 23, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion rpcs3/Emu/Cell/Modules/cellGame.cpp
Expand Up @@ -399,6 +399,7 @@ error_code cellGameBootCheck(vm::ptr<u32> type, vm::ptr<u32> attributes, vm::ptr
perm->dir = std::move(dir);
perm->sfo = std::move(sfo);
perm->restrict_sfo_params = *type == u32{CELL_GAME_GAMETYPE_HDD}; // Ratchet & Clank: All 4 One (PSN versions) rely on this error checking (TODO: Needs proper hw tests)
perm->exists = true;

return CELL_OK;
}
Expand Down Expand Up @@ -436,6 +437,7 @@ error_code cellGamePatchCheck(vm::ptr<CellGameContentSize> size, vm::ptr<void> r
perm->restrict_sfo_params = false;
perm->dir = Emu.GetTitleID();
perm->sfo = std::move(sfo);
perm->exists = true;

return CELL_OK;
}
Expand Down Expand Up @@ -539,7 +541,7 @@ error_code cellGameContentPermit(vm::ptr<char[CELL_GAME_PATH_MAX]> contentInfoPa

const std::string dir = perm->dir.empty() ? "/dev_bdvd/PS3_GAME"s : "/dev_hdd0/game/" + perm->dir;

if (perm->can_create && perm->temp.empty() && !fs::is_dir(vfs::get(dir)))
if (perm->temp.empty() && !perm->exists)
{
perm->reset();
strcpy_trunc(*contentInfoPath, "");
Expand Down