From cf7b0d5dda0e9af08d0cc816f6980678e72e0100 Mon Sep 17 00:00:00 2001 From: N2614 Date: Wed, 19 Nov 2014 06:24:31 +0000 Subject: [PATCH] =?UTF-8?q?trunk/ConsoleDataMigration/sources=E3=81=8B?= =?UTF-8?q?=E3=82=89=E3=83=AA=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B3826-825?= =?UTF-8?q?=E3=82=92=E9=80=86=E3=83=9E=E3=83=BC=E3=82=B8:=20Personalized?= =?UTF-8?q?=20eTicket=E3=81=AE=E5=AD=98=E5=9C=A8=E3=81=99=E3=82=8BDSiWare?= =?UTF-8?q?=E3=81=AE=E3=81=BF=E3=83=80=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20......?= =?UTF-8?q?..=20=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E7=95=AA?= =?UTF-8?q?=E5=8F=B7=E3=82=92=E6=9B=B4=E6=96=B0=20........?= 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@828 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../ConsoleRestore/TitleDownloader.cpp | 39 +------------------ .../sources/ConsoleRestore/TitleDownloader.h | 3 -- .../sources/common/version.h | 2 +- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp index 41cdaf1..ddf6f83 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp @@ -39,10 +39,6 @@ bit8 s_buffer1[400 * 1024]; size_t s_ProgramIdNum = 0; // ダウンロードするタイトルのProgramIdの配列 nn::ProgramId s_ProgramIdList[256]; -// SDカードに吸い出されたDSiWareのタイトルの個数 -size_t s_SdDSiWareProgramIdNum = 0; -// SDカードに吸い出されたDSiWareのProgramIdの配列 -nn::ProgramId s_SdDSiWareList[32]; // ダウンロード済みのタイトルの個数 size_t s_FinishedTitleNum = 0; @@ -134,21 +130,14 @@ nn::Result TitleDownloader::m_Result = nn::ResultSuccess(); void TwlTitleDownloaderThreadFunc() { TitleDownloader TwlTitleDownloader; - PreinstallImporter importer; s_Progress = 0; - - TitleDownloader::m_Result = ListUpTwlTitles(s_SdDSiWareList, &s_SdDSiWareProgramIdNum); + TitleDownloader::m_Result = ListUpTwlTitles(s_ProgramIdList, &s_ProgramIdNum); COMMON_LOGGER_RETURN_VOID_IF_FAILED(TitleDownloader::m_Result); + TwlTitleDownloader.SetupTitleList(s_ProgramIdList, s_ProgramIdNum, s_FinishedTitleNum); TitleDownloader::m_Result = nn::am::InitializeForNetworkImporter(); COMMON_LOGGER_RETURN_VOID_IF_FAILED(TitleDownloader::m_Result); - - TwlTitleDownloader.m_Result = importer.ListTitlesBasedOnTickets(s_ProgramIdList, &s_ProgramIdNum); - COMMON_LOGGER_RETURN_VOID_IF_FAILED(TwlTitleDownloader.m_Result); - - TwlTitleDownloader.SetupTitleListForTWL(s_ProgramIdList, s_ProgramIdNum, s_FinishedTitleNum, s_SdDSiWareList, s_SdDSiWareProgramIdNum); - TwlTitleDownloader.Start(); nn::am::FinalizeForNetworkImporter(); s_FinishedTitleNum = TwlTitleDownloader.GetFinishedTitleNum(); @@ -430,30 +419,6 @@ void TitleDownloader::SetupTitleList(nn::ProgramId* list, size_t num, u32 index) m_FinishedTitleNum = index; } -void TitleDownloader::SetupTitleListForTWL(nn::ProgramId* eTicketList, size_t eTicketNum, u32 index, nn::ProgramId* sdDSiWareList, size_t sdDSiWareNum) -{ - const size_t listNum = nn::math::Min(eTicketNum, IMPORTABLE_TITLE_MAX); - u32 twlAppNum = 0; - - // 8thNUPからのショップアカウント削除後もセーブデータが削除されない仕様と、MSETでのSDカードへのDSiWareのバックアップ機能があるため、 - // eTicketが存在する、かつセーブデータが存在するタイトルのみダウンロードする - for(u32 i = 0; i < listNum; i++) - { - if(nn::CTR::IsTwlApp(eTicketList[i])) - { - for(u32 j = 0; j < sdDSiWareNum; j++) - { - if(eTicketList[i] == sdDSiWareList[j]) - { - m_ProgramIdList[twlAppNum++] = eTicketList[i]; - } - } - } - } - m_TiteNum = twlAppNum; - m_FinishedTitleNum = index; -} - void TitleDownloader::CalculateRequiredSize(s64* requiredSize) { *requiredSize = 0; diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h index fd2e8ba..b283d03 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.h @@ -69,9 +69,6 @@ public: //! @brief タイトルリストを設定する void SetupTitleList(nn::ProgramId* list, size_t num, u32 index); - //! @brief TWLタイトルリストを設定する - void SetupTitleListForTWL(nn::ProgramId* eTicketList, size_t eTicketNum, u32 index, nn::ProgramId* sdDSiWareList, size_t sdDSiWareNum); - //! @brief タイトルをダウンロードするのに必要なサイズを計算します void CalculateRequiredSize(s64* requiredSize); diff --git a/trunk/ConsoleDataMigration/sources/common/version.h b/trunk/ConsoleDataMigration/sources/common/version.h index 4e8e7a6..cb8c8ed 100644 --- a/trunk/ConsoleDataMigration/sources/common/version.h +++ b/trunk/ConsoleDataMigration/sources/common/version.h @@ -26,6 +26,6 @@ // 同じMAJORバージョン内で互換性のある変更がある時に変更する。 // Backup単体またはRestore単体のみの変更時に修正することが多い。 -#define CONSOLE_REPAIR_VERSION_MICRO "2" +#define CONSOLE_REPAIR_VERSION_MICRO "1" #endif /* VERSION_H_ */