From e5af1a3526be7e54158ed69999a9388eedf733bb Mon Sep 17 00:00:00 2001 From: N2614 Date: Tue, 14 Feb 2012 04:10:28 +0000 Subject: [PATCH] =?UTF-8?q?NN=5FUTIL=5FRETURN=5FIF=5FFAILED=E3=82=92COMMON?= =?UTF-8?q?=5FLOGGER=5FRETURN=5FIF=5FFAILED=E3=81=AB=E7=BD=AE=E6=8F=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@632 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleRestore/Importer.cpp | 12 ++++---- .../sources/ConsoleRestore/NtpClient.cpp | 2 +- .../sources/ConsoleRestore/Shop.cpp | 30 +++++++++---------- .../ConsoleRestore/TitleDownloader.cpp | 4 +-- .../sources/ConsoleRestore/Updater.cpp | 14 ++++----- .../sources/common/FileTransfer.cpp | 2 +- .../sources/common/SdReaderWriter.cpp | 8 ++--- .../sources/common/configLoader.cpp | 7 +++-- 8 files changed, 40 insertions(+), 39 deletions(-) diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Importer.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Importer.cpp index 95d5c1d..8725c07 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Importer.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Importer.cpp @@ -403,7 +403,7 @@ nn::Result ImportCountryLanguageData() SetLanguage(reinterpret_cast (buf)->language); } - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); } } else @@ -524,7 +524,7 @@ nn::Result ImportMcuRtc(common::HardwareStateManager& manager) } } - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); } else { @@ -678,7 +678,7 @@ nn::Result ImportIvs() } nn::fs::Unmount(common::NAND_ARCHIVE_NAME); } - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); } else { @@ -1711,7 +1711,7 @@ nn::Result InitializeHardwareDependentSetting() common::CfgCalData cfgCalData; result = ImportCalData(&cfgCalData); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_TOUCHPANEL), &cfgCalData.touchPanelCfgData, sizeof(TouchPanelCfgData)); @@ -1764,7 +1764,7 @@ nn::Result SetupFileList() // ファイル一覧を読み込む nn::Result result = ReadFileList(&s_SdFileSize, &s_FileLists); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); return result; } @@ -1783,7 +1783,7 @@ nn::Result ReadFileList(SdFileSize* sdFiles, common::ImportDataList* fileList) // サイズ取得のため一時的に開く result = file.TryInitialize(common::FILE_LIST_PATHNAME); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); result = file.TryGetSize(&fileSize); if (result.IsFailure()) diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp index 53335d3..13159cc 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp @@ -90,7 +90,7 @@ nn::Result FinalizeNetwork(void) // 接続要求用のパラメータを作成 result = nn::ac::Close(); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); result = nn::ac::Finalize(); COMMON_LOGGER_RESULT_IF_FAILED(result); diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Shop.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Shop.cpp index 14c38a0..f226772 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Shop.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Shop.cpp @@ -220,17 +220,17 @@ nn::Result ConnectNetwork() result = nn::ac::CreateDefaultConfig(&config); COMMON_LOGGER_RESULT_IF_FAILED(result); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); result = nn::ac::ConnectWithoutEula(config); COMMON_LOGGER_RESULT_IF_FAILED(result); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); COMMON_LOGGER_DETAIL("Success nn::ac::ConnectWithoutEula\n"); result = PrintNetworkSetting(); COMMON_LOGGER_RESULT_IF_FAILED(result); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); return result; } @@ -241,11 +241,11 @@ nn::Result InitializeInternal() result = nn::ac::InitializeInternal(); COMMON_LOGGER_RESULT_IF_FAILED(result); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); result = ConnectNetwork(); COMMON_LOGGER_RESULT_IF_FAILED(result); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); return result; } @@ -257,7 +257,7 @@ nn::Result FinalizeInternal() nn::ac::CloseAll(); result = nn::ac::FinalizeInternal(); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); return result; } @@ -294,9 +294,9 @@ nn::Result ShopOperationConnect(ECAccountInfo** pAccountInfo) -------------------------------------------------------------------- */ COMMON_LOGGER_DETAIL("nim::Shop::Connect\n"); result = nn::nim::Shop::Connect(pAccountInfo, s_EcBufffer, EC_BUFFER_SIZE); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); result = CheckStandbyMode((*pAccountInfo)->isStandbyMode); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); PrintECAccountInfo(**pAccountInfo); COMMON_LOGGER_DETAIL("\n"); @@ -315,7 +315,7 @@ nn::Result ShopOperationInitialize() { COMMON_LOGGER_DETAIL("nim::InitializeForShop\n"); result = nn::nim::InitializeForShop(); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); s_IsNimShopInitialized = true; } @@ -325,11 +325,11 @@ nn::Result ShopOperationInitialize() COMMON_LOGGER_DETAIL("nim::Shop::SetApplication Id\n"); nn::nim::Shop::SetApplicationId(); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); COMMON_LOGGER_DETAIL("nim::Shop::SetTIN\n"); result = nn::nim::Shop::SetTin(CONSOLE_RESTORE_TIN); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); return result; } @@ -338,14 +338,14 @@ nn::Result ShopOperationConnect() { nn::Result result; result = ShopOperationInitialize(); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); /* ------------------------------------------------------------------- Connect -------------------------------------------------------------------- */ ECAccountInfo* pAccountInfo; result = ShopOperationConnect(&pAccountInfo); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); return result; } @@ -359,12 +359,12 @@ nn::Result ShopOperationFinalize() -------------------------------------------------------------------- */ COMMON_LOGGER_DETAIL("nim::FinalizeForShop\n"); result = nn::nim::FinalizeForShop(); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); s_IsNimShopInitialized = false; COMMON_LOGGER_DETAIL("util::ac::Finalize\n"); result = FinalizeInternal(); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); return result; } diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/TitleDownloader.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/TitleDownloader.cpp index 2545ad4..d9e5790 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/TitleDownloader.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/TitleDownloader.cpp @@ -91,7 +91,7 @@ nn::Result GetEntry(ES_NAMESPACE::ESTitleId titleId, EC_NAMESPACE::ECTitleCatalo nn::Result GetTitleConfig(const ES_NAMESPACE::ESTitleId titleId, nn::nim::TitleConfig *titleConfig) { EC_NAMESPACE::ECTitleCatalogEntry *entry; - NN_UTIL_RETURN_IF_FAILED(GetEntry(titleId, &entry)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(GetEntry(titleId, &entry)); titleConfig->titleId=titleId; titleConfig->version=std::strtoull(GetAttribute(entry->attributes, entry->nAttributes, "Version"), NULL, 10); @@ -171,7 +171,7 @@ nn::Result WaitCancelled() while(true) { // キャンセルがResultとして返ってくる / ダウンロード終了まで待つ - NN_UTIL_RETURN_IF_FAILED(nn::nim::Shop::GetProgress(&progress)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(nn::nim::Shop::GetProgress(&progress)); if(progress.lastResult==nn::nim::ResultCancelRequested() || progress.state==nn::nim::TITLE_STATE_FINISHED) { break; diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Updater.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Updater.cpp index ee87db8..4c885cd 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Updater.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Updater.cpp @@ -63,7 +63,7 @@ u64 s_Progress = 0; nn::Result PrintNetworkSetting() { nn::ac::NetworkSetting networkSetting; - NN_UTIL_RETURN_IF_FAILED(nn::ac::LoadNetworkSetting(0, networkSetting)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(nn::ac::LoadNetworkSetting(0, networkSetting)); COMMON_LOGGER("SSID: %s\n", networkSetting.wireless.essidSecurity.ssid); COMMON_LOGGER("DNS : %d.%d.%d.%d\n", networkSetting.ip.dns[0][0], networkSetting.ip.dns[0][1], @@ -78,14 +78,14 @@ nn::Result ConnectNetwork() nn::ac::Config config; result = nn::ac::CreateDefaultConfig(&config); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); result = nn::ac::ConnectWithoutEula(config); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); COMMON_LOGGER_DETAIL("Success nn::ac::ConnectWithoutEula\n"); - NN_UTIL_RETURN_IF_FAILED(PrintNetworkSetting()); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(PrintNetworkSetting()); return result; } @@ -95,10 +95,10 @@ nn::Result InitializeInternal() nn::Result result = nn::ResultSuccess(); result = nn::ac::InitializeInternal(); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); result = ConnectNetwork(); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); return result; } @@ -110,7 +110,7 @@ nn::Result FinalizeInternal() nn::ac::CloseAll(); result = nn::ac::FinalizeInternal(); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); return result; } diff --git a/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp b/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp index aae13bc..ecb212d 100644 --- a/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp @@ -806,7 +806,7 @@ nn::Result CalculateFileSizeRecursively(std::wstring currentDirectory, s64& file if (entry.attributes.isDirectory) { result = CalculateFileSizeRecursively(currentDirectory + std::wstring(entry.entryName) + std::wstring(L"/"), fileSize); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); } // ファイルの場合 else diff --git a/branches/1stNUP_for_2ndNUP/sources/common/SdReaderWriter.cpp b/branches/1stNUP_for_2ndNUP/sources/common/SdReaderWriter.cpp index 9ce75c6..ccf12b8 100644 --- a/branches/1stNUP_for_2ndNUP/sources/common/SdReaderWriter.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/common/SdReaderWriter.cpp @@ -98,7 +98,7 @@ nn::Result SdReaderWriter::WriteBuf(nn::fs::FileStream& file, const wchar_t* pat nn::Result result; result = WriteBufCore(file, path, buf, size); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); result = file.TryFlush(); COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); @@ -116,7 +116,7 @@ nn::Result SdReaderWriter::WriteBufWithCmac(const wchar_t* path, void* buf, size nn::fs::FileStream file; result = WriteBufCore(file, path, buf, size); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); nn::crypto::Initialize(); bit8 sha256Hash[nn::crypto::Sha256Context::HASH_SIZE]; @@ -174,7 +174,7 @@ nn::Result SdReaderWriter::ReadBuf(nn::fs::FileStream& file, const wchar_t* path nn::Result result; result = ReadBufCore(file, path, buf, size, totalSize); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); file.Finalize(); return result; @@ -188,7 +188,7 @@ nn::Result SdReaderWriter::ReadBufWithCmac(const wchar_t* path, void* buf, size_ NN_ASSERT(size > nn::crypto::AES_CMAC_MAC_SIZE); result = ReadBufCore(file, path, buf, size, totalSize); - NN_UTIL_RETURN_IF_FAILED(result); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); file.Finalize(); // ハッシュが付加されていない diff --git a/branches/1stNUP_for_2ndNUP/sources/common/configLoader.cpp b/branches/1stNUP_for_2ndNUP/sources/common/configLoader.cpp index b262ba9..775cb36 100644 --- a/branches/1stNUP_for_2ndNUP/sources/common/configLoader.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/common/configLoader.cpp @@ -2,6 +2,7 @@ #include #include #include "configLoader.h" +#include "CommonLogger.h" namespace common { @@ -10,8 +11,8 @@ Result ConfigFileLoader::Initialize(const wchar_t* fileName, void* buffer, const { s64 fileSize; FileInputStream fi; - NN_UTIL_RETURN_IF_FAILED(fi.TryInitialize(fileName)); - NN_UTIL_RETURN_IF_FAILED(fi.TryGetSize(&fileSize)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(fi.TryInitialize(fileName)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(fi.TryGetSize(&fileSize)); // NULL終端ぶん読めるサイズを減らす if (fileSize > bufferSize - sizeof(wchar_t)) @@ -21,7 +22,7 @@ Result ConfigFileLoader::Initialize(const wchar_t* fileName, void* buffer, const } m_Buffer = static_cast(buffer); - NN_UTIL_RETURN_IF_FAILED(fi.TryRead(&m_UsedBufferSize, m_Buffer, fileSize)); + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(fi.TryRead(&m_UsedBufferSize, m_Buffer, fileSize)); NN_LOG("config size = %d\n", m_UsedBufferSize); return ParseData(); }