lvella/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

PTM & CFG: use the correct path and error code according to the new FileSys policy

Browse source
This commit is contained in:
wwylele 2016-10-20 09:43:43 +08:00
parent 0647f86649
commit 5c6e13a171
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/hle/service/cfg/cfg.cpp
View file

@ -359,7 +359,7 @@ ResultCode CreateConfigInfoBlk(u32 block_id, u16 size, u16 flags, const void* da
} }
ResultCode DeleteConfigNANDSaveFile() { ResultCode DeleteConfigNANDSaveFile() {
FileSys::Path path("config"); FileSys::Path path("/config");
return Service::FS::DeleteFileFromArchive(cfg_system_save_data_archive, path); return Service::FS::DeleteFileFromArchive(cfg_system_save_data_archive, path);
} }
@ -368,7 +368,7 @@ ResultCode UpdateConfigNANDSavegame() {
mode.write_flag.Assign(1); mode.write_flag.Assign(1);
mode.create_flag.Assign(1); mode.create_flag.Assign(1);
FileSys::Path path("config"); FileSys::Path path("/config");
auto config_result = Service::FS::OpenFileFromArchive(cfg_system_save_data_archive, path, mode); auto config_result = Service::FS::OpenFileFromArchive(cfg_system_save_data_archive, path, mode);
ASSERT_MSG(config_result.Succeeded(), "could not open file"); ASSERT_MSG(config_result.Succeeded(), "could not open file");
@ -382,8 +382,9 @@ ResultCode UpdateConfigNANDSavegame() {
ResultCode FormatConfig() { ResultCode FormatConfig() {
ResultCode res = DeleteConfigNANDSaveFile(); ResultCode res = DeleteConfigNANDSaveFile();
// The delete command fails if the file doesn't exist, so we have to check that too // The delete command fails if the file doesn't exist, so we have to check that too
if (!res.IsSuccess() && res.description != ErrorDescription::FS_NotFound) if (!res.IsSuccess() && res.description != ErrorDescription::FS_FileNotFound) {
return res; return res;
}
// Delete the old data // Delete the old data
cfg_config_file_buffer.fill(0); cfg_config_file_buffer.fill(0);
// Create the header // Create the header
@ -504,7 +505,7 @@ ResultCode LoadConfigNANDSaveFile() {
cfg_system_save_data_archive = *archive_result; cfg_system_save_data_archive = *archive_result;
FileSys::Path config_path("config"); FileSys::Path config_path("/config");
FileSys::Mode open_mode = {}; FileSys::Mode open_mode = {};
open_mode.read_flag.Assign(1); open_mode.read_flag.Assign(1);

2
src/core/hle/service/ptm/ptm.cpp
View file

@ -128,7 +128,7 @@ void Init() {
Service::FS::OpenArchive(Service::FS::ArchiveIdCode::SharedExtSaveData, archive_path); Service::FS::OpenArchive(Service::FS::ArchiveIdCode::SharedExtSaveData, archive_path);
ASSERT_MSG(archive_result.Succeeded(), "Could not open the PTM SharedExtSaveData archive!"); ASSERT_MSG(archive_result.Succeeded(), "Could not open the PTM SharedExtSaveData archive!");
FileSys::Path gamecoin_path("gamecoin.dat"); FileSys::Path gamecoin_path("/gamecoin.dat");
FileSys::Mode open_mode = {}; FileSys::Mode open_mode = {};
open_mode.write_flag.Assign(1); open_mode.write_flag.Assign(1);
open_mode.create_flag.Assign(1); open_mode.create_flag.Assign(1);