マスタエディタ:ミドルウェアリスト出力を拡張。ミドルウェア名を設定ファイルから取得して追記するようにした。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@284 7061adef-622a-194b-ae81-725974e89856
2025-10-31 06:41:18 -04:00 · 2009-06-05 06:38:25 +00:00 · 2009-06-05 06:38:25 +00:00 · 1b371075d2
commit 1b371075d2
parent 9ead5c44a4
15 changed files with 266 additions and 25 deletions
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
 // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
 // 既定値にすることができます:

-[assembly:AssemblyVersionAttribute("1.5.*")];
+[assembly:AssemblyVersionAttribute("1.6.*")];

 [assembly:ComVisible(false)];

--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
@ -10,6 +10,7 @@
 #include "FormError.h"
 #include "Form1_const.h"
 #include "message_bank.h"
+#include "middleware_name_list.h"

 namespace MasterEditorTWL {

@ -65,6 +66,9 @@ namespace MasterEditorTWL {
 		// エラーメッセージ
 		RCMessageBank ^hMsg;

+		// ミドルウェア名称リスト
+		RCMiddlewareNameList ^hMiddlewareNameList;
+
 	/////////////////////////////////////////////
 	// VC自動追加フィールド
 	/////////////////////////////////////////////
@ -4233,7 +4237,7 @@ private: System::Windows::Forms::ComboBox^  combGRB;
 		{
 			System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly();
 			System::Version ^ver =  ass->GetName()->Version;
-			return ( ver->Major.ToString() + "." + ver->Minor.ToString() + "a" );
+			return ( ver->Major.ToString() + "." + ver->Minor.ToString() );
 		}

 		// SRLに登録されないROM仕様のフォーム入力を
@ -4378,6 +4382,11 @@ private: System::Windows::Forms::ComboBox^  combGRB;
 		{
 			return (this->getResDir() + "mrc_msg_e.xml");
 		}
+		// ミドルウェア名称リストファイル
+		System::String^ getMiddlewareNameListFile(void)
+		{
+			return (this->getResDir() + "middleware_name_list.xml");
+		}

 	private:
 		// ----------------------------------------------
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp
@ -41,6 +41,7 @@ void Form1::construct(void)
 	this->IsReadOnly    = false;
 	this->SizeGboxExFlags   = this->gboxExFlags->Size;
 	this->hMsg = gcnew RCMessageBank( this->getGuiMessageFileJ(), this->getGuiMessageFileE() );
+	this->hMiddlewareNameList = gcnew RCMiddlewareNameList( this->getMiddlewareNameListFile() );

 	// バージョン情報を表示
 	//this->labAssemblyVersion->Text = System::Windows::Forms::Application::ProductVersion;
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp
@ -214,6 +214,18 @@ void Form1::loadAppendInit(void)
 			u32 relstep = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/relstep" ) );
 			u32 sdkver  = (major << 24) | (minor << 16) | (relstep & 0xFFFF);
 			this->hSrl->hMrcExternalCheckItems->SDKVer = sdkver;
+
+			major   = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticTWL/major" ) );
+			minor   = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticTWL/minor" ) );
+			relstep = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticTWL/relstep" ) );
+			sdkver  = (major << 24) | (minor << 16) | (relstep & 0xFFFF);
+			this->hSrl->hMrcExternalCheckItems->SDKVerNotStaticTWL = sdkver;
+
+			major   = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticNTR/major" ) );
+			minor   = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticNTR/minor" ) );
+			relstep = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticNTR/relstep" ) );
+			sdkver  = (major << 24) | (minor << 16) | (relstep & 0xFFFF);
+			this->hSrl->hMrcExternalCheckItems->SDKVerNotStaticNTR = sdkver;
 		}
 		catch ( System::Exception ^ex )
 		{
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp
@ -58,6 +58,16 @@ System::Void Form1::makeMiddlewareListXml(System::Xml::XmlDocument^ doc)
 			System::Xml::XmlElement ^mid = doc->CreateElement( "middleware" );
 			MasterEditorTWL::appendXmlTag( doc, mid, "publisher", lic->Publisher );
 			MasterEditorTWL::appendXmlTag( doc, mid, "name", lic->Name );
+			System::String ^note = "";
+			if( this->isJapanese() )
+			{
+				note = this->hMiddlewareNameList->search(lic->Publisher, lic->Name, true );
+			}
+			else
+			{
+				note = this->hMiddlewareNameList->search(lic->Publisher, lic->Name, false );
+			}
+			MasterEditorTWL::appendXmlTag( doc, mid, "note", note );
 			midlist->AppendChild( mid );
 		}
 	}
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj
@ -387,6 +387,10 @@
 				RelativePath=".\message_bank.h"
 				>
 			</File>
