From 58fb914c7ff6227cb93883f2f3e62e083c60e2e9 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Wed, 25 Mar 2009 01:10:01 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E3=82=A8=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=82=BF:photo=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9?= =?UTF-8?q?=E6=99=82=E3=81=ABTCL=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9?= =?UTF-8?q?=E3=83=AA=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=A8=E3=81=8D=E3=81=AB=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E3=81=AB=E3=81=99=E3=82=8B=E3=83=81=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92"1.5a"=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=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@252 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11496448 -> 11496448 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 73216 -> 76288 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 22878 -> 22906 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 2 +- .../MasterEditorTWL/srl_mrc.cpp | 17 +++++++++++++++++ .../MasterEditorTWL/resource/mrc_msg_e.xml | 5 +++++ .../MasterEditorTWL/resource/mrc_msg_j.xml | 5 +++++ 7 files changed, 28 insertions(+), 1 deletion(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 8d73be14926bd033ace0b7d5ea79b0c3839cb09e..49e3de6dc98a431807d8b823831739294991fdf1 100644 GIT binary patch delta 7294 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 aeMeXv*SEj0q)@dF@D^Y{EmSoWFZ>(gf}08e delta 15259 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 Gs|5i=kVJX_ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index 22e7586..5ecc5d0 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -4214,7 +4214,7 @@ private: System::Windows::Forms::RadioButton^ rSubmitInternet; { System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly(); System::Version ^ver = ass->GetName()->Version; - return ( ver->Major.ToString() + "." + ver->Minor.ToString() ); + return ( ver->Major.ToString() + "." + ver->Minor.ToString() + "a" ); } // SRLに登録されないROM仕様のフォーム入力を diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index 7aedb41..a9ccdac 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -687,6 +687,23 @@ void RCSrl::mrcAccessControl(FILE *fp) { this->hWarnList->Add( this->makeMrcError("SDJpegSignAccessUser") ); } + // photoアクセスするのにTCLライブラリを使用していないとき + 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") ); + } + } } if( this->pRomHeader->s.access_control.common_client_key_for_debugger_sysmenu != 0 ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml index 58c6b9f..32f0253 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml @@ -272,6 +272,11 @@ Write access to the Photo Database is not permitted. 1b41b7FalseTrue + + 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア + 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク繧「繧ッ繧サ繧ケ縺吶k蝣エ蜷医↓縺ッTCL繝ゥ繧、繝悶Λ繝ェ繧剃スソ逕ィ縺励※縺上□縺輔>縲 + 1b41b7FalseTrue + Access Control Information JPEG signatures (JpegSign) are not enabled, even though write access to the Photo Database has been specified. diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml index 6df0f96..6c0c670 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -272,6 +272,11 @@ 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク縺ョ繝ゥ繧、繝医い繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 1b41b7FalseTrue + + 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア + 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク繧「繧ッ繧サ繧ケ縺吶k蝣エ蜷医↓縺ッTCL繝ゥ繧、繝悶Λ繝ェ繧剃スソ逕ィ縺励※縺上□縺輔>縲 + 1b41b7FalseTrue + 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク縺ョ繝ゥ繧、繝医い繧ッ繧サ繧ケ縺梧欠螳壹&繧後※縺繧九↓繧ゅ°縺九o繧峨★JPEG鄂イ蜷(JpegSign)縺梧怏蜉ケ縺ォ縺ェ縺」縺ヲ縺縺セ縺帙s縲