From 5fafe403918de1c88acd072fcf03892936c3340e Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Fri, 23 May 2008 01:24:30 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E5=BC=B7=E5=8C=96=E3=81=9D=E3=81=AE=EF=BC=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1482 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/sysmenu/ARM9/src/title.c | 6 ++++-- build/systemMenu_RED/Launcher/ARM9/src/main.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c index 1b1817df..69ad7ef9 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c @@ -86,6 +86,7 @@ static OSThread s_thread; static OSThread s_auth_thread; static TWLBannerFile s_bannerBuf[ LAUNCHER_TITLE_LIST_NUM ] ATTRIBUTE_ALIGN(32); static AuthResult s_authResult = AUTH_RESULT_PROCESSING; // ROM検証結果 +static AuthResult s_headerAuthResult = AUTH_RESULT_TITLE_LOAD_FAILED; static MbAuthCode s_authcode; @@ -681,7 +682,8 @@ OS_TPrintf("RebootSystem failed: cant read file(%p, %d, %d, %d)\n", &s_authcode, //[TODO:]この時点でヘッダの正当性検証 // ※ROMヘッダ認証 - if( AUTH_RESULT_SUCCEEDED != SYSMi_AuthenticateHeader( pBootTitle, head ) ) + s_headerAuthResult = SYSMi_AuthenticateHeader( pBootTitle, head ); + if( AUTH_RESULT_SUCCEEDED != s_headerAuthResult ) { goto ERROR; } @@ -1410,7 +1412,7 @@ static void SYSMi_AuthenticateTitleThreadFunc( TitleProperty *pBootTitle ) // ロード成功？ if( SYSMi_GetWork()->flags.common.isLoadSucceeded == FALSE ) { - s_authResult = AUTH_RESULT_TITLE_LOAD_FAILED; + s_authResult = (s_headerAuthResult == AUTH_RESULT_SUCCEEDED) ? AUTH_RESULT_TITLE_LOAD_FAILED : s_headerAuthResult; return; } // パラメータチェック diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c index 966225aa..4f8505a9 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/main.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c @@ -350,8 +350,8 @@ void TwlMain( void ) LauncherInit( s_titleList ); NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_NULL ); G2_ChangeBlendAlpha( 0, 31 ); - PrintfSJIS( 1, 25, TXT_COLOR_RED," LAUNCHER : ERROR OCCURRED!\n" ); - PrintfSJIS( 1, 40, TXT_COLOR_RED," %s",error_msg[res] ); + PrintfSJIS( 1, 25, TXT_COLOR_RED,"LAUNCHER : ERROR OCCURRED!\n" ); + PrintfSJIS( 1, 40, TXT_COLOR_RED,"%s",error_msg[res] ); GX_DispOn(); GXS_DispOn(); }