mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-16 19:13:40 +01:00
Merge pull request #1772 from unknownbrackets/savedata
Improve automatic save/load based on tests
This commit is contained in:
commit
dd1077d9cd
4 files changed
+219
-109
No files matched your search
+131
-26
@@ -55,12 +55,21 @@ int PSPSaveDialog::Init(int paramAddr)
|
||||
INFO_LOG(HLE,"sceUtilitySavedataInitStart(%08x)", paramAddr);
|
||||
INFO_LOG(HLE,"Mode: %i", param.GetPspParam()->mode);
|
||||
|
||||
currentSelectedSave = 0;
|
||||
switch(param.GetPspParam()->mode)
|
||||
{
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_AUTOLOAD:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_LOAD:
|
||||
DEBUG_LOG(HLE, "Loading. Title: %s Save: %s File: %s", param.GetGameName(param.GetPspParam()).c_str(), param.GetSaveName(param.GetPspParam()).c_str(), param.GetFileName(param.GetPspParam()).c_str());
|
||||
if (param.GetFileInfo(0).size != 0)
|
||||
display = DS_LOAD_CONFIRM;
|
||||
else
|
||||
display = DS_LOAD_NODATA;
|
||||
currentSelectedSave = param.GetSelectedSave();
|
||||
break;
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_AUTOLOAD:
|
||||
DEBUG_LOG(HLE, "Loading. Title: %s Save: %s File: %s", param.GetGameName(param.GetPspParam()).c_str(), param.GetSaveName(param.GetPspParam()).c_str(), param.GetFileName(param.GetPspParam()).c_str());
|
||||
display = DS_NONE;
|
||||
currentSelectedSave = param.GetSelectedSave();
|
||||
break;
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_LISTLOAD:
|
||||
DEBUG_LOG(HLE, "Loading. Title: %s Save: %s File: %s", param.GetGameName(param.GetPspParam()).c_str(), param.GetGameName(param.GetPspParam()).c_str(), param.GetFileName(param.GetPspParam()).c_str());
|
||||
@@ -69,10 +78,18 @@ int PSPSaveDialog::Init(int paramAddr)
|
||||
else
|
||||
display = DS_LOAD_LIST_CHOICE;
|
||||
break;
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_AUTOSAVE:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_SAVE:
|
||||
DEBUG_LOG(HLE, "Saving. Title: %s Save: %s File: %s", param.GetGameName(param.GetPspParam()).c_str(), param.GetGameName(param.GetPspParam()).c_str(), param.GetFileName(param.GetPspParam()).c_str());
|
||||
if (param.GetFileInfo(0).size != 0)
|
||||
display = DS_SAVE_CONFIRM_OVERWRITE;
|
||||
else
|
||||
display = DS_SAVE_CONFIRM;
|
||||
currentSelectedSave = param.GetSelectedSave();
|
||||
break;
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_AUTOSAVE:
|
||||
DEBUG_LOG(HLE, "Saving. Title: %s Save: %s File: %s", param.GetGameName(param.GetPspParam()).c_str(), param.GetGameName(param.GetPspParam()).c_str(), param.GetFileName(param.GetPspParam()).c_str());
|
||||
display = DS_NONE;
|
||||
currentSelectedSave = param.GetSelectedSave();
|
||||
break;
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_LISTSAVE:
|
||||
DEBUG_LOG(HLE, "Saving. Title: %s Save: %s File: %s", param.GetGameName(param.GetPspParam()).c_str(), param.GetGameName(param.GetPspParam()).c_str(), param.GetFileName(param.GetPspParam()).c_str());
|
||||
@@ -89,16 +106,21 @@ int PSPSaveDialog::Init(int paramAddr)
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_LIST:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_FILES:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_GETSIZE:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_SINGLEDELETE:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_DELETEDATA:
|
||||
display = DS_NONE;
|
||||
break;
|
||||
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_MAKEDATASECURE:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_MAKEDATA:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_WRITEDATASECURE:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_WRITEDATA:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_READDATASECURE:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_READDATA:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_SINGLEDELETE:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_DELETEDATA:
|
||||
display = DS_NONE;
|
||||
currentSelectedSave = param.GetSelectedSave();
|
||||
break;
|
||||
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_DELETE: // This run on PSP display a list of all save on the PSP. Weird. (Not really, it's to let you free up space)
|
||||
display = DS_DELETE_LIST_CHOICE;
|
||||
break;
|
||||
@@ -115,7 +137,6 @@ int PSPSaveDialog::Init(int paramAddr)
|
||||
|
||||
status = (int)retval < 0 ? SCE_UTILITY_STATUS_SHUTDOWN : SCE_UTILITY_STATUS_INITIALIZE;
|
||||
|
||||
currentSelectedSave = 0;
|
||||
lastButtons = __CtrlPeekButtons();
|
||||
StartFade(true);
|
||||
|
||||
@@ -153,6 +174,26 @@ int PSPSaveDialog::Init(int paramAddr)
|
||||
return retval;
|
||||
}
|
||||
|
||||
const std::string PSPSaveDialog::GetSelectedSaveDirName()
|
||||
{
|
||||
switch (param.GetPspParam()->mode)
|
||||
{
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_LOAD:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_AUTOLOAD:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_SAVE:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_AUTOSAVE:
|
||||
if (param.GetSaveName(param.GetPspParam()).length() != 0)
|
||||
return param.GetSaveDirName(param.GetPspParam());
|
||||
// Intentional fallthrough when saveName not valid.
|
||||
|
||||
// TODO: Maybe also WRITEDATA/READDATA/MAKEDATA/DELETEDATA/SINGLEDELETE?
|
||||
|
||||
default:
|
||||
return param.GetSaveDirName(param.GetPspParam(), currentSelectedSave);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void PSPSaveDialog::DisplaySaveList(bool canMove)
|
||||
{
|
||||
int displayCount = 0;
|
||||
@@ -423,6 +464,7 @@ int PSPSaveDialog::Update()
|
||||
DisplaySaveDataInfo1();
|
||||
|
||||
DisplayEnterBack();
|
||||
|
||||
if (IsButtonPressed(cancelButtonFlag))
|
||||
{
|
||||
param.GetPspParam()->result = SCE_UTILITY_DIALOG_RESULT_CANCEL;
|
||||
@@ -439,7 +481,7 @@ int PSPSaveDialog::Update()
|
||||
else
|
||||
{
|
||||
display = DS_SAVE_SAVING;
|
||||
if(param.Save(param.GetPspParam(),currentSelectedSave))
|
||||
if (param.Save(param.GetPspParam(), GetSelectedSaveDirName()))
|
||||
{
|
||||
param.SetPspParam(param.GetPspParam()); // Optim : Just Update modified save
|
||||
display = DS_SAVE_DONE;
|
||||
@@ -452,9 +494,39 @@ int PSPSaveDialog::Update()
|
||||
}
|
||||
EndDraw();
|
||||
break;
|
||||
case DS_SAVE_CONFIRM:
|
||||
StartDraw();
|
||||
|
||||
DisplaySaveIcon();
|
||||
DisplaySaveDataInfo2();
|
||||
|
||||
DisplayConfirmationYesNo(d->T("Confirm Save", "Do you want to save this data?"));
|
||||
|
||||
DisplayEnterBack();
|
||||
if (IsButtonPressed(cancelButtonFlag) || (IsButtonPressed(okButtonFlag) && yesnoChoice == 0))
|
||||
{
|
||||
param.GetPspParam()->result = SCE_UTILITY_DIALOG_RESULT_CANCEL;
|
||||
StartFade(false);
|
||||
}
|
||||
else if (IsButtonPressed(okButtonFlag))
|
||||
{
|
||||
display = DS_SAVE_SAVING;
|
||||
if (param.Save(param.GetPspParam(), GetSelectedSaveDirName()))
|
||||
{
|
||||
param.SetPspParam(param.GetPspParam()); // Optim : Just Update modified save
|
||||
display = DS_SAVE_DONE;
|
||||
}
|
||||
else
|
||||
{
|
||||
// TODO: This should probably show an error message?
|
||||
StartFade(false);
|
||||
}
|
||||
}
|
||||
|
||||
EndDraw();
|
||||
break;
|
||||
case DS_SAVE_CONFIRM_OVERWRITE:
|
||||
StartDraw();
|
||||
|
||||
|
||||
DisplaySaveIcon();
|
||||
DisplaySaveDataInfo2();
|
||||
@@ -462,28 +534,31 @@ int PSPSaveDialog::Update()
|
||||
DisplayConfirmationYesNo(d->T("Do you want to overwrite the data?"));
|
||||
|
||||
DisplayEnterBack();
|
||||
if (IsButtonPressed(cancelButtonFlag))
|
||||
if (IsButtonPressed(cancelButtonFlag) || (IsButtonPressed(okButtonFlag) && yesnoChoice == 0))
|
||||
{
|
||||
display = DS_SAVE_LIST_CHOICE;
|
||||
if (param.GetPspParam()->mode != SCE_UTILITY_SAVEDATA_TYPE_SAVE)
|
||||
display = DS_SAVE_LIST_CHOICE;
|
||||
else
|
||||
{
|
||||
param.GetPspParam()->result = SCE_UTILITY_DIALOG_RESULT_CANCEL;
|
||||
StartFade(false);
|
||||
}
|
||||
}
|
||||
else if (IsButtonPressed(okButtonFlag))
|
||||
{
|
||||
if(yesnoChoice == 0)
|
||||
display = DS_SAVE_SAVING;
|
||||
if (param.Save(param.GetPspParam(), GetSelectedSaveDirName()))
|
||||
{
|
||||
display = DS_SAVE_LIST_CHOICE;
|
||||
param.SetPspParam(param.GetPspParam()); // Optim : Just Update modified save
|
||||
display = DS_SAVE_DONE;
|
||||
}
|
||||
else
|
||||
{
|
||||
display = DS_SAVE_SAVING;
|
||||
if(param.Save(param.GetPspParam(),currentSelectedSave))
|
||||
{
|
||||
param.SetPspParam(param.GetPspParam()); // Optim : Just Update modified save
|
||||
display = DS_SAVE_DONE;
|
||||
}
|
||||
// TODO: This should probably show an error message?
|
||||
if (param.GetPspParam()->mode != SCE_UTILITY_SAVEDATA_TYPE_SAVE)
|
||||
display = DS_SAVE_LIST_CHOICE;
|
||||
else
|
||||
{
|
||||
display = DS_SAVE_LIST_CHOICE; // This will probably need error message ?
|
||||
}
|
||||
StartFade(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -536,7 +611,7 @@ int PSPSaveDialog::Update()
|
||||
else if (IsButtonPressed(okButtonFlag))
|
||||
{
|
||||
display = DS_LOAD_LOADING;
|
||||
if(param.Load(param.GetPspParam(),currentSelectedSave))
|
||||
if (param.Load(param.GetPspParam(), GetSelectedSaveDirName(), currentSelectedSave))
|
||||
{
|
||||
display = DS_LOAD_DONE;
|
||||
}
|
||||
@@ -544,6 +619,36 @@ int PSPSaveDialog::Update()
|
||||
|
||||
EndDraw();
|
||||
break;
|
||||
case DS_LOAD_CONFIRM:
|
||||
StartDraw();
|
||||
|
||||
DisplaySaveIcon();
|
||||
DisplaySaveDataInfo2();
|
||||
|
||||
DisplayConfirmationYesNo(d->T("ConfirmLoad", "Load this data?"));
|
||||
|
||||
DisplayEnterBack();
|
||||
if (IsButtonPressed(cancelButtonFlag) || (IsButtonPressed(okButtonFlag) && yesnoChoice == 0))
|
||||
{
|
||||
param.GetPspParam()->result = SCE_UTILITY_DIALOG_RESULT_CANCEL;
|
||||
StartFade(false);
|
||||
}
|
||||
else if (IsButtonPressed(okButtonFlag))
|
||||
{
|
||||
display = DS_LOAD_LOADING;
|
||||
if (param.Load(param.GetPspParam(), GetSelectedSaveDirName(), currentSelectedSave))
|
||||
{
|
||||
display = DS_LOAD_DONE;
|
||||
}
|
||||
else
|
||||
{
|
||||
// TODO: Show some error message?
|
||||
StartFade(false);
|
||||
}
|
||||
}
|
||||
|
||||
EndDraw();
|
||||
break;
|
||||
case DS_LOAD_LOADING:
|
||||
StartDraw();
|
||||
|
||||
@@ -699,7 +804,7 @@ int PSPSaveDialog::Update()
|
||||
{
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_LOAD: // Only load and exit
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_AUTOLOAD:
|
||||
if(param.Load(param.GetPspParam(),param.GetSelectedSave()))
|
||||
if (param.Load(param.GetPspParam(), GetSelectedSaveDirName(), currentSelectedSave))
|
||||
param.GetPspParam()->result = 0;
|
||||
else
|
||||
param.GetPspParam()->result = SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_DATA;
|
||||
@@ -707,7 +812,7 @@ int PSPSaveDialog::Update()
|
||||
break;
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_SAVE: // Only save and exit
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_AUTOSAVE:
|
||||
if(param.Save(param.GetPspParam(),param.GetSelectedSave()))
|
||||
if(param.Save(param.GetPspParam(), GetSelectedSaveDirName()))
|
||||
param.GetPspParam()->result = 0;
|
||||
else
|
||||
param.GetPspParam()->result = SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_NOSPACE;
|
||||
@@ -774,7 +879,7 @@ int PSPSaveDialog::Update()
|
||||
break;
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_MAKEDATA:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_MAKEDATASECURE:
|
||||
if (param.Save(param.GetPspParam(), param.GetSelectedSave(), param.GetPspParam()->mode == SCE_UTILITY_SAVEDATA_TYPE_MAKEDATASECURE))
|
||||
if (param.Save(param.GetPspParam(), GetSelectedSaveDirName(), param.GetPspParam()->mode == SCE_UTILITY_SAVEDATA_TYPE_MAKEDATASECURE))
|
||||
param.GetPspParam()->result = 0;
|
||||
else
|
||||
param.GetPspParam()->result = SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA;
|
||||
@@ -782,7 +887,7 @@ int PSPSaveDialog::Update()
|
||||
break;
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_WRITEDATA:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_WRITEDATASECURE:
|
||||
if (param.Save(param.GetPspParam(), param.GetSelectedSave(), param.GetPspParam()->mode == SCE_UTILITY_SAVEDATA_TYPE_WRITEDATASECURE))
|
||||
if (param.Save(param.GetPspParam(), GetSelectedSaveDirName(), param.GetPspParam()->mode == SCE_UTILITY_SAVEDATA_TYPE_WRITEDATASECURE))
|
||||
param.GetPspParam()->result = 0;
|
||||
else
|
||||
param.GetPspParam()->result = SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA;
|
||||
@@ -790,7 +895,7 @@ int PSPSaveDialog::Update()
|
||||
break;
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_READDATA:
|
||||
case SCE_UTILITY_SAVEDATA_TYPE_READDATASECURE:
|
||||
if (param.Load(param.GetPspParam(), param.GetSelectedSave(), param.GetPspParam()->mode == SCE_UTILITY_SAVEDATA_TYPE_READDATASECURE))
|
||||
if (param.Load(param.GetPspParam(), GetSelectedSaveDirName(), currentSelectedSave, param.GetPspParam()->mode == SCE_UTILITY_SAVEDATA_TYPE_READDATASECURE))
|
||||
param.GetPspParam()->result = 0;
|
||||
else
|
||||
param.GetPspParam()->result = SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA; // not sure if correct code
|
||||
|
||||
@@ -82,17 +82,20 @@ private :
|
||||
void DisplaySaveDataInfo2();
|
||||
void DisplayConfirmationYesNo(std::string text);
|
||||
void DisplayInfo(std::string text);
|
||||
const std::string GetSelectedSaveDirName();
|
||||
|
||||
enum DisplayState
|
||||
{
|
||||
DS_NONE,
|
||||
|
||||
DS_SAVE_LIST_CHOICE,
|
||||
DS_SAVE_CONFIRM,
|
||||
DS_SAVE_CONFIRM_OVERWRITE,
|
||||
DS_SAVE_SAVING,
|
||||
DS_SAVE_DONE,
|
||||
|
||||
DS_LOAD_LIST_CHOICE,
|
||||
DS_LOAD_CONFIRM,
|
||||
DS_LOAD_LOADING,
|
||||
DS_LOAD_DONE,
|
||||
DS_LOAD_NODATA,
|
||||
@@ -108,7 +111,7 @@ private :
|
||||
|
||||
SavedataParam param;
|
||||
SceUtilitySavedataParam request;
|
||||
int requestAddr;
|
||||
u32 requestAddr;
|
||||
int currentSelectedSave;
|
||||
|
||||
int yesnoChoice;
|
||||
|
||||
@@ -173,26 +173,32 @@ std::string SavedataParam::GetSaveDirName(SceUtilitySavedataParam* param, int sa
|
||||
return dirName;
|
||||
}
|
||||
|
||||
std::string SavedataParam::GetSaveDir(SceUtilitySavedataParam* param, int saveId)
|
||||
std::string SavedataParam::GetSaveDir(SceUtilitySavedataParam* param, const std::string &saveDirName)
|
||||
{
|
||||
if (!param) {
|
||||
return "";
|
||||
}
|
||||
|
||||
std::string dirPath = GetGameName(param)+GetSaveName(param);
|
||||
if (saveId >= 0 && saveNameListDataCount > 0) // if user selection, use it
|
||||
dirPath = std::string(GetGameName(param))+GetFilename(saveId);
|
||||
return GetGameName(param) + saveDirName;
|
||||
}
|
||||
|
||||
return dirPath;
|
||||
std::string SavedataParam::GetSaveDir(SceUtilitySavedataParam* param, int saveId)
|
||||
{
|
||||
return GetSaveDir(param, GetSaveDirName(param, saveId));
|
||||
}
|
||||
|
||||
std::string SavedataParam::GetSaveFilePath(SceUtilitySavedataParam* param, const std::string &saveDir)
|
||||
{
|
||||
if (!param) {
|
||||
return "";
|
||||
}
|
||||
|
||||
return savePath + saveDir;
|
||||
}
|
||||
|
||||
std::string SavedataParam::GetSaveFilePath(SceUtilitySavedataParam* param, int saveId)
|
||||
{
|
||||
if (!param) {
|
||||
return "";
|
||||
}
|
||||
|
||||
return savePath + GetSaveDir(param,saveId);
|
||||
return GetSaveFilePath(param, GetSaveDir(param, saveId));
|
||||
}
|
||||
|
||||
std::string SavedataParam::GetGameName(SceUtilitySavedataParam* param)
|
||||
@@ -241,13 +247,13 @@ bool SavedataParam::Delete(SceUtilitySavedataParam* param, int saveId)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SavedataParam::Save(SceUtilitySavedataParam* param, int saveId, bool secureMode)
|
||||
bool SavedataParam::Save(SceUtilitySavedataParam* param, const std::string &saveDirName, bool secureMode)
|
||||
{
|
||||
if (!param) {
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string dirPath = GetSaveFilePath(param, saveId);
|
||||
std::string dirPath = GetSaveFilePath(param, GetSaveDir(param, saveDirName));
|
||||
|
||||
if (!pspFileSystem.GetFileInfo(dirPath).exists)
|
||||
pspFileSystem.MkDir(dirPath);
|
||||
@@ -307,7 +313,7 @@ bool SavedataParam::Save(SceUtilitySavedataParam* param, int saveId, bool secure
|
||||
sfoFile.SetValue("SAVEDATA_DETAIL",param->sfoParam.detail,1024);
|
||||
sfoFile.SetValue("PARENTAL_LEVEL",param->sfoParam.parentalLevel,4);
|
||||
sfoFile.SetValue("CATEGORY","MS",4);
|
||||
sfoFile.SetValue("SAVEDATA_DIRECTORY",GetSaveDir(param,saveId),64);
|
||||
sfoFile.SetValue("SAVEDATA_DIRECTORY", GetSaveDir(param, saveDirName), 64);
|
||||
|
||||
// For each file, 13 bytes for filename, 16 bytes for file hash (0 in PPSSPP), 3 byte for padding
|
||||
const int FILE_LIST_ITEM_SIZE = 13 + 16 + 3;
|
||||
@@ -384,7 +390,7 @@ bool SavedataParam::Save(SceUtilitySavedataParam* param, int saveId, bool secure
|
||||
INFO_LOG(HLE,"Saving file with size %u in %s",saveSize,filePath.c_str());
|
||||
|
||||
// copy back save name in request
|
||||
strncpy(param->saveName,GetSaveDirName(param, saveId).c_str(),20);
|
||||
strncpy(param->saveName, saveDirName.c_str(), 20);
|
||||
|
||||
if (!WritePSPFile(filePath, data_, saveSize))
|
||||
{
|
||||
@@ -446,7 +452,7 @@ bool SavedataParam::Save(SceUtilitySavedataParam* param, int saveId, bool secure
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SavedataParam::Load(SceUtilitySavedataParam *param, int saveId, bool secureMode)
|
||||
bool SavedataParam::Load(SceUtilitySavedataParam *param, const std::string &saveDirName, int saveId, bool secureMode)
|
||||
{
|
||||
if (!param) {
|
||||
return false;
|
||||
@@ -454,7 +460,7 @@ bool SavedataParam::Load(SceUtilitySavedataParam *param, int saveId, bool secure
|
||||
|
||||
u8 *data_ = (u8*)Memory::GetPointer(param->dataBuf);
|
||||
|
||||
std::string dirPath = GetSaveFilePath(param, saveId);
|
||||
std::string dirPath = GetSaveFilePath(param, GetSaveDir(param, saveDirName));
|
||||
if (saveId >= 0 && saveNameListDataCount > 0) // if user selection, use it
|
||||
{
|
||||
if (saveDataList[saveId].size == 0) // don't read no existing file
|
||||
@@ -476,7 +482,7 @@ bool SavedataParam::Load(SceUtilitySavedataParam *param, int saveId, bool secure
|
||||
saveSize = (int)readSize;
|
||||
|
||||
// copy back save name in request
|
||||
strncpy(param->saveName,GetSaveDirName(param, saveId).c_str(),20);
|
||||
strncpy(param->saveName, saveDirName.c_str(), 20);
|
||||
|
||||
ParamSFOData sfoFile;
|
||||
std::string sfopath = dirPath+"/"+sfoName;
|
||||
@@ -500,7 +506,7 @@ bool SavedataParam::Load(SceUtilitySavedataParam *param, int saveId, bool secure
|
||||
// Don't know what it is, but PSP always respond this and this unlock some game
|
||||
param->bind = 1021;
|
||||
|
||||
bool isCrypted = IsSaveEncrypted(param,saveId) && secureMode;
|
||||
bool isCrypted = IsSaveEncrypted(param, saveDirName) && secureMode;
|
||||
bool saveDone = false;
|
||||
if(isCrypted)// Try to decrypt
|
||||
{
|
||||
@@ -879,7 +885,7 @@ bool SavedataParam::GetFilesList(SceUtilitySavedataParam *param)
|
||||
PSPFileInfo info = pspFileSystem.GetFileInfo(filePath);
|
||||
if (info.exists)
|
||||
{
|
||||
bool isCrypted = IsSaveEncrypted(param,0);
|
||||
bool isCrypted = IsSaveEncrypted(param, GetSaveDirName(param, 0));
|
||||
Memory::Write_U32(0x21FF, curFileInfoAddr+0);
|
||||
if(isCrypted) // Crypted save are 16 bytes bigger
|
||||
Memory::Write_U64(info.size - 0x10, curFileInfoAddr+8);
|
||||
@@ -953,7 +959,7 @@ void SavedataParam::Clear()
|
||||
saveDataList = 0;
|
||||
saveDataListCount = 0;
|
||||
}
|
||||
if(noSaveIcon)
|
||||
if (noSaveIcon)
|
||||
{
|
||||
if(noSaveIcon->textureData != 0)
|
||||
kernelMemory.Free(noSaveIcon->textureData);
|
||||
@@ -1018,25 +1024,7 @@ int SavedataParam::SetPspParam(SceUtilitySavedataParam *param)
|
||||
{
|
||||
if (listEmptyFile)
|
||||
{
|
||||
saveDataList[realCount].size = 0;
|
||||
saveDataList[realCount].saveName = saveNameListData[i];
|
||||
saveDataList[realCount].idx = i;
|
||||
saveDataList[realCount].textureData = 0;
|
||||
|
||||
if(Memory::IsValidAddress(param->newData))
|
||||
{
|
||||
// We have a png to show
|
||||
if(!noSaveIcon)
|
||||
{
|
||||
noSaveIcon = new SaveFileInfo();
|
||||
PspUtilitySavedataFileData newData;
|
||||
Memory::ReadStruct(param->newData, &newData);
|
||||
CreatePNGIcon(Memory::GetPointer(newData.buf), (int)newData.size, *noSaveIcon);
|
||||
}
|
||||
saveDataList[realCount].textureData = noSaveIcon->textureData;
|
||||
saveDataList[realCount].textureWidth = noSaveIcon->textureWidth;
|
||||
saveDataList[realCount].textureHeight = noSaveIcon->textureHeight;
|
||||
}
|
||||
ClearFileInfo(saveDataList[realCount], saveNameListData[i]);
|
||||
DEBUG_LOG(HLE,"Don't Exist");
|
||||
realCount++;
|
||||
}
|
||||
@@ -1060,7 +1048,7 @@ int SavedataParam::SetPspParam(SceUtilitySavedataParam *param)
|
||||
PSPFileInfo info = pspFileSystem.GetFileInfo(fileDataPath);
|
||||
if (info.exists)
|
||||
{
|
||||
SetFileInfo(0, info, GetSaveName(pspParam));
|
||||
SetFileInfo(0, info, GetSaveName(param));
|
||||
|
||||
DEBUG_LOG(HLE,"%s Exist",fileDataPath.c_str());
|
||||
saveNameListDataCount = 1;
|
||||
@@ -1069,25 +1057,7 @@ int SavedataParam::SetPspParam(SceUtilitySavedataParam *param)
|
||||
{
|
||||
if (listEmptyFile)
|
||||
{
|
||||
saveDataList[0].size = 0;
|
||||
saveDataList[0].saveName = GetSaveName(param);
|
||||
saveDataList[0].idx = 0;
|
||||
saveDataList[0].textureData = 0;
|
||||
|
||||
if(Memory::IsValidAddress(param->newData))
|
||||
{
|
||||
// We have a png to show
|
||||
if(!noSaveIcon)
|
||||
{
|
||||
noSaveIcon = new SaveFileInfo();
|
||||
PspUtilitySavedataFileData newData;
|
||||
Memory::ReadStruct(param->newData, &newData);
|
||||
CreatePNGIcon(Memory::GetPointer(newData.buf), (int)newData.size, *noSaveIcon);
|
||||
}
|
||||
saveDataList[0].textureData = noSaveIcon->textureData;
|
||||
saveDataList[0].textureWidth = noSaveIcon->textureWidth;
|
||||
saveDataList[0].textureHeight = noSaveIcon->textureHeight;
|
||||
}
|
||||
ClearFileInfo(saveDataList[0], GetSaveName(param));
|
||||
DEBUG_LOG(HLE,"Don't Exist");
|
||||
}
|
||||
saveNameListDataCount = 0;
|
||||
@@ -1124,18 +1094,18 @@ bool SavedataParam::CreatePNGIcon(u8* pngData, int pngSize, SaveFileInfo& info)
|
||||
return true;
|
||||
}
|
||||
|
||||
void SavedataParam::SetFileInfo(int idx, PSPFileInfo &info, std::string saveName)
|
||||
void SavedataParam::SetFileInfo(SaveFileInfo &saveInfo, PSPFileInfo &info, std::string saveName)
|
||||
{
|
||||
saveDataList[idx].size = info.size;
|
||||
saveDataList[idx].saveName = saveName;
|
||||
saveDataList[idx].idx = 0;
|
||||
saveDataList[idx].modif_time = info.mtime;
|
||||
saveInfo.size = info.size;
|
||||
saveInfo.saveName = saveName;
|
||||
saveInfo.idx = 0;
|
||||
saveInfo.modif_time = info.mtime;
|
||||
|
||||
// Start with a blank slate.
|
||||
saveDataList[idx].textureData = 0;
|
||||
saveDataList[idx].title[0] = 0;
|
||||
saveDataList[idx].saveTitle[0] = 0;
|
||||
saveDataList[idx].saveDetail[0] = 0;
|
||||
saveInfo.textureData = 0;
|
||||
saveInfo.title[0] = 0;
|
||||
saveInfo.saveTitle[0] = 0;
|
||||
saveInfo.saveDetail[0] = 0;
|
||||
|
||||
// Search save image icon0
|
||||
// TODO : If icon0 don't exist, need to use icon1 which is a moving icon. Also play sound
|
||||
@@ -1145,7 +1115,7 @@ void SavedataParam::SetFileInfo(int idx, PSPFileInfo &info, std::string saveName
|
||||
{
|
||||
u8 *textureDataPNG = new u8[(size_t)info2.size];
|
||||
ReadPSPFile(fileDataPath2, &textureDataPNG, info2.size, NULL);
|
||||
CreatePNGIcon(textureDataPNG, (int)info2.size, saveDataList[idx]);
|
||||
CreatePNGIcon(textureDataPNG, (int)info2.size, saveInfo);
|
||||
delete[] textureDataPNG;
|
||||
}
|
||||
|
||||
@@ -1159,14 +1129,43 @@ void SavedataParam::SetFileInfo(int idx, PSPFileInfo &info, std::string saveName
|
||||
ParamSFOData sfoFile;
|
||||
if (sfoFile.ReadSFO(sfoParam,(size_t)info2.size))
|
||||
{
|
||||
SetStringFromSFO(sfoFile, "TITLE", saveDataList[idx].title, sizeof(saveDataList[idx].title));
|
||||
SetStringFromSFO(sfoFile, "SAVEDATA_TITLE", saveDataList[idx].saveTitle, sizeof(saveDataList[idx].saveTitle));
|
||||
SetStringFromSFO(sfoFile, "SAVEDATA_DETAIL", saveDataList[idx].saveDetail, sizeof(saveDataList[idx].saveDetail));
|
||||
SetStringFromSFO(sfoFile, "TITLE", saveInfo.title, sizeof(saveInfo.title));
|
||||
SetStringFromSFO(sfoFile, "SAVEDATA_TITLE", saveInfo.saveTitle, sizeof(saveInfo.saveTitle));
|
||||
SetStringFromSFO(sfoFile, "SAVEDATA_DETAIL", saveInfo.saveDetail, sizeof(saveInfo.saveDetail));
|
||||
}
|
||||
delete [] sfoParam;
|
||||
}
|
||||
}
|
||||
|
||||
void SavedataParam::SetFileInfo(int idx, PSPFileInfo &info, std::string saveName)
|
||||
{
|
||||
SetFileInfo(saveDataList[idx], info, saveName);
|
||||
saveDataList[idx].idx = idx;
|
||||
}
|
||||
|
||||
void SavedataParam::ClearFileInfo(SaveFileInfo &saveInfo, std::string saveName)
|
||||
{
|
||||
saveInfo.size = 0;
|
||||
saveInfo.saveName = saveName;
|
||||
saveInfo.idx = 0;
|
||||
saveInfo.textureData = 0;
|
||||
|
||||
if (Memory::IsValidAddress(GetPspParam()->newData))
|
||||
{
|
||||
// We have a png to show
|
||||
if (!noSaveIcon)
|
||||
{
|
||||
noSaveIcon = new SaveFileInfo();
|
||||
PspUtilitySavedataFileData newData;
|
||||
Memory::ReadStruct(GetPspParam()->newData, &newData);
|
||||
CreatePNGIcon(Memory::GetPointer(newData.buf), (int)newData.size, *noSaveIcon);
|
||||
}
|
||||
saveInfo.textureData = noSaveIcon->textureData;
|
||||
saveInfo.textureWidth = noSaveIcon->textureWidth;
|
||||
saveInfo.textureHeight = noSaveIcon->textureHeight;
|
||||
}
|
||||
}
|
||||
|
||||
SceUtilitySavedataParam* SavedataParam::GetPspParam()
|
||||
{
|
||||
return pspParam;
|
||||
@@ -1219,13 +1218,12 @@ void SavedataParam::DoState(PointerWrap &p)
|
||||
p.DoMarker("SavedataParam");
|
||||
}
|
||||
|
||||
bool SavedataParam::IsSaveEncrypted(SceUtilitySavedataParam* param, int saveId)
|
||||
bool SavedataParam::IsSaveEncrypted(SceUtilitySavedataParam* param, const std::string &saveDirName)
|
||||
{
|
||||
|
||||
bool isCrypted = false;
|
||||
|
||||
ParamSFOData sfoFile;
|
||||
std::string dirPath = GetSaveFilePath(param, saveId);
|
||||
std::string dirPath = GetSaveFilePath(param, GetSaveDir(param, saveDirName));
|
||||
std::string sfopath = dirPath+"/"+sfoName;
|
||||
PSPFileInfo sfoInfo = pspFileSystem.GetFileInfo(sfopath);
|
||||
if(sfoInfo.exists) // Read sfo
|
||||
|
||||
@@ -110,7 +110,7 @@ struct SceUtilitySavedataParam
|
||||
char unused[3];
|
||||
/** saveName: name of the particular save, normally a number */
|
||||
char saveName[20];
|
||||
int saveNameList;
|
||||
u32 saveNameList;
|
||||
/** fileName: name of the data file of the game for example DATA.BIN */
|
||||
char fileName[13];
|
||||
char unused2[3];
|
||||
@@ -128,7 +128,7 @@ struct SceUtilitySavedataParam
|
||||
PspUtilitySavedataFileData pic1FileData;
|
||||
PspUtilitySavedataFileData snd0FileData;
|
||||
|
||||
int newData;
|
||||
u32 newData;
|
||||
int focus;
|
||||
int abortStatus;
|
||||
|
||||
@@ -194,16 +194,18 @@ public:
|
||||
|
||||
static void Init();
|
||||
std::string GetSaveFilePath(SceUtilitySavedataParam* param, int saveId = -1);
|
||||
std::string GetSaveFilePath(SceUtilitySavedataParam* param, const std::string &saveDir);
|
||||
std::string GetSaveDirName(SceUtilitySavedataParam* param, int saveId = -1);
|
||||
std::string GetSaveDir(SceUtilitySavedataParam* param, int saveId = -1);
|
||||
std::string GetSaveDir(SceUtilitySavedataParam* param, const std::string &saveDirName);
|
||||
bool Delete(SceUtilitySavedataParam* param, int saveId = -1);
|
||||
bool Save(SceUtilitySavedataParam* param, int saveId = -1, bool secureMode = true);
|
||||
bool Load(SceUtilitySavedataParam* param, int saveId = -1, bool secureMode = true);
|
||||
bool Save(SceUtilitySavedataParam* param, const std::string &saveDirName, bool secureMode = true);
|
||||
bool Load(SceUtilitySavedataParam* param, const std::string &saveDirName, int saveId = -1, bool secureMode = true);
|
||||
bool GetSizes(SceUtilitySavedataParam* param);
|
||||
bool GetList(SceUtilitySavedataParam* param);
|
||||
bool GetFilesList(SceUtilitySavedataParam* param);
|
||||
bool GetSize(SceUtilitySavedataParam* param);
|
||||
bool IsSaveEncrypted(SceUtilitySavedataParam* param, int saveId);
|
||||
bool IsSaveEncrypted(SceUtilitySavedataParam* param, const std::string &saveDirName);
|
||||
|
||||
std::string GetGameName(SceUtilitySavedataParam* param);
|
||||
std::string GetSaveName(SceUtilitySavedataParam* param);
|
||||
@@ -227,6 +229,8 @@ private:
|
||||
void Clear();
|
||||
bool CreatePNGIcon(u8* pngData, int pngSize, SaveFileInfo& info);
|
||||
void SetFileInfo(int idx, PSPFileInfo &info, std::string saveName);
|
||||
void SetFileInfo(SaveFileInfo &saveInfo, PSPFileInfo &info, std::string saveName);
|
||||
void ClearFileInfo(SaveFileInfo &saveInfo, std::string saveName);
|
||||
|
||||
int DecryptSave(unsigned int mode, unsigned char *data, int *dataLen, int *alignedLen, unsigned char *cryptkey);
|
||||
int EncryptData(unsigned int mode, unsigned char *data, int *dataLen, int *alignedLen, unsigned char *hash, unsigned char *cryptkey);
|
||||
@@ -235,8 +239,8 @@ private:
|
||||
|
||||
SceUtilitySavedataParam* pspParam;
|
||||
int selectedSave;
|
||||
SaveFileInfo* saveDataList;
|
||||
SaveFileInfo* noSaveIcon;
|
||||
SaveFileInfo *saveDataList;
|
||||
SaveFileInfo *noSaveIcon;
|
||||
int saveDataListCount;
|
||||
int saveNameListDataCount;
|
||||
};
|
||||
Reference in new issue
Block a user