PSPSaveDialog: Style/warning fixes. Add a way to return errors (unused).

Core/Dialog/PSPSaveDialog.cpp

@@ -31,19 +31,17 @@ PSPSaveDialog::PSPSaveDialog()
 PSPSaveDialog::~PSPSaveDialog() {
 }
 
-void PSPSaveDialog::Init(int paramAddr)
+u32 PSPSaveDialog::Init(int paramAddr)
 {
 	// Ignore if already running
 	if (status != SCE_UTILITY_STATUS_NONE && status != SCE_UTILITY_STATUS_SHUTDOWN)
 	{
-		return;
+		return 0;
 	}
-	param.SetPspParam((SceUtilitySavedataParam*)Memory::GetPointer(paramAddr));
-
-	DEBUG_LOG(HLE,"sceUtilitySavedataInitStart(%08x)", paramAddr);
+	u32 retval = param.SetPspParam((SceUtilitySavedataParam*)Memory::GetPointer(paramAddr));
 	DEBUG_LOG(HLE,"Mode: %i", param.GetPspParam()->mode);
 
-	switch(param.GetPspParam()->mode)
+	switch (param.GetPspParam()->mode)
 	{
 		case SCE_UTILITY_SAVEDATA_TYPE_AUTOLOAD:
 		case SCE_UTILITY_SAVEDATA_TYPE_LOAD:
@@ -85,12 +83,12 @@ void PSPSaveDialog::Init(int paramAddr)
 			ERROR_LOG(HLE, "Load/Save function %d not coded. Title: %s Save: %s File: %s", param.GetPspParam()->mode, param.GetGameName(param.GetPspParam()).c_str(), param.GetGameName(param.GetPspParam()).c_str(), param.GetFileName(param.GetPspParam()).c_str());
 			param.GetPspParam()->result = 0;
 			display = DS_NONE;
-			return; // Return 0 should allow the game to continue, but missing function must be implemented and returning the right value or the game can block.
+			return 0; // Return 0 should allow the game to continue, but missing function must be implemented and returning the right value or the game can block.
 		}
 		break;
 	}
 
-	status = SCE_UTILITY_STATUS_INITIALIZE;
+	status = (int)retval < 0 ? SCE_UTILITY_STATUS_SHUTDOWN : SCE_UTILITY_STATUS_INITIALIZE;
 
 	currentSelectedSave = 0;
 	lastButtons = __CtrlPeekButtons();
@@ -126,7 +124,7 @@ void PSPSaveDialog::Init(int paramAddr)
 
 	INFO_LOG(HLE,"snd0 data : %08x",*((unsigned int*)&param.GetPspParam()->snd0FileData.buf));
 	INFO_LOG(HLE,"snd0 size : %u",param.GetPspParam()->snd0FileData.bufSize);*/
-
+	return retval;
 }
 
 void PSPSaveDialog::DisplaySaveList(bool canMove)
@@ -142,16 +140,16 @@ void PSPSaveDialog::DisplaySaveList(bool canMove)
 		}
 
 		// Calc save image position on screen
-		int w = 150;
-		int h = 80;
-		int x = 20;
+		float w = 150;
+		float h = 80;
+		float x = 20;
 		if(displayCount != currentSelectedSave)
 		{
 			w = 80;
 			h = 40;
 			x = 50;
 		}
-		int y = 80;
+		float y = 80;
 		if(displayCount < currentSelectedSave)
 			y -= 50 * (currentSelectedSave - displayCount);
 		else if(displayCount > currentSelectedSave)
@@ -199,10 +197,10 @@ void PSPSaveDialog::DisplaySaveIcon()
 	}
 
 	// Calc save image position on screen
-	int w = 150;
-	int h = 80;
-	int x = 20;
-	int y = 80;
+	float w = 150;
+	float h = 80;
+	float x = 20;
+	float y = 80;
 
 	int tw = 256;
 	int th = 256;

Core/Dialog/PSPSaveDialog.h

@@ -62,7 +62,7 @@ public:
 	PSPSaveDialog();
 	virtual ~PSPSaveDialog();
 
-	virtual void Init(int paramAddr);
+	virtual u32 Init(int paramAddr);
 	virtual void Update();
 	void Shutdown();
 

