diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 464ddd9..6cf1f24 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index b49b856..8fb2e3b 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 0b65000..70c8d2f 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index eaaefa5..1783c73 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -561,7 +561,7 @@ void RCSrl::mrcAccessControl(FILE *fp) this->hErrorList->Add( this->makeMrcError("CardAccess") ); } - if( this->IsAppUser ) + if( !this->IsAppUser ) // ƒVƒXƒeƒ€ƒAƒvƒŠ { if( this->pRomHeader->s.access_control.common_client_key != 0 ) { @@ -603,9 +603,33 @@ void RCSrl::mrcAccessControl(FILE *fp) { this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Common Client Key for the debugger system menu") ); } + if( this->pRomHeader->s.access_control.photo_access_read != 0 ) + { + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Photo Database(Read)") ); + } + if( this->pRomHeader->s.access_control.photo_access_write != 0 ) + { + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Photo Database(Write)") ); + } + if( this->pRomHeader->s.access_control.sdmc_access_read != 0 ) + { + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "SD Card(Read)") ); + } + if( this->pRomHeader->s.access_control.sdmc_access_write != 0 ) + { + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "SD Card(Write)") ); + } + if( this->pRomHeader->s.access_control.backup_access_read != 0 ) + { + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Card Backup(Read)") ); + } + if( this->pRomHeader->s.access_control.backup_access_write != 0 ) + { + this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "Card Backup(Write)") ); + } // ‚»‚Ì‘¼‚̃rƒbƒg - u32 okbits = 0x80001FFF; + u32 okbits = 0x8001FFFF; u32 *p = (u32*)&(this->pRomHeader->s); if( p[ 0x1b4 / 4 ] & ~okbits ) { @@ -677,7 +701,7 @@ void RCSrl::mrcAccessControl(FILE *fp) this->hErrorList->Add( this->makeMrcError("SDAccessPriv") ); } } - } + } //else if( !this->IsMediaNand ) { diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml index c4f58b1..46de06d 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml and b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml index 02f309e..2fa00ab 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -12,12 +12,12 @@ - アクセスコントロール情報 + 写真データベースアクセス 写真データベースã¸ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹å ´åˆã«ã¯TCLライブラリを使用ã—ã¦ãã ã•ã„。 1b41b7FalseTrue - アクセスコントロール情報 + SDカードアクセス SDカードã¸ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã®è¨­å®šãŒä¸å分ã§ã™ã€‚RSFファイルã®SDCardAccessプロパティã«"None"ã€"Read"ã€"Write"ã€"ReadWrite"ã®ã„ãšã‚Œã‹ã‚’指定ã™ã‚‹å¿…è¦ãŒã‚りã¾ã™ã€‚ 1b41b7FalseTrue @@ -362,7 +362,7 @@ 1b41b7FalseTrue - アクセスコントロール情報 + SDカードアクセス SDカードã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã¯è¨±å¯ã•れã¦ã„ã¾ã›ã‚“。 1b41b7FalseTrue @@ -392,17 +392,17 @@ 1b41b7FalseTrue - アクセスコントロール情報 + 写真データベースアクセス 写真データベースã¸ã®ãƒªãƒ¼ãƒ‰ã‚¢ã‚¯ã‚»ã‚¹ã¯è¨±å¯ã•れã¦ã„ã¾ã›ã‚“。 1b41b7FalseTrue - アクセスコントロール情報 + 写真データベースアクセス 写真データベースã¸ã®ãƒ©ã‚¤ãƒˆã‚¢ã‚¯ã‚»ã‚¹ã¯è¨±å¯ã•れã¦ã„ã¾ã›ã‚“。 1b41b7FalseTrue - アクセスコントロール情報 + 写真データベースアクセス 写真データベースã¸ã®ãƒ©ã‚¤ãƒˆã‚¢ã‚¯ã‚»ã‚¹ãŒæŒ‡å®šã•れã¦ã„ã‚‹ã«ã‚‚ã‹ã‹ã‚らãšJPEGç½²å(JpegSign)ãŒæœ‰åйã«ãªã£ã¦ã„ã¾ã›ã‚“。 1b41b7FalseTrue @@ -412,7 +412,7 @@ 1b41b7FalseTrue - アクセスコントロール情報 + 写真データベースアクセス 写真データベースã¸ã®ãƒ©ã‚¤ãƒˆã‚¢ã‚¯ã‚»ã‚¹ãŒæŒ‡å®šã•れã¦ã„ãªã„ã«ã‚‚ã‹ã‹ã‚らãšJPEGç½²å(JpegSign)ãŒæœ‰åйã«ãªã£ã¦ã„ã¾ã™ã€‚ 1b41b7FalseTrue