diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index 88a9b3ae..247bf3b9 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo index dfca91f9..72d1f2c1 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 64403c41..3b91691f 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h index 2b2ca200..81b6322b 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -1,5 +1,6 @@ #pragma once +#include "common.h" #include "srl.h" #include "deliverable.h" #include "crc_whole.h" diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/FormError.h b/build/tools/MasterEditorTWL/MasterEditorTWL/FormError.h index 34df51ce..c79cf0a3 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/FormError.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/FormError.h @@ -1,5 +1,6 @@ #pragma once +#include "common.h" #include "srl.h" using namespace System; diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj b/build/tools/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj index e19f85a9..abcaa678 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj @@ -253,6 +253,10 @@ Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > + + diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/common.h b/build/tools/MasterEditorTWL/MasterEditorTWL/common.h new file mode 100644 index 00000000..ada6faf7 --- /dev/null +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/common.h @@ -0,0 +1,23 @@ +#pragma once + +// ビルドスイッチ +#define METWL_VER_APPTYPE_USER +//#define METWL_VER_APPTYPE_SYSTEM +//#define METWL_VER_APPTYPE_SECURE +//#define METWL_VER_APPTYPE_LAUNCHER + +//#define METWL_WHETHER_PLATFORM_CHECK // プラットフォームがTWL対応以外かどうかをチェックする +//#define METWL_WHETHER_SIGN_DECRYPT // 署名を外してダイジェストをベリファイする +#define METWL_WHETHER_MRC // MRC機能を含めるか + +// 定数 +#define METWL_ERRLIST_NORANGE 0 // エラーのアドレス範囲を指定しないことを表す特別な値 +#define METWL_ROMSIZE_MIN 256 // 最小のデバイス容量 256Mbit +#define METWL_ROMSIZE_MAX 4096 // 最大の.. 4Gbit +#define METWL_MASK_REGION_JAPAN 0x00000001 +#define METWL_MASK_REGION_AMERICA 0x00000002 +#define METWL_MASK_REGION_EUROPE 0x00000004 +#define METWL_MASK_REGION_AUSTRALIA 0x00000008 +#define METWL_MASK_REGION_CHINA 0x00000010 +#define METWL_MASK_REGION_KOREA 0x00000020 +#define METWL_MASK_REGION_ALL 0xffffffff diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/crc_whole.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/crc_whole.cpp index 0cb22739..9b418deb 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/crc_whole.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/crc_whole.cpp @@ -1,6 +1,7 @@ // crc_whole.h の実装 #include "stdafx.h" +#include "common.h" #include "crc_whole.h" #include #include diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index c8b9fa83..feebdeff 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -1,6 +1,7 @@ // deliverable.h のクラス実装 #include "stdafx.h" +#include "common.h" #include "srl.h" #include "deliverable.h" #include "utility.h" diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h index fabfb4ea..18eead19 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/deliverable.h @@ -1,5 +1,11 @@ +#pragma once + +// 書類クラスの宣言 + +#include "common.h" #include #include +#include "common.h" #include "srl.h" namespace MasterEditorTWL diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/keys.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/keys.cpp index 42cae43d..d8b89aca 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/keys.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/keys.cpp @@ -2,6 +2,7 @@ #include "stdafx.h" #include +#include "common.h" #include "keys.h" namespace MasterEditorTWL diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp index 8776a015..6491a27b 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -1,6 +1,7 @@ // srl.h のクラス実装 #include "stdafx.h" +#include "common.h" #include "srl.h" #include "utility.h" #include "keys.h" @@ -949,7 +950,7 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) { this->hWarnList->Add( gcnew RCMRCError( "アプリ種別", 0x230, 0x237, "システムアプリではありません。", - "Application Type", "Not SYSTEM application.", false ) ); + "Application Type", "Not SYSTEM application.", false, true ) ); } #endif #ifdef METWL_VER_APPTYPE_SECURE @@ -957,7 +958,7 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) { this->hWarnList->Add( gcnew RCMRCError( "アプリ種別", 0x230, 0x237, "セキュアアプリではありません。", - "Application Type", "Not SECURE application.", false ) ); + "Application Type", "Not SECURE application.", false, true ) ); } #endif #ifdef METWL_VER_APPTYPE_LAUNCHER @@ -965,7 +966,7 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) { this->hWarnList->Add( gcnew RCMRCError( "アプリ種別", 0x230, 0x237, "ランチャーアプリではありません。", - "Application Type", "Not LAUNCHER application.", false ) ); + "Application Type", "Not LAUNCHER application.", false, true ) ); } #endif } // アプリ種別のチェック @@ -1115,7 +1116,7 @@ System::Boolean RCSrl::mrcRegion( System::UInt32 region ) { this->hErrorList->Add( gcnew RCMRCError( "カードリージョン", 0x1b0, 0x1b3, "仕向地の組み合わせが不正です。本ツールを用いて修正できます。", - "Card Region", "Illigal Region. This tool can modify this information.", true ) ); + "Card Region", "Illigal Region. This tool can modify this information.", true, true ) ); bRegionResult = false; } #else diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h index d99afd8a..ebd94cc2 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.h @@ -2,6 +2,7 @@ // ROMデータ(SRL)クラスと関連クラスの宣言 +#include "common.h" #include #include #include diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/stdafx.h b/build/tools/MasterEditorTWL/MasterEditorTWL/stdafx.h index d923771d..6c1fb4be 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/stdafx.h +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/stdafx.h @@ -4,25 +4,3 @@ #pragma once // TODO: プログラムに必要な追加ヘッダーをここで参照してください。 - -// ビルドオプション -#define METWL_VER_APPTYPE_USER -//#define METWL_VER_APPTYPE_SYSTEM -//#define METWL_VER_APPTYPE_SECURE -//#define METWL_VER_APPTYPE_LAUNCHER - -//#define METWL_WHETHER_PLATFORM_CHECK // プラットフォームがTWL対応以外かどうかをチェックする -//#define METWL_WHETHER_SIGN_DECRYPT // 署名を外してダイジェストをベリファイする -#define METWL_WHETHER_MRC // MRC機能を含めるか - -// 宣言 -#define METWL_ERRLIST_NORANGE 0 // エラーのアドレス範囲を指定しないことを表す特別な値 -#define METWL_ROMSIZE_MIN 256 // 最小のデバイス容量 256Mbit -#define METWL_ROMSIZE_MAX 4096 // 最大の.. 4Gbit -#define METWL_MASK_REGION_JAPAN 0x00000001 -#define METWL_MASK_REGION_AMERICA 0x00000002 -#define METWL_MASK_REGION_EUROPE 0x00000004 -#define METWL_MASK_REGION_AUSTRALIA 0x00000008 -#define METWL_MASK_REGION_CHINA 0x00000010 -#define METWL_MASK_REGION_KOREA 0x00000020 -#define METWL_MASK_REGION_ALL 0xffffffff diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/utility.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/utility.cpp index ec9f0aaa..4a3a8b02 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/utility.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/utility.cpp @@ -1,6 +1,7 @@ // utility.h の実装 #include "stdafx.h" +#include "common.h" #include "utility.h" #include #include