Core/Dialog/SavedataParam.cpp

@@ -20,6 +20,7 @@
 #include "image/png_load.h"
 #include "../HLE/sceKernelMemory.h"
 #include "../ELF/ParamSFO.h"
+#include "PSPSaveDialog.h"
 
 std::string icon0Name = "ICON0.PNG";
 std::string icon1Name = "ICON1.PMF";
@@ -41,7 +42,7 @@ SavedataParam::SavedataParam()
 
 void SavedataParam::Init()
 {
-	if(!pspFileSystem.GetFileInfo(savePath).exists)
+	if (!pspFileSystem.GetFileInfo(savePath).exists)
 	{
 		pspFileSystem.MkDir(savePath);
 	}
@@ -54,7 +55,7 @@ std::string SavedataParam::GetSaveDir(SceUtilitySavedataParam* param, int saveId
 	}
 
 	std::string dirPath = GetGameName(param)+GetSaveName(param);
-	if(saveId >= 0 && saveNameListDataCount > 0) // if user selection, use it
+	if (saveId >= 0 && saveNameListDataCount > 0) // if user selection, use it
 		dirPath = std::string(GetGameName(param))+GetFilename(saveId);
 
 	return dirPath;
@@ -101,9 +102,9 @@ bool SavedataParam::Delete(SceUtilitySavedataParam* param, int saveId)
 	}
 
 	std::string dirPath = GetSaveFilePath(param,saveId);
-	if(saveId >= 0 && saveNameListDataCount > 0) // if user selection, use it
+	if (saveId >= 0 && saveNameListDataCount > 0) // if user selection, use it
 	{
-		if(saveDataList[saveId].size == 0) // don't delete no existing file
+		if (saveDataList[saveId].size == 0) // don't delete no existing file
 		{
 			return false;
 		}
@@ -119,22 +120,22 @@ bool SavedataParam::Save(SceUtilitySavedataParam* param, int saveId)
 		return false;
 	}
 
-	u8* data_ = (u8*)Memory::GetPointer(*((unsigned int*)&param->dataBuf));
+	u8 *data_ = (u8*)Memory::GetPointer(*((unsigned int*)&param->dataBuf));
 
 	std::string dirPath = GetSaveFilePath(param, saveId);
 
-	if(!pspFileSystem.GetFileInfo(dirPath).exists)
+	if (!pspFileSystem.GetFileInfo(dirPath).exists)
 		pspFileSystem.MkDir(dirPath);
 
 	std::string filePath = dirPath+"/"+GetFileName(param);
 	INFO_LOG(HLE,"Saving file with size %u in %s",param->dataBufSize,filePath.c_str());
 	unsigned int handle = pspFileSystem.OpenFile(filePath,(FileAccess)(FILEACCESS_WRITE | FILEACCESS_CREATE));
-	if(handle == 0)
+	if (handle == 0)
 	{
 		ERROR_LOG(HLE,"Error opening file %s",filePath.c_str());
 		return false;
 	}
