From 09a6b5a6385635e8d3003e5b6747d7140d8e5ef6 Mon Sep 17 00:00:00 2001 From: mizu Date: Wed, 18 May 2011 04:58:21 +0000 Subject: [PATCH] git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@258 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../Mover/Imp/imp_list/batch/csm_list.txt | 1 + .../Mover/Imp/imp_list/batch/csm_sign.dat | Bin 256 -> 256 bytes trunk/CardSaveData/Mover/Imp/source/main.cpp | 2 +- trunk/CardSaveData/ToSD/Imp/banner.bsf | Bin 2448 -> 2382 bytes trunk/CardSaveData/ToSD/Imp/source/main.cpp | 2 +- trunk/CardSaveData/ToSD/body/banner.bsf | Bin 2448 -> 2384 bytes .../ToSD/body/source/screen/screen.cpp | 6 +++--- trunk/CardSaveData/common/savefile/sdmcwo.cpp | 20 ++++++++++-------- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/trunk/CardSaveData/Mover/Imp/imp_list/batch/csm_list.txt b/trunk/CardSaveData/Mover/Imp/imp_list/batch/csm_list.txt index c610178..5f9944f 100644 --- a/trunk/CardSaveData/Mover/Imp/imp_list/batch/csm_list.txt +++ b/trunk/CardSaveData/Mover/Imp/imp_list/batch/csm_list.txt @@ -1,2 +1,3 @@ # EJF10000237 +EJF10000308 diff --git a/trunk/CardSaveData/Mover/Imp/imp_list/batch/csm_sign.dat b/trunk/CardSaveData/Mover/Imp/imp_list/batch/csm_sign.dat index c0e054cca4df9c3ba0b8db6bdab63db182b93c52..65d55eb549fc20fd0596b2694992d007b5fb91ae 100644 GIT binary patch literal 256 zcmV+b0ssC;gI2aZKN{fw(jcfxhv~-FIkCNuc;(C7QGP#R-e0}o-XX9=liRi%N@F74 zwUd{E21>JCqeWf7afb-aanANfQQ*sV8&L0b0uv%z&*i1A@@h~=h?Mu14R1{g4lBv! z#EsALosuz>Cbm$#631~>=1pfPmY&$cAKdkiL}YzuYaG1|j|RT5VG6ChdO(ixI5 z?}&UggY9QRuEsc~jzOvIwe5p#*`!*~^gdv0B#C3X7vkO1W7*28++ZqpP`BE72rU&f z9}yNrK<@062y%ueJrx<=nMzY$zZOn4(9P^Gi5qh5l9$$j^&%ZOK2cRmhzl_k0D{dX GQlcIQ(|w)* literal 256 zcmV+b0ssD7?+tMzBfgF~r6aZGF~zdx6T$?Ec8=flI?1n|lP9#TR50^ZbXUN47+#Q8 z7rFXRPirIsp$!zV*IK_@<1O1*`0L)YnWEZ3^;gD8^N1Q~ZcLpvE)`i?Gb@lEWMVg} zW_y?P;Bf-Wf%N5RJ1?~yDuO;`PMBRD*77TcaXPURK`F*E7kDGyC2}Cn9AMZ90;W$= zlEhlOqTAq*hb?b9CnNO#ubX=4-%A?c`V-g%96r0qY+_82=~WP-Rbz)ih;?KJY*`mS zvXum79; Ggy63t8+eHT diff --git a/trunk/CardSaveData/Mover/Imp/source/main.cpp b/trunk/CardSaveData/Mover/Imp/source/main.cpp index 138b342..32e77e2 100644 --- a/trunk/CardSaveData/Mover/Imp/source/main.cpp +++ b/trunk/CardSaveData/Mover/Imp/source/main.cpp @@ -31,7 +31,7 @@ #include "../../../common/sleep.h" #include "../../../common/common.h" #include "../../../common/shfnt.h" -#include "test_data.h" +#include "../../../common/test_data.h" #define INF_FILE "sdmc:/csm_inf.txt" diff --git a/trunk/CardSaveData/ToSD/Imp/banner.bsf b/trunk/CardSaveData/ToSD/Imp/banner.bsf index 6224adf8c81ca2d726a365b7560cc0e2826c00f1..140ac49143bf2668e32fafbccd24afd470867b62 100644 GIT binary patch delta 76 zcmbOrd`@VC6{Dy=LlQ$GLmm*OG88fBGh{O4G89ZMW>i;2mq}qL1nG(mWS730J+2AsJJ`3xxxsSG)j{TbDP0>Z^Wfl`J%pr9T@GD8wWF+Px# delta 52 zcmca0G(mWS730J+2AsJJ`3xxxsSG)j0~ytU0>Z^Wfl`J%pr9T@GD8wWF+"); + gui.MessStr(MESSAGE_TITLE," < CTR Card Savedata Exporter >"); gui.MessEffective(MESSAGE_MENU_ERROR,false,false); gui.MessEffective(MESSAGE_MENU_CAUTION,false,false); diff --git a/trunk/CardSaveData/common/savefile/sdmcwo.cpp b/trunk/CardSaveData/common/savefile/sdmcwo.cpp index d7698e5..9016dd4 100644 --- a/trunk/CardSaveData/common/savefile/sdmcwo.cpp +++ b/trunk/CardSaveData/common/savefile/sdmcwo.cpp @@ -27,8 +27,8 @@ wchar_t latestPath_w[MAX_PATH_LENGTH];//filer/UserSaveData/YearMtDtHrMtSc bool created; bool IsMounted; -//SDKツールã®SaveFilerã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«åˆã‚ã›ã‚‹ -//------------ sources\tools\NandFiler\nandf_Dialog.h å‚ç…§ +//SDKツールã®SaveFiler用ã®æƒ…報ファイル +//-------ources\tools\NandFiler\nandf_Dialog.h å‚ç…§ const wchar_t *SDMC_ROOT_DIR_NAME = L"/filer"; struct FormatParameters @@ -42,7 +42,7 @@ struct FormatParameters FormatParameters() : m_LimitSize(0),m_IconSize(0), m_pIconData(0) {} - //オリジナルã¯LinitSizeä¸å®š + //オリジナルã¯LimitSizeä¸å®š }; struct AdditionalInfo @@ -53,7 +53,9 @@ struct AdditionalInfo AdditionalInfo() : m_Version(0), m_Id(0) {} }; -//--------------------------- nandf_util.cpp å‚ç…§ + +//ä¿å­˜å…ˆï¼šæ—¥æ™‚をディレクトリå +//-------- nandf_util.cpp å‚ç…§ std::wstring Sdmcwo::GetDateName() { nn::fnd::DateTime tm = nn::fnd::DateTime::GetNow(); @@ -79,7 +81,7 @@ bit64 ChangeId(bit64 id, bit64 key) return id ^ key ^ 0xce8a4d52f7105339; } -//----------------------------- +//---------------------------------------------------------- //ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªä½œæˆ //ディレクトリオープンも出æ¥ãªã„ã®ã§ã€ãƒ©ã‚¤ãƒˆè©¦è¡Œ @@ -170,11 +172,13 @@ myResult Sdmcwo::Mount() IsMounted = true; return RESULT_OK; } + void Sdmcwo::Unmount() { IsMounted = false; nn::fs::Unmount(devName); } + //ライト属性ファイルを閉ã˜ã‚‹ void Sdmcwo::CloseW() { @@ -209,7 +213,6 @@ bool Sdmcwo::OpenW(wchar_t *path,s64 size,bool *mkdir) if (pos <= 0)return false;//rootã‹ãƒ‘スãŒä¸æ­£ wcscpy(expathw_w,expath_w);//ワークã«ã‚³ãƒ”ー while (LastNnResult.IsFailure()){//ディレクトリ作æˆã§ãã‚‹ã¾ã§é¡ã‚‹ - //if(LastNnResult.GetDescription()!=nn::fs::DESCRIPTION_DBM_DIRECTORY_NOT_FOUND)return false; if(nn::fs::ResultNotFound::Includes(LastNnResult)==false)return false; pos2 = GetPosDelmLast(expathw_w,ROOTLENGTH_SD);//境界ä½ç½®ã‚’探㙠if (pos2 == 0)return false;//rootåˆ°é” @@ -222,15 +225,14 @@ bool Sdmcwo::OpenW(wchar_t *path,s64 size,bool *mkdir) } -//パスåエラーã§ä½œæˆã§ããªã„å ´åˆã®é€€é¿å…ˆ -//例：FATè¦ç´„é•åã€"/ test"->"/test"ã€SDæ ¼ç´å…ˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ãƒ‘ス長オーãƒãƒ¼ +//パスåエラーã§ä½œæˆã§ããªã„å ´åˆã®æ ¼ç´å…ˆ bool Sdmcwo::OpenVnfW(wchar_t *path,s64 size) { s32 sz; tVnf vnf; //パスå＆オフセット用ファイル wcscpy(expath_w,latestPath_w); - wcscat(expath_w,L"/00000000.vnf"); + wcscat(expath_w,L"/00000000.vnf");// 00000000.vnf LastNnResult = writer.TryInitialize(expath_w,false); if (LastNnResult.IsSuccess()){ LastNnResult = writer.TrySeek(0,nn::fs::POSITION_BASE_END);//追記