rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

trunk r369のマージ

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@370 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-07-07 07:48:12 +00:00
parent e0ad38b640
commit f0c49b9bc3
5 changed files with 143 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
branches/work/RW_Aging/sources/ConsoleBackup/Exporter.cpp
View File

@ -93,10 +93,8 @@ nn::Result DeleteTrash(std::wstring currentDirectory)
for (;;) for (;;)
{ {
result = dir.TryRead(&numEntry, &entry, 1); result = dir.TryRead(&numEntry, &entry, 1);
if (result.IsFailure()) COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
{
dir.Finalize();
}
if (numEntry == 0) if (numEntry == 0)
{ {
// ルートディレクトリを閉じる // ルートディレクトリを閉じる
@ -298,27 +296,23 @@ void CreateTwlDirectory(enum common::TWL_PATH_INDEX path)
std::wstring(common::SD_TWL_ROOTNAME_TABLE[path])).c_str()); std::wstring(common::SD_TWL_ROOTNAME_TABLE[path])).c_str());
} }
void ListTwlSaveData(std::wstring currentDirectory, std::vector<common::SavePathInfo>* list) bool ListTwlSaveData(std::wstring currentDirectory, std::vector<common::SavePathInfo>* list)
{ {
nn::fs::Directory dir; nn::fs::Directory dir;
nn::fs::DirectoryEntry entry; nn::fs::DirectoryEntry entry;
s32 numEntry; s32 numEntry;
nn::Result result = dir.TryInitialize(currentDirectory.c_str()); nn::Result result = dir.TryInitialize(currentDirectory.c_str());
if(result.IsSuccess()) COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
{
for (;;) for (;;)
{ {
result = dir.TryRead(&numEntry, &entry, 1); result = dir.TryRead(&numEntry, &entry, 1);
if(result.IsFailure()) COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
{
dir.Finalize();
break;
}
if (numEntry == 0) if (numEntry == 0)
{ {
dir.Finalize(); break;
} }
else else
{ {
@ -328,7 +322,8 @@ void ListTwlSaveData(std::wstring currentDirectory, std::vector<common::SavePath
list->push_back(pathInfo); list->push_back(pathInfo);
} }
} }
}
return true;
} }
void AddCurrentProgramIdPath(std::vector<std::wstring>* programIdList, std::wstring currentDir) void AddCurrentProgramIdPath(std::vector<std::wstring>* programIdList, std::wstring currentDir)
@ -384,17 +379,15 @@ bool ListTwlSaveDataDirectory(std::wstring currentDirectory, u32 level, std::vec
const wchar_t* const TWL_SAVEDATA_DIRECTORY_NAME = L"data"; const wchar_t* const TWL_SAVEDATA_DIRECTORY_NAME = L"data";
result = dir.TryInitialize(currentDirectory.c_str()); result = dir.TryInitialize(currentDirectory.c_str());
if (result.IsSuccess()) COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
{
nn::fs::DirectoryEntry entry; nn::fs::DirectoryEntry entry;
s32 numEntry; s32 numEntry;
for (;;) for (;;)
{ {
result = dir.TryRead(&numEntry, &entry, 1); result = dir.TryRead(&numEntry, &entry, 1);
if (result.IsFailure()) COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
{
dir.Finalize();
}
if (numEntry == 0) if (numEntry == 0)
{ {
dir.Finalize(); dir.Finalize();
@ -408,14 +401,18 @@ bool ListTwlSaveDataDirectory(std::wstring currentDirectory, u32 level, std::vec
if (entryIndex->attributes.isDirectory) if (entryIndex->attributes.isDirectory)
{ {
if (ListTwlSaveDataDirectory( if (ListTwlSaveDataDirectory(
currentDirectory + std::wstring(L"/") + std::wstring(entryIndex->entryName), currentDirectory + std::wstring(L"/") + std::wstring(entryIndex->entryName), level + 1,
level + 1, list, programIdList)) list, programIdList))
{ {
NN_LOG("%ls/%ls has data directory.\n", currentDirectory.c_str(), entryIndex->entryName); NN_LOG("%ls/%ls has data directory.\n", currentDirectory.c_str(), entryIndex->entryName);
retValue = true; retValue = true;
AddCurrentDirectory(list, currentDirectory, entryIndex->entryName); AddCurrentDirectory(list, currentDirectory, entryIndex->entryName);
} }
else
{
return false;
}
} }
} }
// レベル2のディレクトリなら data かどうかチェック // レベル2のディレクトリなら data かどうかチェック
@ -425,7 +422,11 @@ bool ListTwlSaveDataDirectory(std::wstring currentDirectory, u32 level, std::vec
{ {
// ファイル一覧を取得する // ファイル一覧を取得する
retValue = true; retValue = true;
ListTwlSaveData(currentDirectory + std::wstring(L"/") + std::wstring(entryIndex->entryName), list); if (!ListTwlSaveData(
currentDirectory + std::wstring(L"/") + std::wstring(entryIndex->entryName), list))
{
return false;
}
AddCurrentDirectory(list, currentDirectory, entryIndex->entryName); AddCurrentDirectory(list, currentDirectory, entryIndex->entryName);
AddCurrentProgramIdPath(programIdList, currentDirectory); AddCurrentProgramIdPath(programIdList, currentDirectory);
@ -450,15 +451,8 @@ bool ListTwlSaveDataDirectory(std::wstring currentDirectory, u32 level, std::vec
entryList.push_back(entry); entryList.push_back(entry);
} }
} }
}
else
{
NN_LOG("failed initialize directory\n");
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
dir.Finalize();
}
return false; return true;
} }

14
branches/work/RW_Aging/sources/ConsoleRestore/Controller.cpp
View File

@ -804,9 +804,16 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
CreateConsoleInitializedFile(); CreateConsoleInitializedFile();
// ファイルシステムの初期化を行う // ファイルシステムの初期化を行う
InitializeFileSystem(); if(InitializeFileSystem())
{
s_RestoreState = REBOOTING; s_RestoreState = REBOOTING;
} }
else
{
s_RestoreState = FAIL;
}
}
break; break;
case WAIT_START_UPDATE: case WAIT_START_UPDATE:
@ -1557,7 +1564,10 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
case INITIALIZE_AND_SHUTDOWN: case INITIALIZE_AND_SHUTDOWN:
{ {
// 本体初期化を行う // 本体初期化を行う
InitializeFileSystem(); if(!InitializeFileSystem())
{
s_RestoreState = FAIL;
}
// シャットダウンする // シャットダウンする
nn::ptm::CTR::ShutdownAsync(0, nn::fnd::TimeSpan::FromSeconds(0)); nn::ptm::CTR::ShutdownAsync(0, nn::fnd::TimeSpan::FromSeconds(0));

30
branches/work/RW_Aging/sources/ConsoleRestore/Importer.cpp
View File

@ -543,32 +543,30 @@ nn::Result ImportMcuRtc(common::HardwareStateManager& manager)
return result; return result;
} }
void InitializeFileSystem() bool InitializeFileSystem()
{ {
nn::Result result; nn::Result result;
for (u32 i = 0; i < common::TWL_PATHNAME_MAX; i++) for (u32 i = 0; i < common::TWL_PATHNAME_MAX; i++)
{ {
result = nn::fs::MountSpecialArchive(common::TWL_ARCHIVE_NAME_TABLE[i], common::TWL_FS_ARCHIVE_KIND[i]); result = nn::fs::MountSpecialArchive(common::TWL_ARCHIVE_NAME_TABLE[i], common::TWL_FS_ARCHIVE_KIND[i]);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
if (result.IsSuccess())
{
nn::fs::Directory dir; nn::fs::Directory dir;
std::vector<nn::fs::DirectoryEntry> entryList; //カレントディレクトリのエントリ一覧を格納 std::vector<nn::fs::DirectoryEntry> entryList; //カレントディレクトリのエントリ一覧を格納
std::vector<nn::fs::DirectoryEntry>::iterator entryIndex; std::vector<nn::fs::DirectoryEntry>::iterator entryIndex;
std::wstring currentDirectory = common::NAND_TWL_ROOT_PATHNAME_WITH_SLASH_TABLE[i]; std::wstring currentDirectory = common::NAND_TWL_ROOT_PATHNAME_WITH_SLASH_TABLE[i];
result = dir.TryInitialize(currentDirectory.c_str()); result = dir.TryInitialize(currentDirectory.c_str());
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
nn::fs::DirectoryEntry entry; nn::fs::DirectoryEntry entry;
s32 numEntry; s32 numEntry;
for (;;) for (;;)
{ {
result = dir.TryRead(&numEntry, &entry, 1); result = dir.TryRead(&numEntry, &entry, 1);
if (result.IsFailure()) COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
{
dir.Finalize();
}
if (numEntry == 0) if (numEntry == 0)
{ {
// ルートディレクトリを閉じる // ルートディレクトリを閉じる
@ -581,9 +579,9 @@ void InitializeFileSystem()
if (entryIndex->attributes.isDirectory) if (entryIndex->attributes.isDirectory)
{ {
NN_LOG("Try Delete %ls%ls/\n", currentDirectory.c_str(), entryIndex->entryName); NN_LOG("Try Delete %ls%ls/\n", currentDirectory.c_str(), entryIndex->entryName);
result = nn::fs::TryDeleteDirectoryRecursively((currentDirectory + ::std::wstring( result = nn::fs::TryDeleteDirectoryRecursively(
entryIndex->entryName)).c_str()); (currentDirectory + ::std::wstring(entryIndex->entryName)).c_str());
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
} }
// ファイルなら削除する // ファイルなら削除する
@ -592,7 +590,7 @@ void InitializeFileSystem()
NN_LOG("Try Delete %ls%ls\n", currentDirectory.c_str(), entryIndex->entryName); NN_LOG("Try Delete %ls%ls\n", currentDirectory.c_str(), entryIndex->entryName);
result = nn::fs::TryDeleteFile( result = nn::fs::TryDeleteFile(
(currentDirectory + ::std::wstring(entryIndex->entryName)).c_str()); (currentDirectory + ::std::wstring(entryIndex->entryName)).c_str());
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
} }
} }
@ -613,13 +611,15 @@ void InitializeFileSystem()
} }
} }
} }
}
nn::fs::Unmount(common::TWL_ARCHIVE_NAME_TABLE[i]); result = nn::fs::Unmount(common::TWL_ARCHIVE_NAME_TABLE[i]);
COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
} }
result = nn::am::DeleteAllTwlUserPrograms(); result = nn::am::DeleteAllTwlUserPrograms();
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
nn::fs::InitializeCtrFileSystem(); nn::fs::InitializeCtrFileSystem();
return true;
} }
nn::Result ImportIvs() nn::Result ImportIvs()