+			<File
+				RelativePath=".\middleware_name_list.h"
+				>
+			</File>
 			<File
 				RelativePath=".\resource.h"
 				>
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h
@ -336,6 +336,8 @@ namespace MasterEditorTWL
 	public:
 		property System::Boolean  IsAppendCheck;						// 追加チェックをするかどうか(すべての項目が追加チェックとは限らない)
 		property System::UInt32   SDKVer;								// SDKのバージョン
+		property System::UInt32   SDKVerNotStaticTWL;					// SDKのバージョン(TWL常駐モジュール以外)
+		property System::UInt32   SDKVerNotStaticNTR;					// SDKのバージョン(NTR常駐モジュール以外)
 		property System::Boolean  IsPermitNormalJump;					// ノーマルジャンプがアクセス許可されているか
 		property cli::array<System::Boolean> ^hIsPermitShared2Array;	// Shared2ファイルアクセスが許可されているか
 		property cli::array<System::UInt32>  ^hShared2SizeArray;		// Shared2ファイルサイズ
@ -345,6 +347,8 @@ namespace MasterEditorTWL
 		{
 			this->IsAppendCheck         = false;
 			this->SDKVer                = 0;
+			this->SDKVerNotStaticTWL    = 0;
+			this->SDKVerNotStaticNTR    = 0;
 			this->IsPermitNormalJump    = false;
 			this->hIsPermitShared2Array = gcnew cli::array<System::Boolean>(METWL_NUMOF_SHARED2FILES);
 			this->hShared2SizeArray     = gcnew cli::array<System::UInt32>(METWL_NUMOF_SHARED2FILES);
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
@ -888,6 +888,8 @@ void RCSrl::mrcSDKVersion(FILE *fp)
 {
 	// SDKバージョン
 	System::Boolean isOld  = false;
+	System::Boolean isOldExTWL = false;
+	System::Boolean isOldExNTR = false;
 	System::Boolean isPR   = false;
 	System::Boolean isRC   = false;
 	for each( RCSDKVersion ^sdk in this->hSDKList )
@ -901,11 +903,34 @@ void RCSrl::mrcSDKVersion(FILE *fp)
 				isOld = MasterEditorTWL::IsOldSDKVersion( sdk->Code, this->hMrcExternalCheckItems->SDKVer );
 			}
 		}
+		else	// 常駐モジュール以外
+		{
+			if( this->hMrcExternalCheckItems->IsAppendCheck )
+			{
+				u32 major = sdk->Code >> 24;
+				if( major >= 5 )	// TWLSDK
+				{
+					isOldExTWL = MasterEditorTWL::IsOldSDKVersion( sdk->Code, this->hMrcExternalCheckItems->SDKVerNotStaticTWL );
+				}
+				else				// NTRSDK
+				{
+					isOldExNTR = MasterEditorTWL::IsOldSDKVersion( sdk->Code, this->hMrcExternalCheckItems->SDKVerNotStaticNTR );
+				}
+			}
+		}
 	}
 	if( isOld )
 	{
 		this->hWarnList->Add( this->makeMrcError("SDKVersionOld") );
 	}
