From bf58c83a1febc47a7dd2d3fe48ac7fcb94c1df3e Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Tue, 12 Jan 2010 06:54:32 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=A8=93=E7=89=88=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=96=E3=83=A9=E3=83=AA=E3=81=AE=E5=90=8D=E7=A7=B0=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=81=AB=E4=BC=B4=E3=81=86ROM=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=81=AE=E5=A4=89=E6=9B=B4/=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=EF=BC=8E?= 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@484 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 13937664 -> 13937664 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 83968 -> 83968 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 23956 -> 23956 bytes .../MasterEditorTWL/Release/BuildLog.htm | Bin 24228 -> 24228 bytes .../MasterEditorTWL/srl_mrc.cpp | 13 ++++++++-- .../MasterEditorTWLSetup.vdproj | 24 +++++++++--------- .../MasterEditorTWL/resource/mrc_msg_e.xml | Bin 73252 -> 73802 bytes .../MasterEditorTWL/resource/mrc_msg_j.xml | 12 ++++++--- 8 files changed, 32 insertions(+), 17 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 51509e9d852279cd0350e1617d86b73eac5e475c..79d2c74508bb96332ce9909d333c97bc3ba2ed1a 100644 GIT binary patch delta 10253 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 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 83d9a74bf1e01f366cbedd69f51500bb10ddd950..21cefc8ec884caafed2eb7ff32f294b9b6d8a18d 100644 GIT binary patch delta 1023 zcmZuvU2Icj81CDibK29cXZ>T=Z8Wuvn{9SoN6gktdY0^>0tOnFU4X>79|bZBY@Ly~ zXeWvjmbmoMoB(2K)eNUGq+h#5 zp7;6Q=S@wDsY&syZj_%g7z|NfE$ou*_OLLqfMeNAO(udHgsf;-u<9@j?wu za)1bNOO)yI5fK-KW+W?jptGhu=lG7~Hql^+^D<%1IV>t%)duIE4M@7SuW@g?wo7E? zu)Pekr27ps{lNaIenq4(8}T1^Vk{iJKd_31(%}K<;gr-jvVS0vgdUBsREt_69q@-k zp;n~S5O%d#wO%*H5K~+22B|$UGB~)I4=@mRhx_hJ*|HsG?72{no*sdPyK0F%AYTE! zk2WIow!$J?tY)gvqP5h-lJN3SdYy&te)!!~T4+L=9LM02&-&R?p+svLymZtB>C3x_$W54^ zax(SYCL`1hcgUp08|WUH*`f3Hazx~NGp)y!(@LiOv_jmpp|swN#{>@>)}J=I_XS_x zKUhZpKOTH*+02|5TS(ab>CCSz_Khx?IDy%|KPNv-=hX55kMQ1xvM+Y{>J9Un!O=x8 z|H`tK@{)wX>(zL7@hI)Y*vB3CAn!rqXRD@5bXVL|cEq>(R_>R>)`!cxga>f;)yg$d r-o^teA6Pd&EV}6|D-=Vv2Z*zO5xryAG7h>m`+6n$Xg2Mn#1sDlKpSX_ delta 992 zcmZuvZD?C%6u#$rZ*Fdq<>T&BYZ7A3++=NO)1;13hrMM*_JP!lx*xWT(51G@XxB7? zA1HB?`ZZje$9WkYTBA^@B3)m)Xx-dp_0Kj28-yY{*D8p@f*ZAVQ>691tG~uxI6vOQ zInT#ACpRqThUH01RO5mmH1pWW&WoRr!$=u&-%*y4_DYyL_Zar6QFJCAhEHvj8tO8H zq_de>>S5VItNeKp_`L>M-&68Bj!|v@*pjbA>UIA0kRSwbB`}CqR}5LL%|R|ZeWzzh zYs0M6z_RP#P^irQ4!$B&g1u1nZU7zeZX7c@V8wH2j)#=)zPe2J;EQL-{XN{82HiHh_<*J7e^mO-RuKm`aq#Yfw*ZAe++LT9TfQunZYL3w9BQ~ zdRR7jL`1wj&Wv9xN#4SR`FYXF!d@4s)C%v8Dwb|f6Dy@OG7B0l;dH7J`be;l7NLDm z!k4@KbU*vKOC?NYG_{2zh&&w3*ZT-T@41Ywu~RsBO=lOLe@!Cy+Nk=EnEo(TQyjkI zH`Wa3(2kc;d!>>!9rW0pGli^SpN5WEolbDuBohS_4LP=ER z*)v^%QmV{V2C-PYjg{UCrB3MO>bII7X><$OAsvpd{}EgJVI&@B#!RD#=-4uzJ*%7T zHS{kj7&yIZQw-&;q<7LYwr$crLqT{V;>1Ie&IYX~MKS#xtmZ~+S3@i?n;?nKq&Bl1 z-&v0PfQGQ3Q}hrczHfZe6D-`;%lzN`}0G5dDqMj6$;CZ zobwsH{%H$37b3I*ioQAZ%S*0%<7(1fdG^iCpJa76-NqoG#p2peqa?E{KVewC* Vqw9)UKSjtq*o5F`x^1Yq(W;@X^Mxdk< z4xM#On>!0%xp7c&Nt-VUygv)3Oj`u?xDc&9>I_nXyW| zxAO$)aK)lSmT_~2V-pirS*SKQbZx+}vD`e#)eNKyLvr(bJ8QQK&+`%Y|M-hY4nPt5=T delta 427 zcmbQTn{mo+#tmj{!Uhb648{!R3>H9W#$W)%7L#qQjW^e@P2s~T`QA=?vz=%dBT&)^ zht4{t%@L9lSh1=AYM*Q;>a;mReib`VfiYGiJk;Zaut{#-X;}!e*aThIW?Sp|%vdGf z+j)X?m}1c(%eXniv55(*EL58rx;9|gSZCAW8O#}s7>t3?l)-FsAlp?wtP+-@<&1(RK$WQK4~hkH zUFhkd|nbBq=Go~=m4(Uy&BlNoI+H`lqjFbQHxfvr+uoGj)eAZdxNkwK3ki6N1p zWOBT!_~ZgMq0K2?hZqGhlx;Tm(dA?`+gu;S%s9DES!8leSPY{Dn7jE-_z5-uXdq2N delta 408 zcmZ3omvPBn#tn9C!Uha(42BHmKx_uYrVJ(wCYuAHDMGq#-c%y zakGol1SU*5xGocPU6UDYEH~G=xiAT0N`b9XVVo@HBOqytu8~2HA&DW8p=5Hrs`%sr sHlfWaUWXV3F_djK_tE8KG}&Aq#LPIkPg!JgO;`-0C78SUPWTBn0FnPo!~g&Q diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index 6ef2325..b12cd3d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -1352,17 +1352,26 @@ void RCSrl::mrcTrialApp(FILE *fp) // 表示するときに振り分けをする // Touch!Try!DS + bool use_tis = false; bool use_nis = false; for each( RCLicense ^lic in this->hLicenseList ) { + if( lic->Publisher->Equals( "NINTENDO" ) && lic->Name->StartsWith( "TIS_FOR_TWLSDK" ) ) + { + use_tis = true; + } if( lic->Publisher->Equals( "NINTENDO" ) && lic->Name->StartsWith( "NIS_FOR_TWLSDK" ) ) { use_nis = true; } } - if( !use_nis ) + if( !use_tis ) { - this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::TouchTryDS, "TouchTryDSLib") ); + this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::TouchTryDS, "TouchTryDSLibTis") ); + } + if( use_nis ) + { + this->hErrorList->Add( this->makeMrcError(RCMrcError::PurposeType::TouchTryDS, "TouchTryDSLibNis") ); } if( this->IsMediaNand ) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj index 628bff3..7a683b2 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj @@ -57,7 +57,7 @@ } "Entry" { - "MsmKey" = "8:_6ACA4D814AA04AF2A2F63060CDA5FA7D" + "MsmKey" = "8:_4E53291669A94A01BEB1B14679DF85E0" "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" "MsmSig" = "8:_UNDEFINED" } @@ -87,6 +87,12 @@ } "Entry" { + "MsmKey" = "8:_899760908357496CB0912065D65DDBDA" + "OwnerKey" = "8:_4E53291669A94A01BEB1B14679DF85E0" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_9081D70FB535474FA8789DC9AFE4637C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -111,12 +117,6 @@ } "Entry" { - "MsmKey" = "8:_E67AE567BCA041ABA7D402B9029EA503" - "OwnerKey" = "8:_6ACA4D814AA04AF2A2F63060CDA5FA7D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_FE56DE664C36410FB05BBF909ADE9DBE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -408,7 +408,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3658.26637, Culture=en, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3664.28542, Culture=en, processorArchitecture=MSIL" "ScatterAssemblies" { } @@ -494,7 +494,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3658.26637, Culture=ja, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.8.3664.28542, Culture=ja, processorArchitecture=MSIL" "ScatterAssemblies" { } @@ -657,7 +657,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MasterEditorTWL" "ProductCode" = "8:{B12B5AFF-26D1-47B5-85B6-1E2A7B5106F5}" - "PackageCode" = "8:{E2B78A12-4165-4BC1-99EC-3E8BF69CB7A6}" + "PackageCode" = "8:{1047076B-0F2A-4B45-8FB6-12E43381C4B5}" "UpgradeCode" = "8:{CE22C209-7AE1-4F58-8F6B-6D044BA2A118}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" @@ -1186,7 +1186,7 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_6ACA4D814AA04AF2A2F63060CDA5FA7D" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_4E53291669A94A01BEB1B14679DF85E0" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -1200,7 +1200,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E67AE567BCA041ABA7D402B9029EA503" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_899760908357496CB0912065D65DDBDA" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml index 651efcc33ca6d1725848c64bcd87105ce54b6202..a510eee18253d96565e03a34509ce3c201f370e2 100644 GIT binary patch delta 155 zcmZ3ohvn1(mJM1GtRW1U48@ZlHb_rCrxG=Jfh*hOB@#-EA)Aj&s53$(-%2WT`v8?C zG5En1=gEXkf564aH<^oDVDd4E2weq+P=;cLR0aix5{3*g9m3$r5Det!fVCDeBr+5+ eR5EA)RcTH(( delta 54 zcmX?gfMv-ZmJM1GlP_6HOm>ipn7lwjXYw{6ts;40vVe-xWGgv=$p-F1Ai3rZGTS%E IFwSBI06aGnX8-^I diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml index cf08ae5..ede8a72 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -61,11 +61,17 @@ - + Touch!Try!DS菴馴ｨ鍋沿蟇ｾ蠢 - Touch!Try!DS菴馴ｨ鍋沿縺ｧ縺ｯNIS繝ｩ繧､繝悶Λ繝ｪ繧剃ｽｿ逕ｨ縺吶ｋ蠢隕√′縺ゅｊ縺ｾ縺吶 + Touch!Try!DS菴馴ｨ鍋沿縺ｧ縺ｯTIS繝ｩ繧､繝悶Λ繝ｪ繧剃ｽｿ逕ｨ縺吶ｋ蠢隕√′縺ゅｊ縺ｾ縺吶 00FalseTrue - + + + + Touch!Try!DS菴馴ｨ鍋沿蟇ｾ蠢 + Touch!Try!DS菴馴ｨ鍋沿縺ｧ縺ｯNIS繝ｩ繧､繝悶Λ繝ｪ繧剃ｽｿ逕ｨ縺励※縺ｯ縺縺代∪縺帙ｓ縲５IS繝ｩ繧､繝悶Λ繝ｪ繧剃ｽｿ逕ｨ縺励※縺上□縺輔＞縲 + 00FalseTrue + Touch!Try!DS菴馴ｨ鍋沿蟇ｾ蠢