mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-16 16:21:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve cellGameCreateGameData error checks

Browse Source
This commit is contained in:
Nekotekina 2018-03-12 15:33:18 +03:00
parent f328cdbaef
commit ba54f7ae39
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpcs3/Emu/Cell/Modules/cellGame.cpp
View File

@ -99,6 +99,8 @@ struct content_permission final
// Temporary directory path // Temporary directory path
std::string temp; std::string temp;
bool can_create = false;
template <typename Dir, typename Sfo> template <typename Dir, typename Sfo>
content_permission(Dir&& dir, Sfo&& sfo) content_permission(Dir&& dir, Sfo&& sfo)
: dir(std::forward<Dir>(dir)) : dir(std::forward<Dir>(dir))
@ -360,6 +362,11 @@ error_code cellGameDataCheck(u32 type, vm::cptr<char> dirName, vm::ptr<CellGameC
return CELL_GAME_ERROR_BUSY; return CELL_GAME_ERROR_BUSY;
} }
if (type == CELL_GAME_GAMETYPE_GAMEDATA)
{
prm->can_create = true;
}
const std::string dir = prm->dir.empty() ? "/dev_bdvd/PS3_GAME"s : "/dev_hdd0/game/" + prm->dir; const std::string dir = prm->dir.empty() ? "/dev_bdvd/PS3_GAME"s : "/dev_hdd0/game/" + prm->dir;
if (!fs::is_dir(vfs::get(dir))) if (!fs::is_dir(vfs::get(dir)))
@ -369,7 +376,6 @@ error_code cellGameDataCheck(u32 type, vm::cptr<char> dirName, vm::ptr<CellGameC
} }
prm->sfo = psf::load_object(fs::file(vfs::get(dir + "/PARAM.SFO"))); prm->sfo = psf::load_object(fs::file(vfs::get(dir + "/PARAM.SFO")));
return CELL_OK; return CELL_OK;
} }
@ -565,6 +571,11 @@ error_code cellGameCreateGameData(vm::ptr<CellGameSetInitParams> init, vm::ptr<c
return CELL_GAME_ERROR_FAILURE; return CELL_GAME_ERROR_FAILURE;
} }
if (!prm->can_create)
{
return CELL_GAME_ERROR_NOTSUPPORTED;
}
std::string tmp_contentInfo = "/dev_hdd1/game/" + prm->dir; std::string tmp_contentInfo = "/dev_hdd1/game/" + prm->dir;
std::string tmp_usrdir = "/dev_hdd1/game/" + prm->dir + "/USRDIR"; std::string tmp_usrdir = "/dev_hdd1/game/" + prm->dir + "/USRDIR";