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

Merge pull request #740 from tambry/ErrorDialogFix

Browse source 
Improve content errors and fix access violation
This commit is contained in:
B1ackDaemon 2014-08-13 00:23:52 +03:00
commit 72f1206585
1 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -421,9 +421,15 @@ int cellGameGetLocalWebContentPath()
int cellGameContentErrorDialog(s32 type, s32 errNeedSizeKB, u32 dirName_addr) int cellGameContentErrorDialog(s32 type, s32 errNeedSizeKB, u32 dirName_addr)
{ {
cellGame->Warning("cellGameContentErrorDialog(type=%d, errNeedSizeKB=%d, dirName_addr=0x%x)", type, errNeedSizeKB, dirName_addr); cellGame->Warning("cellGameContentErrorDialog(type=%d, errNeedSizeKB=%d, dirName_addr=0x%x)", type, errNeedSizeKB, dirName_addr);
char* dirName = (char*)Memory.VirtualToRealAddr(dirName_addr);
std::string errorName; std::string errorName;
std::string errorMsg;
char* dirName;
if (type == CELL_GAME_ERRDIALOG_NOSPACE || CELL_GAME_ERRDIALOG_NOSPACE_EXIT)
{
char* dirName = (char*)Memory.VirtualToRealAddr(dirName_addr);
}
switch (type) switch (type)
{ {
case CELL_GAME_ERRDIALOG_BROKEN_GAMEDATA: errorName = "Game data is corrupted (can be continued)."; break; case CELL_GAME_ERRDIALOG_BROKEN_GAMEDATA: errorName = "Game data is corrupted (can be continued)."; break;
@ -435,9 +441,17 @@ int cellGameContentErrorDialog(s32 type, s32 errNeedSizeKB, u32 dirName_addr)
default: return CELL_GAME_ERROR_PARAM; default: return CELL_GAME_ERROR_PARAM;
} }
std::string errorMsg = fmt::Format("%s\nSpace needed: %d KB\nDirectory name: %s", if (type == CELL_GAME_ERRDIALOG_NOSPACE || CELL_GAME_ERRDIALOG_NOSPACE_EXIT)
errorName.c_str(), errNeedSizeKB, dirName); {
errorMsg = fmt::Format("ERROR: %s\nSpace needed: %d KB\nDirectory name: %s", errorName.c_str(), errNeedSizeKB, dirName);
}
else
{
errorMsg = fmt::Format("ERROR: %s", errorName.c_str());
}
rMessageBox(errorMsg, "Error", rICON_ERROR | rOK); rMessageBox(errorMsg, "Error", rICON_ERROR | rOK);
return CELL_OK; return CELL_OK;
} }