archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 09:48:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compilation fix

Browse source
This commit is contained in:
Nekotekina 2015-04-17 16:56:32 +03:00
parent be48a330b4
commit 9bedf0d13e
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rpcs3/Emu/SysCalls/Modules/cellGame.cpp
View file

@ -50,7 +50,8 @@ s32 cellHddGameCheck(PPUThread& CPU, u32 version, vm::ptr<const char> dirName, u
else else
{ {
// TODO: Is cellHddGameCheck really responsible for writing the information in get->getParam ? (If not, delete this else) // TODO: Is cellHddGameCheck really responsible for writing the information in get->getParam ? (If not, delete this else)
const PSFLoader psf(vfsFile("/dev_hdd0/game/" + dir + "/PARAM.SFO")); vfsFile f("/dev_hdd0/game/" + dir + "/PARAM.SFO");
const PSFLoader psf(f);
if (!psf) if (!psf)
{ {
return CELL_HDDGAME_ERROR_BROKEN; return CELL_HDDGAME_ERROR_BROKEN;
@ -103,7 +104,8 @@ s32 cellGameBootCheck(vm::ptr<u32> type, vm::ptr<u32> attributes, vm::ptr<CellGa
size->sysSizeKB = 0; size->sysSizeKB = 0;
} }
const PSFLoader psf(vfsFile("/app_home/../PARAM.SFO")); vfsFile f("/app_home/../PARAM.SFO");
const PSFLoader psf(f);
if (!psf) if (!psf)
{ {
cellGame.Error("cellGameBootCheck(): CELL_GAME_ERROR_ACCESS_ERROR (cannot read PARAM.SFO)"); cellGame.Error("cellGameBootCheck(): CELL_GAME_ERROR_ACCESS_ERROR (cannot read PARAM.SFO)");
@ -163,7 +165,8 @@ s32 cellGamePatchCheck(vm::ptr<CellGameContentSize> size, vm::ptr<void> reserved
size->sysSizeKB = 0; size->sysSizeKB = 0;
} }
const PSFLoader psf(vfsFile("/app_home/../PARAM.SFO")); vfsFile f("/app_home/../PARAM.SFO");
const PSFLoader psf(f);
if (!psf) if (!psf)
{ {
cellGame.Error("cellGamePatchCheck(): CELL_GAME_ERROR_ACCESS_ERROR (cannot read PARAM.SFO)"); cellGame.Error("cellGamePatchCheck(): CELL_GAME_ERROR_ACCESS_ERROR (cannot read PARAM.SFO)");
@ -290,7 +293,8 @@ s32 cellGameDataCheckCreate2(PPUThread& CPU, u32 version, vm::ptr<const char> di
return CELL_GAMEDATA_RET_OK; return CELL_GAMEDATA_RET_OK;
} }
const PSFLoader psf(vfsFile("/app_home/../PARAM.SFO")); vfsFile f("/app_home/../PARAM.SFO");
const PSFLoader psf(f);
if (!psf) if (!psf)
{ {
cellGame.Error("cellGameDataCheckCreate2(): CELL_GAMEDATA_ERROR_BROKEN (cannot read PARAM.SFO)"); cellGame.Error("cellGameDataCheckCreate2(): CELL_GAMEDATA_ERROR_BROKEN (cannot read PARAM.SFO)");
@ -419,7 +423,8 @@ s32 cellGameGetParamInt(u32 id, vm::ptr<u32> value)
cellGame.Warning("cellGameGetParamInt(id=%d, value=*0x%x)", id, value); cellGame.Warning("cellGameGetParamInt(id=%d, value=*0x%x)", id, value);
// TODO: Access through cellGame***Check functions // TODO: Access through cellGame***Check functions
const PSFLoader psf(vfsFile("/app_home/../PARAM.SFO")); vfsFile f("/app_home/../PARAM.SFO");
const PSFLoader psf(f);
if (!psf) if (!psf)
{ {
return CELL_GAME_ERROR_FAILURE; return CELL_GAME_ERROR_FAILURE;
@ -443,7 +448,8 @@ s32 cellGameGetParamString(u32 id, vm::ptr<char> buf, u32 bufsize)
cellGame.Warning("cellGameGetParamString(id=%d, buf=*0x%x, bufsize=%d)", id, buf, bufsize); cellGame.Warning("cellGameGetParamString(id=%d, buf=*0x%x, bufsize=%d)", id, buf, bufsize);
// TODO: Access through cellGame***Check functions // TODO: Access through cellGame***Check functions
const PSFLoader psf(vfsFile("/app_home/../PARAM.SFO")); vfsFile f("/app_home/../PARAM.SFO");
const PSFLoader psf(f);
if (!psf) if (!psf)
{ {
return CELL_GAME_ERROR_FAILURE; return CELL_GAME_ERROR_FAILURE;

10
rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
View file

@ -150,7 +150,8 @@ __noinline s32 savedata_op(
listGet->dirNum++; listGet->dirNum++;
// PSF parameters // PSF parameters
const PSFLoader psf(vfsFile(base_dir + entry->name + "/PARAM.SFO")); vfsFile f(base_dir + entry->name + "/PARAM.SFO");
const PSFLoader psf(f);
if (!psf) if (!psf)
{ {
@ -351,7 +352,8 @@ __noinline s32 savedata_op(
std::string dir_path = base_dir + save_entry.dirName + "/"; std::string dir_path = base_dir + save_entry.dirName + "/";
std::string sfo_path = dir_path + "PARAM.SFO"; std::string sfo_path = dir_path + "PARAM.SFO";
PSFLoader psf(vfsFile(sfo_path, vfsRead)); vfsFile f(sfo_path);
PSFLoader psf(f);
std::string dir_local_path; std::string dir_local_path;
@ -487,7 +489,9 @@ __noinline s32 savedata_op(
if (psf) if (psf)
{ {
Emu.GetVFS().CreateFile(sfo_path, true); Emu.GetVFS().CreateFile(sfo_path, true);
psf.Save(vfsFile(sfo_path, vfsWrite));
vfsFile f(sfo_path, vfsWrite);
psf.Save(f);
} }
// Enter the loop where the save files are read/created/deleted // Enter the loop where the save files are read/created/deleted

2
rpcs3/Loader/PSF.h
View file

@ -61,7 +61,7 @@ public:
const PSFEntry* SearchEntry(const std::string& key) const; const PSFEntry* SearchEntry(const std::string& key) const;
PSFEntry& PSFLoader::AddEntry(const std::string& key, u16 type); PSFEntry& AddEntry(const std::string& key, u16 type);
std::string GetString(const std::string& key, std::string def = "") const; std::string GetString(const std::string& key, std::string def = "") const;