From da3337e3afd37de7dd3ca68ef76450d94697b4d9 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Thu, 24 Dec 2009 10:56:40 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@451 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 13937664 -> 13937664 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 86528 -> 85504 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 23956 -> 12570 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 2 +- .../MasterEditorTWL/Form1.ja.resx | 2 +- .../MasterEditorTWL/Form1.resX | 2 +- .../MasterEditorTWL/Release/BuildLog.htm | Bin 24228 -> 24228 bytes .../MasterEditorTWL/srl_mrc.cpp | 56 +++++++++++++----- 8 files changed, 45 insertions(+), 17 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index d8cf817de5cfef63b8dbf11b321f92a7a3ce168b..43fd2b3d2852f1307085cc29193002dd2eecd207 100644 GIT binary patch delta 17098 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 K`p9%0FaBR|s?iz% delta 12369 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 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 2a8bcba0283d298e8d380a1e69e9c3d699258dcb..61a8af98eaa2e7139123338bd04021ae195c5f96 100644 GIT binary patch delta 5036 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 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 37ed741bd12119cd5cc150201ae24a795b2652c9..84f32d1c4d128bcaa2153237d83daf9af5e3b31c 100644 GIT binary patch delta 317 zcmbQTn{igs1~WEcLk0r|V+Io-HUrZJ3>K4Zt&KO=u?qHO~qliIi@Og4# delta 3098 zcmb_eUrbw782?%rld)FX0=AU)URsdhN;$x&VlpEcm=PjV7OBP=LQ9z_6xJ4;ae+4z zjfs)7#Keao#z#%m8x#LNxCfnyKA5O4>JsCN(?p}bnCOGQbK2W`dV5)P@qtUv`F`K` z{k}iveCMUi#rIurq?!VZhG>+A=@{LC{|sNor+Y?>3r+7eh3=s>D$puT;#-ivla!@( zTIat7v2wTh-5v54zrpliC!wSQQg~=hm3zUIIPQ{0^*w4~DJwcD6Xf`R2 zb|#b<@}VHV8aiCF)1$2PkXe(p?xV)0r^DscGRCg=oDdA}(@R@!SJwFJrsIvi5-o!B z5}mIyR_xZR?|L8MUpBPzmwOv03J9}EXYtKLIR_It(rJ)3u$!aP2z5gSo}>HVqJ-du zG>d)F4x&?Y#990o{#mf|;CYHsf?|9(c-kG4+tmUN!Ft)(gH_NdKN;+(05!8-0{9qQ znQ+VIXw)vV$Q5B!(5Nv}j;ZWbF%uDHR9TG~{=GMBW@lTJT+PZNqK}~o9-tYTq7!tA zCUA~pGACu3lVl0miUFBJTWuiMg9s1jy&9s>k70F2+0SApX8hnC5FIe$*a35`a|ifq zzAJp)>*aU*bmNr{|6wPz@kvZJ(lG}!WBiiuYhj@Q8R6s2abG!KN=|rpOFP#+O`53t zoicMC^3Wl~QNl{}!HVb&{$kG*|2^n$8I-#jd>6SZI4v!I7wmKC{HboOVS!eRz3zaB ztDexVH*EZPtM1}kUM~Qn*JX@0`B#iZJN-At!m=addO|kFDLZ3hx@XOeQ0fG{teF&v zxV=uR|Hw6GLGNv2?)JI^FY3XMC$tgs7}ZS|SuyA7l1^y8nk!sd`$*H8bvFH=d%)-wbPMCqLFmQP5D znX=1$;rNtg+p_2|q@oY;gscjKi*f_=ZNSXrqfUC zL;QLdvGKbSQ4hnVR^8%*@n6M+7!lX7PSfle_WHBi?1SgG*%o_t5 zVE>=*A>5i{*Y&NAwj0d1?i{ySp>m0Nrp3Rl(-E4beh^CIY~=9}S;G^lh_$&ti#bqK z-Vr+Hruup)06Pav0jOn2@>r*EDn#*8D6S~7Scw)9n(KJ77Jxj9w@B%bbaX-x;0rB* z$+GbRK;n@t9xP>(N#JxE$Dmrl|EjtqS{`_Uz@`{kl;r0U+DS83o!(|2vuo(bD`@RA Xr&=>GetName()->Version; - return ( ver->Major.ToString() + "." + ver->Minor.ToString() + "TRIAL" ); + return ( ver->Major.ToString() + "." + ver->Minor.ToString() ); } // SRLに登録されないROM仕様のフォーム入力を diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx index 30eeb5e..7221940 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx @@ -1085,7 +1085,7 @@ 縺昴ョ莉悶い繝励Μ諠蝣ア - 245, 82 + 245, 103 88, 12 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index 5712c0d..895cc91 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -5698,7 +5698,7 @@ Submission Date - 711, 24 + 731, 24 Form1 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index cea938621fb0b3ddfc61c40380fc3a42e83e55c3..1186e610aadebf31f386198f941c45d930b0479a 100644 GIT binary patch delta 356 zcmZ3omvPBn#tn9Cf(8tRKxhesW(>v*K;C3UN7KzMY>W7?Ny*1=)>4yT1WFlU(e*`4 zh67V-v!c8rNZ1&Qjt=#ELYPvU%dN^mc9@{**sSQN%(z*}wvP#m+(CPPkQP%6EgPA! r2t!qyp{fRY-FkDKn-j=|BPZed%*hfPX8ezTUE1S3$&7>lki zVlo_)f0`=A%h%zUToq-vU*~W<#&fAZyWuO?~o(00hWA=Kufz diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index 7c35821..dd670ad 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -323,9 +323,7 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) u32 allsize = this->hNandUsedSize->NandUsedSize; // TMDやサブバナーのサイズを含める if( allsize > METWL_ALLSIZE_MAX_NAND ) { - this->hErrorList->Add( this->makeMrcError( - RCMrcError::PurposeType::Production | RCMrcError::PurposeType::DSiShop, - "UsedNandSizeLimit") ); + this->hErrorList->Add( this->makeMrcError("UsedNandSizeLimit") ); } if( (allsize > METWL_ALLSIZE_MAX_NAND_LIC) && this->IsAppUser ) // ユーザアプリのときのみ { @@ -500,6 +498,10 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) { this->hErrorList->Add( this->makeMrcError("DebugBuild") ); } + if( lic->Publisher->Equals( "NINTENDO" ) && lic->Name->StartsWith( "DEBUG DWC" ) ) + { + this->hErrorList->Add( this->makeMrcError("DwcDebug") ); + } } // 中韓版チェック @@ -607,6 +609,39 @@ void RCSrl::mrcAccessControl(FILE *fp) this->hErrorList->Add( this->makeMrcError("CardAccess") ); } + // TCLライブラリを使用しているかどうかを調べる + System::Boolean useTcl = false; + for each( RCLicense ^lic in this->hLicenseList ) + { + if( lic->Publisher->StartsWith("NINTENDO") && lic->Name->StartsWith("TCL") ) + { + useTcl = true; + } + } + + // TCL_DeletePicture() を使用してはいけないSDKを調べる(DEA-SUP参照) + bool prohibid = false; + if( useTcl && (this->pRomHeader->s.access_control.photo_access_write != 0) ) + { + for each( RCSDKVersion ^sdk in this->hSDKList ) + { + if( sdk->IsStatic ) + { + System::Byte major = (System::Byte)(0xff & (sdk->Code >> 24)); + System::Byte minor = (System::Byte)(0xff & (sdk->Code >> 16)); + System::UInt16 relstep = (System::UInt16)(0xffff & sdk->Code); + if( (major == 5) && (minor == 3) && (30000 <= relstep) && (relstep < 30003) ) + { + this->hWarnList->Add( this->makeMrcError("TclDeletePicture53") ); + } + else if( (major == 5) && (minor == 2) && (30000 <= relstep) && (relstep < 30004) ) + { + this->hWarnList->Add( this->makeMrcError("TclDeletePicture52") ); + } + } + } + } + if( !this->IsAppUser ) // システムアプリ { if( this->pRomHeader->s.access_control.common_client_key != 0 ) @@ -836,14 +871,6 @@ void RCSrl::mrcAccessControl(FILE *fp) if( (this->pRomHeader->s.access_control.photo_access_read != 0) || (this->pRomHeader->s.access_control.photo_access_write != 0) ) { - System::Boolean useTcl = false; - for each( RCLicense ^lic in this->hLicenseList ) - { - if( lic->Publisher->StartsWith("NINTENDO") && lic->Name->StartsWith("TCL") ) - { - useTcl = true; - } - } if( !useTcl ) { this->hErrorList->Add( this->makeMrcError("PhotoTclAccessUser") ); @@ -964,6 +991,7 @@ void RCSrl::mrcReservedArea(FILE *fp) } if( !bReserved ) { + // begin と end が mrc_msg.xml には記載されていないので呼び出し方が他とは異なる this->hErrorList->Add( this->makeMrcError(begin, end, false, true, RCMrcError::PurposeType::Common, "ReservedArea") ); } } //for each @@ -1369,12 +1397,12 @@ void RCSrl::mrcTrialApp(FILE *fp) if( this->pRomHeader->s.platform_code == PLATFORM_CODE_TWL_LIMITED ) { this->hWarnList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneLimited") ); - this->hWarnList->Add( this->makeMrcError(RCMrcError::PurposeType::DSDownload, "DSDownloadLimited") ); + this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::DSDownload, "DSDownloadLimited") ); } if( filesize > (5 * 1024 * 1024 / 2) ) { - this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneRomSize") ); - this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::DSDownload, "DSDownloadRomSize") ); + this->hWarnList->Add( this->makeMrcError(RCMrcError::PurposeType::Zone, "ZoneRomSize") ); + this->hWarnList->Add( this->makeMrcError(RCMrcError::PurposeType::DSDownload, "DSDownloadRomSize") ); } if( !this->HasDSDLPlaySign ) {