2
branches/work/RW_Aging/sources/ConsoleRestore/Importer.h
View File

@ -137,7 +137,7 @@ nn::Result ImportCountryLanguageData();
nn::Result ImportMcuRtc(common::HardwareStateManager& manager); nn::Result ImportMcuRtc(common::HardwareStateManager& manager);
// TWL写真領域を初期化してから本体初期化を行う // TWL写真領域を初期化してから本体初期化を行う
void InitializeFileSystem(); bool InitializeFileSystem();
// SDカードのファイルと本体情報の比較結果をクリアする // SDカードのファイルと本体情報の比較結果をクリアする
void ClearFileReadResult(); void ClearFileReadResult();

5
branches/work/RW_Aging/sources/common/FileTransfer.cpp
View File

@ -58,7 +58,6 @@ const char* GetCharStr(const wchar_t* path)
nn::Result CalculateFileNum(std::wstring currentDirectory, u32& fileNum, s64& fileSize) nn::Result CalculateFileNum(std::wstring currentDirectory, u32& fileNum, s64& fileSize)
{ {
nn::fs::FileInputStream fis;
nn::fs::Directory dir; nn::fs::Directory dir;
nn::Result result; nn::Result result;
std::vector<nn::fs::DirectoryEntry> entryList; //カレントディレクトリのエントリ一覧を格納 std::vector<nn::fs::DirectoryEntry> entryList; //カレントディレクトリのエントリ一覧を格納
@ -267,7 +266,9 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
while (1) while (1)
{ {
result = from_dir.TryRead(&numread, &entry, 1); result = from_dir.TryRead(&numread, &entry, 1);
if (result.IsFailure() || numread != 1) COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
if(numread == 0)
{ {
break; break;
} }