rvtr/TwlToolsRED
1
Fork 0
mirror of https://github.com/rvtr/TwlToolsRED.git synced 2025-10-31 06:41:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

エラーチェックを追加。

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@451 7061adef-622a-194b-ae81-725974e89856
This commit is contained in:
nishikawa_takeshi 2009-12-24 10:56:40 +00:00
parent 61e0ae8028
commit da3337e3af
8 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb
View File

Binary file not shown.

BIN
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo
View File

Binary file not shown.

BIN
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
View File

Binary file not shown.

2
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
View File

@ -4582,7 +4582,7 @@ private: System::Windows::Forms::RadioButton^ rPurposeCardTouchTryDS;
{
System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly();
System::Version ^ver = ass->GetName()->Version;
return ( ver->Major.ToString() + "." + ver->Minor.ToString() + "TRIAL" );
return ( ver->Major.ToString() + "." + ver->Minor.ToString() );
}
// SRLに登録されないROM仕様のフォーム入力を

2
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx
View File

@ -1085,7 +1085,7 @@
<value>その他アプリ情報</value>
</data>
<data name="labMedia.Location" type="System.Drawing.Point, System.Drawing">
<value>245, 82</value>
<value>245, 103</value>
</data>
<data name="labMedia.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 12</value>

2
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX
View File

@ -5698,7 +5698,7 @@
<value>Submission Date</value>
</data>
<data name="labAssemblyVersion.Location" type="System.Drawing.Point, System.Drawing">
<value>711, 24</value>
<value>731, 24</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>Form1</value>

BIN
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm
View File

Binary file not shown.

56
build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
View File

@ -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 )
{