-	if(!pspFileSystem.WriteFile(handle, data_, param->dataBufSize))
+	if (!pspFileSystem.WriteFile(handle, data_, param->dataBufSize))
 	{
 		pspFileSystem.CloseFile(handle);
 		ERROR_LOG(HLE,"Error writing file %s",filePath.c_str());
@@ -154,12 +155,12 @@ bool SavedataParam::Save(SceUtilitySavedataParam* param, int saveId)
 		sfoFile.SetValue("SAVEDATA_DIRECTORY",GetSaveDir(param,saveId),64);
 		sfoFile.SetValue("SAVEDATA_FILE_LIST","",3168); // This need to be filed with the save filename and a hash
 		sfoFile.SetValue("SAVEDATA_PARAMS","",128); // This need to be filled with a hash of the save file encrypted.
-		u8* sfoData;
+		u8 *sfoData;
 		size_t sfoSize;
 		sfoFile.WriteSFO(&sfoData,&sfoSize);
 		std::string sfopath = dirPath+"/"+sfoName;
 		handle = pspFileSystem.OpenFile(sfopath,(FileAccess)(FILEACCESS_WRITE | FILEACCESS_CREATE));
-		if(handle)
+		if (handle)
 		{
 			pspFileSystem.WriteFile(handle, sfoData, sfoSize);
 			pspFileSystem.CloseFile(handle);
@@ -167,36 +168,36 @@ bool SavedataParam::Save(SceUtilitySavedataParam* param, int saveId)
 		delete[] sfoData;
 
 		// SAVE ICON0
-		if(param->icon0FileData.buf)
+		if (param->icon0FileData.buf)
 		{
 			data_ = (u8*)Memory::GetPointer(*((unsigned int*)&param->icon0FileData.buf));
 			std::string icon0path = dirPath+"/"+icon0Name;
 			handle = pspFileSystem.OpenFile(icon0path,(FileAccess)(FILEACCESS_WRITE | FILEACCESS_CREATE));
-			if(handle)
+			if (handle)
 			{
 				pspFileSystem.WriteFile(handle, data_, param->icon0FileData.bufSize);
 				pspFileSystem.CloseFile(handle);
 			}
 		}
 		// SAVE ICON1
-		if(param->icon1FileData.buf)
+		if (param->icon1FileData.buf)
 		{
 			data_ = (u8*)Memory::GetPointer(*((unsigned int*)&param->icon1FileData.buf));
 			std::string icon1path = dirPath+"/"+icon1Name;
 			handle = pspFileSystem.OpenFile(icon1path,(FileAccess)(FILEACCESS_WRITE | FILEACCESS_CREATE));
-			if(handle)
+			if (handle)
 			{
 				pspFileSystem.WriteFile(handle, data_, param->icon1FileData.bufSize);
 				pspFileSystem.CloseFile(handle);
 			}
 		}
 		// SAVE PIC1
-		if(param->pic1FileData.buf)
+		if (param->pic1FileData.buf)
 		{
 			data_ = (u8*)Memory::GetPointer(*((unsigned int*)&param->pic1FileData.buf));
 			std::string pic1path = dirPath+"/"+pic1Name;
 			handle = pspFileSystem.OpenFile(pic1path,(FileAccess)(FILEACCESS_WRITE | FILEACCESS_CREATE));
-			if(handle)
+			if (handle)
 			{
 				pspFileSystem.WriteFile(handle, data_, param->pic1FileData.bufSize);
 				pspFileSystem.CloseFile(handle);
@@ -204,12 +205,12 @@ bool SavedataParam::Save(SceUtilitySavedataParam* param, int saveId)
 		}
 
 		// Save SND
-		if(param->snd0FileData.buf)
+		if (param->snd0FileData.buf)
 		{
 			data_ = (u8*)Memory::GetPointer(*((unsigned int*)&param->snd0FileData.buf));
 			std::string snd0path = dirPath+"/"+snd0Name;
 			handle = pspFileSystem.OpenFile(snd0path,(FileAccess)(FILEACCESS_WRITE | FILEACCESS_CREATE));
-			if(handle)
+			if (handle)
 			{
 				pspFileSystem.WriteFile(handle, data_, param->snd0FileData.bufSize);
 				pspFileSystem.CloseFile(handle);
@@ -219,18 +220,18 @@ bool SavedataParam::Save(SceUtilitySavedataParam* param, int saveId)
 	return true;
 }
 
-bool SavedataParam::Load(SceUtilitySavedataParam* param, int saveId)
+bool SavedataParam::Load(SceUtilitySavedataParam *param, int saveId)
 {
 	if (!param) {
 		return false;
 	}
 
-	u8* data_ = (u8*)Memory::GetPointer(*((unsigned int*)&param->dataBuf));
+	u8 *data_ = (u8*)Memory::GetPointer(*((unsigned int*)&param->dataBuf));
 
 	std::string dirPath = GetSaveFilePath(param, saveId);
-	if(saveId >= 0 && saveNameListDataCount > 0) // if user selection, use it
+	if (saveId >= 0 && saveNameListDataCount > 0) // if user selection, use it
 	{
-		if(saveDataList[saveId].size == 0) // don't read no existing file
+		if (saveDataList[saveId].size == 0) // don't read no existing file
 		{
 			return false;
 		}
@@ -239,12 +240,12 @@ bool SavedataParam::Load(SceUtilitySavedataParam* param, int saveId)
 	std::string filePath = dirPath+"/"+GetFileName(param);
 	INFO_LOG(HLE,"Loading file with size %u in %s",param->dataBufSize,filePath.c_str());
 	u32 handle = pspFileSystem.OpenFile(filePath,FILEACCESS_READ);
-	if(!handle)
+	if (!handle)
 	{
 		ERROR_LOG(HLE,"Error opening file %s",filePath.c_str());
 		return false;
 	}
-	if(!pspFileSystem.ReadFile(handle, data_, param->dataBufSize))
+	if (!pspFileSystem.ReadFile(handle, data_, param->dataBufSize))
 	{
 		pspFileSystem.CloseFile(handle);
 		ERROR_LOG(HLE,"Error reading file %s",filePath.c_str());
@@ -254,20 +255,20 @@ bool SavedataParam::Load(SceUtilitySavedataParam* param, int saveId)
 	return true;
 }
 
-bool SavedataParam::GetSizes(SceUtilitySavedataParam* param)
+bool SavedataParam::GetSizes(SceUtilitySavedataParam *param)
 {
 	if (!param) {
 		return false;
 	}
 
-	if(Memory::IsValidAddress(param->msFree))
+	if (Memory::IsValidAddress(param->msFree))
 	{
 		Memory::Write_U32(32768,param->msFree);
 		Memory::Write_U32(32768,param->msFree+4);
 		Memory::Write_U32(1048576,param->msFree+8);
 		Memory::Write_U8(0,param->msFree+12);
 	}
-	if(Memory::IsValidAddress(param->msData))
+	if (Memory::IsValidAddress(param->msData))
 	{
 		Memory::Write_U32(0,param->msData+36);
 		Memory::Write_U32(0,param->msData+40);
@@ -275,7 +276,7 @@ bool SavedataParam::GetSizes(SceUtilitySavedataParam* param)
 		Memory::Write_U32(0,param->msData+52);
 		Memory::Write_U8(0,param->msData+56);
 	}
-	if(Memory::IsValidAddress(param->utilityData))
+	if (Memory::IsValidAddress(param->utilityData))
 	{
 		Memory::Write_U32(13,param->utilityData);
 		Memory::Write_U32(416,param->utilityData+4);
@@ -287,13 +288,13 @@ bool SavedataParam::GetSizes(SceUtilitySavedataParam* param)
 
 }
 
-bool SavedataParam::GetList(SceUtilitySavedataParam* param)
+bool SavedataParam::GetList(SceUtilitySavedataParam *param)
 {
 	if (!param) {
 		return false;
 	}
 
-	if(Memory::IsValidAddress(param->idListAddr))
+	if (Memory::IsValidAddress(param->idListAddr))
 	{
 		Memory::Write_U32(0,param->idListAddr+4);
 	}
@@ -302,11 +303,11 @@ bool SavedataParam::GetList(SceUtilitySavedataParam* param)
 
 void SavedataParam::Clear()
 {
-	if(saveDataList)
+	if (saveDataList)
 	{
-		for(int i = 0; i < saveNameListDataCount; i++)
+		for (int i = 0; i < saveNameListDataCount; i++)
 		{
-			if(saveDataList[i].textureData != 0)
+			if (saveDataList[i].textureData != 0)
 				kernelMemory.Free(saveDataList[i].textureData);
 			saveDataList[i].textureData = 0;
 		}
@@ -316,23 +317,23 @@ void SavedataParam::Clear()
 	}
 }
 
-void SavedataParam::SetPspParam(SceUtilitySavedataParam* param)
+u32 SavedataParam::SetPspParam(SceUtilitySavedataParam *param)
 {
 	pspParam = param;
-	if(!pspParam)
+	if (!pspParam)
 	{
 		Clear();
-		return;
+		return 0;
 	}
 
 	bool listEmptyFile = true;
-	if(param->mode == SCE_UTILITY_SAVEDATA_TYPE_LISTLOAD ||
+	if (param->mode == SCE_UTILITY_SAVEDATA_TYPE_LISTLOAD ||
 			param->mode == SCE_UTILITY_SAVEDATA_TYPE_LISTDELETE)
 	{
 		listEmptyFile = false;
 	}
 
-	if(param->saveNameList != 0)
+	if (param->saveNameList != 0)
 	{
 		saveNameListData = (char(*)[20])Memory::GetPointer(param->saveNameList);
 
@@ -348,13 +349,13 @@ void SavedataParam::SetPspParam(SceUtilitySavedataParam* param)
 
 		// get and stock file info for each file
 		int realCount = 0;
-		for(int i = 0; i <count; i++)
+		for (int i = 0; i < count; i++)
 		{
 			DEBUG_LOG(HLE,"Name : %s",saveNameListData[i]);
 
 			std::string fileDataPath = savePath+GetGameName(param)+saveNameListData[i]+"/"+param->fileName;
 			PSPFileInfo info = pspFileSystem.GetFileInfo(fileDataPath);
-			if(info.exists)
+			if (info.exists)
 			{
 				saveDataList[realCount].size = info.size;
 				saveDataList[realCount].saveName = saveNameListData[i];
@@ -365,15 +366,15 @@ void SavedataParam::SetPspParam(SceUtilitySavedataParam* param)
 				// TODO : If icon0 don't exist, need to use icon1 which is a moving icon. Also play sound
 				std::string fileDataPath2 = savePath+GetGameName(param)+saveNameListData[i]+"/"+icon0Name;
 				PSPFileInfo info2 = pspFileSystem.GetFileInfo(fileDataPath2);
-				if(info2.exists)
+				if (info2.exists)
 				{
-					u8* textureDataPNG = new u8[info2.size];
+					u8 *textureDataPNG = new u8[(size_t)info2.size];
 					int handle = pspFileSystem.OpenFile(fileDataPath2,FILEACCESS_READ);
 					pspFileSystem.ReadFile(handle,textureDataPNG,info2.size);
 					pspFileSystem.CloseFile(handle);
 					unsigned char* textureData;
 					int w,h;
-					pngLoadPtr(textureDataPNG, info2.size, &w, &h, &textureData, false);
+					pngLoadPtr(textureDataPNG, (int)info2.size, &w, &h, &textureData, false);
 					delete[] textureDataPNG;
 					u32 texSize = w*h*4;
 					u32 atlasPtr = kernelMemory.Alloc(texSize, true, "SaveData Icon");
@@ -391,14 +392,14 @@ void SavedataParam::SetPspParam(SceUtilitySavedataParam* param)
 				// Load info in PARAM.SFO
 				fileDataPath2 = savePath+GetGameName(param)+saveNameListData[i]+"/"+sfoName;
 				info2 = pspFileSystem.GetFileInfo(fileDataPath2);
-				if(info2.exists)
+				if (info2.exists)
 				{
-					u8* sfoParam = new u8[info2.size];
+					u8 *sfoParam = new u8[(size_t)info2.size];
 					int handle = pspFileSystem.OpenFile(fileDataPath2,FILEACCESS_READ);
 					pspFileSystem.ReadFile(handle,sfoParam,info2.size);
 					pspFileSystem.CloseFile(handle);
 					ParamSFOData sfoFile;
-					if(sfoFile.ReadSFO(sfoParam,info2.size))
+					if (sfoFile.ReadSFO(sfoParam, (size_t)info2.size))
 					{
 						std::string title = sfoFile.GetValueString("TITLE");
 						memcpy(saveDataList[realCount].title,title.c_str(),title.size());
@@ -420,7 +421,7 @@ void SavedataParam::SetPspParam(SceUtilitySavedataParam* param)
 			}
 			else
 			{
-				if(listEmptyFile)
+				if (listEmptyFile)
 				{
 					saveDataList[realCount].size = 0;
 					saveDataList[realCount].saveName = saveNameListData[i];
@@ -445,7 +446,7 @@ void SavedataParam::SetPspParam(SceUtilitySavedataParam* param)
 
 		std::string fileDataPath = savePath+GetGameName(param)+GetSaveName(param)+"/"+param->fileName;
 		PSPFileInfo info = pspFileSystem.GetFileInfo(fileDataPath);
-		if(info.exists)
+		if (info.exists)
 		{
 			saveDataList[0].size = info.size;
 			saveDataList[0].saveName = GetSaveName(param);
@@ -456,15 +457,15 @@ void SavedataParam::SetPspParam(SceUtilitySavedataParam* param)
 			// TODO : If icon0 don't exist, need to use icon1 which is a moving icon. Also play sound
 			std::string fileDataPath2 = savePath+GetGameName(param)+GetSaveName(param)+"/"+icon0Name;
 			PSPFileInfo info2 = pspFileSystem.GetFileInfo(fileDataPath2);
-			if(info2.exists)
+			if (info2.exists)
 			{
-				u8* textureDataPNG = new u8[info2.size];
+				u8 *textureDataPNG = new u8[(size_t)info2.size];
 				int handle = pspFileSystem.OpenFile(fileDataPath2,FILEACCESS_READ);
 				pspFileSystem.ReadFile(handle,textureDataPNG,info2.size);
 				pspFileSystem.CloseFile(handle);
-				unsigned char* textureData;
+				unsigned char *textureData;
 				int w,h;
-				pngLoadPtr(textureDataPNG, info2.size, &w, &h, &textureData, false);
+				pngLoadPtr(textureDataPNG, (int)info2.size, &w, &h, &textureData, false);
 				delete[] textureDataPNG;
 				u32 texSize = w*h*4;
 				u32 atlasPtr = kernelMemory.Alloc(texSize, true, "SaveData Icon");
@@ -482,14 +483,14 @@ void SavedataParam::SetPspParam(SceUtilitySavedataParam* param)
 			// Load info in PARAM.SFO
 			fileDataPath2 = savePath+GetGameName(param)+GetSaveName(param)+"/"+sfoName;
 			info2 = pspFileSystem.GetFileInfo(fileDataPath2);
-			if(info2.exists)
+			if (info2.exists)
 			{
-				u8* sfoParam = new u8[info2.size];
+				u8 *sfoParam = new u8[(size_t)info2.size];
 				int handle = pspFileSystem.OpenFile(fileDataPath2,FILEACCESS_READ);
 				pspFileSystem.ReadFile(handle,sfoParam,info2.size);
 				pspFileSystem.CloseFile(handle);
 				ParamSFOData sfoFile;
-				if(sfoFile.ReadSFO(sfoParam,info2.size))
+				if (sfoFile.ReadSFO(sfoParam,(size_t)info2.size))
 				{
 					std::string title = sfoFile.GetValueString("TITLE");
 					memcpy(saveDataList[0].title,title.c_str(),title.size());
@@ -511,7 +512,7 @@ void SavedataParam::SetPspParam(SceUtilitySavedataParam* param)
 		}
 		else
 		{
-			if(listEmptyFile)
+			if (listEmptyFile)
 			{
 				saveDataList[0].size = 0;
 				saveDataList[0].saveName = GetSaveName(param);
@@ -520,8 +521,10 @@ void SavedataParam::SetPspParam(SceUtilitySavedataParam* param)
 				DEBUG_LOG(HLE,"Don't Exist");
 			}
 			saveNameListDataCount = 0;
+			return 0;
 		}
 	}
+	return 0;
 }
 
 SceUtilitySavedataParam* SavedataParam::GetPspParam()
@@ -547,8 +550,8 @@ int SavedataParam::GetSelectedSave()
 {
 	return selectedSave;
 }
+
 void SavedataParam::SetSelectedSave(int idx)
 {
 	selectedSave = idx;
 }
-

Core/Dialog/SavedataParam.h

@@ -118,9 +118,10 @@ struct SceUtilitySavedataParam
 
 };
 
+// Non native, this one we can reorganize as we like
 struct SaveFileInfo
 {
-	int size;
+	s64 size;
 	std::string saveName;
 	int idx;
 
@@ -153,7 +154,7 @@ public:
 
 	SavedataParam();
 
-	void SetPspParam(SceUtilitySavedataParam* param);
+	u32 SetPspParam(SceUtilitySavedataParam* param);
 	SceUtilitySavedataParam* GetPspParam();
 
 	int GetFilenameCount();

Core/HLE/sceUtility.cpp

@@ -41,8 +41,8 @@ void __UtilityInit()
 
 int sceUtilitySavedataInitStart(u32 paramAddr)
 {
-	saveDialog.Init(paramAddr);
-	return 0;
+	DEBUG_LOG(HLE,"sceUtilitySavedataInitStart(%08x)", paramAddr);
+	return (u32)saveDialog.Init(paramAddr);
 }
 
 int sceUtilitySavedataShutdownStart()