From 69fb53b4683cebee3721d86d48703c4a1b5b49ef Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff> Date: Mon, 14 Jul 2008 01:56:17 +0000 Subject: [PATCH] =?UTF-8?q?(=E6=9B=B4=E6=96=B0=EF=BC=9AAkabane=20Jumpei)?= =?UTF-8?q?=20TWL=E5=AF=BE=E5=BF=9C=E3=82=A2=E3=83=97=E3=83=AA=E3=81=AE?= =?UTF-8?q?=E3=81=BF=E3=83=AA=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=83=81?= =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92=E8=A1=8C=E3=81=86=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= 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@1866 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 14 +++++++------- .../util/ARM9/src/util_menuAppManager.c | 14 ++++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c index 8710fad9..00242cc3 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c @@ -404,17 +404,17 @@ static HotSwState LoadCardData(void) } SYSMi_GetWork()->gameCommondParam = s_cbData.gameCommondParam; - - // CRCチェック if( !UTL_CheckAppCRC16( &s_cbData.pBootSegBuf->rh.s ) ) { retval = (retval == HOTSW_SUCCESS) ? HOTSW_CRC_CHECK_ERROR : retval; } - - // リージョンチェック - if( !UTL_CheckAppRegion( s_cbData.pBootSegBuf->rh.s.card_region_bitmap ) ) { - retval = (retval == HOTSW_SUCCESS) ? HOWSW_REGION_CHECK_ERROR : retval; - } + + if(s_cbData.pBootSegBuf->rh.s.platform_code & 0x02){ + // リージョンチェック + if( !UTL_CheckAppRegion( s_cbData.pBootSegBuf->rh.s.card_region_bitmap ) ) { + retval = (retval == HOTSW_SUCCESS) ? HOWSW_REGION_CHECK_ERROR : retval; + } + } // アプリジャンプのデバッグ時にROMエミュレーション情報だけ必要な場合 if(SYSMi_GetWork()->flags.hotsw.isLoadRomEmuOnly){ diff --git a/build/libraries_sysmenu/util/ARM9/src/util_menuAppManager.c b/build/libraries_sysmenu/util/ARM9/src/util_menuAppManager.c index 5fd9bc38..0b3b568f 100644 --- a/build/libraries_sysmenu/util/ARM9/src/util_menuAppManager.c +++ b/build/libraries_sysmenu/util/ARM9/src/util_menuAppManager.c @@ -477,12 +477,14 @@ static void AMNi_getAndAddNandTitleData( NAMTitleId titleID, BOOL readShowData ) return; } - // ROMヘッダのリージョンチェックとCRCチェックを行い、不正なアプリは無視する。 - if( !UTL_CheckAppRegion( s_AllRomHeaderArray[rhArrayLen].card_region_bitmap ) ) { - OS_TPrintf( "Region Check NG : %llx\n", titleID ); - FS_CloseFile(file); - return; - } + if(s_AllRomHeaderArray[rhArrayLen].platform_code & 0x02){ + // ROMヘッダのリージョンチェックとCRCチェックを行い、不正なアプリは無視する。 + if( !UTL_CheckAppRegion( s_AllRomHeaderArray[rhArrayLen].card_region_bitmap ) ) { + OS_TPrintf( "Region Check NG : %llx\n", titleID ); + FS_CloseFile(file); + return; + } + } if( !UTL_CheckAppCRC16( &s_AllRomHeaderArray[rhArrayLen] ) ) { OS_TPrintf( "CRC16 Check NG : %llx\n", titleID ); FS_CloseFile(file);