+	if( isOldExTWL )
+	{
+		this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleTwlOld") );
+	}
+	if( isOldExNTR )
+	{
+		this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleNtrOld") );
+	}
 	if( isPR )
 	{
 		this->hWarnList->Add( this->makeMrcError("SDKVersionPR") );
@ -925,19 +950,7 @@ void RCSrl::mrcBanner(FILE *fp)
 	u8 mapChina[ 0x10000 ];
 	u8 mapKorea[ 0x10000 ];
 	int i;
-/*
-	// 本体設定だけはガイドライン無視
-	if( memcmp( this->pRomHeader->s.game_code, "HNB", 3 ) == 0 )
-	{
-		//this->hWarnList->Add( gcnew RCMrcError( 
-		//	"バナーファイル", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE,
-		//	"本体設定アプリに限ってはバナーの文字コードチェックをスキップします。",
-		//	"Banner File",
-		//	"Only a machine setting app., a charactor code check of the banner file is skip.",
-		//	false, true ) );
-		return;
-	}
-*/
+
 	// バナーオフセットにエラーがあるときには調べない
 	if( this->pRomHeader->s.banner_offset == 0 )
 	{
@ -978,6 +991,9 @@ void RCSrl::mrcBanner(FILE *fp)
 		this->hErrorList->Add( this->makeMrcError("BannerRead") );
 	}

+	// バナーバージョン
+	u8 banner_version = banner[0];
+
 	// バナーの各文字がマップに登録されているかチェック
 	System::Boolean bResultWorldwide = true;
 	System::Boolean bResultChina     = true;
@ -990,7 +1006,7 @@ void RCSrl::mrcBanner(FILE *fp)
 		code = (code << 8) + banner[i];

 		// 中国のフォント箇所
-		if( (0x840 <= i) && (i < 0x940) )
+		if( (0x840 <= i) && (i < 0x940) && (banner_version >= 2) )	// バナーバージョンが1のときは中国版バナーは読み込まれない
 		{
 			if( (mapWorldwide[ code ] == 0) && (mapChina[ code ] == 0) )	// ワールドワイド版が使われててもOK
 			{
@ -998,7 +1014,7 @@ void RCSrl::mrcBanner(FILE *fp)
 			}
 		}
 		// 韓国のフォント箇所
-		else if( (0x940 <= i) && (i < 0xA40) )
+		else if( (0x940 <= i) && (i < 0xA40) && (banner_version >= 3) )
 		{
 			if( (mapWorldwide[ code ] == 0) && (mapKorea[ code ] == 0) )
 			{
@ -1016,10 +1032,10 @@ void RCSrl::mrcBanner(FILE *fp)
 	}
 	if( !bResultWorldwide )
 	{
-		if( memcmp( this->pRomHeader->s.game_code, "HNB", 3 ) != 0 )	// 本体設定は特別に許される
-		{
+		//if( memcmp( this->pRomHeader->s.game_code, "HNB", 3 ) != 0 )	// 本体設定は特別に許される
+		//{
 			this->hErrorList->Add( this->makeMrcError("BannerChar") );
-		}
+		//}
 	}
 	if( !bResultChina )
 	{
--- a/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml
@ -5,9 +5,19 @@
 	<!-- SDKのバージョンのチェックをする場合にはONを指定してください。-->
 	<spcheck>ON</spcheck>
 	<!-- SDKバージョンの真値を指定してください。 -->
-	<sdk>
+	<sdk>				<!-- TWL常駐モジュール -->
 		<major>5</major>
 		<minor>0</minor>
 		<relstep>30000</relstep>
 	</sdk>
+	<sdkNotStaticTWL>	<!-- TWL常駐モジュール以外のモジュール -->
+		<major>5</major>
+		<minor>0</minor>
+		<relstep>30000</relstep>
+	</sdkNotStaticTWL>
+	<sdkNotStaticNTR>	<!-- NTR常駐モジュール以外のモジュール -->
+		<major>4</major>
+		<minor>0</minor>
+		<relstep>30000</relstep>
+	</sdkNotStaticNTR>
 </init>
--- a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware.xsl
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware.xsl
@ -19,7 +19,7 @@
 			  font-weight: bold;
 			}
 			hr {
-			  width: 700px;
+			  width: 1000px;
 			  margin-left: 0;
 			}
 			tr {
@ -34,7 +34,10 @@
 			  width: 200px;
 			}
 			th.name {
-			  width: 500px;
+			  width: 400px;
+			}
+			th.note {
+			  width: 400px;
 			}
 	        td {
 	          font-weight: normal;
@ -75,6 +78,7 @@
 		<tr>
 			<th class="publisher">Publisher</th>
 			<th class="name">Middleware Name</th>
+			<th class="note">Note</th>
 		</tr>

 		<xsl:apply-templates />
@ -86,6 +90,7 @@
 	<tr>
 		<td class="publisher"><xsl:value-of select="publisher" /></td>
 		<td class="name"><xsl:value-of select="name" /></td>
+		<td class="note"><xsl:value-of select="note" /></td>
 	</tr>
 </xsl:template>

--- a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_e.xsl
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_e.xsl
@ -19,7 +19,7 @@
 			  font-weight: bold;
 			}
 			hr {
-			  width: 700px;
+			  width: 1000px;
 			  margin-left: 0;
 			}
 			tr {
@ -34,7 +34,10 @@
 			  width: 200px;
 			}
 			th.name {
-			  width: 500px;
+			  width: 400px;
+			}
+			th.note {
+			  width: 400px;
 			}
 	        td {
 	          font-weight: normal;
@ -75,6 +78,7 @@
 		<tr>
 			<th class="publisher">Publisher</th>
 			<th class="name">Middleware Name</th>
+			<th class="note">Note</th>
 		</tr>

 		<xsl:apply-templates />
@ -86,6 +90,7 @@
 	<tr>
 		<td class="publisher"><xsl:value-of select="publisher" /></td>
 		<td class="name"><xsl:value-of select="name" /></td>
+		<td class="note"><xsl:value-of select="note" /></td>
 	</tr>
 </xsl:template>

--- a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_name_list.xml
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_name_list.xml
@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<middleware-name-list>
+	<version>1.6</version>
+
+	<middleware>
+		<publisher>MEI</publisher>
+		<code>libASR</code>
+		<note-j>音声認識エンジン for NINTENDO DS (パナソニック)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>MEI</publisher>
+		<code>ASR</code>
+		<note-j>音声認識エンジン for NINTENDO DS (パナソニック)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>Panasonic</publisher>
+		<code>ASR</code>
+		<note-j>音声認識エンジン for NINTENDO DS (パナソニック)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>Panasonic</publisher>
+		<code>libASR</code>
+		<note-j>音声認識エンジン for NINTENDO DS (パナソニック)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>Actimagine</publisher>
+		<code>VX</code>
+		<note-j>VX MiddleWare for NINTENDO DS (Actimagine)</note-j>
+		<note-e>VX MiddleWare for NINTENDO DS (Actimagine)</note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>NINTENDO</publisher>
+		<code>DWC</code>
+		<note-j>TWL-DWC (任天堂)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>NINTENDO</publisher>
+		<code>WiFi</code>
+		<note-j>TWL-WiFi (任天堂)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>MEI</publisher>
+		<code>libHWR_FULL</code>
+		<note-j>手書き認識ライブラリ (松下)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>Panasonic</publisher>
+		<code>libHWR_FULL</code>
+		<note-j>手書き認識ライブラリ (松下)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>Zi Corporation</publisher>
+		<code>DLTLIB</code>
+		<note-j>Decuma手書文字認識ライブラリ日本語版 (Zi Corporation)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>Zi Corporation</publisher>
+		<code>SCRLIB</code>
+		<note-j>Decuma手書文字認識ライブラリ英語版 (Zi Corporation)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>Zi Corporation</publisher>
+		<code>MCRLIB</code>
+		<note-j>Decuma手書文字認識ライブラリ英語版 (Zi Corporation)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>JUSTSYSTEM</publisher>
+		<code>ATOK</code>
+		<note-j>DS用ATOKライブラリ (ジャストシステム)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>Abiosso</publisher>
+		<code>VoiceChat</code>
+		<note-j>VoiceChatライブラリ for NINTENDO DS (Abiosso)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>SHARP</publisher>
+		<code>SHTTS</code>
+		<note-j>SHARP音声合成ライブラリ</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>ACCESS</publisher>
+		<code>NFC</code>
+		<note-j>NetFront ブラウザコンポーネント HTTP/HTTPSプロトコル</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>ACCESS</publisher>
+		<code>NFB</code>
+		<note-j>NetFront ブラウザコンポーネント</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>TMC</publisher>
+		<code>MP3Decoder_</code>
+		<note-j>MP3コーデックライブラリ (テクノマセマティカル)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>Actimagine</publisher>
+		<code>Mobiclip</code>
+		<note-j>Mobiclip Middleware for NINTENDO DS (Actimagine)</note-j>
+		<note-e>Mobiclip Middleware for NINTENDO DS (Actimagine)</note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>OKI</publisher>
+		<code>FSE</code>
+		<note-j>TWL用 顔認識ライブラリ (沖電気)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>TOSHIBA</publisher>
+		<code>SPConv</code>
+		<note-j>スピーチコンバータ for DS (東芝)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>NINTENDO</publisher>
+		<code>M4A</code>
+		<note-j>MPEG4Systems Demux ライブラリ (CEVA+SHARP+任天堂)</note-j>
+		<note-e></note-e>
+	</middleware>
+
+	<middleware>
+		<publisher>NINTENDO</publisher>
+		<code>AAC-LC</code>
+		<note-j>AAC-LC Decoder ライブラリ (CEVA+SHARP+任天堂)</note-j>
+		<note-e></note-e>
+	</middleware>
+</middleware-name-list>