From d3de56200d972021cc3abea1fa87706053025a0d Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Tue, 13 Jan 2009 05:42:46 +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:=E7=BD=B2=E5=90=8D=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E6=99=82=E3=81=AE=E3=82=A2=E3=83=97=E3=83=AA?= =?UTF-8?q?=E7=A8=AE=E5=88=A5=E3=81=AE=E5=88=A4=E5=AE=9A=E3=81=ABSRL?= =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=82=B9=E3=81=AE=E3=83=A1=E3=83=B3=E3=83=90?= =?UTF-8?q?=E3=81=AEROM=E3=83=98=E3=83=83=E3=83=80=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=83=90=E3=82=B0?= =?UTF-8?q?=E3=82=92=E4=B8=80=E6=99=82=E7=9A=84=E3=81=AAROM=E3=83=98?= =?UTF-8?q?=E3=83=83=E3=83=80=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=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@108 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11373568 -> 11373568 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 66048 -> 67584 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 20662 -> 20662 bytes .../MasterEditorTWL/MasterEditorTWL/srl.cpp | 8 ++++---- .../MasterEditorTWL/MasterEditorTWL/srl.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index ee1aaf6f1078d5a3bf41b9d5c6a32204680b4737..485b649e02082a4b73a21fcbf5dfab005fcafbd4 100644 GIT binary patch delta 17507 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 delta 12471 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 AQvd(} diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 0d9a9e0b1abdabef65f3347013085117c8546ba7..44f34ad8f5ec85421423407897e6b214f42f61a7 100644 GIT binary patch delta 3493 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 Hj$8Qwi{Cpi delta 345 zcmdnCka62W#tmj{!X^x63`Rg~!C=B*2qeuI3^seRaq?o5m~1N>yZM5W2qRF^97ESj z5l0TJ61K9-LH1an>zM4xX1ZBNB}@RDG@H+iO#CMk9^+38D z(REFhG_%~CU~R^PRT838fpPK!2R>;N1}Ajg40;Sn42cXSlLOf_H=Eh-09k>dXfvbZ GR(=5D_dB=% diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp index 4d55074..c333f89 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -718,7 +718,7 @@ ECSrlResult RCSrl::decryptRomHeader( ROM_Header *prh ) // (1) 公開鍵で復号した結果(ブロック)をローカル変数(original)に格納 // (2) ブロックから余分な部分を取り除いて引数(pDst)にコピー - ECAppType type = this->selectAppType(); + ECAppType type = this->selectAppType( prh ); // 鍵を選ぶ #ifdef METWL_VER_APPTYPE_LAUNCHER @@ -776,12 +776,12 @@ ECSrlResult RCSrl::decryptRomHeader( ROM_Header *prh ) // ------------------------------------------------------------------- // アプリ種別の判定 // ------------------------------------------------------------------- -ECAppType RCSrl::selectAppType(void) +ECAppType RCSrl::selectAppType( ROM_Header *prh ) { ECAppType type = ECAppType::ILLEGAL; - u8 *idL = this->pRomHeader->s.titleID_Lo; - u32 idH = this->pRomHeader->s.titleID_Hi; + u8 *idL = prh->s.titleID_Lo; + u32 idH = prh->s.titleID_Hi; if( (idL[3]=='H') && (idL[2]=='N') && (idL[1]=='A') ) // ランチャアプリかどうかはTitleID_Loの値で決定 { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h index 831c804..fdfbf69 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h @@ -419,7 +419,7 @@ namespace MasterEditorTWL // @arg [in] 入力ファイルのFP (->SRL読み込み時に実行されるべき)] ECSrlResult searchSDKVersion( FILE *fp ); // SDKバージョンを取得する ECSrlResult searchLicenses( FILE *fp ); // 使用ライセンスを取得する - ECAppType selectAppType(void); + ECAppType selectAppType( ROM_Header *prh ); // TitleIDからアプリ種別を決定する // MRC(Master ROM Checker)機能 ECSrlResult mrc( FILE *fp );