diff --git a/.clang-format b/.clang-format index 06abdf66..6ec4ed91 100644 --- a/.clang-format +++ b/.clang-format @@ -68,4 +68,4 @@ SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false TabWidth: 4 -UseTab: Never +UseTab: Never \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9163dc6b..b5c67bfe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,11 +44,13 @@ # Code Guidelines +### Note: In some scenarios, some of these rules can be ignored if they either affect matching or relate to symbols or DWARF from ELF files. + ### General - Style formatting is all done by `clang-format`. - It should automatically apply when using Visual Studio Code on saving a source file. -- For checking on pointers, please use the `NULL` macro, unless if it affects code matching. +- For checking on pointers, please use the `NULL` macro. ```cpp // Do this! if (myPointer == NULL) { @@ -149,7 +151,7 @@ Make sure the guard names are uppercase SNAKE_CASE. ### Literals -- For floating-point values, please be explicit with them. (it can change code and data matching) +- For floating-point values, please be explicit with them. (they also affect matching) ```cpp // Do this! float value0 = 1.0f; diff --git a/config/43E/symbols.txt b/config/43E/symbols.txt index 0809cf9b..c3bd1af0 100644 --- a/config/43E/symbols.txt +++ b/config/43E/symbols.txt @@ -1756,10 +1756,10 @@ list_sd_save_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348DEC; // type:functio list_sd_app_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E00; // type:function size:0x14 get_sd_save_banner_async__Q23ipl12NandSDWorkerFUlP17WIISaveBannerFile = .text:0x81348E14; // type:function size:0x28 get_sd_app_thumbnail_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81348E3C; // type:function size:0x34 -iplNandSD_81348DFC__Q23ipl12NandSDWorkerFUlPvPv = .text:0x81348E70; // type:function size:0x34 -update_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348EA4; // type:function size:0x14 -read_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348EB8; // type:function size:0x14 -iplNandSD_81348E58__Q23ipl12NandSDWorkerFUxPvPv = .text:0x81348ECC; // type:function size:0x30 +get_sd_app_meta_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl12NandSDWorker14SDAppMetaEntry = .text:0x81348E70; // type:function size:0x34 +update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348EA4; // type:function size:0x14 +read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348EB8; // type:function size:0x14 +check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x81348ECC; // type:function size:0x30 check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348EFC; // type:function size:0x20 iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348F1C; // type:function size:0x2C get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348F48; // type:function size:0x18 @@ -1776,7 +1776,7 @@ copy_sd_save_to_nand_async__Q23ipl12NandSDWorkerFUl = .text:0x81349028; // type: format_sd_async__Q23ipl12NandSDWorkerFv = .text:0x81349044; // type:function size:0x8 get_sd_free_area_async__Q23ipl12NandSDWorkerFPUx = .text:0x8134904C; // type:function size:0x14 list_nand_app_async__Q23ipl12NandSDWorkerFPUx = .text:0x81349060; // type:function size:0x14 -iplNandSD_81349000__Q23ipl12NandSDWorkerFPvPv = .text:0x81349074; // type:function size:0x20 +list_nand_apps_usage_async__Q23ipl12NandSDWorkerFPvPv = .text:0x81349074; // type:function size:0x20 get_nand_app_thumbnail_async__Q23ipl12NandSDWorkerFUxPvPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81349094; // type:function size:0x30 delete_nand_app_async__Q23ipl12NandSDWorkerFUxb = .text:0x813490C4; // type:function size:0x28 copy_nand_app_to_sd_async__Q23ipl12NandSDWorkerFUx = .text:0x813490EC; // type:function size:0x20 @@ -1817,12 +1817,12 @@ check_nand_save_banner_exist__Q23ipl12NandSDWorkerFUx = .text:0x8134AFDC; // typ get_nand_save_banner__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134B0C0; // type:function size:0x3B0 do_get_sd_save_banner__Q23ipl12NandSDWorkerFv = .text:0x8134B470; // type:function size:0x160 do_get_sd_app_thumbnail__Q23ipl12NandSDWorkerFv = .text:0x8134B5D0; // type:function size:0x1CC -do_unk_8134B728__Q23ipl12NandSDWorkerFv = .text:0x8134B79C; // type:function size:0x1F4 -do_update_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134B990; // type:function size:0x344 -do_read_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134BCD4; // type:function size:0x270 -do_unk_8134BED0__Q23ipl12NandSDWorkerFv = .text:0x8134BF44; // type:function size:0x3C8 +do_get_sd_app_meta__Q23ipl12NandSDWorkerFv = .text:0x8134B79C; // type:function size:0x1F4 +do_update_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134B990; // type:function size:0x344 +do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134BCD4; // type:function size:0x270 +do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134BF44; // type:function size:0x3C8 check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134C30C; // type:function size:0x3D8 -do_list_nand_apps_usages__Q23ipl12NandSDWorkerFv = .text:0x8134C6E4; // type:function size:0x1C8 +do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134C6E4; // type:function size:0x1C8 do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134C8AC; // type:function size:0x2D0 do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134CB7C; // type:function size:0x260 do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134CDDC; // type:function size:0x1F4 @@ -1852,7 +1852,7 @@ delete_download_task__Q23ipl12NandSDWorkerFUl = .text:0x8134FD08; // type:functi delete_nand_app_content__Q23ipl12NandSDWorkerFUx = .text:0x8134FF1C; // type:function size:0x134 do_copy_nand_app_to_sd__Q23ipl12NandSDWorkerFv = .text:0x81350050; // type:function size:0x530 get_save_banner_for_data_only_title__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x81350580; // type:function size:0x160 -get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker11SDAppBanner = .text:0x813506E0; // type:function size:0x480 +get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker15SDAppBackupData = .text:0x813506E0; // type:function size:0x480 open_nand_app_content__Q23ipl12NandSDWorkerFUxUsPUlPP12ESTicketView = .text:0x81350B60; // type:function size:0x21C read_file__Q23ipl12NandSDWorkerFPvQ33ipl12NandSDWorker8FileKindlUlPv = .text:0x81350D7C; // type:function size:0x158 search_meta_header__Q23ipl12NandSDWorkerFPCUc = .text:0x81350ED4; // type:function size:0x54 @@ -1920,13 +1920,13 @@ check_nand_save_exist_lo__Q23ipl12NandSDWorkerFUl = .text:0x8135476C; // type:fu get_nand_title_version__Q23ipl12NandSDWorkerFUxPUs = .text:0x81354834; // type:function size:0x80 get_sd_title_version__Q23ipl12NandSDWorkerFUlPUs = .text:0x813548B4; // type:function size:0xF4 check_sd_title_restorable__Q23ipl12NandSDWorkerFUl = .text:0x813549A8; // type:function size:0x184 -__ct__Q33ipl2ut8FreeListFv = .text:0x81354B2C; // type:function size:0x14 -init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81354B40; // type:function size:0x5C -get__Q33ipl2ut8FreeListFv = .text:0x81354B9C; // type:function size:0x24 -__ct__Q33ipl2ut5StackFv = .text:0x81354BC0; // type:function size:0x40 -init__Q33ipl2ut5StackFPvUlUl = .text:0x81354C00; // type:function size:0x4C -push__Q33ipl2ut5StackFPCv = .text:0x81354C4C; // type:function size:0x78 -pop__Q33ipl2ut5StackFPv = .text:0x81354CC4; // type:function size:0x80 +__ct__Q33ipl2ut8FreeListFv = .text:0x81354B2C; // type:function size:0x14 scope:weak +init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81354B40; // type:function size:0x5C scope:weak +get__Q33ipl2ut8FreeListFv = .text:0x81354B9C; // type:function size:0x24 scope:weak +__ct__Q33ipl2ut5StackFv = .text:0x81354BC0; // type:function size:0x40 scope:weak +init__Q33ipl2ut5StackFPvUlUl = .text:0x81354C00; // type:function size:0x4C scope:weak +push__Q33ipl2ut5StackFPCv = .text:0x81354C4C; // type:function size:0x78 scope:weak +pop__Q33ipl2ut5StackFPv = .text:0x81354CC4; // type:function size:0x80 scope:weak getFirstController__Q23ipl8keyboardFv = .text:0x81354D44; // type:function size:0x50 onCommand__Q33ipl8keyboard13EventObserverFQ39textinput15CommandReceiver13INPUT_COMMANDPv = .text:0x81354D94; // type:function size:0x34 onSE__Q33ipl8keyboard13EventObserverFQ39textinput5sound2SE = .text:0x81354DC8; // type:function size:0x218 @@ -2607,8 +2607,8 @@ LeftScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginV RightScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136FA28; // type:function size:0x3C GetScrollState__Q23www9trasitionFv = .text:0x8136FA64; // type:function size:0x8 ResetScrollState__Q23www9trasitionFv = .text:0x8136FA6C; // type:function size:0xC -www_wiisetting_8136F9D0 = .text:0x8136FA78; // type:function size:0x24 scope:local -www_wiisetting_8136F9F4 = .text:0x8136FA9C; // type:function size:0x44 scope:local +DPDCallback2__Q23www10wiisettingFll = .text:0x8136FA78; // type:function size:0x24 scope:local +DPDCallback__Q23www10wiisettingFll = .text:0x8136FA9C; // type:function size:0x44 scope:local allow_access__Q23www10wiisettingFPCcPCci = .text:0x8136FAE0; // type:function size:0x8 AddJsPlugin__Q23www10wiisettingFv = .text:0x8136FAE8; // type:function size:0x88 globalGetter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136FB70; // type:function size:0xC8 @@ -2617,9 +2617,9 @@ Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x81 Setter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8137065C; // type:function size:0x50C wiiOSReport__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x81370B68; // type:function size:0x5C wiiWriteBack__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x81370BC4; // type:function size:0x344 -www_wiisetting_81370E60 = .text:0x81370F08; // type:function size:0x54 scope:local +getKeyboardLanguage__Q23www10wiisettingFUc = .text:0x81370F08; // type:function size:0x54 scope:local initWiiSetting__Q23www10wiisettingFv = .text:0x81370F5C; // type:function size:0x60 -www_wiisetting_81370F14 = .text:0x81370FBC; // type:function size:0x98 scope:local +getBytePropIndex__Q23www10wiisettingFPCc = .text:0x81370FBC; // type:function size:0x98 scope:local startFunc__Q23www10wiisettingFUc = .text:0x81371054; // type:function size:0x1A4 getWiiSettingData__Q23www10wiisettingFv = .text:0x813711F8; // type:function size:0xC getWiiSettingFlag__Q23www10wiisettingFv = .text:0x81371204; // type:function size:0x8 @@ -13814,7 +13814,7 @@ lbl_8160D840 = .rodata:0x8160D840; // type:object size:0x20 scNumber__3ipl = .rodata:0x8160D860; // type:object size:0x16 data:wstring c_es_encrypt_iv__Q23ipl12NandSDWorker = .rodata:0x8160D878; // type:object size:0x10 c_md5_secret_key__Q23ipl12NandSDWorker = .rodata:0x8160D888; // type:object size:0x10 -lbl_8160D898 = .rodata:0x8160D898; // type:object size:0x10 data:4byte +@14986 = .rodata:0x8160D898; // type:object size:0x10 scope:local data:4byte cDefaultChanList__3ipl = .rodata:0x8160D8A8; // type:object size:0x300 scope:local odh_zigzag_order = .rodata:0x8160DBA8; // type:object size:0x40 scope:local data:byte odh_natural_order = .rodata:0x8160DBE8; // type:object size:0x40 scope:local data:byte @@ -13856,8 +13856,8 @@ scMonthToMessageID__Q23ipl5scene = .rodata:0x8160FD98; // type:object size:0x30 scNumber__Q23ipl5scene = .rodata:0x8160FDC8; // type:object size:0x18 scope:local data:2byte scAnmFrame__Q23ipl5scene = .rodata:0x8160FDE0; // type:object size:0x90 scope:local scNumber__Q23ipl5scene = .rodata:0x8160FE70; // type:object size:0x18 scope:local -scNumber__Q23ipl5scene = .rodata:0x8160FE88; // type:object size:0x14 scope:local data:2byte -scNumber2__Q23ipl5scene = .rodata:0x8160FE9C; // type:object size:0x14 scope:local data:2byte +@13129 = .rodata:0x8160FE88; // type:object size:0x14 scope:local data:2byte +@13171 = .rodata:0x8160FE9C; // type:object size:0x14 scope:local data:2byte lbl_8160FEB0 = .rodata:0x8160FEB0; // type:object size:0x10 lbl_8160FEC0 = .rodata:0x8160FEC0; // type:object size:0x10 scNumber__Q23ipl5scene = .rodata:0x8160FED0; // type:object size:0x18 scope:local data:2byte @@ -13869,9 +13869,9 @@ cfChanThumbOfss__Q23ipl5scene = .rodata:0x81610510; // type:object size:0x10 sco lbl_81610520 = .rodata:0x81610520; // type:object size:0x10 data:4byte lbl_81610530 = .rodata:0x81610530; // type:object size:0x20 data:4byte @10845 = .rodata:0x81610550; // type:object size:0x14 scope:local data:2byte -scNumber__Q23ipl5scene = .rodata:0x81610568; // type:object size:0x14 scope:local data:2byte -scNumber2__Q23ipl5scene = .rodata:0x8161057C; // type:object size:0x14 scope:local data:2byte -scNumber__Q23ipl5scene = .rodata:0x81610590; // type:object size:0x14 scope:local data:2byte +@13108 = .rodata:0x81610568; // type:object size:0x14 scope:local data:2byte +@13150 = .rodata:0x8161057C; // type:object size:0x14 scope:local data:2byte +@12843 = .rodata:0x81610590; // type:object size:0x14 scope:local data:2byte scAnmName__Q23ipl5scene = .rodata:0x816105A8; // type:object size:0xD8 scope:local scTextboxToMessageID__Q23ipl5scene = .rodata:0x81610680; // type:object size:0x28 scope:local scNumber__Q23ipl5scene = .rodata:0x816106A8; // type:object size:0x18 scope:local data:2byte @@ -14055,7 +14055,7 @@ g_SpecialsChars = .rodata:0x81618FB0; // type:object size:0x10 scope:local data: TtableInv = .rodata:0x81618FC0; // type:object size:0x10 scope:local VFipf_valid_fn_char = .rodata:0x81618FD0; // type:object size:0x60 fat_special_values = .rodata:0x81619030; // type:object size:0x3C scope:local -cp932_to_unicode = .rodata:0x81619070; // type:object size:0x4272 scope:local data:2byte +cp932_to_unicode = .rodata:0x81619070; // type:object size:0x4272 scope:local data:2byte noreloc ErrInfoTbl$4383 = .rodata:0x8161D2E8; // type:object size:0xD0 scope:local l_nand_func = .rodata:0x8161D3B8; // type:object size:0x20 scope:local pfd_sddrv_func = .rodata:0x8161D3D8; // type:object size:0x20 scope:local @@ -14189,7 +14189,7 @@ ms_ppki = .rodata:0x8162E438; // type:object size:0x240 noreloc @1272 = .rodata:0x8162E678; // type:object size:0x278 scope:local data:4byte pf_valid_fn_char = .rodata:0x8162E8F0; // type:object size:0x60 fat_special_values = .rodata:0x8162E950; // type:object size:0x3C -cp932_to_unicode = .rodata:0x8162E990; // type:object size:0x4272 data:2byte +cp932_to_unicode = .rodata:0x8162E990; // type:object size:0x4272 scope:local data:2byte noreloc fa_nand_func = .rodata:0x81632C08; // type:object size:0x20 pfd_sddrv_func = .rodata:0x81632C28; // type:object size:0x20 sddrv_size_depend_tbl = .rodata:0x81632C48; // type:object size:0x150 data:4byte @@ -14397,65 +14397,290 @@ __vt__Q23ipl12DialogWindow = .data:0x81635CD0; // type:object size:0x18 __vt__Q23gui12EventHandler = .data:0x81635CE8; // type:object size:0x18 scope:weak __vt__Q23gui9Interface = .data:0x81635D00; // type:object size:0x20 scope:weak @10439 = .data:0x81635D20; // type:object size:0x12 scope:local data:string -lbl_81635D38 = .data:0x81635D38; // type:object size:0xB data:string -lbl_81635D43 = .data:0x81635D43; // type:object size:0xB data:string -lbl_81635D4E = .data:0x81635D4E; // type:object size:0x14 data:string -lbl_81635D62 = .data:0x81635D62; // type:object size:0x9 data:string -lbl_81635D6B = .data:0x81635D6B; // type:object size:0xC data:string -lbl_81635D77 = .data:0x81635D77; // type:object size:0x14 data:string -lbl_81635D8B = .data:0x81635D8B; // type:object size:0x20 data:string -lbl_81635DAB = .data:0x81635DAB; // type:object size:0x10 data:string -lbl_81635DBB = .data:0x81635DBB; // type:object size:0xC data:string +@12343 = .data:0x81635D38; // type:object size:0xB scope:local data:string +...data.0 = .data:0x81635D38; // type:label scope:local +@12345 = .data:0x81635D43; // type:object size:0xB scope:local data:string +@12346 = .data:0x81635D4E; // type:object size:0x14 scope:local data:string +@12347 = .data:0x81635D62; // type:object size:0x9 scope:local data:string +@12348 = .data:0x81635D6B; // type:object size:0xC scope:local data:string +@12349 = .data:0x81635D77; // type:object size:0x14 scope:local data:string +@12350 = .data:0x81635D8B; // type:object size:0x20 scope:local data:string +@12351 = .data:0x81635DAB; // type:object size:0x10 scope:local data:string +@12354 = .data:0x81635DBB; // type:object size:0xC scope:local data:string c_ignore_list_for_shared2__Q23ipl12NandSDWorker = .data:0x81635DC8; // type:object size:0x14 -lbl_81635DDC = .data:0x81635DDC; // type:object size:0xC data:string -lbl_81635DE8 = .data:0x81635DE8; // type:object size:0xA data:string -lbl_81635DF2 = .data:0x81635DF2; // type:object size:0x1E data:string -lbl_81635E10 = .data:0x81635E10; // type:object size:0x22 data:string -lbl_81635E32 = .data:0x81635E32; // type:object size:0x22 data:string -lbl_81635E54 = .data:0x81635E54; // type:object size:0x6A -lbl_81635EBE = .data:0x81635EBE; // type:object size:0x21 data:string -lbl_81635EDF = .data:0x81635EDF; // type:object size:0x25 data:string -lbl_81635F04 = .data:0x81635F04; // type:object size:0xC7 -lbl_81635FCB = .data:0x81635FCB; // type:object size:0x95 -jumptable_81636060 = .data:0x81636060; // type:object size:0xD0 scope:local -lbl_81636130 = .data:0x81636130; // type:object size:0x54B scope:local -lbl_8163667B = .data:0x8163667B; // type:object size:0x163 -lbl_816367DE = .data:0x816367DE; // type:object size:0x15 data:string -lbl_816367F3 = .data:0x816367F3; // type:object size:0x42 -lbl_81636835 = .data:0x81636835; // type:object size:0x170 -lbl_816369A5 = .data:0x816369A5; // type:object size:0x25 data:string -lbl_816369CA = .data:0x816369CA; // type:object size:0xAE -lbl_81636A78 = .data:0x81636A78; // type:object size:0xE0 -lbl_81636B58 = .data:0x81636B58; // type:object size:0x21 data:string -lbl_81636B79 = .data:0x81636B79; // type:object size:0x1F data:string -lbl_81636B98 = .data:0x81636B98; // type:object size:0x1E data:string -lbl_81636BB6 = .data:0x81636BB6; // type:object size:0x450 -lbl_81637006 = .data:0x81637006; // type:object size:0x64E -lbl_81637654 = .data:0x81637654; // type:object size:0x26 data:string -lbl_8163767A = .data:0x8163767A; // type:object size:0x13 data:string -lbl_8163768D = .data:0x8163768D; // type:object size:0xD data:string -lbl_8163769A = .data:0x8163769A; // type:object size:0x61 -lbl_816376FB = .data:0x816376FB; // type:object size:0x2A data:string -lbl_81637725 = .data:0x81637725; // type:object size:0x425 -lbl_81637B4A = .data:0x81637B4A; // type:object size:0x28 data:string -lbl_81637B72 = .data:0x81637B72; // type:object size:0x6D9 -lbl_8163824B = .data:0x8163824B; // type:object size:0x35 data:string -lbl_81638280 = .data:0x81638280; // type:object size:0x34 data:string -lbl_816382B4 = .data:0x816382B4; // type:object size:0x448 -lbl_816386FC = .data:0x816386FC; // type:object size:0x69 -lbl_81638765 = .data:0x81638765; // type:object size:0x24 data:string -lbl_81638789 = .data:0x81638789; // type:object size:0x2E data:string -lbl_816387B7 = .data:0x816387B7; // type:object size:0x79 -lbl_81638830 = .data:0x81638830; // type:object size:0xCE -lbl_816388FE = .data:0x816388FE; // type:object size:0x20 data:string -lbl_8163891E = .data:0x8163891E; // type:object size:0x1E1 -lbl_81638AFF = .data:0x81638AFF; // type:object size:0x21 data:string -lbl_81638B20 = .data:0x81638B20; // type:object size:0x24 data:string -lbl_81638B44 = .data:0x81638B44; // type:object size:0x43 -lbl_81638B87 = .data:0x81638B87; // type:object size:0x2A data:string -lbl_81638BB1 = .data:0x81638BB1; // type:object size:0x1 data:string +@12357 = .data:0x81635DDC; // type:object size:0xC scope:local data:string +@12358 = .data:0x81635DE8; // type:object size:0xA scope:local data:string +@12359 = .data:0x81635DF2; // type:object size:0x1E scope:local data:string +@21503 = .data:0x81635E10; // type:object size:0x22 scope:local data:string +@21504 = .data:0x81635E32; // type:object size:0x22 scope:local data:string +@21767 = .data:0x81635E54; // type:object size:0x16 scope:local data:string +@21770 = .data:0x81635E6A; // type:object size:0x11 scope:local data:string +@21777 = .data:0x81635E7B; // type:object size:0x19 scope:local data:string +@21780 = .data:0x81635E94; // type:object size:0x1A scope:local data:string +@21783 = .data:0x81635EAE; // type:object size:0x10 scope:local data:string +@21788 = .data:0x81635EBE; // type:object size:0x21 scope:local data:string +@21789 = .data:0x81635EDF; // type:object size:0x25 scope:local data:string +@21792 = .data:0x81635F04; // type:object size:0x28 scope:local data:string +@21804 = .data:0x81635F2C; // type:object size:0x1B scope:local data:string +@21805 = .data:0x81635F47; // type:object size:0x1E scope:local data:string +@21806 = .data:0x81635F65; // type:object size:0x29 scope:local data:string +@21917 = .data:0x81635F8E; // type:object size:0x1F scope:local data:string +@21918 = .data:0x81635FAD; // type:object size:0x1E scope:local data:string +@21919 = .data:0x81635FCB; // type:object size:0x2F scope:local data:string +@21920 = .data:0x81635FFA; // type:object size:0x34 scope:local data:string +@21921 = .data:0x8163602E; // type:object size:0x14 scope:local data:string +@21922 = .data:0x81636042; // type:object size:0x1B scope:local data:string +@21924 = .data:0x81636060; // type:object size:0xD0 scope:local +@21965 = .data:0x81636130; // type:object size:0x21 scope:local data:string +@21966 = .data:0x81636151; // type:object size:0x22 scope:local data:string +@21967 = .data:0x81636173; // type:object size:0x30 scope:local data:string +@21968 = .data:0x816361A3; // type:object size:0x3F scope:local data:string +@21969 = .data:0x816361E2; // type:object size:0x33 scope:local data:string +@21970 = .data:0x81636215; // type:object size:0x30 scope:local data:string +@21971 = .data:0x81636245; // type:object size:0x2E scope:local data:string +@21972 = .data:0x81636273; // type:object size:0x28 scope:local data:string +@21973 = .data:0x8163629B; // type:object size:0x28 scope:local data:string +@21974 = .data:0x816362C3; // type:object size:0x35 scope:local data:string +@21975 = .data:0x816362F8; // type:object size:0x21 scope:local data:string +@21999 = .data:0x81636319; // type:object size:0x2F scope:local data:string +@22000 = .data:0x81636348; // type:object size:0x33 scope:local data:string +@22001 = .data:0x8163637B; // type:object size:0x3A scope:local data:string +@22002 = .data:0x816363B5; // type:object size:0x3F scope:local data:string +@22028 = .data:0x816363F4; // type:object size:0x2C scope:local data:string +@22029 = .data:0x81636420; // type:object size:0x32 scope:local data:string +@22030 = .data:0x81636452; // type:object size:0x29 scope:local data:string +@22055 = .data:0x8163647B; // type:object size:0x2D scope:local data:string +@22056 = .data:0x816364A8; // type:object size:0x9 scope:local data:string +@22057 = .data:0x816364B1; // type:object size:0x3C scope:local data:string +@22058 = .data:0x816364ED; // type:object size:0x28 scope:local data:string +@22106 = .data:0x81636515; // type:object size:0x29 scope:local data:string +@22107 = .data:0x8163653E; // type:object size:0x1D scope:local data:string +@22108 = .data:0x8163655B; // type:object size:0x1E scope:local data:string +@22109 = .data:0x81636579; // type:object size:0x1D scope:local data:string +@22110 = .data:0x81636596; // type:object size:0x24 scope:local data:string +@22134 = .data:0x816365BA; // type:object size:0x34 scope:local data:string +@22135 = .data:0x816365EE; // type:object size:0x1E scope:local data:string +@22136 = .data:0x8163660C; // type:object size:0x28 scope:local data:string +@22137 = .data:0x81636634; // type:object size:0x2B scope:local data:string +@22138 = .data:0x8163665F; // type:object size:0x1C scope:local data:string +@22158 = .data:0x8163667B; // type:object size:0x2D scope:local data:string +@22193 = .data:0x816366A8; // type:object size:0x26 scope:local data:string +@22194 = .data:0x816366CE; // type:object size:0x2C scope:local data:string +@22195 = .data:0x816366FA; // type:object size:0x30 scope:local data:string +@22196 = .data:0x8163672A; // type:object size:0x30 scope:local data:string +@22197 = .data:0x8163675A; // type:object size:0x26 scope:local data:string +@22198 = .data:0x81636780; // type:object size:0x27 scope:local data:string +@22199 = .data:0x816367A7; // type:object size:0x37 scope:local data:string +@13884 = .data:0x816367DE; // type:object size:0x15 scope:local data:string +@13885 = .data:0x816367F3; // type:object size:0x15 scope:local data:string +@22354 = .data:0x81636808; // type:object size:0x2D scope:local data:string +@22355 = .data:0x81636835; // type:object size:0x30 scope:local data:string +@22356 = .data:0x81636865; // type:object size:0x4E scope:local data:string +@22357 = .data:0x816368B3; // type:object size:0x40 scope:local data:string +@22358 = .data:0x816368F3; // type:object size:0x2E scope:local data:string +@22359 = .data:0x81636921; // type:object size:0x37 scope:local data:string +@22360 = .data:0x81636958; // type:object size:0x4D scope:local data:string +@22400 = .data:0x816369A5; // type:object size:0x25 scope:local data:string +@22401 = .data:0x816369CA; // type:object size:0x41 scope:local data:string +@22422 = .data:0x81636A0B; // type:object size:0x30 scope:local data:string +@22423 = .data:0x81636A3B; // type:object size:0x3D scope:local data:string +@22455 = .data:0x81636A78; // type:object size:0x48 scope:local data:string +@22476 = .data:0x81636AC0; // type:object size:0x31 scope:local data:string +@22477 = .data:0x81636AF1; // type:object size:0x38 scope:local data:string +@22497 = .data:0x81636B29; // type:object size:0x2F scope:local data:string +@22513 = .data:0x81636B58; // type:object size:0x21 scope:local data:string +@22514 = .data:0x81636B79; // type:object size:0x1F scope:local data:string +@22536 = .data:0x81636B98; // type:object size:0x1E scope:local data:string +@22537 = .data:0x81636BB6; // type:object size:0x20 scope:local data:string +@22570 = .data:0x81636BD6; // type:object size:0x9 scope:local data:string +@22571 = .data:0x81636BDF; // type:object size:0x37 scope:local data:string +@22572 = .data:0x81636C16; // type:object size:0x34 scope:local data:string +@22573 = .data:0x81636C4A; // type:object size:0xD scope:local data:string +@22574 = .data:0x81636C57; // type:object size:0x3A scope:local data:string +@22575 = .data:0x81636C91; // type:object size:0x31 scope:local data:string +@22576 = .data:0x81636CC2; // type:object size:0x2E scope:local data:string +@22577 = .data:0x81636CF0; // type:object size:0x2E scope:local data:string +@22578 = .data:0x81636D1E; // type:object size:0x2B scope:local data:string +@22579 = .data:0x81636D49; // type:object size:0x2C scope:local data:string +@22580 = .data:0x81636D75; // type:object size:0x2B scope:local data:string +@22581 = .data:0x81636DA0; // type:object size:0x23 scope:local data:string +@22582 = .data:0x81636DC3; // type:object size:0x38 scope:local data:string +@22583 = .data:0x81636DFB; // type:object size:0x2E scope:local data:string +@22584 = .data:0x81636E29; // type:object size:0x2A scope:local data:string +@22593 = .data:0x81636E53; // type:object size:0xF scope:local data:string +@22594 = .data:0x81636E62; // type:object size:0x3C scope:local data:string +@22595 = .data:0x81636E9E; // type:object size:0xF scope:local data:string +@22596 = .data:0x81636EAD; // type:object size:0x3C scope:local data:string +@22619 = .data:0x81636EE9; // type:object size:0x2E scope:local data:string +@22620 = .data:0x81636F17; // type:object size:0x33 scope:local data:string +@22621 = .data:0x81636F4A; // type:object size:0x39 scope:local data:string +@22622 = .data:0x81636F83; // type:object size:0x28 scope:local data:string +@22634 = .data:0x81636FAB; // type:object size:0x2B scope:local data:string +@22635 = .data:0x81636FD6; // type:object size:0x30 scope:local data:string +@22647 = .data:0x81637006; // type:object size:0x38 scope:local data:string +@22681 = .data:0x8163703E; // type:object size:0x2F scope:local data:string +@22682 = .data:0x8163706D; // type:object size:0x2F scope:local data:string +@22683 = .data:0x8163709C; // type:object size:0x36 scope:local data:string +@22684 = .data:0x816370D2; // type:object size:0x34 scope:local data:string +@22685 = .data:0x81637106; // type:object size:0x35 scope:local data:string +@22686 = .data:0x8163713B; // type:object size:0x2B scope:local data:string +@22690 = .data:0x81637166; // type:object size:0x32 scope:local data:string +@22691 = .data:0x81637198; // type:object size:0x21 scope:local data:string +@22692 = .data:0x816371B9; // type:object size:0x21 scope:local data:string +@22693 = .data:0x816371DA; // type:object size:0x26 scope:local data:string +@22701 = .data:0x81637200; // type:object size:0x36 scope:local data:string +@22702 = .data:0x81637236; // type:object size:0x38 scope:local data:string +@22703 = .data:0x8163726E; // type:object size:0x2A scope:local data:string +@22730 = .data:0x81637298; // type:object size:0x31 scope:local data:string +@22731 = .data:0x816372C9; // type:object size:0x33 scope:local data:string +@22732 = .data:0x816372FC; // type:object size:0x2F scope:local data:string +@22733 = .data:0x8163732B; // type:object size:0x31 scope:local data:string +@22789 = .data:0x8163735C; // type:object size:0x26 scope:local data:string +@22790 = .data:0x81637382; // type:object size:0x2F scope:local data:string +@22791 = .data:0x816373B1; // type:object size:0x2B scope:local data:string +@22792 = .data:0x816373DC; // type:object size:0x2C scope:local data:string +@22793 = .data:0x81637408; // type:object size:0x4F scope:local data:string +@22794 = .data:0x81637457; // type:object size:0x28 scope:local data:string +@22795 = .data:0x8163747F; // type:object size:0x3A scope:local data:string +@22796 = .data:0x816374B9; // type:object size:0x2D scope:local data:string +@22797 = .data:0x816374E6; // type:object size:0x22 scope:local data:string +@22798 = .data:0x81637508; // type:object size:0x20 scope:local data:string +@22799 = .data:0x81637528; // type:object size:0x22 scope:local data:string +@22800 = .data:0x8163754A; // type:object size:0x27 scope:local data:string +@22801 = .data:0x81637571; // type:object size:0x23 scope:local data:string +@22802 = .data:0x81637594; // type:object size:0x3D scope:local data:string +@22803 = .data:0x816375D1; // type:object size:0x27 scope:local data:string +@22815 = .data:0x816375F8; // type:object size:0x2C scope:local data:string +@22816 = .data:0x81637624; // type:object size:0x30 scope:local data:string +@22817 = .data:0x81637654; // type:object size:0x26 scope:local data:string +@14983 = .data:0x8163767A; // type:object size:0x13 scope:local data:string +@14984 = .data:0x8163768D; // type:object size:0xD scope:local data:string +@14985 = .data:0x8163769A; // type:object size:0x9 scope:local data:string +@22831 = .data:0x816376A3; // type:object size:0x18 scope:local data:string +@22832 = .data:0x816376BB; // type:object size:0x1C scope:local data:string +@22833 = .data:0x816376D7; // type:object size:0x24 scope:local data:string +@22841 = .data:0x816376FB; // type:object size:0x2A scope:local data:string +@22842 = .data:0x81637725; // type:object size:0x28 scope:local data:string +@22914 = .data:0x8163774D; // type:object size:0x35 scope:local data:string +@22915 = .data:0x81637782; // type:object size:0x2C scope:local data:string +@22916 = .data:0x816377AE; // type:object size:0x34 scope:local data:string +@22917 = .data:0x816377E2; // type:object size:0x35 scope:local data:string +@22918 = .data:0x81637817; // type:object size:0x2A scope:local data:string +@22919 = .data:0x81637841; // type:object size:0x38 scope:local data:string +@22920 = .data:0x81637879; // type:object size:0x53 scope:local data:string +@22921 = .data:0x816378CC; // type:object size:0x2A scope:local data:string +@22922 = .data:0x816378F6; // type:object size:0x29 scope:local data:string +@22923 = .data:0x8163791F; // type:object size:0x27 scope:local data:string +@22924 = .data:0x81637946; // type:object size:0x28 scope:local data:string +@22925 = .data:0x8163796E; // type:object size:0x28 scope:local data:string +@22926 = .data:0x81637996; // type:object size:0x33 scope:local data:string +@22927 = .data:0x816379C9; // type:object size:0x35 scope:local data:string +@22947 = .data:0x816379FE; // type:object size:0x2A scope:local data:string +@22948 = .data:0x81637A28; // type:object size:0x20 scope:local data:string +@22949 = .data:0x81637A48; // type:object size:0x39 scope:local data:string +@22977 = .data:0x81637A81; // type:object size:0x41 scope:local data:string +@22978 = .data:0x81637AC2; // type:object size:0x3D scope:local data:string +@22979 = .data:0x81637AFF; // type:object size:0x27 scope:local data:string +@22980 = .data:0x81637B26; // type:object size:0x24 scope:local data:string +@22984 = .data:0x81637B4A; // type:object size:0x28 scope:local data:string +@22985 = .data:0x81637B72; // type:object size:0x24 scope:local data:string +@23013 = .data:0x81637B96; // type:object size:0x22 scope:local data:string +@23014 = .data:0x81637BB8; // type:object size:0x21 scope:local data:string +@23015 = .data:0x81637BD9; // type:object size:0x39 scope:local data:string +@23016 = .data:0x81637C12; // type:object size:0x3A scope:local data:string +@23017 = .data:0x81637C4C; // type:object size:0x35 scope:local data:string +@23018 = .data:0x81637C81; // type:object size:0x33 scope:local data:string +@23019 = .data:0x81637CB4; // type:object size:0x29 scope:local data:string +@23020 = .data:0x81637CDD; // type:object size:0x38 scope:local data:string +@23021 = .data:0x81637D15; // type:object size:0x2D scope:local data:string +@23035 = .data:0x81637D42; // type:object size:0x39 scope:local data:string +@23036 = .data:0x81637D7B; // type:object size:0x31 scope:local data:string +@23037 = .data:0x81637DAC; // type:object size:0x2F scope:local data:string +@23038 = .data:0x81637DDB; // type:object size:0x30 scope:local data:string +@23094 = .data:0x81637E0B; // type:object size:0x46 scope:local data:string +@23095 = .data:0x81637E51; // type:object size:0x2D scope:local data:string +@23096 = .data:0x81637E7E; // type:object size:0x2D scope:local data:string +@23097 = .data:0x81637EAB; // type:object size:0x2C scope:local data:string +@23098 = .data:0x81637ED7; // type:object size:0x34 scope:local data:string +@23123 = .data:0x81637F0B; // type:object size:0x27 scope:local data:string +@23124 = .data:0x81637F32; // type:object size:0x2B scope:local data:string +@23125 = .data:0x81637F5D; // type:object size:0x1F scope:local data:string +@23126 = .data:0x81637F7C; // type:object size:0x21 scope:local data:string +@23127 = .data:0x81637F9D; // type:object size:0x26 scope:local data:string +@23128 = .data:0x81637FC3; // type:object size:0x29 scope:local data:string +@23129 = .data:0x81637FEC; // type:object size:0xF scope:local data:string +@23130 = .data:0x81637FFB; // type:object size:0x23 scope:local data:string +@23131 = .data:0x8163801E; // type:object size:0x2B scope:local data:string +@23132 = .data:0x81638049; // type:object size:0x23 scope:local data:string +@23159 = .data:0x8163806C; // type:object size:0x34 scope:local data:string +@23160 = .data:0x816380A0; // type:object size:0x3B scope:local data:string +@23161 = .data:0x816380DB; // type:object size:0x30 scope:local data:string +@23162 = .data:0x8163810B; // type:object size:0x4D scope:local data:string +@23163 = .data:0x81638158; // type:object size:0x50 scope:local data:string +@23176 = .data:0x816381A8; // type:object size:0x23 scope:local data:string +@23177 = .data:0x816381CB; // type:object size:0x24 scope:local data:string +@23178 = .data:0x816381EF; // type:object size:0x2E scope:local data:string +@23179 = .data:0x8163821D; // type:object size:0x2E scope:local data:string +@23199 = .data:0x8163824B; // type:object size:0x35 scope:local data:string +@23200 = .data:0x81638280; // type:object size:0x34 scope:local data:string +@23214 = .data:0x816382B4; // type:object size:0x2C scope:local data:string +@23269 = .data:0x816382E0; // type:object size:0x29 scope:local data:string +@23270 = .data:0x81638309; // type:object size:0x3E scope:local data:string +@23271 = .data:0x81638347; // type:object size:0x30 scope:local data:string +@23272 = .data:0x81638377; // type:object size:0x3C scope:local data:string +@23273 = .data:0x816383B3; // type:object size:0x34 scope:local data:string +@23278 = .data:0x816383E7; // type:object size:0x35 scope:local data:string +@23279 = .data:0x8163841C; // type:object size:0x32 scope:local data:string +@23280 = .data:0x8163844E; // type:object size:0x32 scope:local data:string +@23281 = .data:0x81638480; // type:object size:0x2D scope:local data:string +@23325 = .data:0x816384AD; // type:object size:0x32 scope:local data:string +@23326 = .data:0x816384DF; // type:object size:0x1F scope:local data:string +@23327 = .data:0x816384FE; // type:object size:0x3C scope:local data:string +@23328 = .data:0x8163853A; // type:object size:0x2F scope:local data:string +@23363 = .data:0x81638569; // type:object size:0x2E scope:local data:string +@23364 = .data:0x81638597; // type:object size:0x29 scope:local data:string +@23365 = .data:0x816385C0; // type:object size:0x45 scope:local data:string +@23366 = .data:0x81638605; // type:object size:0x36 scope:local data:string +@23367 = .data:0x8163863B; // type:object size:0x2D scope:local data:string +@23368 = .data:0x81638668; // type:object size:0x49 scope:local data:string +@23369 = .data:0x816386B1; // type:object size:0x4B scope:local data:string +@23376 = .data:0x816386FC; // type:object size:0x33 scope:local data:string +@23414 = .data:0x8163872F; // type:object size:0x36 scope:local data:string +@23486 = .data:0x81638765; // type:object size:0x24 scope:local data:string +@23496 = .data:0x81638789; // type:object size:0x2E scope:local data:string +@23499 = .data:0x816387B7; // type:object size:0x2E scope:local data:string +@23572 = .data:0x816387E5; // type:object size:0x15 scope:local data:string +@23573 = .data:0x816387FA; // type:object size:0x36 scope:local data:string +@23575 = .data:0x81638830; // type:object size:0x2B scope:local data:string +@23576 = .data:0x8163885B; // type:object size:0xA scope:local data:string +@23577 = .data:0x81638865; // type:object size:0xA scope:local data:string +@23578 = .data:0x8163886F; // type:object size:0x38 scope:local data:string +@23579 = .data:0x816388A7; // type:object size:0x22 scope:local data:string +@23580 = .data:0x816388C9; // type:object size:0x35 scope:local data:string +@23593 = .data:0x816388FE; // type:object size:0x20 scope:local data:string +@23598 = .data:0x8163891E; // type:object size:0x1F scope:local data:string +@23689 = .data:0x8163893D; // type:object size:0x30 scope:local data:string +@23690 = .data:0x8163896D; // type:object size:0x30 scope:local data:string +@23691 = .data:0x8163899D; // type:object size:0x1B scope:local data:string +@23692 = .data:0x816389B8; // type:object size:0x24 scope:local data:string +@23693 = .data:0x816389DC; // type:object size:0x2F scope:local data:string +@23694 = .data:0x81638A0B; // type:object size:0x2E scope:local data:string +@23695 = .data:0x81638A39; // type:object size:0x25 scope:local data:string +@23710 = .data:0x81638A5E; // type:object size:0x2D scope:local data:string +@23711 = .data:0x81638A8B; // type:object size:0x2B scope:local data:string +@23712 = .data:0x81638AB6; // type:object size:0x22 scope:local data:string +@23713 = .data:0x81638AD8; // type:object size:0x27 scope:local data:string +@23719 = .data:0x81638AFF; // type:object size:0x21 scope:local data:string +@23724 = .data:0x81638B20; // type:object size:0x24 scope:local data:string +@23750 = .data:0x81638B44; // type:object size:0x25 scope:local data:string +@23766 = .data:0x81638B69; // type:object size:0x1E scope:local data:string +@23767 = .data:0x81638B87; // type:object size:0x2A scope:local data:string +@23772 = .data:0x81638BB1; // type:object size:0x26 scope:local data:string lbl_81638BB2 = .data:0x81638BB2; // type:object size:0x26 data:string -lbl_81638BD7 = .data:0x81638BD7; // type:object size:0xBA +@23777 = .data:0x81638BD7; // type:object size:0x26 scope:local data:string +@23879 = .data:0x81638BFD; // type:object size:0x3B scope:local data:string +@23880 = .data:0x81638C38; // type:object size:0x29 scope:local data:string +@23881 = .data:0x81638C61; // type:object size:0x30 scope:local data:string sZiSysLangTable__Q23ipl8keyboard = .data:0x81638C98; // type:object size:0x58 scope:local sZiOemLangTable__Q23ipl8keyboard = .data:0x81638CF0; // type:object size:0x58 scope:local lbl_81638D48 = .data:0x81638D48; // type:object size:0x1A8 @@ -16583,9 +16808,24 @@ __vt__Q33ipl5scene7Setting = .data:0x81657A5C; // type:object size:0xFC @1909 = .data:0x81657BDC; // type:object size:0x12 scope:local data:string @1910 = .data:0x81657BEE; // type:object size:0xC scope:local data:string @1911 = .data:0x81657BFA; // type:object size:0x16 scope:local data:string -lbl_81657C10 = .data:0x81657C10; // type:object size:0x21 data:string -lbl_81657C31 = .data:0x81657C31; // type:object size:0x1E data:string -lbl_81657C4F = .data:0x81657C4F; // type:object size:0x111 +@12223 = .data:0x81657C10; // type:object size:0x21 scope:local data:string +...data.0 = .data:0x81657C10; // type:label scope:local +@12284 = .data:0x81657C31; // type:object size:0x1E scope:local data:string +@12285 = .data:0x81657C4F; // type:object size:0x22 scope:local data:string +@12300 = .data:0x81657C71; // type:object size:0x10 scope:local data:string +@12301 = .data:0x81657C81; // type:object size:0x9 scope:local data:string +@12303 = .data:0x81657C8A; // type:object size:0xD scope:local data:string +@12306 = .data:0x81657C97; // type:object size:0xA scope:local data:string +@12308 = .data:0x81657CA1; // type:object size:0xB scope:local data:string +@12310 = .data:0x81657CAC; // type:object size:0xD scope:local data:string +@12312 = .data:0x81657CB9; // type:object size:0x13 scope:local data:string +@12314 = .data:0x81657CCC; // type:object size:0x11 scope:local data:string +@12316 = .data:0x81657CDD; // type:object size:0x17 scope:local data:string +@12318 = .data:0x81657CF4; // type:object size:0x20 scope:local data:string +@12320 = .data:0x81657D14; // type:object size:0x1E scope:local data:string +@12322 = .data:0x81657D32; // type:object size:0xF scope:local data:string +@12324 = .data:0x81657D41; // type:object size:0xE scope:local data:string +@12326 = .data:0x81657D4F; // type:object size:0xD scope:local data:string lbl_81657D60 = .data:0x81657D60; // type:object size:0x1B data:string lbl_81657D7B = .data:0x81657D7B; // type:object size:0x1D data:string __vt__Q33ipl5scene12APScanThread = .data:0x81657D98; // type:object size:0x30 @@ -19700,12 +19940,12 @@ lbl_8169638B = .sdata2:0x8169638B; // type:object size:0x5 data:byte @10441 = .sdata2:0x81696400; // type:object size:0x4 scope:local align:4 data:float @10442 = .sdata2:0x81696404; // type:object size:0x4 scope:local align:4 data:float @10445 = .sdata2:0x81696408; // type:object size:0x8 scope:local align:8 data:double -lbl_81696410 = .sdata2:0x81696410; // type:object size:0x4 data:4byte +@13886 = .sdata2:0x81696410; // type:object size:0x8 scope:local data:4byte lbl_81696414 = .sdata2:0x81696414; // type:object size:0x4 data:4byte -lbl_81696418 = .sdata2:0x81696418; // type:object size:0x4 data:4byte +@13978 = .sdata2:0x81696418; // type:object size:0x8 scope:local data:4byte lbl_8169641C = .sdata2:0x8169641C; // type:object size:0x4 data:4byte -lbl_81696420 = .sdata2:0x81696420; // type:object size:0x4 align:4 data:float -lbl_81696428 = .sdata2:0x81696428; // type:object size:0x8 align:8 data:double +@23219 = .sdata2:0x81696420; // type:object size:0x4 scope:local align:4 data:float +@23221 = .sdata2:0x81696428; // type:object size:0x8 scope:local align:8 data:double lbl_81696430 = .sdata2:0x81696430; // type:object size:0x4 align:4 data:float lbl_81696434 = .sdata2:0x81696434; // type:object size:0x4 align:4 data:float lbl_81696438 = .sdata2:0x81696438; // type:object size:0x8 align:4 data:float @@ -21038,7 +21278,7 @@ lbl_81697F96 = .sdata:0x81697F96; // type:object size:0x6 data:string @14129 = .sdata:0x8169802A; // type:object size:0x6 scope:local data:string @14332 = .sdata:0x81698030; // type:object size:0x6 scope:local data:string c_banner_file_name__Q23ipl12NandSDWorker = .sdata:0x81698038; // type:object size:0x4 data:4byte -lbl_8169803C = .sdata:0x8169803C; // type:object size:0x7 data:string +@12344 = .sdata:0x8169803C; // type:object size:0x7 scope:local data:string c_nocopy_folder_name__Q23ipl12NandSDWorker = .sdata:0x81698044; // type:object size:0x4 data:4byte c_notransfer_folder_name__Q23ipl12NandSDWorker = .sdata:0x81698048; // type:object size:0x4 data:4byte c_wii_sd_title_root__Q23ipl12NandSDWorker = .sdata:0x8169804C; // type:object size:0x4 data:4byte @@ -21047,17 +21287,17 @@ c_sd_app_file_name__Q23ipl12NandSDWorker = .sdata:0x81698054; // type:object siz c_succession_path__Q23ipl12NandSDWorker = .sdata:0x81698058; // type:object size:0x4 data:4byte c_transferid_path__Q23ipl12NandSDWorker = .sdata:0x8169805C; // type:object size:0x4 data:4byte c_tmp_work_path__Q23ipl12NandSDWorker = .sdata:0x81698060; // type:object size:0x4 data:4byte -lbl_81698064 = .sdata:0x81698064; // type:object size:0x6 data:string -lbl_8169806A = .sdata:0x8169806A; // type:object size:0x7 data:string -lbl_81698071 = .sdata:0x81698071; // type:object size:0x6 data:string -lbl_81698077 = .sdata:0x81698077; // type:object size:0x5 data:string +@12352 = .sdata:0x81698064; // type:object size:0x6 scope:local data:string +@12353 = .sdata:0x8169806A; // type:object size:0x7 scope:local data:string +@12355 = .sdata:0x81698071; // type:object size:0x6 scope:local data:string +@12356 = .sdata:0x81698077; // type:object size:0x5 scope:local data:string c_ignore_list_for_wiimenu__Q23ipl12NandSDWorker = .sdata:0x8169807C; // type:object size:0x8 c_wii_menu_save_path__Q23ipl12NandSDWorker = .sdata:0x81698084; // type:object size:0x4 data:4byte -lbl_81698088 = .sdata:0x81698088; // type:object size:0x2 data:string -lbl_8169808A = .sdata:0x8169808A; // type:object size:0x3 data:string -lbl_8169808D = .sdata:0x8169808D; // type:object size:0x2 data:string -lbl_8169808F = .sdata:0x8169808F; // type:object size:0x5 data:string -lbl_81698094 = .sdata:0x81698094; // type:object size:0x4 data:string +@22157 = .sdata:0x81698088; // type:object size:0x2 scope:local data:string +@22300 = .sdata:0x8169808A; // type:object size:0x3 scope:local data:string +@22314 = .sdata:0x8169808D; // type:object size:0x2 scope:local data:string +@23190 = .sdata:0x8169808F; // type:object size:0x5 scope:local data:string +@23574 = .sdata:0x81698094; // type:object size:0x4 scope:local data:string lbl_81698098 = .sdata:0x81698098; // type:object size:0x4 data:string lbl_8169809C = .sdata:0x8169809C; // type:object size:0x4 @10074 = .sdata:0x816980A0; // type:object size:0x4 scope:local data:string @@ -21729,8 +21969,8 @@ lbl_81699063 = .sdata:0x81699063; // type:object size:0x6 data:string lbl_81699069 = .sdata:0x81699069; // type:object size:0x7 data:string lbl_81699070 = .sdata:0x81699070; // type:object size:0x3 data:string lbl_81699074 = .sdata:0x81699074; // type:object size:0x8 data:wstring -lbl_81699080 = .sdata:0x81699080; // type:object size:0x5 data:string -lbl_81699085 = .sdata:0x81699085; // type:object size:0x5 data:string +@12299 = .sdata:0x81699080; // type:object size:0x5 scope:local data:string +@12302 = .sdata:0x81699085; // type:object size:0x5 scope:local data:string lbl_81699090 = .sdata:0x81699090; // type:object size:0x4 data:string lbl_81699098 = .sdata:0x81699098; // type:object size:0x8 data:4byte lbl_816990A0 = .sdata:0x816990A0; // type:object size:0x4 data:4byte @@ -22845,7 +23085,7 @@ ScrollState___Q23www9trasition = .sbss:0x8169A824; // type:object size:0x4 scope gDpdWaitFrm = .sbss:0x8169A828; // type:object size:0x4 data:4byte wiiFlag__Q23www10wiisetting = .sbss:0x8169A82C; // type:object size:0x8 data:4byte writeBackID__Q23www10wiisetting = .sbss:0x8169A834; // type:object size:0x1 data:byte -savedata_smth__Q23www10wiisetting = .sbss:0x8169A835; // type:object size:0x1 data:byte +saveData__Q23www10wiisetting = .sbss:0x8169A835; // type:object size:0x1 data:byte funcResult__Q23www10wiisetting = .sbss:0x8169A836; // type:object size:0x1 data:byte setupFlag__Q23www10wiisetting = .sbss:0x8169A837; // type:object size:0x1 data:byte mQueue__Q23www10wiisetting = .sbss:0x8169A838; // type:object size:0x4 data:4byte diff --git a/config/43J/symbols.txt b/config/43J/symbols.txt index aefbbde1..fd38034e 100644 --- a/config/43J/symbols.txt +++ b/config/43J/symbols.txt @@ -1523,10 +1523,10 @@ list_sd_save_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348258; // type:functio list_sd_app_async__Q23ipl12NandSDWorkerFPUl = .text:0x8134826C; // type:function size:0x14 get_sd_save_banner_async__Q23ipl12NandSDWorkerFUlP17WIISaveBannerFile = .text:0x81348280; // type:function size:0x28 get_sd_app_thumbnail_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl7channel18SChanMgrMetaHeader = .text:0x813482A8; // type:function size:0x34 -iplNandSD_81348DFC__Q23ipl12NandSDWorkerFUlPvPv = .text:0x813482DC; // type:function size:0x34 -update_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348310; // type:function size:0x14 -read_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348324; // type:function size:0x14 -iplNandSD_81348E58__Q23ipl12NandSDWorkerFUxPvPv = .text:0x81348338; // type:function size:0x30 +get_sd_app_meta_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl12NandSDWorker14SDAppMetaEntry = .text:0x813482DC; // type:function size:0x34 +update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348310; // type:function size:0x14 +read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348324; // type:function size:0x14 +check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x81348338; // type:function size:0x30 check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348368; // type:function size:0x20 iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348388; // type:function size:0x2C get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x813483B4; // type:function size:0x18 @@ -1543,7 +1543,7 @@ copy_sd_save_to_nand_async__Q23ipl12NandSDWorkerFUl = .text:0x81348494; // type: format_sd_async__Q23ipl12NandSDWorkerFv = .text:0x813484B0; // type:function size:0x8 get_sd_free_area_async__Q23ipl12NandSDWorkerFPUx = .text:0x813484B8; // type:function size:0x14 list_nand_app_async__Q23ipl12NandSDWorkerFPUx = .text:0x813484CC; // type:function size:0x14 -iplNandSD_81349000__Q23ipl12NandSDWorkerFPvPv = .text:0x813484E0; // type:function size:0x20 +list_nand_apps_usage_async__Q23ipl12NandSDWorkerFPvPv = .text:0x813484E0; // type:function size:0x20 get_nand_app_thumbnail_async__Q23ipl12NandSDWorkerFUxPvPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81348500; // type:function size:0x30 delete_nand_app_async__Q23ipl12NandSDWorkerFUxb = .text:0x81348530; // type:function size:0x28 copy_nand_app_to_sd_async__Q23ipl12NandSDWorkerFUx = .text:0x81348558; // type:function size:0x20 @@ -1584,12 +1584,12 @@ check_nand_save_banner_exist__Q23ipl12NandSDWorkerFUx = .text:0x8134A448; // typ get_nand_save_banner__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134A52C; // type:function size:0x3B0 do_get_sd_save_banner__Q23ipl12NandSDWorkerFv = .text:0x8134A8DC; // type:function size:0x160 do_get_sd_app_thumbnail__Q23ipl12NandSDWorkerFv = .text:0x8134AA3C; // type:function size:0x1CC -do_unk_8134B728__Q23ipl12NandSDWorkerFv = .text:0x8134AC08; // type:function size:0x1F4 -do_update_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134ADFC; // type:function size:0x344 -do_read_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134B140; // type:function size:0x270 -do_unk_8134BED0__Q23ipl12NandSDWorkerFv = .text:0x8134B3B0; // type:function size:0x3C8 +do_get_sd_app_meta__Q23ipl12NandSDWorkerFv = .text:0x8134AC08; // type:function size:0x1F4 +do_update_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134ADFC; // type:function size:0x344 +do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134B140; // type:function size:0x270 +do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134B3B0; // type:function size:0x3C8 check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134B778; // type:function size:0x3D8 -do_list_nand_apps_usages__Q23ipl12NandSDWorkerFv = .text:0x8134BB50; // type:function size:0x1C8 +do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134BB50; // type:function size:0x1C8 do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134BD18; // type:function size:0x2D0 do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134BFE8; // type:function size:0x260 do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134C248; // type:function size:0x1F4 @@ -1619,7 +1619,7 @@ delete_download_task__Q23ipl12NandSDWorkerFUl = .text:0x8134F174; // type:functi delete_nand_app_content__Q23ipl12NandSDWorkerFUx = .text:0x8134F388; // type:function size:0x134 do_copy_nand_app_to_sd__Q23ipl12NandSDWorkerFv = .text:0x8134F4BC; // type:function size:0x530 get_save_banner_for_data_only_title__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134F9EC; // type:function size:0x160 -get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker11SDAppBanner = .text:0x8134FB4C; // type:function size:0x480 +get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker15SDAppBackupData = .text:0x8134FB4C; // type:function size:0x480 open_nand_app_content__Q23ipl12NandSDWorkerFUxUsPUlPP12ESTicketView = .text:0x8134FFCC; // type:function size:0x21C read_file__Q23ipl12NandSDWorkerFPvQ33ipl12NandSDWorker8FileKindlUlPv = .text:0x813501E8; // type:function size:0x158 search_meta_header__Q23ipl12NandSDWorkerFPCUc = .text:0x81350340; // type:function size:0x54 @@ -1687,13 +1687,13 @@ check_nand_save_exist_lo__Q23ipl12NandSDWorkerFUl = .text:0x81353BD8; // type:fu get_nand_title_version__Q23ipl12NandSDWorkerFUxPUs = .text:0x81353CA0; // type:function size:0x80 get_sd_title_version__Q23ipl12NandSDWorkerFUlPUs = .text:0x81353D20; // type:function size:0xF4 check_sd_title_restorable__Q23ipl12NandSDWorkerFUl = .text:0x81353E14; // type:function size:0x184 -__ct__Q33ipl2ut8FreeListFv = .text:0x81353F98; // type:function size:0x14 -init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81353FAC; // type:function size:0x5C -get__Q33ipl2ut8FreeListFv = .text:0x81354008; // type:function size:0x24 -__ct__Q33ipl2ut5StackFv = .text:0x8135402C; // type:function size:0x40 -init__Q33ipl2ut5StackFPvUlUl = .text:0x8135406C; // type:function size:0x4C -push__Q33ipl2ut5StackFPCv = .text:0x813540B8; // type:function size:0x78 -pop__Q33ipl2ut5StackFPv = .text:0x81354130; // type:function size:0x80 +__ct__Q33ipl2ut8FreeListFv = .text:0x81353F98; // type:function size:0x14 scope:weak +init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81353FAC; // type:function size:0x5C scope:weak +get__Q33ipl2ut8FreeListFv = .text:0x81354008; // type:function size:0x24 scope:weak +__ct__Q33ipl2ut5StackFv = .text:0x8135402C; // type:function size:0x40 scope:weak +init__Q33ipl2ut5StackFPvUlUl = .text:0x8135406C; // type:function size:0x4C scope:weak +push__Q33ipl2ut5StackFPCv = .text:0x813540B8; // type:function size:0x78 scope:weak +pop__Q33ipl2ut5StackFPv = .text:0x81354130; // type:function size:0x80 scope:weak getFirstController__Q23ipl8keyboardFv = .text:0x813541B0; // type:function size:0x50 onCommand__Q33ipl8keyboard13EventObserverFQ39textinput15CommandReceiver13INPUT_COMMANDPv = .text:0x81354200; // type:function size:0x34 onSE__Q33ipl8keyboard13EventObserverFQ39textinput5sound2SE = .text:0x81354234; // type:function size:0x218 @@ -2376,8 +2376,8 @@ LeftScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginV RightScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136EE34; // type:function size:0x3C GetScrollState__Q23www9trasitionFv = .text:0x8136EE70; // type:function size:0x8 ResetScrollState__Q23www9trasitionFv = .text:0x8136EE78; // type:function size:0xC -www_wiisetting_8136F9D0 = .text:0x8136EE84; // type:function size:0x24 scope:local -www_wiisetting_8136F9F4 = .text:0x8136EEA8; // type:function size:0x44 scope:local +DPDCallback2__Q23www10wiisettingFll = .text:0x8136EE84; // type:function size:0x24 scope:local +DPDCallback__Q23www10wiisettingFll = .text:0x8136EEA8; // type:function size:0x44 scope:local allow_access__Q23www10wiisettingFPCcPCci = .text:0x8136EEEC; // type:function size:0x8 AddJsPlugin__Q23www10wiisettingFv = .text:0x8136EEF4; // type:function size:0x88 globalGetter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136EF7C; // type:function size:0xC8 @@ -2386,9 +2386,9 @@ Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x81 Setter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136FA68; // type:function size:0x50C wiiOSReport__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136FF74; // type:function size:0x5C wiiWriteBack__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136FFD0; // type:function size:0x344 -www_wiisetting_81370E60 = .text:0x81370314; // type:function size:0x54 scope:local +getKeyboardLanguage__Q23www10wiisettingFUc = .text:0x81370314; // type:function size:0x54 scope:local initWiiSetting__Q23www10wiisettingFv = .text:0x81370368; // type:function size:0x60 -www_wiisetting_81370F14 = .text:0x813703C8; // type:function size:0x98 scope:local +getBytePropIndex__Q23www10wiisettingFPCc = .text:0x813703C8; // type:function size:0x98 scope:local startFunc__Q23www10wiisettingFUc = .text:0x81370460; // type:function size:0x1A4 getWiiSettingData__Q23www10wiisettingFv = .text:0x81370604; // type:function size:0xC getWiiSettingFlag__Q23www10wiisettingFv = .text:0x81370610; // type:function size:0x8 @@ -13836,7 +13836,7 @@ lbl_81636800 = .rodata:0x81636800; // type:object size:0x20 scNumber__3ipl = .rodata:0x81636820; // type:object size:0x16 data:wstring c_es_encrypt_iv__Q23ipl12NandSDWorker = .rodata:0x81636838; // type:object size:0x10 c_md5_secret_key__Q23ipl12NandSDWorker = .rodata:0x81636848; // type:object size:0x10 -lbl_81636858 = .rodata:0x81636858; // type:object size:0x10 data:4byte +@14986 = .rodata:0x81636858; // type:object size:0x10 scope:local data:4byte cDefaultChanList__3ipl = .rodata:0x81636868; // type:object size:0x300 scope:local odh_zigzag_order = .rodata:0x81636B68; // type:object size:0x40 scope:local data:byte odh_natural_order = .rodata:0x81636BA8; // type:object size:0x40 scope:local data:byte @@ -13878,8 +13878,8 @@ scMonthToMessageID__Q23ipl5scene = .rodata:0x81638D58; // type:object size:0x30 scNumber__Q23ipl5scene = .rodata:0x81638D88; // type:object size:0x18 scope:local data:2byte scAnmFrame__Q23ipl5scene = .rodata:0x81638DA0; // type:object size:0x90 scope:local scNumber__Q23ipl5scene = .rodata:0x81638E30; // type:object size:0x18 scope:local -scNumber__Q23ipl5scene = .rodata:0x81638E48; // type:object size:0x14 scope:local data:2byte -scNumber2__Q23ipl5scene = .rodata:0x81638E5C; // type:object size:0x14 scope:local data:2byte +@13129 = .rodata:0x81638E48; // type:object size:0x14 scope:local data:2byte +@13171 = .rodata:0x81638E5C; // type:object size:0x14 scope:local data:2byte lbl_81638E70 = .rodata:0x81638E70; // type:object size:0x10 lbl_81638E80 = .rodata:0x81638E80; // type:object size:0x10 scNumber__Q23ipl5scene = .rodata:0x81638E90; // type:object size:0x18 scope:local data:2byte @@ -13891,9 +13891,9 @@ cfChanThumbOfss__Q23ipl5scene = .rodata:0x816394D0; // type:object size:0x10 sco lbl_816394E0 = .rodata:0x816394E0; // type:object size:0x10 data:4byte lbl_816394F0 = .rodata:0x816394F0; // type:object size:0x20 data:4byte @10845 = .rodata:0x81639510; // type:object size:0x14 scope:local data:2byte -scNumber__Q23ipl5scene = .rodata:0x81639528; // type:object size:0x14 scope:local data:2byte -scNumber2__Q23ipl5scene = .rodata:0x8163953C; // type:object size:0x14 scope:local data:2byte -scNumber__Q23ipl5scene = .rodata:0x81639550; // type:object size:0x14 scope:local data:2byte +@13108 = .rodata:0x81639528; // type:object size:0x14 scope:local data:2byte +@13150 = .rodata:0x8163953C; // type:object size:0x14 scope:local data:2byte +@12843 = .rodata:0x81639550; // type:object size:0x14 scope:local data:2byte scAnmName__Q23ipl5scene = .rodata:0x81639568; // type:object size:0xD8 scope:local scTextboxToMessageID__Q23ipl5scene = .rodata:0x81639640; // type:object size:0x28 scope:local scNumber__Q23ipl5scene = .rodata:0x81639668; // type:object size:0x18 scope:local data:2byte @@ -14139,8 +14139,8 @@ DAYS_OF_YEAR = .rodata:0x81648F90; // type:object size:0x18 scope:local g_SpecialsChars = .rodata:0x81648FA8; // type:object size:0x10 data:byte TtableInv = .rodata:0x81648FB8; // type:object size:0x10 scope:local VFipf_valid_fn_char = .rodata:0x81648FC8; // type:object size:0x60 -fat_special_values = .rodata:0x81649028; // type:object size:0x3C scope:local -cp932_to_unicode = .rodata:0x81649068; // type:object size:0x4272 scope:local data:2byte +fat_special_values = .rodata:0x81649028; // type:object size:0x3C scope:local noreloc +cp932_to_unicode = .rodata:0x81649068; // type:object size:0x4272 scope:local data:2byte noreloc ErrInfoTbl$4383 = .rodata:0x8164D2E0; // type:object size:0xD0 scope:local l_nand_func = .rodata:0x8164D3B0; // type:object size:0x20 scope:local pfd_sddrv_func = .rodata:0x8164D3D0; // type:object size:0x20 scope:local @@ -14274,7 +14274,7 @@ ms_ppki = .rodata:0x8165E430; // type:object size:0x240 noreloc @1272 = .rodata:0x8165E670; // type:object size:0x278 scope:local data:4byte pf_valid_fn_char = .rodata:0x8165E8E8; // type:object size:0x60 fat_special_values = .rodata:0x8165E948; // type:object size:0x3C -cp932_to_unicode = .rodata:0x8165E988; // type:object size:0x4272 data:2byte +cp932_to_unicode = .rodata:0x8165E988; // type:object size:0x4272 scope:local data:2byte noreloc fa_nand_func = .rodata:0x81662C00; // type:object size:0x20 pfd_sddrv_func = .rodata:0x81662C20; // type:object size:0x20 sddrv_size_depend_tbl = .rodata:0x81662C40; // type:object size:0x150 data:4byte @@ -14483,64 +14483,289 @@ __vt__Q23ipl12DialogWindow = .data:0x81666370; // type:object size:0x18 __vt__Q23gui12EventHandler = .data:0x81666388; // type:object size:0x18 scope:weak __vt__Q23gui9Interface = .data:0x816663A0; // type:object size:0x20 scope:weak @10439 = .data:0x816663C0; // type:object size:0x12 scope:local data:string -lbl_816663D8 = .data:0x816663D8; // type:object size:0xB data:string -lbl_816663E3 = .data:0x816663E3; // type:object size:0xB data:string -lbl_816663EE = .data:0x816663EE; // type:object size:0x14 data:string -lbl_81666402 = .data:0x81666402; // type:object size:0x9 data:string -lbl_8166640B = .data:0x8166640B; // type:object size:0xC data:string -lbl_81666417 = .data:0x81666417; // type:object size:0x14 data:string -lbl_8166642B = .data:0x8166642B; // type:object size:0x20 data:string -lbl_8166644B = .data:0x8166644B; // type:object size:0x10 data:string -lbl_8166645B = .data:0x8166645B; // type:object size:0xC data:string +@12343 = .data:0x816663D8; // type:object size:0xB scope:local data:string +...data.0 = .data:0x816663D8; // type:label scope:local +@12345 = .data:0x816663E3; // type:object size:0xB scope:local data:string +@12346 = .data:0x816663EE; // type:object size:0x14 scope:local data:string +@12347 = .data:0x81666402; // type:object size:0x9 scope:local data:string +@12348 = .data:0x8166640B; // type:object size:0xC scope:local data:string +@12349 = .data:0x81666417; // type:object size:0x14 scope:local data:string +@12350 = .data:0x8166642B; // type:object size:0x20 scope:local data:string +@12351 = .data:0x8166644B; // type:object size:0x10 scope:local data:string +@12354 = .data:0x8166645B; // type:object size:0xC scope:local data:string c_ignore_list_for_shared2__Q23ipl12NandSDWorker = .data:0x81666468; // type:object size:0x14 -lbl_8166647C = .data:0x8166647C; // type:object size:0xC data:string -lbl_81666488 = .data:0x81666488; // type:object size:0xA data:string -lbl_81666492 = .data:0x81666492; // type:object size:0x1E data:string -lbl_816664B0 = .data:0x816664B0; // type:object size:0x22 data:string -lbl_816664D2 = .data:0x816664D2; // type:object size:0x22 data:string -lbl_816664F4 = .data:0x816664F4; // type:object size:0x6A -lbl_8166655E = .data:0x8166655E; // type:object size:0x21 data:string -lbl_8166657F = .data:0x8166657F; // type:object size:0x25 data:string -lbl_816665A4 = .data:0x816665A4; // type:object size:0xC7 -lbl_8166666B = .data:0x8166666B; // type:object size:0x95 -jumptable_81666700 = .data:0x81666700; // type:object size:0xD0 scope:local -lbl_81636130 = .data:0x816667D0; // type:object size:0x54B scope:local -lbl_81666D1B = .data:0x81666D1B; // type:object size:0x163 -lbl_81666E7E = .data:0x81666E7E; // type:object size:0x15 data:string -lbl_81666E93 = .data:0x81666E93; // type:object size:0x42 -lbl_81666ED5 = .data:0x81666ED5; // type:object size:0x170 -lbl_81667045 = .data:0x81667045; // type:object size:0x25 data:string -lbl_8166706A = .data:0x8166706A; // type:object size:0xAE -lbl_81667118 = .data:0x81667118; // type:object size:0xE0 -lbl_816671F8 = .data:0x816671F8; // type:object size:0x21 data:string -lbl_81667219 = .data:0x81667219; // type:object size:0x1F data:string -lbl_81667238 = .data:0x81667238; // type:object size:0x1E data:string -lbl_81667256 = .data:0x81667256; // type:object size:0x450 -lbl_816676A6 = .data:0x816676A6; // type:object size:0x64E -lbl_81667CF4 = .data:0x81667CF4; // type:object size:0x26 data:string -lbl_81667D1A = .data:0x81667D1A; // type:object size:0x13 data:string -lbl_81667D2D = .data:0x81667D2D; // type:object size:0xD data:string -lbl_81667D3A = .data:0x81667D3A; // type:object size:0x61 -lbl_81667D9B = .data:0x81667D9B; // type:object size:0x2A data:string -lbl_81667DC5 = .data:0x81667DC5; // type:object size:0x425 -lbl_816681EA = .data:0x816681EA; // type:object size:0x28 data:string -lbl_81668212 = .data:0x81668212; // type:object size:0x6D9 -lbl_816688EB = .data:0x816688EB; // type:object size:0x35 data:string -lbl_81668920 = .data:0x81668920; // type:object size:0x34 data:string -lbl_81668954 = .data:0x81668954; // type:object size:0x448 -lbl_81668D9C = .data:0x81668D9C; // type:object size:0x69 -lbl_81668E05 = .data:0x81668E05; // type:object size:0x24 data:string -lbl_81668E29 = .data:0x81668E29; // type:object size:0x2E data:string -lbl_81668E57 = .data:0x81668E57; // type:object size:0x79 -lbl_81668ED0 = .data:0x81668ED0; // type:object size:0xCE -lbl_81668F9E = .data:0x81668F9E; // type:object size:0x20 data:string -lbl_81668FBE = .data:0x81668FBE; // type:object size:0x1E1 -lbl_8166919F = .data:0x8166919F; // type:object size:0x21 data:string -lbl_816691C0 = .data:0x816691C0; // type:object size:0x24 data:string -lbl_816691E4 = .data:0x816691E4; // type:object size:0x43 -lbl_81669227 = .data:0x81669227; // type:object size:0x2A data:string -lbl_81669251 = .data:0x81669251; // type:object size:0x26 data:string -lbl_81669277 = .data:0x81669277; // type:object size:0xBA +@12357 = .data:0x8166647C; // type:object size:0xC scope:local data:string +@12358 = .data:0x81666488; // type:object size:0xA scope:local data:string +@12359 = .data:0x81666492; // type:object size:0x1E scope:local data:string +@21503 = .data:0x816664B0; // type:object size:0x22 scope:local data:string +@21504 = .data:0x816664D2; // type:object size:0x22 scope:local data:string +@21767 = .data:0x816664F4; // type:object size:0x16 scope:local data:string +@21770 = .data:0x8166650A; // type:object size:0x11 scope:local data:string +@21777 = .data:0x8166651B; // type:object size:0x19 scope:local data:string +@21780 = .data:0x81666534; // type:object size:0x1A scope:local data:string +@21783 = .data:0x8166654E; // type:object size:0x10 scope:local data:string +@21788 = .data:0x8166655E; // type:object size:0x21 scope:local data:string +@21789 = .data:0x8166657F; // type:object size:0x25 scope:local data:string +@21792 = .data:0x816665A4; // type:object size:0x28 scope:local data:string +@21804 = .data:0x816665CC; // type:object size:0x1B scope:local data:string +@21805 = .data:0x816665E7; // type:object size:0x1E scope:local data:string +@21806 = .data:0x81666605; // type:object size:0x29 scope:local data:string +@21917 = .data:0x8166662E; // type:object size:0x1F scope:local data:string +@21918 = .data:0x8166664D; // type:object size:0x1E scope:local data:string +@21919 = .data:0x8166666B; // type:object size:0x2F scope:local data:string +@21920 = .data:0x8166669A; // type:object size:0x34 scope:local data:string +@21921 = .data:0x816666CE; // type:object size:0x14 scope:local data:string +@21922 = .data:0x816666E2; // type:object size:0x1B scope:local data:string +@21924 = .data:0x81666700; // type:object size:0xD0 scope:local +@21965 = .data:0x816667D0; // type:object size:0x21 scope:local data:string +@21966 = .data:0x816667F1; // type:object size:0x22 scope:local data:string +@21967 = .data:0x81666813; // type:object size:0x30 scope:local data:string +@21968 = .data:0x81666843; // type:object size:0x3F scope:local data:string +@21969 = .data:0x81666882; // type:object size:0x33 scope:local data:string +@21970 = .data:0x816668B5; // type:object size:0x30 scope:local data:string +@21971 = .data:0x816668E5; // type:object size:0x2E scope:local data:string +@21972 = .data:0x81666913; // type:object size:0x28 scope:local data:string +@21973 = .data:0x8166693B; // type:object size:0x28 scope:local data:string +@21974 = .data:0x81666963; // type:object size:0x35 scope:local data:string +@21975 = .data:0x81666998; // type:object size:0x21 scope:local data:string +@21999 = .data:0x816669B9; // type:object size:0x2F scope:local data:string +@22000 = .data:0x816669E8; // type:object size:0x33 scope:local data:string +@22001 = .data:0x81666A1B; // type:object size:0x3A scope:local data:string +@22002 = .data:0x81666A55; // type:object size:0x3F scope:local data:string +@22028 = .data:0x81666A94; // type:object size:0x2C scope:local data:string +@22029 = .data:0x81666AC0; // type:object size:0x32 scope:local data:string +@22030 = .data:0x81666AF2; // type:object size:0x29 scope:local data:string +@22055 = .data:0x81666B1B; // type:object size:0x2D scope:local data:string +@22056 = .data:0x81666B48; // type:object size:0x9 scope:local data:string +@22057 = .data:0x81666B51; // type:object size:0x3C scope:local data:string +@22058 = .data:0x81666B8D; // type:object size:0x28 scope:local data:string +@22106 = .data:0x81666BB5; // type:object size:0x29 scope:local data:string +@22107 = .data:0x81666BDE; // type:object size:0x1D scope:local data:string +@22108 = .data:0x81666BFB; // type:object size:0x1E scope:local data:string +@22109 = .data:0x81666C19; // type:object size:0x1D scope:local data:string +@22110 = .data:0x81666C36; // type:object size:0x24 scope:local data:string +@22134 = .data:0x81666C5A; // type:object size:0x34 scope:local data:string +@22135 = .data:0x81666C8E; // type:object size:0x1E scope:local data:string +@22136 = .data:0x81666CAC; // type:object size:0x28 scope:local data:string +@22137 = .data:0x81666CD4; // type:object size:0x2B scope:local data:string +@22138 = .data:0x81666CFF; // type:object size:0x1C scope:local data:string +@22158 = .data:0x81666D1B; // type:object size:0x2D scope:local data:string +@22193 = .data:0x81666D48; // type:object size:0x26 scope:local data:string +@22194 = .data:0x81666D6E; // type:object size:0x2C scope:local data:string +@22195 = .data:0x81666D9A; // type:object size:0x30 scope:local data:string +@22196 = .data:0x81666DCA; // type:object size:0x30 scope:local data:string +@22197 = .data:0x81666DFA; // type:object size:0x26 scope:local data:string +@22198 = .data:0x81666E20; // type:object size:0x27 scope:local data:string +@22199 = .data:0x81666E47; // type:object size:0x37 scope:local data:string +@13884 = .data:0x81666E7E; // type:object size:0x15 scope:local data:string +@13885 = .data:0x81666E93; // type:object size:0x15 scope:local data:string +@22354 = .data:0x81666EA8; // type:object size:0x2D scope:local data:string +@22355 = .data:0x81666ED5; // type:object size:0x30 scope:local data:string +@22356 = .data:0x81666F05; // type:object size:0x4E scope:local data:string +@22357 = .data:0x81666F53; // type:object size:0x40 scope:local data:string +@22358 = .data:0x81666F93; // type:object size:0x2E scope:local data:string +@22359 = .data:0x81666FC1; // type:object size:0x37 scope:local data:string +@22360 = .data:0x81666FF8; // type:object size:0x4D scope:local data:string +@22400 = .data:0x81667045; // type:object size:0x25 scope:local data:string +@22401 = .data:0x8166706A; // type:object size:0x41 scope:local data:string +@22422 = .data:0x816670AB; // type:object size:0x30 scope:local data:string +@22423 = .data:0x816670DB; // type:object size:0x3D scope:local data:string +@22455 = .data:0x81667118; // type:object size:0x48 scope:local data:string +@22476 = .data:0x81667160; // type:object size:0x31 scope:local data:string +@22477 = .data:0x81667191; // type:object size:0x38 scope:local data:string +@22497 = .data:0x816671C9; // type:object size:0x2F scope:local data:string +@22513 = .data:0x816671F8; // type:object size:0x21 scope:local data:string +@22514 = .data:0x81667219; // type:object size:0x1F scope:local data:string +@22536 = .data:0x81667238; // type:object size:0x1E scope:local data:string +@22537 = .data:0x81667256; // type:object size:0x20 scope:local data:string +@22570 = .data:0x81667276; // type:object size:0x9 scope:local data:string +@22571 = .data:0x8166727F; // type:object size:0x37 scope:local data:string +@22572 = .data:0x816672B6; // type:object size:0x34 scope:local data:string +@22573 = .data:0x816672EA; // type:object size:0xD scope:local data:string +@22574 = .data:0x816672F7; // type:object size:0x3A scope:local data:string +@22575 = .data:0x81667331; // type:object size:0x31 scope:local data:string +@22576 = .data:0x81667362; // type:object size:0x2E scope:local data:string +@22577 = .data:0x81667390; // type:object size:0x2E scope:local data:string +@22578 = .data:0x816673BE; // type:object size:0x2B scope:local data:string +@22579 = .data:0x816673E9; // type:object size:0x2C scope:local data:string +@22580 = .data:0x81667415; // type:object size:0x2B scope:local data:string +@22581 = .data:0x81667440; // type:object size:0x23 scope:local data:string +@22582 = .data:0x81667463; // type:object size:0x38 scope:local data:string +@22583 = .data:0x8166749B; // type:object size:0x2E scope:local data:string +@22584 = .data:0x816674C9; // type:object size:0x2A scope:local data:string +@22593 = .data:0x816674F3; // type:object size:0xF scope:local data:string +@22594 = .data:0x81667502; // type:object size:0x3C scope:local data:string +@22595 = .data:0x8166753E; // type:object size:0xF scope:local data:string +@22596 = .data:0x8166754D; // type:object size:0x3C scope:local data:string +@22619 = .data:0x81667589; // type:object size:0x2E scope:local data:string +@22620 = .data:0x816675B7; // type:object size:0x33 scope:local data:string +@22621 = .data:0x816675EA; // type:object size:0x39 scope:local data:string +@22622 = .data:0x81667623; // type:object size:0x28 scope:local data:string +@22634 = .data:0x8166764B; // type:object size:0x2B scope:local data:string +@22635 = .data:0x81667676; // type:object size:0x30 scope:local data:string +@22647 = .data:0x816676A6; // type:object size:0x38 scope:local data:string +@22681 = .data:0x816676DE; // type:object size:0x2F scope:local data:string +@22682 = .data:0x8166770D; // type:object size:0x2F scope:local data:string +@22683 = .data:0x8166773C; // type:object size:0x36 scope:local data:string +@22684 = .data:0x81667772; // type:object size:0x34 scope:local data:string +@22685 = .data:0x816677A6; // type:object size:0x35 scope:local data:string +@22686 = .data:0x816677DB; // type:object size:0x2B scope:local data:string +@22690 = .data:0x81667806; // type:object size:0x32 scope:local data:string +@22691 = .data:0x81667838; // type:object size:0x21 scope:local data:string +@22692 = .data:0x81667859; // type:object size:0x21 scope:local data:string +@22693 = .data:0x8166787A; // type:object size:0x26 scope:local data:string +@22701 = .data:0x816678A0; // type:object size:0x36 scope:local data:string +@22702 = .data:0x816678D6; // type:object size:0x38 scope:local data:string +@22703 = .data:0x8166790E; // type:object size:0x2A scope:local data:string +@22730 = .data:0x81667938; // type:object size:0x31 scope:local data:string +@22731 = .data:0x81667969; // type:object size:0x33 scope:local data:string +@22732 = .data:0x8166799C; // type:object size:0x2F scope:local data:string +@22733 = .data:0x816679CB; // type:object size:0x31 scope:local data:string +@22789 = .data:0x816679FC; // type:object size:0x26 scope:local data:string +@22790 = .data:0x81667A22; // type:object size:0x2F scope:local data:string +@22791 = .data:0x81667A51; // type:object size:0x2B scope:local data:string +@22792 = .data:0x81667A7C; // type:object size:0x2C scope:local data:string +@22793 = .data:0x81667AA8; // type:object size:0x4F scope:local data:string +@22794 = .data:0x81667AF7; // type:object size:0x28 scope:local data:string +@22795 = .data:0x81667B1F; // type:object size:0x3A scope:local data:string +@22796 = .data:0x81667B59; // type:object size:0x2D scope:local data:string +@22797 = .data:0x81667B86; // type:object size:0x22 scope:local data:string +@22798 = .data:0x81667BA8; // type:object size:0x20 scope:local data:string +@22799 = .data:0x81667BC8; // type:object size:0x22 scope:local data:string +@22800 = .data:0x81667BEA; // type:object size:0x27 scope:local data:string +@22801 = .data:0x81667C11; // type:object size:0x23 scope:local data:string +@22802 = .data:0x81667C34; // type:object size:0x3D scope:local data:string +@22803 = .data:0x81667C71; // type:object size:0x27 scope:local data:string +@22815 = .data:0x81667C98; // type:object size:0x2C scope:local data:string +@22816 = .data:0x81667CC4; // type:object size:0x30 scope:local data:string +@22817 = .data:0x81667CF4; // type:object size:0x26 scope:local data:string +@14983 = .data:0x81667D1A; // type:object size:0x13 scope:local data:string +@14984 = .data:0x81667D2D; // type:object size:0xD scope:local data:string +@14985 = .data:0x81667D3A; // type:object size:0x9 scope:local data:string +@22831 = .data:0x81667D43; // type:object size:0x18 scope:local data:string +@22832 = .data:0x81667D5B; // type:object size:0x1C scope:local data:string +@22833 = .data:0x81667D77; // type:object size:0x24 scope:local data:string +@22841 = .data:0x81667D9B; // type:object size:0x2A scope:local data:string +@22842 = .data:0x81667DC5; // type:object size:0x28 scope:local data:string noreloc +@22914 = .data:0x81667DED; // type:object size:0x35 scope:local data:string +@22915 = .data:0x81667E22; // type:object size:0x2C scope:local data:string +@22916 = .data:0x81667E4E; // type:object size:0x34 scope:local data:string +@22917 = .data:0x81667E82; // type:object size:0x35 scope:local data:string +@22918 = .data:0x81667EB7; // type:object size:0x2A scope:local data:string +@22919 = .data:0x81667EE1; // type:object size:0x38 scope:local data:string +@22920 = .data:0x81667F19; // type:object size:0x53 scope:local data:string +@22921 = .data:0x81667F6C; // type:object size:0x2A scope:local data:string +@22922 = .data:0x81667F96; // type:object size:0x29 scope:local data:string +@22923 = .data:0x81667FBF; // type:object size:0x27 scope:local data:string +@22924 = .data:0x81667FE6; // type:object size:0x28 scope:local data:string +@22925 = .data:0x8166800E; // type:object size:0x28 scope:local data:string +@22926 = .data:0x81668036; // type:object size:0x33 scope:local data:string +@22927 = .data:0x81668069; // type:object size:0x35 scope:local data:string +@22947 = .data:0x8166809E; // type:object size:0x2A scope:local data:string +@22948 = .data:0x816680C8; // type:object size:0x20 scope:local data:string +@22949 = .data:0x816680E8; // type:object size:0x39 scope:local data:string +@22977 = .data:0x81668121; // type:object size:0x41 scope:local data:string +@22978 = .data:0x81668162; // type:object size:0x3D scope:local data:string +@22979 = .data:0x8166819F; // type:object size:0x27 scope:local data:string +@22980 = .data:0x816681C6; // type:object size:0x24 scope:local data:string +@22984 = .data:0x816681EA; // type:object size:0x28 scope:local data:string +@22985 = .data:0x81668212; // type:object size:0x24 scope:local data:string +@23013 = .data:0x81668236; // type:object size:0x22 scope:local data:string +@23014 = .data:0x81668258; // type:object size:0x21 scope:local data:string +@23015 = .data:0x81668279; // type:object size:0x39 scope:local data:string +@23016 = .data:0x816682B2; // type:object size:0x3A scope:local data:string +@23017 = .data:0x816682EC; // type:object size:0x35 scope:local data:string +@23018 = .data:0x81668321; // type:object size:0x33 scope:local data:string +@23019 = .data:0x81668354; // type:object size:0x29 scope:local data:string +@23020 = .data:0x8166837D; // type:object size:0x38 scope:local data:string +@23021 = .data:0x816683B5; // type:object size:0x2D scope:local data:string +@23035 = .data:0x816683E2; // type:object size:0x39 scope:local data:string +@23036 = .data:0x8166841B; // type:object size:0x31 scope:local data:string +@23037 = .data:0x8166844C; // type:object size:0x2F scope:local data:string +@23038 = .data:0x8166847B; // type:object size:0x30 scope:local data:string +@23094 = .data:0x816684AB; // type:object size:0x46 scope:local data:string +@23095 = .data:0x816684F1; // type:object size:0x2D scope:local data:string +@23096 = .data:0x8166851E; // type:object size:0x2D scope:local data:string +@23097 = .data:0x8166854B; // type:object size:0x2C scope:local data:string +@23098 = .data:0x81668577; // type:object size:0x34 scope:local data:string +@23123 = .data:0x816685AB; // type:object size:0x27 scope:local data:string +@23124 = .data:0x816685D2; // type:object size:0x2B scope:local data:string +@23125 = .data:0x816685FD; // type:object size:0x1F scope:local data:string +@23126 = .data:0x8166861C; // type:object size:0x21 scope:local data:string +@23127 = .data:0x8166863D; // type:object size:0x26 scope:local data:string +@23128 = .data:0x81668663; // type:object size:0x29 scope:local data:string +@23129 = .data:0x8166868C; // type:object size:0xF scope:local data:string +@23130 = .data:0x8166869B; // type:object size:0x23 scope:local data:string +@23131 = .data:0x816686BE; // type:object size:0x2B scope:local data:string +@23132 = .data:0x816686E9; // type:object size:0x23 scope:local data:string +@23159 = .data:0x8166870C; // type:object size:0x34 scope:local data:string +@23160 = .data:0x81668740; // type:object size:0x3B scope:local data:string +@23161 = .data:0x8166877B; // type:object size:0x30 scope:local data:string +@23162 = .data:0x816687AB; // type:object size:0x4D scope:local data:string +@23163 = .data:0x816687F8; // type:object size:0x50 scope:local data:string +@23176 = .data:0x81668848; // type:object size:0x23 scope:local data:string +@23177 = .data:0x8166886B; // type:object size:0x24 scope:local data:string +@23178 = .data:0x8166888F; // type:object size:0x2E scope:local data:string +@23179 = .data:0x816688BD; // type:object size:0x2E scope:local data:string +@23199 = .data:0x816688EB; // type:object size:0x35 scope:local data:string +@23200 = .data:0x81668920; // type:object size:0x34 scope:local data:string +@23214 = .data:0x81668954; // type:object size:0x2C scope:local data:string +@23269 = .data:0x81668980; // type:object size:0x29 scope:local data:string +@23270 = .data:0x816689A9; // type:object size:0x3E scope:local data:string +@23271 = .data:0x816689E7; // type:object size:0x30 scope:local data:string +@23272 = .data:0x81668A17; // type:object size:0x3C scope:local data:string +@23273 = .data:0x81668A53; // type:object size:0x34 scope:local data:string +@23278 = .data:0x81668A87; // type:object size:0x35 scope:local data:string +@23279 = .data:0x81668ABC; // type:object size:0x32 scope:local data:string +@23280 = .data:0x81668AEE; // type:object size:0x32 scope:local data:string +@23281 = .data:0x81668B20; // type:object size:0x2D scope:local data:string +@23325 = .data:0x81668B4D; // type:object size:0x32 scope:local data:string +@23326 = .data:0x81668B7F; // type:object size:0x1F scope:local data:string +@23327 = .data:0x81668B9E; // type:object size:0x3C scope:local data:string +@23328 = .data:0x81668BDA; // type:object size:0x2F scope:local data:string +@23363 = .data:0x81668C09; // type:object size:0x2E scope:local data:string +@23364 = .data:0x81668C37; // type:object size:0x29 scope:local data:string +@23365 = .data:0x81668C60; // type:object size:0x45 scope:local data:string +@23366 = .data:0x81668CA5; // type:object size:0x36 scope:local data:string +@23367 = .data:0x81668CDB; // type:object size:0x2D scope:local data:string +@23368 = .data:0x81668D08; // type:object size:0x49 scope:local data:string +@23369 = .data:0x81668D51; // type:object size:0x4B scope:local data:string +@23376 = .data:0x81668D9C; // type:object size:0x33 scope:local data:string +@23414 = .data:0x81668DCF; // type:object size:0x36 scope:local data:string +@23486 = .data:0x81668E05; // type:object size:0x24 scope:local data:string +@23496 = .data:0x81668E29; // type:object size:0x2E scope:local data:string +@23499 = .data:0x81668E57; // type:object size:0x2E scope:local data:string +@23572 = .data:0x81668E85; // type:object size:0x15 scope:local data:string +@23573 = .data:0x81668E9A; // type:object size:0x36 scope:local data:string +@23575 = .data:0x81668ED0; // type:object size:0x2B scope:local data:string +@23576 = .data:0x81668EFB; // type:object size:0xA scope:local data:string +@23577 = .data:0x81668F05; // type:object size:0xA scope:local data:string +@23578 = .data:0x81668F0F; // type:object size:0x38 scope:local data:string +@23579 = .data:0x81668F47; // type:object size:0x22 scope:local data:string +@23580 = .data:0x81668F69; // type:object size:0x35 scope:local data:string +@23593 = .data:0x81668F9E; // type:object size:0x20 scope:local data:string +@23598 = .data:0x81668FBE; // type:object size:0x1F scope:local data:string +@23689 = .data:0x81668FDD; // type:object size:0x30 scope:local data:string +@23690 = .data:0x8166900D; // type:object size:0x30 scope:local data:string +@23691 = .data:0x8166903D; // type:object size:0x1B scope:local data:string +@23692 = .data:0x81669058; // type:object size:0x24 scope:local data:string +@23693 = .data:0x8166907C; // type:object size:0x2F scope:local data:string +@23694 = .data:0x816690AB; // type:object size:0x2E scope:local data:string +@23695 = .data:0x816690D9; // type:object size:0x25 scope:local data:string +@23710 = .data:0x816690FE; // type:object size:0x2D scope:local data:string +@23711 = .data:0x8166912B; // type:object size:0x2B scope:local data:string +@23712 = .data:0x81669156; // type:object size:0x22 scope:local data:string +@23713 = .data:0x81669178; // type:object size:0x27 scope:local data:string +@23719 = .data:0x8166919F; // type:object size:0x21 scope:local data:string +@23724 = .data:0x816691C0; // type:object size:0x24 scope:local data:string +@23750 = .data:0x816691E4; // type:object size:0x25 scope:local data:string +@23766 = .data:0x81669209; // type:object size:0x1E scope:local data:string +@23767 = .data:0x81669227; // type:object size:0x2A scope:local data:string +@23772 = .data:0x81669251; // type:object size:0x26 scope:local data:string +@23777 = .data:0x81669277; // type:object size:0x26 scope:local data:string +@23879 = .data:0x8166929D; // type:object size:0x3B scope:local data:string +@23880 = .data:0x816692D8; // type:object size:0x29 scope:local data:string +@23881 = .data:0x81669301; // type:object size:0x30 scope:local data:string lbl_81669338 = .data:0x81669338; // type:object size:0x1A8 jumptable_816694E0 = .data:0x816694E0; // type:object size:0x60 scope:local lbl_81669540 = .data:0x81669540; // type:object size:0x80 scope:local @@ -16666,9 +16891,24 @@ __vt__Q33ipl5scene7Setting = .data:0x8168807C; // type:object size:0xFC @1909 = .data:0x816881FC; // type:object size:0x12 scope:local data:string @1910 = .data:0x8168820E; // type:object size:0xC scope:local data:string @1911 = .data:0x8168821A; // type:object size:0x16 scope:local data:string -lbl_81688230 = .data:0x81688230; // type:object size:0x21 data:string -lbl_81688251 = .data:0x81688251; // type:object size:0x1E data:string -lbl_8168826F = .data:0x8168826F; // type:object size:0x111 +@12223 = .data:0x81688230; // type:object size:0x21 scope:local data:string +...data.0 = .data:0x81688230; // type:label scope:local +@12284 = .data:0x81688251; // type:object size:0x1E scope:local data:string +@12285 = .data:0x8168826F; // type:object size:0x22 scope:local data:string +@12300 = .data:0x81688291; // type:object size:0x10 scope:local data:string +@12301 = .data:0x816882A1; // type:object size:0x9 scope:local data:string +@12303 = .data:0x816882AA; // type:object size:0xD scope:local data:string +@12306 = .data:0x816882B7; // type:object size:0xA scope:local data:string +@12308 = .data:0x816882C1; // type:object size:0xB scope:local data:string +@12310 = .data:0x816882CC; // type:object size:0xD scope:local data:string +@12312 = .data:0x816882D9; // type:object size:0x13 scope:local data:string +@12314 = .data:0x816882EC; // type:object size:0x11 scope:local data:string +@12316 = .data:0x816882FD; // type:object size:0x17 scope:local data:string +@12318 = .data:0x81688314; // type:object size:0x20 scope:local data:string +@12320 = .data:0x81688334; // type:object size:0x1E scope:local data:string +@12322 = .data:0x81688352; // type:object size:0xF scope:local data:string +@12324 = .data:0x81688361; // type:object size:0xE scope:local data:string +@12326 = .data:0x8168836F; // type:object size:0xD scope:local data:string lbl_81688380 = .data:0x81688380; // type:object size:0x1B data:string lbl_8168839B = .data:0x8168839B; // type:object size:0x1D data:string __vt__Q33ipl5scene12APScanThread = .data:0x816883B8; // type:object size:0x30 @@ -19745,12 +19985,12 @@ lbl_816C3BEB = .sdata2:0x816C3BEB; // type:object size:0x5 data:byte @10441 = .sdata2:0x816C3C60; // type:object size:0x4 scope:local align:4 data:float @10442 = .sdata2:0x816C3C64; // type:object size:0x4 scope:local align:4 data:float @10445 = .sdata2:0x816C3C68; // type:object size:0x8 scope:local align:8 data:double -lbl_816C3C70 = .sdata2:0x816C3C70; // type:object size:0x4 data:4byte +@13886 = .sdata2:0x816C3C70; // type:object size:0x8 scope:local data:4byte lbl_816C3C74 = .sdata2:0x816C3C74; // type:object size:0x4 data:4byte -lbl_816C3C78 = .sdata2:0x816C3C78; // type:object size:0x4 data:4byte +@13978 = .sdata2:0x816C3C78; // type:object size:0x8 scope:local data:4byte lbl_816C3C7C = .sdata2:0x816C3C7C; // type:object size:0x4 data:4byte -lbl_816C3C80 = .sdata2:0x816C3C80; // type:object size:0x4 align:4 data:float -lbl_816C3C88 = .sdata2:0x816C3C88; // type:object size:0x8 align:8 data:double +@23219 = .sdata2:0x816C3C80; // type:object size:0x4 scope:local align:4 data:float +@23221 = .sdata2:0x816C3C88; // type:object size:0x8 scope:local align:8 data:double lbl_816C3C90 = .sdata2:0x816C3C90; // type:object size:0x4 align:4 data:float lbl_816C3C94 = .sdata2:0x816C3C94; // type:object size:0x4 align:4 data:float lbl_816C3C98 = .sdata2:0x816C3C98; // type:object size:0x4 align:4 data:float @@ -21087,7 +21327,7 @@ lbl_816C57B6 = .sdata:0x816C57B6; // type:object size:0x6 data:string @14129 = .sdata:0x816C584A; // type:object size:0x6 scope:local data:string @14332 = .sdata:0x816C5850; // type:object size:0x6 scope:local data:string c_banner_file_name__Q23ipl12NandSDWorker = .sdata:0x816C5858; // type:object size:0x4 data:4byte -lbl_816C585C = .sdata:0x816C585C; // type:object size:0x7 data:string +@12344 = .sdata:0x816C585C; // type:object size:0x7 scope:local data:string c_nocopy_folder_name__Q23ipl12NandSDWorker = .sdata:0x816C5864; // type:object size:0x4 data:4byte c_notransfer_folder_name__Q23ipl12NandSDWorker = .sdata:0x816C5868; // type:object size:0x4 data:4byte c_wii_sd_title_root__Q23ipl12NandSDWorker = .sdata:0x816C586C; // type:object size:0x4 data:4byte @@ -21096,17 +21336,17 @@ c_sd_app_file_name__Q23ipl12NandSDWorker = .sdata:0x816C5874; // type:object siz c_succession_path__Q23ipl12NandSDWorker = .sdata:0x816C5878; // type:object size:0x4 data:4byte c_transferid_path__Q23ipl12NandSDWorker = .sdata:0x816C587C; // type:object size:0x4 data:4byte c_tmp_work_path__Q23ipl12NandSDWorker = .sdata:0x816C5880; // type:object size:0x4 data:4byte -lbl_816C5884 = .sdata:0x816C5884; // type:object size:0x6 data:string -lbl_816C588A = .sdata:0x816C588A; // type:object size:0x7 data:string -lbl_816C5891 = .sdata:0x816C5891; // type:object size:0x6 data:string -lbl_816C5897 = .sdata:0x816C5897; // type:object size:0x5 data:string +@12352 = .sdata:0x816C5884; // type:object size:0x6 scope:local data:string +@12353 = .sdata:0x816C588A; // type:object size:0x7 scope:local data:string +@12355 = .sdata:0x816C5891; // type:object size:0x6 scope:local data:string +@12356 = .sdata:0x816C5897; // type:object size:0x5 scope:local data:string c_ignore_list_for_wiimenu__Q23ipl12NandSDWorker = .sdata:0x816C589C; // type:object size:0x8 c_wii_menu_save_path__Q23ipl12NandSDWorker = .sdata:0x816C58A4; // type:object size:0x4 data:4byte -lbl_816C58A8 = .sdata:0x816C58A8; // type:object size:0x2 data:string -lbl_816C58AA = .sdata:0x816C58AA; // type:object size:0x3 data:string -lbl_816C58AD = .sdata:0x816C58AD; // type:object size:0x2 data:string -lbl_816C58AF = .sdata:0x816C58AF; // type:object size:0x5 data:string -lbl_816C58B4 = .sdata:0x816C58B4; // type:object size:0x4 data:string +@22157 = .sdata:0x816C58A8; // type:object size:0x2 scope:local data:string +@22300 = .sdata:0x816C58AA; // type:object size:0x3 scope:local data:string +@22314 = .sdata:0x816C58AD; // type:object size:0x2 scope:local data:string +@23190 = .sdata:0x816C58AF; // type:object size:0x5 scope:local data:string +@23574 = .sdata:0x816C58B4; // type:object size:0x4 scope:local data:string lbl_816C58B8 = .sdata:0x816C58B8; // type:object size:0x4 data:string lbl_816C58BC = .sdata:0x816C58BC; // type:object size:0x2 lbl_816C58BE = .sdata:0x816C58BE; // type:object size:0x8 data:string @@ -21790,8 +22030,8 @@ lbl_816C68C3 = .sdata:0x816C68C3; // type:object size:0x6 data:string lbl_816C68C9 = .sdata:0x816C68C9; // type:object size:0x7 data:string lbl_816C68D0 = .sdata:0x816C68D0; // type:object size:0x3 data:string lbl_816C68D4 = .sdata:0x816C68D4; // type:object size:0x8 data:wstring -lbl_816C68E0 = .sdata:0x816C68E0; // type:object size:0x5 data:string -lbl_816C68E5 = .sdata:0x816C68E5; // type:object size:0x5 data:string +@12299 = .sdata:0x816C68E0; // type:object size:0x5 scope:local data:string +@12302 = .sdata:0x816C68E5; // type:object size:0x5 scope:local data:string lbl_816C68F0 = .sdata:0x816C68F0; // type:object size:0x4 data:string lbl_816C68F8 = .sdata:0x816C68F8; // type:object size:0x8 data:4byte lbl_816C6900 = .sdata:0x816C6900; // type:object size:0x4 data:4byte @@ -22906,7 +23146,7 @@ ScrollState___Q23www9trasition = .sbss:0x816C8084; // type:object size:0x4 scope gDpdWaitFrm = .sbss:0x816C8088; // type:object size:0x4 data:4byte wiiFlag__Q23www10wiisetting = .sbss:0x816C808C; // type:object size:0x8 data:4byte writeBackID__Q23www10wiisetting = .sbss:0x816C8094; // type:object size:0x1 data:byte -savedata_smth__Q23www10wiisetting = .sbss:0x816C8095; // type:object size:0x1 data:byte +saveData__Q23www10wiisetting = .sbss:0x816C8095; // type:object size:0x1 data:byte funcResult__Q23www10wiisetting = .sbss:0x816C8096; // type:object size:0x1 data:byte setupFlag__Q23www10wiisetting = .sbss:0x816C8097; // type:object size:0x1 data:byte mQueue__Q23www10wiisetting = .sbss:0x816C8098; // type:object size:0x4 data:4byte diff --git a/config/43K/symbols.txt b/config/43K/symbols.txt index e9d9dcca..71de5adf 100644 --- a/config/43K/symbols.txt +++ b/config/43K/symbols.txt @@ -1510,10 +1510,10 @@ list_sd_save_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348210; // type:functio list_sd_app_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348224; // type:function size:0x14 get_sd_save_banner_async__Q23ipl12NandSDWorkerFUlP17WIISaveBannerFile = .text:0x81348238; // type:function size:0x28 get_sd_app_thumbnail_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81348260; // type:function size:0x34 -iplNandSD_81348DFC__Q23ipl12NandSDWorkerFUlPvPv = .text:0x81348294; // type:function size:0x34 -update_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x813482C8; // type:function size:0x14 -read_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x813482DC; // type:function size:0x14 -iplNandSD_81348E58__Q23ipl12NandSDWorkerFUxPvPv = .text:0x813482F0; // type:function size:0x30 +get_sd_app_meta_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl12NandSDWorker14SDAppMetaEntry = .text:0x81348294; // type:function size:0x34 +update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x813482C8; // type:function size:0x14 +read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x813482DC; // type:function size:0x14 +check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x813482F0; // type:function size:0x30 check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348320; // type:function size:0x20 iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348340; // type:function size:0x2C get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x8134836C; // type:function size:0x18 @@ -1530,7 +1530,7 @@ copy_sd_save_to_nand_async__Q23ipl12NandSDWorkerFUl = .text:0x8134844C; // type: format_sd_async__Q23ipl12NandSDWorkerFv = .text:0x81348468; // type:function size:0x8 get_sd_free_area_async__Q23ipl12NandSDWorkerFPUx = .text:0x81348470; // type:function size:0x14 list_nand_app_async__Q23ipl12NandSDWorkerFPUx = .text:0x81348484; // type:function size:0x14 -iplNandSD_81349000__Q23ipl12NandSDWorkerFPvPv = .text:0x81348498; // type:function size:0x20 +list_nand_apps_usage_async__Q23ipl12NandSDWorkerFPvPv = .text:0x81348498; // type:function size:0x20 get_nand_app_thumbnail_async__Q23ipl12NandSDWorkerFUxPvPQ33ipl7channel18SChanMgrMetaHeader = .text:0x813484B8; // type:function size:0x30 delete_nand_app_async__Q23ipl12NandSDWorkerFUxb = .text:0x813484E8; // type:function size:0x28 copy_nand_app_to_sd_async__Q23ipl12NandSDWorkerFUx = .text:0x81348510; // type:function size:0x20 @@ -1571,12 +1571,12 @@ check_nand_save_banner_exist__Q23ipl12NandSDWorkerFUx = .text:0x8134A400; // typ get_nand_save_banner__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134A4E4; // type:function size:0x3B0 do_get_sd_save_banner__Q23ipl12NandSDWorkerFv = .text:0x8134A894; // type:function size:0x160 do_get_sd_app_thumbnail__Q23ipl12NandSDWorkerFv = .text:0x8134A9F4; // type:function size:0x1CC -do_unk_8134B728__Q23ipl12NandSDWorkerFv = .text:0x8134ABC0; // type:function size:0x1F4 -do_update_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134ADB4; // type:function size:0x344 -do_read_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134B0F8; // type:function size:0x270 -do_unk_8134BED0__Q23ipl12NandSDWorkerFv = .text:0x8134B368; // type:function size:0x3C8 +do_get_sd_app_meta__Q23ipl12NandSDWorkerFv = .text:0x8134ABC0; // type:function size:0x1F4 +do_update_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134ADB4; // type:function size:0x344 +do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134B0F8; // type:function size:0x270 +do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134B368; // type:function size:0x3C8 check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134B730; // type:function size:0x3D8 -do_list_nand_apps_usages__Q23ipl12NandSDWorkerFv = .text:0x8134BB08; // type:function size:0x1C8 +do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134BB08; // type:function size:0x1C8 do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134BCD0; // type:function size:0x2D0 do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134BFA0; // type:function size:0x260 do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134C200; // type:function size:0x1F4 @@ -1606,7 +1606,7 @@ delete_download_task__Q23ipl12NandSDWorkerFUl = .text:0x8134F12C; // type:functi delete_nand_app_content__Q23ipl12NandSDWorkerFUx = .text:0x8134F340; // type:function size:0x134 do_copy_nand_app_to_sd__Q23ipl12NandSDWorkerFv = .text:0x8134F474; // type:function size:0x530 get_save_banner_for_data_only_title__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134F9A4; // type:function size:0x160 -get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker11SDAppBanner = .text:0x8134FB04; // type:function size:0x480 +get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker15SDAppBackupData = .text:0x8134FB04; // type:function size:0x480 open_nand_app_content__Q23ipl12NandSDWorkerFUxUsPUlPP12ESTicketView = .text:0x8134FF84; // type:function size:0x21C read_file__Q23ipl12NandSDWorkerFPvQ33ipl12NandSDWorker8FileKindlUlPv = .text:0x813501A0; // type:function size:0x158 search_meta_header__Q23ipl12NandSDWorkerFPCUc = .text:0x813502F8; // type:function size:0x54 @@ -1674,13 +1674,13 @@ check_nand_save_exist_lo__Q23ipl12NandSDWorkerFUl = .text:0x81353B90; // type:fu get_nand_title_version__Q23ipl12NandSDWorkerFUxPUs = .text:0x81353C58; // type:function size:0x80 get_sd_title_version__Q23ipl12NandSDWorkerFUlPUs = .text:0x81353CD8; // type:function size:0xF4 check_sd_title_restorable__Q23ipl12NandSDWorkerFUl = .text:0x81353DCC; // type:function size:0x184 -__ct__Q33ipl2ut8FreeListFv = .text:0x81353F50; // type:function size:0x14 -init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81353F64; // type:function size:0x5C -get__Q33ipl2ut8FreeListFv = .text:0x81353FC0; // type:function size:0x24 -__ct__Q33ipl2ut5StackFv = .text:0x81353FE4; // type:function size:0x40 -init__Q33ipl2ut5StackFPvUlUl = .text:0x81354024; // type:function size:0x4C -push__Q33ipl2ut5StackFPCv = .text:0x81354070; // type:function size:0x78 -pop__Q33ipl2ut5StackFPv = .text:0x813540E8; // type:function size:0x80 +__ct__Q33ipl2ut8FreeListFv = .text:0x81353F50; // type:function size:0x14 scope:weak +init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81353F64; // type:function size:0x5C scope:weak +get__Q33ipl2ut8FreeListFv = .text:0x81353FC0; // type:function size:0x24 scope:weak +__ct__Q33ipl2ut5StackFv = .text:0x81353FE4; // type:function size:0x40 scope:weak +init__Q33ipl2ut5StackFPvUlUl = .text:0x81354024; // type:function size:0x4C scope:weak +push__Q33ipl2ut5StackFPCv = .text:0x81354070; // type:function size:0x78 scope:weak +pop__Q33ipl2ut5StackFPv = .text:0x813540E8; // type:function size:0x80 scope:weak getFirstController__Q23ipl8keyboardFv = .text:0x81354168; // type:function size:0x50 onCommand__Q33ipl8keyboard13EventObserverFQ39textinput15CommandReceiver13INPUT_COMMANDPv = .text:0x813541B8; // type:function size:0x34 onSE__Q33ipl8keyboard13EventObserverFQ39textinput5sound2SE = .text:0x813541EC; // type:function size:0x218 @@ -2359,8 +2359,8 @@ LeftScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginV RightScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136ED14; // type:function size:0x3C GetScrollState__Q23www9trasitionFv = .text:0x8136ED50; // type:function size:0x8 ResetScrollState__Q23www9trasitionFv = .text:0x8136ED58; // type:function size:0xC -www_wiisetting_8136F9D0 = .text:0x8136ED64; // type:function size:0x24 scope:local -www_wiisetting_8136F9F4 = .text:0x8136ED88; // type:function size:0x44 scope:local +DPDCallback2__Q23www10wiisettingFll = .text:0x8136ED64; // type:function size:0x24 scope:local +DPDCallback__Q23www10wiisettingFll = .text:0x8136ED88; // type:function size:0x44 scope:local allow_access__Q23www10wiisettingFPCcPCci = .text:0x8136EDCC; // type:function size:0x8 AddJsPlugin__Q23www10wiisettingFv = .text:0x8136EDD4; // type:function size:0x88 globalGetter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136EE5C; // type:function size:0xC8 @@ -2369,9 +2369,9 @@ Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x81 Setter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136F948; // type:function size:0x50C wiiOSReport__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136FE54; // type:function size:0x5C wiiWriteBack__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136FEB0; // type:function size:0x344 -www_wiisetting_81370E60 = .text:0x813701F4; // type:function size:0x54 scope:local +getKeyboardLanguage__Q23www10wiisettingFUc = .text:0x813701F4; // type:function size:0x54 scope:local initWiiSetting__Q23www10wiisettingFv = .text:0x81370248; // type:function size:0x60 -www_wiisetting_81370F14 = .text:0x813702A8; // type:function size:0x98 scope:local +getBytePropIndex__Q23www10wiisettingFPCc = .text:0x813702A8; // type:function size:0x98 scope:local startFunc__Q23www10wiisettingFUc = .text:0x81370340; // type:function size:0x1A4 getWiiSettingData__Q23www10wiisettingFv = .text:0x813704E4; // type:function size:0xC getWiiSettingFlag__Q23www10wiisettingFv = .text:0x813704F0; // type:function size:0x8 @@ -13405,7 +13405,7 @@ lbl_815E61C0 = .rodata:0x815E61C0; // type:object size:0x20 scNumber__3ipl = .rodata:0x815E61E0; // type:object size:0x16 data:wstring c_es_encrypt_iv__Q23ipl12NandSDWorker = .rodata:0x815E61F8; // type:object size:0x10 c_md5_secret_key__Q23ipl12NandSDWorker = .rodata:0x815E6208; // type:object size:0x10 -lbl_815E6218 = .rodata:0x815E6218; // type:object size:0x10 data:4byte +@14986 = .rodata:0x815E6218; // type:object size:0x10 scope:local data:4byte cDefaultChanList__3ipl = .rodata:0x815E6228; // type:object size:0x300 scope:local odh_zigzag_order = .rodata:0x815E6528; // type:object size:0x40 scope:local data:byte odh_natural_order = .rodata:0x815E6568; // type:object size:0x40 scope:local data:byte @@ -13447,8 +13447,8 @@ scMonthToMessageID__Q23ipl5scene = .rodata:0x815E8718; // type:object size:0x30 scNumber__Q23ipl5scene = .rodata:0x815E8748; // type:object size:0x18 scope:local data:2byte scAnmFrame__Q23ipl5scene = .rodata:0x815E8760; // type:object size:0x90 scope:local scNumber__Q23ipl5scene = .rodata:0x815E87F0; // type:object size:0x18 scope:local -scNumber__Q23ipl5scene = .rodata:0x815E8808; // type:object size:0x14 scope:local data:2byte -scNumber2__Q23ipl5scene = .rodata:0x815E881C; // type:object size:0x14 scope:local data:2byte +@13129 = .rodata:0x815E8808; // type:object size:0x14 scope:local data:2byte +@13171 = .rodata:0x815E881C; // type:object size:0x14 scope:local data:2byte lbl_815E8830 = .rodata:0x815E8830; // type:object size:0x10 lbl_815E8840 = .rodata:0x815E8840; // type:object size:0x10 scNumber__Q23ipl5scene = .rodata:0x815E8850; // type:object size:0x18 scope:local data:2byte @@ -13460,9 +13460,9 @@ cfChanThumbOfss__Q23ipl5scene = .rodata:0x815E8E90; // type:object size:0x10 sco lbl_815E8EA0 = .rodata:0x815E8EA0; // type:object size:0x10 data:4byte lbl_815E8EB0 = .rodata:0x815E8EB0; // type:object size:0x20 data:4byte @10845 = .rodata:0x815E8ED0; // type:object size:0x14 scope:local data:2byte -scNumber__Q23ipl5scene = .rodata:0x815E8EE8; // type:object size:0x14 scope:local data:2byte -scNumber2__Q23ipl5scene = .rodata:0x815E8EFC; // type:object size:0x14 scope:local data:2byte -scNumber__Q23ipl5scene = .rodata:0x815E8F10; // type:object size:0x14 scope:local data:2byte +@13108 = .rodata:0x815E8EE8; // type:object size:0x14 scope:local data:2byte +@13150 = .rodata:0x815E8EFC; // type:object size:0x14 scope:local data:2byte +@12843 = .rodata:0x815E8F10; // type:object size:0x14 scope:local data:2byte scAnmName__Q23ipl5scene = .rodata:0x815E8F28; // type:object size:0xD8 scope:local scTextboxToMessageID__Q23ipl5scene = .rodata:0x815E9000; // type:object size:0x28 scope:local scNumber__Q23ipl5scene = .rodata:0x815E9028; // type:object size:0x18 scope:local data:2byte @@ -13634,7 +13634,7 @@ g_SpecialsChars = .rodata:0x815F2560; // type:object size:0x10 data:byte TtableInv = .rodata:0x815F2570; // type:object size:0x10 scope:local VFipf_valid_fn_char = .rodata:0x815F2580; // type:object size:0x60 fat_special_values = .rodata:0x815F25E0; // type:object size:0x3C scope:local -cp932_to_unicode = .rodata:0x815F2620; // type:object size:0x4272 scope:local data:2byte +cp932_to_unicode = .rodata:0x815F2620; // type:object size:0x4272 scope:local data:2byte noreloc ErrInfoTbl$4383 = .rodata:0x815F6898; // type:object size:0xD0 scope:local l_nand_func = .rodata:0x815F6968; // type:object size:0x20 scope:local pfd_sddrv_func = .rodata:0x815F6988; // type:object size:0x20 scope:local @@ -13770,7 +13770,7 @@ ms_ppki = .rodata:0x81606700; // type:object size:0x240 noreloc @1272 = .rodata:0x81606940; // type:object size:0x278 scope:local data:4byte pf_valid_fn_char = .rodata:0x81606BB8; // type:object size:0x60 fat_special_values = .rodata:0x81606C18; // type:object size:0x3C -cp932_to_unicode = .rodata:0x81606C58; // type:object size:0x4272 data:2byte +cp932_to_unicode = .rodata:0x81606C58; // type:object size:0x4272 scope:local data:2byte noreloc fa_nand_func = .rodata:0x8160AED0; // type:object size:0x20 pfd_sddrv_func = .rodata:0x8160AEF0; // type:object size:0x20 sddrv_size_depend_tbl = .rodata:0x8160AF10; // type:object size:0x150 data:4byte @@ -13977,64 +13977,289 @@ __vt__Q23ipl12DialogWindow = .data:0x8160DC10; // type:object size:0x18 __vt__Q23gui12EventHandler = .data:0x8160DC28; // type:object size:0x18 scope:weak __vt__Q23gui9Interface = .data:0x8160DC40; // type:object size:0x20 scope:weak @10439 = .data:0x8160DC60; // type:object size:0x12 scope:local data:string -lbl_8160DC78 = .data:0x8160DC78; // type:object size:0xB data:string -lbl_8160DC83 = .data:0x8160DC83; // type:object size:0xB data:string -lbl_8160DC8E = .data:0x8160DC8E; // type:object size:0x14 data:string -lbl_8160DCA2 = .data:0x8160DCA2; // type:object size:0x9 data:string -lbl_8160DCAB = .data:0x8160DCAB; // type:object size:0xC data:string -lbl_8160DCB7 = .data:0x8160DCB7; // type:object size:0x14 data:string -lbl_8160DCCB = .data:0x8160DCCB; // type:object size:0x20 data:string -lbl_8160DCEB = .data:0x8160DCEB; // type:object size:0x10 data:string -lbl_8160DCFB = .data:0x8160DCFB; // type:object size:0xC data:string +@12343 = .data:0x8160DC78; // type:object size:0xB scope:local data:string +...data.0 = .data:0x8160DC78; // type:label scope:local +@12345 = .data:0x8160DC83; // type:object size:0xB scope:local data:string +@12346 = .data:0x8160DC8E; // type:object size:0x14 scope:local data:string +@12347 = .data:0x8160DCA2; // type:object size:0x9 scope:local data:string +@12348 = .data:0x8160DCAB; // type:object size:0xC scope:local data:string +@12349 = .data:0x8160DCB7; // type:object size:0x14 scope:local data:string +@12350 = .data:0x8160DCCB; // type:object size:0x20 scope:local data:string +@12351 = .data:0x8160DCEB; // type:object size:0x10 scope:local data:string +@12354 = .data:0x8160DCFB; // type:object size:0xC scope:local data:string c_ignore_list_for_shared2__Q23ipl12NandSDWorker = .data:0x8160DD08; // type:object size:0x14 -lbl_8160DD1C = .data:0x8160DD1C; // type:object size:0xC data:string -lbl_8160DD28 = .data:0x8160DD28; // type:object size:0xA data:string -lbl_8160DD32 = .data:0x8160DD32; // type:object size:0x1E data:string -lbl_8160DD50 = .data:0x8160DD50; // type:object size:0x22 data:string -lbl_8160DD72 = .data:0x8160DD72; // type:object size:0x22 data:string -lbl_8160DD94 = .data:0x8160DD94; // type:object size:0x6A -lbl_8160DDFE = .data:0x8160DDFE; // type:object size:0x21 data:string -lbl_8160DE1F = .data:0x8160DE1F; // type:object size:0x25 data:string -lbl_8160DE44 = .data:0x8160DE44; // type:object size:0xC7 -lbl_8160DF0B = .data:0x8160DF0B; // type:object size:0x95 -jumptable_8160DFA0 = .data:0x8160DFA0; // type:object size:0xD0 scope:local -lbl_8160E070 = .data:0x8160E070; // type:object size:0x54B scope:local -lbl_8160E5BB = .data:0x8160E5BB; // type:object size:0x163 -lbl_8160E71E = .data:0x8160E71E; // type:object size:0x15 data:string -lbl_8160E733 = .data:0x8160E733; // type:object size:0x42 -lbl_8160E775 = .data:0x8160E775; // type:object size:0x170 -lbl_8160E8E5 = .data:0x8160E8E5; // type:object size:0x25 data:string -lbl_8160E90A = .data:0x8160E90A; // type:object size:0xAE -lbl_8160E9B8 = .data:0x8160E9B8; // type:object size:0xE0 -lbl_8160EA98 = .data:0x8160EA98; // type:object size:0x21 data:string -lbl_8160EAB9 = .data:0x8160EAB9; // type:object size:0x1F data:string -lbl_8160EAD8 = .data:0x8160EAD8; // type:object size:0x1E data:string -lbl_8160EAF6 = .data:0x8160EAF6; // type:object size:0x450 -lbl_8160EF46 = .data:0x8160EF46; // type:object size:0x64E -lbl_8160F594 = .data:0x8160F594; // type:object size:0x26 data:string -lbl_8160F5BA = .data:0x8160F5BA; // type:object size:0x13 data:string -lbl_8160F5CD = .data:0x8160F5CD; // type:object size:0xD data:string -lbl_8160F5DA = .data:0x8160F5DA; // type:object size:0x61 -lbl_8160F63B = .data:0x8160F63B; // type:object size:0x2A data:string -lbl_8160F665 = .data:0x8160F665; // type:object size:0x425 -lbl_8160FA8A = .data:0x8160FA8A; // type:object size:0x28 data:string -lbl_8160FAB2 = .data:0x8160FAB2; // type:object size:0x6D9 -lbl_8161018B = .data:0x8161018B; // type:object size:0x35 data:string -lbl_816101C0 = .data:0x816101C0; // type:object size:0x34 data:string -lbl_816101F4 = .data:0x816101F4; // type:object size:0x448 -lbl_8161063C = .data:0x8161063C; // type:object size:0x69 -lbl_816106A5 = .data:0x816106A5; // type:object size:0x24 data:string -lbl_816106C9 = .data:0x816106C9; // type:object size:0x2E data:string -lbl_816106F7 = .data:0x816106F7; // type:object size:0x79 -lbl_81610770 = .data:0x81610770; // type:object size:0xCE -lbl_8161083E = .data:0x8161083E; // type:object size:0x20 data:string -lbl_8161085E = .data:0x8161085E; // type:object size:0x1E1 -lbl_81610A3F = .data:0x81610A3F; // type:object size:0x21 data:string -lbl_81610A60 = .data:0x81610A60; // type:object size:0x24 data:string -lbl_81610A84 = .data:0x81610A84; // type:object size:0x43 -lbl_81610AC7 = .data:0x81610AC7; // type:object size:0x2A data:string -lbl_81610AF1 = .data:0x81610AF1; // type:object size:0x26 data:string -lbl_81610B17 = .data:0x81610B17; // type:object size:0xBA +@12357 = .data:0x8160DD1C; // type:object size:0xC scope:local data:string +@12358 = .data:0x8160DD28; // type:object size:0xA scope:local data:string +@12359 = .data:0x8160DD32; // type:object size:0x1E scope:local data:string +@21503 = .data:0x8160DD50; // type:object size:0x22 scope:local data:string +@21504 = .data:0x8160DD72; // type:object size:0x22 scope:local data:string +@21767 = .data:0x8160DD94; // type:object size:0x16 scope:local data:string +@21770 = .data:0x8160DDAA; // type:object size:0x11 scope:local data:string +@21777 = .data:0x8160DDBB; // type:object size:0x19 scope:local data:string +@21780 = .data:0x8160DDD4; // type:object size:0x1A scope:local data:string +@21783 = .data:0x8160DDEE; // type:object size:0x10 scope:local data:string +@21788 = .data:0x8160DDFE; // type:object size:0x21 scope:local data:string +@21789 = .data:0x8160DE1F; // type:object size:0x25 scope:local data:string +@21792 = .data:0x8160DE44; // type:object size:0x28 scope:local data:string +@21804 = .data:0x8160DE6C; // type:object size:0x1B scope:local data:string +@21805 = .data:0x8160DE87; // type:object size:0x1E scope:local data:string +@21806 = .data:0x8160DEA5; // type:object size:0x29 scope:local data:string +@21917 = .data:0x8160DECE; // type:object size:0x1F scope:local data:string +@21918 = .data:0x8160DEED; // type:object size:0x1E scope:local data:string +@21919 = .data:0x8160DF0B; // type:object size:0x2F scope:local data:string +@21920 = .data:0x8160DF3A; // type:object size:0x34 scope:local data:string +@21921 = .data:0x8160DF6E; // type:object size:0x14 scope:local data:string +@21922 = .data:0x8160DF82; // type:object size:0x1B scope:local data:string +@21924 = .data:0x8160DFA0; // type:object size:0xD0 scope:local +@21965 = .data:0x8160E070; // type:object size:0x21 scope:local data:string +@21966 = .data:0x8160E091; // type:object size:0x22 scope:local data:string +@21967 = .data:0x8160E0B3; // type:object size:0x30 scope:local data:string +@21968 = .data:0x8160E0E3; // type:object size:0x3F scope:local data:string +@21969 = .data:0x8160E122; // type:object size:0x33 scope:local data:string +@21970 = .data:0x8160E155; // type:object size:0x30 scope:local data:string +@21971 = .data:0x8160E185; // type:object size:0x2E scope:local data:string +@21972 = .data:0x8160E1B3; // type:object size:0x28 scope:local data:string +@21973 = .data:0x8160E1DB; // type:object size:0x28 scope:local data:string +@21974 = .data:0x8160E203; // type:object size:0x35 scope:local data:string +@21975 = .data:0x8160E238; // type:object size:0x21 scope:local data:string +@21999 = .data:0x8160E259; // type:object size:0x2F scope:local data:string +@22000 = .data:0x8160E288; // type:object size:0x33 scope:local data:string +@22001 = .data:0x8160E2BB; // type:object size:0x3A scope:local data:string +@22002 = .data:0x8160E2F5; // type:object size:0x3F scope:local data:string +@22028 = .data:0x8160E334; // type:object size:0x2C scope:local data:string +@22029 = .data:0x8160E360; // type:object size:0x32 scope:local data:string +@22030 = .data:0x8160E392; // type:object size:0x29 scope:local data:string +@22055 = .data:0x8160E3BB; // type:object size:0x2D scope:local data:string +@22056 = .data:0x8160E3E8; // type:object size:0x9 scope:local data:string +@22057 = .data:0x8160E3F1; // type:object size:0x3C scope:local data:string +@22058 = .data:0x8160E42D; // type:object size:0x28 scope:local data:string +@22106 = .data:0x8160E455; // type:object size:0x29 scope:local data:string +@22107 = .data:0x8160E47E; // type:object size:0x1D scope:local data:string +@22108 = .data:0x8160E49B; // type:object size:0x1E scope:local data:string +@22109 = .data:0x8160E4B9; // type:object size:0x1D scope:local data:string +@22110 = .data:0x8160E4D6; // type:object size:0x24 scope:local data:string +@22134 = .data:0x8160E4FA; // type:object size:0x34 scope:local data:string +@22135 = .data:0x8160E52E; // type:object size:0x1E scope:local data:string +@22136 = .data:0x8160E54C; // type:object size:0x28 scope:local data:string +@22137 = .data:0x8160E574; // type:object size:0x2B scope:local data:string +@22138 = .data:0x8160E59F; // type:object size:0x1C scope:local data:string +@22158 = .data:0x8160E5BB; // type:object size:0x2D scope:local data:string +@22193 = .data:0x8160E5E8; // type:object size:0x26 scope:local data:string +@22194 = .data:0x8160E60E; // type:object size:0x2C scope:local data:string +@22195 = .data:0x8160E63A; // type:object size:0x30 scope:local data:string +@22196 = .data:0x8160E66A; // type:object size:0x30 scope:local data:string +@22197 = .data:0x8160E69A; // type:object size:0x26 scope:local data:string +@22198 = .data:0x8160E6C0; // type:object size:0x27 scope:local data:string +@22199 = .data:0x8160E6E7; // type:object size:0x37 scope:local data:string +@13884 = .data:0x8160E71E; // type:object size:0x15 scope:local data:string +@13885 = .data:0x8160E733; // type:object size:0x15 scope:local data:string +@22354 = .data:0x8160E748; // type:object size:0x2D scope:local data:string +@22355 = .data:0x8160E775; // type:object size:0x30 scope:local data:string +@22356 = .data:0x8160E7A5; // type:object size:0x4E scope:local data:string +@22357 = .data:0x8160E7F3; // type:object size:0x40 scope:local data:string +@22358 = .data:0x8160E833; // type:object size:0x2E scope:local data:string +@22359 = .data:0x8160E861; // type:object size:0x37 scope:local data:string +@22360 = .data:0x8160E898; // type:object size:0x4D scope:local data:string +@22400 = .data:0x8160E8E5; // type:object size:0x25 scope:local data:string +@22401 = .data:0x8160E90A; // type:object size:0x41 scope:local data:string +@22422 = .data:0x8160E94B; // type:object size:0x30 scope:local data:string +@22423 = .data:0x8160E97B; // type:object size:0x3D scope:local data:string +@22455 = .data:0x8160E9B8; // type:object size:0x48 scope:local data:string +@22476 = .data:0x8160EA00; // type:object size:0x31 scope:local data:string +@22477 = .data:0x8160EA31; // type:object size:0x38 scope:local data:string +@22497 = .data:0x8160EA69; // type:object size:0x2F scope:local data:string +@22513 = .data:0x8160EA98; // type:object size:0x21 scope:local data:string +@22514 = .data:0x8160EAB9; // type:object size:0x1F scope:local data:string +@22536 = .data:0x8160EAD8; // type:object size:0x1E scope:local data:string +@22537 = .data:0x8160EAF6; // type:object size:0x20 scope:local data:string +@22570 = .data:0x8160EB16; // type:object size:0x9 scope:local data:string +@22571 = .data:0x8160EB1F; // type:object size:0x37 scope:local data:string +@22572 = .data:0x8160EB56; // type:object size:0x34 scope:local data:string +@22573 = .data:0x8160EB8A; // type:object size:0xD scope:local data:string +@22574 = .data:0x8160EB97; // type:object size:0x3A scope:local data:string +@22575 = .data:0x8160EBD1; // type:object size:0x31 scope:local data:string +@22576 = .data:0x8160EC02; // type:object size:0x2E scope:local data:string +@22577 = .data:0x8160EC30; // type:object size:0x2E scope:local data:string +@22578 = .data:0x8160EC5E; // type:object size:0x2B scope:local data:string +@22579 = .data:0x8160EC89; // type:object size:0x2C scope:local data:string +@22580 = .data:0x8160ECB5; // type:object size:0x2B scope:local data:string +@22581 = .data:0x8160ECE0; // type:object size:0x23 scope:local data:string +@22582 = .data:0x8160ED03; // type:object size:0x38 scope:local data:string +@22583 = .data:0x8160ED3B; // type:object size:0x2E scope:local data:string +@22584 = .data:0x8160ED69; // type:object size:0x2A scope:local data:string +@22593 = .data:0x8160ED93; // type:object size:0xF scope:local data:string +@22594 = .data:0x8160EDA2; // type:object size:0x3C scope:local data:string +@22595 = .data:0x8160EDDE; // type:object size:0xF scope:local data:string +@22596 = .data:0x8160EDED; // type:object size:0x3C scope:local data:string +@22619 = .data:0x8160EE29; // type:object size:0x2E scope:local data:string +@22620 = .data:0x8160EE57; // type:object size:0x33 scope:local data:string +@22621 = .data:0x8160EE8A; // type:object size:0x39 scope:local data:string +@22622 = .data:0x8160EEC3; // type:object size:0x28 scope:local data:string +@22634 = .data:0x8160EEEB; // type:object size:0x2B scope:local data:string +@22635 = .data:0x8160EF16; // type:object size:0x30 scope:local data:string +@22647 = .data:0x8160EF46; // type:object size:0x38 scope:local data:string +@22681 = .data:0x8160EF7E; // type:object size:0x2F scope:local data:string +@22682 = .data:0x8160EFAD; // type:object size:0x2F scope:local data:string +@22683 = .data:0x8160EFDC; // type:object size:0x36 scope:local data:string +@22684 = .data:0x8160F012; // type:object size:0x34 scope:local data:string +@22685 = .data:0x8160F046; // type:object size:0x35 scope:local data:string +@22686 = .data:0x8160F07B; // type:object size:0x2B scope:local data:string +@22690 = .data:0x8160F0A6; // type:object size:0x32 scope:local data:string +@22691 = .data:0x8160F0D8; // type:object size:0x21 scope:local data:string +@22692 = .data:0x8160F0F9; // type:object size:0x21 scope:local data:string +@22693 = .data:0x8160F11A; // type:object size:0x26 scope:local data:string +@22701 = .data:0x8160F140; // type:object size:0x36 scope:local data:string +@22702 = .data:0x8160F176; // type:object size:0x38 scope:local data:string +@22703 = .data:0x8160F1AE; // type:object size:0x2A scope:local data:string +@22730 = .data:0x8160F1D8; // type:object size:0x31 scope:local data:string +@22731 = .data:0x8160F209; // type:object size:0x33 scope:local data:string +@22732 = .data:0x8160F23C; // type:object size:0x2F scope:local data:string +@22733 = .data:0x8160F26B; // type:object size:0x31 scope:local data:string +@22789 = .data:0x8160F29C; // type:object size:0x26 scope:local data:string +@22790 = .data:0x8160F2C2; // type:object size:0x2F scope:local data:string +@22791 = .data:0x8160F2F1; // type:object size:0x2B scope:local data:string +@22792 = .data:0x8160F31C; // type:object size:0x2C scope:local data:string +@22793 = .data:0x8160F348; // type:object size:0x4F scope:local data:string +@22794 = .data:0x8160F397; // type:object size:0x28 scope:local data:string +@22795 = .data:0x8160F3BF; // type:object size:0x3A scope:local data:string +@22796 = .data:0x8160F3F9; // type:object size:0x2D scope:local data:string +@22797 = .data:0x8160F426; // type:object size:0x22 scope:local data:string +@22798 = .data:0x8160F448; // type:object size:0x20 scope:local data:string +@22799 = .data:0x8160F468; // type:object size:0x22 scope:local data:string +@22800 = .data:0x8160F48A; // type:object size:0x27 scope:local data:string +@22801 = .data:0x8160F4B1; // type:object size:0x23 scope:local data:string +@22802 = .data:0x8160F4D4; // type:object size:0x3D scope:local data:string +@22803 = .data:0x8160F511; // type:object size:0x27 scope:local data:string +@22815 = .data:0x8160F538; // type:object size:0x2C scope:local data:string +@22816 = .data:0x8160F564; // type:object size:0x30 scope:local data:string +@22817 = .data:0x8160F594; // type:object size:0x26 scope:local data:string +@14983 = .data:0x8160F5BA; // type:object size:0x13 scope:local data:string +@14984 = .data:0x8160F5CD; // type:object size:0xD scope:local data:string +@14985 = .data:0x8160F5DA; // type:object size:0x9 scope:local data:string +@22831 = .data:0x8160F5E3; // type:object size:0x18 scope:local data:string +@22832 = .data:0x8160F5FB; // type:object size:0x1C scope:local data:string +@22833 = .data:0x8160F617; // type:object size:0x24 scope:local data:string +@22841 = .data:0x8160F63B; // type:object size:0x2A scope:local data:string +@22842 = .data:0x8160F665; // type:object size:0x28 scope:local data:string +@22914 = .data:0x8160F68D; // type:object size:0x35 scope:local data:string +@22915 = .data:0x8160F6C2; // type:object size:0x2C scope:local data:string +@22916 = .data:0x8160F6EE; // type:object size:0x34 scope:local data:string +@22917 = .data:0x8160F722; // type:object size:0x35 scope:local data:string +@22918 = .data:0x8160F757; // type:object size:0x2A scope:local data:string +@22919 = .data:0x8160F781; // type:object size:0x38 scope:local data:string +@22920 = .data:0x8160F7B9; // type:object size:0x53 scope:local data:string +@22921 = .data:0x8160F80C; // type:object size:0x2A scope:local data:string +@22922 = .data:0x8160F836; // type:object size:0x29 scope:local data:string +@22923 = .data:0x8160F85F; // type:object size:0x27 scope:local data:string +@22924 = .data:0x8160F886; // type:object size:0x28 scope:local data:string +@22925 = .data:0x8160F8AE; // type:object size:0x28 scope:local data:string +@22926 = .data:0x8160F8D6; // type:object size:0x33 scope:local data:string +@22927 = .data:0x8160F909; // type:object size:0x35 scope:local data:string +@22947 = .data:0x8160F93E; // type:object size:0x2A scope:local data:string +@22948 = .data:0x8160F968; // type:object size:0x20 scope:local data:string +@22949 = .data:0x8160F988; // type:object size:0x39 scope:local data:string +@22977 = .data:0x8160F9C1; // type:object size:0x41 scope:local data:string +@22978 = .data:0x8160FA02; // type:object size:0x3D scope:local data:string +@22979 = .data:0x8160FA3F; // type:object size:0x27 scope:local data:string +@22980 = .data:0x8160FA66; // type:object size:0x24 scope:local data:string +@22984 = .data:0x8160FA8A; // type:object size:0x28 scope:local data:string +@22985 = .data:0x8160FAB2; // type:object size:0x24 scope:local data:string +@23013 = .data:0x8160FAD6; // type:object size:0x22 scope:local data:string +@23014 = .data:0x8160FAF8; // type:object size:0x21 scope:local data:string +@23015 = .data:0x8160FB19; // type:object size:0x39 scope:local data:string +@23016 = .data:0x8160FB52; // type:object size:0x3A scope:local data:string +@23017 = .data:0x8160FB8C; // type:object size:0x35 scope:local data:string +@23018 = .data:0x8160FBC1; // type:object size:0x33 scope:local data:string +@23019 = .data:0x8160FBF4; // type:object size:0x29 scope:local data:string +@23020 = .data:0x8160FC1D; // type:object size:0x38 scope:local data:string +@23021 = .data:0x8160FC55; // type:object size:0x2D scope:local data:string +@23035 = .data:0x8160FC82; // type:object size:0x39 scope:local data:string +@23036 = .data:0x8160FCBB; // type:object size:0x31 scope:local data:string +@23037 = .data:0x8160FCEC; // type:object size:0x2F scope:local data:string +@23038 = .data:0x8160FD1B; // type:object size:0x30 scope:local data:string +@23094 = .data:0x8160FD4B; // type:object size:0x46 scope:local data:string +@23095 = .data:0x8160FD91; // type:object size:0x2D scope:local data:string +@23096 = .data:0x8160FDBE; // type:object size:0x2D scope:local data:string +@23097 = .data:0x8160FDEB; // type:object size:0x2C scope:local data:string +@23098 = .data:0x8160FE17; // type:object size:0x34 scope:local data:string +@23123 = .data:0x8160FE4B; // type:object size:0x27 scope:local data:string +@23124 = .data:0x8160FE72; // type:object size:0x2B scope:local data:string +@23125 = .data:0x8160FE9D; // type:object size:0x1F scope:local data:string +@23126 = .data:0x8160FEBC; // type:object size:0x21 scope:local data:string +@23127 = .data:0x8160FEDD; // type:object size:0x26 scope:local data:string +@23128 = .data:0x8160FF03; // type:object size:0x29 scope:local data:string +@23129 = .data:0x8160FF2C; // type:object size:0xF scope:local data:string +@23130 = .data:0x8160FF3B; // type:object size:0x23 scope:local data:string +@23131 = .data:0x8160FF5E; // type:object size:0x2B scope:local data:string +@23132 = .data:0x8160FF89; // type:object size:0x23 scope:local data:string +@23159 = .data:0x8160FFAC; // type:object size:0x34 scope:local data:string +@23160 = .data:0x8160FFE0; // type:object size:0x3B scope:local data:string +@23161 = .data:0x8161001B; // type:object size:0x30 scope:local data:string +@23162 = .data:0x8161004B; // type:object size:0x4D scope:local data:string +@23163 = .data:0x81610098; // type:object size:0x50 scope:local data:string +@23176 = .data:0x816100E8; // type:object size:0x23 scope:local data:string +@23177 = .data:0x8161010B; // type:object size:0x24 scope:local data:string +@23178 = .data:0x8161012F; // type:object size:0x2E scope:local data:string +@23179 = .data:0x8161015D; // type:object size:0x2E scope:local data:string +@23199 = .data:0x8161018B; // type:object size:0x35 scope:local data:string +@23200 = .data:0x816101C0; // type:object size:0x34 scope:local data:string +@23214 = .data:0x816101F4; // type:object size:0x2C scope:local data:string +@23269 = .data:0x81610220; // type:object size:0x29 scope:local data:string +@23270 = .data:0x81610249; // type:object size:0x3E scope:local data:string +@23271 = .data:0x81610287; // type:object size:0x30 scope:local data:string +@23272 = .data:0x816102B7; // type:object size:0x3C scope:local data:string +@23273 = .data:0x816102F3; // type:object size:0x34 scope:local data:string +@23278 = .data:0x81610327; // type:object size:0x35 scope:local data:string +@23279 = .data:0x8161035C; // type:object size:0x32 scope:local data:string +@23280 = .data:0x8161038E; // type:object size:0x32 scope:local data:string +@23281 = .data:0x816103C0; // type:object size:0x2D scope:local data:string +@23325 = .data:0x816103ED; // type:object size:0x32 scope:local data:string +@23326 = .data:0x8161041F; // type:object size:0x1F scope:local data:string +@23327 = .data:0x8161043E; // type:object size:0x3C scope:local data:string +@23328 = .data:0x8161047A; // type:object size:0x2F scope:local data:string +@23363 = .data:0x816104A9; // type:object size:0x2E scope:local data:string +@23364 = .data:0x816104D7; // type:object size:0x29 scope:local data:string +@23365 = .data:0x81610500; // type:object size:0x45 scope:local data:string +@23366 = .data:0x81610545; // type:object size:0x36 scope:local data:string +@23367 = .data:0x8161057B; // type:object size:0x2D scope:local data:string +@23368 = .data:0x816105A8; // type:object size:0x49 scope:local data:string +@23369 = .data:0x816105F1; // type:object size:0x4B scope:local data:string +@23376 = .data:0x8161063C; // type:object size:0x33 scope:local data:string +@23414 = .data:0x8161066F; // type:object size:0x36 scope:local data:string +@23486 = .data:0x816106A5; // type:object size:0x24 scope:local data:string +@23496 = .data:0x816106C9; // type:object size:0x2E scope:local data:string +@23499 = .data:0x816106F7; // type:object size:0x2E scope:local data:string +@23572 = .data:0x81610725; // type:object size:0x15 scope:local data:string +@23573 = .data:0x8161073A; // type:object size:0x36 scope:local data:string +@23575 = .data:0x81610770; // type:object size:0x2B scope:local data:string +@23576 = .data:0x8161079B; // type:object size:0xA scope:local data:string +@23577 = .data:0x816107A5; // type:object size:0xA scope:local data:string +@23578 = .data:0x816107AF; // type:object size:0x38 scope:local data:string +@23579 = .data:0x816107E7; // type:object size:0x22 scope:local data:string +@23580 = .data:0x81610809; // type:object size:0x35 scope:local data:string +@23593 = .data:0x8161083E; // type:object size:0x20 scope:local data:string +@23598 = .data:0x8161085E; // type:object size:0x1F scope:local data:string +@23689 = .data:0x8161087D; // type:object size:0x30 scope:local data:string +@23690 = .data:0x816108AD; // type:object size:0x30 scope:local data:string +@23691 = .data:0x816108DD; // type:object size:0x1B scope:local data:string +@23692 = .data:0x816108F8; // type:object size:0x24 scope:local data:string +@23693 = .data:0x8161091C; // type:object size:0x2F scope:local data:string +@23694 = .data:0x8161094B; // type:object size:0x2E scope:local data:string +@23695 = .data:0x81610979; // type:object size:0x25 scope:local data:string +@23710 = .data:0x8161099E; // type:object size:0x2D scope:local data:string +@23711 = .data:0x816109CB; // type:object size:0x2B scope:local data:string +@23712 = .data:0x816109F6; // type:object size:0x22 scope:local data:string +@23713 = .data:0x81610A18; // type:object size:0x27 scope:local data:string +@23719 = .data:0x81610A3F; // type:object size:0x21 scope:local data:string +@23724 = .data:0x81610A60; // type:object size:0x24 scope:local data:string +@23750 = .data:0x81610A84; // type:object size:0x25 scope:local data:string +@23766 = .data:0x81610AA9; // type:object size:0x1E scope:local data:string +@23767 = .data:0x81610AC7; // type:object size:0x2A scope:local data:string +@23772 = .data:0x81610AF1; // type:object size:0x26 scope:local data:string +@23777 = .data:0x81610B17; // type:object size:0x26 scope:local data:string +@23879 = .data:0x81610B3D; // type:object size:0x3B scope:local data:string +@23880 = .data:0x81610B78; // type:object size:0x29 scope:local data:string +@23881 = .data:0x81610BA1; // type:object size:0x30 scope:local data:string lbl_81610BD8 = .data:0x81610BD8; // type:object size:0x1A8 jumptable_81610D80 = .data:0x81610D80; // type:object size:0x60 scope:local lbl_81610DE0 = .data:0x81610DE0; // type:object size:0x80 scope:local @@ -16159,9 +16384,24 @@ __vt__Q33ipl5scene7Setting = .data:0x8162C684; // type:object size:0xFC @1909 = .data:0x8162C804; // type:object size:0x12 scope:local data:string @1910 = .data:0x8162C816; // type:object size:0xC scope:local data:string @1911 = .data:0x8162C822; // type:object size:0x16 scope:local data:string -lbl_8162C838 = .data:0x8162C838; // type:object size:0x21 data:string -lbl_8162C859 = .data:0x8162C859; // type:object size:0x1E data:string -lbl_8162C877 = .data:0x8162C877; // type:object size:0x111 +@12223 = .data:0x8162C838; // type:object size:0x21 scope:local data:string +...data.0 = .data:0x8162C838; // type:label scope:local +@12284 = .data:0x8162C859; // type:object size:0x1E scope:local data:string +@12285 = .data:0x8162C877; // type:object size:0x22 scope:local data:string +@12300 = .data:0x8162C899; // type:object size:0x10 scope:local data:string +@12301 = .data:0x8162C8A9; // type:object size:0x9 scope:local data:string +@12303 = .data:0x8162C8B2; // type:object size:0xD scope:local data:string +@12306 = .data:0x8162C8BF; // type:object size:0xA scope:local data:string +@12308 = .data:0x8162C8C9; // type:object size:0xB scope:local data:string +@12310 = .data:0x8162C8D4; // type:object size:0xD scope:local data:string +@12312 = .data:0x8162C8E1; // type:object size:0x13 scope:local data:string +@12314 = .data:0x8162C8F4; // type:object size:0x11 scope:local data:string +@12316 = .data:0x8162C905; // type:object size:0x17 scope:local data:string +@12318 = .data:0x8162C91C; // type:object size:0x20 scope:local data:string +@12320 = .data:0x8162C93C; // type:object size:0x1E scope:local data:string +@12322 = .data:0x8162C95A; // type:object size:0xF scope:local data:string +@12324 = .data:0x8162C969; // type:object size:0xE scope:local data:string +@12326 = .data:0x8162C977; // type:object size:0xD scope:local data:string lbl_8162C988 = .data:0x8162C988; // type:object size:0x1B data:string lbl_8162C9A3 = .data:0x8162C9A3; // type:object size:0x1D data:string __vt__Q33ipl5scene12APScanThread = .data:0x8162C9C0; // type:object size:0x30 @@ -19197,12 +19437,10 @@ lbl_81668B4B = .sdata2:0x81668B4B; // type:object size:0x5 data:byte @10441 = .sdata2:0x81668BC0; // type:object size:0x4 scope:local align:4 data:float @10442 = .sdata2:0x81668BC4; // type:object size:0x4 scope:local align:4 data:float @10445 = .sdata2:0x81668BC8; // type:object size:0x8 scope:local align:8 data:double -lbl_81668BD0 = .sdata2:0x81668BD0; // type:object size:0x4 data:4byte -lbl_81668BD4 = .sdata2:0x81668BD4; // type:object size:0x4 data:4byte -lbl_81668BD8 = .sdata2:0x81668BD8; // type:object size:0x4 data:4byte -lbl_81668BDC = .sdata2:0x81668BDC; // type:object size:0x4 data:4byte -lbl_81668BE0 = .sdata2:0x81668BE0; // type:object size:0x4 align:4 data:float -lbl_81668BE8 = .sdata2:0x81668BE8; // type:object size:0x8 align:8 data:double +@13886 = .sdata2:0x81668BD0; // type:object size:0x8 scope:local data:4byte +@13978 = .sdata2:0x81668BD8; // type:object size:0x8 scope:local data:4byte +@23219 = .sdata2:0x81668BE0; // type:object size:0x4 scope:local align:4 data:float +@23221 = .sdata2:0x81668BE8; // type:object size:0x8 scope:local align:8 data:double lbl_81668BF0 = .sdata2:0x81668BF0; // type:object size:0x4 align:4 data:float lbl_81668BF4 = .sdata2:0x81668BF4; // type:object size:0x4 align:4 data:float lbl_81668BF8 = .sdata2:0x81668BF8; // type:object size:0x8 align:4 data:float @@ -20528,7 +20766,7 @@ lbl_8166A716 = .sdata:0x8166A716; // type:object size:0x6 data:string @14129 = .sdata:0x8166A7AA; // type:object size:0x6 scope:local data:string @14332 = .sdata:0x8166A7B0; // type:object size:0x6 scope:local data:string c_banner_file_name__Q23ipl12NandSDWorker = .sdata:0x8166A7B8; // type:object size:0x4 data:4byte -lbl_8166A7BC = .sdata:0x8166A7BC; // type:object size:0x7 data:string +@12344 = .sdata:0x8166A7BC; // type:object size:0x7 scope:local data:string c_nocopy_folder_name__Q23ipl12NandSDWorker = .sdata:0x8166A7C4; // type:object size:0x4 data:4byte c_notransfer_folder_name__Q23ipl12NandSDWorker = .sdata:0x8166A7C8; // type:object size:0x4 data:4byte c_wii_sd_title_root__Q23ipl12NandSDWorker = .sdata:0x8166A7CC; // type:object size:0x4 data:4byte @@ -20537,17 +20775,17 @@ c_sd_app_file_name__Q23ipl12NandSDWorker = .sdata:0x8166A7D4; // type:object siz c_succession_path__Q23ipl12NandSDWorker = .sdata:0x8166A7D8; // type:object size:0x4 data:4byte c_transferid_path__Q23ipl12NandSDWorker = .sdata:0x8166A7DC; // type:object size:0x4 data:4byte c_tmp_work_path__Q23ipl12NandSDWorker = .sdata:0x8166A7E0; // type:object size:0x4 data:4byte -lbl_8166A7E4 = .sdata:0x8166A7E4; // type:object size:0x6 data:string -lbl_8166A7EA = .sdata:0x8166A7EA; // type:object size:0x7 data:string -lbl_8166A7F1 = .sdata:0x8166A7F1; // type:object size:0x6 data:string -lbl_8166A7F7 = .sdata:0x8166A7F7; // type:object size:0x5 data:string +@12352 = .sdata:0x8166A7E4; // type:object size:0x6 scope:local data:string +@12353 = .sdata:0x8166A7EA; // type:object size:0x7 scope:local data:string +@12355 = .sdata:0x8166A7F1; // type:object size:0x6 scope:local data:string +@12356 = .sdata:0x8166A7F7; // type:object size:0x5 scope:local data:string c_ignore_list_for_wiimenu__Q23ipl12NandSDWorker = .sdata:0x8166A7FC; // type:object size:0x8 c_wii_menu_save_path__Q23ipl12NandSDWorker = .sdata:0x8166A804; // type:object size:0x4 data:4byte -lbl_8166A808 = .sdata:0x8166A808; // type:object size:0x2 data:string -lbl_8166A80A = .sdata:0x8166A80A; // type:object size:0x3 data:string -lbl_8166A80D = .sdata:0x8166A80D; // type:object size:0x2 data:string -lbl_8166A80F = .sdata:0x8166A80F; // type:object size:0x5 data:string -lbl_8166A814 = .sdata:0x8166A814; // type:object size:0x4 data:string +@22157 = .sdata:0x8166A808; // type:object size:0x2 scope:local data:string +@22300 = .sdata:0x8166A80A; // type:object size:0x3 scope:local data:string +@22314 = .sdata:0x8166A80D; // type:object size:0x2 scope:local data:string +@23190 = .sdata:0x8166A80F; // type:object size:0x5 scope:local data:string +@23574 = .sdata:0x8166A814; // type:object size:0x4 scope:local data:string lbl_8166A818 = .sdata:0x8166A818; // type:object size:0x4 data:string lbl_8166A81C = .sdata:0x8166A81C; // type:object size:0x4 @10074 = .sdata:0x8166A820; // type:object size:0x4 scope:local data:string @@ -21219,8 +21457,8 @@ lbl_8166B7E3 = .sdata:0x8166B7E3; // type:object size:0x6 data:string lbl_8166B7E9 = .sdata:0x8166B7E9; // type:object size:0x7 data:string lbl_8166B7F0 = .sdata:0x8166B7F0; // type:object size:0x3 data:string lbl_8166B7F4 = .sdata:0x8166B7F4; // type:object size:0x8 data:wstring -lbl_8166B800 = .sdata:0x8166B800; // type:object size:0x5 data:string -lbl_8166B805 = .sdata:0x8166B805; // type:object size:0x5 data:string +@12299 = .sdata:0x8166B800; // type:object size:0x5 scope:local data:string +@12302 = .sdata:0x8166B805; // type:object size:0x5 scope:local data:string lbl_8166B810 = .sdata:0x8166B810; // type:object size:0x4 data:string lbl_8166B818 = .sdata:0x8166B818; // type:object size:0x8 data:4byte lbl_8166B820 = .sdata:0x8166B820; // type:object size:0x4 data:4byte @@ -22333,7 +22571,7 @@ ScrollState___Q23www9trasition = .sbss:0x8166CF9C; // type:object size:0x4 scope gDpdWaitFrm = .sbss:0x8166CFA0; // type:object size:0x4 data:4byte wiiFlag__Q23www10wiisetting = .sbss:0x8166CFA4; // type:object size:0x8 data:4byte writeBackID__Q23www10wiisetting = .sbss:0x8166CFAC; // type:object size:0x1 data:byte -savedata_smth__Q23www10wiisetting = .sbss:0x8166CFAD; // type:object size:0x1 data:byte +saveData__Q23www10wiisetting = .sbss:0x8166CFAD; // type:object size:0x1 data:byte funcResult__Q23www10wiisetting = .sbss:0x8166CFAE; // type:object size:0x1 data:byte setupFlag__Q23www10wiisetting = .sbss:0x8166CFAF; // type:object size:0x1 data:byte mQueue__Q23www10wiisetting = .sbss:0x8166CFB0; // type:object size:0x4 data:4byte diff --git a/config/43U/symbols.txt b/config/43U/symbols.txt index 381356fa..1a354f1b 100644 --- a/config/43U/symbols.txt +++ b/config/43U/symbols.txt @@ -1756,10 +1756,10 @@ list_sd_save_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348D78; // type:functio list_sd_app_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348D8C; // type:function size:0x14 get_sd_save_banner_async__Q23ipl12NandSDWorkerFUlP17WIISaveBannerFile = .text:0x81348DA0; // type:function size:0x28 get_sd_app_thumbnail_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81348DC8; // type:function size:0x34 -iplNandSD_81348DFC__Q23ipl12NandSDWorkerFUlPvPv = .text:0x81348DFC; // type:function size:0x34 -update_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E30; // type:function size:0x14 -read_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E44; // type:function size:0x14 -iplNandSD_81348E58__Q23ipl12NandSDWorkerFUxPvPv = .text:0x81348E58; // type:function size:0x30 +get_sd_app_meta_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl12NandSDWorker14SDAppMetaEntry = .text:0x81348DFC; // type:function size:0x34 +update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E30; // type:function size:0x14 +read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E44; // type:function size:0x14 +check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x81348E58; // type:function size:0x30 check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348E88; // type:function size:0x20 iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348ED4; // type:function size:0x18 @@ -1776,7 +1776,7 @@ copy_sd_save_to_nand_async__Q23ipl12NandSDWorkerFUl = .text:0x81348FB4; // type: format_sd_async__Q23ipl12NandSDWorkerFv = .text:0x81348FD0; // type:function size:0x8 get_sd_free_area_async__Q23ipl12NandSDWorkerFPUx = .text:0x81348FD8; // type:function size:0x14 list_nand_app_async__Q23ipl12NandSDWorkerFPUx = .text:0x81348FEC; // type:function size:0x14 -iplNandSD_81349000__Q23ipl12NandSDWorkerFPvPv = .text:0x81349000; // type:function size:0x20 +list_nand_apps_usage_async__Q23ipl12NandSDWorkerFPvPv = .text:0x81349000; // type:function size:0x20 get_nand_app_thumbnail_async__Q23ipl12NandSDWorkerFUxPvPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81349020; // type:function size:0x30 delete_nand_app_async__Q23ipl12NandSDWorkerFUxb = .text:0x81349050; // type:function size:0x28 copy_nand_app_to_sd_async__Q23ipl12NandSDWorkerFUx = .text:0x81349078; // type:function size:0x20 @@ -1817,12 +1817,12 @@ check_nand_save_banner_exist__Q23ipl12NandSDWorkerFUx = .text:0x8134AF68; // typ get_nand_save_banner__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134B04C; // type:function size:0x3B0 do_get_sd_save_banner__Q23ipl12NandSDWorkerFv = .text:0x8134B3FC; // type:function size:0x160 do_get_sd_app_thumbnail__Q23ipl12NandSDWorkerFv = .text:0x8134B55C; // type:function size:0x1CC -do_unk_8134B728__Q23ipl12NandSDWorkerFv = .text:0x8134B728; // type:function size:0x1F4 -do_update_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134B91C; // type:function size:0x344 -do_read_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134BC60; // type:function size:0x270 -do_unk_8134BED0__Q23ipl12NandSDWorkerFv = .text:0x8134BED0; // type:function size:0x3C8 +do_get_sd_app_meta__Q23ipl12NandSDWorkerFv = .text:0x8134B728; // type:function size:0x1F4 +do_update_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134B91C; // type:function size:0x344 +do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134BC60; // type:function size:0x270 +do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134BED0; // type:function size:0x3C8 check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134C298; // type:function size:0x3D8 -do_list_nand_apps_usages__Q23ipl12NandSDWorkerFv = .text:0x8134C670; // type:function size:0x1C8 +do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134C670; // type:function size:0x1C8 do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0 do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134CB08; // type:function size:0x260 do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134CD68; // type:function size:0x1F4 @@ -1852,7 +1852,7 @@ delete_download_task__Q23ipl12NandSDWorkerFUl = .text:0x8134FC94; // type:functi delete_nand_app_content__Q23ipl12NandSDWorkerFUx = .text:0x8134FEA8; // type:function size:0x134 do_copy_nand_app_to_sd__Q23ipl12NandSDWorkerFv = .text:0x8134FFDC; // type:function size:0x530 get_save_banner_for_data_only_title__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8135050C; // type:function size:0x160 -get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker11SDAppBanner = .text:0x8135066C; // type:function size:0x480 +get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker15SDAppBackupData = .text:0x8135066C; // type:function size:0x480 open_nand_app_content__Q23ipl12NandSDWorkerFUxUsPUlPP12ESTicketView = .text:0x81350AEC; // type:function size:0x21C read_file__Q23ipl12NandSDWorkerFPvQ33ipl12NandSDWorker8FileKindlUlPv = .text:0x81350D08; // type:function size:0x158 search_meta_header__Q23ipl12NandSDWorkerFPCUc = .text:0x81350E60; // type:function size:0x54 @@ -1920,13 +1920,13 @@ check_nand_save_exist_lo__Q23ipl12NandSDWorkerFUl = .text:0x813546F8; // type:fu get_nand_title_version__Q23ipl12NandSDWorkerFUxPUs = .text:0x813547C0; // type:function size:0x80 get_sd_title_version__Q23ipl12NandSDWorkerFUlPUs = .text:0x81354840; // type:function size:0xF4 check_sd_title_restorable__Q23ipl12NandSDWorkerFUl = .text:0x81354934; // type:function size:0x184 -__ct__Q33ipl2ut8FreeListFv = .text:0x81354AB8; // type:function size:0x14 -init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81354ACC; // type:function size:0x5C -get__Q33ipl2ut8FreeListFv = .text:0x81354B28; // type:function size:0x24 -__ct__Q33ipl2ut5StackFv = .text:0x81354B4C; // type:function size:0x40 -init__Q33ipl2ut5StackFPvUlUl = .text:0x81354B8C; // type:function size:0x4C -push__Q33ipl2ut5StackFPCv = .text:0x81354BD8; // type:function size:0x78 -pop__Q33ipl2ut5StackFPv = .text:0x81354C50; // type:function size:0x80 +__ct__Q33ipl2ut8FreeListFv = .text:0x81354AB8; // type:function size:0x14 scope:weak +init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81354ACC; // type:function size:0x5C scope:weak +get__Q33ipl2ut8FreeListFv = .text:0x81354B28; // type:function size:0x24 scope:weak +__ct__Q33ipl2ut5StackFv = .text:0x81354B4C; // type:function size:0x40 scope:weak +init__Q33ipl2ut5StackFPvUlUl = .text:0x81354B8C; // type:function size:0x4C scope:weak +push__Q33ipl2ut5StackFPCv = .text:0x81354BD8; // type:function size:0x78 scope:weak +pop__Q33ipl2ut5StackFPv = .text:0x81354C50; // type:function size:0x80 scope:weak getFirstController__Q23ipl8keyboardFv = .text:0x81354CD0; // type:function size:0x50 onCommand__Q33ipl8keyboard13EventObserverFQ39textinput15CommandReceiver13INPUT_COMMANDPv = .text:0x81354D20; // type:function size:0x34 onSE__Q33ipl8keyboard13EventObserverFQ39textinput5sound2SE = .text:0x81354D54; // type:function size:0x218 @@ -2607,8 +2607,8 @@ LeftScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginV RightScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136F980; // type:function size:0x3C GetScrollState__Q23www9trasitionFv = .text:0x8136F9BC; // type:function size:0x8 ResetScrollState__Q23www9trasitionFv = .text:0x8136F9C4; // type:function size:0xC -www_wiisetting_8136F9D0 = .text:0x8136F9D0; // type:function size:0x24 scope:local -www_wiisetting_8136F9F4 = .text:0x8136F9F4; // type:function size:0x44 scope:local +DPDCallback2__Q23www10wiisettingFll = .text:0x8136F9D0; // type:function size:0x24 scope:local +DPDCallback__Q23www10wiisettingFll = .text:0x8136F9F4; // type:function size:0x44 scope:local allow_access__Q23www10wiisettingFPCcPCci = .text:0x8136FA38; // type:function size:0x8 AddJsPlugin__Q23www10wiisettingFv = .text:0x8136FA40; // type:function size:0x88 globalGetter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136FAC8; // type:function size:0xC8 @@ -2617,9 +2617,9 @@ Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x81 Setter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x813705B4; // type:function size:0x50C wiiOSReport__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x81370AC0; // type:function size:0x5C wiiWriteBack__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x81370B1C; // type:function size:0x344 -www_wiisetting_81370E60 = .text:0x81370E60; // type:function size:0x54 scope:local +getKeyboardLanguage__Q23www10wiisettingFUc = .text:0x81370E60; // type:function size:0x54 scope:local initWiiSetting__Q23www10wiisettingFv = .text:0x81370EB4; // type:function size:0x60 -www_wiisetting_81370F14 = .text:0x81370F14; // type:function size:0x98 scope:local +getBytePropIndex__Q23www10wiisettingFPCc = .text:0x81370F14; // type:function size:0x98 scope:local startFunc__Q23www10wiisettingFUc = .text:0x81370FAC; // type:function size:0x1A4 getWiiSettingData__Q23www10wiisettingFv = .text:0x81371150; // type:function size:0xC getWiiSettingFlag__Q23www10wiisettingFv = .text:0x8137115C; // type:function size:0x8 @@ -13814,7 +13814,7 @@ lbl_8160D600 = .rodata:0x8160D600; // type:object size:0x20 scNumber__3ipl = .rodata:0x8160D620; // type:object size:0x16 data:wstring c_es_encrypt_iv__Q23ipl12NandSDWorker = .rodata:0x8160D638; // type:object size:0x10 c_md5_secret_key__Q23ipl12NandSDWorker = .rodata:0x8160D648; // type:object size:0x10 -lbl_8160D658 = .rodata:0x8160D658; // type:object size:0x10 data:4byte +@14986 = .rodata:0x8160D658; // type:object size:0x10 scope:local data:4byte cDefaultChanList__3ipl = .rodata:0x8160D668; // type:object size:0x300 scope:local odh_zigzag_order = .rodata:0x8160D968; // type:object size:0x40 scope:local data:byte odh_natural_order = .rodata:0x8160D9A8; // type:object size:0x40 scope:local data:byte @@ -13856,8 +13856,8 @@ scMonthToMessageID__Q23ipl5scene = .rodata:0x8160FB58; // type:object size:0x30 scNumber__Q23ipl5scene = .rodata:0x8160FB88; // type:object size:0x14 scope:local data:2byte scAnmFrame__Q23ipl5scene = .rodata:0x8160FBA0; // type:object size:0x90 scope:local scNumber__Q23ipl5scene = .rodata:0x8160FC30; // type:object size:0x14 scope:local data:2byte -scNumber__Q23ipl5scene = .rodata:0x8160FC48; // type:object size:0x14 scope:local data:2byte -scNumber2__Q23ipl5scene = .rodata:0x8160FC5C; // type:object size:0x14 scope:local data:2byte +@13129 = .rodata:0x8160FC48; // type:object size:0x14 scope:local data:2byte +@13171 = .rodata:0x8160FC5C; // type:object size:0x14 scope:local data:2byte lbl_8160FC70 = .rodata:0x8160FC70; // type:object size:0x10 lbl_8160FC80 = .rodata:0x8160FC80; // type:object size:0x10 scNumber__Q23ipl5scene = .rodata:0x8160FC90; // type:object size:0x14 scope:local data:2byte @@ -13869,9 +13869,9 @@ cfChanThumbOfss__Q23ipl5scene = .rodata:0x816102D0; // type:object size:0x10 sco lbl_816102E0 = .rodata:0x816102E0; // type:object size:0x10 data:4byte lbl_816102F0 = .rodata:0x816102F0; // type:object size:0x20 data:4byte @10845 = .rodata:0x81610310; // type:object size:0x14 scope:local data:2byte -scNumber__Q23ipl5scene = .rodata:0x81610328; // type:object size:0x14 scope:local data:2byte -scNumber2__Q23ipl5scene = .rodata:0x8161033C; // type:object size:0x14 scope:local data:2byte -scNumber__Q23ipl5scene = .rodata:0x81610350; // type:object size:0x14 scope:local data:2byte +@13108 = .rodata:0x81610328; // type:object size:0x14 scope:local data:2byte +@13150 = .rodata:0x8161033C; // type:object size:0x14 scope:local data:2byte +@12843 = .rodata:0x81610350; // type:object size:0x14 scope:local data:2byte scAnmName__Q23ipl5scene = .rodata:0x81610368; // type:object size:0xD8 scope:local scTextboxToMessageID__Q23ipl5scene = .rodata:0x81610440; // type:object size:0x28 scope:local scNumber__Q23ipl5scene = .rodata:0x81610468; // type:object size:0x14 scope:local data:2byte @@ -14055,7 +14055,7 @@ g_SpecialsChars = .rodata:0x81618D70; // type:object size:0x10 data:byte TtableInv = .rodata:0x81618D80; // type:object size:0x10 scope:local VFipf_valid_fn_char = .rodata:0x81618D90; // type:object size:0x60 fat_special_values = .rodata:0x81618DF0; // type:object size:0x3C scope:local -cp932_to_unicode = .rodata:0x81618E30; // type:object size:0x4272 scope:local data:2byte +cp932_to_unicode = .rodata:0x81618E30; // type:object size:0x4272 scope:local data:2byte noreloc ErrInfoTbl$4383 = .rodata:0x8161D0A8; // type:object size:0xD0 scope:local l_nand_func = .rodata:0x8161D178; // type:object size:0x20 scope:local pfd_sddrv_func = .rodata:0x8161D198; // type:object size:0x20 scope:local @@ -14187,7 +14187,7 @@ ca_ppki = .rodata:0x8162DBB8; // type:object size:0x400 noreloc ms_dpki = .rodata:0x8162DFB8; // type:object size:0x240 noreloc ms_ppki = .rodata:0x8162E1F8; // type:object size:0x240 noreloc @1272 = .rodata:0x8162E438; // type:object size:0x278 scope:local data:4byte -pf_valid_fn_char = .rodata:0x8162E6B0; // type:object size:0x60 +pf_valid_fn_char = .rodata:0x8162E6B0; // type:object size:0x60 scope:local noreloc fat_special_values = .rodata:0x8162E710; // type:object size:0x3C cp932_to_unicode = .rodata:0x8162E750; // type:object size:0x4272 data:2byte fa_nand_func = .rodata:0x816329C8; // type:object size:0x20 @@ -14397,288 +14397,289 @@ __vt__Q23ipl12DialogWindow = .data:0x81635A20; // type:object size:0x18 __vt__Q23gui12EventHandler = .data:0x81635A38; // type:object size:0x18 scope:weak __vt__Q23gui9Interface = .data:0x81635A50; // type:object size:0x20 scope:weak @10439 = .data:0x81635A70; // type:object size:0x12 scope:local data:string -lbl_81635A88 = .data:0x81635A88; // type:object size:0xB data:string -lbl_81635A93 = .data:0x81635A93; // type:object size:0xB data:string -lbl_81635A9E = .data:0x81635A9E; // type:object size:0x14 data:string -lbl_81635AB2 = .data:0x81635AB2; // type:object size:0x9 data:string -lbl_81635ABB = .data:0x81635ABB; // type:object size:0xC data:string -lbl_81635AC7 = .data:0x81635AC7; // type:object size:0x14 data:string -lbl_81635ADB = .data:0x81635ADB; // type:object size:0x20 data:string -lbl_81635AFB = .data:0x81635AFB; // type:object size:0x10 data:string -lbl_81635B0B = .data:0x81635B0B; // type:object size:0xC data:string +@12343 = .data:0x81635A88; // type:object size:0xB scope:local data:string +...data.0 = .data:0x81635A88; // type:label scope:local +@12345 = .data:0x81635A93; // type:object size:0xB scope:local data:string +@12346 = .data:0x81635A9E; // type:object size:0x14 scope:local data:string +@12347 = .data:0x81635AB2; // type:object size:0x9 scope:local data:string +@12348 = .data:0x81635ABB; // type:object size:0xC scope:local data:string +@12349 = .data:0x81635AC7; // type:object size:0x14 scope:local data:string +@12350 = .data:0x81635ADB; // type:object size:0x20 scope:local data:string +@12351 = .data:0x81635AFB; // type:object size:0x10 scope:local data:string +@12354 = .data:0x81635B0B; // type:object size:0xC scope:local data:string c_ignore_list_for_shared2__Q23ipl12NandSDWorker = .data:0x81635B18; // type:object size:0x14 -lbl_81635B2C = .data:0x81635B2C; // type:object size:0xC data:string -lbl_81635B38 = .data:0x81635B38; // type:object size:0xA data:string -lbl_81635B42 = .data:0x81635B42; // type:object size:0x1E data:string -lbl_81635B60 = .data:0x81635B60; // type:object size:0x22 data:string -lbl_81635B82 = .data:0x81635B82; // type:object size:0x22 data:string -lbl_81635BA4 = .data:0x81635BA4; // type:object size:0x16 data:string -lbl_81635BBA = .data:0x81635BBA; // type:object size:0x11 data:string -lbl_81635BCB = .data:0x81635BCB; // type:object size:0x19 data:string -lbl_81635BE4 = .data:0x81635BE4; // type:object size:0x1A data:string -lbl_81635BFE = .data:0x81635BFE; // type:object size:0x10 data:string -lbl_81635C0E = .data:0x81635C0E; // type:object size:0x21 data:string -lbl_81635C2F = .data:0x81635C2F; // type:object size:0x25 data:string -lbl_81635C54 = .data:0x81635C54; // type:object size:0x28 data:string -lbl_81635C7C = .data:0x81635C7C; // type:object size:0x1B data:string -lbl_81635C97 = .data:0x81635C97; // type:object size:0x1E data:string -lbl_81635CB5 = .data:0x81635CB5; // type:object size:0x29 data:string -lbl_81635CDE = .data:0x81635CDE; // type:object size:0x1F data:string -lbl_81635CFD = .data:0x81635CFD; // type:object size:0x1E data:string -lbl_81635D1B = .data:0x81635D1B; // type:object size:0x2F data:string -lbl_81635D4A = .data:0x81635D4A; // type:object size:0x34 data:string -lbl_81635D7E = .data:0x81635D7E; // type:object size:0x14 data:string -lbl_81635D92 = .data:0x81635D92; // type:object size:0x1B data:string -jumptable_81635DB0 = .data:0x81635DB0; // type:object size:0xD0 scope:local -lbl_81635E80 = .data:0x81635E80; // type:object size:0x21 data:string -lbl_81635EA1 = .data:0x81635EA1; // type:object size:0x22 data:string -lbl_81635EC3 = .data:0x81635EC3; // type:object size:0x30 data:string -lbl_81635EF3 = .data:0x81635EF3; // type:object size:0x3F data:string -lbl_81635F32 = .data:0x81635F32; // type:object size:0x33 data:string -lbl_81635F65 = .data:0x81635F65; // type:object size:0x30 data:string -lbl_81635F95 = .data:0x81635F95; // type:object size:0x2E data:string -lbl_81635FC3 = .data:0x81635FC3; // type:object size:0x28 data:string -lbl_81635FEB = .data:0x81635FEB; // type:object size:0x28 data:string -lbl_81636013 = .data:0x81636013; // type:object size:0x35 data:string -lbl_81636048 = .data:0x81636048; // type:object size:0x21 data:string -lbl_81636069 = .data:0x81636069; // type:object size:0x2F data:string -lbl_81636098 = .data:0x81636098; // type:object size:0x33 data:string -lbl_816360CB = .data:0x816360CB; // type:object size:0x3A data:string -lbl_81636105 = .data:0x81636105; // type:object size:0x3F data:string -lbl_81636144 = .data:0x81636144; // type:object size:0x2C data:string -lbl_81636170 = .data:0x81636170; // type:object size:0x32 data:string -lbl_816361A2 = .data:0x816361A2; // type:object size:0x29 data:string -lbl_816361CB = .data:0x816361CB; // type:object size:0x2D data:string -lbl_816361F8 = .data:0x816361F8; // type:object size:0x9 data:string -lbl_81636201 = .data:0x81636201; // type:object size:0x3C data:string -lbl_8163623D = .data:0x8163623D; // type:object size:0x28 data:string -lbl_81636265 = .data:0x81636265; // type:object size:0x29 data:string -lbl_8163628E = .data:0x8163628E; // type:object size:0x1D data:string -lbl_816362AB = .data:0x816362AB; // type:object size:0x1E data:string -lbl_816362C9 = .data:0x816362C9; // type:object size:0x1D data:string -lbl_816362E6 = .data:0x816362E6; // type:object size:0x24 data:string -lbl_8163630A = .data:0x8163630A; // type:object size:0x34 data:string -lbl_8163633E = .data:0x8163633E; // type:object size:0x1E data:string -lbl_8163635C = .data:0x8163635C; // type:object size:0x28 data:string -lbl_81636384 = .data:0x81636384; // type:object size:0x2B data:string -lbl_816363AF = .data:0x816363AF; // type:object size:0x1C data:string -lbl_816363CB = .data:0x816363CB; // type:object size:0x2D data:string -lbl_816363F8 = .data:0x816363F8; // type:object size:0x26 data:string -lbl_8163641E = .data:0x8163641E; // type:object size:0x2C data:string -lbl_8163644A = .data:0x8163644A; // type:object size:0x30 data:string -lbl_8163647A = .data:0x8163647A; // type:object size:0x30 data:string -lbl_816364AA = .data:0x816364AA; // type:object size:0x26 data:string -lbl_816364D0 = .data:0x816364D0; // type:object size:0x27 data:string -lbl_816364F7 = .data:0x816364F7; // type:object size:0x37 data:string -lbl_8163652E = .data:0x8163652E; // type:object size:0x15 data:string -lbl_81636543 = .data:0x81636543; // type:object size:0x15 data:string -lbl_81636558 = .data:0x81636558; // type:object size:0x2D data:string -lbl_81636585 = .data:0x81636585; // type:object size:0x30 data:string -lbl_816365B5 = .data:0x816365B5; // type:object size:0x4E data:string -lbl_81636603 = .data:0x81636603; // type:object size:0x40 data:string -lbl_81636643 = .data:0x81636643; // type:object size:0x2E data:string -lbl_81636671 = .data:0x81636671; // type:object size:0x37 data:string -lbl_816366A8 = .data:0x816366A8; // type:object size:0x4D data:string -lbl_816366F5 = .data:0x816366F5; // type:object size:0x25 data:string -lbl_8163671A = .data:0x8163671A; // type:object size:0x41 data:string -lbl_8163675B = .data:0x8163675B; // type:object size:0x30 data:string -lbl_8163678B = .data:0x8163678B; // type:object size:0x3D data:string -lbl_816367C8 = .data:0x816367C8; // type:object size:0x48 data:string -lbl_81636810 = .data:0x81636810; // type:object size:0x31 data:string -lbl_81636841 = .data:0x81636841; // type:object size:0x38 data:string -lbl_81636879 = .data:0x81636879; // type:object size:0x2F data:string -lbl_816368A8 = .data:0x816368A8; // type:object size:0x21 data:string -lbl_816368C9 = .data:0x816368C9; // type:object size:0x1F data:string -lbl_816368E8 = .data:0x816368E8; // type:object size:0x1E data:string -lbl_81636906 = .data:0x81636906; // type:object size:0x20 data:string -lbl_81636926 = .data:0x81636926; // type:object size:0x9 data:string -lbl_8163692F = .data:0x8163692F; // type:object size:0x37 data:string -lbl_81636966 = .data:0x81636966; // type:object size:0x34 data:string -lbl_8163699A = .data:0x8163699A; // type:object size:0xD data:string -lbl_816369A7 = .data:0x816369A7; // type:object size:0x3A data:string -lbl_816369E1 = .data:0x816369E1; // type:object size:0x31 data:string -lbl_81636A12 = .data:0x81636A12; // type:object size:0x2E data:string -lbl_81636A40 = .data:0x81636A40; // type:object size:0x2E data:string -lbl_81636A6E = .data:0x81636A6E; // type:object size:0x2B data:string -lbl_81636A99 = .data:0x81636A99; // type:object size:0x2C data:string -lbl_81636AC5 = .data:0x81636AC5; // type:object size:0x2B data:string -lbl_81636AF0 = .data:0x81636AF0; // type:object size:0x23 data:string -lbl_81636B13 = .data:0x81636B13; // type:object size:0x38 data:string -lbl_81636B4B = .data:0x81636B4B; // type:object size:0x2E data:string -lbl_81636B79 = .data:0x81636B79; // type:object size:0x2A data:string -lbl_81636BA3 = .data:0x81636BA3; // type:object size:0xF data:string -lbl_81636BB2 = .data:0x81636BB2; // type:object size:0x3C data:string -lbl_81636BEE = .data:0x81636BEE; // type:object size:0xF data:string -lbl_81636BFD = .data:0x81636BFD; // type:object size:0x3C data:string -lbl_81636C39 = .data:0x81636C39; // type:object size:0x2E data:string -lbl_81636C67 = .data:0x81636C67; // type:object size:0x33 data:string -lbl_81636C9A = .data:0x81636C9A; // type:object size:0x39 data:string -lbl_81636CD3 = .data:0x81636CD3; // type:object size:0x28 data:string -lbl_81636CFB = .data:0x81636CFB; // type:object size:0x2B data:string -lbl_81636D26 = .data:0x81636D26; // type:object size:0x30 data:string -lbl_81636D56 = .data:0x81636D56; // type:object size:0x38 data:string -lbl_81636D8E = .data:0x81636D8E; // type:object size:0x2F data:string -lbl_81636DBD = .data:0x81636DBD; // type:object size:0x2F data:string -lbl_81636DEC = .data:0x81636DEC; // type:object size:0x36 data:string -lbl_81636E22 = .data:0x81636E22; // type:object size:0x34 data:string -lbl_81636E56 = .data:0x81636E56; // type:object size:0x35 data:string -lbl_81636E8B = .data:0x81636E8B; // type:object size:0x2B data:string -lbl_81636EB6 = .data:0x81636EB6; // type:object size:0x32 data:string -lbl_81636EE8 = .data:0x81636EE8; // type:object size:0x21 data:string -lbl_81636F09 = .data:0x81636F09; // type:object size:0x21 data:string -lbl_81636F2A = .data:0x81636F2A; // type:object size:0x26 data:string -lbl_81636F50 = .data:0x81636F50; // type:object size:0x36 data:string -lbl_81636F86 = .data:0x81636F86; // type:object size:0x38 data:string -lbl_81636FBE = .data:0x81636FBE; // type:object size:0x2A data:string -lbl_81636FE8 = .data:0x81636FE8; // type:object size:0x31 data:string -lbl_81637019 = .data:0x81637019; // type:object size:0x33 data:string -lbl_8163704C = .data:0x8163704C; // type:object size:0x2F data:string -lbl_8163707B = .data:0x8163707B; // type:object size:0x31 data:string -lbl_816370AC = .data:0x816370AC; // type:object size:0x26 data:string -lbl_816370D2 = .data:0x816370D2; // type:object size:0x2F data:string -lbl_81637101 = .data:0x81637101; // type:object size:0x2B data:string -lbl_8163712C = .data:0x8163712C; // type:object size:0x2C data:string -lbl_81637158 = .data:0x81637158; // type:object size:0x4F data:string -lbl_816371A7 = .data:0x816371A7; // type:object size:0x28 data:string -lbl_816371CF = .data:0x816371CF; // type:object size:0x3A data:string -lbl_81637209 = .data:0x81637209; // type:object size:0x2D data:string -lbl_81637236 = .data:0x81637236; // type:object size:0x22 data:string -lbl_81637258 = .data:0x81637258; // type:object size:0x20 data:string -lbl_81637278 = .data:0x81637278; // type:object size:0x22 data:string -lbl_8163729A = .data:0x8163729A; // type:object size:0x27 data:string -lbl_816372C1 = .data:0x816372C1; // type:object size:0x23 data:string -lbl_816372E4 = .data:0x816372E4; // type:object size:0x3D data:string -lbl_81637321 = .data:0x81637321; // type:object size:0x27 data:string -lbl_81637348 = .data:0x81637348; // type:object size:0x2C data:string -lbl_81637374 = .data:0x81637374; // type:object size:0x30 data:string -lbl_816373A4 = .data:0x816373A4; // type:object size:0x26 data:string -lbl_816373CA = .data:0x816373CA; // type:object size:0x13 data:string -lbl_816373DD = .data:0x816373DD; // type:object size:0xD data:string -lbl_816373EA = .data:0x816373EA; // type:object size:0x9 data:string -lbl_816373F3 = .data:0x816373F3; // type:object size:0x18 data:string -lbl_8163740B = .data:0x8163740B; // type:object size:0x1C data:string -lbl_81637427 = .data:0x81637427; // type:object size:0x24 data:string -lbl_8163744B = .data:0x8163744B; // type:object size:0x2A data:string -lbl_81637475 = .data:0x81637475; // type:object size:0x28 data:string -lbl_8163749D = .data:0x8163749D; // type:object size:0x35 data:string -lbl_816374D2 = .data:0x816374D2; // type:object size:0x2C data:string -lbl_816374FE = .data:0x816374FE; // type:object size:0x34 data:string -lbl_81637532 = .data:0x81637532; // type:object size:0x35 data:string -lbl_81637567 = .data:0x81637567; // type:object size:0x2A data:string -lbl_81637591 = .data:0x81637591; // type:object size:0x38 data:string -lbl_816375C9 = .data:0x816375C9; // type:object size:0x53 data:string -lbl_8163761C = .data:0x8163761C; // type:object size:0x2A data:string -lbl_81637646 = .data:0x81637646; // type:object size:0x29 data:string -lbl_8163766F = .data:0x8163766F; // type:object size:0x27 data:string -lbl_81637696 = .data:0x81637696; // type:object size:0x28 data:string -lbl_816376BE = .data:0x816376BE; // type:object size:0x28 data:string -lbl_816376E6 = .data:0x816376E6; // type:object size:0x33 data:string -lbl_81637719 = .data:0x81637719; // type:object size:0x35 data:string -lbl_8163774E = .data:0x8163774E; // type:object size:0x2A data:string -lbl_81637778 = .data:0x81637778; // type:object size:0x20 data:string -lbl_81637798 = .data:0x81637798; // type:object size:0x39 data:string -lbl_816377D1 = .data:0x816377D1; // type:object size:0x41 data:string -lbl_81637812 = .data:0x81637812; // type:object size:0x3D data:string -lbl_8163784F = .data:0x8163784F; // type:object size:0x27 data:string -lbl_81637876 = .data:0x81637876; // type:object size:0x24 data:string -lbl_8163789A = .data:0x8163789A; // type:object size:0x28 data:string -lbl_816378C2 = .data:0x816378C2; // type:object size:0x24 data:string -lbl_816378E6 = .data:0x816378E6; // type:object size:0x22 data:string -lbl_81637908 = .data:0x81637908; // type:object size:0x21 data:string -lbl_81637929 = .data:0x81637929; // type:object size:0x39 data:string -lbl_81637962 = .data:0x81637962; // type:object size:0x3A data:string -lbl_8163799C = .data:0x8163799C; // type:object size:0x35 data:string -lbl_816379D1 = .data:0x816379D1; // type:object size:0x33 data:string -lbl_81637A04 = .data:0x81637A04; // type:object size:0x29 data:string -lbl_81637A2D = .data:0x81637A2D; // type:object size:0x38 data:string -lbl_81637A65 = .data:0x81637A65; // type:object size:0x2D data:string -lbl_81637A92 = .data:0x81637A92; // type:object size:0x39 data:string -lbl_81637ACB = .data:0x81637ACB; // type:object size:0x31 data:string -lbl_81637AFC = .data:0x81637AFC; // type:object size:0x2F data:string -lbl_81637B2B = .data:0x81637B2B; // type:object size:0x30 data:string -lbl_81637B5B = .data:0x81637B5B; // type:object size:0x46 data:string -lbl_81637BA1 = .data:0x81637BA1; // type:object size:0x2D data:string -lbl_81637BCE = .data:0x81637BCE; // type:object size:0x2D data:string -lbl_81637BFB = .data:0x81637BFB; // type:object size:0x2C data:string -lbl_81637C27 = .data:0x81637C27; // type:object size:0x34 data:string -lbl_81637C5B = .data:0x81637C5B; // type:object size:0x27 data:string -lbl_81637C82 = .data:0x81637C82; // type:object size:0x2B data:string -lbl_81637CAD = .data:0x81637CAD; // type:object size:0x1F data:string -lbl_81637CCC = .data:0x81637CCC; // type:object size:0x21 data:string -lbl_81637CED = .data:0x81637CED; // type:object size:0x26 data:string -lbl_81637D13 = .data:0x81637D13; // type:object size:0x29 data:string -lbl_81637D3C = .data:0x81637D3C; // type:object size:0xF data:string -lbl_81637D4B = .data:0x81637D4B; // type:object size:0x23 data:string -lbl_81637D6E = .data:0x81637D6E; // type:object size:0x2B data:string -lbl_81637D99 = .data:0x81637D99; // type:object size:0x23 data:string -lbl_81637DBC = .data:0x81637DBC; // type:object size:0x34 data:string -lbl_81637DF0 = .data:0x81637DF0; // type:object size:0x3B data:string -lbl_81637E2B = .data:0x81637E2B; // type:object size:0x30 data:string -lbl_81637E5B = .data:0x81637E5B; // type:object size:0x4D data:string -lbl_81637EA8 = .data:0x81637EA8; // type:object size:0x50 data:string -lbl_81637EF8 = .data:0x81637EF8; // type:object size:0x23 data:string -lbl_81637F1B = .data:0x81637F1B; // type:object size:0x24 data:string -lbl_81637F3F = .data:0x81637F3F; // type:object size:0x2E data:string -lbl_81637F6D = .data:0x81637F6D; // type:object size:0x2E data:string -lbl_81637F9B = .data:0x81637F9B; // type:object size:0x35 data:string -lbl_81637FD0 = .data:0x81637FD0; // type:object size:0x34 data:string -lbl_81638004 = .data:0x81638004; // type:object size:0x2C data:string -lbl_81638030 = .data:0x81638030; // type:object size:0x29 data:string -lbl_81638059 = .data:0x81638059; // type:object size:0x3E data:string -lbl_81638097 = .data:0x81638097; // type:object size:0x30 data:string -lbl_816380C7 = .data:0x816380C7; // type:object size:0x3C data:string -lbl_81638103 = .data:0x81638103; // type:object size:0x34 data:string -lbl_81638137 = .data:0x81638137; // type:object size:0x35 data:string -lbl_8163816C = .data:0x8163816C; // type:object size:0x32 data:string -lbl_8163819E = .data:0x8163819E; // type:object size:0x32 data:string -lbl_816381D0 = .data:0x816381D0; // type:object size:0x2D data:string -lbl_816381FD = .data:0x816381FD; // type:object size:0x32 data:string -lbl_8163822F = .data:0x8163822F; // type:object size:0x1F data:string -lbl_8163824E = .data:0x8163824E; // type:object size:0x3C data:string -lbl_8163828A = .data:0x8163828A; // type:object size:0x2F data:string -lbl_816382B9 = .data:0x816382B9; // type:object size:0x2E data:string -lbl_816382E7 = .data:0x816382E7; // type:object size:0x29 data:string -lbl_81638310 = .data:0x81638310; // type:object size:0x45 data:string -lbl_81638355 = .data:0x81638355; // type:object size:0x36 data:string -lbl_8163838B = .data:0x8163838B; // type:object size:0x2D data:string -lbl_816383B8 = .data:0x816383B8; // type:object size:0x49 data:string -lbl_81638401 = .data:0x81638401; // type:object size:0x4B data:string -lbl_8163844C = .data:0x8163844C; // type:object size:0x33 data:string -lbl_8163847F = .data:0x8163847F; // type:object size:0x36 data:string -lbl_816384B5 = .data:0x816384B5; // type:object size:0x24 data:string -lbl_816384D9 = .data:0x816384D9; // type:object size:0x2E data:string -lbl_81638507 = .data:0x81638507; // type:object size:0x2E data:string -lbl_81638535 = .data:0x81638535; // type:object size:0x15 data:string -lbl_8163854A = .data:0x8163854A; // type:object size:0x36 data:string -lbl_81638580 = .data:0x81638580; // type:object size:0x2B data:string -lbl_816385AB = .data:0x816385AB; // type:object size:0xA data:string -lbl_816385B5 = .data:0x816385B5; // type:object size:0xA data:string -lbl_816385BF = .data:0x816385BF; // type:object size:0x38 data:string -lbl_816385F7 = .data:0x816385F7; // type:object size:0x22 data:string -lbl_81638619 = .data:0x81638619; // type:object size:0x35 data:string -lbl_8163864E = .data:0x8163864E; // type:object size:0x20 data:string -lbl_8163866E = .data:0x8163866E; // type:object size:0x1F data:string -lbl_8163868D = .data:0x8163868D; // type:object size:0x30 data:string -lbl_816386BD = .data:0x816386BD; // type:object size:0x30 data:string -lbl_816386ED = .data:0x816386ED; // type:object size:0x1B data:string -lbl_81638708 = .data:0x81638708; // type:object size:0x24 data:string -lbl_8163872C = .data:0x8163872C; // type:object size:0x2F data:string -lbl_8163875B = .data:0x8163875B; // type:object size:0x2E data:string -lbl_81638789 = .data:0x81638789; // type:object size:0x25 data:string -lbl_816387AE = .data:0x816387AE; // type:object size:0x2D data:string -lbl_816387DB = .data:0x816387DB; // type:object size:0x2B data:string -lbl_81638806 = .data:0x81638806; // type:object size:0x22 data:string -lbl_81638828 = .data:0x81638828; // type:object size:0x27 data:string -lbl_8163884F = .data:0x8163884F; // type:object size:0x21 data:string -lbl_81638870 = .data:0x81638870; // type:object size:0x24 data:string -lbl_81638894 = .data:0x81638894; // type:object size:0x25 data:string -lbl_816388B9 = .data:0x816388B9; // type:object size:0x1E data:string -lbl_816388D7 = .data:0x816388D7; // type:object size:0x2A data:string -lbl_81638901 = .data:0x81638901; // type:object size:0x26 data:string -lbl_81638927 = .data:0x81638927; // type:object size:0x26 data:string -lbl_8163894D = .data:0x8163894D; // type:object size:0x3B data:string -lbl_81638988 = .data:0x81638988; // type:object size:0x29 data:string -lbl_816389B1 = .data:0x816389B1; // type:object size:0x30 data:string +@12357 = .data:0x81635B2C; // type:object size:0xC scope:local data:string +@12358 = .data:0x81635B38; // type:object size:0xA scope:local data:string +@12359 = .data:0x81635B42; // type:object size:0x1E scope:local data:string +@21503 = .data:0x81635B60; // type:object size:0x22 scope:local data:string +@21504 = .data:0x81635B82; // type:object size:0x22 scope:local data:string +@21767 = .data:0x81635BA4; // type:object size:0x16 scope:local data:string +@21770 = .data:0x81635BBA; // type:object size:0x11 scope:local data:string +@21777 = .data:0x81635BCB; // type:object size:0x19 scope:local data:string +@21780 = .data:0x81635BE4; // type:object size:0x1A scope:local data:string +@21783 = .data:0x81635BFE; // type:object size:0x10 scope:local data:string +@21788 = .data:0x81635C0E; // type:object size:0x21 scope:local data:string +@21789 = .data:0x81635C2F; // type:object size:0x25 scope:local data:string +@21792 = .data:0x81635C54; // type:object size:0x28 scope:local data:string +@21804 = .data:0x81635C7C; // type:object size:0x1B scope:local data:string +@21805 = .data:0x81635C97; // type:object size:0x1E scope:local data:string +@21806 = .data:0x81635CB5; // type:object size:0x29 scope:local data:string +@21917 = .data:0x81635CDE; // type:object size:0x1F scope:local data:string +@21918 = .data:0x81635CFD; // type:object size:0x1E scope:local data:string +@21919 = .data:0x81635D1B; // type:object size:0x2F scope:local data:string +@21920 = .data:0x81635D4A; // type:object size:0x34 scope:local data:string +@21921 = .data:0x81635D7E; // type:object size:0x14 scope:local data:string +@21922 = .data:0x81635D92; // type:object size:0x1B scope:local data:string +@21924 = .data:0x81635DB0; // type:object size:0xD0 scope:local +@21965 = .data:0x81635E80; // type:object size:0x21 scope:local data:string +@21966 = .data:0x81635EA1; // type:object size:0x22 scope:local data:string +@21967 = .data:0x81635EC3; // type:object size:0x30 scope:local data:string +@21968 = .data:0x81635EF3; // type:object size:0x3F scope:local data:string +@21969 = .data:0x81635F32; // type:object size:0x33 scope:local data:string +@21970 = .data:0x81635F65; // type:object size:0x30 scope:local data:string +@21971 = .data:0x81635F95; // type:object size:0x2E scope:local data:string +@21972 = .data:0x81635FC3; // type:object size:0x28 scope:local data:string +@21973 = .data:0x81635FEB; // type:object size:0x28 scope:local data:string +@21974 = .data:0x81636013; // type:object size:0x35 scope:local data:string +@21975 = .data:0x81636048; // type:object size:0x21 scope:local data:string +@21999 = .data:0x81636069; // type:object size:0x2F scope:local data:string +@22000 = .data:0x81636098; // type:object size:0x33 scope:local data:string +@22001 = .data:0x816360CB; // type:object size:0x3A scope:local data:string +@22002 = .data:0x81636105; // type:object size:0x3F scope:local data:string +@22028 = .data:0x81636144; // type:object size:0x2C scope:local data:string +@22029 = .data:0x81636170; // type:object size:0x32 scope:local data:string +@22030 = .data:0x816361A2; // type:object size:0x29 scope:local data:string +@22055 = .data:0x816361CB; // type:object size:0x2D scope:local data:string +@22056 = .data:0x816361F8; // type:object size:0x9 scope:local data:string +@22057 = .data:0x81636201; // type:object size:0x3C scope:local data:string +@22058 = .data:0x8163623D; // type:object size:0x28 scope:local data:string +@22106 = .data:0x81636265; // type:object size:0x29 scope:local data:string +@22107 = .data:0x8163628E; // type:object size:0x1D scope:local data:string +@22108 = .data:0x816362AB; // type:object size:0x1E scope:local data:string +@22109 = .data:0x816362C9; // type:object size:0x1D scope:local data:string +@22110 = .data:0x816362E6; // type:object size:0x24 scope:local data:string +@22134 = .data:0x8163630A; // type:object size:0x34 scope:local data:string +@22135 = .data:0x8163633E; // type:object size:0x1E scope:local data:string +@22136 = .data:0x8163635C; // type:object size:0x28 scope:local data:string +@22137 = .data:0x81636384; // type:object size:0x2B scope:local data:string +@22138 = .data:0x816363AF; // type:object size:0x1C scope:local data:string +@22158 = .data:0x816363CB; // type:object size:0x2D scope:local data:string +@22193 = .data:0x816363F8; // type:object size:0x26 scope:local data:string +@22194 = .data:0x8163641E; // type:object size:0x2C scope:local data:string +@22195 = .data:0x8163644A; // type:object size:0x30 scope:local data:string +@22196 = .data:0x8163647A; // type:object size:0x30 scope:local data:string +@22197 = .data:0x816364AA; // type:object size:0x26 scope:local data:string +@22198 = .data:0x816364D0; // type:object size:0x27 scope:local data:string +@22199 = .data:0x816364F7; // type:object size:0x37 scope:local data:string +@13884 = .data:0x8163652E; // type:object size:0x15 scope:local data:string +@13885 = .data:0x81636543; // type:object size:0x15 scope:local data:string +@22354 = .data:0x81636558; // type:object size:0x2D scope:local data:string +@22355 = .data:0x81636585; // type:object size:0x30 scope:local data:string +@22356 = .data:0x816365B5; // type:object size:0x4E scope:local data:string +@22357 = .data:0x81636603; // type:object size:0x40 scope:local data:string +@22358 = .data:0x81636643; // type:object size:0x2E scope:local data:string +@22359 = .data:0x81636671; // type:object size:0x37 scope:local data:string +@22360 = .data:0x816366A8; // type:object size:0x4D scope:local data:string +@22400 = .data:0x816366F5; // type:object size:0x25 scope:local data:string +@22401 = .data:0x8163671A; // type:object size:0x41 scope:local data:string +@22422 = .data:0x8163675B; // type:object size:0x30 scope:local data:string +@22423 = .data:0x8163678B; // type:object size:0x3D scope:local data:string +@22455 = .data:0x816367C8; // type:object size:0x48 scope:local data:string +@22476 = .data:0x81636810; // type:object size:0x31 scope:local data:string +@22477 = .data:0x81636841; // type:object size:0x38 scope:local data:string +@22497 = .data:0x81636879; // type:object size:0x2F scope:local data:string +@22513 = .data:0x816368A8; // type:object size:0x21 scope:local data:string +@22514 = .data:0x816368C9; // type:object size:0x1F scope:local data:string +@22536 = .data:0x816368E8; // type:object size:0x1E scope:local data:string +@22537 = .data:0x81636906; // type:object size:0x20 scope:local data:string +@22570 = .data:0x81636926; // type:object size:0x9 scope:local data:string +@22571 = .data:0x8163692F; // type:object size:0x37 scope:local data:string +@22572 = .data:0x81636966; // type:object size:0x34 scope:local data:string +@22573 = .data:0x8163699A; // type:object size:0xD scope:local data:string +@22574 = .data:0x816369A7; // type:object size:0x3A scope:local data:string +@22575 = .data:0x816369E1; // type:object size:0x31 scope:local data:string +@22576 = .data:0x81636A12; // type:object size:0x2E scope:local data:string +@22577 = .data:0x81636A40; // type:object size:0x2E scope:local data:string +@22578 = .data:0x81636A6E; // type:object size:0x2B scope:local data:string +@22579 = .data:0x81636A99; // type:object size:0x2C scope:local data:string +@22580 = .data:0x81636AC5; // type:object size:0x2B scope:local data:string +@22581 = .data:0x81636AF0; // type:object size:0x23 scope:local data:string +@22582 = .data:0x81636B13; // type:object size:0x38 scope:local data:string +@22583 = .data:0x81636B4B; // type:object size:0x2E scope:local data:string +@22584 = .data:0x81636B79; // type:object size:0x2A scope:local data:string +@22593 = .data:0x81636BA3; // type:object size:0xF scope:local data:string +@22594 = .data:0x81636BB2; // type:object size:0x3C scope:local data:string +@22595 = .data:0x81636BEE; // type:object size:0xF scope:local data:string +@22596 = .data:0x81636BFD; // type:object size:0x3C scope:local data:string +@22619 = .data:0x81636C39; // type:object size:0x2E scope:local data:string +@22620 = .data:0x81636C67; // type:object size:0x33 scope:local data:string +@22621 = .data:0x81636C9A; // type:object size:0x39 scope:local data:string +@22622 = .data:0x81636CD3; // type:object size:0x28 scope:local data:string +@22634 = .data:0x81636CFB; // type:object size:0x2B scope:local data:string +@22635 = .data:0x81636D26; // type:object size:0x30 scope:local data:string +@22647 = .data:0x81636D56; // type:object size:0x38 scope:local data:string +@22681 = .data:0x81636D8E; // type:object size:0x2F scope:local data:string +@22682 = .data:0x81636DBD; // type:object size:0x2F scope:local data:string +@22683 = .data:0x81636DEC; // type:object size:0x36 scope:local data:string +@22684 = .data:0x81636E22; // type:object size:0x34 scope:local data:string +@22685 = .data:0x81636E56; // type:object size:0x35 scope:local data:string +@22686 = .data:0x81636E8B; // type:object size:0x2B scope:local data:string +@22690 = .data:0x81636EB6; // type:object size:0x32 scope:local data:string +@22691 = .data:0x81636EE8; // type:object size:0x21 scope:local data:string +@22692 = .data:0x81636F09; // type:object size:0x21 scope:local data:string +@22693 = .data:0x81636F2A; // type:object size:0x26 scope:local data:string +@22701 = .data:0x81636F50; // type:object size:0x36 scope:local data:string +@22702 = .data:0x81636F86; // type:object size:0x38 scope:local data:string +@22703 = .data:0x81636FBE; // type:object size:0x2A scope:local data:string +@22730 = .data:0x81636FE8; // type:object size:0x31 scope:local data:string +@22731 = .data:0x81637019; // type:object size:0x33 scope:local data:string +@22732 = .data:0x8163704C; // type:object size:0x2F scope:local data:string +@22733 = .data:0x8163707B; // type:object size:0x31 scope:local data:string +@22789 = .data:0x816370AC; // type:object size:0x26 scope:local data:string +@22790 = .data:0x816370D2; // type:object size:0x2F scope:local data:string +@22791 = .data:0x81637101; // type:object size:0x2B scope:local data:string +@22792 = .data:0x8163712C; // type:object size:0x2C scope:local data:string +@22793 = .data:0x81637158; // type:object size:0x4F scope:local data:string +@22794 = .data:0x816371A7; // type:object size:0x28 scope:local data:string +@22795 = .data:0x816371CF; // type:object size:0x3A scope:local data:string +@22796 = .data:0x81637209; // type:object size:0x2D scope:local data:string +@22797 = .data:0x81637236; // type:object size:0x22 scope:local data:string +@22798 = .data:0x81637258; // type:object size:0x20 scope:local data:string +@22799 = .data:0x81637278; // type:object size:0x22 scope:local data:string +@22800 = .data:0x8163729A; // type:object size:0x27 scope:local data:string +@22801 = .data:0x816372C1; // type:object size:0x23 scope:local data:string +@22802 = .data:0x816372E4; // type:object size:0x3D scope:local data:string +@22803 = .data:0x81637321; // type:object size:0x27 scope:local data:string +@22815 = .data:0x81637348; // type:object size:0x2C scope:local data:string +@22816 = .data:0x81637374; // type:object size:0x30 scope:local data:string +@22817 = .data:0x816373A4; // type:object size:0x26 scope:local data:string +@14983 = .data:0x816373CA; // type:object size:0x13 scope:local data:string +@14984 = .data:0x816373DD; // type:object size:0xD scope:local data:string +@14985 = .data:0x816373EA; // type:object size:0x9 scope:local data:string +@22831 = .data:0x816373F3; // type:object size:0x18 scope:local data:string +@22832 = .data:0x8163740B; // type:object size:0x1C scope:local data:string +@22833 = .data:0x81637427; // type:object size:0x24 scope:local data:string +@22841 = .data:0x8163744B; // type:object size:0x2A scope:local data:string +@22842 = .data:0x81637475; // type:object size:0x28 scope:local data:string +@22914 = .data:0x8163749D; // type:object size:0x35 scope:local data:string +@22915 = .data:0x816374D2; // type:object size:0x2C scope:local data:string +@22916 = .data:0x816374FE; // type:object size:0x34 scope:local data:string +@22917 = .data:0x81637532; // type:object size:0x35 scope:local data:string +@22918 = .data:0x81637567; // type:object size:0x2A scope:local data:string +@22919 = .data:0x81637591; // type:object size:0x38 scope:local data:string +@22920 = .data:0x816375C9; // type:object size:0x53 scope:local data:string +@22921 = .data:0x8163761C; // type:object size:0x2A scope:local data:string +@22922 = .data:0x81637646; // type:object size:0x29 scope:local data:string +@22923 = .data:0x8163766F; // type:object size:0x27 scope:local data:string +@22924 = .data:0x81637696; // type:object size:0x28 scope:local data:string +@22925 = .data:0x816376BE; // type:object size:0x28 scope:local data:string +@22926 = .data:0x816376E6; // type:object size:0x33 scope:local data:string +@22927 = .data:0x81637719; // type:object size:0x35 scope:local data:string +@22947 = .data:0x8163774E; // type:object size:0x2A scope:local data:string +@22948 = .data:0x81637778; // type:object size:0x20 scope:local data:string +@22949 = .data:0x81637798; // type:object size:0x39 scope:local data:string +@22977 = .data:0x816377D1; // type:object size:0x41 scope:local data:string +@22978 = .data:0x81637812; // type:object size:0x3D scope:local data:string +@22979 = .data:0x8163784F; // type:object size:0x27 scope:local data:string +@22980 = .data:0x81637876; // type:object size:0x24 scope:local data:string +@22984 = .data:0x8163789A; // type:object size:0x28 scope:local data:string +@22985 = .data:0x816378C2; // type:object size:0x24 scope:local data:string +@23013 = .data:0x816378E6; // type:object size:0x22 scope:local data:string +@23014 = .data:0x81637908; // type:object size:0x21 scope:local data:string +@23015 = .data:0x81637929; // type:object size:0x39 scope:local data:string +@23016 = .data:0x81637962; // type:object size:0x3A scope:local data:string +@23017 = .data:0x8163799C; // type:object size:0x35 scope:local data:string +@23018 = .data:0x816379D1; // type:object size:0x33 scope:local data:string +@23019 = .data:0x81637A04; // type:object size:0x29 scope:local data:string +@23020 = .data:0x81637A2D; // type:object size:0x38 scope:local data:string +@23021 = .data:0x81637A65; // type:object size:0x2D scope:local data:string +@23035 = .data:0x81637A92; // type:object size:0x39 scope:local data:string +@23036 = .data:0x81637ACB; // type:object size:0x31 scope:local data:string +@23037 = .data:0x81637AFC; // type:object size:0x2F scope:local data:string +@23038 = .data:0x81637B2B; // type:object size:0x30 scope:local data:string +@23094 = .data:0x81637B5B; // type:object size:0x46 scope:local data:string +@23095 = .data:0x81637BA1; // type:object size:0x2D scope:local data:string +@23096 = .data:0x81637BCE; // type:object size:0x2D scope:local data:string +@23097 = .data:0x81637BFB; // type:object size:0x2C scope:local data:string +@23098 = .data:0x81637C27; // type:object size:0x34 scope:local data:string +@23123 = .data:0x81637C5B; // type:object size:0x27 scope:local data:string +@23124 = .data:0x81637C82; // type:object size:0x2B scope:local data:string +@23125 = .data:0x81637CAD; // type:object size:0x1F scope:local data:string +@23126 = .data:0x81637CCC; // type:object size:0x21 scope:local data:string +@23127 = .data:0x81637CED; // type:object size:0x26 scope:local data:string +@23128 = .data:0x81637D13; // type:object size:0x29 scope:local data:string +@23129 = .data:0x81637D3C; // type:object size:0xF scope:local data:string +@23130 = .data:0x81637D4B; // type:object size:0x23 scope:local data:string +@23131 = .data:0x81637D6E; // type:object size:0x2B scope:local data:string +@23132 = .data:0x81637D99; // type:object size:0x23 scope:local data:string +@23159 = .data:0x81637DBC; // type:object size:0x34 scope:local data:string +@23160 = .data:0x81637DF0; // type:object size:0x3B scope:local data:string +@23161 = .data:0x81637E2B; // type:object size:0x30 scope:local data:string +@23162 = .data:0x81637E5B; // type:object size:0x4D scope:local data:string +@23163 = .data:0x81637EA8; // type:object size:0x50 scope:local data:string +@23176 = .data:0x81637EF8; // type:object size:0x23 scope:local data:string +@23177 = .data:0x81637F1B; // type:object size:0x24 scope:local data:string +@23178 = .data:0x81637F3F; // type:object size:0x2E scope:local data:string +@23179 = .data:0x81637F6D; // type:object size:0x2E scope:local data:string +@23199 = .data:0x81637F9B; // type:object size:0x35 scope:local data:string +@23200 = .data:0x81637FD0; // type:object size:0x34 scope:local data:string +@23214 = .data:0x81638004; // type:object size:0x2C scope:local data:string +@23269 = .data:0x81638030; // type:object size:0x29 scope:local data:string +@23270 = .data:0x81638059; // type:object size:0x3E scope:local data:string +@23271 = .data:0x81638097; // type:object size:0x30 scope:local data:string +@23272 = .data:0x816380C7; // type:object size:0x3C scope:local data:string +@23273 = .data:0x81638103; // type:object size:0x34 scope:local data:string +@23278 = .data:0x81638137; // type:object size:0x35 scope:local data:string +@23279 = .data:0x8163816C; // type:object size:0x32 scope:local data:string +@23280 = .data:0x8163819E; // type:object size:0x32 scope:local data:string +@23281 = .data:0x816381D0; // type:object size:0x2D scope:local data:string +@23325 = .data:0x816381FD; // type:object size:0x32 scope:local data:string +@23326 = .data:0x8163822F; // type:object size:0x1F scope:local data:string +@23327 = .data:0x8163824E; // type:object size:0x3C scope:local data:string +@23328 = .data:0x8163828A; // type:object size:0x2F scope:local data:string +@23363 = .data:0x816382B9; // type:object size:0x2E scope:local data:string +@23364 = .data:0x816382E7; // type:object size:0x29 scope:local data:string +@23365 = .data:0x81638310; // type:object size:0x45 scope:local data:string +@23366 = .data:0x81638355; // type:object size:0x36 scope:local data:string +@23367 = .data:0x8163838B; // type:object size:0x2D scope:local data:string +@23368 = .data:0x816383B8; // type:object size:0x49 scope:local data:string +@23369 = .data:0x81638401; // type:object size:0x4B scope:local data:string +@23376 = .data:0x8163844C; // type:object size:0x33 scope:local data:string +@23414 = .data:0x8163847F; // type:object size:0x36 scope:local data:string +@23486 = .data:0x816384B5; // type:object size:0x24 scope:local data:string +@23496 = .data:0x816384D9; // type:object size:0x2E scope:local data:string +@23499 = .data:0x81638507; // type:object size:0x2E scope:local data:string +@23572 = .data:0x81638535; // type:object size:0x15 scope:local data:string +@23573 = .data:0x8163854A; // type:object size:0x36 scope:local data:string +@23575 = .data:0x81638580; // type:object size:0x2B scope:local data:string +@23576 = .data:0x816385AB; // type:object size:0xA scope:local data:string +@23577 = .data:0x816385B5; // type:object size:0xA scope:local data:string +@23578 = .data:0x816385BF; // type:object size:0x38 scope:local data:string +@23579 = .data:0x816385F7; // type:object size:0x22 scope:local data:string +@23580 = .data:0x81638619; // type:object size:0x35 scope:local data:string +@23593 = .data:0x8163864E; // type:object size:0x20 scope:local data:string +@23598 = .data:0x8163866E; // type:object size:0x1F scope:local data:string +@23689 = .data:0x8163868D; // type:object size:0x30 scope:local data:string +@23690 = .data:0x816386BD; // type:object size:0x30 scope:local data:string +@23691 = .data:0x816386ED; // type:object size:0x1B scope:local data:string +@23692 = .data:0x81638708; // type:object size:0x24 scope:local data:string +@23693 = .data:0x8163872C; // type:object size:0x2F scope:local data:string +@23694 = .data:0x8163875B; // type:object size:0x2E scope:local data:string +@23695 = .data:0x81638789; // type:object size:0x25 scope:local data:string +@23710 = .data:0x816387AE; // type:object size:0x2D scope:local data:string +@23711 = .data:0x816387DB; // type:object size:0x2B scope:local data:string +@23712 = .data:0x81638806; // type:object size:0x22 scope:local data:string +@23713 = .data:0x81638828; // type:object size:0x27 scope:local data:string +@23719 = .data:0x8163884F; // type:object size:0x21 scope:local data:string +@23724 = .data:0x81638870; // type:object size:0x24 scope:local data:string +@23750 = .data:0x81638894; // type:object size:0x25 scope:local data:string +@23766 = .data:0x816388B9; // type:object size:0x1E scope:local data:string +@23767 = .data:0x816388D7; // type:object size:0x2A scope:local data:string +@23772 = .data:0x81638901; // type:object size:0x26 scope:local data:string +@23777 = .data:0x81638927; // type:object size:0x26 scope:local data:string +@23879 = .data:0x8163894D; // type:object size:0x3B scope:local data:string +@23880 = .data:0x81638988; // type:object size:0x29 scope:local data:string +@23881 = .data:0x816389B1; // type:object size:0x30 scope:local data:string sZiSysLangTable__Q23ipl8keyboard = .data:0x816389E8; // type:object size:0x58 scope:local sZiOemLangTable__Q23ipl8keyboard = .data:0x81638A40; // type:object size:0x58 scope:local lbl_81638A98 = .data:0x81638A98; // type:object size:0x1A8 @@ -16970,23 +16971,24 @@ __vt__Q33ipl5scene7Setting = .data:0x8165779C; // type:object size:0xFC @1909 = .data:0x8165791C; // type:object size:0x12 scope:local data:string @1910 = .data:0x8165792E; // type:object size:0xC scope:local data:string @1911 = .data:0x8165793A; // type:object size:0x16 scope:local data:string -lbl_81657950 = .data:0x81657950; // type:object size:0x21 data:string -lbl_81657971 = .data:0x81657971; // type:object size:0x1E data:string -lbl_8165798F = .data:0x8165798F; // type:object size:0x22 data:string -lbl_816579B1 = .data:0x816579B1; // type:object size:0x10 data:string -lbl_816579C1 = .data:0x816579C1; // type:object size:0x9 data:string -lbl_816579CA = .data:0x816579CA; // type:object size:0xD data:string -lbl_816579D7 = .data:0x816579D7; // type:object size:0xA data:string -lbl_816579E1 = .data:0x816579E1; // type:object size:0xB data:string -lbl_816579EC = .data:0x816579EC; // type:object size:0xD data:string -lbl_816579F9 = .data:0x816579F9; // type:object size:0x13 data:string -lbl_81657A0C = .data:0x81657A0C; // type:object size:0x11 data:string -lbl_81657A1D = .data:0x81657A1D; // type:object size:0x17 data:string -lbl_81657A34 = .data:0x81657A34; // type:object size:0x20 data:string -lbl_81657A54 = .data:0x81657A54; // type:object size:0x1E data:string -lbl_81657A72 = .data:0x81657A72; // type:object size:0xF data:string -lbl_81657A81 = .data:0x81657A81; // type:object size:0xE data:string -lbl_81657A8F = .data:0x81657A8F; // type:object size:0xD data:string +@12223 = .data:0x81657950; // type:object size:0x21 scope:local data:string +...data.0 = .data:0x81657950; // type:label scope:local +@12284 = .data:0x81657971; // type:object size:0x1E scope:local data:string +@12285 = .data:0x8165798F; // type:object size:0x22 scope:local data:string +@12300 = .data:0x816579B1; // type:object size:0x10 scope:local data:string +@12301 = .data:0x816579C1; // type:object size:0x9 scope:local data:string +@12303 = .data:0x816579CA; // type:object size:0xD scope:local data:string +@12306 = .data:0x816579D7; // type:object size:0xA scope:local data:string +@12308 = .data:0x816579E1; // type:object size:0xB scope:local data:string +@12310 = .data:0x816579EC; // type:object size:0xD scope:local data:string +@12312 = .data:0x816579F9; // type:object size:0x13 scope:local data:string +@12314 = .data:0x81657A0C; // type:object size:0x11 scope:local data:string +@12316 = .data:0x81657A1D; // type:object size:0x17 scope:local data:string +@12318 = .data:0x81657A34; // type:object size:0x20 scope:local data:string +@12320 = .data:0x81657A54; // type:object size:0x1E scope:local data:string +@12322 = .data:0x81657A72; // type:object size:0xF scope:local data:string +@12324 = .data:0x81657A81; // type:object size:0xE scope:local data:string +@12326 = .data:0x81657A8F; // type:object size:0xD scope:local data:string lbl_81657AA0 = .data:0x81657AA0; // type:object size:0x1B data:string lbl_81657ABB = .data:0x81657ABB; // type:object size:0x1D data:string __vt__Q33ipl5scene12APScanThread = .data:0x81657AD8; // type:object size:0x30 @@ -20088,10 +20090,10 @@ lbl_816944EB = .sdata2:0x816944EB; // type:object size:0x1 data:byte @10441 = .sdata2:0x81694560; // type:object size:0x4 scope:local align:4 data:float @10442 = .sdata2:0x81694564; // type:object size:0x4 scope:local align:4 data:float @10445 = .sdata2:0x81694568; // type:object size:0x8 scope:local align:8 data:double -lbl_81694570 = .sdata2:0x81694570; // type:object size:0x8 data:8byte -lbl_81694578 = .sdata2:0x81694578; // type:object size:0x8 data:8byte -lbl_81694580 = .sdata2:0x81694580; // type:object size:0x4 align:4 data:float -lbl_81694588 = .sdata2:0x81694588; // type:object size:0x8 align:8 data:double +@13886 = .sdata2:0x81694570; // type:object size:0x8 scope:local data:8byte +@13978 = .sdata2:0x81694578; // type:object size:0x8 scope:local data:8byte +@23219 = .sdata2:0x81694580; // type:object size:0x4 scope:local align:4 data:float +@23221 = .sdata2:0x81694588; // type:object size:0x8 scope:local align:8 data:double lbl_81694590 = .sdata2:0x81694590; // type:object size:0x4 align:4 data:float lbl_81694594 = .sdata2:0x81694594; // type:object size:0x4 align:4 data:float lbl_81694598 = .sdata2:0x81694598; // type:object size:0x4 align:4 data:float @@ -21421,7 +21423,7 @@ lbl_816960F6 = .sdata:0x816960F6; // type:object size:0x6 data:string @14129 = .sdata:0x8169618A; // type:object size:0x6 scope:local data:string @14332 = .sdata:0x81696190; // type:object size:0x6 scope:local data:string c_banner_file_name__Q23ipl12NandSDWorker = .sdata:0x81696198; // type:object size:0x4 data:4byte -lbl_8169619C = .sdata:0x8169619C; // type:object size:0x8 scope:local data:string +@12344 = .sdata:0x8169619C; // type:object size:0x7 scope:local data:string c_nocopy_folder_name__Q23ipl12NandSDWorker = .sdata:0x816961A4; // type:object size:0x4 data:4byte c_notransfer_folder_name__Q23ipl12NandSDWorker = .sdata:0x816961A8; // type:object size:0x4 data:4byte c_wii_sd_title_root__Q23ipl12NandSDWorker = .sdata:0x816961AC; // type:object size:0x4 data:4byte @@ -21430,17 +21432,17 @@ c_sd_app_file_name__Q23ipl12NandSDWorker = .sdata:0x816961B4; // type:object siz c_succession_path__Q23ipl12NandSDWorker = .sdata:0x816961B8; // type:object size:0x4 data:4byte c_transferid_path__Q23ipl12NandSDWorker = .sdata:0x816961BC; // type:object size:0x4 data:4byte c_tmp_work_path__Q23ipl12NandSDWorker = .sdata:0x816961C0; // type:object size:0x4 data:4byte -lbl_816961C4 = .sdata:0x816961C4; // type:object size:0x6 data:string -lbl_816961CA = .sdata:0x816961CA; // type:object size:0x7 data:string -lbl_816961D1 = .sdata:0x816961D1; // type:object size:0x6 data:string -lbl_816961D7 = .sdata:0x816961D7; // type:object size:0x5 data:string +@12352 = .sdata:0x816961C4; // type:object size:0x6 scope:local data:string +@12353 = .sdata:0x816961CA; // type:object size:0x7 scope:local data:string +@12355 = .sdata:0x816961D1; // type:object size:0x6 scope:local data:string +@12356 = .sdata:0x816961D7; // type:object size:0x5 scope:local data:string c_ignore_list_for_wiimenu__Q23ipl12NandSDWorker = .sdata:0x816961DC; // type:object size:0x8 c_wii_menu_save_path__Q23ipl12NandSDWorker = .sdata:0x816961E4; // type:object size:0x4 data:4byte -lbl_816961E8 = .sdata:0x816961E8; // type:object size:0x2 data:string -lbl_816961EA = .sdata:0x816961EA; // type:object size:0x3 data:string -lbl_816961ED = .sdata:0x816961ED; // type:object size:0x2 data:string -lbl_816961EF = .sdata:0x816961EF; // type:object size:0x5 data:string -lbl_816961F4 = .sdata:0x816961F4; // type:object size:0x4 data:string +@22157 = .sdata:0x816961E8; // type:object size:0x2 scope:local data:string +@22300 = .sdata:0x816961EA; // type:object size:0x3 scope:local data:string +@22314 = .sdata:0x816961ED; // type:object size:0x2 scope:local data:string +@23190 = .sdata:0x816961EF; // type:object size:0x5 scope:local data:string +@23574 = .sdata:0x816961F4; // type:object size:0x4 scope:local data:string lbl_816961F8 = .sdata:0x816961F8; // type:object size:0x4 data:string lbl_816961FC = .sdata:0x816961FC; // type:object size:0x4 @10074 = .sdata:0x81696200; // type:object size:0x4 scope:local data:string @@ -22112,8 +22114,8 @@ lbl_816971C3 = .sdata:0x816971C3; // type:object size:0x6 data:string lbl_816971C9 = .sdata:0x816971C9; // type:object size:0x7 data:string lbl_816971D0 = .sdata:0x816971D0; // type:object size:0x3 data:string lbl_816971D4 = .sdata:0x816971D4; // type:object size:0x8 data:wstring -lbl_816971E0 = .sdata:0x816971E0; // type:object size:0x5 data:string -lbl_816971E5 = .sdata:0x816971E5; // type:object size:0x5 data:string +@12299 = .sdata:0x816971E0; // type:object size:0x5 scope:local data:string +@12302 = .sdata:0x816971E5; // type:object size:0x5 scope:local data:string lbl_816971F0 = .sdata:0x816971F0; // type:object size:0x4 data:string lbl_816971F8 = .sdata:0x816971F8; // type:object size:0x4 data:4byte lbl_81697200 = .sdata:0x81697200; // type:object size:0x4 data:4byte @@ -23227,7 +23229,7 @@ ScrollState___Q23www9trasition = .sbss:0x81698984; // type:object size:0x4 scope gDpdWaitFrm = .sbss:0x81698988; // type:object size:0x4 data:4byte wiiFlag__Q23www10wiisetting = .sbss:0x8169898C; // type:object size:0x8 data:4byte writeBackID__Q23www10wiisetting = .sbss:0x81698994; // type:object size:0x1 data:byte -savedata_smth__Q23www10wiisetting = .sbss:0x81698995; // type:object size:0x1 data:byte +saveData__Q23www10wiisetting = .sbss:0x81698995; // type:object size:0x1 data:byte funcResult__Q23www10wiisetting = .sbss:0x81698996; // type:object size:0x1 data:byte setupFlag__Q23www10wiisetting = .sbss:0x81698997; // type:object size:0x1 data:byte mQueue__Q23www10wiisetting = .sbss:0x81698998; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index 5178524d..d55bf559 100644 --- a/configure.py +++ b/configure.py @@ -639,7 +639,7 @@ config.libs = [ Object(Matching, "system/iplPointerCore.cpp"), Object(Matching, "system/iplDialogWindow.cpp"), Object(Matching, "system/iplHomeButtonMenu.cpp"), - Object(Equivalent, "system/iplNandSDWorker.cpp"), + Object(Matching, "system/iplNandSDWorker.cpp"), Object(Equivalent, "system/iplKeyboard.cpp"), Object(Matching, "system/iplErrorHandler.cpp"), Object(Matching, "system/iplResetHandler.cpp"), @@ -863,7 +863,7 @@ config.libs = [ Object(NonMatching, "scene/setting/iplSetting.cpp"), Object(NonMatching, "scene/setting/iplSensitivity.cpp"), Object(Matching, "scene/setting/iplNCDSetting.cpp"), - Object(NonMatching, "scene/setting/iplParental.cpp"), + Object(Matching, "scene/setting/iplParental.cpp"), Object(NonMatching, "scene/setting/iplAPScanThread.cpp"), Object(NonMatching, "scene/setting/iplUSBAP.cpp"), Object(NonMatching, "scene/setting/iplUSBAPThread.cpp"), diff --git a/include/iplwww/www_arcreader.h b/include/iplwww/www_arcreader.h index f295943f..c492dc36 100644 --- a/include/iplwww/www_arcreader.h +++ b/include/iplwww/www_arcreader.h @@ -6,7 +6,7 @@ #include #include -#include "iplwww/www_js.h" +#include namespace www { namespace arcreader { @@ -25,7 +25,7 @@ namespace www { private: ARCHandle mHandles[4]; bool mFlags[4]; - void* pScratch; + void* mpScratch; }; extern const char* sProtocolName; diff --git a/include/iplwww/www_browser.h b/include/iplwww/www_browser.h index 594295cb..2e48f1e7 100644 --- a/include/iplwww/www_browser.h +++ b/include/iplwww/www_browser.h @@ -4,41 +4,10 @@ #include #include -#include "iplwww/www_js.h" #include "iplwww/www_message.h" #include "iplwww/www_thread.h" -typedef void (*WWWAddJSPluginFn)(const char*, WWWJSCap*, JSCallbackSet**); - -typedef u32 (*WWWProtocolWriteFn)(void* wwwInternal, const void* data, u32 dataSize); -typedef u32 (*WWWProtocolFinalizeFn)(void*); -typedef int (*WWWAddProtocolFn)(const char*); - -typedef void (*WWWBasicWindowFn)(WWWHandlewindow*); -typedef void (*WWWSetBrowserWindowRectFn)(WWWHandlewindow*, WWWRect*); -typedef void (*WWWSetImageModeFn)(WWWHandlewindow*, GXTexFmt); -typedef void (*WWWSetRenderingModeFn)(WWWHandlewindow*, int); -typedef BOOL (*WWWCreateBrowserWindowFn)(void*, WWWHandlewindow**, int); -typedef BOOL (*WWWCloseBrowserWindowFn)(void*, WWWHandlewindow*); -typedef void (*WWWOpenUrlFn)(WWWHandlewindow*, const char*); - -typedef void (*WWWGetBrowserAllocationFunctionsFn)(void* heapBuf, u32 heapBufSize, void** allocOut, void (**freeOut)(void*), int (**availOut)()); -typedef void (*WWWSetAllocationFunctionsFn)(void* allocA, void (*freeA)(void*), int (*avail)(), void* allocB, void (*freeB)(void*), void* allocC, - void (*freeC)(void*)); - -typedef int (*WWWSurfaceInitFn)(int w, int h, u32 rowSize, int, void* rasterBuf); -typedef int (*WWWSurfaceSetFlushCallbackFn)(void (*FlushCallback)(WWWRect*, int), int); -typedef void (*WWWSurfaceAddFontFn)(const char*); -typedef void (*WWWSurfaceUpdateScreenFn)(u32); -typedef void (*WWWSurfaceKeyboardEvtFn)(WWWKeyBtnCmd cmd, WWWKeySym sym, u32 unk); -typedef void (*WWWSurfaceMouseEvtFn)(WWWMouseCmd cmd, int x, int y, WWWMouseAttrib attrib, u32 unkA, u32 unkB); - -typedef void (*WWWCommitImeFn)(int imeID, const char* str); -typedef void (*WWWUpdateImeFn)(int imeID, const char* str, u32 unk); - -typedef BOOL (*WWWNotifyCallbackFn)(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData); -typedef void (*WWWCreateBrowserFn)(WWWHandle** browser, WWWNotifyCallbackFn notifyCallback, const char** fonts, const char* arc); -typedef BOOL (*WWWSimpleBrowserFn)(WWWHandle* browser); +#include extern WWWSurfaceInitFn WWWSurfaceInit; extern void* WWWSurfaceNewScreen; @@ -153,13 +122,19 @@ extern WWWProtocolFinalizeFn WWWProtocolFinished; extern WWWProtocolFinalizeFn WWWProtocolFailed; extern WWWAddProtocolFn WWWAddProtocol; +namespace www { + namespace arcreader { + class ArcContainer; + } // namespace arcreader +} // namespace www + namespace ext_ead { namespace www { typedef struct ImeData { u32 unk_0x00; // 0x00 u32 imeID; // 0x04 char* text; // 0x08 - u32 unk_0x0c; // 0x0c + u32 unk_0x0C; // 0x0c u32 unk_0x10; // 0x10 u32 unk_0x14; // 0x14 u32 unk_0x18; // 0x18 @@ -191,7 +166,7 @@ namespace ext_ead { struct { u32 imeID; char* str; - u32 unk_0x0c; + u32 unk_0x0C; } updateIme; // ID 4 u32 raw[6]; } data; @@ -203,7 +178,7 @@ namespace ext_ead { virtual void* Run(); void RegisterArcFile(void* arcData); - void RegisterIniFile(void*, u32); + void RegisterIniFile(void* iniData, u32 iniLen); void CreateThread(int w, int h, void* threadStack, u32 threadStackSize, int priority); void StopThread(); bool IsThreadStopped(); @@ -214,12 +189,15 @@ namespace ext_ead { void CreateImeData(ImeData* data, const WWWIMEData* wwwData); void DisposeImeData(ImeData* data); - void CommitIme(ImeData* data, const char*); + void CommitIme(ImeData* data, const char* something); void CommitImeCmdPacket(const CmdPacket* data); void UpdateImeCmdPacket(const CmdPacket* data); - static void FlushCallback(WWWRect*, int); + static void FlushCallback(WWWRect* rect, int unk); + + u32* GetRaster() { return mpRaster; } + WWWHandle* GetHandle() { return mpBrowserHandle; } private: static BOOL SNotifyCallback_(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData); @@ -227,32 +205,36 @@ namespace ext_ead { bool CheckThreadExit_(); void InitSurface_(); - void InitFonts_(const char*); + void InitFonts_(const char* unk); void SendKeyboardEvent_(u32 btnMask, u32 triggerFlag, u32 releaseFlag, WWWKeySym sym); - WWWKeySym GetKeyboardSym_(u32); + WWWKeySym GetKeyboardSym_(u32 input); int ExecDpdEvent_(const CmdPacket&); void ExecSpacialEvent_(const CmdPacket&); inline bool WaitForNextUIEvent_(CmdPacket*); void HandleUIEvent_(); - OSMessageQueue mQueue; // 0x32c - OSMessage mQueueBuf[0x20]; // 0x34c + OSMessageQueue mQueue; // 0x32C + OSMessage mQueueBuf[0x20]; // 0x34C + ut_message_cmd mCmdPacketQueue; // 0x510 ut_message_cmd mImeDataQueue; // 0x510 - u32* pRaster; // 0x674 - void* pOperaHeapBuf; // 0x678 - WWWHandle* pWwwBrowser; // 0x67c - public: - void* pBrowserWindows[4]; // 0x680 - private: - int mWidth; // 0x690 - int mHeight; // 0x694 - void* pIniData; // 0x698 - u32 mIniLen; // 0x69c - void* pArcContainer; // 0x6a0 - void* pArcDecompressionScratch; // 0x6a4 + + u32* mpRaster; // 0x674 + void* mpOperaHeapBuf; // 0x678 + WWWHandle* mpBrowserHandle; // 0x67C + + void* mpBrowserWindows[4]; // 0x680 + + int mWidth; // 0x690 + int mHeight; // 0x694 + + void* mpIniData; // 0x698 + u32 mIniLen; // 0x69C + + ::www::arcreader::ArcContainer* mpArcContainer; // 0x6a0 + void* mpArcDecmpScratch; // 0x6a4 static OSMutex runSliceMutex_; static int classInitialized_; diff --git a/include/iplwww/www_js.h b/include/iplwww/www_js.h deleted file mode 100644 index 0b053fdb..00000000 --- a/include/iplwww/www_js.h +++ /dev/null @@ -1,175 +0,0 @@ -#ifndef IPL_WWW_JS_H -#define IPL_WWW_JS_H - -#include - -#include - -typedef union { - int jsInt; - double jsFloat; - double jsDouble; - void* jsObj; - const char* jsStr; -} WWWJSPluginValueData; - -typedef struct WWWJSPluginObj { -} WWWJSPluginObj; -typedef struct WWWJSPluginValue { - s32 ty; - u8 unk_0x04[4]; - WWWJSPluginValueData data; -} WWWJSPluginValue; - -typedef int (*JSConstructorFn)(WWWJSPluginObj*, WWWJSPluginObj*, int, WWWJSPluginValue*, WWWJSPluginValue*); -typedef int (*JSGetterSetter)(WWWJSPluginObj*, const char*, WWWJSPluginValue*); -typedef bool (*JSAllowAccess)(const char*, const char*, int); - -typedef int (*JSGlobalGetCallback)(WWWJSPluginObj*, int, int, JSConstructorFn, JSConstructorFn, const char*, int, WWWJSPluginValueData*); -typedef int (*JSConstructCallback)(WWWJSPluginObj*, JSGetterSetter, JSGetterSetter, int, WWWJSPluginValueData*); - -typedef struct JSCallbackSet { - JSGlobalGetCallback globalGet; - JSConstructCallback construct; -} JSCallbackSet; - -typedef struct WWWJSCap { - const char** name; - int unk_0x04; - JSGetterSetter getter; - void* unk_0x0c; - void* unk_0x10; - void* unk_0x14; - void* unk_0x18; - JSAllowAccess allowAccess; -} WWWJSCap; - -typedef struct WWWProtocolData { - const char* filePath; - const char* protocolName; - void* wwwInternal; -} WWWProtocolData; - -typedef struct WWWRect { - int x; - int y; - int w; - int h; -} WWWRect; - -// typedef struct WWWWindow { -// } WWWWindow; - -typedef struct WWWHandleEventData { - u32 data[6]; -} WWWHandleEventData; - -typedef struct WWWIMEData { - u32 imeID; - const char* text; - u32 unk_0x08; - u32 unk_0x0c; - u32 unk_0x10; - u32 unk_0x14; - u32 unk_0x18; - u32 maxLength; -} WWWIMEData; - -enum WWWEvent { - WWW_EVT_CURSOR_CHANGE = 0x00, - WWW_EVT_WINDOW_CLOSE = 0x01, - WWW_EVT_WINDOW_NEW = 0x02, - WWW_EVT_WINDOW_REQUEST = 0x03, - WWW_EVT_AUTHENTICATION = 0x04, - WWW_EVT_URL_CHANGE = 0x05, - WWW_EVT_LOADING_START = 0x06, - WWW_EVT_LOADING_FINISHED = 0x07, - WWW_EVT_LOADING_PROGRESS = 0x08, - WWW_EVT_UPLOADING_START = 0x09, - WWW_EVT_UPLOADING_FINISHED = 0x0a, - - WWW_EVT_DOCUMENT_TITLE = 0x0b, - WWW_EVT_DOCUMENT_SIZE = 0x0c, - WWW_EVT_DOCUMENT_ICON = 0x0d, - - WWW_EVT_LINK_CLICKED = 0x0e, - WWW_EVT_SECURITY_MODE = 0x0f, - WWW_EVT_LINK_NAVIGATED = 0x10, - WWW_EVT_LINK_HOVER = 0x11, - - WWW_EVT_UNK_0x13 = 0x13, - - WWW_EVT_UNKNOWN_PROTOCOL = 0x16, - - WWW_EVT_DOWNLOAD = 0x18, - - WWW_EVT_ERROR = 0x1d, - WWW_EVT_IMECREATE = 0x1e, - WWW_EVT_IMEMOVE = 0x1f, - WWW_EVT_IMECANCEL = 0x20, - WWW_EVT_ASYNC_DIALOG = 0x21, - WWW_EVT_BLOCKING_DIALOG = 0x22, - WWW_EVT_OUT_OF_MEMORY = 0x23, - WWW_EVT_SOFT_OUT_OF_MEMORY = 0x24, - - WWW_EVT_PROTOCOL_LOADING_START = 0x2c, - WWW_EVT_EXISTS_HISTORY = 0x2d, - WWW_EVT_EXTERNAL_ACTION = 0x2e, - - WWW_EVT_SCREEN_INVALID = 0x34, - WWW_EVT_FILTERED_URL = 0x35, -}; - -// case ipl::controller::BTN_NEXT_LEFT: -// return (WWWKeySym)0xe001; -// case ipl::controller::BTN_NEXT_RIGHT: -// return (WWWKeySym)0xe02b; - -// case ipl::controller::BTN_RIGHT: -// return (WWWKeySym)0xe03c; -// case ipl::controller::BTN_LEFT: -// return (WWWKeySym)0xe03d; -// case ipl::controller::BTN_UP: -// return (WWWKeySym)0xe03e; -// case ipl::controller::BTN_DOWN: -// return (WWWKeySym)0xe03f; -// case ipl::controller::REVO_BTN_1: -// return (WWWKeySym)0xe044; -// case ipl::controller::REVO_BTN_2: -// return (WWWKeySym)0xe045; -enum WWWKeySym { - KEY_SYM_BLANK = 0, - KEY_SYM_SOMETHING = 0xe001, - - KEY_SYM_NEXT_RIGHT = 0xe02b, - KEY_SYM_NEXT_LEFT = 0xe02c, - - KEY_SYM_RIGHT = 0xe03c, - KEY_SYM_LEFT = 0xe03d, - KEY_SYM_UP = 0xe03e, - KEY_SYM_DOWN = 0xe03f, - - KEY_SYM_BTN1 = 0xe044, - KEY_SYM_BTN2 = 0xe045, -}; - -enum WWWKeyBtnCmd { - KEY_CMD_TRIGGER = 0, - KEY_CMD_RELEASE = 1, -}; -enum WWWMouseCmd { - MOUSE_CMD_MOVE = 0, - MOUSE_CMD_TRIGGER = 1, - MOUSE_CMD_RELEASE = 2, -}; -enum WWWMouseAttrib { - MOUSE_ATTRIB_BUTTON = 1, - MOUSE_ATTRIB_POSITION = 4, -}; - -typedef struct WWWHandle { -} WWWHandle; -typedef struct WWWHandlewindow { -} WWWHandlewindow; - -#endif // IPL_WWW_JS_H diff --git a/include/iplwww/www_message.h b/include/iplwww/www_message.h index c2bed341..093cbb01 100644 --- a/include/iplwww/www_message.h +++ b/include/iplwww/www_message.h @@ -9,6 +9,11 @@ namespace ext_ead { namespace www { + // fakematch? + inline void ut_message_cmd_printerr_() { + OSReport("ERROR?\n"); + } + class ut_message_base { public: virtual ~ut_message_base() {} @@ -69,7 +74,7 @@ namespace ext_ead { if (ReceiveMessage(&msg, 0)) { entry = (BufferEntry*)msg; if (entry->taken != -1) { - OSReport("ERROR?\n"); + ut_message_cmd_printerr_(); } *data = entry->value; memset(entry, 0, sizeof(BufferEntry)); diff --git a/include/iplwww/www_print.h b/include/iplwww/www_print.h index a8a85d9f..a000f0c5 100644 --- a/include/iplwww/www_print.h +++ b/include/iplwww/www_print.h @@ -11,6 +11,15 @@ namespace ext_ead { void IPLWWWReport(int type, const char* format, ...); void IPLWWWVReport(int type, const char* format, va_list args); + enum { + WWW_TICK_TIMER = 0, + WWW_WARNING, + WWW_INFO, + WWW_DEBUG, + WWW_EVENT, + WWW_REPORT, // ? + }; + class TickTimer { public: TickTimer() : start(OSGetTick()) {} @@ -21,10 +30,10 @@ namespace ext_ead { va_list vlist; va_start(vlist, fmt); - IPLWWWVReport(0, fmt, vlist); + IPLWWWVReport(WWW_TICK_TIMER, fmt, vlist); va_end(vlist); - IPLWWWReport(5, " : %d[ms]\n", OSTicksToMilliseconds(end - start)); + IPLWWWReport(WWW_REPORT, " : %d[ms]\n", OSTicksToMilliseconds(end - start)); } private: @@ -38,6 +47,7 @@ namespace ext_ead { // }; extern const char* Message[6]; + // TODO: sort out this messy match hack #define IPL_WWW_REPORT_REDEFINE_MESSAGE(RESPECT_STRIP) \ char MSG_TICK_TIMER_TAG[12] = "[TickTimer]"; \ char MSG_WARNING_TAG[10] = "[Warning]"; \ diff --git a/include/iplwww/www_surface.h b/include/iplwww/www_surface.h index 003f1fa1..e9d6f4c6 100644 --- a/include/iplwww/www_surface.h +++ b/include/iplwww/www_surface.h @@ -23,10 +23,10 @@ namespace ext_ead { inline void init(void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize); inline void destroy(); - extern MEMiHeapHead* hMem1; - extern MEMiHeapHead* hMem2; + extern MEMHeapHandle hMem1; + extern MEMHeapHandle hMem2; extern void* wwwalloc_; - extern void (*wwwfree_)(void*); + extern void (*wwwfree_)(void* buf); extern int (*wwwavail_)(); extern u32 hFreeSize1; @@ -52,29 +52,36 @@ namespace ext_ead { bool IsThreadStopped(); void DisposeInstance_(); - static SurfaceManager* Instance_; + BrowserThread* GetBrowserThread() { return mpBrowserThread; } + + int GetWidth() { return mWidth; } + int GetHeight() { return mHeight; } + + char* GetArcPath() { return mpArcPath; } + + static SurfaceManager* GetInstance() { return Instance_; } private: SurfaceManager(); virtual ~SurfaceManager(); - public: + static SurfaceManager* Instance_; + u32 mWidth; // 0x04 u32 mHeight; // 0x08 - private: - u32 unk_0x0c; // 0x0c - OSMutex mMutex; // 0x10 - public: - BrowserThread* pBrowserThread; // 0x28 - private: - void* pOperaThreadStack; // 0x2c - void* pBss; // 0x30 - void* pLibBuf; // 0x34 - public: - char* pArcPath; // 0x38 + + u32 unk_0x0C; // 0x0C + + OSMutex mMutex; // 0x10 + BrowserThread* mpBrowserThread; // 0x28 + + void* mpOperaThreadStack; // 0x2C + void* mpRSOBss; // 0x30 + void* mpLibBuffer; // 0x34 + char* mpArcPath; // 0x38 }; - static RSOExportFuncTable rsoSymbolList[] = { + static RSOExportFuncTable RsoExports[] = { {"WWWSurfaceInit", (u32*)&WWWSurfaceInit}, {"WWWSurfaceNewScreen", (u32*)&WWWSurfaceNewScreen}, {"WWWSurfaceDeleteScreen", (u32*)&WWWSurfaceDeleteScreen}, diff --git a/include/iplwww/www_thread.h b/include/iplwww/www_thread.h index 94492c71..8724a560 100644 --- a/include/iplwww/www_thread.h +++ b/include/iplwww/www_thread.h @@ -1,37 +1,37 @@ #ifndef IPL_WWW_THREAD #define IPL_WWW_THREAD -#include #include +#include namespace ext_ead { namespace www { class ut_thread { - public: - ut_thread(); + public: + ut_thread(); - virtual ~ut_thread(); // 0x08 - virtual void* Run() = 0; // 0x0C - virtual void Create(void* pStack, u32 stackSize, int priority, bool bStartThread = true); // 0x10 - virtual void Resume(); // 0x14 - virtual void Suspend(); // 0x18 - virtual BOOL WaitForThreadExit(); // 0x1C - virtual bool IsThreadTerminated(); // 0x20 - virtual bool IsThreadSuspended(); // 0x24 - - private: - static void* ThreadMain_(void* param); + virtual ~ut_thread(); // 0x08 + virtual void* Run() = 0; // 0x0C + virtual void Create(void* pStack, u32 stackSize, int priority, bool bStartThread = true); // 0x10 + virtual void Resume(); // 0x14 + virtual void Suspend(); // 0x18 + virtual BOOL WaitForThreadExit(); // 0x1C + virtual bool IsThreadTerminated(); // 0x20 + virtual bool IsThreadSuspended(); // 0x24 - protected: - OSThread mThread; // 0x08 - - private: - void* mpStack; // 0x320 - u32 mStackSize; // 0x324 - - int mPriority; // 0x328 + private: + static void* ThreadMain_(void* param); + + protected: + OSThread mThread; // 0x08 + + private: + void* mpStack; // 0x320 + u32 mStackSize; // 0x324 + + int mPriority; // 0x328 }; - } -} + } // namespace www +} // namespace ext_ead -#endif // IPL_WWW_THREAD +#endif // IPL_WWW_THREAD diff --git a/include/iplwww/www_trasition.h b/include/iplwww/www_trasition.h index 71c4dc21..26c8a9a1 100644 --- a/include/iplwww/www_trasition.h +++ b/include/iplwww/www_trasition.h @@ -5,26 +5,17 @@ #include -#include "iplwww/www_js.h" +#include "iplwww/www_browser.h" #include "iplwww/www_wiisetting.h" -#include "iplwww/www_browser.h" +#include namespace www { namespace trasition { - // typedef struct ScrollState { - // u8 unk_0x00[0x28]; - // ext_ead::www::BrowserThread* unk_0x28; - // u32 unk_0x2c; - // u32 unk_0x30; - // u32 unk_0x34; - // u32 unk_0x38; - // } ScrollState; - enum ScrollState { SCROLL_RESET = 0, - SCROLL_LEFT = 1, - SCROLL_RIGHT = 2, + SCROLL_LEFT, + SCROLL_RIGHT, }; static WWWJSCap cap; diff --git a/include/iplwww/www_wiisetting.h b/include/iplwww/www_wiisetting.h index b4a99cf7..73e3b4f6 100644 --- a/include/iplwww/www_wiisetting.h +++ b/include/iplwww/www_wiisetting.h @@ -7,10 +7,10 @@ #include #include -#include "iplwww/www_js.h" - #include "iplwww/www_print.h" +#include + extern int gDpdWaitFrm; extern BOOL gEnableDpd; @@ -42,80 +42,82 @@ namespace www { FORM_ID_DUMMY_SECURITY_KEY, FORM_ID_VERSION, FORM_ID_DIRECT_URL, + FORM_ID_MAX, } WiiSettingFormID; + typedef enum WriteBackID { - WB_ID_RESET = 0x00, - WB_ID_SOUND_ID = 0x01, // SC Sound Mode - WB_ID_NWC24 = 0x02, // SC WCFlags enable bit - WB_ID_INTERNET = 0x3, // NCD Use Profile ID - WB_ID_STANDBY = 0x04, // Idle Mode Standby - WB_ID_LED = 0x05, // Idle Mode LED - WB_ID_DIS_WIDE = 0x06, // SC Aspect Ratio - WB_ID_DIS_POS = 0x07, // Display Position (Horizontal Offset) - WB_ID_PROGRESSIVE = 0x08, // Progressive Scan - WB_ID_SCREENSAVER = 0x09, // Screensaver Enable - WB_ID_SENSOR_BAR = 0x0a, // Sensor Bar on top Flag - WB_ID_LIGHT = 0x0b, // BlueTooth Pad Sensibility (I think this is how bright the wiimote player indicator light is???) - WB_ID_YEAR = 0x0c, // Year - WB_ID_MONTH = 0x0d, // Month - WB_ID_DATE = 0x0e, // Day of month - WB_ID_HOUR = 0x0f, // Hour (0 to 23 inclusive) - WB_ID_MINUTE = 0x10, // Minute - WB_ID_FORM_ID = 0x11, // TODO: What is this? - WB_ID_PAGE_ID = 0x12, // TODO: What is this? - WB_ID_MESSAGE = 0x13, // TODO: What is this? - WB_ID_TYPE = 0x14, // TODO: What is this? - WB_ID_CONNECT_TYPE = 0x15, // NCD "this connection" flag - WB_ID_CONNECT_TYPE_1 = 0x16, // NCD Flag 0 (This enum is 1-indexed for some reason) - WB_ID_CONNECT_TYPE_2 = 0x17, // NCD Flag 1 (This enum is 1-indexed for some reason) - WB_ID_CONNECT_TYPE_3 = 0x18, // NCD Flag 2 (This enum is 1-indexed for some reason) - WB_ID_PROFILE_ID = 0x19, // NCD Profile ID - WB_ID_SELECT_WIRE = 0x1a, // TODO: What is this? - WB_ID_WIFI_TYPE = 0x1b, // TODO: What is this? - WB_ID_FUNC_ID = 0x1c, // TODO: What is this? - WB_ID_FUNC_RESULT = 0x1d, // TODO: What is this? - WB_ID_SELECT_SEC_KEY = 0x1e, // NCD Privacy Mode - WB_ID_AUTO_IP = 0x1f, // NCD DHCP Flag - WB_ID_AUTO_DNS = 0x20, // NCD DNS Flag - WB_ID_IP = 0x21, // TODO: What is this? - WB_ID_BACKUP_NCD = 0x22, // Backup NCD Data - WB_ID_RESET_NCD = 0x23, // Reset NCD Data - WB_ID_AUTO_PROXY = 0x24, // NCD Proxy Flag - WB_ID_AUTO_BASIC = 0x25, // NCD Basic - WB_ID_BACK_SEC_KEY = 0x26, // TODO: What is this? - WB_ID_CHANGE_CONNECT_TYPE = 0x27, // TODO: What is this? - WB_ID_CHANGE_ENABLE = 0x28, // NCD Change Enable - WB_ID_PARE_FLAG = 0x29, // Parental Flags - WB_ID_SEC_Q = 0x2a, // Parental Security Question - WB_ID_SEC_Q_SAVE = 0x2b, // Parental Security Question Save???? - WB_ID_OGN = 0x2c, // Parental OGN - WB_ID_RATE = 0x2d, // Parental Rating - WB_ID_RATE_SAVE = 0x2e, // Parental Rating Save???? - WB_ID_PAL = 0x2f, // EU RGB60 Mode - WB_ID_LANGUAGE = 0x30, // Language - WB_ID_LANGUAGE_SAVE = 0x31, // Language save???? - WB_ID_DTV = 0x32, // DTV Status - WB_ID_USE_ID = 0x33, // NCD useProfileID again for some reason - WB_ID_CONNECT_TEST = 0x34, // NCD Connect Test Flag - WB_ID_ERROR = 0x35, // TODO: What is this? - WB_ID_SET_STRING = 0x36, // TODO: What is this? - WB_ID_SE = 0x37, // TODO: What is this? - WB_ID_EXCSE = 0x38, // TODO: What is this? - WB_ID_FINISH = 0x39, // TODO: What is this? - WB_ID_FLUSH = 0x3a, // TODO: What is this? - WB_ID_INIT_FLAG = 0x3b, // Initial Setup Complete flag - WB_ID_COUNTRY = 0x3c, // Parental Country - WB_ID_COUNTRY_SAVE = 0x3d, // Parental Country Save???? - WB_ID_MAC_AVAILABLE = 0x3e, // LAN MAC Addresss Available - WB_ID_UPDATE_TYPE = 0x3f, // SC Update Type - WB_ID_RESTRICTIONS = 0x40, // Parental Restrictions - WB_ID_ASSERT = 0x41, // TODO: What is this? - WB_ID_SUB_PAGE_ID = 0x42, // TODO: What is this? - WB_ID_PRODUCT_AREA = 0x43, // System Region - WB_ID_EULA = 0x44, // EULA Accepted - WB_ID_TVRC = 0x45, // TODO: What is this? - WB_ID_TVRC_MAKER = 0x46, // TODO: What is this? - WB_ID_TVRC_TYPE = 0x47, // TODO: What is this? + WB_ID_RESET = 0, + WB_ID_SOUND_ID, // Sound Mode + WB_ID_NWC24, // WCFlags enable bit + WB_ID_INTERNET, // NCD Use Profile ID + WB_ID_STANDBY, // Standby mode + WB_ID_DISC_LED, // Slot illumination + WB_ID_DIS_WIDE, // Aspect Ratio + WB_ID_DIS_POS, // Display Position (Horizontal Offset) + WB_ID_PROGRESSIVE, // Progressive Scan + WB_ID_SCREENSAVER, // Screensaver Enable + WB_ID_SENSOR_BAR, // Sensor Bar on top Flag + WB_ID_LIGHT, // BlueTooth Pad Sensibility (I think this is how bright the wiimote player indicator light is???) + WB_ID_YEAR, // Year + WB_ID_MONTH, // Month + WB_ID_DATE, // Day of month + WB_ID_HOUR, // Hour (0 to 23 inclusive) + WB_ID_MINUTE, // Minute + WB_ID_FORM_ID, // TODO: What is this? + WB_ID_PAGE_ID, // TODO: What is this? + WB_ID_MESSAGE, // TODO: What is this? + WB_ID_TYPE, // TODO: What is this? + WB_ID_CONNECT_TYPE, // NCD "this connection" flag + WB_ID_CONNECT_TYPE_1, // NCD Flag 0 (This enum is 1-indexed for some reason) + WB_ID_CONNECT_TYPE_2, // NCD Flag 1 (This enum is 1-indexed for some reason) + WB_ID_CONNECT_TYPE_3, // NCD Flag 2 (This enum is 1-indexed for some reason) + WB_ID_PROFILE_ID, // NCD Profile ID + WB_ID_SELECT_WIRE, // NCD Wired or Wireless? + WB_ID_WIFI_TYPE, // NCD Wifi Type + WB_ID_FUNC_ID, // TODO: What is this? + WB_ID_FUNC_RESULT, // TODO: What is this? + WB_ID_SELECT_SEC_KEY, // NCD Privacy Mode + WB_ID_AUTO_IP, // NCD DHCP Flag + WB_ID_AUTO_DNS, // NCD DNS Flag + WB_ID_IP, // NCD IP Address + WB_ID_BACKUP_NCD, // Backup NCD Data + WB_ID_RESET_NCD, // Reset NCD Data + WB_ID_AUTO_PROXY, // NCD Proxy Flag + WB_ID_AUTO_BASIC, // NCD Basic + WB_ID_BACK_SEC_KEY, // NCD Backup Security Key + WB_ID_CHANGE_CONNECT_TYPE, // NCD Connect Type + WB_ID_CHANGE_ENABLE, // NCD Change Enable + WB_ID_PARE_FLAG, // Parental Flags + WB_ID_SEC_Q, // Parental Security Question + WB_ID_SEC_Q_SAVE, // Parental Security Question Save? + WB_ID_OGN, // Parental OGN + WB_ID_RATE, // Parental Rating + WB_ID_RATE_SAVE, // Parental Rating Save? + WB_ID_PAL, // EU RGB60 Mode + WB_ID_LANGUAGE, // Language + WB_ID_LANGUAGE_SAVE, // Language save? + WB_ID_DTV, // DTV Status + WB_ID_USE_ID, // NCD useProfileID again for some reason + WB_ID_CONNECT_TEST, // NCD Connect Test Flag + WB_ID_ERROR, // TODO: What is this? + WB_ID_SET_STRING, // TODO: What is this? + WB_ID_SE, // Sound effect? + WB_ID_EXCSE, // Another Sound effect related thing? + WB_ID_FINISH, // TODO: What is this? + WB_ID_FLUSH, // SC Flush? + WB_ID_INIT_FLAG, // Initial Setup Complete flag + WB_ID_COUNTRY, // Parental Country + WB_ID_COUNTRY_SAVE, // Parental Country Save? + WB_ID_MAC_AVAILABLE, // LAN MAC Addresss Available + WB_ID_UPDATE_TYPE, // Update Type? + WB_ID_RESTRICTIONS, // Parental Restrictions + WB_ID_ASSERT, // Error assert? + WB_ID_SUB_PAGE_ID, // TODO: What is this? + WB_ID_PRODUCT_AREA, // System Region + WB_ID_EULA, // EULA Accepted + WB_ID_TVRC, // TV Remote Control Setup + WB_ID_TVRC_MAKER, // TV Remote Control Input TV manufacturer + WB_ID_TVRC_TYPE, // TV Remote Control Input TV type } WriteBackID; typedef struct WiiDataDate { @@ -123,13 +125,13 @@ namespace www { u8 month; u8 mday; } WiiDataDate; + typedef struct WiiDataTime { u8 hour; u8 min; } WiiDataTime; typedef struct WiiData { - public: u8 data[0x48]; } WiiData; @@ -174,15 +176,13 @@ namespace www { static WiiFlag wiiFlag; static u8 writeBackID; - static u8 savedata_smth; + static u8 saveData; static u8 funcResult; static u8 setupFlag; static OSMessageQueue* mQueue; static SetStringBuf* pString; static JSCallbackSet* opera_callbacks; - // void www_wiisetting_8136F9D0(s32 chan, s32 result); - // void www_wiisetting_8136F9F4(s32 chan, s32 result); bool allow_access(const char*, const char*, int); void AddJsPlugin(); int globalGetter_(WWWJSPluginObj*, const char*, WWWJSPluginValue*); diff --git a/include/iplwww/www_window.h b/include/iplwww/www_window.h index 539dd908..63c79b33 100644 --- a/include/iplwww/www_window.h +++ b/include/iplwww/www_window.h @@ -23,8 +23,10 @@ namespace ext_ead { void SendNotifyEvent(WWWEvent event, WWWHandleEventData* dataHandle); void ExecuteEvent(); void UpdateTexture(); - void* GetTextureBuffer(int, bool, WWWRect**); - void SetWindowSize(int, int); + void* GetTextureBuffer(int a, bool b, WWWRect** rectPtrOut); + void SetWindowSize(int w, int h); + + WWWHandlewindow* GetHandleWindow() { return mpWwwWindow; }; private: void ExecWwwEvent_(int eventCode, WWWHandleEventData* dataHandle); @@ -34,28 +36,30 @@ namespace ext_ead { void ReportEventId_(int eventCode, void*); struct WindowCmd { - public: - // u32 unk_0x00; - u32 mEventCode; - WWWHandleEventData* pHandleEventData; + u32 eventCode; // 0x00 + WWWHandleEventData* pHandleEventData; // 0x04 }; - u16 mWidth; // 0x004 - u16 mHeight; // 0x006 - BrowserThread* pThread; // 0x008 - void* mTexBufArr[2][3]; // 0x00C - WWWRect mTexDisplayRects[2][3]; // 0x024 - public: - WWWHandlewindow* pWwwWindow; // 0x084 + + u16 mWidth; // 0x04 + u16 mHeight; // 0x06 + + BrowserThread* mpBrowserThread; // 0x08 + + void* mTexBufArr[2][3]; // 0x0C + WWWRect mTexDisplayRects[2][3]; // 0x24 + + WWWHandlewindow* mpWwwWindow; // 0x84 + private: - ut_message_cmd mMessage; // 0x088 - u32 mRenderingMode; // 0x2ac + ut_message_cmd mMessage; // 0x88 + u32 mRenderingMode; // 0x2AC + public: - int unk_0x2b0; // 0x2b0 - u32 unk_0x2b4[2]; // 0x2b4 - u32 unk_0x2bc; // 0x2bc - u32 unk_0x2c0; // 0x2c0 - u8 unk_0x2c4[6]; // 0x2c4 - // u8[] + int unk_0x2B0; // 0x2B0 + u32 unk_0x2B4[2]; // 0x2B4 + u32 unk_0x2BC; // 0x2BC + u32 unk_0x2C0; // 0x2C0 + u8 unk_0x2C4[6]; // 0x2C4 }; } // namespace www } // namespace ext_ead diff --git a/include/scene/channelEdit/iplAnmController.h b/include/scene/channelEdit/iplAnmController.h index 39cd451c..0749198a 100644 --- a/include/scene/channelEdit/iplAnmController.h +++ b/include/scene/channelEdit/iplAnmController.h @@ -8,21 +8,23 @@ namespace ipl { namespace scene { + #define WAIT_FOR_ANIM_STATE(FN_NAME, ANIM, THEN) \ void FN_NAME() { \ - if (is_animation(ANIM)) \ + if (is_animation(ANIM)) { \ return; \ + } \ THEN; \ } - struct Anm { + class Anm { public: - inline Anm(ipl::layout::GroupAnimator* _animator) : animator(_animator) {} - ipl::layout::GroupAnimator* animator; + inline Anm(layout::GroupAnimator* _animator) : animator(_animator) {} + layout::GroupAnimator* animator; nw4r::ut::Link mLink; }; - struct AnmPane { + typedef class AnmPane { public: enum AnimCommand { ANIM_CMD_NONE = 0, @@ -31,8 +33,8 @@ namespace ipl { ANIM_CMD_CANCEL = 3, }; inline AnmPane(const char* name, Anm* anmIn, Anm* anmOut) - : pName(name), mCurrState(ANIM_STATE_IDLE), mPrevState(ANIM_STATE_IDLE), mHoverCount(0), mCurrCmd(ANIM_CMD_NONE), pAnmCurr(NULL), - pAnmIn(anmIn), pAnmOut(anmOut) {} + : pName(name), mCurrState(ANIM_STATE_IDLE), mPrevState(ANIM_STATE_IDLE), mHoverCount(0), mCurrCmd(ANIM_CMD_NONE), mpAnmCurr(NULL), + mpAnmIn(anmIn), mpAnmOut(anmOut) {} void calc(); void on_cmd_recv(AnimCommand); @@ -50,21 +52,27 @@ namespace ipl { ANIM_STATE_POINT = 1, ANIM_STATE_LEFT = 2, }; + nw4r::ut::Link mLink; // 0x00 - const char* pName; // 0x08 - AnimState mCurrState; // 0x0c + + const char* pName; // 0x08 + + AnimState mCurrState; // 0x0C AnimState mPrevState; // 0x10 - int mHoverCount; // 0x14 + + int mHoverCount; // 0x14 + AnimCommand mCurrCmd; // 0x18 - Anm* pAnmCurr; // 0x1c - Anm* pAnmIn; // 0x20 - Anm* pAnmOut; // 0x24 - }; + + Anm* mpAnmCurr; // 0x1C + Anm* mpAnmIn; // 0x20 + Anm* mpAnmOut; // 0x24 + } AnmPane; class AnmController { public: - inline AnmController(EGG::Heap* heap) : pHeap(heap) { - pLytObj = NULL; + inline AnmController(EGG::Heap* heap) : mpHeap(heap) { + mpLayout = NULL; nw4r::ut::List_Init(&mAnmList, 4); nw4r::ut::List_Init(&mPaneList, 0); } @@ -73,8 +81,9 @@ namespace ipl { while (currAnm != NULL) { nw4r::ut::List_Remove(&mAnmList, currAnm); - if (currAnm != NULL) + if (currAnm != NULL) { delete currAnm; + } currAnm = (Anm*)nw4r::ut::List_GetFirst(&mAnmList); } @@ -112,11 +121,13 @@ namespace ipl { const nw4r::math::VEC2& get_scale(const char* pane); protected: - layout::Object* pLytObj; // 0x04 - ipl::gui::PaneManager* pPaneManager; // 0x08 - nw4r::ut::List mAnmList; // 0x0c - nw4r::ut::List mPaneList; // 0x18 - EGG::Heap* pHeap; // 0x24 + layout::Object* mpLayout; // 0x04 + gui::PaneManager* mpGui; // 0x08 + + nw4r::ut::List mAnmList; // 0x0c + nw4r::ut::List mPaneList; // 0x18 + + EGG::Heap* mpHeap; // 0x24 }; } // namespace scene } // namespace ipl diff --git a/include/scene/channelEdit/iplChanAppBase.h b/include/scene/channelEdit/iplChanAppBase.h index 9f075393..ad230cb1 100644 --- a/include/scene/channelEdit/iplChanAppBase.h +++ b/include/scene/channelEdit/iplChanAppBase.h @@ -14,7 +14,7 @@ namespace ipl { class ChanAppBase : public AnmController, private ::gui::EventHandler { public: - ChanAppBase(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName); + ChanAppBase(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName); virtual ~ChanAppBase(); void calc(); @@ -38,10 +38,38 @@ namespace ipl { virtual void onEvent(u32 compId, u32 event, void* data) override; - inline layout::Object* getLytObject() { return pLytObj; } - inline bool isIdle() { return mState == CHANAPP_IDLE; } + inline layout::Object* getLytObject() { return mpLayout; } + + inline bool isIdle() { return mState == STATE_IDLE; } private: + enum { + ANIM_DATA_IN = 0, + ANIM_DATA_OUT, + ANIM_SELECT_IN, + ANIM_SELECT_WII_IN, + ANIM_SELECT_WII_OUT, + ANIM_SELECT_WII_FLASH, + ANIM_SELECT_SD_IN, + ANIM_SELECT_SD_OUT, + ANIM_SELECT_SD_FLASH, + ANIM_ARROWS_MOVE_L, + ANIM_ARROWS_MOVE_R, + ANIM_ARROW_R_SELECT, + ANIM_ARROW_L_SELECT, + ANIM_ARROW_R_FOCUS_ON, + ANIM_ARROW_L_FOCUS_ON, + ANIM_ARROW_R_FOCUS_OFF, + ANIM_ARROW_L_FOCUS_OFF, + ANIM_ARROW_R_LOOP, + ANIM_ARROW_R_END, + ANIM_ARROW_L_END, + ANIM_ARROW_R_LOST, + ANIM_ARROW_L_LOST, + ANIM_ERROR_TEXT_IN, + ANIM_ERROR_TEXT_OUT, + }; + void on_fadein1st(); void on_fadein2nd(); @@ -56,21 +84,22 @@ namespace ipl { void on_text_fadein(); void on_text_fadeout(); - enum State { - CHANAPP_IDLE = 0, // 0x0 - CHANAPP_FADEIN1ST, // 0x1 - CHANAPP_FADEIN2ND, // 0x2 - CHANAPP_FADEOUT, // 0x3 - CHANAPP_CHANGE_SD_TO_WII, // 0x4 - CHANAPP_CHANGE_WII_TO_SD, // 0x5 - - CHANAPP_SCROLL_R = 8, // 0x8 - CHANAPP_SCROLL_L, // 0x9 - CHANAPP_TEXT_FADEIN, // 0xa - CHANAPP_TEXT_FADEOUT, // 0xb + enum { + STATE_IDLE = 0, + STATE_FADE_IN_1ST, + STATE_FADE_IN_2ND, + STATE_FADE_OUT, + STATE_CHANGE_SD_TO_WII, + STATE_CHANGE_WII_TO_SD, + STATE_6, + STATE_7, + STATE_SCROLL_R = 8, + STATE_SCROLL_L, + STATE_TEXT_FADEIN, + STATE_TEXT_FADEOUT, }; - State mState; // 0x34 + int mState; // 0x34 }; } // namespace scene } // namespace ipl diff --git a/include/scene/channelEdit/iplChanAppBox.h b/include/scene/channelEdit/iplChanAppBox.h index fb5eeffc..5f0dc48e 100644 --- a/include/scene/channelEdit/iplChanAppBox.h +++ b/include/scene/channelEdit/iplChanAppBox.h @@ -12,7 +12,7 @@ namespace ipl { class ChanAppBox : public AnmController, public ::gui::EventHandler { public: - ChanAppBox(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName); + ChanAppBox(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName); virtual ~ChanAppBox(); void calc(); @@ -27,40 +27,55 @@ namespace ipl { ChannelEdit* get_channel_edit(); - Thumbnail* getThumbnail() const { return pThumbnail; } - void setThumbnail(Thumbnail* newThumbnail) { pThumbnail = newThumbnail; } + Thumbnail* getThumbnail() const { return mpThumbnail; } + void setThumbnail(Thumbnail* newThumbnail) { mpThumbnail = newThumbnail; } const nw4r::math::VEC3& getTranslate() { return get_translate("N_All"); } void setTranslate(const nw4r::math::VEC3& translate) { set_translate("N_All", translate); } - TextBalloon* getTextBalloon() { return pTextBalloon; } - void setTextBalloon(TextBalloon* balloon) { pTextBalloon = balloon; } + void terminateBalloon() { + mpBalloon->terminate(); + mbInitBalloon = false; + } - bool getTextBalloonInitialized() { return mTextBalloonInitialized; } - void setTextBalloonInitialized(bool val) { mTextBalloonInitialized = val; } + TextBalloon* getTextBalloon() { return mpBalloon; } + void setTextBalloon(TextBalloon* balloon) { mpBalloon = balloon; } - inline bool isIdle() { return mState == BOX_STATE_IDLE; } + bool hasBalloonInitialized() { return mbInitBalloon; } + + inline bool isIdle() { return mState == STATE_IDLE; } static char s_all_pane_name[6]; private: + enum { + ANIM_DATA_IN = 0, + ANIM_DATA_OUT, + ANIM_DATA_FOCUS_IN, + ANIM_DATA_FOCUS_OUT, + }; + void on_fadein(); void on_fadeout(); - enum State { - BOX_STATE_HIDDEN = 0, // 0x0 - BOX_STATE_IDLE, // 0x1 - BOX_STATE_FADEIN, // 0x2 - BOX_STATE_FADEOUT, // 0x3 + enum { + STATE_HIDDEN = 0, + STATE_IDLE, + STATE_FADE_IN, + STATE_FADE_OUT, }; public: nw4r::ut::Link mLink; // 0x34 + private: - State mState; // 0x3c - Thumbnail* pThumbnail; // 0x40 - TextBalloon* pTextBalloon; // 0x44 - bool mTextBalloonInitialized; // 0x48 + int mState; // 0x3C + Thumbnail* mpThumbnail; // 0x40 + TextBalloon* mpBalloon; // 0x44 + bool mbInitBalloon; // 0x48 + + friend class ChannelEdit; + friend class Memory; }; } // namespace scene } // namespace ipl diff --git a/include/scene/channelEdit/iplChanAppEdit.h b/include/scene/channelEdit/iplChanAppEdit.h index 58a3cea9..da00007c 100644 --- a/include/scene/channelEdit/iplChanAppEdit.h +++ b/include/scene/channelEdit/iplChanAppEdit.h @@ -14,7 +14,7 @@ namespace ipl { class ChanAppEdit : public AnmController, public ::gui::EventHandler { public: - ChanAppEdit(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName); + ChanAppEdit(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName); virtual ~ChanAppEdit(); void calc(); @@ -43,10 +43,29 @@ namespace ipl { void clearAllThumbnails(); - inline bool isIdle() { return mState == EDIT_STATE_IDLE; } + inline bool isIdle() { return mState == STATE_IDLE; } private: - void change_button_text(u32); + enum { + ANIM_MASK_IN = 0, + ANIM_MASK_OUT, + ANIM_COPY_IN, + ANIM_COPY_OUT, + ANIM_COPY_FLASH, + ANIM_DEL_IN, + ANIM_DEL_OUT, + ANIM_DEL_FLASH, + ANIM_SELECT_OUT, + ANIM_TEXT_FADEIN, + ANIM_TEXT_FADEOUT, + ANIM_WAIT, + ANIM_COVER_IN, + ANIM_MOVE_IN, + ANIM_MOVE_OUT, + ANIM_MOVE_FLASH, + }; + + void change_button_text(u32 msgId); void on_fadein(); void on_fadeout(); @@ -61,30 +80,31 @@ namespace ipl { void on_trig_del(); void on_clear(); - enum State { - EDIT_STATE_IDLE = 0, // 0x0 - EDIT_STATE_FADEIN, // 0x1 - EDIT_STATE_FADEOUT, // 0x2 - EDIT_STATE_HIDE_BTN0_DIALOG, // 0x3 - EDIT_STATE_SHOW_BTN2_DIALOG1ST, // 0x4 - EDIT_STATE_SHOW_BTN2_DIALOG2ND, // 0x5 - EDIT_STATE_SELECT_FADEIN, // 0x6 - EDIT_STATE_SELECT_FADEOUT1ST, // 0x7 - EDIT_STATE_SELECT_FADEOUT2ND, // 0x8 - EDIT_STATE_TEXT_FADEIN, // 0x9 - EDIT_STATE_TEXT_FADEOUT, // 0xa - EDIT_STATE_TRIG_DEL, // 0xb - EDIT_STATE_CLEAR, // 0xc + enum { + STATE_IDLE = 0, + STATE_FADEIN, + STATE_FADEOUT, + STATE_HIDE_BTN0_DIALOG, + STATE_SHOW_BTN2_DIALOG1ST, + STATE_SHOW_BTN2_DIALOG2ND, + STATE_SELECT_FADEIN, + STATE_SELECT_FADEOUT1ST, + STATE_SELECT_FADEOUT2ND, + STATE_TEXT_FADEIN, + STATE_TEXT_FADEOUT, + STATE_TRIG_DEL, + STATE_CLEAR, }; public: nw4r::ut::Link mLink; // 0x34 + private: - State mState; // 0x3c + int mState; // 0x3C math::LinearIntp mLinearInterp; // 0x40 - ChanAppBox* pChanAppBox; // 0x78 + ChanAppBox* mpChanAppBox; // 0x78 s32 mMsgId; // 0x7c - Thumbnail* pThumbnail; // 0x80 + Thumbnail* mpThumbnail; // 0x80 }; } // namespace scene } // namespace ipl diff --git a/include/scene/channelEdit/iplChannelEdit.h b/include/scene/channelEdit/iplChannelEdit.h index 5b3e6f63..eee56ef0 100644 --- a/include/scene/channelEdit/iplChannelEdit.h +++ b/include/scene/channelEdit/iplChannelEdit.h @@ -14,39 +14,39 @@ namespace ipl { namespace scene { SCENE_CLASS(ChannelEdit) { public: - enum State { - CHANEDIT_STATE_ON_NORMAL = 0, // 0x00 - CHANEDIT_STATE_ON_FADEIN1ST, // 0x01 - CHANEDIT_STATE_ON_FADEIN2ND, // 0x02 - CHANEDIT_STATE_ON_FADEOUT1ST, // 0x03 - CHANEDIT_STATE_ON_FADEOUT2ND, // 0x04 - CHANEDIT_STATE_ON_SCROLL_R, // 0x05 - CHANEDIT_STATE_ON_SCROLL_L, // 0x06 - CHANEDIT_STATE_ON_CHANGE_TAG1ST, // 0x07 - CHANEDIT_STATE_ON_CHANGE_TAG2ND, // 0x08 - CHANEDIT_STATE_ON_TRIG_COPY, // 0x09 - CHANEDIT_STATE_ON_EDIT, // 0x0a - CHANEDIT_STATE_ON_EDIT_FADEIN, // 0x0b - CHANEDIT_STATE_ON_EDIT_FADEOUT1ST, // 0x0c - CHANEDIT_STATE_ON_EDIT_FADEOUT2ND, // 0x0d - CHANEDIT_STATE_ON_VERIFY1ST, // 0x0e - CHANEDIT_STATE_ON_VERIFY2ND, // 0x0f - CHANEDIT_STATE_ON_VERIFY_COPY, // 0x10 - CHANEDIT_STATE_ON_VERIFY_DEL, // 0x11 - CHANEDIT_STATE_ON_VERIFY_FORMAT, // 0x12 - CHANEDIT_STATE_ON_END_FORMAT, // 0x13 - CHANEDIT_STATE_ON_END_DEL, // 0x14 - CHANEDIT_STATE_ON_SD_MOUNT, // 0x15 - CHANEDIT_STATE_ON_SD_MESSAGE1ST, // 0x16 - CHANEDIT_STATE_ON_SD_MESSAGE2ND, // 0x17 - CHANEDIT_STATE_ON_SD_MESSAGE3RD, // 0x18 - CHANEDIT_STATE_ON_PROCESS, // 0x19 - CHANEDIT_STATE_ON_END_PROCESS, // 0x1a - CHANEDIT_STATE_ON_EXIST_APP, // 0x1b - CHANEDIT_STATE_ON_SD_MOUNT_ONLY, // 0x1c - CHANEDIT_STATE_ON_TRIG_MOVE, // 0x1d - CHANEDIT_STATE_ON_VERIFY_MOVE, // 0x1e - CHANEDIT_STATE_ON_END_MOVE, // 0x1f + enum { + STATE_ON_NORMAL = 0, + STATE_ON_FADEIN1ST, + STATE_ON_FADEIN2ND, + STATE_ON_FADEOUT1ST, + STATE_ON_FADEOUT2ND, + STATE_ON_SCROLL_R, + STATE_ON_SCROLL_L, + STATE_ON_CHANGE_TAG1ST, + STATE_ON_CHANGE_TAG2ND, + STATE_ON_TRIG_COPY, + STATE_ON_EDIT, + STATE_ON_EDIT_FADEIN, + STATE_ON_EDIT_FADEOUT1ST, + STATE_ON_EDIT_FADEOUT2ND, + STATE_ON_VERIFY1ST, + STATE_ON_VERIFY2ND, + STATE_ON_VERIFY_COPY, + STATE_ON_VERIFY_DEL, + STATE_ON_VERIFY_FORMAT, + STATE_ON_END_FORMAT, + STATE_ON_END_DEL, + STATE_ON_SD_MOUNT, + STATE_ON_SD_MESSAGE1ST, + STATE_ON_SD_MESSAGE2ND, + STATE_ON_SD_MESSAGE3RD, + STATE_ON_PROCESS, + STATE_ON_END_PROCESS, + STATE_ON_EXIST_APP, + STATE_ON_SD_MOUNT_ONLY, + STATE_ON_TRIG_MOVE, + STATE_ON_VERIFY_MOVE, + STATE_ON_END_MOVE, }; ChannelEdit(EGG::Heap * heap); @@ -70,19 +70,27 @@ namespace ipl { void update_nand_free(); void update_sd_free(); - void onPoint(AnmPane*); - void onLeft(AnmPane*); - void onTrig(AnmPane*); - void onTrig(ChanAppBox*); + void onPoint(AnmPane * pane); + void onLeft(AnmPane * pane); + void onTrig(AnmPane * pane); + void onTrig(ChanAppBox * box); void onTrigButton(bool isErr); void onTrigDel(); void onTrigCopy(); void onTrigMove(); - inline State getState() { + inline int getState() { return mState; } + nand::File* getHatenaLayout() { + return mpCorruptIconFile; + } + + nand::File* geTmpTitleLayout() { + return mpTmpTitleIconFile; + } + private: void start_scroll_r(bool playButtonAnm, bool playSound); void start_scroll_l(bool playButtonAnm, bool playSound); @@ -131,42 +139,54 @@ namespace ipl { void on_end_move(); enum Page { - CHANEDIT_PAGE_WII = 0, - CHANEDIT_PAGE_SD = 1, + PAGE_WII = 0, + PAGE_SD = 1, }; enum IntentType { - CHANEDIT_INTENT_NONE = 0, - CHANEDIT_INTENT_COPY = 1, - CHANEDIT_INTENT_MOVE = 2, + INTENT_NONE = 0, + INTENT_COPY, + INTENT_MOVE, }; enum { - CHANEDIT_PROC_NUL = 0, // 0 - CHANEDIT_PROC_CPY = 1, // 1 - CHANEDIT_PROC_DEL = 2, // 2 - CHANEDIT_PROC_FMT = 3, // 3 - CHANEDIT_PROC_MOV = 4, // 4 + PROC_NUL = 0, + PROC_CPY, + PROC_DEL, + PROC_FMT, + PROC_MOV, }; - State mState; // 0x54 - nand::LayoutFile* pChanEditLytFile; // 0x58 - nand::LayoutFile* pBalloonLytFile; // 0x5c - nand::File* pCorruptIconFile; // 0x60 - nand::File* pTmptitleIconFile; // 0x64 - ChanAppBase* pChanAppBase; // 0x68 - ChanAppEdit* pChanAppEdit; // 0x6c - nw4r::ut::List mChanAppBoxList; // 0x70 - NandSDCardManager* pNandSDCardManager; // 0x7c - TextBalloon* mTextBalloonArr[15]; // 0x80 - Page mPage; // 0xbc - ChanAppBox* pCurrBox; // 0xc0 - int mPageOffset; // 0xc4 - int mSdState; // 0xc8 - bool mArwRVisible; // 0xcc - bool mArwLVisible; // 0xcd - int mProcessType; // 0xd0 - IntentType mActionIntent; // 0xd4 + int mState; // 0x54 + + nand::LayoutFile* mpLayoutFile; // 0x58 + nand::LayoutFile* mpBalloonFile; // 0x5C + + nand::File* mpCorruptIconFile; // 0x60 + nand::File* mpTmpTitleIconFile; // 0x64 + + ChanAppBase* mpChanAppBase; // 0x68 + ChanAppEdit* mpChanAppEdit; // 0x6C + nw4r::ut::List mChanAppBoxList; // 0x70 + + NandSDCardManager* mpNandSDCardManager; // 0x7C + + static const int MAX_BALLOONS = 15; + + TextBalloon* mpBalloons[MAX_BALLOONS]; // 0x80 + + Page mPage; // 0xBC + ChanAppBox* mpCurrentBox; // 0xC0 + int mPageOffset; // 0xC4 + + int mSDState; // 0xC8 + + bool mArwRVisible; // 0xCC + bool mArwLVisible; // 0xCD + + int mProcessType; // 0xD0 + + IntentType mActionIntent; // 0xD4 }; } // namespace scene } // namespace ipl diff --git a/include/scene/channelEdit/iplNandSDCardManager.h b/include/scene/channelEdit/iplNandSDCardManager.h index 93e08c7d..4558cc1b 100644 --- a/include/scene/channelEdit/iplNandSDCardManager.h +++ b/include/scene/channelEdit/iplNandSDCardManager.h @@ -16,11 +16,11 @@ namespace ipl { class NandSDCardManager { public: enum Mode { - NAND_MANAGER_MODE_SAVES = 0, - NAND_MANAGER_MODE_APPS = 1, + NAND_MODE_SAVES = 0, + NAND_MODE_APPS, }; - NandSDCardManager(Mode); + NandSDCardManager(Mode mode); ~NandSDCardManager(); void calc(); @@ -36,138 +36,141 @@ namespace ipl { void cmdGetNandFree(); void cmdGetSDFree(); - void cmdCopySaveNandToSD(ESTitleId); - void cmdCopySaveSDToNand(ESTitleId32); + void cmdCopySaveNandToSD(ESTitleId titleId); + void cmdCopySaveSDToNand(ESTitleId32 titleId); - void cmdCopyAppNandToSD(ESTitleId); - void cmdCopyAppSDToNand(ESTitleId32); + void cmdCopyAppNandToSD(ESTitleId titleId); + void cmdCopyAppSDToNand(ESTitleId32 titleId); - void cmdDelNandApp(ChanAppBox*); - void cmdDelSDApp(ChanAppBox*); + void cmdDelNandApp(ChanAppBox* box); + void cmdDelSDApp(ChanAppBox* box); - void cmdDelNandSave(SavedataBox*); - void cmdDelSDSave(SavedataBox*); + void cmdDelNandSave(SavedataBox* box); + void cmdDelSDSave(SavedataBox* box); void cmdCleanQueue(); void cmdListNand(); void cmdListSD(); - void cmdExistNandApp(ESTitleId32); - void cmdExistNandSave(ESTitleId32); - void cmdExistSDApp(ESTitleId32); - void cmdExistSDSave(ESTitleId32); + void cmdExistNandApp(ESTitleId32 titleId); + void cmdExistNandSave(ESTitleId32 titleId); + void cmdExistSDApp(ESTitleId32 titleId); + void cmdExistSDSave(ESTitleId32 titleId); - void cmdMoveAppNandToSD(ChanAppBox*); - void cmdMoveAppSDToNand(ChanAppBox*); + void cmdMoveAppNandToSD(ChanAppBox* box); + void cmdMoveAppSDToNand(ChanAppBox* box); - void cmdMoveSaveNandToSD(SavedataBox*); - void cmdMoveSaveSDToNand(SavedataBox*); + void cmdMoveSaveNandToSD(SavedataBox* box); + void cmdMoveSaveSDToNand(SavedataBox* box); - bool isWorking() { return mState != MANAGER_STATE_NORMAL || mCmdQueue.get_current_index() > 0; } + bool isWorking() { return mState != STATE_NORMAL || mCmdQueue.get_current_index() > 0; } int getAsyncResult(); - NandSDWorker* getWorker() { return pWorker; } + NandSDWorker* getWorker() { return mpWorker; } inline int getNandBlocksFree() { return mNandBlocksFree; } inline int getSDBlocksFree() { return mSDBlocksFree; } - inline bool isSDWriteProtected() { return pWorker->is_sd_write_protected() == TRUE; } + inline bool isSDWriteProtected() { return mpWorker->is_sd_write_protected() == TRUE; } - inline bool isTerminated() { return mState == MANAGER_STATE_STOPPED; } + inline bool isTerminated() { return mState == STATE_STOPPED; } inline BOOL sdWorkerReadyMaybe() { return mThumbCmdQueue.current == 0 && mCmdQueue.current == 0; } inline ESTitleId getTmpTitle() { return mTmpTitleId; } - void disableThumbnailFetching() { mDisableThumbnailFetching = true; } - void enableThumbnailFetching() { mDisableThumbnailFetching = false; } + void disableThumbnailFetching() { mbDisableThumbFetch = true; } + void enableThumbnailFetching() { mbDisableThumbFetch = false; } private: - enum State { - MANAGER_STATE_INIT = 0x00, // 0x00 - MANAGER_STATE_STARTUP = 0x01, // 0x01 - MANAGER_STATE_CHECK_EXIST = 0x02, // 0x02 - MANAGER_STATE_MOUNT_SD = 0x03, // 0x03 - MANAGER_STATE_LIST_NANDAPP = 0x04, // 0x04 - MANAGER_STATE_LIST_SDAPP = 0x05, // 0x05 - MANAGER_STATE_GET_NAND_FREE = 0x06, // 0x06 - MANAGER_STATE_GET_SD_FREE = 0x07, // 0x07 - MANAGER_STATE_NORMAL = 0x08, // 0x08 - MANAGER_STATE_TERMINATE = 0x09, // 0x09 - MANAGER_STATE_COPY_NANDSAVE_TO_SD = 0x0a, // 0x0a - MANAGER_STATE_COPY_SDSAVE_TO_NAND = 0x0b, // 0x0b - MANAGER_STATE_COPY_NANDAPP_TO_SD = 0x0d, // 0x0d - MANAGER_STATE_COPY_SDAPP_TO_NAND = 0x0e, // 0x0e - MANAGER_STATE_DEL_NANDAPP = 0x0f, // 0x0f - MANAGER_STATE_DEL_NANDSAVE = 0x10, // 0x10 - MANAGER_STATE_DEL_SDAPP = 0x11, // 0x11 - MANAGER_STATE_DEL_SDSAVE = 0x12, // 0x12 - MANAGER_STATE_GET_THUMBNAIL = 0x13, // 0x13 - MANAGER_STATE_GET_THUMBNAIL_SIZE = 0x14, // 0x14 - MANAGER_STATE_GET_WIIBANNER = 0x15, // 0x15 - MANAGER_STATE_GET_WIIBANNER_SIZE = 0x16, // 0x16 - MANAGER_STATE_GET_WIIBANNER_PERMS = 0x17, // 0x17 - MANAGER_STATE_SC_FLUSH = 0x18, // 0x18 - MANAGER_STATE_CHANGE_NAND_APP_COUNT = 0x19, // 0x19 - MANAGER_STATE_MOVE_NANDSAVE_TO_SD = 0x1a, // 0x1a - MANAGER_STATE_MOVE_SDSAVE_TO_NAND = 0x1b, // 0x1b - MANAGER_STATE_MOVE_NANDAPP_TO_SD = 0x1c, // 0x1c - MANAGER_STATE_MOVE_SDAPP_TO_NAND = 0x1d, // 0x1d - MANAGER_STATE_CHECK_SD_TITLE_RESTORABLE = 0x1e, // 0x1e - MANAGER_STATE_STOPPED = 0x1f, // 0x1f + enum { + STATE_INIT = 0, + STATE_STARTUP, + STATE_CHECK_EXIST, + STATE_MOUNT_SD, + STATE_LIST_NANDAPP, + STATE_LIST_SDAPP, + STATE_GET_NAND_FREE, + STATE_GET_SD_FREE, + STATE_NORMAL, + STATE_TERMINATE, + STATE_COPY_NANDSAVE_TO_SD, + STATE_COPY_SDSAVE_TO_NAND, + STATE_12, + STATE_COPY_NANDAPP_TO_SD, + STATE_COPY_SDAPP_TO_NAND, + STATE_DEL_NANDAPP, + STATE_DEL_NANDSAVE, + STATE_DEL_SDAPP, + STATE_DEL_SDSAVE, + STATE_GET_THUMBNAIL, + STATE_GET_THUMBNAIL_SIZE, + STATE_GET_WIIBANNER, + STATE_GET_WIIBANNER_SIZE, + STATE_GET_WIIBANNER_PERMS, + STATE_SC_FLUSH, + STATE_CHANGE_NAND_APP_COUNT, + STATE_MOVE_NANDSAVE_TO_SD, + STATE_MOVE_SDSAVE_TO_NAND, + STATE_MOVE_NANDAPP_TO_SD, + STATE_MOVE_SDAPP_TO_NAND, + STATE_CHECK_SD_TITLE_RESTORABLE, + STATE_STOPPED, }; enum CommandTag { - CMD_NUL = 0x00, // 0x00 - CMD_TERMINATE = 0x01, // 0x01 - CMD_MOUNT_SD = 0x02, // 0x02 - CMD_FORMAT_SD = 0x03, // 0x03 - CMD_GET_NAND_FREE = 0x04, // 0x04 - CMD_GET_SD_FREE = 0x05, // 0x05 - CMD_COPY_NANDSAVE_TO_SD = 0x07, // 0x07 - CMD_COPY_SDSAVE_TO_NAND = 0x08, // 0x08 - CMD_COPY_SDAPP_TO_NAND = 0x09, // 0x09 - CMD_COPY_NANDAPP_TO_SD = 0x0a, // 0x0a - CMD_DEL_NANDAPP = 0x0b, // 0x0b - CMD_DEL_NANDSAVE = 0x0c, // 0x0c - CMD_DEL_SDAPP = 0x0d, // 0x0d - CMD_DEL_SDSAVE = 0x0e, // 0x0e - CMD_CLEAN_QUEUE = 0x0f, // 0x0f - CMD_LIST_NAND = 0x10, // 0x10 - CMD_LIST_SD = 0x11, // 0x11 - CMD_NAND_APP_EXIST = 0x12, // 0x12 - CMD_NAND_SAVE_EXIST = 0x13, // 0x13 - CMD_SD_APP_EXIST = 0x14, // 0x14 - CMD_SD_SAVE_EXIST = 0x15, // 0x15 - CMD_MOVE_NANDSAVE_TO_SD = 0x16, // 0x16 - CMD_MOVE_SDSAVE_TO_NAND = 0x17, // 0x17 - CMD_MOVE_NANDAPP_TO_SD = 0x18, // 0x18 - CMD_MOVE_SDAPP_TO_NAND = 0x19, // 0x19 - }; - struct Command { - public: - CommandTag mTag; // 0x00 - ChanAppBox* pChanAppBox; // 0x04 - SavedataBox* pSavedataBox; // 0x08 - ESTitleId mWiiTitleId; // 0x10 - ESTitleId32 mSDTitleId; // 0x18 + CMD_NUL, + CMD_TERMINATE, + CMD_MOUNT_SD, + CMD_FORMAT_SD, + CMD_GET_NAND_FREE, + CMD_GET_SD_FREE, + CMD_6, + CMD_COPY_NANDSAVE_TO_SD, + CMD_COPY_SDSAVE_TO_NAND, + CMD_COPY_SDAPP_TO_NAND, + CMD_COPY_NANDAPP_TO_SD, + CMD_DEL_NANDAPP, + CMD_DEL_NANDSAVE, + CMD_DEL_SDAPP, + CMD_DEL_SDSAVE, + CMD_CLEAN_QUEUE, + CMD_LIST_NAND, + CMD_LIST_SD, + CMD_NAND_APP_EXIST, + CMD_NAND_SAVE_EXIST, + CMD_SD_APP_EXIST, + CMD_SD_SAVE_EXIST, + CMD_MOVE_NANDSAVE_TO_SD, + CMD_MOVE_SDSAVE_TO_NAND, + CMD_MOVE_NANDAPP_TO_SD, + CMD_MOVE_SDAPP_TO_NAND, }; + + typedef struct Command { + CommandTag tag; // 0x00 + ChanAppBox* chanAppBox; // 0x04 + SavedataBox* savedataBox; // 0x08 + ESTitleId wiiTitleId; // 0x10 + ESTitleId32 sdTitleId; // 0x18 + } Command; + typedef struct { - ChanAppBox* pChannelBox; // 0x00 - SavedataBox* pSavedataBox; // 0x04 - int mIdx; // 0x08 - bool mIsWiiNotSD; // 0x0c + ChanAppBox* channelBox; // 0x00 + SavedataBox* savedataBox; // 0x04 + int idx; // 0x08 + bool isWii; // 0x0C } GetThumbnailCmd; struct TitleListing { public: - inline TitleListing(ESTitleId wiiTitleId) : mWiiTitleId(wiiTitleId) {} - inline TitleListing(ESTitleId32 sdTitleId) : mSDTitleId(sdTitleId) {} - ESTitleId mWiiTitleId; // 0x00 - ESTitleId32 mSDTitleId; // 0x08 - nw4r::ut::Link mLink; // 0x0c + inline TitleListing(ESTitleId wiiTitleId) : wiiTitleId(wiiTitleId) {} + inline TitleListing(ESTitleId32 sdTitleId) : sdTitleId(sdTitleId) {} + ESTitleId wiiTitleId; // 0x00 + ESTitleId32 sdTitleId; // 0x08 + nw4r::ut::Link link; // 0x0C }; void on_init(); @@ -208,30 +211,39 @@ namespace ipl { Thumbnail* get_free_thumbnail(); WiiBannerFileInfo* get_free_banner(); - State mState; // 0x00000 - Mode mMode; // 0x00004 - NandSDWorker* pWorker; // 0x00008 - void* pWorkerWorkBuf; // 0x0000c - void* pWorkerDataBuf; // 0x00010 - ESTitleId* pNandTitleIds; // 0x00014 - ESTitleId32* pSDTitleIds; // 0x00018 - nw4r::ut::List mNandListingList; // 0x0001c - nw4r::ut::List mSDListingList; // 0x00028 - undefined4 unk_0x00034; // 0x00034 - Thumbnail mThumbnailArr[15]; // 0x00038 - WiiBannerFileInfo mBannerArr[15]; // 0x05c90 - ChanAppBox* pActiveChanAppBox; // 0xe85e0 - Thumbnail* pActiveThumbnail; // 0xe85e4 - SavedataBox* pActiveSavedataBox; // 0xe85e8 - WiiBannerFileInfo* pActiveBanner; // 0xe85ec - utility::Queue mCmdQueue; // 0xe85f0 - utility::Queue mThumbCmdQueue; // 0xe8680 - int mNandBlocksFree; // 0xe8780 - int mSDBlocksFree; // 0xe8784 - u64 mSDBytesFree; // 0xe8788 - bool mDisableThumbnailFetching; // 0xe8790 - ESTitleId mTmpTitleId; // 0xe8798 - bool unk_0xe87a0; // 0xe87a0 + int mState; // 0x00 + + Mode mMode; // 0x04 + + NandSDWorker* mpWorker; // 0x08 + void* mpWorkerWorkBuf; // 0x0C + void* mpWorkerDataBuf; // 0x10 + + ESTitleId* mpNandTitleIds; // 0x14 + ESTitleId32* mpSDTitleIds; // 0x18 + + nw4r::ut::List mNandListingList; // 0x1C + nw4r::ut::List mSDListingList; // 0x28 + + undefined4 unk_0x34; // 0x34 + Thumbnail mThumbnails[15]; // 0x38 + + WiiBannerFileInfo mBanners[15]; // 0x5C90 + ChanAppBox* mpActiveChanAppBox; // 0xE85E0 + Thumbnail* mpActiveThumbnail; // 0xE85E4 + SavedataBox* mpActiveSavedataBox; // 0xE85E8 + WiiBannerFileInfo* mpActiveBanner; // 0xE85EC + + utility::Queue mCmdQueue; // 0xE85F0 + utility::Queue mThumbCmdQueue; // 0xE8680 + + int mNandBlocksFree; // 0xE8780 + int mSDBlocksFree; // 0xE8784 + u64 mSDBytesFree; // 0xE8788 + + bool mbDisableThumbFetch; // 0xE8790 + ESTitleId mTmpTitleId; // 0xE8798 + bool unk_0xE87A0; // 0xE87a0 }; } // namespace scene } // namespace ipl diff --git a/include/scene/iplSceneBase.h b/include/scene/iplSceneBase.h index 0d0a953e..ef1ac817 100644 --- a/include/scene/iplSceneBase.h +++ b/include/scene/iplSceneBase.h @@ -44,6 +44,7 @@ namespace ipl { void* args; // 0x18 } CommandData; + typedef struct Command { CommandData data; // 0x00 diff --git a/include/scene/memory/iplMemory.h b/include/scene/memory/iplMemory.h index 1f5f6eff..e774b65d 100644 --- a/include/scene/memory/iplMemory.h +++ b/include/scene/memory/iplMemory.h @@ -45,10 +45,10 @@ namespace ipl { virtual void draw() override; virtual BOOL isResetAcceptable() const override; - void onPoint(AnmPane*); - void onLeft(AnmPane*); - void onTrig(AnmPane*); - void onTrig(SavedataBox*); + void onPoint(AnmPane * pane); + void onLeft(AnmPane * pane); + void onTrig(AnmPane * pane); + void onTrig(SavedataBox * box); void onTrigButton(bool isErr); void onTrigDel(); void onTrigCopy(); @@ -89,76 +89,88 @@ namespace ipl { void on_verify_move(); private: - enum State { - MEMORY_STATE_ON_NORMAL = 0x00, // 0x00 - MEMORY_STATE_ON_FADEIN1ST, // 0x01 - MEMORY_STATE_ON_FADEIN2ND, // 0x02 - MEMORY_STATE_ON_FADEOUT1ST, // 0x03 - MEMORY_STATE_ON_FADEOUT2ND, // 0x04 - MEMORY_STATE_ON_SCROLL_R, // 0x05 - MEMORY_STATE_ON_SCROLL_L, // 0x06 - MEMORY_STATE_ON_CHANGE_TAG1ST, // 0x07 - MEMORY_STATE_ON_CHANGE_TAG2ND, // 0x08 - MEMORY_STATE_ON_TRIG_COPY, // 0x09 - MEMORY_STATE_ON_UNUSED_0x0A, // 0x0a - MEMORY_STATE_ON_EDIT, // 0x0b - MEMORY_STATE_ON_EDIT_FADEIN, // 0x0c - MEMORY_STATE_ON_EDIT_FADEOUT1ST, // 0x0d - MEMORY_STATE_ON_EDIT_FADEOUT2ND, // 0x0e - MEMORY_STATE_ON_VERIFY1ST, // 0x0f - MEMORY_STATE_ON_VERIFY2ND, // 0x10 - MEMORY_STATE_ON_VERIFY_COPY, // 0x11 - MEMORY_STATE_ON_VERIFY_DEL, // 0x12 - MEMORY_STATE_ON_VERIFY_FORMAT, // 0x13 - MEMORY_STATE_ON_END_FORMAT, // 0x14 - MEMORY_STATE_ON_SD_MOUNT, // 0x15 - MEMORY_STATE_ON_SD_MESSAGE1ST, // 0x16 - MEMORY_STATE_ON_SD_MESSAGE2ND, // 0x17 - MEMORY_STATE_ON_SD_MESSAGE3RD, // 0x18 - MEMORY_STATE_ON_PROCESS, // 0x19 - MEMORY_STATE_ON_END_PROCESS, // 0x1a - MEMORY_STATE_ON_EXIST_SAVE, // 0x1b - MEMORY_STATE_ON_SD_MOUNT_ONLY, // 0x1c - MEMORY_STATE_ON_TRIG_MOVE, // 0x1d - MEMORY_STATE_ON_VERIFY_MOVE, // 0x1e + enum { + STATE_ON_NORMAL = 0, + STATE_ON_FADEIN1ST, + STATE_ON_FADEIN2ND, + STATE_ON_FADEOUT1ST, + STATE_ON_FADEOUT2ND, + STATE_ON_SCROLL_R, + STATE_ON_SCROLL_L, + STATE_ON_CHANGE_TAG1ST, + STATE_ON_CHANGE_TAG2ND, + STATE_ON_TRIG_COPY, + STATE_10, + STATE_ON_EDIT, + STATE_ON_EDIT_FADEIN, + STATE_ON_EDIT_FADEOUT1ST, + STATE_ON_EDIT_FADEOUT2ND, + STATE_ON_VERIFY1ST, + STATE_ON_VERIFY2ND, + STATE_ON_VERIFY_COPY, + STATE_ON_VERIFY_DEL, + STATE_ON_VERIFY_FORMAT, + STATE_ON_END_FORMAT, + STATE_ON_SD_MOUNT, + STATE_ON_SD_MESSAGE1ST, + STATE_ON_SD_MESSAGE2ND, + STATE_ON_SD_MESSAGE3RD, + STATE_ON_PROCESS, + STATE_ON_END_PROCESS, + STATE_ON_EXIST_SAVE, + STATE_ON_SD_MOUNT_ONLY, + STATE_ON_TRIG_MOVE, + STATE_ON_VERIFY_MOVE, }; - enum Page { + enum { MEMORY_PAGE_WII = 0, - MEMORY_PAGE_SD = 1, + MEMORY_PAGE_SD, }; enum IntentType { MEMORY_INTENT_NONE = 0, - MEMORY_INTENT_COPY = 1, - MEMORY_INTENT_MOVE = 2, + MEMORY_INTENT_COPY, + MEMORY_INTENT_MOVE, }; enum { - MEMORY_PROC_NUL = 0, // 0 - MEMORY_PROC_CPY = 1, // 1 - MEMORY_PROC_DEL = 2, // 2 - MEMORY_PROC_FMT = 3, // 3 - MEMORY_PROC_MOV = 4, // 4 + PROC_NUL = 0, + PROC_CPY, + PROC_DEL, + PROC_FMT, + PROC_MOV, }; - State mState; // 0x54 - nand::LayoutFile* pWiiMemLytFile; // 0x58 - nand::LayoutFile* pBalloonLytFile; // 0x5c - SavedataBase* pSavedataBase; // 0x60 - nand::File* pCorruptTexFile; // 0x64 - SavedataEdit* pSavedataEdit; // 0x68 - nw4r::ut::List mSavedataBoxList; // 0x6c - NandSDCardManager* pNandSDCardManager; // 0x78 - TextBalloon* mTextBalloonArr[15]; // 0x7c - Page mPage; // 0xb8 - SavedataBox* pCurrBox; // 0xbc - int mPageOffset; // 0xc0 - int mSdState; // 0xc4 - bool mArwRVisible; // 0xc8 - bool mArwLVisible; // 0xc9 - int mProcessType; // 0xcc - IntentType mActionIntent; // 0xd0 + int mState; // 0x54 + + nand::LayoutFile* mpLayout; // 0x58 + nand::LayoutFile* mpBalloonFilm; // 0x5C + + SavedataBase* mpSavedataBase; // 0x60 + nand::File* mpCorruptFile; // 0x64 + + SavedataEdit* mpSavedataEdit; // 0x68 + nw4r::ut::List mSavedataBoxList; // 0x6C + + NandSDCardManager* mpNandSDCardManager; // 0x78 + + static const int MAX_BALLOONS = 15; + + TextBalloon* mpBalloons[MAX_BALLOONS]; // 0x7C + + int mPage; // 0xB8 + SavedataBox* mpCurrentBox; // 0xBC + int mPageOffset; // 0xC0 + + int mSdState; // 0xC4 + + bool mArwRVisible; // 0xC8 + bool mArwLVisible; // 0xC9 + + int mProcessType; // 0xCC + + IntentType mActionIntent; // 0xD0 }; } // namespace scene } // namespace ipl diff --git a/include/scene/nakamuraTest/iplContest.h b/include/scene/nakamuraTest/iplContest.h index 4e3e2135..dd3f8533 100644 --- a/include/scene/nakamuraTest/iplContest.h +++ b/include/scene/nakamuraTest/iplContest.h @@ -1,13 +1,13 @@ #ifndef IPL_SCENE_CONTEST_H #define IPL_SCENE_CONTEST_H +#include + #ifdef __cplusplus extern "C" { #endif -#include - -void IPLContestInitialize(void*, NCDProxyProfile*); +void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy); void IPLContestStart(); int IPLContestProcess(); void IPLContestShutdown(); diff --git a/include/scene/nakamuraTest/iplNakamuraTest.h b/include/scene/nakamuraTest/iplNakamuraTest.h index bf59b5d7..58e42237 100644 --- a/include/scene/nakamuraTest/iplNakamuraTest.h +++ b/include/scene/nakamuraTest/iplNakamuraTest.h @@ -37,26 +37,26 @@ namespace ipl { static void nhttpfree(void* buf); static void nhttpcleanupcallback(); - NetSetup mNetSetup; // 0x0058 - EGG::Heap* pAppHeap; // 0x2810 - void* pAppHeapBuf; // 0x2814 - void* pNetSetupHeapBuf; // 0x2818 - void* pNUPHeapBuf; // 0x281c - MEMHeapHandle pNUPHeap; // 0x2820 - MEMAllocator mNUPAllocator; // 0x2824 - OSThread mConnTestThread; // 0x2838 - void* pConnTestThreadStack; // 0x2b50 - u32 mNetSetupLastErr; // 0x2b54 - u32 mState; // 0x2b58 - u32 mConnTestResult; // 0x2b5c - bool mFoundUpdate; // 0x2b60 - u64 mAmtCompleted; // 0x2b68 - u64 mAmtTotal; // 0x2b70 - u16 mCurrVersion; // 0x2b78 - void* pNUPInstance; // 0x2b7c - u32 unk_0x2b80; // 0x2b80 - u32 unk_0x2b84; // 0x2b84 - u32 unk_0x2b88; // 0x2b88 + NetSetup mNetSetup; // 0x0058 + EGG::Heap* mpAppHeap; // 0x2810 + void* mpAppHeapBuf; // 0x2814 + void* mpNetSetupHeapBuf; // 0x2818 + void* mpNUPHeapBuf; // 0x281C + MEMHeapHandle mNUPHeap; // 0x2820 + MEMAllocator mNUPAllocator; // 0x2824 + OSThread mConnTestThread; // 0x2838 + void* mpConnTestThreadStack; // 0x2B50 + u32 mNetSetupLastErr; // 0x2B54 + u32 mState; // 0x2B58 + u32 mConnTestResult; // 0x2B5C + bool mFoundUpdate; // 0x2B60 + u64 mAmtCompleted; // 0x2B68 + u64 mAmtTotal; // 0x2B70 + u16 mCurrVersion; // 0x2B78 + void* mpNUPInstance; // 0x2B7C + u32 unk_0x2B80; // 0x2B80 + u32 unk_0x2B84; // 0x2B84 + u32 unk_0x2B88; // 0x2B88 static EGG::Heap* spHeap; static BOOL sNHTTPFinished; diff --git a/include/scene/nakamuraTest/iplNetSetup.h b/include/scene/nakamuraTest/iplNetSetup.h index 9f411d1f..b4d29445 100644 --- a/include/scene/nakamuraTest/iplNetSetup.h +++ b/include/scene/nakamuraTest/iplNetSetup.h @@ -12,11 +12,11 @@ namespace ipl { public: enum NetSetupState { NET_SETUP_NOT_STARTED = 0, - NET_SETUP_REQUESTED_STARTUP = 1, - NET_SETUP_RUNNING = 2, - NET_SETUP_SUCCESS = 3, - NET_SETUP_UNK_4 = 4, - NET_SETUP_ERROR = 5, + NET_SETUP_REQUESTED_STARTUP, + NET_SETUP_RUNNING, + NET_SETUP_SUCCESS, + NET_SETUP_UNK_4, + NET_SETUP_ERROR, }; NetSetup(); @@ -44,14 +44,14 @@ namespace ipl { } StaticSOStartupInfo; NCDConfig mNcdCfg; // 0x0004 - u8 mProfileId; // 0x1b60 - u32 mConnType; // 0x1b64 - NCDIfConfig mNcdIfCfg; // 0x1b68 - NCDIpConfig mNcdIpCfg; // 0x1cc8 - NetSetupState mState; // 0x248c + u8 mProfileId; // 0x1B60 + u32 mConnType; // 0x1B64 + NCDIfConfig mNcdIfCfg; // 0x1B68 + NCDIpConfig mNcdIpCfg; // 0x1CC8 + NetSetupState mState; // 0x248C int mLastErr; // 0x2490 OSThread mThread; // 0x2498 - void* pThreadStack; // 0x27b0 + void* mpThreadStack; // 0x27B0 static MEMHeapHandle sHeap; static void* sHeapBuf; diff --git a/include/scene/saveDataEdit/iplSaveDataBase.h b/include/scene/saveDataEdit/iplSaveDataBase.h index 95382b48..3f69ee16 100644 --- a/include/scene/saveDataEdit/iplSaveDataBase.h +++ b/include/scene/saveDataEdit/iplSaveDataBase.h @@ -1,5 +1,5 @@ -#ifndef IPL_SCENE_SAVEDATA_BASE_H -#define IPL_SCENE_SAVEDATA_BASE_H +#ifndef IPL_SCENE_STATE_BASE_H +#define IPL_SCENE_STATE_BASE_H #include "scene/channelEdit/iplAnmController.h" @@ -11,7 +11,7 @@ namespace ipl { namespace scene { class SavedataBase : public AnmController, public ::gui::EventHandler { public: - SavedataBase(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName); + SavedataBase(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName); virtual ~SavedataBase(); @@ -22,7 +22,7 @@ namespace ipl { void update(); void anmFadein(); - void anmFadeout(bool); + void anmFadeout(bool isErr); void anmChangeWiitoSD(); void anmChangeSDtoWii(); @@ -36,10 +36,38 @@ namespace ipl { void anmArwAppear(bool arwR, bool arwL); void anmArwDisappear(bool arwR, bool arwL); - inline layout::Object* getLytObject() { return pLytObj; } - inline bool isIdle() { return mState == SAVEDATA_IDLE; } + inline layout::Object* getLytObject() { return mpLayout; } + inline bool isIdle() { return mState == STATE_IDLE; } private: + enum { + ANIM_SWITCH = 0, + ANIM_DATA_IN, + ANIM_DATA_OUT, + ANIM_SELECT_IN, + ANIM_SELECT_WII_IN, + ANIM_SELECT_WII_OUT, + ANIM_SELECT_WII_FLASH, + ANIM_SELECT_SD_IN, + ANIM_SELECT_SD_OUT, + ANIM_SELECT_SD_FLASH, + ANIM_ARROWS_MOVE_L, + ANIM_ARROWS_MOVE_R, + ANIM_ARROW_R_SELECT, + ANIM_ARROW_L_SELECT, + ANIM_ARROW_R_FOCUS_ON, + ANIM_ARROW_L_FOCUS_ON, + ANIM_ARROW_R_FOCUS_OFF, + ANIM_ARROW_L_FOCUS_OFF, + ANIM_ARROW_R_LOOP, + ANIM_ARROW_R_END, + ANIM_ARROW_L_END, + ANIM_ARROW_R_LOST, + ANIM_ARROW_L_LOST, + ANIM_ERROR_TEXT_IN, + ANIM_ERROR_TEXT_OUT, + }; + void on_fadein1st(); void on_fadein2nd(); void on_fadeout(); @@ -50,22 +78,24 @@ namespace ipl { void on_text_fadein(); void on_text_fadeout(); - enum State { - SAVEDATA_IDLE = 0x0, // 0x0 - SAVEDATA_FADEIN1ST = 0x1, // 0x1 - SAVEDATA_FADEIN2ND = 0x2, // 0x2 - SAVEDATA_FADEOUT = 0x3, // 0x3 - SAVEDATA_CHANGE_SD_TO_WII = 0x4, // 0x4 - SAVEDATA_CHANGE_WII_TO_SD = 0x5, // 0x5 - SAVEDATA_SCROLL_R = 0x8, // 0x8 - SAVEDATA_SCROLL_L = 0x9, // 0x9 - SAVEDATA_TEXT_FADEIN = 0xa, // 0xa - SAVEDATA_TEXT_FADEOUT = 0xb, // 0xb + enum { + STATE_IDLE = 0, + STATE_FADEIN1ST, + STATE_FADEIN2ND, + STATE_FADEOUT, + STATE_CHANGE_SD_TO_WII, + STATE_CHANGE_WII_TO_SD, + STATE_6, + STATE_7, + STATE_SCROLL_R, + STATE_SCROLL_L, + STATE_TEXT_FADEIN, + STATE_TEXT_FADEOUT, }; - State mState; + int mState; }; } // namespace scene } // namespace ipl -#endif // IPL_SCENE_SAVEDATA_BASE_H +#endif // IPL_SCENE_STATE_BASE_H diff --git a/include/scene/saveDataEdit/iplSaveDataBox.h b/include/scene/saveDataEdit/iplSaveDataBox.h index 164fb5c9..a64906b5 100644 --- a/include/scene/saveDataEdit/iplSaveDataBox.h +++ b/include/scene/saveDataEdit/iplSaveDataBox.h @@ -12,7 +12,7 @@ namespace ipl { namespace scene { class SavedataBox : public AnmController, public ::gui::EventHandler { public: - SavedataBox(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName); + SavedataBox(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName); virtual ~SavedataBox(); void calc(); @@ -25,37 +25,49 @@ namespace ipl { virtual void onEvent(u32 compId, u32 event, void* data) override; void clearEvent(); - WiiBannerFileInfo* getBanner() const { return pBannerFileInfo; } - void setBannerFileInfo(WiiBannerFileInfo* info) { pBannerFileInfo = info; } + WiiBannerFileInfo* getBanner() const { return mpBannerFileInfo; } + void setBannerFileInfo(WiiBannerFileInfo* info) { mpBannerFileInfo = info; } const nw4r::math::VEC3& getTranslate() { return get_translate("N_Data_00"); } void setTranslate(const nw4r::math::VEC3& translate) { set_translate("N_Data_00", translate); } - TextBalloon* getTextBalloon() { return pTextBalloon; } - void setTextBalloon(TextBalloon* balloon) { pTextBalloon = balloon; } + void terminateBalloon() { + mpBalloon->terminate(); + mbInitBalloon = false; + } - bool getTextBalloonInitialized() { return mTextBalloonInitialized; } - void setTextBalloonInitialized(bool val) { mTextBalloonInitialized = val; } + TextBalloon* getTextBalloon() { return mpBalloon; } + void setTextBalloon(TextBalloon* balloon) { mpBalloon = balloon; } - inline bool isIdle() { return mState == BOX_STATE_IDLE; } + bool hasBalloonInitialized() { return mbInitBalloon; } + + inline bool isIdle() { return mState == STATE_IDLE; } private: + enum { + ANIM_DATA_IN, + ANIM_DATA_OUT, + ANIM_DATA_FOCUS_IN, + ANIM_DATA_FOCUS_OUT, + }; + void on_fadein(); void on_fadeout(); - enum State { - BOX_STATE_IDLE = 0x0, // 0x0 - BOX_STATE_FADEIN = 0x1, // 0x1 - BOX_STATE_FADEOUT = 0x2, // 0x2 + enum { + STATE_IDLE = 0, + STATE_FADEIN, + STATE_FADEOUT, }; public: nw4r::ut::Link mLink; // 0x34 + private: - State mState; // 0x3c - WiiBannerFileInfo* pBannerFileInfo; // 0x40 - TextBalloon* pTextBalloon; // 0x44 - bool mTextBalloonInitialized; // 0x48 + int mState; // 0x3C + WiiBannerFileInfo* mpBannerFileInfo; // 0x40 + TextBalloon* mpBalloon; // 0x44 + bool mbInitBalloon; // 0x48 }; } // namespace scene } // namespace ipl diff --git a/include/scene/saveDataEdit/iplSaveDataEdit.h b/include/scene/saveDataEdit/iplSaveDataEdit.h index 41824d79..b9f73eb4 100644 --- a/include/scene/saveDataEdit/iplSaveDataEdit.h +++ b/include/scene/saveDataEdit/iplSaveDataEdit.h @@ -13,7 +13,7 @@ namespace ipl { namespace scene { class SavedataEdit : public AnmController, public ::gui::EventHandler { public: - SavedataEdit(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName); + SavedataEdit(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName); virtual ~SavedataEdit(); @@ -41,11 +41,29 @@ namespace ipl { virtual void onEvent(u32 compId, u32 event, void* data) override; - void change_button_text(u32); + void change_button_text(u32 msgId); - inline bool isIdle() { return mState == EDIT_STATE_IDLE; } + inline bool isIdle() { return mState == STATE_IDLE; } private: + enum { + ANIM_MASK_IN = 0, + ANIM_MASK_OUT, + ANIM_COPY_IN, + ANIM_COPY_OUT, + ANIM_COPY_FLASH, + ANIM_DEL_IN, + ANIM_DEL_OUT, + ANIM_DEL_FLASH, + ANIM_SELECT_OUT, + ANIM_TEXT_FADEIN, + ANIM_TEXT_FADEOUT, + ANIM_WAIT, + ANIM_MOVE_IN, + ANIM_MOVE_OUT, + ANIM_MOVE_FLASH, + }; + void on_fadein(); void on_fadeout(); void on_hide_btn0_dialog(); @@ -58,27 +76,28 @@ namespace ipl { void on_text_fadeout(); void on_trig_del(); - enum State { - EDIT_STATE_IDLE = 0x0, // 0x0 - EDIT_STATE_FADEIN = 0x1, // 0x1 - EDIT_STATE_FADEOUT = 0x2, // 0x2 - EDIT_STATE_HIDE_BTN0_DIALOG = 0x3, // 0x3 - EDIT_STATE_SHOW_BTN2_DIALOG1ST = 0x4, // 0x4 - EDIT_STATE_SHOW_BTN2_DIALOG2ND = 0x5, // 0x5 - EDIT_STATE_SELECT_FADEIN = 0x6, // 0x6 - EDIT_STATE_SELECT_FADEOUT1ST = 0x7, // 0x7 - EDIT_STATE_SELECT_FADEOUT2ND = 0x8, // 0x8 - EDIT_STATE_TEXT_FADEIN = 0x9, // 0x9 - EDIT_STATE_TEXT_FADEOUT = 0xa, // 0xa - EDIT_STATE_TRIG_DEL = 0xb, // 0xb + enum { + STATE_IDLE = 0, + STATE_FADEIN, + STATE_FADEOUT, + STATE_HIDE_BTN0_DIALOG, + STATE_SHOW_BTN2_DIALOG1ST, + STATE_SHOW_BTN2_DIALOG2ND, + STATE_SELECT_FADEIN, + STATE_SELECT_FADEOUT1ST, + STATE_SELECT_FADEOUT2ND, + STATE_TEXT_FADEIN, + STATE_TEXT_FADEOUT, + STATE_TRIG_DEL, }; public: nw4r::ut::Link mLink; // 0x34 + private: - State mState; // 0x3c + int mState; // 0x3C math::LinearIntp mLinearInterp; // 0x40 - SavedataBox* pSavedataBox; // 0x78 + SavedataBox* mpSavedataBox; // 0x78 int mMsgId; // 0x7c }; } // namespace scene diff --git a/include/scene/saveDataEdit/iplWiiBannerFileInfo.h b/include/scene/saveDataEdit/iplWiiBannerFileInfo.h index fbada6f3..e832b0db 100644 --- a/include/scene/saveDataEdit/iplWiiBannerFileInfo.h +++ b/include/scene/saveDataEdit/iplWiiBannerFileInfo.h @@ -4,46 +4,12 @@ #include #include +#include "system/iplSaveBanner.h" #include "system/iplSystem.h" #include #include -#define SAVE_NAME_LENGTH 32 - -#define SAVE_ICON_COUNT 8 - -#define SAVE_ICON_TEX_SIZE 0x1200 -#define SAVE_ICON_TEX_WIDTH 48 -#define SAVE_ICON_TEX_HEIGHT 48 - -#define SAVE_BANNER_TEX_SIZE 0x6000 -#define SAVE_BANNER_TEX_WIDTH 192 -#define SAVE_BANNER_TEX_HEIGHT 64 - -#define SAVE_ANIM_FRAME_TICK 4 - -typedef struct WIISaveBannerFile { - u32 magic; // 0x0000 - u32 flags; // 0x0004 - u16 speed; // 0x0008 - u8 padding[22]; - - wchar_t name[SAVE_NAME_LENGTH]; // 0x0020 - wchar_t subName[SAVE_NAME_LENGTH]; // 0x0060 - - u8 bannerData[SAVE_BANNER_TEX_SIZE]; // 0x00a0 - - u8 iconData0[SAVE_ICON_TEX_SIZE]; // 0x60a0 - u8 iconData1[SAVE_ICON_TEX_SIZE]; // 0x72a0 - u8 iconData2[SAVE_ICON_TEX_SIZE]; // 0x84a0 - u8 iconData3[SAVE_ICON_TEX_SIZE]; // 0x96a0 - u8 iconData4[SAVE_ICON_TEX_SIZE]; // 0xa8a0 - u8 iconData5[SAVE_ICON_TEX_SIZE]; // 0xbaa0 - u8 iconData6[SAVE_ICON_TEX_SIZE]; // 0xcca0 - u8 iconData7[SAVE_ICON_TEX_SIZE]; // 0xdea0 -} SData; - namespace ipl { namespace scene { class WiiBannerFileInfo { @@ -51,22 +17,22 @@ namespace ipl { WiiBannerFileInfo() : mFrameCount(0), mFrameSpeed(0), mFlags(0), mAnim_Incrementer(0), mAnim_AltFlag(0), mAnim_AltForward(0), mAnim_AltBackward(0), mBlockCount(0), mPerms(0), mIsCorrupt(false) { - wmemset(mSaveName, 0, SAVE_NAME_LENGTH + 1); - wmemset(mSaveSubName, 0, SAVE_NAME_LENGTH + 1); + wmemset(mSaveName, 0, WII_SAVE_BANNER_LENGTH + 1); + wmemset(mSaveSubName, 0, WII_SAVE_BANNER_LENGTH + 1); - mpBannerData = System::getMem2App()->alloc(SAVE_BANNER_TEX_SIZE, DEFAULT_ALIGN); - memset(mpBannerData, 0, SAVE_BANNER_TEX_SIZE); + mpBannerData = System::getMem2App()->alloc(WII_SAVE_BANNER_BNR_TEXSIZE, DEFAULT_ALIGN); + memset(mpBannerData, 0, WII_SAVE_BANNER_BNR_TEXSIZE); - for (int i = 0; i < SAVE_ICON_COUNT; i++) { - mpIconData[i] = System::getMem2App()->alloc(SAVE_ICON_TEX_SIZE, DEFAULT_ALIGN); - memset(mpIconData[i], 0, SAVE_ICON_TEX_SIZE); + for (int i = 0; i < WII_SAVE_BANNER_ICON_COUNT; i++) { + mpIconData[i] = System::getMem2App()->alloc(WII_SAVE_BANNER_ICON_TEXSIZE, DEFAULT_ALIGN); + memset(mpIconData[i], 0, WII_SAVE_BANNER_ICON_TEXSIZE); } memset(&mData, 0, sizeof(mData)); } ~WiiBannerFileInfo() { - for (int i = 0; i < SAVE_ICON_COUNT; i++) { + for (int i = 0; i < WII_SAVE_BANNER_ICON_COUNT; i++) { System::getMem2App()->free(mpIconData[i]); } @@ -97,20 +63,15 @@ namespace ipl { inline bool isCorrupt() const { return mIsCorrupt; } inline void setCorrupt(bool newValue) { mIsCorrupt = newValue; } - inline SData* getDataRef() { return &mData; } - - enum { - FLAG_LOCAL_SAVE = 0x00000001, - FLAG_ALTERNATE_ANIMATION = 0x00000010, - }; + WIISaveBannerFile* getData() { return &mData; } private: void resolve_icon(); int get_iconspeed(int frame) const; - int get_iconspeed_ticks(int frame) { return get_iconspeed(frame) * SAVE_ANIM_FRAME_TICK; } + int get_iconspeed_ticks(int frame) { return get_iconspeed(frame) * WII_SAVE_BANNER_FRAME_TICK; } - int get_iconspeed_begin_tick(int frame) { return get_iconspeed(frame - 1) * SAVE_ANIM_FRAME_TICK; } + int get_iconspeed_begin_tick(int frame) { return get_iconspeed(frame - 1) * WII_SAVE_BANNER_FRAME_TICK; } vu8 mFrameCount; // 0x00 @@ -127,11 +88,11 @@ namespace ipl { u8 mAnim_AltForward; // 0x0E u8 mAnim_AltBackward; // 0x0F - wchar_t mSaveName[SAVE_NAME_LENGTH + 1]; // 0x10 - wchar_t mSaveSubName[SAVE_NAME_LENGTH + 1]; // 0x52 + wchar_t mSaveName[WII_SAVE_BANNER_LENGTH + 1]; // 0x10 + wchar_t mSaveSubName[WII_SAVE_BANNER_LENGTH + 1]; // 0x52 - void* mpBannerData; // 0x94 - void* mpIconData[SAVE_ICON_COUNT]; // 0x98 + void* mpBannerData; // 0x94 + void* mpIconData[WII_SAVE_BANNER_ICON_COUNT]; // 0x98 GXTexObj mCurIconTex; // 0xB8 GXTexObj mCurBannerTex; // 0xD8 @@ -140,7 +101,7 @@ namespace ipl { ESTitleId32 mSDTitleId; u32 mBlockCount; - SData mData; // 0x108 + WIISaveBannerFile mData; // 0x108 u32 mPerms; // 0xf1a8 bool mIsCorrupt; // 0xf1ac diff --git a/include/scene/setting/iplNCDSetting.h b/include/scene/setting/iplNCDSetting.h index fbb63147..5649fa42 100644 --- a/include/scene/setting/iplNCDSetting.h +++ b/include/scene/setting/iplNCDSetting.h @@ -13,57 +13,55 @@ namespace ipl { namespace ncd { class NCDSetting { public: - static NCDConfig mConfig; - static NCDConfig mSaveConfig; - static u8 mMac[]; - - static u16 mID; - static u32 mMacNum; - static void init(); - static void initSetID(u16); - static int checkFlag(int); + + static void initSetID(u16 setID); + + static int checkFlag(int id); static int checkThisFlag(); static bool checkAllFlag(); + static u8 checkConnectTestFlag(); static u8 checkDHCPFlag(); static u8 checkDNSFlag(); - static void checkDHCP_(); static u8 checkProxyFlag(); static u8 checkBasic(); static bool checkChangeEnable(); - static bool convert16toASCII(char, char, unsigned char*); - static int checkWEPKey(char*); - static bool checkProxy(char*); - static bool checkProxyBasic(char*); - static void adjustNCDData_(); - static void adjustSelectMedia_(int); - static void adjustEnableFlag_(int); - static void setConnectTestFlag(bool); - static void setDHCPFlag(unsigned char); - static void setDNSFlag(unsigned char); - static void setProxyFlag(unsigned char); - static void setBasicFlag(unsigned char); + static int checkWEPKey(char* key); + static bool checkProxy(char* proxy); + static bool checkProxyBasic(char* proxy); + + static void setConnectTestFlag(bool newFlag); + static void setDHCPFlag(u8 newFlag); + static void setDNSFlag(u8 newFlag); + static void setProxyFlag(u8 newFlag); + static void setBasicFlag(u8 newFlag); static void setWired(); - static void setWireless(unsigned char); - static void changeConnectType(unsigned char); - static void setSSID(u8*); - static void setPrivacyMode(u16); - static void setWDPrivacyMode(u16); - static void setPrivacy(unsigned char*, int); - static void setIP(NCDIpProfile*); - static void setDNS(NCDIpProfile*); - static void setMTU(long); - static void setProxy(NCDProxyServerProfile*); - static void setBasic(NCDProxyServerProfile*); + static void setWireless(u8 configMethod); + static void changeConnectType(u8 connectType); + static void setSSID(u8* newSSID); + static void setPrivacyMode(u16 newMode); + static void setWDPrivacyMode(u16 mode); + static void setPrivacy(u8* newKey, int len); + static void setIP(NCDIpProfile* ip); + static void setDNS(NCDIpProfile* ip); + static void setMTU(s32 mtu); + + static void setProxy(NCDProxyServerProfile* proxyServerProfile); + static void setBasic(NCDProxyServerProfile* proxyServerProfile); + static void clearData(); static void clearLocal(); + static void write(); + static void backupData(); static void resetData(); + static void setUseProfileID(); - static void setAOSSParams(const NCDAossConfig&); - static void setRakuParams(const NCDApConfig&); + static void setAOSSParams(const NCDAossConfig& src); + static void setRakuParams(const NCDApConfig& src); + static u16 getID(); static NCDApConfig* getSSID(); static u16 getUseProfileID(); @@ -74,15 +72,34 @@ namespace ipl { static NCDIpProfile* getIP(); static u32 getMacNum(); static u8* getMacAddr(); + static void makeMacAddr(); + static NCDProxyProfile* getProxy(); static s32 getMTU(); static NCDConfig* getData(); static bool getConnectEnableFlag(); static bool getEnableFlag(); + static NCDErr adjustNWC24Flag(); + + private: + static void checkDHCP_(); + + static void adjustNCDData_(); + static void adjustSelectMedia_(int exclude); + static void adjustEnableFlag_(int exclude); static void adjustNWC24FlagEx_(); + static bool convert16toASCII(char hexHi, char hexLo, u8* byte); + + static NCDConfig mConfig; + static NCDConfig mSaveConfig; + static u8 mMac[0x20]; + + static u16 mID; + static u32 mMacNum; + #ifndef NON_MATCHING static void matchHack(); #endif diff --git a/include/system/iplChannelManager.h b/include/system/iplChannelManager.h index da787245..59020b16 100644 --- a/include/system/iplChannelManager.h +++ b/include/system/iplChannelManager.h @@ -97,7 +97,9 @@ namespace ipl { static const int META_DISK_IN_MESSAGE_LENGTH = 376; static const int META_CURRENT_VERSION = 3; -#define META_PAD 64 + static const int META_RESERVED_PADDING = 64; + +#define IPL_META_MAGIC "IMET" typedef struct SMetaBlockHeader { char magic[4]; // 0x00 (Always "IMET"; "IPL Meta"?) @@ -135,9 +137,11 @@ namespace ipl { }; // 0x18 } SMetaBlockHeader; + static const int META_HEAD_BLOCK_SIZE = offsetof(SMetaBlockHeader, iconSize); + typedef struct SChanMgrMetaHeader { - u8 reserved0[META_PAD]; // 0x00 - SMetaBlockHeader blockHdr; // 0x40 + u8 reserved0[META_RESERVED_PADDING]; // 0x00 + SMetaBlockHeader blockHdr; // 0x40 u16 names[SC_LANG_MAX][NAME_INDEX_MAX][META_CHANNEL_NAME_LENGTH + 1]; // 0x5C diff --git a/include/system/iplController.h b/include/system/iplController.h index 7ae2d417..b9725546 100644 --- a/include/system/iplController.h +++ b/include/system/iplController.h @@ -63,128 +63,128 @@ namespace ipl { // clang-format on class Base { - public: - Base(int chan, KPADStatus &arg1) { - this->mButton = 0; - this->mUnk8 = 0; - this->mLastRumbleTime = 0; - this->mRumbleType = -1; - this->mChan = chan; - this->mUnk18 = 2; - this->mUnk1C = 0; + public: + Base(int chan, KPADStatus& arg1) { + mButton = 0; + unk_0x08 = 0; + mLastRumbleTime = 0; + mRumbleType = -1; + mChan = chan; + unk_0x18 = 2; + unk_0x1C = 0; - KPADEnableDPD(chan); + KPADEnableDPD(chan); - this->mUnk1D = 0; - this->mUnk1E = 0; - this->mUnk20 = &arg1; - } + unk_0x1D = 0; + unk_0x1E = 0; + unk_0x20 = &arg1; + } - virtual ~Base(); // 0x08 - virtual int getType() const; // 0x0C - virtual int getChannel() const; // 0x10 - virtual int down(u32 button) const; // 0x14 - virtual int downTrg(u32 button) const; // 0x18 - virtual int upTrg(u32 button) const; // 0x1C - virtual int pinch() const; // 0x20 - virtual int pinchTrg() const; // 0x24 - virtual int pinchOffTrg() const; // 0x28 - virtual int decide() const; // 0x2C - virtual int repeat(u32 button) const; // 0x30 - virtual int rumble(int timer = 0); // 0x34 - virtual void cancelRumbling(); // 0x38 - virtual int getHoldFlag() const; // 0x3C - virtual int getTrigFlag() const; // 0x40 - virtual int getReleaseFlag() const; // 0x44 - virtual int getClassicHoldFlag() const; // 0x48 - virtual int getClassicTrigFlag() const; // 0x4C - virtual int getClassicReleaseFlag() const; // 0x50 - virtual math::VEC2 getDpdPos() const; // 0x54 - /** - * @brief Gets the IR sensor position of the Wii Remote. - * @return The IR sensor X and Y as `ipl::math::VEC2`. - */ - virtual math::VEC2 getDpdProjectionPos() const; // 0x58 - /** - * @brief Gets the Horizon of the Wii Remote. - * @return The Horizon X and Y as `ipl::math::VEC2`. - */ - virtual math::VEC2 getHorizon() const; // 0x5C - virtual int getDpdDistance() const; // 0x60 - virtual KPADStatus* getKPADStatus() const; // 0x64 - virtual PADStatus* getPADStatus() const; // 0x68 - virtual bool isValidBtn() const; // 0x6C - virtual bool isValidDpd() const; // 0x70 + virtual ~Base(); // 0x08 + virtual int getType() const; // 0x0C + virtual int getChannel() const; // 0x10 + virtual int down(u32 button) const; // 0x14 + virtual int downTrg(u32 button) const; // 0x18 + virtual int upTrg(u32 button) const; // 0x1C + virtual int pinch() const; // 0x20 + virtual int pinchTrg() const; // 0x24 + virtual int pinchOffTrg() const; // 0x28 + virtual int decide() const; // 0x2C + virtual int repeat(u32 button) const; // 0x30 + virtual BOOL rumble(int timer = 0); // 0x34 + virtual void cancelRumbling(); // 0x38 + virtual int getHoldFlag() const; // 0x3C + virtual int getTrigFlag() const; // 0x40 + virtual int getReleaseFlag() const; // 0x44 + virtual int getClassicHoldFlag() const; // 0x48 + virtual int getClassicTrigFlag() const; // 0x4C + virtual int getClassicReleaseFlag() const; // 0x50 + virtual math::VEC2 getDpdPos() const; // 0x54 + /** + * @brief Gets the IR sensor position of the Wii Remote. + * @return The IR sensor X and Y as `ipl::math::VEC2`. + */ + virtual math::VEC2 getDpdProjectionPos() const; // 0x58 + /** + * @brief Gets the Horizon of the Wii Remote. + * @return The Horizon X and Y as `ipl::math::VEC2`. + */ + virtual math::VEC2 getHorizon() const; // 0x5C + virtual int getDpdDistance() const; // 0x60 + virtual KPADStatus* getKPADStatus() const; // 0x64 + virtual PADStatus* getPADStatus() const; // 0x68 + virtual bool isValidBtn() const; // 0x6C + virtual bool isValidDpd() const; // 0x70 - virtual bool setForceInvalid(bool flag); // 0x74 + virtual bool setForceInvalid(bool flag); // 0x74 - virtual f32 getMainStickX() const; // 0x78 - virtual f32 getMainStickY() const; // 0x7C + virtual f32 getMainStickX() const; // 0x78 + virtual f32 getMainStickY() const; // 0x7C - virtual f32 getSubStickX() const; // 0x80 - virtual f32 getSubStickY() const; // 0x84 + virtual f32 getSubStickX() const; // 0x80 + virtual f32 getSubStickY() const; // 0x84 - virtual void read(); // 0x88 + virtual void read(); // 0x88 // protected: - u8 mButton; // 0x4 - u32 mUnk8; // 0x8 - OSTick mLastRumbleTime; // 0xC - s32 mRumbleType; // 0x10 - u32 mChan; // 0x14 - u32 mUnk18; // 0x18 - u8 mUnk1C; - u8 mUnk1D; // 0x1D - u8 mUnk1E; // 0x1E - KPADStatus *mUnk20; // 0x20 + u8 mButton; // 0x4 + u32 unk_0x08; // 0x8 + OSTick mLastRumbleTime; // 0xC + s32 mRumbleType; // 0x10 + u32 mChan; // 0x14 + u32 unk_0x18; // 0x18 + u8 unk_0x1C; + u8 unk_0x1D; // 0x1D + u8 unk_0x1E; // 0x1E + KPADStatus* unk_0x20; // 0x20 }; class Interface : public Base { public: - Interface(int chan, KPADStatus &arg1) : Base(chan, arg1) {} + Interface(int chan, KPADStatus& arg1) : Base(chan, arg1) {} ~Interface() {} - virtual int down(u32 button) const override; // 0x10 - virtual int downTrg(u32 button) const override; // 0x18 - virtual int pinch() const override; // 0x1C - virtual KPADStatus* getKPADStatus() const override; // 0x64 - virtual bool isValidBtn() const override; // 0x6C + virtual int down(u32 button) const override; // 0x10 + virtual int downTrg(u32 button) const override; // 0x18 + virtual int pinch() const override; // 0x1C + virtual KPADStatus* getKPADStatus() const override; // 0x64 + virtual bool isValidBtn() const override; // 0x6C }; class Revolution : public Interface { public: - Revolution(int chan, KPADStatus &arg1) : Interface(chan, arg1) {} + Revolution(int chan, KPADStatus& arg1) : Interface(chan, arg1) {} virtual ~Revolution(); - virtual int down(u32 button) const override; // 0x10 + virtual int down(u32 button) const override; // 0x10 - virtual math::VEC2 getDpdProjectionPos() const override; // 0x58 + virtual math::VEC2 getDpdProjectionPos() const override; // 0x58 - virtual bool isValidBtn() const override; // 0x6C - virtual bool isValidDpd() const override; // 0x70 + virtual bool isValidBtn() const override; // 0x6C + virtual bool isValidDpd() const override; // 0x70 - virtual void read() override; // 0x88 + virtual void read() override; // 0x88 }; class Classic : public Revolution { public: - Classic(int arg0, KPADStatus &arg1); + Classic(int arg0, KPADStatus& arg1); - virtual int getClassicHoldFlag() const override; // 0x48 + virtual int getClassicHoldFlag() const override; // 0x48 - virtual math::VEC2 getDpdPos() const override; // 0x54 - virtual math::VEC2 getDpdProjectionPos() const override;// 0x58 - virtual math::VEC2 getHorizon() const override; // 0x5C + virtual math::VEC2 getDpdPos() const override; // 0x54 + virtual math::VEC2 getDpdProjectionPos() const override; // 0x58 + virtual math::VEC2 getHorizon() const override; // 0x5C - virtual void read() override; // 0x88 + virtual void read() override; // 0x88 - virtual BOOL isValidDpdClassic() const; // 0x8C + virtual BOOL isValidDpdClassic() const; // 0x8C private: - math::VEC2 unk24; - int unk2C; + math::VEC2 unk_0x24; + int unk_0x2C; }; class Manager { diff --git a/include/system/iplDialogWindow.h b/include/system/iplDialogWindow.h index 32e58fbd..4a2498df 100644 --- a/include/system/iplDialogWindow.h +++ b/include/system/iplDialogWindow.h @@ -432,8 +432,8 @@ namespace ipl { void start_left_event(const char* paneName); void start_trig_event(const char* paneName); - State mState; // 0x0C - ipl::nand::LayoutFile* mpLayoutFile; // 0x10 + State mState; // 0x0C + nand::LayoutFile* mpLayoutFile; // 0x10 BOOL mbBtnHovered[DIALOG_BTN_TYPE_MAX]; // 0x14 diff --git a/include/system/iplNandSDWorker.h b/include/system/iplNandSDWorker.h index 8a28daa0..be7b1bba 100644 --- a/include/system/iplNandSDWorker.h +++ b/include/system/iplNandSDWorker.h @@ -2,65 +2,78 @@ #define IPL_NAND_SD_WORKER_H #include +#include +#include #include -// TODO: Move WIISaveBannerFile to a better place -#include "scene/saveDataEdit/iplWiiBannerFileInfo.h" +#include "system/iplSaveBanner.h" #include "system/iplChannelManager.h" namespace ipl { class NandSDWorker { public: - enum SDState { - SD_STATE_INITIAL = 0, // 0 - SD_STATE_SLOT_EMPTY = 1, // 1 - SD_STATE_NOT_MOUNTED = 2, // 2 - SD_STATE_BROKEN_MEDIA = 3, // 3 - SD_STATE_ILLEGAL_MEDIA = 4, // 4 - SD_STATE_ERRORED = 5, // 5 - SD_STATE_READY = 6, // 6 - SD_STATE_MOUNTED = 7, // 7 - }; + typedef enum WorkSDState { + SD_STATE_INITIAL = 0, + SD_STATE_EJECTED, + SD_STATE_INSERTED, + SD_STATE_BROKEN, + SD_STATE_ILLEGAL, + SD_STATE_ERROR, + SD_STATE_READY, + SD_STATE_MOUNTED, + } WorkSDState; + struct TitleUsage { - ESTitleId mTitleId; - u32 mSize; - u32 mInode; + ESTitleId curTitleId; + u32 size; + u32 inode; }; struct TitleIdList { - ESTitleId* pTitleIds; - u32 mCount; + ESTitleId* titleIds; + u32 count; }; enum NandSDWorkerResult { - WORKER_RESULT_OK = 0, // 0 - WORKER_RESULT_WORKING = -1, // -1 - WORKER_RESULT_GENERIC_ERR = -2, // -2 - WORKER_RESULT_BAD_FILE = -3, // -3 - WORKER_RESULT_TOO_MANY_FILES = -4, // -4 - WORKER_RESULT_NAND_CORRUPT = -5, // -5 - WORKER_RESULT_ALREADY_EXISTS = -6, // -6 - WORKER_RESULT_NO_SPACE = -7, // -7 - WORKER_RESULT_SYSFILES_CORRUPT = -8, // -8 - WORKER_RESULT_BROKEN_MEDIA = -9, // -9 - WORKER_RESULT_ILLEGAL_MEDIA = -10, // -10 - WORKER_RESULT_WRITE_PROTECTED = -11, // -11 - WORKER_RESULT_UNK_N12 = -12, // -12 - WORKER_RESULT_NOCOPY = -13, // -13 - WORKER_RESULT_ES_ERROR = -14, // -14 - WORKER_RESULT_NOT_TRANSFERRABLE = -15, // -15 - WORKER_RESULT_VERSION_ERR = -16, // -16 - WORKER_RESULT_UNK_N18 = -18, // -18 + RESULT_OK = 0, + RESULT_WORKING = -1, + RESULT_FATAL_SD_ERROR = -2, + RESULT_BAD_FILE = -3, + RESULT_TOO_MANY_FILES = -4, + RESULT_NAND_CORRUPT = -5, + RESULT_ALREADY_EXISTS = -6, + RESULT_OUT_OF_SPACE = -7, + RESULT_FA_ERROR = -8, // Not used in NandSDWorker. Name from SDVFWorker + RESULT_BROKEN_MEDIA = -9, + RESULT_ILLEGAL_MEDIA = -10, + RESULT_WRITE_PROTECTED = -11, + RESULT_UNK_N12 = -12, + RESULT_NOCOPY = -13, + RESULT_ES_ERROR = -14, + RESULT_NOT_TRANSFERRABLE = -15, + RESULT_VERSION_ERR = -16, + RESULT_SD_APP_LOC_NOT_FOUND = -17, + RESULT_UNK_18 = -18, }; + typedef struct SDAppMetaEntry { + ESTitleId titleId; + channel::SChanMgrMetaHeader metaHdr; + } SDAppMetaEntry; + + typedef struct AppBlocksInfo { + u32 bytes; + u32 blocks; + } AppBlocksInfo; + NandSDWorker(); ~NandSDWorker(); - void create(void* work, void* savesBuf, void* appsBuf, int prio); + void create(void* work, void* savesBuf, void* appsBuf, int priority); int get_async_result(); - SDState get_sd_state(); + WorkSDState get_sd_state(); u32 get_nand_save_num(); u32 get_nand_app_num(); @@ -74,34 +87,34 @@ namespace ipl { void mount_sd_async(); void format_sd_async(); - void iplNandSD_81348DFC(ESTitleId32, void*, void*); - void update_loc_dat_async(ESTitleId32* titleIds); - void read_loc_dat_async(ESTitleId32* titleIds); - void iplNandSD_81348E58(ESTitleId, void*, void*); + void get_sd_app_meta_async(ESTitleId32 titleId, u8* thumbnailBuf, SDAppMetaEntry* paramB); + void update_sd_app_location_async(ESTitleId32* titleIds); + void read_sd_app_location_async(ESTitleId32* titleIds); + void check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks); void check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles); - void iplNandSD_81348EA8(void*, void*, void*); + void iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC); - void iplNandSD_81349000(void*, void*); + void list_nand_apps_usage_async(void* ptrA, void* ptr); - void list_nand_app_async(ESTitleId*); - void list_nand_save_async(ESTitleId*); - void list_sd_app_async(ESTitleId32*); - void list_sd_save_async(ESTitleId32*); + void list_nand_app_async(ESTitleId* titleIdOut); + void list_nand_save_async(ESTitleId* titleIdOut); + void list_sd_app_async(ESTitleId32* titleIdOut); + void list_sd_save_async(ESTitleId32* titleIdOut); - void nand_app_exist_async(ESTitleId); - void sd_save_exist_async(ESTitleId32); + void nand_app_exist_async(ESTitleId titleId); + void sd_save_exist_async(ESTitleId32 titleId); - void nocopy_exist_nand_save_async(ESTitleId); - void nand_save_exist_async(ESTitleId); - void nand_save_exist_lo_async(ESTitleId32); - void sd_app_exist_async(ESTitleId32); - void both_app_exist_async(ESTitleId32); + void nocopy_exist_nand_save_async(ESTitleId titleId); + void nand_save_exist_async(ESTitleId titleId); + void nand_save_exist_lo_async(ESTitleId32 titleId); + void sd_app_exist_async(ESTitleId32 titleId); + void both_app_exist_async(ESTitleId32 titleId); void get_nand_user_free_area_async(); - void get_sd_free_area_async(u64* out); + void get_sd_free_area_async(ESTitleId* titleIdOut /*?*/); - void get_nand_app_thumbnail_async(ESTitleId titleId, void* lytBuf, channel::SChanMgrMetaHeader* file); - void get_sd_app_thumbnail_async(ESTitleId32 titleId, u8* lytBuf, channel::SChanMgrMetaHeader* file); + void get_nand_app_thumbnail_async(ESTitleId titleId, void* thumbnailBuf, channel::SChanMgrMetaHeader* file); + void get_sd_app_thumbnail_async(ESTitleId32 titleId, u8* thumbnailBuf, channel::SChanMgrMetaHeader* file); void get_nand_save_banner_async(ESTitleId titleId, WIISaveBannerFile* file); void get_sd_save_banner_async(ESTitleId32 titleId, WIISaveBannerFile* file); @@ -111,11 +124,11 @@ namespace ipl { void get_sd_save_size_async(ESTitleId32 titleId); void copy_nand_app_to_sd_async(ESTitleId titleId); - void copy_sd_app_to_nand_async(ESTitleId32 titleId, bool); + void copy_sd_app_to_nand_async(ESTitleId32 titleId, bool hidden); void copy_nand_save_to_sd_async(ESTitleId titleId); void copy_sd_save_to_nand_async(ESTitleId32 titleId); - void delete_nand_app_async(ESTitleId titleId, bool); + void delete_nand_app_async(ESTitleId titleId, bool hidden); void delete_sd_app_async(ESTitleId32 titleId); void delete_nand_save_async(ESTitleId titleId); @@ -144,183 +157,198 @@ namespace ipl { static bool is_available_data_only_titleidlo(ESTitleId32 titleId); inline static u32 workerWorkSize() { return sizeof(Work); } - inline static u32 heapSizeForAppWorker() { return appCacheHeapSize() + 0x40000; } + inline static u32 heapSizeForApmpWorker() { return appCacheHeapSize() + 0x40000; } inline static u32 heapSizeForSaveWorker() { return saveCacheHeapSize() + 0x40000; } + static const int SD_MAX_APP_PAGE = 20; + static const int SD_MAX_APP_INDEX = 12; + static const int SD_MAX_APP_TOTAL = (SD_MAX_APP_PAGE * SD_MAX_APP_INDEX); + + static const int SD_APP_BACKUP_THUMBNAIL_LENGTH = 0xC800; + protected: - enum WorkState { - WORKER_STATE_IDLE = 0x00, // 0x00 - WORKER_STATE_WORKING = 0x01, // 0x01 - }; + static const int FAT_PAGES = 8; + static const int DATA_PAGES = 32; + static const int TOTAl_PAGES = (FAT_PAGES + DATA_PAGES); + static const int STACK_SIZE = 0x20000; - struct Work { - FACacheBuf mFatCacheBuf[40]; // 0x00000 - FACachePage mFatCachePages[40]; // 0x05000 - u8 mHeap19000Buf[100 * 1024]; // 0x05640 - FADrvTbl mFatDriveTable; // 0x1e640 - FACacheSetting mFatCacheSetting; // 0x1e64c - nw4r::ut::List mSavesListNand; // 0x1e660 - nw4r::ut::List mSavesListSD; // 0x1e66c - nw4r::ut::List mAppsListNand; // 0x1e678 - nw4r::ut::List mAppsListSD; // 0x1e684 - MEMHeapHandle pHeap19000; // 0x1e690 - MEMHeapHandle pSaveCacheHeap; // 0x1e694 - MEMHeapHandle pAppCacheHeap; // 0x1e698 - MEMHeapHandle pBothHeap; // 0x1e69c - MEMAllocator mBothHeapAllocator; // 0x1e6a0 - u8 mThreadStack[0x20000]; // 0x1e6b0 - OSThread mThread; // 0x3e6b0 - OSMutex mMutex; // 0x3e9c8 - OSMessageQueue mMsgQueue; // 0x3e9e0 - OSMessage mMsgQueueBuf[8]; // 0x3ea00 - WorkState mState; // 0x3ea20 - s32 mAsyncResult; // 0x3ea24 - int mNandSaveNum; // 0x3ea28 - int mNandAppNum; // 0x3ea2c - int mSdSaveNum; // 0x3ea30 - int mSdAppNum; // 0x3ea34 - void* pParamA; // 0x3ea38 - void* pParamB; // 0x3ea3c - void* pParamC; // 0x3ea40 - u64 mTitleId; // 0x3ea48 - u64 mUid; // 0x3ea50 - BOOL mIsSDWriteProtected; // 0x3ea50 - int mSdMountErr; // 0x3ea5c - }; + typedef enum WorkState { + STATE_IDLE = 0, + STATE_WORKING + } WorkState; - struct AppCacheEntry { - u64 titleId; // 0x00000 - s32 mFileSize; // 0x00008 - s32 mThumbnailSize; // 0x0000c - nw4r::ut::Link mLink; // 0x00010 - u8 mThumbnail[100 * 1024]; // 0x00018 - channel::SChanMgrMetaHeader mMetaHdr; // 0x19018 - u8 unk_0x19018[8]; // 0x19618 - }; - struct SaveCacheEntry { - WIISaveBannerFile mBanner; // 0x0000 - u64 mTitleId; // 0xf0a0 - s32 mSize; // 0xf0a8 - nw4r::ut::Link mLink; // 0xf0ac - u8 unk_0xf0b4[12]; // 0xf0b4 - }; + typedef struct Work { + FACacheBuf cacheBuf[TOTAl_PAGES]; // 0x00 + FACachePage cachePages[TOTAl_PAGES]; // 0x5000 + u8 mHeap19000Buf[100 * 1024]; // 0x5640 + FADrvTbl driveTable; // 0x1E640 + FACacheSetting cacheSetting; // 0x1E64C + nw4r::ut::List nandSaveList; // 0x1E660 + nw4r::ut::List sdSaveList; // 0x1E66C + nw4r::ut::List nandAppList; // 0x1E678 + nw4r::ut::List sdAppList; // 0x1E684 + MEMHeapHandle mainHeap; // 0x1E690 + MEMHeapHandle saveCacheHeap; // 0x1E694 + MEMHeapHandle appCacheHeap; // 0x1E698 + MEMHeapHandle unkHeap; // 0x1E69C + MEMAllocator unkAllocator; // 0x1E6A0 + u8 threadStack[STACK_SIZE]; // 0x1E6B0 + OSThread thread; // 0x3e6B0 + OSMutex mutex; // 0x3e9C8 + OSMessageQueue msgQueue; // 0x3e9E0 + OSMessage messages[8]; // 0x3EA00 + WorkState state; // 0x3EA20 + s32 asyncResult; // 0x3EA24 + int nandSaveNum; // 0x3EA28 + int nandAppNum; // 0x3EA2c + int sdSaveNum; // 0x3EA30 + int sdAppNum; // 0x3EA34 + void* paramA; // 0x3EA38 + void* paramB; // 0x3EA3c + void* paramC; // 0x3EA40 + ESTitleId curTitleId; // 0x3EA48 + ESTitleId curUId; // 0x3EA50 + BOOL sdWriteProtected; // 0x3EA50 + int prevAsyncResult; // 0x3EA5C + } Work; - struct SDSaveBanner { - ESTitleId mTitleId; // 0x000 - u32 mHdrSize; // 0x008 - u8 mPerms; // 0x00c - u8 mAttrib; // 0x00d - u8 mMd5Digest[0x10]; // 0x00e - WIISaveBannerFile mBanner; // 0x020 - }; - struct SDAppBanner { - ESTitleId mTitleId; // 0x000 - u32 mThumbnailSize; // 0x008 - u8 mHdrMd5[0x10]; // 0x00c - u8 mIconMd5[0x10]; // 0x01c - u64 unk_0x030; // 0x030 - u64 unk_0x038; // 0x038 - channel::SChanMgrMetaHeader mMetaHdr; // 0x040 - }; + typedef struct AppCacheEntry { + u64 titleId; // 0x00 + s32 fileSize; // 0x08 + s32 thumbSize; // 0x0C + nw4r::ut::Link link; // 0x10 + u8 thumbnail[100 * 1024]; // 0x18 + channel::SChanMgrMetaHeader metaHdr; // 0x19018 + u8 unk_0x19018[8]; // 0x19618 + } AppCacheEntry; - struct ContentBin { - SDAppBanner hdr; // 0x0000 - u8 icon[0xc800]; // 0x0640 - }; + typedef struct SaveCacheEntry { + WIISaveBannerFile banner; // 0x00 + ESTitleId titleId; // 0xF0A0 + s32 size; // 0xF0A8 + nw4r::ut::Link link; // 0xF0AC + u8 unk_0xf0b4[12]; // 0xF0B4 + } SaveCacheEntry; - struct LocDat { - char mMagic[4]; // 0x000 - u8 mMd5Digest[0x10]; // 0x004 - ESTitleId32 mTitleIds[240]; // 0x014 - u8 mPadding[0xc]; // 0x3d4 - }; + typedef struct SDSaveBanner { + ESTitleId curTitleId; // 0x00 + u32 headerSize; // 0x08 + u8 perms; // 0x0C + u8 attr; // 0x0D + NETMD5Sum MD5Sum; // 0x0E + WIISaveBannerFile banner; // 0x20 + } SDSaveBanner; - enum WorkMessage { - MSG_TERMINATE = 0x01, // 0x01 - MSG_STARTUP = 0x02, // 0x02 - MSG_MOUNT_SD = 0x03, // 0x03 - MSG_LIST_NAND_SAVE = 0x04, // 0x04 - MSG_GET_NAND_SAVE_BANNER = 0x05, // 0x05 - MSG_LIST_SD_SAVE = 0x06, // 0x06 - MSG_GET_SD_SAVE_BANNER = 0x07, // 0x07 - MSG_GET_NAND_SAVE_SIZE = 0x08, // 0x08 - MSG_DEL_NAND_SAVE = 0x09, // 0x09 - MSG_GET_SD_SAVE_SIZE = 0x0a, // 0x0a - MSG_DEL_SD_SAVE = 0x0b, // 0x0b - MSG_INITIALIZE_NAND = 0x0c, // 0x0c - MSG_GET_NAND_USER_FREE_AREA = 0x0d, // 0x0d - MSG_COPY_NAND_SAVE_TO_SD = 0x0e, // 0x0e - MSG_COPY_SD_SAVE_TO_NAND = 0x0f, // 0x0f - MSG_FORMAT_SD = 0x10, // 0x10 - MSG_GET_SD_FREE_AREA = 0x11, // 0x11 - MSG_LIST_NAND_APP = 0x12, // 0x12 - MSG_GET_NAND_APP_THUMBNAIL = 0x13, // 0x13 - MSG_DEL_NAND_APP_A = 0x14, // 0x14 - MSG_COPY_NAND_APP_TO_SD = 0x15, // 0x15 - MSG_COPY_SD_APP_TO_NAND_A = 0x16, // 0x16 - MSG_LIST_SD_APP = 0x17, // 0x17 - MSG_DEL_SD_APP = 0x18, // 0x18 - MSG_GET_SD_APP_SIZE = 0x19, // 0x19 - MSG_GET_SD_APP_THUMBNAIL = 0x1a, // 0x1a - MSG_GET_NAND_APP_SIZE = 0x1b, // 0x1b - MSG_NOCOPY_EXIST_NAND_SAVE = 0x1c, // 0x1c - MSG_NAND_SAVE_EXIST = 0x1d, // 0x1d - MSG_NAND_SAVE_EXIST_LO = 0x1e, // 0x1e - MSG_NAND_APP_EXIST = 0x1f, // 0x1f - MSG_BOTH_APP_EXIST = 0x20, // 0x20 - MSG_SD_SAVE_EXIST = 0x21, // 0x21 - MSG_SD_APP_EXIST = 0x22, // 0x22 - MSG_GET_NAND_SAVE_PERMS = 0x23, // 0x23 - MSG_GET_SD_SAVE_PERMS = 0x24, // 0x24 - MSG_MOVE_NAND_SAVE_TO_SD = 0x25, // 0x25 - MSG_MOVE_SD_SAVE_TO_NAND = 0x26, // 0x26 - MSG_MOVE_NAND_APP_TO_SD = 0x27, // 0x27 - MSG_MOVE_SD_APP_TO_NAND = 0x28, // 0x28 - MSG_UNK_x29 = 0x29, // 0x29 - MSG_UPDATE_LOC_DAT = 0x2a, // 0x2a - MSG_READ_LOC_DAT = 0x2b, // 0x2b - MSG_UNK_x2c = 0x2c, // 0x2c - MSG_LIST_NAND_APPS_USAGES = 0x2d, // 0x2d - MSG_CHECK_BACKUP_FITS = 0x2e, // 0x2e - MSG_COPY_SD_APP_TO_NAND_B = 0x2f, // 0x2f - MSG_DEL_NAND_APP_B = 0x30, // 0x30 - MSG_UNK_x31 = 0x31, // 0x31 - MSG_CHANGE_NAND_APP_COUNT = 0x32, // 0x32 - MSG_CHECK_SD_TITLE_RESTORABLE = 0x33, // 0x33 - }; + typedef struct SDAppBanner { + ESTitleId titleId; // 0x00 + u32 thumbSize; // 0x08 + NETMD5Sum headerMD5; // 0x0C + NETMD5Sum iconMD5; // 0x1C + u64 unk_0x30; + u64 unk_0x38; + channel::SChanMgrMetaHeader metaHdr; // 0x40 + } SDAppBanner; - enum RecursiveProcess { + typedef struct SDAppBackupData { + SDAppBanner head; // 0x00 + u8 thumbnail[SD_APP_BACKUP_THUMBNAIL_LENGTH]; // 0x640 + } SDAppBackupData; + + typedef struct SDAppLocation { + char signature[4]; // 0x00 + NETMD5Sum MD5Sum; // 0x04 + ESTitleId32 titleIds[SD_MAX_APP_TOTAL]; // 0x14 + u8 padding[0xC]; // 0x3D4 + } SDAppLocation; + + typedef enum WorkMessage { + MESSAGE_NONE = 0, + MESSAGE_TERMINATE, + MESSAGE_STARTUP, + MESSAGE_MOUNT_SD, + MESSAGE_LIST_NAND_SAVE, + MESSAGE_GET_NAND_SAVE_BANNER, + MESSAGE_LIST_SD_SAVE, + MESSAGE_GET_SD_SAVE_BANNER, + MESSAGE_GET_NAND_SAVE_SIZE, + MESSAGE_DEL_NAND_SAVE, + MESSAGE_GET_SD_SAVE_SIZE, + MESSAGE_DEL_SD_SAVE, + MESSAGE_INITIALIZE_NAND, + MESSAGE_GET_NAND_USER_FREE_AREA, + MESSAGE_COPY_NAND_SAVE_TO_SD, + MESSAGE_COPY_SD_SAVE_TO_NAND, + MESSAGE_FORMAT_SD, + MESSAGE_GET_SD_FREE_AREA, + MESSAGE_LIST_NAND_APP, + MESSAGE_GET_NAND_APP_THUMBNAIL, + MESSAGE_DEL_NAND_APP, + MESSAGE_COPY_NAND_APP_TO_SD, + MESSAGE_COPY_SD_APP_TO_NAND_HIDDEN, + MESSAGE_LIST_SD_APP, + MESSAGE_DEL_SD_APP, + MESSAGE_GET_SD_APP_SIZE, + MESSAGE_GET_SD_APP_THUMBNAIL, + MESSAGE_GET_NAND_APP_SIZE, + MESSAGE_NOCOPY_EXIST_NAND_SAVE, + MESSAGE_NAND_SAVE_EXIST, + MESSAGE_NAND_SAVE_EXIST_LO, + MESSAGE_NAND_APP_EXIST, + MESSAGE_BOTH_APP_EXIST, + MESSAGE_SD_SAVE_EXIST, + MESSAGE_SD_APP_EXIST, + MESSAGE_GET_NAND_SAVE_PERMS, + MESSAGE_GET_SD_SAVE_PERMS, + MESSAGE_MOVE_NAND_SAVE_TO_SD, + MESSAGE_MOVE_SD_SAVE_TO_NAND, + MESSAGE_MOVE_NAND_APP_TO_SD, + MESSAGE_MOVE_SD_APP_TO_NAND, + MESSAGE_GET_SD_APP_META, + MESSAGE_UPDATE_SD_APP_LOCATION, + MESSAGE_READ_SD_APP_LOCATION, + MESSAGE_CHECK_FOR_SD_APP_TO_NAND, + MESSAGE_LIST_NAND_APPS_USAGE, + MESSAGE_CHECK_BACKUP_FITS, + MESSAGE_COPY_SD_APP_TO_NAND, + MESSAGE_DEL_NAND_APP_HIDDEN, + MESSAGE_UNK_49, + MESSAGE_CHANGE_NAND_APP_COUNT, + MESSAGE_CHECK_SD_TITLE_RESTORABLE + } WorkMessage; + + typedef enum RecursiveProcess { RECURSIVE_GET_SIZE = 0, - RECURSIVE_DELETE = 1, - RECURSIVE_MOVE = 2, - }; + RECURSIVE_DELETE, + RECURSIVE_MOVE, + } RecursiveProcess; - enum FileKind { - FILEKIND_NAND = 1, - FILEKIND_ES_CONTENT = 2, - }; + typedef enum FileKind { + FILEKIND_NONE = 0, + FILEKIND_NAND, + FILEKIND_ES_CONTENT, + } FileKind; - enum NandTitleExistence { + typedef enum NandTitleExistence { EXISTENCE_NOEXIST = 0, - EXISTENCE_INCOMPLETE = 1, - EXISTENCE_COMPLETE = 2, - }; + EXISTENCE_INCOMPLETE, + EXISTENCE_COMPLETE, + } NandTitleExistence; inline static u32 appCacheHeapSize() { return MEMCalcHeapSizeForUnitHeap(sizeof(AppCacheEntry), 96, 0x20); } inline static u32 saveCacheHeapSize() { return MEMCalcHeapSizeForUnitHeap(sizeof(SaveCacheEntry), 90, 0x20); } - static void sd_insert_callback(signed char driveLetter); - static void sd_eject_callback(signed char driveLetter); + static void sd_insert_callback(s8 driveLetter); + static void sd_eject_callback(s8 driveLetter); static ESTitleId32 gamecode_to_titleid_lo(const char* gamecode); - static void* thread_main(void*); + static void* thread_main(void* work); static int encrypt(const void* input, u32 inputSize, void* output); static int decrypt(const void* input, u32 inputSize, void* output); bool check_md5(const u8* digest, const u8* input, u32 inputSize); - bool check_nand_corrupt(s32 nandCode, s32* errcodeOut); + bool check_nand_corrupt(s32 nandErr, s32* result); WorkState get_state(); void set_state(WorkState newState); @@ -335,9 +363,9 @@ namespace ipl { void delete_app_cache(nw4r::ut::List* list, ESTitleId titleId); WIISaveBannerFile* get_cached_nand_save_banner(ESTitleId titleId); - void* get_cached_nand_app_thumbnail(ESTitleId titleId, u32*); + void* get_cached_nand_app_thumbnail(ESTitleId titleId, u32* sizeOut); WIISaveBannerFile* get_cached_sd_save_banner(ESTitleId32 titleId); - void* get_cached_sd_app_thumbnail(ESTitleId32 titleId, u32*); + void* get_cached_sd_app_thumbnail(ESTitleId32 titleId, u32* sizeOut); channel::SChanMgrMetaHeader* get_cached_nand_app_meta_header(ESTitleId titleId); channel::SChanMgrMetaHeader* get_cached_sd_app_meta_header(ESTitleId32 titleId); @@ -351,17 +379,12 @@ namespace ipl { void* run(); - /** - * @brief Verifies if the banner header is valid. - * @param pBnrData The buffer containing the banner data. - * @param headerSize Header file size. - */ bool check_header_base(const u8* bnrData, u32* headerSize = NULL); - void send_work(WorkMessage); + void send_work(WorkMessage msg); WorkMessage wait_work(); - int get_nand_save_banner(ESTitleId titleId, WIISaveBannerFile* fileOut, u32* sizeOut); + int get_nand_save_banner(ESTitleId titleId, WIISaveBannerFile* bannerFile, u32* sizeOut); int get_sd_save_banner(ESTitleId32 titleId, SDSaveBanner* bannerOut); int get_sd_app_banner(ESTitleId32 titleId, SDAppBanner* bannerOut); int get_save_banner_for_data_only_title(ESTitleId titleId, WIISaveBannerFile* fileOut, u32* sizeOut); @@ -379,19 +402,19 @@ namespace ipl { int get_sd_save_size(ESTitleId32 titleId); int get_sd_app_size(ESTitleId32 titleId); - s32 get_nand_app_thumbnail(ESTitleId titleId, u8* thumbnailOut, channel::SChanMgrMetaHeader* metaHdrOut); + s32 get_nand_app_thumbnail(ESTitleId titleId, u8* thumbnailBuf, channel::SChanMgrMetaHeader* metaHdrOut); int item_exist_nand_save_folder(ESTitleId titleId, const char* folderName); bool check_nand_save_banner_exist(ESTitleId titleId); - bool nand_app_exist(ESTitleId titleId); + bool nand_app_exist(ESTitleId titleId) NO_INLINE; int nand_app_exist_ex(ESTitleId titleId); bool both_app_exist(ESTitleId32 titleId); int sd_file_exist(const char* path, u32 size); s32 nand_get_length(const char* path); - bool is_all_region(ESTitleId titleId); - bool is_same_title(ESTitleId titleIdA, ESTitleId titleIdB); + bool is_all_region(ESTitleId titleId) NO_INLINE; + bool is_same_title(ESTitleId titleIdA, ESTitleId titleIdB) NO_INLINE; bool check_nand_save_exist_lo(ESTitleId32 titleId); @@ -415,9 +438,9 @@ namespace ipl { int handle_sd_error(FAError err, s32* out); int handle_sd_error_for_entry(FAError err, s32* out); - s32 get_sd_app_thumbnail(const SDAppBanner* banner, u8* thumbnailOut); + s32 get_sd_app_thumbnail(const SDAppBanner* banner, u8* thumbnailBuf); - int get_sd_wad_header(ESTitleId32 titleid, WADBackupHeader*, u32 offset); + int get_sd_wad_header(ESTitleId32 titleid, WADBackupHeader* wadBackupHeader, u32 offset); int get_nand_title_version(ESTitleId titleId, u16* versionOut); int get_sd_title_version(ESTitleId32 titleId, u16* versionOut); @@ -428,25 +451,25 @@ namespace ipl { int delete_empty_title(ESTitleId titleId, bool force); int create_sd_backup_dir(ESTitleId titleId); int create_sd_dir(const char* base, const char* final); - int get_app_banner_from_meta(ESTitleId titleId, SDAppBanner* banner); + int get_app_banner_from_meta(ESTitleId titleId, SDAppBackupData* banner); s32 open_nand_app_content(ESTitleId titleId, u16 contentIdx, u32* sizeOut, ESTicketView** ticketViewOut); int read_file(void*, FileKind fileKind, s32, u32, void*); int get_nand_app_tmdview(ESTitleId titleId, ESTmdView** tmdViewOut); static bool content_exist(ESTmdView* tmdView, u32 contentIdx); - s32 search_meta_header(const u8* buf); + int search_meta_header(const u8* buffer); bool check_header_md5(u8* buf); s32 uncompress_app_thumbnail(const u8* cmpr, u32 uncmprSize, u8* uncmpr); - s32 get_sd_entry_list(const char* filename, ESTitleId32* titleIdsOut, u32 minSize); + s32 get_sd_entry_list(const char* fileName, ESTitleId32* titleIdsOut, u32 minSize); static void decompress(const u8* in, void* out); - static bool is_compressed(const u8*); - static bool is_sli_compressed(const u8*); - static bool is_asr_compressed(const u8*); - static bool is_ash_compressed(const u8*); - static bool is_lz7_compressed(const u8*); - static u32 get_decode_size(const u8*); + static bool is_compressed(const u8* data); + static bool is_sli_compressed(const u8* data); + static bool is_asr_compressed(const u8* data); + static bool is_ash_compressed(const u8* data); + static bool is_lz7_compressed(const u8* data); + static u32 get_decode_size(const u8* data); private: // static void get_nand_save_path(ESTitleId titleId, char* outStr); @@ -472,17 +495,17 @@ namespace ipl { void do_copy_nand_save_to_sd(); void do_copy_sd_save_to_nand(); void do_copy_nand_app_to_sd(); - void do_copy_sd_app_to_nand(bool ignoreSC); + void do_copy_sd_app_to_nand(bool changeAppCount); void do_get_nand_app_size(); void do_format_sd(); - void do_unk_8134B728(); - void do_update_loc_dat(); - void do_read_loc_dat(); - void do_unk_8134BED0(); + void do_get_sd_app_meta(); + void do_update_sd_app_location(); + void do_read_sd_app_location(); + void do_check_for_sd_app_to_nand(); void check_backup_fits(); - void do_list_nand_apps_usages(); + void do_list_nand_apps_usage(); void do_unk_8134C838(); void do_move_nand_app_to_sd(); @@ -493,14 +516,14 @@ namespace ipl { void change_nand_app_count(s32 delta); bool change_uid(ESTitleId newTitleId); - bool is_fa_file(u8 stat); + bool is_fa_file(u8 stat) NO_INLINE; - int prepare_sd_copy(const char*); + int prepare_sd_copy(const char* path); static void wad_backup_progress_callback(u32 completed, u32 total, BOOL done); - Work* pWork; // 0x0 - bool unk_0x4; // 0x4 + Work* myWork; // 0x00 + bool unk_0x04; // 0x04 static const char* c_banner_file_name; static const char* c_nocopy_folder_name; @@ -518,7 +541,7 @@ namespace ipl { static const u8 c_md5_secret_key[0x10]; static const u8 c_es_encrypt_iv[0x10]; - static SDState s_sd_state; + static WorkSDState s_sd_state; static int s_completion_pct; }; } // namespace ipl diff --git a/include/system/iplSDVFWorker.h b/include/system/iplSDVFWorker.h index 195d9113..35301f00 100644 --- a/include/system/iplSDVFWorker.h +++ b/include/system/iplSDVFWorker.h @@ -8,11 +8,6 @@ #include namespace ipl { -#define FAT_PAGES 4 -#define DATA_PAGES 4 -#define TOTAl_PAGES (FAT_PAGES + DATA_PAGES) -#define STACK_SIZE 0x20000 - class SDVFWorker { public: typedef enum WorkMessage { @@ -31,27 +26,32 @@ namespace ipl { } WorkState; typedef enum WorkSDState { - SD_STATE_UNAVAILABLE = 0, + SD_STATE_INITIAL = 0, SD_STATE_EJECTED, SD_STATE_INSERTED, SD_STATE_BROKEN, SD_STATE_ERROR, - SD_STATE_AVAILABLE, + SD_STATE_READY, } WorkSDState; enum { RESULT_SUCCESS = 0, - RESULT_STILL_WORKING = -1, + RESULT_WORKING = -1, RESULT_FATAL_SD_ERROR = -2, RESULT_NAND_CORRUPT = -5, // Unused but checked by CdbBackup RESULT_OUT_OF_SPACE = -7, RESULT_FA_ERROR = -8, - RESULT_SD_BROKEN = -9, + RESULT_BROKEN_MEDIA = -9, RESULT_SD_ERROR = -10, RESULT_WRITE_PROTECTED = -11, }; private: + static const int FAT_PAGES = 4; + static const int DATA_PAGES = 4; + static const int TOTAl_PAGES = (FAT_PAGES + DATA_PAGES); + static const int STACK_SIZE = 0x20000; + typedef struct Work { FACacheBuf cacheBuf[TOTAl_PAGES]; // 0x00 FACachePage cachePages[TOTAl_PAGES]; // 0x1000 @@ -68,8 +68,8 @@ namespace ipl { OSMessageQueue msgQueue; // 0x21490 OSMessage messages[8]; // 0x214B0 - WorkState workState; // 0x214D0 - int asyncResult; // 0x214D4 + WorkState state; // 0x214D0 + s32 asyncResult; // 0x214D4 BOOL isWriteProtected; // 0x214D8 int prevAsyncResult; // 0x214DC int priority; // 0x214E0 @@ -102,7 +102,7 @@ namespace ipl { int call_fa_mount(); - void send_work(WorkMessage messsage); + void send_work(WorkMessage message); WorkMessage wait_work(); WorkState get_state(); diff --git a/include/system/iplSaveBanner.h b/include/system/iplSaveBanner.h new file mode 100644 index 00000000..089dbe89 --- /dev/null +++ b/include/system/iplSaveBanner.h @@ -0,0 +1,51 @@ +#ifndef IPL_SAVE_BANNER_H +#define IPL_SAVE_BANNER_H + +#include +#include + +// uhh idk :P + +#define WII_SAVE_BANNER_SIGNATURE 'WIBN' /* WIi save BaNner? */ +#define WII_SAVE_BANNER_LENGTH 32 + +#define WII_SAVE_BANNER_ICON_COUNT 8 + +#define WII_SAVE_BANNER_ICON_TEXSIZE 0x1200 +#define WII_SAVE_BANNER_ICON_WIDTH 48 +#define WII_SAVE_BANNER_ICON_HEIGHT 48 + +#define WII_SAVE_BANNER_BNR_TEXSIZE 0x6000 +#define WII_SAVE_BANNER_BNR_WIDTH 192 +#define WII_SAVE_BANNER_BNR_HEIGHT 64 + +#define WII_SAVE_BANNER_FRAME_TICK 4 + +#define WII_SAVE_BANNER_NORMAL_SIZE offsetof(WIISaveBannerFile, iconData1) +#define WII_SAVE_BANNER_FULL_SIZE sizeof(WIISaveBannerFile) + +#define WII_SAVE_BANNER_FLAG_NOCOPY 0x01 +#define WII_SAVE_BANNER_FLAG_ALTERNATE 0x10 + +typedef struct WIISaveBannerFile { + u32 signature; // 0x00 + u32 flags; // 0x04 + u16 speed; // 0x08 + u8 padding[22]; + + wchar_t name[WII_SAVE_BANNER_LENGTH]; // 0x20 + wchar_t subName[WII_SAVE_BANNER_LENGTH]; // 0x60 + + u8 bannerData[WII_SAVE_BANNER_BNR_TEXSIZE]; // 0xA0 + + u8 iconData[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0x60A0 + u8 iconData1[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0x72A0 + u8 iconData2[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0x84A0 + u8 iconData3[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0x96A0 + u8 iconData4[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0xA8A0 + u8 iconData5[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0xBAA0 + u8 iconData6[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0xCCA0 + u8 iconData7[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0xDEA0 +} WIISaveBannerFile; + +#endif // IPL_SAVE_BANNER_H diff --git a/include/titledb.h b/include/titledb.h index 9970b688..b3e58f04 100644 --- a/include/titledb.h +++ b/include/titledb.h @@ -4,16 +4,22 @@ #include // clang-format off -#define TITLE_TYPE_SYSTEM 0x00000001 -#define TITLE_TYPE_DISC 0x00010000 -#define TITLE_TYPE_CHANNEL 0x00010001 -#define TITLE_TYPE_SYSTEM_CHANNEL 0x00010002 -#define TITLE_TYPE_UNK3 0x00010003 -#define TITLE_TYPE_DISC_CHANNEL 0x00010004 -#define TITLE_TYPE_DLC 0x00010005 -#define TITLE_TYPE_UNK6 0x00010006 -#define TITLE_TYPE_UNK7 0x00010007 -#define TITLE_TYPE_HIDDEN_CHANNEL 0x00010008 +#define TITLE_HITYPE_SYSTEM 0x0000 +#define TITLE_HITYPE_USER 0x0001 + +/* System */ +#define TITLE_TYPE_SYSTEM ((TITLE_HITYPE_SYSTEM << 16) | 0x0001) /* 0x00000001 */ + +/* User */ +#define TITLE_TYPE_DISC ((TITLE_HITYPE_USER << 16) | 0x0000) /* 0x00010000 */ +#define TITLE_TYPE_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0001) /* 0x00010001 */ +#define TITLE_TYPE_SYSTEM_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0002) /* 0x00010002 */ +#define TITLE_TYPE_UNK3 ((TITLE_HITYPE_USER << 16) | 0x0003) /* 0x00010003 */ +#define TITLE_TYPE_DISC_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0004) /* 0x00010004 */ +#define TITLE_TYPE_SHARED ((TITLE_HITYPE_USER << 16) | 0x0005) /* 0x00010005 */ +#define TITLE_TYPE_UNK6 ((TITLE_HITYPE_USER << 16) | 0x0006) /* 0x00010006 */ +#define TITLE_TYPE_UNK7 ((TITLE_HITYPE_USER << 16) | 0x0007) /* 0x00010007 */ +#define TITLE_TYPE_HIDDEN_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0008) /* 0x00010008 */ #define TITLE_REGION_ALL 'A' #define TITLE_REGION_JPN 'J' @@ -21,6 +27,9 @@ #define TITLE_REGION_EUR 'P' #define TITLE_REGION_KOR 'K' +#define TITLE_TYPE_HI(x) ((((u32)(x) >> 16) & 0xFFFF)) +#define TITLE_TYPE_LO(x) (((u32)(x) & 0xFFFF)) + #define TITLE_NULL ((ESTitleId)0x0000000000000000) /* Photo Channel 1.0 */ @@ -80,6 +89,9 @@ #define TITLE_PHOTO_2_CHECK_ALL ((ESTitleId)(TITLE_PHOTO_2_CHECK | TITLE_REGION_ALL)) #define TITLE_PHOTO_2_CHECK_KOR ((ESTitleId)(TITLE_PHOTO_2_CHECK | TITLE_REGION_KOR)) /* does such title even exist? */ +/* Photo Channel 1.1 (Dummy) */ +#define TITLE_UPDATE_PART ES_TITLE_ID(TITLE_TYPE_DISC, '\0UP\0') + #define TITLE_NOREGION_MASK (0xFFFFFFFFFFFFFF00) #define TITLE_REGION_MASK (0x00000000000000FF) diff --git a/include/utility/iplESMisc.h b/include/utility/iplESMisc.h index 54ee44f9..62b27e52 100644 --- a/include/utility/iplESMisc.h +++ b/include/utility/iplESMisc.h @@ -60,7 +60,7 @@ namespace ipl { static u32 NumInodesSaveDirRoot(ESTitleId titleId); - static BOOL CheckSafeDeleteTitle(EGG::Heap* heap, ESTitleId titleId); + static s32 CheckSafeDeleteTitle(EGG::Heap* heap, ESTitleId titleId); static ESError PrepareTitleDir(ESTitleId titleId, EGG::Heap* heap); diff --git a/include/utility/iplStack.h b/include/utility/iplStack.h index 5cf2228e..ab73d228 100644 --- a/include/utility/iplStack.h +++ b/include/utility/iplStack.h @@ -14,12 +14,12 @@ namespace ipl { u8 data[]; }; - FreeList() : pFreeTop(NULL), mStride(0), pBuf(NULL) {} + FreeList() : mpFreeTop(NULL), mStride(0), mpBuffer(NULL) {} void init(void* buf, u32 stride, u32 count) { - pFreeTop = (Block*)buf; + mpFreeTop = (Block*)buf; - Block* ptrBuf = pFreeTop; + Block* ptrBuf = mpFreeTop; int i; u32 ptrsStride = stride / sizeof(Block*); for (i = 0; i < count - 1; i++) { @@ -28,28 +28,28 @@ namespace ipl { ptrBuf[ptrsStride * (count - 1)].next = NULL; mStride = stride; - pBuf = buf; + mpBuffer = buf; } Block* get() { - Block* out = pFreeTop; + Block* out = mpFreeTop; if (out == NULL) return NULL; - pFreeTop = pFreeTop->next; + mpFreeTop = mpFreeTop->next; return out; } void release(Block* block) { - block->next = pFreeTop; - pFreeTop = block; + block->next = mpFreeTop; + mpFreeTop = block; } - void* getBuf() { return pBuf; } + void* getBuf() { return mpBuffer; } private: - Block* pFreeTop; // 0x0 - u32 mStride; // 0x4 - void* pBuf; // 0x8 + Block* mpFreeTop; // 0x00 + u32 mStride; // 0x04 + void* mpBuffer; // 0x08 }; class Stack : private FreeList { @@ -64,6 +64,21 @@ namespace ipl { mCount = 0; } + bool pop(void* data) { + Block* popped = pStackTop; + if (popped != NULL) { + if (data != NULL) { + memcpy(data, popped->data, mStackElSize); + } + pStackTop = popped->next; + release(popped); + mCount--; + return true; + } else { + return false; + } + } + bool push(const void* data) { FreeList::Block* newBlock = get(); if (newBlock != NULL) { @@ -77,21 +92,6 @@ namespace ipl { } } - bool pop(void* data) { - Block* popped = this->pStackTop; - if (popped != NULL) { - if (data != NULL) { - memcpy(data, popped->data, mStackElSize); - } - pStackTop = popped->next; - release(popped); - mCount--; - return true; - } else { - return false; - } - } - void* getBuf() { return FreeList::getBuf(); } static inline u32 getRequiredBufSize(u32 capacity, u32 elSize) { return (elSize + sizeof(FreeList::Block)) * capacity; } @@ -101,17 +101,6 @@ namespace ipl { u32 mStackElSize; // 0x10 u32 mCount; // 0x14 }; - - void CONCAT(FORCEACTIVE_ipl_ut_Stack, __LINE__)(); - void CONCAT(FORCEACTIVE_ipl_ut_Stack, __LINE__)() { - ut::FreeList freeList; - freeList.init(NULL, 0, 0); - freeList.get(); - - ut::Stack stack; - stack.init(NULL, 0, 0); - stack.pop(NULL); - } } // namespace ut } // namespace ipl diff --git a/include/utility/iplTree.h b/include/utility/iplTree.h index d133160c..aaae6312 100644 --- a/include/utility/iplTree.h +++ b/include/utility/iplTree.h @@ -7,7 +7,7 @@ namespace ipl { public: Tree(); - virtual ~Tree() {}; // 0x08 + virtual ~Tree(){}; // 0x08 virtual Tree* getParent() { return mpParent; } // 0x0C virtual Tree* getChild() { return mpChild; } // 0x10 @@ -47,8 +47,9 @@ namespace ipl { mPtr = mPtr->getNext(); } else { while ((mPtr = mPtr->getParent())) { - if (!mPtr->getNext()) + if (!mPtr->getNext()) { continue; + } mPtr = mPtr->getNext(); break; diff --git a/libs/NW4R/include/nw4r/lyt/resources.h b/libs/NW4R/include/nw4r/lyt/resources.h index c4c9ba42..8bdad23f 100644 --- a/libs/NW4R/include/nw4r/lyt/resources.h +++ b/libs/NW4R/include/nw4r/lyt/resources.h @@ -4,7 +4,6 @@ #include #include - #include #include diff --git a/libs/NW4R/include/nw4r/ut/ArchiveFont.h b/libs/NW4R/include/nw4r/ut/ArchiveFont.h index e54a1805..958a4c9b 100644 --- a/libs/NW4R/include/nw4r/ut/ArchiveFont.h +++ b/libs/NW4R/include/nw4r/ut/ArchiveFont.h @@ -1,206 +1,10 @@ #ifndef NW4R_UT_ARCHIVE_FONT_H #define NW4R_UT_ARCHIVE_FONT_H -#include -#include -#include -#include +#include "nw4r/ut/ArchiveFontBase.h" namespace nw4r { namespace ut { - namespace detail { - inline u32 CalcOffsetNameOffsetData() { - return offsetof(ArchiveFontBinaryLayout, glgr.inner.nameOffsets); - } - - inline u32 CalcOffsetSheetData(u16 countNames) { - return ROUNDUP(CalcOffsetNameOffsetData() + countNames * sizeof(u16), 4); - } - inline u32 CalcOffset0AData(u16 countNames, u16 countSheets) { - return ROUNDUP(CalcOffsetSheetData(countNames) + countSheets * sizeof(u32), 4); - } - inline u32 CalcOffset0CData(u16 countNames, u16 countSheets, u16 count0A) { - return ROUNDUP(CalcOffset0AData(countNames, countSheets) + count0A * sizeof(u32), 4); - } - - inline u32 CalcSizeFlagSet(u32 entries) { - return ((s32)entries + 0x1f) / 32 * 4; - } - - inline u32 CalcOffsetSheetFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) { - return ROUNDUP(CalcOffset0CData(countNames, countSheets, count0A) + count0C * sizeof(u32), 4); - } - inline u32 CalcOffset0AFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) { - u32 offsetSheetFlags = CalcOffsetSheetFlags(countNames, countSheets, count0A, count0C); - u32 stepSheet = CalcSizeFlagSet(countSheets); - return ROUNDUP(offsetSheetFlags + stepSheet * countNames, 4); - } - inline u32 CalcOffset0CFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) { - u32 offset0AFlags = CalcOffset0AFlags(countNames, countSheets, count0A, count0C); - u32 step0A = CalcSizeFlagSet(count0A); - return ROUNDUP(offset0AFlags + step0A * countNames, 4); - } - - inline u32 CalcSizeSheetOffsets(u32 countSheets) { - return ROUNDUP(countSheets * sizeof(u16), 4); - } - - class ArchiveFontBase : public ResFontBase { - public: - ArchiveFontBase(); - virtual ~ArchiveFontBase(); - - // protected: - typedef enum { - CONSTRUCT_STATE_DATA_REQUESTED = 0x00, - CONSTRUCT_STATE_DONE = 0x01, - CONSTRUCT_STATE_FATAL_ERR = 0x02, - CONSTRUCT_STATE_WORKING = 0x03, - } ConstructState; - - typedef enum { - CONSTRUCT_CMD_DISPATCH = 0x00, - CONSTRUCT_CMD_ANALYZE_FILE_HEADER = 0x01, - CONSTRUCT_CMD_ANALYZE_GLGR = 0x02, - CONSTRUCT_CMD_ANALYZE_FINF = 0x03, - CONSTRUCT_CMD_ANALYZE_CMAP = 0x04, - CONSTRUCT_CMD_ANALYZE_CWDH = 0x05, - CONSTRUCT_CMD_ANALYZE_TGLP = 0x06, - CONSTRUCT_CMD_PREPAIR_COPY_SHEET = 0x07, - CONSTRUCT_CMD_PREPAIR_EXPAND_SHEET = 0x08, - CONSTRUCT_CMD_COPY = 0x09, - CONSTRUCT_CMD_SKIP = 0x0A, - CONSTRUCT_CMD_EXPAND = 0x0B, - CONSTRUCT_CMD_FATAL_ERR = 0x0C, - - CONSTRUCT_CMD_MAX_CMD = 0x0D, - CONSTRUCT_CMD_INVALID = 0x0E, - } ConstructCmd; - - class ConstructContext; - class CachedStreamReader { - public: - void Init(); - void Attach(const void* data, u32 dataLen); - bool RequestData(ConstructContext* ctx, u32 len); - - inline u32 amtAvailableData() const { return pDataEnd - pDataCurr; } - inline u32 amtAvailableCached() const { return pCachedEnd - pCachedStart; } - inline u32 amtAvailable() const { return amtAvailableData() + amtAvailableCached(); } - - inline u32 getReaderOffset() const { return (pDataCurr - pDataStart) + (pCachedStart - pCachedBase); } - - inline void memcpyToBuf(void* buf, u32 len); - inline void skip(u32 len); - - u8* pDataStart; // 0x00 - u8* pDataCurr; // 0x04 - u8* pDataEnd; // 0x08 - u8* pCachedBase; // 0x0C - u8* pCachedStart; // 0x10 - u8* pCachedEnd; // 0x14 - u32 unk_0x18; // 0x18 - }; - class ConstructContext { - public: - inline u32 getAdvanceSize(const CachedStreamReader* reader) const { return ut::Min(mNextCmdParam, reader->amtAvailable()); } - inline u32 remWorkSpace() const { return pWorkEnd - pWorkCurr; } - - inline u32 getFullOffset(CachedStreamReader* reader) const { return mDataOffset + reader->getReaderOffset(); } - inline ConstructState requestNewData(CachedStreamReader* reader, u32 amt); - - inline void getNumSheetsToLoad(u16* sheetsToLoad) const; - inline u32 updateTextureBlockPtr(); - - inline void enqueueCmds(ConstructCmd first, u32 firstParam, ConstructCmd after) { - mNextCmdParam = firstParam; - mNextCmd = first; - mQueuedCmd = after; - } - - inline void pushCWDH() { - FontWidth* cwdh; - cwdh = (FontWidth*)pWorkCurr; - if (pLastWidth != NULL) - pLastWidth->pNext = cwdh; - else - pFontInfo->pWidth = cwdh; - - pLastWidth = cwdh; - } - inline void pushCMAP() { - FontCodeMap* cmap; - cmap = (FontCodeMap*)pWorkCurr; - if (pLastMap != NULL) - pLastMap->pNext = cmap; - else - pFontInfo->pMap = cmap; - - pLastMap = cmap; - } - - FontInformation* pFontInfo; // 0x00 - FontWidth* pLastWidth; // 0x04 - FontCodeMap* pLastMap; // 0x08 - u32 mNextCmd; // 0x0C - BinaryBlockHeader mNextBlockHdr; // 0x10 - u32 mDataOffset; // 0x18 - CachedStreamReader mReader; // 0x1C - CXUncompContextHuffman* pHuffmanCtx; // 0x38 - const char* pIncludedGroups; // 0x3C - u16* pSheetOffsets; // 0x40 - u8* pWorkStart; // 0x44 - u8* pWorkEnd; // 0x48 - u8* pWorkCurr; // 0x4C - u32 mQueuedCmd; // 0x50 - u32 mNextCmdParam; // 0x54 - u32 mTotalBlocks; // 0x58 - u32 mBlocksParsed; // 0x5C - u16 mSheetsHandled; // 0x60 - u16 mSheetCount; // 0x62 - u16 mGlyphsPerSheet; // 0x64 - }; - - static bool IsValidResource(const void* data, u32 maxPreFinfSize); - CharWidths GetCharWidths(u16 charcode) const; - void SetResourceBuffer(void* pUserBuffer, FontInformation* pFontInfo, u16* pSheetOffsets); - u16 AdjustIndex(u16 glyphIdx) const; - static bool IncludeName(const char* nameList, const char* testName); - - protected: - static ConstructState ConstructOpDispatch(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpAnalyzeFileHeader(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpAnalyzeFINF(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpAnalyzeTGLP(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpAnalyzeCMAP(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpAnalyzeCWDH(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpPrepairCopySheet(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpPrepairExpandSheet(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpCopy(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpSkip(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpExpand(ConstructContext* ctx, CachedStreamReader* reader); - static ConstructState ConstructOpFatalError(ConstructContext* ctx, CachedStreamReader* reader); - - static const char LOAD_GLYPH_ALL[1]; - - private: - inline static ConstructState handleAdvanceDry(ConstructContext* ctx, CachedStreamReader* reader, u32 advanced); - - u16* pSheetOffsets; // 0x18 - - static const u16 VERSION = NW4R_VERSION(1, 4); - static const u32 SIGNATURE_FONT_ARCHIVE = 'RFNA'; - - static const u32 SIGNATURE_FONT_INFO = 'FINF'; /* Font INFormation */ - static const u32 SIGNATURE_TEX_GLYPH = 'TGLP'; /* Texture GLyPh */ - static const u32 SIGNATURE_CHAR_WIDTH = 'CWDH'; /* Character WiDtH */ - static const u32 SIGNATURE_CODE_MAP = 'CMAP'; /* Code MAP */ - - static const u32 SIGNATURE_GLYPH_GROUPS = 'GLGR'; /* GLyph GRoups */ - }; - }; // namespace detail - class ArchiveFont : public detail::ArchiveFontBase { public: ArchiveFont(); diff --git a/libs/NW4R/include/nw4r/ut/ArchiveFontBase.h b/libs/NW4R/include/nw4r/ut/ArchiveFontBase.h new file mode 100644 index 00000000..f617c572 --- /dev/null +++ b/libs/NW4R/include/nw4r/ut/ArchiveFontBase.h @@ -0,0 +1,208 @@ +#ifndef NW4R_UT_ARCHIVE_FONT_BASE_H +#define NW4R_UT_ARCHIVE_FONT_BASE_H + +#include + +#include +#include +#include + +namespace nw4r { + namespace ut { + namespace detail { + static const int GLYPH_INDEX_NOT_FOUND = 0xFFFF; + inline u32 CalcOffsetNameOffsetData() { + return offsetof(ArchiveFontBinaryLayout, glgr.inner.nameOffsets); + } + + inline u32 CalcOffsetSheetData(u16 countNames) { + return ROUNDUP(CalcOffsetNameOffsetData() + countNames * sizeof(u16), 4); + } + inline u32 CalcOffset0AData(u16 countNames, u16 countSheets) { + return ROUNDUP(CalcOffsetSheetData(countNames) + countSheets * sizeof(u32), 4); + } + inline u32 CalcOffset0CData(u16 countNames, u16 countSheets, u16 count0A) { + return ROUNDUP(CalcOffset0AData(countNames, countSheets) + count0A * sizeof(u32), 4); + } + + inline u32 CalcSizeFlagSet(u32 entries) { + return ((s32)entries + 0x1f) / 32 * 4; + } + + inline u32 CalcOffsetSheetFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) { + return ROUNDUP(CalcOffset0CData(countNames, countSheets, count0A) + count0C * sizeof(u32), 4); + } + inline u32 CalcOffset0AFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) { + u32 offsetSheetFlags = CalcOffsetSheetFlags(countNames, countSheets, count0A, count0C); + u32 stepSheet = CalcSizeFlagSet(countSheets); + return ROUNDUP(offsetSheetFlags + stepSheet * countNames, 4); + } + inline u32 CalcOffset0CFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) { + u32 offset0AFlags = CalcOffset0AFlags(countNames, countSheets, count0A, count0C); + u32 step0A = CalcSizeFlagSet(count0A); + return ROUNDUP(offset0AFlags + step0A * countNames, 4); + } + + inline u32 CalcSizeSheetOffsets(u32 countSheets) { + return ROUNDUP(countSheets * sizeof(u16), 4); + } + + class ArchiveFontBase : public ResFontBase { + public: + ArchiveFontBase(); + virtual ~ArchiveFontBase(); + + typedef enum { + CONSTRUCT_STATE_DATA_REQUESTED = 0, + CONSTRUCT_STATE_DONE, + CONSTRUCT_STATE_FATAL_ERR, + CONSTRUCT_STATE_WORKING, + } ConstructState; + + typedef enum { + CONSTRUCT_CMD_DISPATCH = 0, + CONSTRUCT_CMD_ANALYZE_FILE_HEADER, + CONSTRUCT_CMD_ANALYZE_GLGR, + CONSTRUCT_CMD_ANALYZE_FINF, + CONSTRUCT_CMD_ANALYZE_CMAP, + CONSTRUCT_CMD_ANALYZE_CWDH, + CONSTRUCT_CMD_ANALYZE_TGLP, + CONSTRUCT_CMD_PREPAIR_COPY_SHEET, + CONSTRUCT_CMD_PREPAIR_EXPAND_SHEET, + CONSTRUCT_CMD_COPY, + CONSTRUCT_CMD_SKIP, + CONSTRUCT_CMD_EXPAND, + CONSTRUCT_CMD_FATAL_ERR, + + CONSTRUCT_CMD_MAX_CMD, + CONSTRUCT_CMD_INVALID, + } ConstructCmd; + + class ConstructContext; + class CachedStreamReader { + public: + void Init(); + void Attach(const void* data, u32 dataLen); + bool RequestData(ConstructContext* ctx, u32 len); + + inline u32 amtAvailableData() const { return pDataEnd - pDataCurr; } + inline u32 amtAvailableCached() const { return pCachedEnd - pCachedStart; } + inline u32 amtAvailable() const { return amtAvailableData() + amtAvailableCached(); } + + inline u32 getReaderOffset() const { return (pDataCurr - pDataStart) + (pCachedStart - pCachedBase); } + + inline void memcpyToBuf(void* buf, u32 len); + inline void skip(u32 len); + + u8* pDataStart; // 0x00 + u8* pDataCurr; // 0x04 + u8* pDataEnd; // 0x08 + u8* pCachedBase; // 0x0C + u8* pCachedStart; // 0x10 + u8* pCachedEnd; // 0x14 + u32 unk_0x18; // 0x18 + }; + + class ConstructContext { + public: + inline u32 getAdvanceSize(const CachedStreamReader* reader) const { return ut::Min(mNextCmdParam, reader->amtAvailable()); } + inline u32 remWorkSpace() const { return pWorkEnd - pWorkCurr; } + + inline u32 getFullOffset(CachedStreamReader* reader) const { return mDataOffset + reader->getReaderOffset(); } + inline ConstructState requestNewData(CachedStreamReader* reader, u32 amt); + + inline void getNumSheetsToLoad(u16* sheetsToLoad) const; + inline u32 updateTextureBlockPtr(); + + inline void enqueueCmds(ConstructCmd first, u32 firstParam, ConstructCmd after) { + mNextCmdParam = firstParam; + mNextCmd = first; + mQueuedCmd = after; + } + + inline void pushCWDH() { + FontWidth* cwdh; + cwdh = (FontWidth*)pWorkCurr; + if (pLastWidth != NULL) + pLastWidth->pNext = cwdh; + else + pFontInfo->pWidth = cwdh; + + pLastWidth = cwdh; + } + inline void pushCMAP() { + FontCodeMap* cmap; + cmap = (FontCodeMap*)pWorkCurr; + if (pLastMap != NULL) + pLastMap->pNext = cmap; + else + pFontInfo->pMap = cmap; + + pLastMap = cmap; + } + + FontInformation* pFontInfo; // 0x00 + FontWidth* pLastWidth; // 0x04 + FontCodeMap* pLastMap; // 0x08 + u32 mNextCmd; // 0x0C + BinaryBlockHeader mNextBlockHdr; // 0x10 + u32 mDataOffset; // 0x18 + CachedStreamReader mReader; // 0x1C + CXUncompContextHuffman* pHuffmanCtx; // 0x38 + const char* pIncludedGroups; // 0x3C + u16* pSheetOffsets; // 0x40 + u8* pWorkStart; // 0x44 + u8* pWorkEnd; // 0x48 + u8* pWorkCurr; // 0x4C + u32 mQueuedCmd; // 0x50 + u32 mNextCmdParam; // 0x54 + u32 mTotalBlocks; // 0x58 + u32 mBlocksParsed; // 0x5C + u16 mSheetsHandled; // 0x60 + u16 mSheetCount; // 0x62 + u16 mGlyphsPerSheet; // 0x64 + }; + + static bool IsValidResource(const void* data, u32 maxPreFinfSize); + CharWidths GetCharWidths(u16 charcode) const; + void SetResourceBuffer(void* pUserBuffer, FontInformation* pFontInfo, u16* pSheetOffsets); + u16 AdjustIndex(u16 glyphIdx) const; + static bool IncludeName(const char* nameList, const char* testName); + + protected: + static ConstructState ConstructOpDispatch(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpAnalyzeFileHeader(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpAnalyzeFINF(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpAnalyzeTGLP(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpAnalyzeCMAP(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpAnalyzeCWDH(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpPrepairCopySheet(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpPrepairExpandSheet(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpCopy(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpSkip(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpExpand(ConstructContext* ctx, CachedStreamReader* reader); + static ConstructState ConstructOpFatalError(ConstructContext* ctx, CachedStreamReader* reader); + + static const char LOAD_GLYPH_ALL[1]; + + private: + inline static ConstructState handleAdvanceDry(ConstructContext* ctx, CachedStreamReader* reader, u32 advanced); + + u16* pSheetOffsets; // 0x18 + + static const u16 VERSION = NW4R_VERSION(1, 4); + static const u32 SIGNATURE_FONT_ARCHIVE = 'RFNA'; + + static const u32 SIGNATURE_FONT_INFO = 'FINF'; /* Font INFormation */ + static const u32 SIGNATURE_TEX_GLYPH = 'TGLP'; /* Texture GLyPh */ + static const u32 SIGNATURE_CHAR_WIDTH = 'CWDH'; /* Character WiDtH */ + static const u32 SIGNATURE_CODE_MAP = 'CMAP'; /* Code MAP */ + + static const u32 SIGNATURE_GLYPH_GROUPS = 'GLGR'; /* GLyph GRoups */ + }; + }; // namespace detail + } // namespace ut +} // namespace nw4r + +#endif // NW4R_UT_ARCHIVE_FONT_BASE_H diff --git a/libs/NW4R/src/ut/ut_ArchiveFont.cpp b/libs/NW4R/src/ut/ut_ArchiveFont.cpp index 34b81b13..c6d4580a 100644 --- a/libs/NW4R/src/ut/ut_ArchiveFont.cpp +++ b/libs/NW4R/src/ut/ut_ArchiveFont.cpp @@ -10,9 +10,9 @@ namespace nw4r { namespace ut { -#define GLYPH_INDEX_NOT_FOUND 0xFFFF ArchiveFont::ArchiveFont() { } + ArchiveFont::~ArchiveFont() { } @@ -34,7 +34,7 @@ namespace nw4r { const u32* flags0A; const u32* flags0C; - int wordI, j; + int i, j; int entryI; const HeaderedGlyphGroups* offsetPGlgr; u32 loadedSheetCount, loadedSmth0ASize, loadedSmth0CSize; @@ -48,8 +48,9 @@ namespace nw4r { u32 neededCharacterSize; u32 baseSize; - if (!ArchiveFontBase::IsValidResource(fontData, 0x4000)) + if (!ArchiveFontBase::IsValidResource(fontData, 0x4000)) { return 0; + } font = (ArchiveFontBinaryLayout*)fontData; pGlgr = &font->glgr; @@ -83,8 +84,8 @@ namespace nw4r { loadedSmth0CSize = 0; // Get the NUMBER of sheets that should be loaded - for (wordI = 0, entryI = 0; entryI < pGlgr->inner.sheetCount; entryI += 0x20, wordI++) { - offsetFlags = (const u8*)flagsSheets + wordI * sizeof(u32); + for (i = 0, entryI = 0; entryI < pGlgr->inner.sheetCount; entryI += 0x20, i++) { + offsetFlags = (const u8*)flagsSheets + i * sizeof(u32); flagWord = 0; for (j = 0, offsetPGlgr = pGlgr; j < pGlgr->inner.nameCount; @@ -100,8 +101,8 @@ namespace nw4r { // getLoadedSheetCount(pGlgr, flagsSheets, stepSheets, fontData, includedGroups, &loadedSheetCount); // Get the SIZE of unk_0x0a that should be loaded - for (wordI = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0a; entryI += 0x20, wordI++) { - offsetFlags = (const u8*)flags0A + wordI * sizeof(u32); + for (i = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0a; entryI += 32, i++) { + offsetFlags = (const u8*)flags0A + i * sizeof(u32); flagWord = 0; for (j = 0; j < pGlgr->inner.nameCount; j++) { @@ -111,16 +112,17 @@ namespace nw4r { } } - offsetData = (const u32*)data0A + wordI * 32; + offsetData = (const u32*)data0A + i * 32; for (j = 0; j < 32; j++) { - if ((flagWord << j) & 0x80000000U) + if ((flagWord << j) & 0x80000000U) { loadedSmth0ASize += offsetData[j] - sizeof(BinaryBlockHeader); + } } } - // Get the SIZE of unk_0x0c that should be loaded - for (wordI = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0c; entryI += 0x20, wordI++) { - offsetFlags = (const u8*)flags0C + wordI * sizeof(u32); + // Get the SIZE of unk_0x0C that should be loaded + for (i = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0c; entryI += 32, i++) { + offsetFlags = (const u8*)flags0C + i * sizeof(u32); flagWord = 0; for (j = 0; j < pGlgr->inner.nameCount; j++) { @@ -130,10 +132,11 @@ namespace nw4r { } } - offsetData = (const u32*)data0C + wordI * 32; + offsetData = (const u32*)data0C + i * 32; for (j = 0; j < 32; j++) { - if ((flagWord << j) & 0x80000000U) + if ((flagWord << j) & 0x80000000U) { loadedSmth0CSize += offsetData[j] - sizeof(BinaryBlockHeader); + } } } @@ -143,10 +146,11 @@ namespace nw4r { loadedSheetsSize = ROUNDUP(loadedSheetCount * pGlgr->inner.uncompSheetSize, 4); neededCharacterSize = sizeof(CXUncompContextHuffman); - if (loadedSmth0ASize + loadedSmth0CSize >= sizeof(CXUncompContextHuffman)) + if (loadedSmth0ASize + loadedSmth0CSize >= sizeof(CXUncompContextHuffman)) { neededCharacterSize = loadedSmth0ASize + loadedSmth0CSize; + } - baseSize = ROUNDUP(sizeof(FontInformation) + sizeof(FontTextureGlyph) + sheetOffsetsSize, 0x20); + baseSize = OSRoundUp32B(sizeof(FontInformation) + sizeof(FontTextureGlyph) + sheetOffsetsSize); return baseSize + neededCharacterSize + loadedSheetsSize; } @@ -155,8 +159,9 @@ namespace nw4r { CachedStreamReader* reader; // If there's already data bound, exit early - if (mFontInfo != NULL) + if (mFontInfo != NULL) { return ctx->mBlocksParsed < ctx->mTotalBlocks ? CONSTRUCT_STATE_FATAL_ERR : CONSTRUCT_STATE_DONE; + } state = CONSTRUCT_STATE_WORKING; reader = &ctx->mReader; @@ -164,48 +169,62 @@ namespace nw4r { while (state == CONSTRUCT_STATE_WORKING) { switch (ctx->mNextCmd) { - case CONSTRUCT_CMD_DISPATCH: + case CONSTRUCT_CMD_DISPATCH: { state = detail::ArchiveFontBase::ConstructOpDispatch(ctx, reader); break; - case CONSTRUCT_CMD_ANALYZE_FILE_HEADER: + } + case CONSTRUCT_CMD_ANALYZE_FILE_HEADER: { state = detail::ArchiveFontBase::ConstructOpAnalyzeFileHeader(ctx, reader); break; - case CONSTRUCT_CMD_ANALYZE_GLGR: + } + case CONSTRUCT_CMD_ANALYZE_GLGR: { state = detail::ArchiveFontBase::ConstructOpAnalyzeGLGR(ctx, reader); break; - case CONSTRUCT_CMD_ANALYZE_FINF: + } + case CONSTRUCT_CMD_ANALYZE_FINF: { state = detail::ArchiveFontBase::ConstructOpAnalyzeFINF(ctx, reader); break; - case CONSTRUCT_CMD_ANALYZE_CMAP: + } + case CONSTRUCT_CMD_ANALYZE_CMAP: { state = detail::ArchiveFontBase::ConstructOpAnalyzeCMAP(ctx, reader); break; - case CONSTRUCT_CMD_ANALYZE_CWDH: + } + case CONSTRUCT_CMD_ANALYZE_CWDH: { state = detail::ArchiveFontBase::ConstructOpAnalyzeCWDH(ctx, reader); break; - case CONSTRUCT_CMD_ANALYZE_TGLP: + } + case CONSTRUCT_CMD_ANALYZE_TGLP: { state = detail::ArchiveFontBase::ConstructOpAnalyzeTGLP(ctx, reader); break; - case CONSTRUCT_CMD_PREPAIR_COPY_SHEET: + } + case CONSTRUCT_CMD_PREPAIR_COPY_SHEET: { state = detail::ArchiveFontBase::ConstructOpPrepairCopySheet(ctx, reader); break; - case CONSTRUCT_CMD_PREPAIR_EXPAND_SHEET: + } + case CONSTRUCT_CMD_PREPAIR_EXPAND_SHEET: { state = detail::ArchiveFontBase::ConstructOpPrepairExpandSheet(ctx, reader); break; - case CONSTRUCT_CMD_COPY: + } + case CONSTRUCT_CMD_COPY: { state = detail::ArchiveFontBase::ConstructOpCopy(ctx, reader); break; - case CONSTRUCT_CMD_SKIP: + } + case CONSTRUCT_CMD_SKIP: { state = detail::ArchiveFontBase::ConstructOpSkip(ctx, reader); break; - case CONSTRUCT_CMD_EXPAND: + } + case CONSTRUCT_CMD_EXPAND: { state = detail::ArchiveFontBase::ConstructOpExpand(ctx, reader); break; - case CONSTRUCT_CMD_FATAL_ERR: + } + case CONSTRUCT_CMD_FATAL_ERR: { state = detail::ArchiveFontBase::ConstructOpFatalError(ctx, reader); break; - default: + } + default: { ctx->mNextCmd = CONSTRUCT_CMD_FATAL_ERR; state = CONSTRUCT_STATE_FATAL_ERR; + } } } @@ -213,16 +232,17 @@ namespace nw4r { // buffer, adjust the alternate character index to respect unloaded // sheets, and set the reader function (for displaying strings) to // use the encoding in mFontInfo - if ((state == CONSTRUCT_STATE_DONE) && (mFontInfo == NULL)) { + if (state == CONSTRUCT_STATE_DONE && mFontInfo == NULL) { DCFlushRange(ctx->pWorkStart, ctx->pWorkEnd - ctx->pWorkStart); SetResourceBuffer(ctx->pWorkStart, ctx->pFontInfo, ctx->pSheetOffsets); - if (AdjustIndex(this->mFontInfo->alterCharIndex) == GLYPH_INDEX_NOT_FOUND) { - this->mFontInfo->alterCharIndex = 0; + if (AdjustIndex(mFontInfo->alterCharIndex) == detail::GLYPH_INDEX_NOT_FOUND) { + mFontInfo->alterCharIndex = 0; } Font::InitReaderFunc(GetEncoding()); } return state; } + bool ArchiveFont::Construct(void* work, u32 workSize, const void* fontData, const char* includedGroups) { u32 fontDataSize = ((BinaryFileHeader*)fontData)->fileSize; @@ -271,11 +291,12 @@ namespace nw4r { u16 idx = ResFontBase::GetGlyphIndex(c); GetGlyphFromIndex(glyph, idx); } + void ArchiveFont::GetGlyphFromIndex(Glyph* glyph, u16 index) const { FontTextureGlyph& tg = *mFontInfo->pGlyph; u16 realIndex = ArchiveFontBase::AdjustIndex(index); - if (realIndex == GLYPH_INDEX_NOT_FOUND) { + if (realIndex == detail::GLYPH_INDEX_NOT_FOUND) { index = mFontInfo->alterCharIndex; realIndex = ArchiveFontBase::AdjustIndex(index); } diff --git a/libs/NW4R/src/ut/ut_ArchiveFontBase.cpp b/libs/NW4R/src/ut/ut_ArchiveFontBase.cpp index dcc1bdb4..74d4604e 100644 --- a/libs/NW4R/src/ut/ut_ArchiveFontBase.cpp +++ b/libs/NW4R/src/ut/ut_ArchiveFontBase.cpp @@ -14,7 +14,6 @@ namespace nw4r { if ((_ctx)->remWorkSpace() < (_size)) \ return CONSTRUCT_STATE_FATAL_ERR; -#define GLYPH_INDEX_NOT_FOUND 0xFFFF typedef union { u16 formatRaw; struct { @@ -23,7 +22,8 @@ namespace nw4r { }; } FlaggedImageFormat; - // CachedStreamReader inlined + const char ArchiveFontBase::LOAD_GLYPH_ALL[1] = {0}; + void ArchiveFontBase::CachedStreamReader::memcpyToBuf(void* buf, u32 copyLen) { u32 cachedLen; u8* pBuf; @@ -42,6 +42,7 @@ namespace nw4r { pDataCurr += dataLen; } } + void ArchiveFontBase::CachedStreamReader::skip(u32 skipLen) { u32 dataLen, cachedLen; @@ -55,71 +56,16 @@ namespace nw4r { } } - // CachedStreamReader retained - void ArchiveFontBase::CachedStreamReader::Init() { - pDataStart = NULL; - pDataCurr = NULL; - pDataEnd = NULL; - - pCachedBase = NULL; - pCachedStart = NULL; - pCachedEnd = NULL; - - unk_0x18 = 0; - } - void ArchiveFontBase::CachedStreamReader::Attach(const void* data, u32 dataLen) { - pDataStart = (u8*)data; - pDataCurr = (u8*)data; - pDataEnd = (u8*)data + dataLen; - } - - bool ArchiveFontBase::CachedStreamReader::RequestData(ArchiveFontBase::ConstructContext* ctx, u32 offset) { - size_t dataLen; - size_t cachedLen; - size_t available; - - u8* dst; - - available = amtAvailableData() + amtAvailableCached(); - if (available == 0) { - pCachedBase = NULL; - pCachedStart = NULL; - pCachedEnd = NULL; - unk_0x18 = 0; - } else { - if (ctx->remWorkSpace() < (offset << 1)) - return false; - - dst = ctx->pWorkCurr + offset; - cachedLen = pCachedEnd - pCachedStart; - - if (cachedLen >= available) { - memmove(dst, pCachedStart, available); - pCachedStart += available; - } else { - dataLen = available - cachedLen; - memmove(dst, pCachedStart, cachedLen); - memmove(dst + cachedLen, pDataCurr, dataLen); - pCachedStart = pCachedEnd; - pDataCurr += dataLen; - } - pCachedBase = dst; - pCachedStart = dst; - pCachedEnd = dst + available; - unk_0x18 = offset; - } - return true; - } - - // ConstructContext inlined ArchiveFontBase::ConstructState ArchiveFontBase::ConstructContext::requestNewData(CachedStreamReader* reader, u32 amt) { mDataOffset = getFullOffset(reader); bool requestSucceeded = reader->RequestData(this, amt); - if (requestSucceeded) + if (requestSucceeded) { return CONSTRUCT_STATE_DATA_REQUESTED; - else + } else { return CONSTRUCT_STATE_FATAL_ERR; + } } + void ArchiveFontBase::ConstructContext::getNumSheetsToLoad(u16* sheetsToLoad) const { *sheetsToLoad = 0; for (int i = 0; i < mSheetCount; i++) { @@ -127,6 +73,7 @@ namespace nw4r { (*sheetsToLoad)++; } } + // u32 ArchiveFontBase::ConstructContext::updateTextureBlockPtr() { // u32 imgDataOffset; // imgDataOffset = (u32)pFontInfo->pGlyph->sheetImage; @@ -137,9 +84,9 @@ namespace nw4r { // return imgDataOffset; // } - // ArchiveFontBase retained ArchiveFontBase::ArchiveFontBase() : pSheetOffsets(NULL) { } + ArchiveFontBase::~ArchiveFontBase() { } @@ -153,26 +100,31 @@ namespace nw4r { } return GetCharWidthsFromIndex(glyphIdx); } + void ArchiveFontBase::SetResourceBuffer(void* pUserBuffer, FontInformation* pFontInfo, u16* pSheetOffsets) { ResFontBase::SetResourceBuffer(pUserBuffer, pFontInfo); this->pSheetOffsets = pSheetOffsets; } + u16 ArchiveFontBase::AdjustIndex(u16 glyphIdx) const { FontTextureGlyph* pTglp = mFontInfo->pGlyph; s32 glyphsPerSheet = (u32)pTglp->sheetRow * (u32)pTglp->sheetLine; u32 originalSheetIdx = (s32)glyphIdx / glyphsPerSheet; - if (pSheetOffsets[originalSheetIdx] != GLYPH_INDEX_NOT_FOUND) + if (pSheetOffsets[originalSheetIdx] != GLYPH_INDEX_NOT_FOUND) { return glyphIdx - pSheetOffsets[originalSheetIdx]; - else + } else { return GLYPH_INDEX_NOT_FOUND; + } } + bool ArchiveFontBase::IncludeName(const char* groupList, const char* group) { u32 groupLen = strlen(group); const char* substr = groupList - 1; while (true) { substr = strstr(substr + 1, group); - if (substr == NULL) + if (substr == NULL) { return false; + } // Check that there is nothing but spaces between the substr // and the preceeding comma @@ -194,10 +146,12 @@ namespace nw4r { // @bug Should allow for leading spaces in groupList (maybe?) if (substr != groupList) { const char* backsearchStr = substr - 1; - while (backsearchStr > groupList && *backsearchStr == ' ') + while (backsearchStr > groupList && *backsearchStr == ' ') { backsearchStr--; - if (*backsearchStr != ',') + } + if (*backsearchStr != ',') { continue; + } } // Get the length of the section up until the next comma or @@ -207,10 +161,11 @@ namespace nw4r { // - substr = "foo" -> sectionLen = 3 const char* nextComma = strchr(substr, ','); u32 sectionLen; - if (nextComma != NULL) + if (nextComma != NULL) { sectionLen = nextComma - substr; - else + } else { sectionLen = strlen(substr); + } // Check to make sure there is nothing except spaces between // the end of the group name and the next comma: @@ -224,13 +179,16 @@ namespace nw4r { // - substr = "foo, baz" // - group = "foo" const char* sectionEnd = substr + groupLen; - while (sectionEnd < substr + sectionLen && (*sectionEnd == ' ')) + while (sectionEnd < substr + sectionLen && (*sectionEnd == ' ')) { sectionEnd++; + } - if (sectionEnd == substr + sectionLen) + if (sectionEnd == substr + sectionLen) { return true; + } } } + bool ArchiveFontBase::IsValidResource(const void* data, u32 maxPreFinfSize) { const u8* fileBuf = (u8*)data; const BinaryFileHeader* hdr = (const BinaryFileHeader*)fileBuf; @@ -247,35 +205,43 @@ namespace nw4r { ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpDispatch(ConstructContext* ctx, CachedStreamReader* reader) { void* nextBlockHdr; - if (ctx->mBlocksParsed >= ctx->mTotalBlocks) + if (ctx->mBlocksParsed >= ctx->mTotalBlocks) { return CONSTRUCT_STATE_DONE; + } ENSURE_READER_HAS_SIZE(ctx, reader, sizeof(BinaryBlockHeader)); reader->memcpyToBuf(&ctx->mNextBlockHdr, sizeof(BinaryBlockHeader)); switch (ctx->mNextBlockHdr.kind) { - case SIGNATURE_GLYPH_GROUPS: + case SIGNATURE_GLYPH_GROUPS: { ctx->mNextCmd = CONSTRUCT_CMD_ANALYZE_GLGR; break; - case SIGNATURE_FONT_INFO: + } + case SIGNATURE_FONT_INFO: { ctx->mNextCmd = CONSTRUCT_CMD_ANALYZE_FINF; break; - case SIGNATURE_CODE_MAP: + } + case SIGNATURE_CODE_MAP: { ctx->mNextCmd = CONSTRUCT_CMD_ANALYZE_CMAP; break; - case SIGNATURE_CHAR_WIDTH: + } + case SIGNATURE_CHAR_WIDTH: { ctx->mNextCmd = CONSTRUCT_CMD_ANALYZE_CWDH; break; - case SIGNATURE_TEX_GLYPH: + } + case SIGNATURE_TEX_GLYPH: { ctx->mNextCmd = CONSTRUCT_CMD_ANALYZE_TGLP; break; - default: + } + default: { ctx->mNextCmd = CONSTRUCT_CMD_FATAL_ERR; return CONSTRUCT_STATE_FATAL_ERR; + } } ctx->mBlocksParsed++; ctx->pWorkCurr = (u8*)(((u32)ctx->pWorkCurr + 3) & (~3)); return CONSTRUCT_STATE_WORKING; } + ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeFileHeader(ConstructContext* ctx, CachedStreamReader* reader) { ENSURE_READER_HAS_SIZE(ctx, reader, sizeof(BinaryFileHeader)); ENSURE_WORK_HAS_SIZE(ctx, sizeof(BinaryFileHeader)); @@ -290,30 +256,36 @@ namespace nw4r { for (int sheetI = 0; sheetI < glgr->sheetCount; sheetI++) { u32 groupBitIdx = sheetI + groupIdx * flagsStep * 8; - const u32* bitBlockPtr = sheetFlags + (groupBitIdx & ~0x1f) / 32; + const u32* bitBlockPtr = sheetFlags + (groupBitIdx & ~0x1F) / 32; u32 bitBlock = *(u32*)bitBlockPtr; - if (((bitBlock << (groupBitIdx & 0x1f)) & 0x80000000) != 0) + if (((bitBlock << (groupBitIdx & 0x1F)) & 0x80000000) != 0) { sheetOffsets[sheetI] = 1; + } } } + inline void setSheetOffsetBooleans(const ArchiveFontBase::ConstructContext* ctx, const void* glgrHdr, const void* hdr, u16* sheetOffsets, const u32* bitBlocksPtr, u32 sheetFlagsSize) { HeaderedGlyphGroups* pGlgr = (HeaderedGlyphGroups*)glgrHdr; - for (int i = 0; i < pGlgr->inner.sheetCount; i++) + for (int i = 0; i < pGlgr->inner.sheetCount; i++) { sheetOffsets[i] = 0; + } for (int i = 0; i < pGlgr->inner.nameCount; i++) { const char* includedGroups = ctx->pIncludedGroups; u16 offset = pGlgr->inner.nameOffsets[i]; char* name = (char*)((u8*)hdr + offset); - if (*includedGroups != 0) - if (!ArchiveFontBase::IncludeName(includedGroups, name)) + if (*includedGroups != 0) { + if (!ArchiveFontBase::IncludeName(includedGroups, name)) { continue; + } + } updateSheetFlags(glgrHdr, i, sheetOffsets, sheetFlagsSize, bitBlocksPtr); } } + inline void convertSheetOffsetBooleansToOffsets(const void* glgrHdr, u16* sheetOffsets) { HeaderedGlyphGroups* pGlgr = (HeaderedGlyphGroups*)glgrHdr; u16 glyphIdxOffset = 0; @@ -326,12 +298,14 @@ namespace nw4r { } } } + inline void copyFlagOffsets(ArchiveFontBase::ConstructContext* ctx, u16* sheetOffsetsScratch, u32 workSize, u32 scratchSize) { u8* sheetOffsets = ctx->pWorkCurr; ctx->pWorkCurr = sheetOffsets + workSize; memmove(sheetOffsets, sheetOffsetsScratch, scratchSize); ctx->pSheetOffsets = (u16*)sheetOffsets; } + // inline u32 getOffsetSize(void* fontData, u32 remWorkSpace, u16 countSheet, u16** sheetOffsetsScratch) { // u32 sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4); // *sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)fontData + remWorkSpace) - sheetOffsetsSize, 2); @@ -350,8 +324,9 @@ namespace nw4r { glgrInnerLen = ctx->mNextBlockHdr.size - sizeof(BinaryBlockHeader); // Check for RFNA - if (font->hdr.signature != SIGNATURE_FONT_ARCHIVE) + if (font->hdr.signature != SIGNATURE_FONT_ARCHIVE) { return CONSTRUCT_STATE_FATAL_ERR; + } // Check that there's enough data available, and the space to // put that data @@ -369,8 +344,9 @@ namespace nw4r { reader->memcpyToBuf(&pGlgr->inner, glgrInnerLen); } - if (!ArchiveFontBase::IsValidResource(font, expectedMaxSize)) + if (!ArchiveFontBase::IsValidResource(font, expectedMaxSize)) { return CONSTRUCT_STATE_FATAL_ERR; + } // Before here is fine (other than regswaps) // u16 sheetGlyphCount = FORCE_REACCESS_2(font->glgr.inner.sheetGlyphCount, u16); // 0x1C @@ -406,24 +382,26 @@ namespace nw4r { font->glgr.inner.smthCount_0x0c); flagsSheets = (const u32*)font + (flagsSheetsOff >> 2); - // sheetOffsetsSize = ; - pGlgr = &font->glgr; ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize); - // if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) + // if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) { // return CONSTRUCT_STATE_FATAL_ERR; + // } // Clear sheet offsets scratch - // for (s32 i = 0; i < pGlgr->inner.sheetCount; i++) + // for (s32 i = 0; i < pGlgr->inner.sheetCount; i++) { // sheetOffsetsScratch[i] = 0; + // } // for (s32 i = 0; i < pGlgr->inner.nameCount; i++) { // // const char* includedGroups = ctx->pIncludedGroups; // u16 offset = pGlgr->inner.nameOffsets[i]; // const char* name = (char*)((u8*)font + offset); - // if (*ctx->pIncludedGroups != 0) - // if (!ArchiveFontBase::IncludeName(ctx->pIncludedGroups, name)) + // if (*ctx->pIncludedGroups != 0) { + // if (!ArchiveFontBase::IncludeName(ctx->pIncludedGroups, name)) { // continue; + // } + // } // updateSheetFlags(pGlgr, i, sheetOffsetsScratch, stepSheetFlags, flagsSheets); // } @@ -464,6 +442,7 @@ namespace nw4r { ctx->enqueueCmds(CONSTRUCT_CMD_COPY, innerSize, CONSTRUCT_CMD_DISPATCH); return CONSTRUCT_STATE_WORKING; } + ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeCMAP(ConstructContext* ctx, CachedStreamReader* reader) { u32 innerSize; @@ -475,6 +454,7 @@ namespace nw4r { ctx->enqueueCmds(CONSTRUCT_CMD_COPY, innerSize, CONSTRUCT_CMD_DISPATCH); return CONSTRUCT_STATE_WORKING; } + ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeCWDH(ConstructContext* ctx, CachedStreamReader* reader) { u32 innerSize; @@ -537,6 +517,7 @@ namespace nw4r { ctx->mSheetsHandled++; return CONSTRUCT_STATE_WORKING; } + ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpPrepairExpandSheet(ConstructContext* ctx, CachedStreamReader* reader) { u32 compressedSize, uncompressedSize; u8 compressedSizeBuf[4]; @@ -569,13 +550,15 @@ namespace nw4r { advanced = ut::Min(advanced, ctx->mNextCmdParam); ctx->mNextCmdParam -= advanced; - if (ctx->mNextCmdParam == 0) + if (ctx->mNextCmdParam == 0) { ctx->mNextCmd = ctx->mQueuedCmd; - else + } else { return ctx->requestNewData(reader, ctx->mNextCmdParam); + } return ArchiveFontBase::CONSTRUCT_STATE_WORKING; } + ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpCopy(ConstructContext* ctx, CachedStreamReader* reader) { u32 copySize; copySize = ut::Min((u32)(reader->pDataEnd - reader->pDataCurr), ctx->mNextCmdParam); @@ -586,6 +569,7 @@ namespace nw4r { return handleAdvanceDry(ctx, reader, copySize); } + ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpSkip(ConstructContext* ctx, CachedStreamReader* reader) { u32 skipSize; skipSize = ctx->getAdvanceSize(reader); @@ -593,6 +577,7 @@ namespace nw4r { return handleAdvanceDry(ctx, reader, skipSize); } + ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpExpand(ConstructContext* ctx, CachedStreamReader* reader) { u32 cmprSize; u8* src; @@ -606,10 +591,68 @@ namespace nw4r { return handleAdvanceDry(ctx, reader, cmprSize); } + ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpFatalError(ConstructContext* ctx, CachedStreamReader* reader) { ctx->mNextCmd = CONSTRUCT_CMD_FATAL_ERR; return CONSTRUCT_STATE_FATAL_ERR; } + + void ArchiveFontBase::CachedStreamReader::Init() { + pDataStart = NULL; + pDataCurr = NULL; + pDataEnd = NULL; + + pCachedBase = NULL; + pCachedStart = NULL; + pCachedEnd = NULL; + + unk_0x18 = 0; + } + + void ArchiveFontBase::CachedStreamReader::Attach(const void* data, u32 dataLen) { + pDataStart = (u8*)data; + pDataCurr = (u8*)data; + pDataEnd = (u8*)data + dataLen; + } + + bool ArchiveFontBase::CachedStreamReader::RequestData(ArchiveFontBase::ConstructContext* ctx, u32 offset) { + size_t dataLen; + size_t cachedLen; + size_t available; + + u8* dst; + + available = amtAvailableData() + amtAvailableCached(); + if (available == 0) { + pCachedBase = NULL; + pCachedStart = NULL; + pCachedEnd = NULL; + unk_0x18 = 0; + } else { + if (ctx->remWorkSpace() < (offset << 1)) { + return false; + } + + dst = ctx->pWorkCurr + offset; + cachedLen = pCachedEnd - pCachedStart; + + if (cachedLen >= available) { + memmove(dst, pCachedStart, available); + pCachedStart += available; + } else { + dataLen = available - cachedLen; + memmove(dst, pCachedStart, cachedLen); + memmove(dst + cachedLen, pDataCurr, dataLen); + pCachedStart = pCachedEnd; + pDataCurr += dataLen; + } + pCachedBase = dst; + pCachedStart = dst; + pCachedEnd = dst + available; + unk_0x18 = offset; + } + return true; + } } // namespace detail } // namespace ut } // namespace nw4r diff --git a/libs/OperaWWW/include/revolution/www.h b/libs/OperaWWW/include/revolution/www.h index 98d35dd8..8132c96f 100644 --- a/libs/OperaWWW/include/revolution/www.h +++ b/libs/OperaWWW/include/revolution/www.h @@ -2,6 +2,7 @@ #define REVOLUTION_WWW_OPERA_H #include + #include -#endif // REVOLUTION_WWW_OPERA_H +#endif // REVOLUTION_WWW_OPERA_H diff --git a/libs/OperaWWW/include/revolution/www_api.h b/libs/OperaWWW/include/revolution/www_api.h index bb07ff7f..f3aeb844 100644 --- a/libs/OperaWWW/include/revolution/www_api.h +++ b/libs/OperaWWW/include/revolution/www_api.h @@ -1,8 +1,50 @@ #ifndef REVOLUTION_WWW_OPERA_API_H #define REVOLUTION_WWW_OPERA_API_H -#define DLL_SYMBOL(ret, sym) typedef ret (*sym) +#include + +#include + +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + +typedef void (*WWWAddJSPluginFn)(const char*, WWWJSCap*, JSCallbackSet**); + +typedef u32 (*WWWProtocolWriteFn)(void* wwwInternal, const void* data, u32 dataSize); +typedef u32 (*WWWProtocolFinalizeFn)(void*); +typedef int (*WWWAddProtocolFn)(const char*); + +typedef void (*WWWBasicWindowFn)(WWWHandlewindow*); +typedef void (*WWWSetBrowserWindowRectFn)(WWWHandlewindow*, WWWRect*); +typedef void (*WWWSetImageModeFn)(WWWHandlewindow*, GXTexFmt); +typedef void (*WWWSetRenderingModeFn)(WWWHandlewindow*, int); +typedef BOOL (*WWWCreateBrowserWindowFn)(void*, WWWHandlewindow**, int); +typedef BOOL (*WWWCloseBrowserWindowFn)(void*, WWWHandlewindow*); +typedef void (*WWWOpenUrlFn)(WWWHandlewindow*, const char*); + +typedef void (*WWWGetBrowserAllocationFunctionsFn)(void* heapBuf, u32 heapBufSize, void** allocOut, void (**freeOut)(void*), int (**availOut)()); +typedef void (*WWWSetAllocationFunctionsFn)(void* allocA, void (*freeA)(void*), int (*avail)(), void* allocB, void (*freeB)(void*), void* allocC, + void (*freeC)(void*)); + +typedef int (*WWWSurfaceInitFn)(int w, int h, u32 rowSize, int, void* rasterBuf); +typedef int (*WWWSurfaceSetFlushCallbackFn)(void (*FlushCallback)(WWWRect*, int), int); +typedef void (*WWWSurfaceAddFontFn)(const char*); +typedef void (*WWWSurfaceUpdateScreenFn)(u32); +typedef void (*WWWSurfaceKeyboardEvtFn)(WWWKeyBtnCmd cmd, WWWKeySym sym, u32 unk); +typedef void (*WWWSurfaceMouseEvtFn)(WWWMouseCmd cmd, int x, int y, WWWMouseAttrib attrib, u32 unkA, u32 unkB); + +typedef void (*WWWCommitImeFn)(int imeID, const char* str); +typedef void (*WWWUpdateImeFn)(int imeID, const char* str, u32 unk); + +typedef BOOL (*WWWNotifyCallbackFn)(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData); +typedef void (*WWWCreateBrowserFn)(WWWHandle** browser, WWWNotifyCallbackFn notifyCallback, const char** fonts, const char* arc); +typedef BOOL (*WWWSimpleBrowserFn)(WWWHandle* browser); /* TODO */ -#endif // REVOLUTION_WWW_OPERA_API_H +#ifdef __cplusplus +} +#endif // __cplusplus + +#endif // REVOLUTION_WWW_OPERA_API_H diff --git a/libs/OperaWWW/include/revolution/www_types.h b/libs/OperaWWW/include/revolution/www_types.h index 9f715271..d24a49aa 100644 --- a/libs/OperaWWW/include/revolution/www_types.h +++ b/libs/OperaWWW/include/revolution/www_types.h @@ -1,84 +1,187 @@ #ifndef REVOLUTION_WWW_OPERA_TYPES_H #define REVOLUTION_WWW_OPERA_TYPES_H +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + +#include + /*** ENUMS ***/ typedef enum WWWEvent { - WWW_EVT_CURSOR_CHANGE = 0, - WWW_EVT_WINDOW_CLOSE, - WWW_EVT_WINDOW_NEW, - WWW_EVT_WINDOW_REQUEST, - WWW_EVT_AUTHENTICATION, - WWW_EVT_URL_CHANGE, - WWW_EVT_LOADING_START, - WWW_EVT_LOADING_FINISHED, - WWW_EVT_LOADING_PROGRESS, - WWW_EVT_UPLOADING_START, - WWW_EVT_UPLOADING_FINISHED, - WWW_EVT_DOCUMENT_TITLE, - WWW_EVT_DOCUMENT_SIZE, - WWW_EVT_DOCUMENT_ICON, - WWW_EVT_LINK_CLICKED, - WWW_EVT_SECURITY_MODE, - WWW_EVT_LINK_NAVIGATED, - WWW_EVT_LINK_HOVER, - WWW_EVT_UNKNOWN_18, - WWW_EVT_UNKNOWN_19, - WWW_EVT_UNKNOWN_20, - WWW_EVT_UNKNOWN_21, - WWW_EVT_UNKNOWN_PROTOCOL, - WWW_EVT_UNKNOWN_23, - WWW_EVT_DOWNLOAD, - WWW_EVT_UNKNOWN_25, - WWW_EVT_UNKNOWN_26, - WWW_EVT_UNKNOWN_27, - WWW_EVT_UNKNOWN_28, - WWW_EVT_ERROR, - WWW_EVT_IMECREATE, - WWW_EVT_IMEMOVE, - WWW_EVT_IMECANCEL, - WWW_EVT_ASYNC_DIALOG, - WWW_EVT_BLOCKING_DIALOG, - WWW_EVT_OUT_OF_MEMORY, - WWW_EVT_SOFT_OUT_OF_MEMORY, - WWW_EVT_UNKNOWN_37, - WWW_EVT_UNKNOWN_38, - WWW_EVT_UNKNOWN_39, - WWW_EVT_UNKNOWN_40, - WWW_EVT_UNKNOWN_41, - WWW_EVT_UNKNOWN_42, - WWW_EVT_UNKNOWN_43, - WWW_EVT_PROTOCOL_LOADING_START, - WWW_EVT_EXISTS_HISTORY, - WWW_EVT_EXTERNAL_ACTION, - WWW_EVT_UNKNOWN_47, - WWW_EVT_UNKNOWN_48, - WWW_EVT_UNKNOWN_49, - WWW_EVT_UNKNOWN_50, - WWW_EVT_UNKNOWN_51, - WWW_EVT_SCREEN_INVALID, - WWW_EVT_FILTERED_URL + WWW_EVT_CURSOR_CHANGE = 0, + WWW_EVT_WINDOW_CLOSE, + WWW_EVT_WINDOW_NEW, + WWW_EVT_WINDOW_REQUEST, + WWW_EVT_AUTHENTICATION, + WWW_EVT_URL_CHANGE, + WWW_EVT_LOADING_START, + WWW_EVT_LOADING_FINISHED, + WWW_EVT_LOADING_PROGRESS, + WWW_EVT_UPLOADING_START, + WWW_EVT_UPLOADING_FINISHED, + WWW_EVT_DOCUMENT_TITLE, + WWW_EVT_DOCUMENT_SIZE, + WWW_EVT_DOCUMENT_ICON, + WWW_EVT_LINK_CLICKED, + WWW_EVT_SECURITY_MODE, + WWW_EVT_LINK_NAVIGATED, + WWW_EVT_LINK_HOVER, + WWW_EVT_UNKNOWN_18, + WWW_EVT_UNKNOWN_19, + WWW_EVT_UNKNOWN_20, + WWW_EVT_UNKNOWN_21, + WWW_EVT_UNKNOWN_PROTOCOL, + WWW_EVT_UNKNOWN_23, + WWW_EVT_DOWNLOAD, + WWW_EVT_UNKNOWN_25, + WWW_EVT_UNKNOWN_26, + WWW_EVT_UNKNOWN_27, + WWW_EVT_UNKNOWN_28, + WWW_EVT_ERROR, + WWW_EVT_IMECREATE, + WWW_EVT_IMEMOVE, + WWW_EVT_IMECANCEL, + WWW_EVT_ASYNC_DIALOG, + WWW_EVT_BLOCKING_DIALOG, + WWW_EVT_OUT_OF_MEMORY, + WWW_EVT_SOFT_OUT_OF_MEMORY, + WWW_EVT_UNKNOWN_37, + WWW_EVT_UNKNOWN_38, + WWW_EVT_UNKNOWN_39, + WWW_EVT_UNKNOWN_40, + WWW_EVT_UNKNOWN_41, + WWW_EVT_UNKNOWN_42, + WWW_EVT_UNKNOWN_43, + WWW_EVT_PROTOCOL_LOADING_START, + WWW_EVT_EXISTS_HISTORY, + WWW_EVT_EXTERNAL_ACTION, + WWW_EVT_UNKNOWN_47, + WWW_EVT_UNKNOWN_48, + WWW_EVT_UNKNOWN_49, + WWW_EVT_UNKNOWN_50, + WWW_EVT_UNKNOWN_51, + WWW_EVT_SCREEN_INVALID, + WWW_EVT_FILTERED_URL } WWWEvent; +typedef enum WWWError { + WWW_ERROR_OK = 0 +} WWWError; + +typedef enum WWWKeySym { + KEY_SYM_BLANK = 0, + KEY_SYM_SOMETHING = 0xE001, + + KEY_SYM_NEXT_RIGHT = 0xE02B, + KEY_SYM_NEXT_LEFT = 0xE02C, + + KEY_SYM_RIGHT = 0xE03C, + KEY_SYM_LEFT = 0xE03D, + KEY_SYM_UP = 0xE03E, + KEY_SYM_DOWN = 0xE03F, + + KEY_SYM_BTN1 = 0xE044, + KEY_SYM_BTN2 = 0xE045, +} WWWKeySym; + +typedef enum WWWKeyBtnCmd { + KEY_CMD_TRIGGER = 0, + KEY_CMD_RELEASE, +} WWWKeyBtnCmd; + +typedef enum WWWMouseCmd { + MOUSE_CMD_MOVE = 0, + MOUSE_CMD_TRIGGER, + MOUSE_CMD_RELEASE, +} WWWMouseCmd; + +typedef enum WWWMouseAttrib { + MOUSE_ATTRIB_BUTTON = 1, + MOUSE_ATTRIB_POSITION = 4, +} WWWMouseAttrib; + /*** STRUCTS ***/ -typedef struct WWWHandleWindow { - /* TODO */ -} WWWHandleWindow; - -typedef struct WWWHandleEventData { - /* TODO */ -} WWWHandleEventData; - typedef struct WWWHandle { - /* TODO */ } WWWHandle; +typedef struct WWWHandlewindow { +} WWWHandlewindow; + +typedef struct WWWHandleEventData { + u32 data[6]; +} WWWHandleEventData; + typedef struct WWWRect { - int left; // 0x00 - int top; // 0x04 - int right; // 0x08 - int botom; // 0x0C + int x; // 0x00 + int y; // 0x04 + int w; // 0x08 + int h; // 0x0C } WWWRect; -#endif // REVOLUTION_WWW_OPERA_TYPES_H +typedef struct WWWProtocolData { + const char* filePath; // 0x00 + const char* protocolName; // 0x04 + void* wwwInternal; // 0x08 +} WWWProtocolData; + +typedef struct WWWIMEData { + u32 imeID; // 0x00 + const char* text; // 0x04 + u32 unk_0x08; + u32 unk_0x0C; + u32 unk_0x10; + u32 unk_0x14; + u32 unk_0x18; + u32 maxLength; // 0x1C +} WWWIMEData; + +/*** JS TYPES ***/ + +typedef struct WWWJSPluginObj { +} WWWJSPluginObj; + +typedef union { + int jsInt; + f64 /* ok */ jsFloat; + f64 jsDouble; + void* jsObj; + const char* jsStr; +} WWWJSPluginValueData; + +typedef struct WWWJSPluginValue { + s32 ty; + u8 unk_0x04[4]; + WWWJSPluginValueData data; +} WWWJSPluginValue; + +typedef int (*JSConstructorFn)(WWWJSPluginObj*, WWWJSPluginObj*, int, WWWJSPluginValue*, WWWJSPluginValue*); +typedef int (*JSGetterSetter)(WWWJSPluginObj*, const char*, WWWJSPluginValue*); +typedef bool (*JSAllowAccess)(const char*, const char*, int); + +typedef int (*JSGlobalGetCallback)(WWWJSPluginObj*, int, int, JSConstructorFn, JSConstructorFn, const char*, int, WWWJSPluginValueData*); +typedef int (*JSConstructCallback)(WWWJSPluginObj*, JSGetterSetter, JSGetterSetter, int, WWWJSPluginValueData*); + +typedef struct JSCallbackSet { + JSGlobalGetCallback globalGet; + JSConstructCallback construct; +} JSCallbackSet; + +typedef struct WWWJSCap { + const char** name; + int unk_0x04; + JSGetterSetter getter; + void* unk_0x0C; + void* unk_0x10; + void* unk_0x14; + void* unk_0x18; + JSAllowAccess allowAccess; +} WWWJSCap; + +#ifdef __cplusplus +} +#endif // __cplusplus + +#endif // REVOLUTION_WWW_OPERA_TYPES_H diff --git a/libs/RVL_SDK/include/private/wpad/WPADMem.h b/libs/RVL_SDK/include/private/wpad/WPADMem.h index 24328386..19af0a43 100644 --- a/libs/RVL_SDK/include/private/wpad/WPADMem.h +++ b/libs/RVL_SDK/include/private/wpad/WPADMem.h @@ -23,7 +23,7 @@ typedef struct WPADMemBlock { int unk_0x00; // 0x00 int unk_0x04; // 0x04 s16 unk_0x08; // 0x08 - int unk_0x0c; // 0x0C + int unk_0x0C; // 0x0C WPADCallback unk_0x10; // 0x10 } WPADMemBlock; diff --git a/libs/RVL_SDK/include/revolution/cx/CXStreamingUncompression.h b/libs/RVL_SDK/include/revolution/cx/CXStreamingUncompression.h index bf5cdc74..c3a70618 100644 --- a/libs/RVL_SDK/include/revolution/cx/CXStreamingUncompression.h +++ b/libs/RVL_SDK/include/revolution/cx/CXStreamingUncompression.h @@ -19,7 +19,7 @@ typedef struct CXUncompContextRL { u8* unk_0x00; // 0x00 int unk_0x04; // 0x04 int unk_0x08; // 0x08 - u16 unk_0x0c; // 0x0C + u16 unk_0x0C; // 0x0C u8 unk_0x0e; // 0x0E u8 unk_0x0f; // 0x0F } CXUncompContextRL; @@ -28,7 +28,7 @@ typedef struct CXUncompContextLZ { u8* unk_0x00; // 0x00 int unk_0x04; // 0x04 int unk_0x08; // 0x08 - int unk_0x0c; // 0x0C + int unk_0x0C; // 0x0C u8 unk_0x10; // 0x10 u8 unk_0x11; // 0x11 u8 unk_0x12; // 0x12 diff --git a/libs/RVL_SDK/include/revolution/fa.h b/libs/RVL_SDK/include/revolution/fa.h index 283f34df..a50f0976 100644 --- a/libs/RVL_SDK/include/revolution/fa.h +++ b/libs/RVL_SDK/include/revolution/fa.h @@ -22,7 +22,7 @@ FAError FADetach(s8 drive); FAError FAMount(s8 drive); FAError FAUnmount(s8 drive, u32 force); -FAError FAGetdev(s8 drive, u32* data); +FAError FAGetdev(s8 drive, FADevInf* data); FAError FAFormat(s8 drive, u32 unk); diff --git a/libs/RVL_SDK/include/revolution/fa/types.h b/libs/RVL_SDK/include/revolution/fa/types.h index 6b6dcedf..423762f9 100644 --- a/libs/RVL_SDK/include/revolution/fa/types.h +++ b/libs/RVL_SDK/include/revolution/fa/types.h @@ -48,16 +48,10 @@ enum { FA_DEVICE_NAND, }; -enum { - FA_STATUS_INSERTED = (1 << 4), -}; - enum { FA_FLAG_FILENAME_CHECK = (1 << 17), }; -#define FA_INSERTED(driveTable) (driveTable.stat & FA_STATUS_INSERTED) - typedef void FAFILE; typedef void FADIR; typedef void FAVOLUME; @@ -198,6 +192,12 @@ typedef struct FADrvTbl { u8 stat; // 0x09 } FADrvTbl; +enum { + FA_DRV_TBL_STAT_INSERTED = (1 << 4), +}; + +#define FA_INSERTED(driveTable) (driveTable.stat & FA_DRV_TBL_STAT_INSERTED) + typedef struct FAFileInfo { u8 unknown[32]; } FAFileInfo; @@ -243,6 +243,11 @@ typedef struct FAFileStat { u8 stat; // 0x10 } FAFileStat; +enum { + FA_FILE_UNK_1 = (1 << 1), + FA_FILE_STAT_DIR = (1 << 4) +}; + #ifdef __cplusplus } #endif diff --git a/libs/RVL_SDK/include/revolution/nand.h b/libs/RVL_SDK/include/revolution/nand.h index f2c6c1ac..26214a7b 100644 --- a/libs/RVL_SDK/include/revolution/nand.h +++ b/libs/RVL_SDK/include/revolution/nand.h @@ -27,6 +27,9 @@ extern "C" { #define NAND_MB_TO_BYTES(x) (((x) * 1024) * 1024) #define NAND_MB_TO_BLOCKS(x) (NAND_MB_TO_BYTES(x) / NAND_BLOCK_SIZE) +#define NAND_BYTES_TO_BLOCKS(x) ((x) / NAND_BLOCK_SIZE) + +#define NAND_BLOCKS_TO_BYTES(x) ((x) * NAND_BLOCK_SIZE) // The amount of blocks of the entire area of the System Memory. #define NAND_MAX_BLOCKS NAND_MB_TO_BLOCKS(512) /* 32768 blocks / 4096 data management blocks */ diff --git a/libs/RVL_SDK/include/revolution/nup.h b/libs/RVL_SDK/include/revolution/nup.h new file mode 100644 index 00000000..b8210dd3 --- /dev/null +++ b/libs/RVL_SDK/include/revolution/nup.h @@ -0,0 +1,21 @@ +#ifndef REVOLUTION_NUP_H +#define REVOLUTION_NUP_H + +#include + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +void* NUP_Init(MEMAllocator* allocator); +int NUP_Start(void* instance, const char* nus, const char* isoCountryCode, void* productAreaString, int); +int NUP_GetStatus(void* instance, u64*); +int NUP_Finish(void* instance); + +#ifdef __cplusplus +} +#endif + +#endif // REVOLUTION_NUP_H diff --git a/libs/RVL_SDK/include/revolution/scutil.h b/libs/RVL_SDK/include/revolution/scutil.h new file mode 100644 index 00000000..4923c656 --- /dev/null +++ b/libs/RVL_SDK/include/revolution/scutil.h @@ -0,0 +1,16 @@ +#ifndef REVOLUTION_SC_UTIL_H +#define REVOLUTION_SC_UTIL_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +const char* SCUTILGetISOCountryCodeA2(); + +#ifdef __cplusplus +} +#endif + +#endif // REVOLUTION_SC_UTIL_H diff --git a/libs/RVL_SDK/include/revolution/vi.h b/libs/RVL_SDK/include/revolution/vi.h index 1ead1f32..c06692f0 100644 --- a/libs/RVL_SDK/include/revolution/vi.h +++ b/libs/RVL_SDK/include/revolution/vi.h @@ -8,7 +8,6 @@ extern "C" { #include #include - #ifdef __cplusplus } #endif diff --git a/libs/RVL_SDK/include/revolution/vi/vitypes.h b/libs/RVL_SDK/include/revolution/vi/vitypes.h index aa6f0dfe..d622b9be 100644 --- a/libs/RVL_SDK/include/revolution/vi/vitypes.h +++ b/libs/RVL_SDK/include/revolution/vi/vitypes.h @@ -21,6 +21,9 @@ extern "C" { #define VI_MAX_WIDTH_EURGB60 VI_MAX_WIDTH_NTSC #define VI_MAX_HEIGHT_EURGB60 VI_MAX_HEIGHT_NTSC +#define VI_MAX_WIDTH_FRAMEBUFFER 608 +#define VI_MAX_HEIGHT_FRAMEBUFFER 456 + enum { VI_NTSC = 0, VI_PAL, diff --git a/libs/RVL_SDK/include/revolution/wad.h b/libs/RVL_SDK/include/revolution/wad.h index 8c8a2d81..c8e1e31e 100644 --- a/libs/RVL_SDK/include/revolution/wad.h +++ b/libs/RVL_SDK/include/revolution/wad.h @@ -15,6 +15,12 @@ extern "C" { #define WAD_IMPORT_TYPE_SOFTWARE "Is" /* "Import software" */ #define WAD_IMPORT_TYPE_BACKUP "Bk" /* "Backup"*/ +enum { + WAD_ERROR_OK = 0, + WAD_ERROR_NOCOPY = -3002, /*?*/ + WAD_ERROR_INCORRECT_DEVICE = -3008, /*?*/ +}; + typedef struct WADHeader { u32 hdrSize; // 0x00 (Always 32) @@ -53,31 +59,34 @@ typedef struct WADBackupHeader { } WADBackupHeader; typedef enum { - WAD_LOC_DVD = 0x1, // 0x1 - WAD_LOC_NANDPRIVATE = 0x2, // 0x2 - WAD_LOC_SD_CARD = 0x3, // 0x3 - WAD_LOC_DVDCONTENT = 0x4, // 0x4 - WAD_LOC_NANDCONTENT = 0x5, // 0x5 + WAD_LOCATION_DVD = 1, + WAD_LOCATION_NAND, + WAD_LOCATION_SD_CARD, + WAD_LOCATION_CNT_DVD, + WAD_LOCATION_CNT_NAND, } WADLocation; + typedef struct { - u16 unkBlocks; // 0x0 - u16 unkInodes; // 0x2 - u16 privateBlocks; // 0x4 - u16 privateInodes; // 0x6 - u16 sharedBlocks; // 0x8 - u16 sharedInodes; // 0xa - u16 fileBlocks; // 0xc - u16 fileInodes; // 0xe + u16 unkBlocks; // 0x00 + u16 unkInodes; // 0x02 + u16 privateBlocks; // 0x04 + u16 privateInodes; // 0x06 + u16 sharedBlocks; // 0x08 + u16 sharedInodes; // 0x0A + u16 fileBlocks; // 0x0C + u16 fileInodes; // 0x0E } WADBlocks; -typedef void (*WADProgressCb)(u32 completed, u32 total, BOOL done); +typedef void (*WADProcessCallback)(u32 completed, u32 total, BOOL done); -int WADGetTitleVersionEx(char* path, u64* titleIdOut, u16* titleVersionOut, WADLocation location, u32 offset); -int WADBackupEx(u64 titleId, u32 param_2, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 param_7, - WADProgressCb progressCb); +s32 WADGetTitleVersionEx(char* path, ESTitleId* titleId, u16* titleVersion, WADLocation location, u32 offset); +s32 WADBackupEx(u64 titleId, u32 param_2, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 param_7, + WADProcessCallback processCB); -int WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 param_5, WADBlocks* blocksOut, u32* param_7); -int WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 param_4, u32 param_5, WADProgressCb progressCb); +s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 param_5, WADBlocks* blocks, u32* param_7); +s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 param_4, u32 param_5, WADProcessCallback processCB); + +s32 WADGetInstalledVersion(ESTitleId titleID, u16* version); #ifdef __cplusplus } diff --git a/libs/RVL_SDK/src/cx/CXStreamingUncompression.c b/libs/RVL_SDK/src/cx/CXStreamingUncompression.c index f6738a3e..aab5eabf 100644 --- a/libs/RVL_SDK/src/cx/CXStreamingUncompression.c +++ b/libs/RVL_SDK/src/cx/CXStreamingUncompression.c @@ -8,7 +8,7 @@ void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) { context->unk_0x00 = param_2; context->unk_0x04 = 0; context->unk_0x0e = 0; - context->unk_0x0c = 0; + context->unk_0x0C = 0; context->unk_0x0f = 8; context->unk_0x08 = 0; } @@ -18,7 +18,7 @@ void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2) { context->unk_0x04 = 0; context->unk_0x11 = 0; context->unk_0x12 = 0; - context->unk_0x0c = 0; + context->unk_0x0C = 0; context->unk_0x10 = 3; context->unk_0x13 = 8; context->unk_0x14 = 0; @@ -66,10 +66,10 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3 while (context->unk_0x04 > 0) { if (!(context->unk_0x0e & 0x80)) { - while (context->unk_0x0c) { + while (context->unk_0x0C) { *context->unk_0x00++ = *pSrc++; - context->unk_0x0c--; + context->unk_0x0C--; context->unk_0x04--; size--; @@ -77,14 +77,14 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3 return context->unk_0x04; } } - } else if (context->unk_0x0c) { + } else if (context->unk_0x0C) { u8 b = *pSrc++; size--; - while (context->unk_0x0c) { + while (context->unk_0x0C) { *context->unk_0x00++ = b; - context->unk_0x0c--; + context->unk_0x0C--; context->unk_0x04--; } @@ -95,20 +95,20 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3 context->unk_0x0e = *pSrc++; size--; - context->unk_0x0c = context->unk_0x0e & 0x7f; + context->unk_0x0C = context->unk_0x0e & 0x7f; if (context->unk_0x0e & 0x80) { - context->unk_0x0c += 3; + context->unk_0x0C += 3; } else { - context->unk_0x0c += 1; + context->unk_0x0C += 1; } - if (context->unk_0x0c > context->unk_0x04) { + if (context->unk_0x0C > context->unk_0x04) { if (!context->unk_0x08) { return CX_STREAMING_ERR_BAD_FILE_SIZE; } - context->unk_0x0c = context->unk_0x04; + context->unk_0x0C = context->unk_0x04; } if (size) { @@ -205,34 +205,34 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3 context->unk_0x10--; if (!context->unk_0x14) { - context->unk_0x0c = *pSrc++; - context->unk_0x0c += 0x30; + context->unk_0x0C = *pSrc++; + context->unk_0x0C += 0x30; context->unk_0x10 = 0; } else { switch (context->unk_0x10) { case 2: { - context->unk_0x0c = *pSrc++; + context->unk_0x0C = *pSrc++; - if (context->unk_0x0c >> 4 == 1) { - context->unk_0x0c = (context->unk_0x0c & 0x0F) << 16; - context->unk_0x0c += 0x1110; - } else if (context->unk_0x0c >> 4 == 0) { - context->unk_0x0c = (context->unk_0x0c & 0x0F) << 8; - context->unk_0x0c += 0x110; + if (context->unk_0x0C >> 4 == 1) { + context->unk_0x0C = (context->unk_0x0C & 0x0F) << 16; + context->unk_0x0C += 0x1110; + } else if (context->unk_0x0C >> 4 == 0) { + context->unk_0x0C = (context->unk_0x0C & 0x0F) << 8; + context->unk_0x0C += 0x110; context->unk_0x10 = 1; } else { - context->unk_0x0c += 0x10; + context->unk_0x0C += 0x10; context->unk_0x10 = 0; } break; } case 1: { - context->unk_0x0c += *pSrc++ << 8; + context->unk_0x0C += *pSrc++ << 8; break; } case 0: { - context->unk_0x0c += *pSrc++; + context->unk_0x0C += *pSrc++; break; } } @@ -244,26 +244,26 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3 } } - a = (context->unk_0x0c & 0x0F) << 8; - context->unk_0x0c >>= 4; + a = (context->unk_0x0C & 0x0F) << 8; + context->unk_0x0C >>= 4; a = (a | *pSrc++) + 1; size--; context->unk_0x10 = 3; - if (context->unk_0x0c > context->unk_0x04) { + if (context->unk_0x0C > context->unk_0x04) { if (!context->unk_0x08) { return CX_STREAMING_ERR_BAD_FILE_SIZE; } - context->unk_0x0c = context->unk_0x04; + context->unk_0x0C = context->unk_0x04; } - while (context->unk_0x0c > 0) { + while (context->unk_0x0C > 0) { *context->unk_0x00 = context->unk_0x00[-a]; context->unk_0x00++; context->unk_0x04--; - context->unk_0x0c--; + context->unk_0x0C--; } there: diff --git a/libs/RVL_SDK/src/scutil/idToIsoA2.c b/libs/RVL_SDK/src/scutil/idToIsoA2.c index 2961854a..ab7163fa 100644 --- a/libs/RVL_SDK/src/scutil/idToIsoA2.c +++ b/libs/RVL_SDK/src/scutil/idToIsoA2.c @@ -1,4 +1,5 @@ #include +#include char* countryIdToISOA2[] = { NULL, "JP", NULL, NULL, NULL, NULL, NULL, NULL, "AI", "AG", "AR", "AW", "BS", "BB", "BZ", "BO", "BR", "VG", "CA", "KY", "CL", "CO", "CR", @@ -11,7 +12,7 @@ char* countryIdToISOA2[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, "AE", "IN", "EG", "OM", "QA", "KW", "SA", "SY", "BH", "JO", }; -char* SCUTILGetISOCountryCodeA2() { +const char* SCUTILGetISOCountryCodeA2() { u32 countryID, addressID = SCGetSimpleAddressID(); if (addressID == 0xFFFFFFFF) { return NULL; diff --git a/libs/RVL_SDK/src/wpad/WPAD.c b/libs/RVL_SDK/src/wpad/WPAD.c index 4159ddf2..59f54da4 100644 --- a/libs/RVL_SDK/src/wpad/WPAD.c +++ b/libs/RVL_SDK/src/wpad/WPAD.c @@ -777,7 +777,7 @@ static void __ClearControlBlock(s32 chan) { _wmb[chan].unk_0x00 = 0; _wmb[chan].unk_0x04 = 0; _wmb[chan].unk_0x08 = 0; - _wmb[chan].unk_0x0c = 0; + _wmb[chan].unk_0x0C = 0; _wmb[chan].unk_0x10 = NULL; _rumbleCnt[chan] = 0; diff --git a/libs/RevoEX/include/revolution/ncd/NCDTypes.h b/libs/RevoEX/include/revolution/ncd/NCDTypes.h index fc6fd352..f06efa7d 100644 --- a/libs/RevoEX/include/revolution/ncd/NCDTypes.h +++ b/libs/RevoEX/include/revolution/ncd/NCDTypes.h @@ -6,13 +6,13 @@ typedef s32 NCDErr; enum { - NCD_MODE_NONE = 0, // 0 - NCD_MODE_WEP40 = 1, // 1 - NCD_MODE_WEP104 = 2, // 2 - NCD_MODE_INVALID3 = 3, // 3 - NCD_MODE_WPA_PSK_TKIP = 4, // 4 - NCD_MODE_WPA2_PSK_TKIP = 5, // 5 - NCD_MODE_WPA_PSK_AES = 6, // 6 + NCD_MODE_NONE = 0, + NCD_MODE_WEP40, + NCD_MODE_WEP104, + NCD_MODE_INVALID3, + NCD_MODE_WPA_PSK_TKIP, + NCD_MODE_WPA2_PSK_TKIP, + NCD_MODE_WPA_PSK_AES, }; enum { NCD_LINKSTATUS_WIRED = 3, // ? @@ -20,6 +20,7 @@ enum { enum { NCD_RESULT_SUCCESS = 0, + NCD_RESULT_4 = -4, NCD_RESULT_INPROGRESS = -8, }; diff --git a/libs/RevoEX/include/revolution/net.h b/libs/RevoEX/include/revolution/net.h index 68794951..1370b677 100644 --- a/libs/RevoEX/include/revolution/net.h +++ b/libs/RevoEX/include/revolution/net.h @@ -10,6 +10,7 @@ extern "C" { int NETGetWirelessMacAddress(void* data); +int NETGetStartupErrorCode(int); int NETGetStartupErrorCodeEx(int, int); #ifdef __cplusplus diff --git a/libs/RevoEX/include/revolution/nhttp/d_nhttp.h b/libs/RevoEX/include/revolution/nhttp.h similarity index 92% rename from libs/RevoEX/include/revolution/nhttp/d_nhttp.h rename to libs/RevoEX/include/revolution/nhttp.h index 6e832584..d94db82c 100644 --- a/libs/RevoEX/include/revolution/nhttp/d_nhttp.h +++ b/libs/RevoEX/include/revolution/nhttp.h @@ -1,9 +1,11 @@ -#ifndef D_NHTTP_H -#define D_NHTTP_H +#ifndef REVOLUTION_NHTTP_H +#define REVOLUTION_NHTTP_H #include +#include + #ifdef __cplusplus extern "C" { #endif // __cplusplus @@ -52,4 +54,4 @@ int NHTTPSetClientCertDefault(NHTTPRequest* request); } #endif // __cplusplus -#endif // D_NHTTP_H +#endif // REVOLUTION_NHTTP_H diff --git a/libs/RevoEX/include/revolution/ssl.h b/libs/RevoEX/include/revolution/ssl.h index 91832a92..793a58f9 100644 --- a/libs/RevoEX/include/revolution/ssl.h +++ b/libs/RevoEX/include/revolution/ssl.h @@ -1,6 +1,10 @@ #ifndef REVOLUTION_SSL_H #define REVOLUTION_SSL_H +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + #include typedef int SSLResult; @@ -37,4 +41,8 @@ SSLResult SSLSetRootCA(SSLId sslId, const char* rootCAData, u32 rootCASize); SSLResult SSLSetBuiltinRootCA(SSLId sslId, u32 rootCAId); SSLResult SSLSetBuiltinClientCert(SSLId sslId, u32 clientCertId); +#ifdef __cplusplus +} +#endif // __cplusplus + #endif // REVOLUTION_SSL_H diff --git a/libs/RevoEX/include/revolution/vf.h b/libs/RevoEX/include/revolution/vf.h index 17e9399f..2b08f340 100644 --- a/libs/RevoEX/include/revolution/vf.h +++ b/libs/RevoEX/include/revolution/vf.h @@ -1,6 +1,10 @@ #ifndef REVOLUTION_VF_H #define REVOLUTION_VF_H +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + #include void VFInit(); @@ -60,4 +64,8 @@ VFErr VFGetLastDeviceError(const char* drive); const char* VFGetApiErrorString(VFErr error); +#ifdef __cplusplus +} +#endif // __cplusplus + #endif // REVOLUTION_VF_H diff --git a/libs/RevoEX/include/revolution/vf/types.h b/libs/RevoEX/include/revolution/vf/types.h index 5f29f485..733a2ced 100644 --- a/libs/RevoEX/include/revolution/vf/types.h +++ b/libs/RevoEX/include/revolution/vf/types.h @@ -1,6 +1,10 @@ #ifndef REVOLUTION_VF_TYPES_H #define REVOLUTION_VF_TYPES_H +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + #include enum { @@ -90,4 +94,8 @@ typedef struct VFDta { s8 pad[2]; // 0x442 } VFDta; +#ifdef __cplusplus +} +#endif // __cplusplus + #endif // REVOLUTION_VF_TYPES_H diff --git a/src/iplwww/www_arcreader.cpp b/src/iplwww/www_arcreader.cpp index fed77938..1b7f78d6 100644 --- a/src/iplwww/www_arcreader.cpp +++ b/src/iplwww/www_arcreader.cpp @@ -11,12 +11,13 @@ namespace www { static u32 sStatus; void AddProtocol() { - if ((*WWWAddProtocol)(sProtocolName) == 0) { - ext_ead::www::print::IPLWWWReport(3, " - %s protocol added successfully \n", sProtocolName); + if (WWWAddProtocol(sProtocolName) == 0) { + ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, " - %s protocol added successfully \n", sProtocolName); } else { - ext_ead::www::print::IPLWWWReport(3, " - %s protocol added failed- \n", sProtocolName); + ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, " - %s protocol added failed- \n", sProtocolName); } } + bool ReadRequest(const WWWProtocolData* protocolData, ArcContainer* container) { u32 chunkSize; bool ret = 0; @@ -25,60 +26,65 @@ namespace www { const u8* fileData; sStatus = 0; - ext_ead::www::print::IPLWWWReport(3, " Read: %s\n", protocolData->filePath); + + ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, " Read: %s\n", protocolData->filePath); if (strcmp(protocolData->protocolName, sProtocolName) == 0) { ret = true; // Strip the protocol base folder (marc/) and remove any leading // slashes to get just the subpath path = protocolData->filePath + strlen(sProtocolName) + 1; - while (*path == '/') + while (*path == '/') { path++; - ext_ead::www::print::IPLWWWReport(3, " filename: %s\n", path); + } + ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, " filename: %s\n", path); fileData = (const u8*)container->find(path, &fileSize); if (fileData != NULL) { for (; fileSize != 0; fileSize -= chunkSize) { - chunkSize = 0x7fff; - if (fileSize <= 0x7fff) { + chunkSize = 0x7FFF; + if (fileSize <= 0x7FFF) { chunkSize = fileSize; } - sStatus = (*WWWProtocolWrite)(protocolData->wwwInternal, fileData, chunkSize); + sStatus = WWWProtocolWrite(protocolData->wwwInternal, fileData, chunkSize); if (sStatus != 0) { - (*WWWProtocolFailed)(protocolData->wwwInternal); + WWWProtocolFailed(protocolData->wwwInternal); sStatus = 1; return true; } fileData += chunkSize; // sStatus = 0; } - sStatus = (*WWWProtocolFinished)(protocolData->wwwInternal); + sStatus = WWWProtocolFinished(protocolData->wwwInternal); return true; } else { - (*WWWProtocolFailed)(protocolData->wwwInternal); + WWWProtocolFailed(protocolData->wwwInternal); sStatus = 1; } } return ret; } + ArcContainer::ArcContainer(void* scratchSpace) { - pScratch = scratchSpace; + mpScratch = scratchSpace; for (int i = 0; i < ARRAY_LENGTH(mFlags); i++) { mFlags[i] = false; } } + void ArcContainer::RegisterArcFile(const void* data) { int i; for (i = 0; i < ARRAY_LENGTH(mFlags); i++) { if (mFlags[i]) continue; - if (ARCInitHandle((void*)data, this->mHandles + i) != 0) { + if (ARCInitHandle((void*)data, mHandles + i) != 0) { mFlags[i] = true; } break; } + if (i == 4 || !mFlags[i]) { - OSPanic("www_arcreader.cpp", 0x8e, " the file cannot registered\n"); + OSHalt(" the file cannot registered\n", 142); } } @@ -92,10 +98,12 @@ namespace www { *fileSize = 0; for (i = 0; i < (int)ARRAY_LENGTH(mFlags); i++) { - if (!mFlags[i]) + if (!mFlags[i]) { continue; - if (ARCOpen(&mHandles[i], path, &fileInfo) == 0) + } + if (!ARCOpen(&mHandles[i], path, &fileInfo)) { continue; + } filePtr = ARCGetStartAddrInMem(&fileInfo); *fileSize = ARCGetLength(&fileInfo); @@ -106,9 +114,9 @@ namespace www { const char* lz77Hdr = (const char*)filePtr; if (lz77Hdr[0] == 'L' && lz77Hdr[1] == 'Z' && lz77Hdr[2] == '7' && lz77Hdr[3] == '7') { uncompressedSize = CXGetUncompressedSize((const u8*)filePtr + 4); - CXUncompressLZ((const u8*)filePtr + 4, pScratch); + CXUncompressLZ((const u8*)filePtr + 4, mpScratch); *fileSize = uncompressedSize; - return pScratch; + return mpScratch; } } diff --git a/src/iplwww/www_browser.cpp b/src/iplwww/www_browser.cpp index 4651003e..c2240542 100644 --- a/src/iplwww/www_browser.cpp +++ b/src/iplwww/www_browser.cpp @@ -131,68 +131,76 @@ namespace ext_ead { IPL_WWW_REPORT_REDEFINE_MESSAGE(false) } + // TODO: What does this magic number mean? + static const u32 MSG_MAGIC = 0x798ADFE1; + OSMutex BrowserThread::runSliceMutex_ = {}; int BrowserThread::classInitialized_ = false; BOOL BrowserThread::SNotifyCallback_(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData) { - return SurfaceManager::Instance_->pBrowserThread->NotifyCallback_(wwwBrowser, wwwWindow, event, eventData); + return SurfaceManager::GetInstance()->GetBrowserThread()->NotifyCallback_(wwwBrowser, wwwWindow, event, eventData); } + BOOL BrowserThread::NotifyCallback_(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData) { BrowserWindow* pWindow; - for (int i = 0; i < ARRAY_LENGTH(pBrowserWindows); i++) { - pWindow = (BrowserWindow*)pBrowserWindows[i]; - if (pWindow != NULL && pWindow->pWwwWindow == wwwWindow) + for (int i = 0; i < ARRAY_LENGTH(mpBrowserWindows); i++) { + pWindow = (BrowserWindow*)mpBrowserWindows[i]; + if (pWindow != NULL && pWindow->GetHandleWindow() == wwwWindow) { break; + } } - if (event == 0x2c) { - ::www::arcreader::ReadRequest((WWWProtocolData*)eventData, (::www::arcreader::ArcContainer*)this->pArcContainer); + if (event == WWW_EVT_PROTOCOL_LOADING_START) { + ::www::arcreader::ReadRequest((WWWProtocolData*)eventData, mpArcContainer); } if (pWindow != NULL) { pWindow->SendNotifyEvent(event, eventData); - if (event == 7) { - print::IPLWWWReport(3, " EVT_FINISHED: %d/%d %d/%d s:%d\n", eventData->data[1], eventData->data[0], eventData->data[3], - eventData->data[2], eventData->data[6]); + if (event == WWW_EVT_LOADING_FINISHED) { + print::IPLWWWReport(print::WWW_DEBUG, " EVT_FINISHED: %d/%d %d/%d s:%d\n", eventData->data[1], eventData->data[0], + eventData->data[3], eventData->data[2], eventData->data[6]); } } return false; } BrowserThread::BrowserThread() - : pRaster(NULL), pOperaHeapBuf(NULL), mWidth(0), mHeight(0), pIniData(NULL), mIniLen(0), pArcContainer(NULL), - pArcDecompressionScratch(NULL) { + : mpRaster(NULL), mpOperaHeapBuf(NULL), mWidth(0), mHeight(0), mpIniData(NULL), mIniLen(0), mpArcContainer(NULL), + mpArcDecmpScratch(NULL) { if (!classInitialized_) { OSInitMutex(&runSliceMutex_); } classInitialized_++; } + BrowserThread::~BrowserThread() { classInitialized_--; if (!classInitialized_) { - if (this->pRaster != NULL) { - Heap::freeMem1(pRaster); - pRaster = NULL; + if (mpRaster != NULL) { + Heap::freeMem1(mpRaster); + mpRaster = NULL; } - if (pOperaHeapBuf != NULL) { - Heap::freeMem2(pOperaHeapBuf); - pOperaHeapBuf = NULL; + if (mpOperaHeapBuf != NULL) { + Heap::freeMem2(mpOperaHeapBuf); + mpOperaHeapBuf = NULL; } - if (this->pArcContainer != NULL) { - Heap::freeMem1(pArcContainer); - Heap::freeMem1(pArcDecompressionScratch); + if (mpArcContainer != NULL) { + Heap::freeMem1(mpArcContainer); + Heap::freeMem1(mpArcDecmpScratch); } } } + void BrowserThread::RegisterArcFile(void* arcData) { - if (pArcContainer == NULL) { - pArcContainer = (::www::arcreader::ArcContainer*)Heap::allocMem1(0x78, 4); - pArcDecompressionScratch = Heap::allocMem1(0x20000, 4); - new (pArcContainer)::www::arcreader::ArcContainer(pArcDecompressionScratch); + if (mpArcContainer == NULL) { + mpArcContainer = (::www::arcreader::ArcContainer*)Heap::allocMem1(sizeof(::www::arcreader::ArcContainer), 4); + mpArcDecmpScratch = Heap::allocMem1(0x20000, 4); + new (mpArcContainer)::www::arcreader::ArcContainer(mpArcDecmpScratch); } - ((::www::arcreader::ArcContainer*)pArcContainer)->RegisterArcFile(arcData); + mpArcContainer->RegisterArcFile(arcData); return; } + void BrowserThread::RegisterIniFile(void* iniData, u32 iniLen) { - pIniData = iniData; + mpIniData = iniData; mIniLen = iniLen; } @@ -200,15 +208,16 @@ namespace ext_ead { mWidth = w; mHeight = h; OSInitMessageQueue(&mQueue, mQueueBuf, ARRAY_LENGTH(mQueueBuf)); - memset(pBrowserWindows, 0, 0x10); + memset(mpBrowserWindows, 0, sizeof(mpBrowserWindows)); ut_thread::Create(threadStack, threadStackSize, priority, false); } + void BrowserThread::StopThread() { if (!IsThreadTerminated()) { - // TODO: What does this magic number mean? - OSSendMessage(&mQueue, (void*)0x798adfe1, 0); + OSSendMessage(&mQueue, (void*)MSG_MAGIC, 0); } } + bool BrowserThread::IsThreadStopped() { bool isStopped = IsThreadTerminated(); if (isStopped != 0) { @@ -220,49 +229,52 @@ namespace ext_ead { bool BrowserThread::CheckThreadExit_() { OSMessage msg = NULL; if (OSReceiveMessage(&mQueue, &msg, 0)) { - print::IPLWWWReport(3, "BrowserThread:: msg received.\n"); - if ((u32)msg == 0x798adfe1) - return 1; + print::IPLWWWReport(print::WWW_DEBUG, "BrowserThread:: msg received.\n"); + if ((u32)msg == MSG_MAGIC) { + return true; + } } - return 0; + return false; } + void BrowserThread::InitSurface_() { u32 surfaceW, surfaceH; int surfaceInitRet, setFlushCbRet; int rasterRowSize, rasterSize; - void* pvVar1; u32* rasterPtr; - surfaceW = SurfaceManager::Instance_->mWidth; - surfaceH = SurfaceManager::Instance_->mHeight; - SurfaceManager::Instance_->ResolveRsoModule(); + surfaceW = SurfaceManager::GetInstance()->GetWidth(); + surfaceH = SurfaceManager::GetInstance()->GetHeight(); + SurfaceManager::GetInstance()->ResolveRsoModule(); rasterRowSize = surfaceW * sizeof(u32); rasterSize = rasterRowSize * surfaceH; rasterPtr = (u32*)Heap::allocMem1(rasterSize, 4); - pRaster = rasterPtr; - print::IPLWWWReport(3, "www_surface: OperaFrameBuffer: ptr:%p, size:%d\n", rasterPtr, rasterSize); + mpRaster = rasterPtr; + print::IPLWWWReport(print::WWW_DEBUG, "www_surface: OperaFrameBuffer: ptr:%p, size:%d\n", rasterPtr, rasterSize); - pOperaHeapBuf = Heap::allocMem2(0x6e0000, 0x20); - memset(pOperaHeapBuf, 0, 0x6e0000); - print::IPLWWWReport(3, "www_surface: OperaHeapBuffer : ptr:%p \n", pOperaHeapBuf); + mpOperaHeapBuf = Heap::allocMem2(0x6E0000, 0x20); + memset(mpOperaHeapBuf, 0, 0x6E0000); + print::IPLWWWReport(print::WWW_DEBUG, "www_surface: OperaHeapBuffer : ptr:%p \n", mpOperaHeapBuf); - (*WWWGetBrowserAllocationFunctions)(this->pOperaHeapBuf, 0x6e0000, &Heap::wwwalloc_, &Heap::wwwfree_, &Heap::wwwavail_); - (*WWWSetAllocationFunctions)(Heap::wwwalloc_, Heap::wwwfree_, Heap::wwwavail_, Heap::wwwalloc_, Heap::wwwfree_, Heap::wwwalloc_, - Heap::wwwfree_); + WWWGetBrowserAllocationFunctions(mpOperaHeapBuf, 0x6E0000, &Heap::wwwalloc_, &Heap::wwwfree_, &Heap::wwwavail_); + WWWSetAllocationFunctions(Heap::wwwalloc_, Heap::wwwfree_, Heap::wwwavail_, Heap::wwwalloc_, Heap::wwwfree_, Heap::wwwalloc_, + Heap::wwwfree_); print::TickTimer tt; tt.reset(); - surfaceInitRet = (*WWWSurfaceInit)(surfaceW, surfaceH, rasterRowSize, 0, this->pRaster); + surfaceInitRet = WWWSurfaceInit(surfaceW, surfaceH, rasterRowSize, 0, mpRaster); tt.report("WWWSurfaceInit"); - if (surfaceInitRet != 0) + if (surfaceInitRet != WWW_ERROR_OK) { OSReport("WWWSurfaceInit %d\n", surfaceInitRet); + } tt.reset(); - setFlushCbRet = (*WWWSurfaceSetFlushCallback)(FlushCallback, 0); + setFlushCbRet = WWWSurfaceSetFlushCallback(FlushCallback, 0); tt.report("WWWSurfaceSetFlushCallback"); - if (setFlushCbRet != 0) + if (setFlushCbRet != WWW_ERROR_OK) { OSReport("WWWSurfaceSetFlushCallback %d\n", setFlushCbRet); + } } void* BrowserThread::Run() { @@ -270,7 +282,7 @@ namespace ext_ead { InitSurface_(); InitFonts_("/operafonts/"); - print::IPLWWWReport(3, "BrowserThread:: executed\n"); + print::IPLWWWReport(print::WWW_DEBUG, "BrowserThread:: executed\n"); tt.reset(); @@ -281,88 +293,97 @@ namespace ext_ead { fonts[4] = "Wii NTLG Gothic"; fonts[1] = "Wii NTLG PGothic"; fonts[0] = "Wii NTLG PGothic"; - (*WWWCreateBrowser)(&pWwwBrowser, SNotifyCallback_, fonts, "/tmp/www.arc/nand"); + WWWCreateBrowser(&mpBrowserHandle, SNotifyCallback_, fonts, "/tmp/www.arc/nand"); tt.report("WWWCreateBrowser"); ::www::trasition::AddJsPlugin(); ::www::wiisetting::AddJsPlugin(); ::www::arcreader::AddProtocol(); - SurfaceManager* surface = SurfaceManager::Instance_; - pBrowserWindows[0] = (BrowserWindow*)Heap::allocMem1(0x2cc, 4); - new (pBrowserWindows[0]) BrowserWindow(this); - ((BrowserWindow*)pBrowserWindows[0])->CreateWindow(mWidth, mHeight, surface->mWidth, surface->mHeight); + SurfaceManager* surface = SurfaceManager::GetInstance(); + mpBrowserWindows[0] = (BrowserWindow*)Heap::allocMem1(sizeof(BrowserWindow), 4); + new (mpBrowserWindows[0]) BrowserWindow(this); + ((BrowserWindow*)mpBrowserWindows[0])->CreateWindow(mWidth, mHeight, surface->GetWidth(), surface->GetHeight()); Heap::reportHeap(); while (true) { - if (CheckThreadExit_()) + if (CheckThreadExit_()) { break; + } HandleUIEvent_(); OSLockMutex(&runSliceMutex_); int i = 0; BOOL sliceRes; do { - sliceRes = (*WWWRunSlice)(pWwwBrowser); + sliceRes = WWWRunSlice(mpBrowserHandle); i++; - ((BrowserWindow*)pBrowserWindows[0])->ExecuteEvent(); + ((BrowserWindow*)mpBrowserWindows[0])->ExecuteEvent(); } while (sliceRes == 0); if (i > 10) { - print::IPLWWWReport(3, "+++ too many WWWRunSlice called. %d\n", i); + print::IPLWWWReport(print::WWW_DEBUG, "+++ too many WWWRunSlice called. %d\n", i); } OSUnlockMutex(&runSliceMutex_); - (*WWWSurfaceUpdateScreen)(0); - (*WWWSurfaceUpdateScreen)(0); - (*WWWSurfaceUpdateScreen)(0); + WWWSurfaceUpdateScreen(0); + WWWSurfaceUpdateScreen(0); + WWWSurfaceUpdateScreen(0); - ((BrowserWindow*)pBrowserWindows[0])->ExecuteEvent(); - ((BrowserWindow*)pBrowserWindows[0])->UpdateTexture(); - if (*(u32*)mThread.stackEnd != -0x21524542) { - print::IPLWWWReport(3, "This thread stack has overflowed.\n"); + ((BrowserWindow*)mpBrowserWindows[0])->ExecuteEvent(); + ((BrowserWindow*)mpBrowserWindows[0])->UpdateTexture(); + + if (*(u32*)mThread.stackEnd != 0xDEADBABE) { + print::IPLWWWReport(print::WWW_DEBUG, "This thread stack has overflowed.\n"); } OSSleepMilliseconds(5); } - ((BrowserWindow*)pBrowserWindows[0])->CloseWindow(); - ((BrowserWindow*)pBrowserWindows[0])->~BrowserWindow(); + ((BrowserWindow*)mpBrowserWindows[0])->CloseWindow(); + ((BrowserWindow*)mpBrowserWindows[0])->~BrowserWindow(); - Heap::freeMem1(pBrowserWindows[0]); - pBrowserWindows[0] = NULL; + Heap::freeMem1(mpBrowserWindows[0]); + mpBrowserWindows[0] = NULL; - (*WWWTerminateBrowser)(pWwwBrowser); + WWWTerminateBrowser(mpBrowserHandle); return this; } void BrowserThread::SendKeyboardEvent_(u32 btnMask, u32 triggerFlag, u32 releaseFlag, WWWKeySym sym) { if (triggerFlag & btnMask) { - (*WWWSurfaceKeyboardEvt)(KEY_CMD_TRIGGER, sym, 0); + WWWSurfaceKeyboardEvt(KEY_CMD_TRIGGER, sym, 0); } else if (releaseFlag & btnMask) { - (*WWWSurfaceKeyboardEvt)(KEY_CMD_RELEASE, sym, 0); + WWWSurfaceKeyboardEvt(KEY_CMD_RELEASE, sym, 0); } } + WWWKeySym BrowserThread::GetKeyboardSym_(u32 input) { switch (input) { - case ipl::controller::BTN_NEXT_RIGHT: + case ipl::controller::BTN_NEXT_RIGHT: { return KEY_SYM_NEXT_RIGHT; - case ipl::controller::BTN_NEXT_LEFT: + } + case ipl::controller::BTN_NEXT_LEFT: { // return KEY_SYM_NEXT_LEFT; return KEY_SYM_SOMETHING; - - case ipl::controller::BTN_UP: + } + case ipl::controller::BTN_UP: { return KEY_SYM_UP; - case ipl::controller::BTN_DOWN: + } + case ipl::controller::BTN_DOWN: { return KEY_SYM_DOWN; - case ipl::controller::BTN_LEFT: + } + case ipl::controller::BTN_LEFT: { return KEY_SYM_LEFT; - case ipl::controller::BTN_RIGHT: + } + case ipl::controller::BTN_RIGHT: { return KEY_SYM_RIGHT; - - case ipl::controller::REVO_BTN_1: + } + case ipl::controller::REVO_BTN_1: { return KEY_SYM_BTN1; - case ipl::controller::REVO_BTN_2: + } + case ipl::controller::REVO_BTN_2: { return KEY_SYM_BTN2; - - default: + } + default: { return KEY_SYM_BLANK; + } } } @@ -373,34 +394,37 @@ namespace ext_ead { x = cmd.data.controller.irX; y = cmd.data.controller.irY; if (cmd.data.controller.btnTrigger & ipl::controller::BTN_INTERACT) { - (*WWWSurfaceMouseEvt)(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0); - (*WWWSurfaceMouseEvt)(MOUSE_CMD_TRIGGER, x, y, MOUSE_ATTRIB_BUTTON, 1, 0); - (*WWWSurfaceMouseEvt)(MOUSE_CMD_RELEASE, x, y, MOUSE_ATTRIB_BUTTON, 1, 0); + WWWSurfaceMouseEvt(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0); + WWWSurfaceMouseEvt(MOUSE_CMD_TRIGGER, x, y, MOUSE_ATTRIB_BUTTON, 1, 0); + WWWSurfaceMouseEvt(MOUSE_CMD_RELEASE, x, y, MOUSE_ATTRIB_BUTTON, 1, 0); somethingClicked = 1; } else if (cmd.data.controller.btnRelease & ipl::controller::BTN_INTERACT) { - (*WWWSurfaceMouseEvt)(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0); - (*WWWSurfaceMouseEvt)(MOUSE_CMD_RELEASE, x, y, MOUSE_ATTRIB_BUTTON, 1, 0); + WWWSurfaceMouseEvt(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0); + WWWSurfaceMouseEvt(MOUSE_CMD_RELEASE, x, y, MOUSE_ATTRIB_BUTTON, 1, 0); } else { - (*WWWSurfaceMouseEvt)(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0); + WWWSurfaceMouseEvt(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0); if (gDpdWaitFrm >= 4 && (cmd.data.controller.btnTrigger & ipl::controller::BTN_NEXT_LEFT)) { - (*WWWSurfaceKeyboardEvt)(KEY_CMD_RELEASE, KEY_SYM_NEXT_RIGHT, 0); - (*WWWSurfaceKeyboardEvt)(KEY_CMD_TRIGGER, KEY_SYM_NEXT_RIGHT, 0); + WWWSurfaceKeyboardEvt(KEY_CMD_RELEASE, KEY_SYM_NEXT_RIGHT, 0); + WWWSurfaceKeyboardEvt(KEY_CMD_TRIGGER, KEY_SYM_NEXT_RIGHT, 0); } else if (gDpdWaitFrm >= 4 && (cmd.data.controller.btnTrigger & ipl::controller::BTN_NEXT_RIGHT)) { - (*WWWSurfaceKeyboardEvt)(KEY_CMD_RELEASE, KEY_SYM_NEXT_LEFT, 0); - (*WWWSurfaceKeyboardEvt)(KEY_CMD_TRIGGER, KEY_SYM_NEXT_LEFT, 0); + WWWSurfaceKeyboardEvt(KEY_CMD_RELEASE, KEY_SYM_NEXT_LEFT, 0); + WWWSurfaceKeyboardEvt(KEY_CMD_TRIGGER, KEY_SYM_NEXT_LEFT, 0); } } + if (gEnableDpd && ++gDpdWaitFrm > 4) { gDpdWaitFrm = 4; } + return somethingClicked; } + void BrowserThread::ExecSpacialEvent_(const CmdPacket& cmd) { if (cmd.data.controller.btnTrigger & ipl::controller::BTN_NEXT_RIGHT) { - ((BrowserWindow*)pBrowserWindows[0])->PrevPage(); + ((BrowserWindow*)mpBrowserWindows[0])->PrevPage(); } if (cmd.data.controller.btnTrigger & ipl::controller::BTN_NEXT_LEFT) { - ((BrowserWindow*)pBrowserWindows[0])->GotoHome(); + ((BrowserWindow*)mpBrowserWindows[0])->GotoHome(); } #define SEND_KEYBOARD_EVENT_FROM_CONTROLLER_CODE(CONTROLLER_CODE, CMD) \ SendKeyboardEvent_(CONTROLLER_CODE, (CMD).data.controller.btnTrigger, (CMD).data.controller.btnRelease, GetKeyboardSym_(CONTROLLER_CODE)); @@ -412,98 +436,112 @@ namespace ext_ead { SEND_KEYBOARD_EVENT_FROM_CONTROLLER_CODE(ipl::controller::REVO_BTN_1, cmd); SEND_KEYBOARD_EVENT_FROM_CONTROLLER_CODE(ipl::controller::REVO_BTN_2, cmd); } + void BrowserThread::HandleUIEvent_() { CmdPacket cmd; while (mCmdPacketQueue.TryReceiveTypedMessage(&cmd)) { - BrowserWindow* pBrowserWindow = (BrowserWindow*)pBrowserWindows[0]; + BrowserWindow* pBrowserWindow = (BrowserWindow*)mpBrowserWindows[0]; bool something = false; - if ((pBrowserWindow->unk_0x2c4[2] != '\0') && (pBrowserWindow->unk_0x2c4[3] != '\0')) { + if ((pBrowserWindow->unk_0x2C4[2] != '\0') && (pBrowserWindow->unk_0x2C4[3] != '\0')) { something = true; } - if (something || pBrowserWindow->unk_0x2c4[0] != '\0') { + if (something || pBrowserWindow->unk_0x2C4[0] != '\0') { continue; } int retVal = 0; switch (cmd.type) { - case 0: + case 0: { retVal = ExecDpdEvent_(cmd); break; - case 1: + } + case 1: { ExecSpacialEvent_(cmd); break; - case 2: + } + case 2: { pBrowserWindow->SetWindowSize(cmd.data.setWindowSize.width, cmd.data.setWindowSize.height); break; - case 3: + } + case 3: { CommitImeCmdPacket(&cmd); break; - case 4: + } + case 4: { UpdateImeCmdPacket(&cmd); break; - default: - print::IPLWWWReport(3, "BrowserThread::HandleUIEvent_: Unknown type: %d\n", cmd.type); + } + default: { + print::IPLWWWReport(print::WWW_DEBUG, "BrowserThread::HandleUIEvent_: Unknown type: %d\n", cmd.type); break; + } } - if (retVal != 0) + if (retVal != 0) { break; + } } } + void BrowserThread::SendUIEvent(CmdPacket* packet) { mCmdPacketQueue.SendTypedMessage(packet); } - void BrowserThread::InitFonts_(const char*) { + void BrowserThread::InitFonts_(const char* unk) { print::TickTimer tt; tt.reset(); - (*WWWSurfaceAddFont)("DirectUniversal"); + WWWSurfaceAddFont("DirectUniversal"); tt.report("WWWSurfaceAddFont:font1"); } + void* BrowserThread::GetTextureBuffer(int val, WWWRect** rectPtrOut) { - if (pBrowserWindows[0] == NULL) + if (mpBrowserWindows[0] == NULL) { return NULL; - return ((BrowserWindow*)pBrowserWindows[0])->GetTextureBuffer(val, false, rectPtrOut); + } + return ((BrowserWindow*)mpBrowserWindows[0])->GetTextureBuffer(val, false, rectPtrOut); } - void BrowserThread::FlushCallback(WWWRect*, int) { + + void BrowserThread::FlushCallback(WWWRect* rect, int unk) { BOOL level; BrowserWindow* pBrowserWindow; - pBrowserWindow = (BrowserWindow*)SurfaceManager::Instance_->pBrowserThread->pBrowserWindows[0]; - if ((pBrowserWindow->unk_0x2c4[0] == '\0') && (pBrowserWindow->unk_0x2c4[1] == '\0')) { + pBrowserWindow = (BrowserWindow*)SurfaceManager::GetInstance()->GetBrowserThread()->mpBrowserWindows[0]; + if ((pBrowserWindow->unk_0x2C4[0] == '\0') && (pBrowserWindow->unk_0x2C4[1] == '\0')) { level = OSDisableInterrupts(); - if (pBrowserWindow->unk_0x2c4[2] == '\0') { - if (pBrowserWindow->unk_0x2c4[4] == '\0') { - pBrowserWindow->unk_0x2c0 = pBrowserWindow->unk_0x2b0; - pBrowserWindow->unk_0x2bc = (int)(pBrowserWindow->unk_0x2b4[pBrowserWindow->unk_0x2b0] + 1) % 3; + if (pBrowserWindow->unk_0x2C4[2] == '\0') { + if (pBrowserWindow->unk_0x2C4[4] == '\0') { + pBrowserWindow->unk_0x2C0 = pBrowserWindow->unk_0x2B0; + pBrowserWindow->unk_0x2BC = (int)(pBrowserWindow->unk_0x2B4[pBrowserWindow->unk_0x2B0] + 1) % 3; } - pBrowserWindow->unk_0x2c4[4] = 1; + pBrowserWindow->unk_0x2C4[4] = 1; } - pBrowserWindow->unk_0x2c4[1] = 1; + pBrowserWindow->unk_0x2C4[1] = 1; OSRestoreInterrupts(level); } return; } + bool BrowserThread::SendEventFromWindow(ImeData* imeData) { if (!mImeDataQueue.SendTypedMessage(imeData)) { - print::IPLWWWReport(3, "WARNING: Too Many Ime commands. cannot send request.\n"); + print::IPLWWWReport(print::WWW_DEBUG, "WARNING: Too Many Ime commands. cannot send request.\n"); return false; } else { return true; } } + bool BrowserThread::ReceiveWindowEvent(ImeData* imeData) { return mImeDataQueue.TryReceiveTypedMessage(imeData); } void BrowserThread::CreateImeData(ImeData* data, const WWWIMEData* wwwData) { memset(data, 0, sizeof(ImeData)); - print::IPLWWWReport(3, "WWWIMEData imeID:%p\n", wwwData->imeID); - print::IPLWWWReport(3, "WWWIMEData text:%p\n", wwwData->text); - print::IPLWWWReport(3, "WWWIMEData maxlength:%d\n", wwwData->maxLength); + print::IPLWWWReport(print::WWW_DEBUG, "WWWIMEData imeID:%p\n", wwwData->imeID); + print::IPLWWWReport(print::WWW_DEBUG, "WWWIMEData text:%p\n", wwwData->text); + print::IPLWWWReport(print::WWW_DEBUG, "WWWIMEData maxlength:%d\n", wwwData->maxLength); // @bug I think this was supposed to access a different member of // the struct - print::IPLWWWReport(3, "WWWIMEData format:%p\n", wwwData->text); - print::IPLWWWReport(3, "WWWIMEData text_string:%s\n", wwwData->text); + print::IPLWWWReport(print::WWW_DEBUG, "WWWIMEData format:%p\n", wwwData->text); + print::IPLWWWReport(print::WWW_DEBUG, "WWWIMEData text_string:%s\n", wwwData->text); if (wwwData->text) { data->text = (char*)Heap::allocMem2(strlen(wwwData->text) + 1, 4); @@ -514,8 +552,8 @@ namespace ext_ead { data->imeID = wwwData->imeID; data->unk_0x00 = 0; - data->unk_0x0c = wwwData->unk_0x08; - data->unk_0x10 = wwwData->unk_0x0c; + data->unk_0x0C = wwwData->unk_0x08; + data->unk_0x10 = wwwData->unk_0x0C; data->unk_0x14 = wwwData->unk_0x10; data->unk_0x18 = wwwData->unk_0x14; data->maxLength = wwwData->maxLength; @@ -536,18 +574,22 @@ namespace ext_ead { } else { packet.data.commitIme.str = NULL; } + packet.type = 3; packet.data.commitIme.imeID = data->imeID; + SendUIEvent(&packet); } + void BrowserThread::CommitImeCmdPacket(const CmdPacket* packet) { - (*WWWCommitIme)(packet->data.commitIme.imeID, packet->data.commitIme.str); + WWWCommitIme(packet->data.commitIme.imeID, packet->data.commitIme.str); if (packet->data.commitIme.str != NULL) { Heap::freeMem1(packet->data.commitIme.str); } } + void BrowserThread::UpdateImeCmdPacket(const CmdPacket* packet) { - (*WWWUpdateIme)(packet->data.updateIme.imeID, packet->data.updateIme.str, packet->data.updateIme.unk_0x0c); + WWWUpdateIme(packet->data.updateIme.imeID, packet->data.updateIme.str, packet->data.updateIme.unk_0x0C); if (packet->data.updateIme.str != NULL) { Heap::freeMem1(packet->data.updateIme.str); } diff --git a/src/iplwww/www_surface.cpp b/src/iplwww/www_surface.cpp index b4cf8c2d..5cb86b15 100644 --- a/src/iplwww/www_surface.cpp +++ b/src/iplwww/www_surface.cpp @@ -3,6 +3,8 @@ #include "iplwww/www_print.h" #include "iplwww/www_trasition.h" +#include + #include #include @@ -28,7 +30,7 @@ namespace ext_ead { MEMiHeapHead* hMem1; MEMiHeapHead* hMem2; void* wwwalloc_; - void (*wwwfree_)(void*); + void (*wwwfree_)(void* buf); int (*wwwavail_)(); u32 hFreeSize1; @@ -40,6 +42,7 @@ namespace ext_ead { void* Heap::allocMem1(u32 size, int align) { return MEMAllocFromExpHeapEx(hMem1, size, align); } + void Heap::freeMem1(void* block) { return MEMFreeToExpHeap(hMem1, block); } @@ -47,6 +50,7 @@ namespace ext_ead { void* Heap::allocMem2(u32 size, int align) { return MEMAllocFromExpHeapEx(hMem2, size, align); } + void Heap::freeMem2(void* block) { return MEMFreeToExpHeap(hMem2, block); } @@ -65,6 +69,7 @@ namespace ext_ead { hFreeSize2 = MEMGetTotalFreeSizeForExpHeap(hMem2); } } + void Heap::reportLeaHeap() { if (wwwavail_ != NULL) { OSReport(" ++++++++++++++++++++++++++++++++++\n"); @@ -80,36 +85,34 @@ namespace ext_ead { wwwfree_ = 0; wwwavail_ = 0; } + void SurfaceManager::CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize, void* libBuf, const char* arcPath) { - int iVar1; - undefined4 uVar2; - if (Instance_ == NULL) { Heap::init(mem1Buf, mem1BufSize, mem2Buf, mem2BufSize); Instance_ = (SurfaceManager*)Heap::allocMem1(sizeof(SurfaceManager), 4); new (Instance_) SurfaceManager(); if (libBuf != NULL) { - Instance_->pLibBuf = (RSOObjectHeader*)libBuf; + Instance_->mpLibBuffer = (RSOObjectHeader*)libBuf; } if (arcPath != NULL) { u32 arcPathLen = strlen(arcPath); - Instance_->pArcPath = (char*)Heap::allocMem1(arcPathLen + 1, 4); - strcpy(Instance_->pArcPath, arcPath); + Instance_->mpArcPath = (char*)Heap::allocMem1(arcPathLen + 1, 4); + strcpy(Instance_->mpArcPath, arcPath); } Instance_->InitInstance_(surfaceW, surfaceH, browserW, browserH); } - return; } void Heap::destroy() { MEMDestroyExpHeap(Heap::hMem1); MEMDestroyExpHeap(Heap::hMem2); } + void SurfaceManager::DisposeManager() { if (Instance_ != NULL) { - Heap::freeMem1(Instance_->pArcPath); + Heap::freeMem1(Instance_->mpArcPath); Instance_->DisposeInstance_(); Instance_->UnresolveRsoModule(); Instance_->~SurfaceManager(); @@ -120,20 +123,21 @@ namespace ext_ead { Heap::destroy(); } } + void SurfaceManager::ResolveRsoModule() { int i; RSOExportFuncTable* symRef; print::TickTimer tt; RSOObjectHeader* rso; - rso = (RSOObjectHeader*)pLibBuf; + rso = (RSOObjectHeader*)mpLibBuffer; if (rso->bssSize != NULL) { - pBss = Heap::allocMem1(rso->bssSize, 0x20); - memset(pBss, 0, rso->bssSize); + mpRSOBss = Heap::allocMem1(rso->bssSize, 32); + memset(mpRSOBss, 0, rso->bssSize); } tt.reset(); - RSOLinkList(rso, pBss); + RSOLinkList(rso, mpRSOBss); tt.report("RSOLinkList"); if (RSOIsImportSymbolResolvedAll(rso)) OSReport("moduleD's ImportSymbol is resolved all.\n"); @@ -145,86 +149,100 @@ namespace ext_ead { tt.report("RSO_prolog"); tt.reset(); - for (i = 0; i < ARRAY_LENGTH(rsoSymbolList); i++) { - symRef = &rsoSymbolList[i]; + for (i = 0; i < ARRAY_LENGTH(RsoExports); i++) { + symRef = &RsoExports[i]; *symRef->symbol_ptr = (u32)RSOFindExportSymbolAddr(rso, symRef->symbol_name); } tt.report("ResolveModule_www"); } + void SurfaceManager::UnresolveRsoModule() { - RSOObjectHeader* rso = (RSOObjectHeader*)pLibBuf; - if (pLibBuf != NULL) { + RSOObjectHeader* rso = (RSOObjectHeader*)mpLibBuffer; + if (mpLibBuffer != NULL) { if (rso->epilog != NULL) { ((void (*)())rso->epilog)(); } - for (u32 i = 0; i < ARRAY_LENGTH(rsoSymbolList); i++) { - *rsoSymbolList[i].symbol_ptr = (u32)::unresolved_www; + for (u32 i = 0; i < ARRAY_LENGTH(RsoExports); i++) { + *RsoExports[i].symbol_ptr = (u32)::unresolved_www; } RSOUnLinkList(rso); - Heap::freeMem1(pBss); + Heap::freeMem1(mpRSOBss); } - return; } SurfaceManager::SurfaceManager() - : mWidth(0x260), mHeight(0x1c8), unk_0x0c(0), pBrowserThread(NULL), pOperaThreadStack(NULL), pBss(NULL), pLibBuf(NULL), pArcPath(NULL) { + : mWidth(VI_MAX_WIDTH_FRAMEBUFFER), mHeight(VI_MAX_HEIGHT_FRAMEBUFFER), unk_0x0C(0), mpBrowserThread(NULL), mpOperaThreadStack(NULL), + mpRSOBss(NULL), mpLibBuffer(NULL), mpArcPath(NULL) { OSInitMutex(&mMutex); } + SurfaceManager::~SurfaceManager() { } + void SurfaceManager::InitInstance_(int surfaceW, int surfaceH, int browserW, int browserH) { mWidth = surfaceW; mHeight = surfaceH; - pOperaThreadStack = Heap::allocMem1(0x20000, 0x20); - memset(pOperaThreadStack, 0, 0x20000); - print::IPLWWWReport(3, "www_surface: OperaThreadStack: ptr:%p\n", this->pOperaThreadStack); + mpOperaThreadStack = Heap::allocMem1(0x20000, 32); + memset(mpOperaThreadStack, 0, 0x20000); + print::IPLWWWReport(print::WWW_DEBUG, "www_surface: OperaThreadStack: ptr:%p\n", mpOperaThreadStack); - pBrowserThread = (BrowserThread*)Heap::allocMem1(0x6a8, 4); - new (pBrowserThread) BrowserThread(); + mpBrowserThread = (BrowserThread*)Heap::allocMem1(sizeof(BrowserThread), 4); + new (mpBrowserThread) BrowserThread(); - pBrowserThread->CreateThread(browserW, browserH, this->pOperaThreadStack, 0x20000, 0x14); + mpBrowserThread->CreateThread(browserW, browserH, mpOperaThreadStack, 0x20000, 20); return; } + void SurfaceManager::RegisterArcFile(void* fileBuf) { - if (Instance_ == NULL) + if (GetInstance() == NULL) { return; - Instance_->pBrowserThread->RegisterArcFile(fileBuf); + } + GetInstance()->mpBrowserThread->RegisterArcFile(fileBuf); } + void SurfaceManager::RegisterIniFile(void* fileBuf, u32 fileLen) { - if (Instance_ == NULL) + if (GetInstance() == NULL) { return; - Instance_->pBrowserThread->RegisterIniFile(fileBuf, fileLen); + } + GetInstance()->mpBrowserThread->RegisterIniFile(fileBuf, fileLen); } + void SurfaceManager::RegisterFontFile(int fontIdx, void* fileBuf, u32 fileLen) { WWW_FONT_FILE_DATA_TABLE__[fontIdx].start = fileBuf; WWW_FONT_FILE_DATA_TABLE__[fontIdx].end = (u8*)fileBuf + fileLen + 1; } void SurfaceManager::StartThread() { - if (Instance_ == NULL) + if (GetInstance() == NULL) { return; - Instance_->pBrowserThread->Resume(); - } - void SurfaceManager::StopThreadAsync() { - if (pBrowserThread) - pBrowserThread->StopThread(); - } - bool SurfaceManager::IsThreadStopped() { - if (pBrowserThread) - return pBrowserThread->IsThreadStopped(); - else - return true; - } - void SurfaceManager::DisposeInstance_() { - if (pBrowserThread != NULL) { - pBrowserThread->StopThread(); - pBrowserThread->~BrowserThread(); - Heap::freeMem1(pBrowserThread); - pBrowserThread = NULL; } - if (pOperaThreadStack != NULL) { - Heap::freeMem1(pOperaThreadStack); - pOperaThreadStack = NULL; + GetInstance()->mpBrowserThread->Resume(); + } + + void SurfaceManager::StopThreadAsync() { + if (mpBrowserThread) { + mpBrowserThread->StopThread(); + } + } + + bool SurfaceManager::IsThreadStopped() { + if (mpBrowserThread) { + return mpBrowserThread->IsThreadStopped(); + } else { + return true; + } + } + + void SurfaceManager::DisposeInstance_() { + if (mpBrowserThread != NULL) { + mpBrowserThread->StopThread(); + mpBrowserThread->~BrowserThread(); + Heap::freeMem1(mpBrowserThread); + mpBrowserThread = NULL; + } + if (mpOperaThreadStack != NULL) { + Heap::freeMem1(mpOperaThreadStack); + mpOperaThreadStack = NULL; } } } // namespace www diff --git a/src/iplwww/www_thread.cpp b/src/iplwww/www_thread.cpp index 2f293642..a33eccde 100644 --- a/src/iplwww/www_thread.cpp +++ b/src/iplwww/www_thread.cpp @@ -38,7 +38,7 @@ namespace ext_ead { BOOL ut_thread::WaitForThreadExit() { BOOL result = FALSE; if (OSJoinThread(&mThread, (void*)&result)) { - print::IPLWWWReport(3, "ut_thread: joined successfully.\n"); + print::IPLWWWReport(print::WWW_DEBUG, "ut_thread: joined successfully.\n"); } return result; } diff --git a/src/iplwww/www_trasition.cpp b/src/iplwww/www_trasition.cpp index e4fdb54e..bef46180 100644 --- a/src/iplwww/www_trasition.cpp +++ b/src/iplwww/www_trasition.cpp @@ -5,54 +5,59 @@ namespace www { namespace trasition { bool allow_access(const char*, const char*, int) { - return 1; + return true; } static const char* globalNames[2] = {"wiiTrasition", NULL}; + void AddJsPlugin() { cap.name = globalNames; cap.unk_0x04 = NULL; cap.getter = &globalGetter_; - cap.unk_0x0c = NULL; + cap.unk_0x0C = NULL; cap.unk_0x10 = NULL; cap.unk_0x14 = NULL; cap.unk_0x18 = NULL; cap.allowAccess = allow_access; - (*WWWAddJSPlugin)("wiiTrasition.dll", &cap, &opera_callbacks); + WWWAddJSPlugin("wiiTrasition.dll", &cap, &opera_callbacks); ScrollState_ = SCROLL_RESET; OSReport("WWW_TRASITION: AddJSPlugin()\n"); return; } + int globalGetter_(WWWJSPluginObj* obj, const char* str, WWWJSPluginValue* val) { - // int iVar1; WWWJSPluginValueData data; if (strcmp(str, "wiiTrasition") == 0) { OSReport("WWW_TRASITION: call globalGetter_()\n"); if (opera_callbacks->globalGet(obj, 0, 0, 0, ObjectConstructor_, "", 0, &data) < 0) { - return 0xa; + // is this WWWError or it's own thing? + return 10; } else { val->ty = 0; val->data.jsObj = data.jsObj; - return 0x7; + return 7; } } else { - return 0x8; + return 8; } } int ObjectConstructor_(WWWJSPluginObj* objA, WWWJSPluginObj* objB, int valInt, WWWJSPluginValue* valA, WWWJSPluginValue* valB) { WWWJSPluginValueData data; - if (valInt != 0) - return 0x13; - if (opera_callbacks->construct(objB, Getter_, 0, 0, &data) < 0) - return 0x12; + if (valInt != 0) { + return 19; + } + if (opera_callbacks->construct(objB, Getter_, 0, 0, &data) < 0) { + return 18; + } valB->ty = 0; valB->data.jsObj = data.jsObj; *(u32*)data.jsObj = 0; - return 0x10; + + return 16; } int Getter_(WWWJSPluginObj* obj, const char* str, WWWJSPluginValue* val) { @@ -60,38 +65,42 @@ namespace www { void* objRight; if (strcmp(str, "LeftScroll") == 0) { - if (opera_callbacks->globalGet(obj, 0, 0, LeftScroll_, LeftScroll_, "", 0, (WWWJSPluginValueData*)&objLeft) < 0) - return 0x0a; + if (opera_callbacks->globalGet(obj, 0, 0, LeftScroll_, LeftScroll_, "", 0, (WWWJSPluginValueData*)&objLeft) < 0) { + return 10; + } val->ty = 0; val->data.jsObj = objLeft; return 7; } if (strcmp(str, "RightScroll") == 0) { - if (opera_callbacks->globalGet(obj, 0, 0, RightScroll_, RightScroll_, "", 0, (WWWJSPluginValueData*)&objRight) < 0) - return 0x0a; + if (opera_callbacks->globalGet(obj, 0, 0, RightScroll_, RightScroll_, "", 0, (WWWJSPluginValueData*)&objRight) < 0) { + return 10; + } val->ty = 0; val->data.jsObj = objRight; - return 0x07; + return 7; } - return 0x08; + return 8; } int LeftScroll_(WWWJSPluginObj*, WWWJSPluginObj*, int, WWWJSPluginValue*, WWWJSPluginValue*) { - ext_ead::www::print::IPLWWWReport(3, "Left Scroll Set!!\n"); + ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, "Left Scroll Set!!\n"); ScrollState_ = SCROLL_LEFT; - return 0x11; + return 17; } + int RightScroll_(WWWJSPluginObj*, WWWJSPluginObj*, int, WWWJSPluginValue*, WWWJSPluginValue*) { - ext_ead::www::print::IPLWWWReport(3, "Right Scroll Set.!!\n"); + ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, "Right Scroll Set.!!\n"); ScrollState_ = SCROLL_RIGHT; - return 0x11; + return 17; } ScrollState GetScrollState() { return ScrollState_; } + void ResetScrollState() { ScrollState_ = SCROLL_RESET; } diff --git a/src/iplwww/www_wiisetting.cpp b/src/iplwww/www_wiisetting.cpp index f73f27c1..7558f585 100644 --- a/src/iplwww/www_wiisetting.cpp +++ b/src/iplwww/www_wiisetting.cpp @@ -33,7 +33,8 @@ namespace www { 0x1B, 0x1C, 0x1D, 0x1F, 0x20, 0x21, 0x22, 0x10, 0x23, 0x25, 0x24, 0x91, 0x26, 0x27, 0x2A, 0x2C, }, }; - const u8 kbLangEurLUT[][0x3b] = { + + const u8 kbLangEurLUT[][0x3B] = { { 0x00, 0x01, 0x02, 0x31, 0x03, 0x04, 0x05, 0x06, 0x35, 0x07, 0x08, 0x09, 0x0A, 0x38, 0x37, 0x0B, 0x0C, 0x0D, 0x19, 0x0E, 0x0F, 0x10, 0x11, 0x69, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x33, 0x1A, 0x32, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x34, @@ -65,136 +66,134 @@ namespace www { 0x22, 0x23, 0x24, 0x25, 0x27, 0x26, 0x36, 0x39, 0x29, 0x2A, 0x35, 0x09, 0x2D, 0x2E, 0x2F, 0x30, 0x28, 0x2B, 0x2C, }, }; - // const char* b = "[TickTimer]\0[Warning]\0[[Event]]\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; - // void bbbbbbb() { - // static const char* a[6] = {(char*)1}; - // OSReport(a[0]); - // } static const char* globalNames[2] = {"wiiSetting", NULL}; - extern "C" { - void www_wiisetting_8136F9D0(s32 chan, s32 result) { + void DPDCallback2(s32 chan, s32 result) { if (result != 1) { return; } - gEnableDpd = 1; + gEnableDpd = TRUE; gDpdWaitFrm = 0; KPADSetControlDpdCallback(chan, NULL); - return; } - void www_wiisetting_8136F9F4(s32 chan, s32 result) { + + void DPDCallback(s32 chan, s32 result) { if (result == 1) { KPADEnableDPD(chan); - - // @bug this might actually be a bug in how the stuff for KPAD - // is typed idk - KPADSetControlDpdCallback(chan, (KPADCallback*)&www_wiisetting_8136F9D0); + KPADSetControlDpdCallback(chan, (KPADCallback*)&DPDCallback2); } - return; } - // Get Keyboard Language for USA - int www_wiisetting_81370E60(u8 usaLangIdx); - // Get Byte Property Index - int www_wiisetting_81370F14(const char* targetStr); - } + int getKeyboardLanguage(u8 usaLangIdx); + int getBytePropIndex(const char* targetStr); bool allow_access(const char*, const char*, int) { return true; } + void AddJsPlugin() { cap.name = globalNames; cap.unk_0x04 = NULL; cap.getter = &globalGetter_; - cap.unk_0x0c = NULL; + cap.unk_0x0C = NULL; cap.unk_0x10 = NULL; cap.unk_0x14 = NULL; cap.unk_0x18 = NULL; cap.allowAccess = allow_access; - (*WWWAddJSPlugin)("wiiSetting.dll", &cap, &opera_callbacks); - ext_ead::www::print::IPLWWWReport(3, "WWW_WiiSetting: AddJSPlugin()\n"); + WWWAddJSPlugin("wiiSetting.dll", &cap, &opera_callbacks); + ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, "WWW_WiiSetting: AddJSPlugin()\n"); return; } + int globalGetter_(WWWJSPluginObj* obj, const char* str, WWWJSPluginValue* val) { WWWJSPluginValueData data; if (strcmp(str, "wiiSetting") == 0) { OSReport("WWW_TRASITION: call globalGetter_()\n"); - if ((opera_callbacks->globalGet)(obj, 0, 0, 0, ObjectConstructor_, "", 0, &data) < 0) { - return 0x0a; + if (opera_callbacks->globalGet(obj, 0, 0, 0, ObjectConstructor_, "", 0, &data) < 0) { + // is this WWWError or it's own thing? + return 10; } else { OSReport("wiiSetting: GlobalGetter\n"); val->ty = 0; val->data.jsInt = data.jsInt; - return 0x07; + return 7; } } else { - return 0x08; + return 8; } } + int ObjectConstructor_(WWWJSPluginObj* objA, WWWJSPluginObj* objB, int valInt, WWWJSPluginValue* valA, WWWJSPluginValue* valB) { WWWJSPluginValueData data; - if (valInt != 0) - return 0x13; + if (valInt != 0) { + return 19; + } + if (opera_callbacks->construct(objB, Getter_, Setter_, 0, &data) < 0) { - return 0x12; + return 18; } else { valB->ty = 0; - (valB->data).jsObj = data.jsObj; + valB->data.jsObj = data.jsObj; *(u32*)data.jsObj = 0; OSReport("wiiSetting: ObjectConstructor\n"); - return 0x10; + return 16; } } - extern const char* strProps[0x19]; + extern const char* strProps[FORM_ID_MAX]; int getStringPropertyIdx(const char* targetStr) { const char* names[ARRAY_LENGTH(strProps)]; - { - const char** __pDst = names - 1; - const char* const* __pSrc = strProps - 1; - for (int i = 0; i < (ARRAY_LENGTH(names) >> 1); i++) { - *(++__pDst) = *(++__pSrc); - *(++__pDst) = *(++__pSrc); - } - if (ARRAY_LENGTH(names) & 1) - *(++__pDst) = *(++__pSrc); + const char** __pDst = names - 1; + const char* const* __pSrc = strProps - 1; + for (int i = 0; i < (ARRAY_LENGTH(names) >> 1); i++) { + *(++__pDst) = *(++__pSrc); + *(++__pDst) = *(++__pSrc); } + + if (ARRAY_LENGTH(names) & 1) { + *(++__pDst) = *(++__pSrc); + } + for (int i = 0; i < (int)ARRAY_LENGTH(names) >> 1 << 1; i++) { - if (strcmp(targetStr, names[i]) == 0) + if (strcmp(targetStr, names[i]) == 0) { return i + 1; + } } return -1; } + int Getter_(WWWJSPluginObj* obj, const char* str, WWWJSPluginValue* val) { int retVal; - int i; int strPropIdx; if (strcmp(str, "CallOSReport") == 0) { int data; if (opera_callbacks->globalGet(obj, 0, 0, wiiOSReport, wiiOSReport, "", 0, (WWWJSPluginValueData*)&data) < 0) { - return 0x0a; + return 10; } else { val->ty = 0; - (val->data).jsInt = data; - return 0x07; + val->data.jsInt = data; + return 7; } } else if (strcmp(str, "WriteBack") == 0) { int data; if (opera_callbacks->globalGet(obj, 0, 0, wiiWriteBack, wiiWriteBack, "", 0, (WWWJSPluginValueData*)&data) < 0) { - return 0x0a; + return 10; } else { val->ty = 0; - (val->data).jsInt = data; - return 0x07; + val->data.jsInt = data; + return 7; } } if (!(writeBackID == WB_ID_PROGRESSIVE || writeBackID == WB_ID_PAL || writeBackID == WB_ID_COUNTRY || writeBackID == WB_ID_LIGHT || - writeBackID == WB_ID_LANGUAGE || writeBackID == WB_ID_RATE)) + writeBackID == WB_ID_LANGUAGE || writeBackID == WB_ID_RATE)) { writeBackID = WB_ID_RESET; - retVal = 0x08; + } + + retVal = 8; + OSCalendarTime currTime; OSTicksToCalendarTime(OSGetTime(), &currTime); @@ -202,65 +201,83 @@ namespace www { if (strPropIdx >= 0) { val->ty = 1; switch (strPropIdx) { - case 0x09: + case FORM_ID_MAC_ADDR: { val->data.jsObj = ipl::ncd::NCDSetting::getMacAddr(); break; - case 0x15: + } + case LAN_MAC_ADDR: { val->data.jsStr = ipl::socket::SocketSetting::getLANMacAddrUtf8(); break; - case 0x01: + } + case FORM_ID_NICKNAME: { val->data.jsStr = pString->nickname; break; - case 0x03: + } + case FORM_ID_SSID: { val->data.jsStr = pString->ssid; break; - case 0x04: + } + case FORM_ID_IP_ADDR: { val->data.jsStr = pString->ip.addr; break; - case 0x05: + } + case FORM_ID_IP_NETMASK: { val->data.jsStr = pString->ip.netmask; break; - case 0x06: + } + case FORM_ID_IP_GATEWAY: { val->data.jsStr = pString->ip.gateway; break; - case 0x07: + } + case FORM_ID_DNS1: { val->data.jsStr = pString->dns1; break; - case 0x08: + } + case FORM_ID_DNS2: { val->data.jsStr = pString->dns2; break; - case 0x0a: + } + case FORM_ID_PROXY_SERVER: { val->data.jsStr = pString->proxy.server; break; - case 0x0b: + } + case FORM_ID_PROXY_PORT: { val->data.jsStr = pString->proxy.port; break; - case 0x0c: + } + case FORM_ID_PROXY_BASIC_USERNAME: { val->data.jsStr = pString->proxyBasic.uname; break; - case 0x0d: + } + case FORM_ID_PROXY_BASIC_PASSWORD: { val->data.jsStr = pString->proxyBasic.pass; break; - case 0x0e: + } + case FORM_ID_ADJ_MTU: { val->data.jsStr = pString->adjMtu; break; - case 0x12: + } + case FORM_ID_PARENTAL_JUDGE_PASS: { val->data.jsStr = pString->parentalSecA; break; - case 0x14: + } + case FORM_ID_PARENTAL_SEC_ANSWER: { val->data.jsStr = ipl::parental::Parental::getRequestNum(); break; - case 0x17: + } + case FORM_ID_PARENTAL_RE_SEC_ANSWER: { val->data.jsStr = pString->version; break; - case 0x18: + } + case FORM_ID_DIRECT_URL: { val->data.jsStr = pString->netSettingArg; break; - case 0x02: { + } + case FORM_ID_SECURITY_KEY: { memset(pString->asterisks, 0, sizeof(pString->asterisks)); - // int i; - OSReport("mode %d %d\n", savedata_smth, (u16)ipl::ncd::NCDSetting::getPrivacyMode()); - if (savedata_smth == (u16)ipl::ncd::NCDSetting::getPrivacyMode()) { + OSReport("mode %d %d\n", saveData, (u16)ipl::ncd::NCDSetting::getPrivacyMode()); + if (saveData == (u16)ipl::ncd::NCDSetting::getPrivacyMode()) { + int i; OSReport("len ::: %d\n", ipl::ncd::NCDSetting::getPrivacyLen()); for (i = 0; i < ipl::ncd::NCDSetting::getPrivacyLen(); i++) { pString->asterisks[i] = '*'; @@ -272,171 +289,211 @@ namespace www { } else { memset(pString->securityKey, 0, sizeof(pString->securityKey)); } - (val->data).jsStr = pString->asterisks; + val->data.jsStr = pString->asterisks; break; } - case 0x16: { + case FORM_ID_DUMMY_SECURITY_KEY: { memset(pString->asterisks, 0, sizeof(pString->asterisks)); SetStringBuf* strBuf; + int i; for (i = 0; i < strlen((strBuf = pString)->securityKey); strBuf->asterisks[i++] = '*') { } if (i > 0x20) { pString->asterisks[0x20] = '\n'; pString->asterisks[i] = '*'; } - (val->data).jsStr = pString->asterisks; + val->data.jsStr = pString->asterisks; break; } } - retVal = 0x06; + retVal = 6; } else if (strcmp(str, "message") == 0) { - retVal = 0x06; + retVal = 6; } else { - int staIdx = www_wiisetting_81370F14(str); + int staIdx = getBytePropIndex(str); if (staIdx >= 0) { val->ty = 2; switch (staIdx) { - case WB_ID_SOUND_ID: + case WB_ID_SOUND_ID: { sWiiData.data[staIdx] = SCGetSoundMode(); - savedata_smth = sWiiData.data[staIdx]; + saveData = sWiiData.data[staIdx]; break; - case WB_ID_NWC24: + } + case WB_ID_NWC24: { sWiiData.data[staIdx] = SCGetWCFlags() & SC_WC_FLAGS_ENABLED; break; - case WB_ID_INTERNET: + } + case WB_ID_INTERNET: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::getUseProfileID(); break; + } case WB_ID_STANDBY: - case WB_ID_LED: { + case WB_ID_DISC_LED: { SCIdleModeInfo idleModeInfo; SCGetIdleMode(&idleModeInfo); sWiiData.data[WB_ID_STANDBY] = idleModeInfo.standby; - sWiiData.data[WB_ID_LED] = idleModeInfo.led; + sWiiData.data[WB_ID_DISC_LED] = idleModeInfo.led; break; } - case WB_ID_DIS_WIDE: + case WB_ID_DIS_WIDE: { sWiiData.data[staIdx] = SCGetAspectRatio(); break; - case WB_ID_PROGRESSIVE: + } + case WB_ID_PROGRESSIVE: { sWiiData.data[staIdx] = SCGetProgressiveMode(); break; - case WB_ID_SCREENSAVER: + } + case WB_ID_SCREENSAVER: { sWiiData.data[staIdx] = SCGetScreenSaverMode(); break; - case WB_ID_SENSOR_BAR: + } + case WB_ID_SENSOR_BAR: { sWiiData.data[staIdx] = SCGetWpadSensorBarPosition(); break; - - // Date/Time stuff - case WB_ID_YEAR: + } + case WB_ID_YEAR: { sWiiData.data[staIdx] = currTime.year - 2000; break; - case WB_ID_MONTH: + } + case WB_ID_MONTH: { sWiiData.data[staIdx] = currTime.mon + 1; break; - case WB_ID_DATE: + } + case WB_ID_DATE: { sWiiData.data[staIdx] = currTime.mday; break; - case WB_ID_HOUR: + } + case WB_ID_HOUR: { sWiiData.data[staIdx] = currTime.hour; break; - case WB_ID_MINUTE: + } + case WB_ID_MINUTE: { sWiiData.data[staIdx] = currTime.min; break; - - case WB_ID_CONNECT_TYPE: + } + case WB_ID_CONNECT_TYPE: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::checkThisFlag(); break; - case WB_ID_CONNECT_TYPE_1: + } + case WB_ID_CONNECT_TYPE_1: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::checkFlag(0); break; - case WB_ID_CONNECT_TYPE_2: + } + case WB_ID_CONNECT_TYPE_2: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::checkFlag(1); break; - case WB_ID_CONNECT_TYPE_3: + } + case WB_ID_CONNECT_TYPE_3: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::checkFlag(2); break; - case WB_ID_PROFILE_ID: + } + case WB_ID_PROFILE_ID: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::getID(); break; - case WB_ID_FUNC_RESULT: + } + case WB_ID_FUNC_RESULT: { sWiiData.data[staIdx] = funcResult; funcResult = 0; break; - case WB_ID_SELECT_SEC_KEY: + } + case WB_ID_SELECT_SEC_KEY: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::getPrivacyMode(); funcResult = 0; // @bug Maybe? I don't think there's a reason for resetting here. break; - case WB_ID_AUTO_IP: + } + case WB_ID_AUTO_IP: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::checkDHCPFlag(); break; - case WB_ID_AUTO_DNS: + } + case WB_ID_AUTO_DNS: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::checkDNSFlag(); break; - case WB_ID_BACKUP_NCD: + } + case WB_ID_BACKUP_NCD: { ipl::ncd::NCDSetting::backupData(); break; - case WB_ID_RESET_NCD: + } + case WB_ID_RESET_NCD: { ipl::ncd::NCDSetting::resetData(); break; - case WB_ID_AUTO_PROXY: + } + case WB_ID_AUTO_PROXY: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::checkProxyFlag(); break; - case WB_ID_AUTO_BASIC: + } + case WB_ID_AUTO_BASIC: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::checkBasic(); break; - case WB_ID_CHANGE_ENABLE: + } + case WB_ID_CHANGE_ENABLE: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::checkChangeEnable(); break; - case WB_ID_PARE_FLAG: + } + case WB_ID_PARE_FLAG: { sWiiData.data[staIdx] = ipl::parental::Parental::checkFlags(); break; - case WB_ID_SEC_Q: + } + case WB_ID_SEC_Q: { sWiiData.data[staIdx] = ipl::parental::Parental::checkSecQ(); break; - case WB_ID_SEC_Q_SAVE: - sWiiData.data[staIdx] = savedata_smth; - ipl::parental::Parental::setSecQ(savedata_smth); + } + case WB_ID_SEC_Q_SAVE: { + sWiiData.data[staIdx] = saveData; + ipl::parental::Parental::setSecQ(saveData); break; - case WB_ID_RATE_SAVE: - ipl::parental::Parental::setRating(savedata_smth); - sWiiData.data[WB_ID_RATE] = savedata_smth; + } + case WB_ID_RATE_SAVE: { + ipl::parental::Parental::setRating(saveData); + sWiiData.data[WB_ID_RATE] = saveData; break; - case WB_ID_OGN: + } + case WB_ID_OGN: { sWiiData.data[staIdx] = ipl::parental::Parental::getOgn(); break; - case WB_ID_PAL: + } + case WB_ID_PAL: { sWiiData.data[staIdx] = SCGetEuRgb60Mode(); break; - case WB_ID_LANGUAGE_SAVE: + } + case WB_ID_LANGUAGE_SAVE: { sWiiData.data[staIdx] = SCGetLanguage(); break; - case WB_ID_DTV: + } + case WB_ID_DTV: { sWiiData.data[staIdx] = VIGetDTVStatus(); break; - case WB_ID_USE_ID: + } + case WB_ID_USE_ID: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::getUseProfileID(); break; - case WB_ID_CONNECT_TEST: + } + case WB_ID_CONNECT_TEST: { sWiiData.data[staIdx] = ipl::ncd::NCDSetting::checkConnectTestFlag(); break; - case WB_ID_INIT_FLAG: + } + case WB_ID_INIT_FLAG: { sWiiData.data[staIdx] = setupFlag; break; - case WB_ID_MAC_AVAILABLE: + } + case WB_ID_MAC_AVAILABLE: { sWiiData.data[staIdx] = ipl::socket::SocketSetting::checkLANMacAddrAvailable(); break; - case WB_ID_UPDATE_TYPE: + } + case WB_ID_UPDATE_TYPE: { sWiiData.data[staIdx] = SCGetUpdateType(); break; - case WB_ID_PRODUCT_AREA: + } + case WB_ID_PRODUCT_AREA: { sWiiData.data[staIdx] = ipl::System::getRegion(); break; - case WB_ID_EULA: + } + case WB_ID_EULA: { sWiiData.data[staIdx] = SCGetEULA(); break; - case WB_ID_TVRC_TYPE: + } + case WB_ID_TVRC_TYPE: { break; + } } val->data.jsDouble = sWiiData.data[staIdx]; if (staIdx == WB_ID_ERROR) { @@ -447,15 +504,18 @@ namespace www { u32 kbLang; if ((u32)ipl::System::getRegion() == SC_PRODUCT_AREA_USA) { switch (ipl::System::getLanguage()) { - case SC_LANG_ENGLISH: - kbLang = www_wiisetting_81370E60(0); + case SC_LANG_ENGLISH: { + kbLang = getKeyboardLanguage(0); break; - case SC_LANG_FRENCH: - kbLang = www_wiisetting_81370E60(1); + } + case SC_LANG_FRENCH: { + kbLang = getKeyboardLanguage(1); break; - case SC_LANG_SPANISH: - kbLang = www_wiisetting_81370E60(2); + } + case SC_LANG_SPANISH: { + kbLang = getKeyboardLanguage(2); break; + } } } else if ((u32)ipl::System::getRegion() == SC_PRODUCT_AREA_EUR) { for (int i = 0; i < 0x3b; i++) { @@ -467,7 +527,7 @@ namespace www { } val->data.jsDouble = (u8)kbLang; } - retVal = 0x06; + retVal = 6; } } return retVal; @@ -475,42 +535,44 @@ namespace www { int Setter_(WWWJSPluginObj* obj, const char* str, WWWJSPluginValue* val) { int bytePropIdx; - bytePropIdx = www_wiisetting_81370F14(str); + bytePropIdx = getBytePropIndex(str); if (bytePropIdx == WB_ID_PAGE_ID) { - sWiiData.data[bytePropIdx] = (u8)(val->data).jsDouble; + sWiiData.data[bytePropIdx] = (u8)val->data.jsDouble; switch (sWiiData.data[bytePropIdx]) { - case 0x1: - savedata_smth = 0x20 - (SCGetDisplayOffsetH() + 0x10); + case 1: { + saveData = 0x20 - (SCGetDisplayOffsetH() + 0x10); break; - case 0x32: - memset(pString->netSettingArg, 0, 0x40); + } + case 50: { + memset(pString->netSettingArg, 0, sizeof(pString->netSettingArg)); break; + } } - gEnableDpd = 1; + + gEnableDpd = TRUE; gDpdWaitFrm = 0; - return 0xb; + return 11; } else if (bytePropIdx >= 0) { - // u8 newRestrictions; if (bytePropIdx == WB_ID_SE || bytePropIdx == WB_ID_EXCSE) { - if ((val->data).jsDouble == 2.0) { - if ((sWiiData.data[WB_ID_SE] == 0) && (sWiiData.data[WB_ID_EXCSE] == 0)) { - sWiiData.data[bytePropIdx] = (val->data).jsDouble; + if (val->data.jsDouble == 2.0) { + if (sWiiData.data[WB_ID_SE] == 0 && sWiiData.data[WB_ID_EXCSE] == 0) { + sWiiData.data[bytePropIdx] = val->data.jsDouble; } } else { - sWiiData.data[bytePropIdx] = (val->data).jsDouble; + sWiiData.data[bytePropIdx] = val->data.jsDouble; } } else if (bytePropIdx == WB_ID_RESTRICTIONS) { - u32 restrictionsByte = (val->data).jsDouble; + u32 restrictionsByte = val->data.jsDouble; u32 newRestrictions; u8 oldRestrictions = sWiiData.data[bytePropIdx]; - newRestrictions = oldRestrictions | (restrictionsByte & 0x7f); + newRestrictions = oldRestrictions | (restrictionsByte & 0x7F); if ((restrictionsByte & 0x80) != 0) { - newRestrictions = oldRestrictions & ~(restrictionsByte & 0x7f); + newRestrictions = oldRestrictions & ~(restrictionsByte & 0x7F); } sWiiData.data[bytePropIdx] = newRestrictions; writeBackID = bytePropIdx; } else { - sWiiData.data[bytePropIdx] = (val->data).jsDouble; + sWiiData.data[bytePropIdx] = val->data.jsDouble; if (bytePropIdx != WB_ID_FUNC_ID) { writeBackID = bytePropIdx; } @@ -519,103 +581,128 @@ namespace www { } switch (bytePropIdx) { - case WB_ID_DIS_POS: + case WB_ID_DIS_POS: { sWiiData.data[WB_ID_SET_STRING] = 1; break; - case WB_ID_SOUND_ID: - sWiiData.data[WB_ID_SE] = sWiiData.data[bytePropIdx] + 0x0a; + } + case WB_ID_SOUND_ID: { + sWiiData.data[WB_ID_SE] = sWiiData.data[bytePropIdx] + 10; break; - case WB_ID_LIGHT: + } + case WB_ID_LIGHT: { WPADSetDpdSensitivity(sWiiData.data[bytePropIdx]); bytePropIdx = 0; do { - if (WPADIsDpdEnabled(bytePropIdx) != 0) { - gEnableDpd = 0; + if (WPADIsDpdEnabled(bytePropIdx)) { + gEnableDpd = FALSE; gDpdWaitFrm = 0; KPADDisableDPD(bytePropIdx); } - KPADSetControlDpdCallback(bytePropIdx, (KPADCallback*)&www_wiisetting_8136F9F4); + KPADSetControlDpdCallback(bytePropIdx, (KPADCallback*)&DPDCallback); bytePropIdx = bytePropIdx + 1; } while (bytePropIdx < 4); break; - case WB_ID_PROFILE_ID: + } + case WB_ID_PROFILE_ID: { ipl::ncd::NCDSetting::initSetID(sWiiData.data[bytePropIdx]); break; - case WB_ID_SELECT_WIRE: + } + case WB_ID_SELECT_WIRE: { ipl::ncd::NCDSetting::setWired(); break; - case WB_ID_WIFI_TYPE: + } + case WB_ID_WIFI_TYPE: { ipl::ncd::NCDSetting::setWireless(sWiiData.data[bytePropIdx]); break; - case WB_ID_FUNC_ID: + } + case WB_ID_FUNC_ID: { funcResult = 0; startFunc(sWiiData.data[bytePropIdx]); break; - case WB_ID_SELECT_SEC_KEY: - savedata_smth = ipl::ncd::NCDSetting::getPrivacyMode(); + } + case WB_ID_SELECT_SEC_KEY: { + saveData = ipl::ncd::NCDSetting::getPrivacyMode(); ipl::ncd::NCDSetting::setPrivacyMode(sWiiData.data[bytePropIdx]); break; - case WB_ID_BACK_SEC_KEY: - ipl::ncd::NCDSetting::setPrivacyMode(savedata_smth); + } + case WB_ID_BACK_SEC_KEY: { + ipl::ncd::NCDSetting::setPrivacyMode(saveData); break; - case WB_ID_AUTO_IP: + } + case WB_ID_AUTO_IP: { ipl::ncd::NCDSetting::setDHCPFlag(sWiiData.data[bytePropIdx]); break; - case WB_ID_AUTO_DNS: + } + case WB_ID_AUTO_DNS: { ipl::ncd::NCDSetting::setDNSFlag(sWiiData.data[bytePropIdx]); break; - case WB_ID_AUTO_PROXY: + } + case WB_ID_AUTO_PROXY: { ipl::ncd::NCDSetting::setProxyFlag(sWiiData.data[bytePropIdx]); break; - case WB_ID_AUTO_BASIC: + } + case WB_ID_AUTO_BASIC: { ipl::ncd::NCDSetting::setBasicFlag(sWiiData.data[bytePropIdx]); break; - case WB_ID_CHANGE_CONNECT_TYPE: + } + case WB_ID_CHANGE_CONNECT_TYPE: { ipl::ncd::NCDSetting::changeConnectType(sWiiData.data[bytePropIdx]); break; - case WB_ID_PARE_FLAG: + } + case WB_ID_PARE_FLAG: { ipl::parental::Parental::setFlags(sWiiData.data[bytePropIdx]); ipl::ncd::NCDSetting::adjustNWC24Flag(); break; - case WB_ID_RATE: - if (((u32)(val->data).jsDouble & 0x100) != 0) { + } + case WB_ID_RATE: { + if (((u32)val->data.jsDouble & 0x100) != 0) { sWiiData.data[bytePropIdx] = ipl::parental::Parental::checkRating(); } break; - case WB_ID_RATE_SAVE: - savedata_smth = ipl::parental::Parental::checkRating(); + } + case WB_ID_RATE_SAVE: { + saveData = ipl::parental::Parental::checkRating(); break; - case WB_ID_SEC_Q: + } + case WB_ID_SEC_Q: { ipl::parental::Parental::setSecQ(sWiiData.data[bytePropIdx]); break; - case WB_ID_SEC_Q_SAVE: - savedata_smth = ipl::parental::Parental::checkSecQ(); + } + case WB_ID_SEC_Q_SAVE: { + saveData = ipl::parental::Parental::checkSecQ(); break; - case WB_ID_USE_ID: + } + case WB_ID_USE_ID: { ipl::ncd::NCDSetting::setUseProfileID(); break; - case WB_ID_COUNTRY: + } + case WB_ID_COUNTRY: { if ((u32)ipl::System::getRegion() == SC_PRODUCT_AREA_USA) { switch (ipl::System::getLanguage()) { - case SC_LANG_ENGLISH: + case SC_LANG_ENGLISH: { sWiiData.data[WB_ID_COUNTRY] = kbLangUsaLUT[0][sWiiData.data[WB_ID_COUNTRY] - 8] + 8; break; - case SC_LANG_FRENCH: + } + case SC_LANG_FRENCH: { sWiiData.data[WB_ID_COUNTRY] = kbLangUsaLUT[1][sWiiData.data[WB_ID_COUNTRY] - 8] + 8; break; - case SC_LANG_SPANISH: + } + case SC_LANG_SPANISH: { sWiiData.data[WB_ID_COUNTRY] = kbLangUsaLUT[2][sWiiData.data[WB_ID_COUNTRY] - 8] + 8; break; + } } } else if ((u32)ipl::System::getRegion() == SC_PRODUCT_AREA_EUR) { sWiiData.data[WB_ID_COUNTRY] = kbLangEurLUT[ipl::System::getLanguage() - 1][sWiiData.data[WB_ID_COUNTRY] - 0x40] + 0x40; } break; - case WB_ID_COUNTRY_SAVE: - sWiiData.data[0x3c] = ipl::parental::Parental::getCountry(); + } + case WB_ID_COUNTRY_SAVE: { + sWiiData.data[0x3C] = ipl::parental::Parental::getCountry(); break; - case WB_ID_FLUSH: + } + case WB_ID_FLUSH: { if (sWiiData.data[bytePropIdx] == 0) { SCFlush(); OSReport("!!!!!!!!!!!!!!!!!!!SC FLUSH!!!!!!!!!!!!!!\n"); @@ -624,38 +711,43 @@ namespace www { wiiWriteBack(NULL, NULL, 0, NULL, NULL); } break; + } case WB_ID_TVRC: - default: + default: { break; + } } - return 0xb; + return 11; } else { - return 0x8; + return 8; } } + int wiiOSReport(WWWJSPluginObj* objA, WWWJSPluginObj* objB, int valInt, WWWJSPluginValue* valA, WWWJSPluginValue* valB) { if (valA->ty == 1) { - ext_ead::www::print::IPLWWWReport(3, "wiiOSReport Success!!\n"); + ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, "wiiOSReport Success!!\n"); // @bug This is a double, being printed with %d??? OSReport("%d\n", valA->data.jsDouble); } - return 0x11; + return 17; } int wiiWriteBack(WWWJSPluginObj* objA, WWWJSPluginObj* objB, int valInt, WWWJSPluginValue* valA, WWWJSPluginValue* valB) { SCIdleModeInfo idleInfo; SCIdleModeInfo wcFlagsIdleInfo; - OSReport("WriteBack id:%d data:%d savedata:%d\n", writeBackID, sWiiData.data[writeBackID], savedata_smth); + OSReport("WriteBack id:%d data:%d savedata:%d\n", writeBackID, sWiiData.data[writeBackID], saveData); switch (writeBackID) { - case WB_ID_SOUND_ID: + case WB_ID_SOUND_ID: { SCSetSoundMode(sWiiData.data[WB_ID_SOUND_ID]); break; + } case WB_ID_NWC24: { u32 flags = SCGetWCFlags(); - if (sWiiData.data[WB_ID_NWC24] == (flags & SC_WC_FLAGS_ENABLED)) + if (sWiiData.data[WB_ID_NWC24] == (flags & SC_WC_FLAGS_ENABLED)) { break; + } u32 newFlags = flags | SC_WC_FLAGS_ENABLED; if (!sWiiData.data[WB_ID_NWC24]) { @@ -664,15 +756,15 @@ namespace www { SCSetWCFlags(newFlags); if (!sWiiData.data[WB_ID_NWC24]) { - sWiiData.data[WB_ID_STANDBY] = 0; - sWiiData.data[WB_ID_LED] = 0; + sWiiData.data[WB_ID_STANDBY] = FALSE; + sWiiData.data[WB_ID_DISC_LED] = FALSE; } else { - sWiiData.data[WB_ID_STANDBY] = 1; - sWiiData.data[WB_ID_LED] = 1; + sWiiData.data[WB_ID_STANDBY] = TRUE; + sWiiData.data[WB_ID_DISC_LED] = TRUE; } wcFlagsIdleInfo.standby = sWiiData.data[WB_ID_STANDBY]; - wcFlagsIdleInfo.led = sWiiData.data[WB_ID_LED]; + wcFlagsIdleInfo.led = sWiiData.data[WB_ID_DISC_LED]; SCSetIdleMode(&wcFlagsIdleInfo); ipl::ncd::NCDSetting::adjustNWC24Flag(); @@ -680,40 +772,46 @@ namespace www { break; } case WB_ID_STANDBY: - case WB_ID_LED: { + case WB_ID_DISC_LED: { idleInfo.standby = sWiiData.data[WB_ID_STANDBY]; - idleInfo.led = sWiiData.data[WB_ID_LED]; + idleInfo.led = sWiiData.data[WB_ID_DISC_LED]; SCSetIdleMode(&idleInfo); ipl::System::getNwc24Manager()->enableLedNotification(true); break; } - case WB_ID_DIS_WIDE: - OSSendMessage(mQueue, (OSMessage)0x1c, 0); - OSReport("Send Func MsgQ: %d\n", 0x1c); + case WB_ID_DIS_WIDE: { + OSSendMessage(mQueue, (OSMessage)0x1C, 0); + OSReport("Send Func MsgQ: %d\n", 0x1C); break; - case WB_ID_DIS_POS: + } + case WB_ID_DIS_POS: { if (valA->data.jsDouble == 0.0) { - SCSetDisplayOffsetH((int)(char)(0x10 - savedata_smth)); - sWiiData.data[WB_ID_DIS_POS] = savedata_smth; + SCSetDisplayOffsetH((int)(char)(0x10 - saveData)); + sWiiData.data[WB_ID_DIS_POS] = saveData; sWiiData.data[WB_ID_SET_STRING] = 1; } else { SCSetDisplayOffsetH((int)(char)(0x10 - sWiiData.data[WB_ID_DIS_POS])); } break; - case WB_ID_LIGHT: // Why is this out of order??? + } + case WB_ID_LIGHT: { SCSetBtDpdSensibility(sWiiData.data[writeBackID]); break; - case WB_ID_PROGRESSIVE: + } + case WB_ID_PROGRESSIVE: { SCSetProgressiveMode(sWiiData.data[writeBackID]); break; - case WB_ID_SCREENSAVER: + } + case WB_ID_SCREENSAVER: { SCSetScreenSaverMode(sWiiData.data[writeBackID]); VIEnableDimming(sWiiData.data[writeBackID]); break; - case WB_ID_SENSOR_BAR: + } + case WB_ID_SENSOR_BAR: { SCSetWpadSensorBarPosition(sWiiData.data[writeBackID]); break; + } case WB_ID_YEAR: { OSCalendarTime time; OSTicksToCalendarTime(OSGetTime(), &time); @@ -735,39 +833,47 @@ namespace www { ipl::utility::Calendar::setCalendarTime(&time); break; } - case WB_ID_LANGUAGE: + case WB_ID_LANGUAGE: { OSSendMessage(mQueue, (OSMessage)0x50, 0); OSReport("Send Func MsgQ: %d\n", 0x50); break; - case WB_ID_RATE: + } + case WB_ID_RATE: { ipl::parental::Parental::setRating(sWiiData.data[writeBackID]); break; - case WB_ID_RESTRICTIONS: + } + case WB_ID_RESTRICTIONS: { ipl::parental::Parental::setRestrictions(sWiiData.data[writeBackID]); break; - case WB_ID_PAL: + } + case WB_ID_PAL: { SCSetProgressiveMode(sWiiData.data[WB_ID_PROGRESSIVE]); SCSetEuRgb60Mode(sWiiData.data[WB_ID_PAL]); break; - case WB_ID_COUNTRY: + } + case WB_ID_COUNTRY: { ipl::parental::Parental::setCountry(sWiiData.data[WB_ID_COUNTRY]); break; + } } switch (writeBackID) { case WB_ID_DIS_WIDE: case WB_ID_YEAR: case WB_ID_HOUR: - case WB_ID_LANGUAGE: + case WB_ID_LANGUAGE: { break; - default: + } + default: { SCFlush(); OSReport("!!!!!!!!!!!!!!!!!!!SC FLUSH!!!!!!!!!!!!!!!!!\n"); break; + } } writeBackID = 0; - return 0x11; + return 17; } + const char* const byteProps[] = { "soundId", "nwc24", "internet", "standby", "LED", "dis_wide", @@ -794,15 +900,14 @@ namespace www { "productArea", "eula", "tvrc", "tvrc_maker", "tvrc_type", NULL, }; - // @bug I think this is also supposed to be const + const char* strProps[] = { "nickname", "securityKey", "ssID", "ipAddr", "subnet", "gateway", "dns1", "dns2", "macAddr", "proxy", "proxyPort", "basicName", "basicPass", "mtu", "pare_pass", "pare_repass", "pare_judgepass", "secA", "resecA", "master", "lanMac", "dummySec", "version", "directUrl", NULL, }; - extern "C" { - int www_wiisetting_81370E60(u8 usaLangIdx) { + int getKeyboardLanguage(u8 usaLangIdx) { const u8* activeLUT = kbLangUsaLUT[usaLangIdx]; u8 parentalCountry = sWiiData.data[WB_ID_COUNTRY]; for (int i = 0; i < 0x30; i++) { @@ -810,7 +915,7 @@ namespace www { return (u8)(i + 8); } } - } + // @bug: no return here. } void initWiiSetting() { @@ -819,19 +924,21 @@ namespace www { memset(&wiiFlag, 0, sizeof(wiiFlag)); sWiiData.data[WB_ID_NWC24] = SCGetWCFlags() & SC_WC_FLAGS_ENABLED; } - int www_wiisetting_81370F14(const char* targetStr) { + + int getBytePropIndex(const char* targetStr) { const char* names[ARRAY_LENGTH(byteProps)]; - { - const char** __pDst = names - 1; - const char* const* __pSrc = byteProps - 1; - for (int i = 0; i < (ARRAY_LENGTH(names) >> 1); i++) { - *(++__pDst) = *(++__pSrc); - *(++__pDst) = *(++__pSrc); - } + + const char** __pDst = names - 1; + const char* const* __pSrc = byteProps - 1; + for (int i = 0; i < (ARRAY_LENGTH(names) >> 1); i++) { + *(++__pDst) = *(++__pSrc); + *(++__pDst) = *(++__pSrc); } + for (int i = 0; i < (int)ARRAY_LENGTH(names); i++) { - if (strcmp(targetStr, names[i]) == 0) + if (strcmp(targetStr, names[i]) == 0) { return i + 1; + } } return -1; } @@ -840,27 +947,28 @@ namespace www { u32 parentalMistakeRes; switch (funcID) { case 0x17: - case 0x1a: - case 0x1d: - case 0x4d: - case 0x4e: - case 0x4f: + case 0x1A: + case 0x1B: + case 0x4D: + case 0x4E: + case 0x4F: case 0x51: case 0x52: case 0x53: - case 0x5a: - case 0x5b: - case 0x5c: - case 0x5d: - case 0x5e: - case 0x5f: + case 0x5A: + case 0x5B: + case 0x5C: + case 0x5D: + case 0x5E: + case 0x5F: case 0x64: case 0x65: case 0x66: - case 0x67: + case 0x67: { OSSendMessage(mQueue, (OSMessage)(u32)funcID, 0); OSReport("Send Func MsgQ: %d\n", funcID); break; + } case 0x01: case 0x02: case 0x03: @@ -871,72 +979,87 @@ namespace www { case 0x08: case 0x09: case 0x18: - case 0x1e: - case 0x1f: + case 0x1E: + case 0x1F: case 0x23: case 0x54: case 0x55: case 0x56: case 0x57: case 0x58: - case 0x59: + case 0x59: { wiiFlag.smthMsgData = funcID; break; - case 0x20: - if (wiiFlag.smthMsgData == 0x21) + } + case 0x20: { + if (wiiFlag.smthMsgData == 0x21) { OSReport("eJSFunc_AOSSConnect : request ignored."); - else + } else { wiiFlag.smthMsgData = funcID; + } break; + } case 0x21: - case 0x22: + case 0x22: { wiiFlag.smthMsgData = funcID; break; + } case 0x28: case 0x29: - case 0x2a: - if (wiiFlag.smthMsgData == 0x2b) + case 0x2A: { + if (wiiFlag.smthMsgData == 0x2B) { OSReport("eJSFunc_RakuSet%d : request ignored.", funcID - 0x27); - else + } else { wiiFlag.smthMsgData = funcID; + } break; - case 0x2b: - case 0x2c: + } + case 0x2B: + case 0x2C: { wiiFlag.smthMsgData = funcID; break; - - case 0x0a: + } + case 10: { ipl::ncd::NCDSetting::clearData(); break; - case 0x0c: + } + case 0x0C: { parentalMistakeRes = ipl::parental::Parental::checkMistake(0); - OSReport("setFuncResult:%d\n", parentalMistakeRes & 0xff); + OSReport("setFuncResult:%d\n", parentalMistakeRes & 0xFF); funcResult = parentalMistakeRes; break; - case 0x0d: + } + case 0x0D: { parentalMistakeRes = ipl::parental::Parental::checkMistake(1); - OSReport("setFuncResult:%d\n", parentalMistakeRes & 0xff); + OSReport("setFuncResult:%d\n", parentalMistakeRes & 0xFF); funcResult = parentalMistakeRes; break; - case 0x0e: + } + case 0x0E: { parentalMistakeRes = ipl::parental::Parental::checkMistake(2); - OSReport("setFuncResult:%d\n", parentalMistakeRes & 0xff); + OSReport("setFuncResult:%d\n", parentalMistakeRes & 0xFF); funcResult = parentalMistakeRes; break; - case 0x10: + } + case 0x10: { ipl::ncd::NCDSetting::clearLocal(); break; - case 0x14: + } + case 0x14: { ipl::ncd::NCDSetting::write(); break; - case 0x15: + } + case 0x15: { ipl::parental::Parental::write(); break; - case 0x16: + } + case 0x16: { ipl::parental::Parental::clear(); - case 0x19: + } + case 0x19: { sWiiData.data[WB_ID_RESTRICTIONS] = ipl::parental::Parental::checkRestrictions(); break; + } } sWiiData.data[WB_ID_FUNC_ID] = 0; return; @@ -945,12 +1068,15 @@ namespace www { WiiData* getWiiSettingData() { return &sWiiData; } + WiiFlag* getWiiSettingFlag() { return &wiiFlag; } + void setStringBuf(SetStringBuf* buf) { pString = buf; } + void setInitSetupFlag(u8 flag) { setupFlag = flag; } @@ -959,14 +1085,14 @@ namespace www { OSReport("setFuncResult:%d\n", result); funcResult = result; } + u32 getFuncResult() { OSReport("getFuncResult:%d\n", funcResult); return funcResult; } + void setMsgQueue(OSMessageQueue* msgQ) { mQueue = msgQ; } - - // DECOMP_FORCE_ACTIVE(wiisetting, gDpdWaitFrm, wiiFlag); } // namespace wiisetting } // namespace www diff --git a/src/iplwww/www_window.cpp b/src/iplwww/www_window.cpp index fea22112..e2623897 100644 --- a/src/iplwww/www_window.cpp +++ b/src/iplwww/www_window.cpp @@ -11,32 +11,34 @@ namespace ext_ead { namespace window { IPL_WWW_REPORT_REDEFINE_MESSAGE(true); } - BrowserWindow::BrowserWindow(BrowserThread* thread) : pWwwWindow(NULL), pThread(thread) { - unk_0x2b0 = 0; + + BrowserWindow::BrowserWindow(BrowserThread* thread) : mpWwwWindow(NULL), mpBrowserThread(thread) { + unk_0x2B0 = 0; mRenderingMode = 6; - unk_0x2c4[0] = 0; - unk_0x2c4[1] = 0; - unk_0x2c4[2] = 0; - unk_0x2c4[3] = 0; - unk_0x2c4[4] = 0; - unk_0x2c4[5] = 0; + unk_0x2C4[0] = 0; + unk_0x2C4[1] = 0; + unk_0x2C4[2] = 0; + unk_0x2C4[3] = 0; + unk_0x2C4[4] = 0; + unk_0x2C4[5] = 0; int i, j; - for (i = 0; i < 2; i++) { - for (j = 0; j < 3; j++) { + for (i = 0; i < (int)ARRAY_LENGTH(mTexBufArr); i++) { + for (j = 0; j < (int)ARRAY_LENGTH(mTexBufArr[0]); j++) { mTexBufArr[i][j] = NULL; } - unk_0x2b4[i] = NULL; + unk_0x2B4[i] = NULL; } - unk_0x2bc = 0; - unk_0x2c0 = 0; + unk_0x2BC = 0; + unk_0x2C0 = 0; struct { int v0, v1; } unused = {0, 0}; } + BrowserWindow::~BrowserWindow() { CloseWindow(); } @@ -45,52 +47,54 @@ namespace ext_ead { mWidth = w; mHeight = h; - WWWRect rect; - rect.x = 0; - rect.y = 0; - rect.w = 0; - rect.h = 0; + WWWRect rect = {0, 0, 0, 0}; rect.w = mWidth; rect.h = mHeight; - for (int i = 0; i < 2; i++) { - for (int j = 0; j < 3; j++) { + for (int i = 0; i < (int)ARRAY_LENGTH(mTexBufArr); i++) { + for (int j = 0; j < (int)ARRAY_LENGTH(mTexBufArr[0]); j++) { mTexDisplayRects[i][j] = rect; + u32 texBufSize = GXGetTexBufferSize(texW, texH, GX_TF_RGB565, 0, 0); - mTexBufArr[i][j] = Heap::allocMem2(texBufSize, 0x20); + mTexBufArr[i][j] = Heap::allocMem2(texBufSize, 32); + memset(mTexBufArr[i][j], 0, texBufSize); DCStoreRange(mTexBufArr[i][j], texBufSize); - print::IPLWWWReport(3, " TextureBuffer_ %d:%d ptr:%p\n", j, i, mTexBufArr[i][j]); + + print::IPLWWWReport(print::WWW_DEBUG, " TextureBuffer_ %d:%d ptr:%p\n", j, i, mTexBufArr[i][j]); } } - if ((*WWWCreateBrowserWindow)(*(void**)((u8*)pThread + 0x67c), &pWwwWindow, 0)) { - print::IPLWWWReport(1, "INFO: cannot create browser window\n"); + + if (WWWCreateBrowserWindow(mpBrowserThread->GetHandle(), &mpWwwWindow, 0)) { + print::IPLWWWReport(print::WWW_WARNING, "INFO: cannot create browser window\n"); return NULL; } else { - WWWRect rect; - rect.x = 0; - rect.y = 0; - rect.w = 0; - rect.h = 0; + WWWRect rect = {0, 0, 0, 0}; rect.w = mWidth; rect.h = mHeight; - (*WWWSetBrowserWindowRect)(pWwwWindow, &rect); - (*WWWSetImageMode)(pWwwWindow, GX_TF_RGB565); - (*WWWSetRenderingMode)(pWwwWindow, mRenderingMode); - (*WWWShowBrowserWindow)(pWwwWindow); - (*WWWRaiseBrowserWindow)(pWwwWindow); - (*WWWSetFocus)(pWwwWindow); + + WWWSetBrowserWindowRect(mpWwwWindow, &rect); + + WWWSetImageMode(mpWwwWindow, GX_TF_RGB565); + WWWSetRenderingMode(mpWwwWindow, mRenderingMode); + + WWWShowBrowserWindow(mpWwwWindow); + WWWRaiseBrowserWindow(mpWwwWindow); + + WWWSetFocus(mpWwwWindow); + GotoHome(); - return pWwwWindow; + return mpWwwWindow; } } + void BrowserWindow::CloseWindow() { - (*WWWCloseBrowserWindow)(*(void**)((u8*)pThread + 0x67c), pWwwWindow); - pWwwWindow = NULL; + WWWCloseBrowserWindow(mpBrowserThread->GetHandle(), mpWwwWindow); + mpWwwWindow = NULL; int i; - for (i = 0; i < 2; i++) { - for (int j = 0; j < 3; j++) { + for (i = 0; i < (int)ARRAY_LENGTH(mTexBufArr); i++) { + for (int j = 0; j < (int)ARRAY_LENGTH(mTexBufArr[0]); j++) { void* currTexBuf = mTexBufArr[i][j]; if (currTexBuf != NULL) { Heap::freeMem2(currTexBuf); @@ -101,68 +105,74 @@ namespace ext_ead { } void BrowserWindow::PrevPage() { - (*WWWPrevPage)(pWwwWindow); + WWWPrevPage(mpWwwWindow); } + void BrowserWindow::GotoHome() { - if (SurfaceManager::Instance_->pArcPath != NULL) { - (*WWWOpenUrl)(pWwwWindow, SurfaceManager::Instance_->pArcPath); + if (SurfaceManager::GetInstance()->GetArcPath() != NULL) { + WWWOpenUrl(mpWwwWindow, SurfaceManager::GetInstance()->GetArcPath()); } else { - (*WWWOpenUrl)(pWwwWindow, "file:dvd/html/startup.html"); + WWWOpenUrl(mpWwwWindow, "file:dvd/html/startup.html"); } } void BrowserWindow::SendNotifyEvent(WWWEvent event, WWWHandleEventData* dataHandle) { ExecWwwEvent_(event, dataHandle); } + void BrowserWindow::ExecuteEvent() { HandleNotifyEvent_(); } + void BrowserWindow::UpdateTexture() { - if (unk_0x2c4[0] == 0 && unk_0x2c4[1] != 0) { - print::IPLWWWReport(3, " XXX BrowserWindow::CopyToTextureBuffer\n"); + if (unk_0x2C4[0] == 0 && unk_0x2C4[1] != 0) { + print::IPLWWWReport(print::WWW_DEBUG, " XXX BrowserWindow::CopyToTextureBuffer\n"); TileBlit_(); - unk_0x2c4[1] = 0; + unk_0x2C4[1] = 0; } } + void BrowserWindow::ExecWwwEvent_(int eventCode, WWWHandleEventData* dataHandle) { switch (eventCode) { - case 5: - if (unk_0x2c4[2] == '\0') { - unk_0x2c0 = (unk_0x2b0 + 1) % 2; - unk_0x2bc = unk_0x2b4[unk_0x2c0]; + case WWW_EVT_URL_CHANGE: { + if (unk_0x2C4[2] == '\0') { + unk_0x2C0 = (unk_0x2B0 + 1) % 2; + unk_0x2BC = unk_0x2B4[unk_0x2C0]; } - unk_0x2c4[4] = 1; - unk_0x2c4[2] = 1; - unk_0x2c4[0] = 1; + unk_0x2C4[4] = 1; + unk_0x2C4[2] = 1; + unk_0x2C4[0] = 1; break; - case 6: - if (unk_0x2c4[2] == '\0') { - if (unk_0x2c4[4] == '\0') { - unk_0x2c0 = unk_0x2b0; - unk_0x2bc = (int)(unk_0x2b4[unk_0x2b0] + 1) % 3; + } + case WWW_EVT_LOADING_START: { + if (unk_0x2C4[2] == '\0') { + if (unk_0x2C4[4] == '\0') { + unk_0x2C0 = unk_0x2B0; + unk_0x2BC = (int)(unk_0x2B4[unk_0x2B0] + 1) % 3; } - unk_0x2c4[4] = 1; - unk_0x2c4[0] = 1; - print::IPLWWWReport(2, " LoadinStart: %d\n", unk_0x2b4[unk_0x2b0]); + unk_0x2C4[4] = 1; + unk_0x2C4[0] = 1; + print::IPLWWWReport(2, " LoadinStart: %d\n", unk_0x2B4[unk_0x2B0]); } break; - case 7: { + } + case WWW_EVT_LOADING_FINISHED: { BOOL level = OSDisableInterrupts(); - if (unk_0x2c4[0] != '\0') { - unk_0x2c4[0] = 0; - unk_0x2c4[1] = 1; + if (unk_0x2C4[0] != '\0') { + unk_0x2C4[0] = 0; + unk_0x2C4[1] = 1; } OSRestoreInterrupts(level); break; } - case 0x1e: + case WWW_EVT_IMECREATE: { ImeData data; - pThread->CreateImeData(&data, (WWWIMEData*)dataHandle); - pThread->SendEventFromWindow(&data); + mpBrowserThread->CreateImeData(&data, (WWWIMEData*)dataHandle); + mpBrowserThread->SendEventFromWindow(&data); break; + } } ReportEventId_(eventCode, dataHandle); - return; } void BrowserWindow::HandleNotifyEvent_() { @@ -176,25 +186,26 @@ namespace ext_ead { // goto TRY_RECEIVE; while (mMessage.TryReceiveTypedMessage(&cmd)) { - if ((cmd.mEventCode & 0xf0000000) == 0x10000000) { - ExecWwwEvent_(cmd.mEventCode & 0xfffffff, cmd.pHandleEventData); + if ((cmd.eventCode & 0xf0000000) == 0x10000000) { + ExecWwwEvent_(cmd.eventCode & 0xFFFFFFf, cmd.pHandleEventData); } }; } void BrowserWindow::TileBlit_() { typedef u32 SubRow[4]; - if (unk_0x2c4[0] != '\0') + if (unk_0x2C4[0] != '\0') { return; + } u32 srcBlockAdvance; u32 srcRowAdvance; void* rasterSrc; u16* blockRowDst; - srcRowAdvance = SurfaceManager::Instance_->mWidth * sizeof(u32); + srcRowAdvance = SurfaceManager::GetInstance()->GetWidth() * sizeof(u32); - rasterSrc = *(void**)((u8*)pThread + 0x674); + rasterSrc = mpBrowserThread->GetRaster(); blockRowDst = (u16*)GetTextureBuffer(0, TRUE, NULL); srcBlockAdvance = srcRowAdvance * sizeof(u32); @@ -206,55 +217,55 @@ namespace ext_ead { SubRow* blockRowD = (SubRow*)((u8*)blockRowC + srcRowAdvance); for (int blockX = 0; blockX < mWidth; blockX += 4) { - blockDst[0x0] = convertToRGB565((*blockRowA)[0]); - blockDst[0x1] = convertToRGB565((*blockRowA)[1]); - blockDst[0x2] = convertToRGB565((*blockRowA)[2]); - blockDst[0x3] = convertToRGB565((*blockRowA++)[3]); + blockDst[0] = convertToRGB565((*blockRowA)[0]); + blockDst[1] = convertToRGB565((*blockRowA)[1]); + blockDst[2] = convertToRGB565((*blockRowA)[2]); + blockDst[3] = convertToRGB565((*blockRowA++)[3]); - blockDst[0x4] = convertToRGB565((*blockRowB)[0]); - blockDst[0x5] = convertToRGB565((*blockRowB)[1]); - blockDst[0x6] = convertToRGB565((*blockRowB)[2]); - blockDst[0x7] = convertToRGB565((*blockRowB++)[3]); + blockDst[4] = convertToRGB565((*blockRowB)[0]); + blockDst[5] = convertToRGB565((*blockRowB)[1]); + blockDst[6] = convertToRGB565((*blockRowB)[2]); + blockDst[7] = convertToRGB565((*blockRowB++)[3]); - blockDst[0x8] = convertToRGB565((*blockRowC)[0]); - blockDst[0x9] = convertToRGB565((*blockRowC)[1]); - blockDst[0xa] = convertToRGB565((*blockRowC)[2]); - blockDst[0xb] = convertToRGB565((*blockRowC++)[3]); + blockDst[8] = convertToRGB565((*blockRowC)[0]); + blockDst[9] = convertToRGB565((*blockRowC)[1]); + blockDst[10] = convertToRGB565((*blockRowC)[2]); + blockDst[11] = convertToRGB565((*blockRowC++)[3]); - blockDst[0xc] = convertToRGB565((*blockRowD)[0]); - blockDst[0xd] = convertToRGB565((*blockRowD)[1]); - blockDst[0xe] = convertToRGB565((*blockRowD)[2]); - blockDst[0xf] = convertToRGB565((*blockRowD++)[3]); + blockDst[12] = convertToRGB565((*blockRowD)[0]); + blockDst[13] = convertToRGB565((*blockRowD)[1]); + blockDst[14] = convertToRGB565((*blockRowD)[2]); + blockDst[15] = convertToRGB565((*blockRowD++)[3]); - blockDst += 0x10; + blockDst += 16; } rasterSrc = (u8*)rasterSrc + srcBlockAdvance; blockRowDst += mWidth * 4; } WWWRect* newRect; - WWWRect rect; DCStoreRange(GetTextureBuffer(0, true, &newRect), mWidth * mHeight * 2); - rect.x = 0; - rect.y = 0; - rect.w = 0; - rect.h = 0; + + WWWRect rect = {0, 0, 0, 0}; rect.w = mWidth; rect.h = mHeight; + *newRect = rect; BOOL level = OSDisableInterrupts(); - if (unk_0x2c4[2] != '\0') { - unk_0x2c4[2] = 0; - unk_0x2c4[3] = 1; + if (unk_0x2C4[2] != '\0') { + unk_0x2C4[2] = 0; + unk_0x2C4[3] = 1; } - unk_0x2c4[4] = 0; - unk_0x2b0 = unk_0x2c0; - unk_0x2b4[unk_0x2c0] = unk_0x2bc; - unk_0x2c4[5] = 1; + unk_0x2C4[4] = 0; + unk_0x2B0 = unk_0x2C0; + unk_0x2B4[unk_0x2C0] = unk_0x2BC; + unk_0x2C4[5] = 1; + OSRestoreInterrupts(level); } + u16 BrowserWindow::convertToRGB565(u32 argb) { union { u32 argb; @@ -267,155 +278,183 @@ namespace ext_ead { } bytes; bytes.argb = argb; - u32 r = (bytes.r >> 3) & 0x1f; - u32 g = (bytes.g >> 2) & 0x3f; - u32 b = (bytes.b >> 3) & 0x1f; + u32 r = (bytes.r >> 3) & 0x1F; + u32 g = (bytes.g >> 2) & 0x3F; + u32 b = (bytes.b >> 3) & 0x1F; return (r << 11) | (g << 5) | b; } void BrowserWindow::ReportEventId_(int eventCode, void* somePtr) { switch (eventCode) { - case WWW_EVT_CURSOR_CHANGE: - print::IPLWWWReport(4, "WWW_EVT_CURSOR_CHANGE\n"); - return; - case WWW_EVT_WINDOW_CLOSE: - print::IPLWWWReport(4, "WWW_EVT_WINDOW_CLOSE\n"); - return; - case WWW_EVT_WINDOW_NEW: - print::IPLWWWReport(4, "WWW_EVT_WINDOW_NEW\n"); - return; - case WWW_EVT_WINDOW_REQUEST: - print::IPLWWWReport(4, "WWW_EVT_WINDOW_REQUEST\n"); - return; - case WWW_EVT_AUTHENTICATION: - print::IPLWWWReport(4, "WWW_EVT_AUTHENTICATION\n"); - return; - case WWW_EVT_URL_CHANGE: - print::IPLWWWReport(4, "WWW_EVT_URL_CHANGE\n"); - return; - case WWW_EVT_LOADING_START: - print::IPLWWWReport(4, "WWW_EVT_LOADING_START\n"); - return; - case WWW_EVT_LOADING_FINISHED: - print::IPLWWWReport(4, "WWW_EVT_LOADING_FINISHED\n"); - return; - case WWW_EVT_LOADING_PROGRESS: - print::IPLWWWReport(4, "WWW_EVT_LOADING_PROGRESS\n"); - return; - case WWW_EVT_UPLOADING_START: - print::IPLWWWReport(4, "WWW_EVT_UPLOADING_START\n"); - return; - case WWW_EVT_UPLOADING_FINISHED: - print::IPLWWWReport(4, "WWW_EVT_UPLOADING_FINISHED\n"); - return; - case WWW_EVT_DOCUMENT_TITLE: - print::IPLWWWReport(4, "WWW_EVT_DOCUMENT_TITLE\n"); - return; - case WWW_EVT_DOCUMENT_SIZE: - print::IPLWWWReport(4, "WWW_EVT_DOCUMENT_SIZE\n"); - return; - case WWW_EVT_DOCUMENT_ICON: - print::IPLWWWReport(4, "WWW_EVT_DOCUMENT_ICON\n"); - return; - case WWW_EVT_LINK_CLICKED: - print::IPLWWWReport(4, "WWW_EVT_LINK_CLICKED\n"); - return; - case WWW_EVT_SECURITY_MODE: - print::IPLWWWReport(4, "WWW_EVT_SECURITY_MODE\n"); - return; - case WWW_EVT_LINK_NAVIGATED: - print::IPLWWWReport(4, "WWW_EVT_LINK_NAVIGATED\n"); - return; - case WWW_EVT_LINK_HOVER: - // @bug this should include a format argument but it doesn't - print::IPLWWWReport(4, "WWW_EVT_LINK_HOVER %p\n", somePtr); - return; - case WWW_EVT_UNKNOWN_PROTOCOL: - print::IPLWWWReport(4, "WWW_EVT_UNKNOWN_PROTOCOL\n"); - return; - case WWW_EVT_DOWNLOAD: - print::IPLWWWReport(4, "WWW_EVT_DOWNLOAD\n"); - return; - case WWW_EVT_ERROR: - print::IPLWWWReport(4, "WWW_EVT_ERROR\n"); - return; - case WWW_EVT_IMECREATE: - print::IPLWWWReport(4, "WWW_EVT_IMECREATE\n"); - return; - case WWW_EVT_IMEMOVE: - print::IPLWWWReport(4, "WWW_EVT_IMEMOVE\n"); - return; - case WWW_EVT_IMECANCEL: - print::IPLWWWReport(4, "WWW_EVT_IMECANCEL\n"); - return; - case WWW_EVT_ASYNC_DIALOG: - print::IPLWWWReport(4, "WWW_EVT_ASYNC_DIALOG\n"); - return; - case WWW_EVT_BLOCKING_DIALOG: - print::IPLWWWReport(4, "WWW_EVT_BLOCKING_DIALOG\n"); - return; - case WWW_EVT_OUT_OF_MEMORY: - print::IPLWWWReport(4, "WWW_EVT_OUT_OF_MEMORY\n"); - return; - case WWW_EVT_SOFT_OUT_OF_MEMORY: - print::IPLWWWReport(4, "WWW_EVT_SOFT_OUT_OF_MEMORY\n"); - return; - case WWW_EVT_PROTOCOL_LOADING_START: - print::IPLWWWReport(4, "WWW_EVT_PROTOCOL_LOADING_START\n"); - return; - case WWW_EVT_EXISTS_HISTORY: - print::IPLWWWReport(4, "WWW_EVT_EXISTS_HISTORY\n"); - return; - case WWW_EVT_EXTERNAL_ACTION: - print::IPLWWWReport(4, "WWW_EVT_EXTERNAL_ACTION\n"); - return; - case WWW_EVT_SCREEN_INVALID: - print::IPLWWWReport(4, "WWW_EVT_SCREEN_INVALID\n"); - return; - case WWW_EVT_FILTERED_URL: - print::IPLWWWReport(4, "WWW_EVT_FILTERED_URL\n"); - return; - default: - print::IPLWWWReport(4, "RecvNotifyEvent: %d\n", eventCode); - return; - case WWW_EVT_UNK_0x13: - return; + case WWW_EVT_CURSOR_CHANGE: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_CURSOR_CHANGE\n"); + break; + } + case WWW_EVT_WINDOW_CLOSE: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_WINDOW_CLOSE\n"); + break; + } + case WWW_EVT_WINDOW_NEW: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_WINDOW_NEW\n"); + break; + } + case WWW_EVT_WINDOW_REQUEST: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_WINDOW_REQUEST\n"); + break; + } + case WWW_EVT_AUTHENTICATION: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_AUTHENTICATION\n"); + break; + } + case WWW_EVT_URL_CHANGE: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_URL_CHANGE\n"); + break; + } + case WWW_EVT_LOADING_START: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LOADING_START\n"); + break; + } + case WWW_EVT_LOADING_FINISHED: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LOADING_FINISHED\n"); + break; + } + case WWW_EVT_LOADING_PROGRESS: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LOADING_PROGRESS\n"); + break; + } + case WWW_EVT_UPLOADING_START: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_UPLOADING_START\n"); + break; + } + case WWW_EVT_UPLOADING_FINISHED: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_UPLOADING_FINISHED\n"); + break; + } + case WWW_EVT_DOCUMENT_TITLE: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_DOCUMENT_TITLE\n"); + break; + } + case WWW_EVT_DOCUMENT_SIZE: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_DOCUMENT_SIZE\n"); + break; + } + case WWW_EVT_DOCUMENT_ICON: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_DOCUMENT_ICON\n"); + break; + } + case WWW_EVT_LINK_CLICKED: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LINK_CLICKED\n"); + break; + } + case WWW_EVT_SECURITY_MODE: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_SECURITY_MODE\n"); + break; + } + case WWW_EVT_LINK_NAVIGATED: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LINK_NAVIGATED\n"); + break; + } + case WWW_EVT_LINK_HOVER: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LINK_HOVER %p\n", somePtr); + break; + } + case WWW_EVT_UNKNOWN_PROTOCOL: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_UNKNOWN_PROTOCOL\n"); + break; + } + case WWW_EVT_DOWNLOAD: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_DOWNLOAD\n"); + break; + } + case WWW_EVT_ERROR: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_ERROR\n"); + break; + } + case WWW_EVT_IMECREATE: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_IMECREATE\n"); + break; + } + case WWW_EVT_IMEMOVE: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_IMEMOVE\n"); + break; + } + case WWW_EVT_IMECANCEL: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_IMECANCEL\n"); + break; + } + case WWW_EVT_ASYNC_DIALOG: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_ASYNC_DIALOG\n"); + break; + } + case WWW_EVT_BLOCKING_DIALOG: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_BLOCKING_DIALOG\n"); + break; + } + case WWW_EVT_OUT_OF_MEMORY: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_OUT_OF_MEMORY\n"); + break; + } + case WWW_EVT_SOFT_OUT_OF_MEMORY: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_SOFT_OUT_OF_MEMORY\n"); + break; + } + case WWW_EVT_PROTOCOL_LOADING_START: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_PROTOCOL_LOADING_START\n"); + break; + } + case WWW_EVT_EXISTS_HISTORY: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_EXISTS_HISTORY\n"); + break; + } + case WWW_EVT_EXTERNAL_ACTION: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_EXTERNAL_ACTION\n"); + break; + } + case WWW_EVT_SCREEN_INVALID: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_SCREEN_INVALID\n"); + break; + } + case WWW_EVT_FILTERED_URL: { + print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_FILTERED_URL\n"); + break; + } + default: { + print::IPLWWWReport(print::WWW_EVENT, "RecvNotifyEvent: %d\n", eventCode); + break; + } + case WWW_EVT_UNKNOWN_19: { + break; + } } - return; } void* BrowserWindow::GetTextureBuffer(int a, bool b, WWWRect** rectPtrOut) { u32 i; u32 j; - if (!b && unk_0x2c4[5] == 0) + if (!b && unk_0x2C4[5] == 0) return NULL; - if (unk_0x2c4[4] != 0 && b) { - i = unk_0x2c0; - j = unk_0x2bc; + if (unk_0x2C4[4] != 0 && b) { + i = unk_0x2C0; + j = unk_0x2BC; } else { - i = (unk_0x2b0 + 2 - a) % 2; - j = unk_0x2b4[i]; + i = (unk_0x2B0 + 2 - a) % 2; + j = unk_0x2B4[i]; } if (rectPtrOut != NULL) { *rectPtrOut = &mTexDisplayRects[i][j]; } - return this->mTexBufArr[i][j]; + return mTexBufArr[i][j]; } void BrowserWindow::SetWindowSize(int w, int h) { - WWWRect rect; - mWidth = w; mHeight = h; - rect.x = 0; - rect.y = 0; - rect.w = 0; - rect.h = 0; + WWWRect rect = {0, 0, 0, 0}; rect.w = mWidth; rect.h = mHeight; - (*WWWSetBrowserWindowRect)(pWwwWindow, &rect); + WWWSetBrowserWindowRect(mpWwwWindow, &rect); } } // namespace www diff --git a/src/layout/iplGuiManager.cpp b/src/layout/iplGuiManager.cpp index 80a0d8d4..7cd10faf 100644 --- a/src/layout/iplGuiManager.cpp +++ b/src/layout/iplGuiManager.cpp @@ -24,7 +24,7 @@ namespace ipl { System::getProjectionRect(&projRect); // Get Cursor Position - ipl::math::VEC2 conProjPos = con->getDpdProjectionPos(); + math::VEC2 conProjPos = con->getDpdProjectionPos(); if ((projRect.left > conProjPos.x || conProjPos.x > projRect.right) || (projRect.top > conProjPos.y && conProjPos.y > projRect.bottom)) { conProjPos.y = IPL_MATH_NULL_FLOAT; diff --git a/src/scene/board/iplBoardObject.cpp b/src/scene/board/iplBoardObject.cpp index bef35705..ac1e2d52 100644 --- a/src/scene/board/iplBoardObject.cpp +++ b/src/scene/board/iplBoardObject.cpp @@ -117,7 +117,7 @@ namespace ipl { } void BoardObject::create(nand::LayoutFile* file, u8* recordData, u32 gameCode, const CDBId& cdbId, const CDBRecordKey& recordKey, - const ipl::utility::Date& date) { + const utility::Date& date) { mpRecordData = recordData; mpLayoutFile = file; @@ -219,7 +219,7 @@ namespace ipl { mMoveAnim.calc(); - ipl::math::VEC2 finalPos = offsetPos + mBoardPos + mMoveSpeed + mMoveAnim.get2(); + math::VEC2 finalPos = offsetPos + mBoardPos + mMoveSpeed + mMoveAnim.get(); finalPos.x *= locationAdjust; mpLayout->GetRootPane()->SetTranslate(finalPos); mpLayout->calc(); diff --git a/src/scene/board/iplBoardSD.cpp b/src/scene/board/iplBoardSD.cpp index c43c1c6d..5465c657 100644 --- a/src/scene/board/iplBoardSD.cpp +++ b/src/scene/board/iplBoardSD.cpp @@ -21,7 +21,7 @@ namespace ipl { sdWorker->mount_sd_async(); break; } - case SDVFWorker::SD_STATE_AVAILABLE: { + case SDVFWorker::SD_STATE_READY: { mSDState = SD_STATE_INSERTED; sdWorker->prepare_cdb_backup_to_sd_async(); mState = STATE_PREPARE_RESULT; diff --git a/src/scene/channelEdit/iplAnmController.cpp b/src/scene/channelEdit/iplAnmController.cpp index b07fce31..3c4648fd 100644 --- a/src/scene/channelEdit/iplAnmController.cpp +++ b/src/scene/channelEdit/iplAnmController.cpp @@ -5,60 +5,66 @@ namespace ipl { namespace scene { void AnmPane::calc() { - if (pAnmCurr != NULL && !pAnmCurr->animator->isPlaying()) { - pAnmCurr = NULL; + if (mpAnmCurr != NULL && !mpAnmCurr->animator->isPlaying()) { + mpAnmCurr = NULL; on_cmd_recv(ANIM_CMD_CANCEL); } on_cmd_recv(mCurrCmd); } + void AnmPane::on_cmd_recv(AnimCommand cmd) { if (cmd == ANIM_CMD_POINT || cmd == ANIM_CMD_LEFT) { mCurrCmd = cmd; } switch (mCurrState) { - case ANIM_STATE_IDLE: + case ANIM_STATE_IDLE: { if (cmd == ANIM_CMD_POINT) { - pAnmCurr = pAnmIn; - pAnmCurr->animator->play(); + mpAnmCurr = mpAnmIn; + mpAnmCurr->animator->play(); mPrevState = mCurrState; mCurrState = ANIM_STATE_POINT; } else if (cmd == ANIM_CMD_LEFT) { - pAnmCurr = pAnmOut; - pAnmCurr->animator->play(); + mpAnmCurr = mpAnmOut; + mpAnmCurr->animator->play(); mPrevState = mCurrState; mCurrState = ANIM_STATE_LEFT; } break; - - case ANIM_STATE_POINT: - if (cmd != ANIM_CMD_CANCEL) + } + case ANIM_STATE_POINT: { + if (cmd != ANIM_CMD_CANCEL) { break; + } - if (mCurrCmd == ANIM_CMD_POINT) + if (mCurrCmd == ANIM_CMD_POINT) { mCurrCmd = ANIM_CMD_NONE; + } mPrevState = mCurrState; mCurrState = ANIM_STATE_IDLE; break; - - case ANIM_STATE_LEFT: - if (cmd != ANIM_CMD_CANCEL) + } + case ANIM_STATE_LEFT: { + if (cmd != ANIM_CMD_CANCEL) { break; + } - if (mCurrCmd == ANIM_CMD_LEFT) + if (mCurrCmd == ANIM_CMD_LEFT) { mCurrCmd = ANIM_CMD_NONE; + } mPrevState = mCurrState; mCurrState = ANIM_STATE_IDLE; break; + } } } void AnmController::add_animation(const char* brlan, const char* group) { - layout::GroupAnimator* animator = pLytObj->bindToGroup(brlan, group, false); - nw4r::ut::List_Append(&mAnmList, new (pHeap) Anm(animator)); + layout::GroupAnimator* animator = mpLayout->bindToGroup(brlan, group, false); + nw4r::ut::List_Append(&mAnmList, new (mpHeap) Anm(animator)); } void AnmController::do_animation(int idx, int anmType, bool calc) { @@ -66,8 +72,9 @@ namespace ipl { anm->animator->setAnmType(anmType); anm->animator->play(); - if (calc) - pLytObj->calc(); + if (calc) { + mpLayout->calc(); + } } void AnmController::stop_animation(int idx) { @@ -85,7 +92,7 @@ namespace ipl { } void AnmController::add_anmpane(const char* name, Anm* anmIn, Anm* anmOut) { - nw4r::ut::List_Append(&mPaneList, new (pHeap) AnmPane(name, anmIn, anmOut)); + nw4r::ut::List_Append(&mPaneList, new (mpHeap) AnmPane(name, anmIn, anmOut)); } AnmPane* AnmController::get_anmpane(const char* name) { @@ -101,7 +108,7 @@ namespace ipl { void AnmController::clear_anmpane(const char* name) { AnmPane* pane = get_anmpane(name); - pPaneManager->initPane(pLytObj->FindPaneByName(name)); + mpGui->initPane(mpLayout->FindPaneByName(name)); if (pane->hoverCount() >= 1) { pane->on_cmd_recv(AnmPane::ANIM_CMD_LEFT); } @@ -109,34 +116,37 @@ namespace ipl { } void AnmController::set_textbox(const char* name, u32 msgId) { - nw4r::lyt::TextBox* textbox = nw4r::ut::DynamicCast(pLytObj->FindPaneByName(name)); + nw4r::lyt::TextBox* textbox = nw4r::ut::DynamicCast(mpLayout->FindPaneByName(name)); textbox->SetString(System::getMessage(msgId)); } + void AnmController::set_textbox(const char* name, const wchar_t* msg) { - nw4r::lyt::TextBox* textbox = nw4r::ut::DynamicCast(pLytObj->FindPaneByName(name)); + nw4r::lyt::TextBox* textbox = nw4r::ut::DynamicCast(mpLayout->FindPaneByName(name)); textbox->SetString(msg); } void AnmController::set_texture(const char* name, const GXTexObj& tex) { - pLytObj->FindPaneByName(name)->FindMaterialByName(name)->SetTexture(0, tex); + mpLayout->FindPaneByName(name)->FindMaterialByName(name)->SetTexture(0, tex); } void AnmController::set_visible(const char* name, bool visibility) { - pLytObj->FindPaneByName(name)->SetVisible(visibility); + mpLayout->FindPaneByName(name)->SetVisible(visibility); } + bool AnmController::get_visible(const char* name) { - return pLytObj->FindPaneByName(name)->IsVisible(); + return mpLayout->FindPaneByName(name)->IsVisible(); } void AnmController::set_translate(const char* name, const nw4r::math::VEC3& translate) { - pLytObj->FindPaneByName(name)->SetTranslate(translate); + mpLayout->FindPaneByName(name)->SetTranslate(translate); } + const nw4r::math::VEC3& AnmController::get_translate(const char* name) { - return pLytObj->FindPaneByName(name)->GetTranslate(); + return mpLayout->FindPaneByName(name)->GetTranslate(); } const nw4r::math::VEC2& AnmController::get_scale(const char* name) { - return pLytObj->FindPaneByName(name)->GetScale(); + return mpLayout->FindPaneByName(name)->GetScale(); } } // namespace scene } // namespace ipl diff --git a/src/scene/channelEdit/iplChanAppBase.cpp b/src/scene/channelEdit/iplChanAppBase.cpp index ba6081b2..70eefeb2 100644 --- a/src/scene/channelEdit/iplChanAppBase.cpp +++ b/src/scene/channelEdit/iplChanAppBase.cpp @@ -4,36 +4,9 @@ namespace ipl { namespace scene { - enum ChanAppBaseAnimIdx { - ANIM_DATA_IN = 0, // 0x00 - ANIM_DATA_OUT, // 0x01 - ANIM_SELECT_IN, // 0x02 - ANIM_SELECT_WII_IN, // 0x03 - ANIM_SELECT_WII_OUT, // 0x04 - ANIM_SELECT_WII_FLASH, // 0x05 - ANIM_SELECT_SD_IN, // 0x06 - ANIM_SELECT_SD_OUT, // 0x07 - ANIM_SELECT_SD_FLASH, // 0x08 - ANIM_ARROWS_MOVE_L, // 0x09 - ANIM_ARROWS_MOVE_R, // 0x0a - ANIM_ARROW_R_SELECT, // 0x0b - ANIM_ARROW_L_SELECT, // 0x0c - ANIM_ARROW_R_FOCUS_ON, // 0x0d - ANIM_ARROW_L_FOCUS_ON, // 0x0e - ANIM_ARROW_R_FOCUS_OFF, // 0x0f - ANIM_ARROW_L_FOCUS_OFF, // 0x10 - ANIM_ARROW_R_LOOP, // 0x11 - ANIM_ARROW_R_END, // 0x12 - ANIM_ARROW_L_END, // 0x13 - ANIM_ARROW_R_LOST, // 0x14 - ANIM_ARROW_L_LOST, // 0x15 - ANIM_ERROR_TEXT_IN, // 0x16 - ANIM_ERROR_TEXT_OUT, // 0x17 - }; - - ChanAppBase::ChanAppBase(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName) - : AnmController(heap), ::gui::EventHandler(), mState(CHANAPP_IDLE) { - pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName); + ChanAppBase::ChanAppBase(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName) + : AnmController(heap), ::gui::EventHandler(), mState(STATE_IDLE) { + mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName); add_animation("it_ObjChannelEdit_a_DataIn.brlan", "G_DataAll"); add_animation("it_ObjChannelEdit_a_DataOut.brlan", "G_DataAll"); @@ -62,7 +35,7 @@ namespace ipl { get_animation(ANIM_SELECT_WII_OUT)->animator->setAnmType(ANIM_TYPE_BACKWARD); get_animation(ANIM_SELECT_SD_OUT)->animator->setAnmType(ANIM_TYPE_BACKWARD); - pLytObj->finishBinding(); + mpLayout->finishBinding(); set_textbox("T_SelectWii_00", MESG_SAVEDATA_EDIT_WII); set_textbox("T_SelectWii_01", MESG_SAVEDATA_EDIT_WII); @@ -76,14 +49,14 @@ namespace ipl { set_visible("N_Capa_00", false); set_visible("T_Capa_00", false); - pPaneManager = new (heap) ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true); - pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt()); - pPaneManager->setAllComponentTriggerTarget(false); + mpGui = new (heap) gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true); + mpGui->createLayoutScene(*mpLayout->getNW4RLyt()); + mpGui->setAllComponentTriggerTarget(false); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_ArwR"), true); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_ArwL"), true); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_SelectWii_00"), true); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_SelectSd_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_ArwR"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_ArwL"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_SelectWii_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_SelectSd_00"), true); add_anmpane("B_ArwR", get_animation(ANIM_ARROW_R_FOCUS_ON), get_animation(ANIM_ARROW_R_FOCUS_OFF)); add_anmpane("B_ArwL", get_animation(ANIM_ARROW_L_FOCUS_ON), get_animation(ANIM_ARROW_L_FOCUS_OFF)); @@ -92,102 +65,122 @@ namespace ipl { } ChanAppBase::~ChanAppBase() { - delete pLytObj; - delete pPaneManager; + delete mpLayout; + delete mpGui; } void ChanAppBase::calc() { AnmPane* anmPane; - pLytObj->calc(); - pPaneManager->calc(); + mpLayout->calc(); + mpGui->calc(); anmPane = NULL; - while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) + while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) { anmPane->calc(); + } switch (mState) { - case CHANAPP_IDLE: + case STATE_IDLE: { break; - case CHANAPP_FADEIN1ST: + } + case STATE_FADE_IN_1ST: { on_fadein1st(); break; - case CHANAPP_FADEIN2ND: + } + case STATE_FADE_IN_2ND: { on_fadein2nd(); break; - case CHANAPP_FADEOUT: + } + case STATE_FADE_OUT: { on_fadeout(); break; - case CHANAPP_CHANGE_SD_TO_WII: + } + case STATE_CHANGE_SD_TO_WII: { on_change_sd_to_wii(); break; - case CHANAPP_CHANGE_WII_TO_SD: + } + case STATE_CHANGE_WII_TO_SD: { on_change_wii_to_sd(); break; - case CHANAPP_SCROLL_R: + } + case STATE_SCROLL_R: { on_scroll_r(); break; - case CHANAPP_SCROLL_L: + } + case STATE_SCROLL_L: { on_scroll_l(); break; - case CHANAPP_TEXT_FADEIN: + } + case STATE_TEXT_FADEIN: { on_text_fadein(); break; - case CHANAPP_TEXT_FADEOUT: + } + case STATE_TEXT_FADEOUT: { on_text_fadeout(); break; + } + default: { + break; + } } } void ChanAppBase::draw() { - pLytObj->draw(); + mpLayout->draw(); } void ChanAppBase::update() { - pPaneManager->update(); + mpGui->update(); } void ChanAppBase::anmFadein() { do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true); - mState = CHANAPP_FADEIN1ST; + mState = STATE_FADE_IN_1ST; } + void ChanAppBase::anmFadeout(bool isErr) { do_animation(ANIM_DATA_OUT, ANIM_TYPE_FORWARD, true); if (isErr) { do_animation(ANIM_ERROR_TEXT_OUT, ANIM_TYPE_FORWARD, true); } - mState = CHANAPP_FADEOUT; + mState = STATE_FADE_OUT; } void ChanAppBase::anmChangeWiitoSD() { do_animation(ANIM_SELECT_SD_FLASH, ANIM_TYPE_FORWARD, true); - mState = CHANAPP_CHANGE_WII_TO_SD; + mState = STATE_CHANGE_WII_TO_SD; } + void ChanAppBase::anmChangeSDtoWii() { do_animation(ANIM_SELECT_WII_FLASH, ANIM_TYPE_FORWARD, true); - mState = CHANAPP_CHANGE_SD_TO_WII; + mState = STATE_CHANGE_SD_TO_WII; } void ChanAppBase::anmScrollR(bool playButtonAnm) { do_animation(ANIM_ARROWS_MOVE_L, ANIM_TYPE_FORWARD, true); - if (playButtonAnm) + if (playButtonAnm) { do_animation(ANIM_ARROW_R_SELECT, ANIM_TYPE_FORWARD, true); - mState = CHANAPP_SCROLL_R; + } + mState = STATE_SCROLL_R; } + void ChanAppBase::anmScrollL(bool playButtonAnm) { do_animation(ANIM_ARROWS_MOVE_R, ANIM_TYPE_FORWARD, true); - if (playButtonAnm) + if (playButtonAnm) { do_animation(ANIM_ARROW_L_SELECT, ANIM_TYPE_FORWARD, true); - mState = CHANAPP_SCROLL_L; + } + mState = STATE_SCROLL_L; } void ChanAppBase::anmTextFadein(u32 msgId) { set_textbox("T_Error_00", msgId); do_animation(ANIM_ERROR_TEXT_IN, ANIM_TYPE_FORWARD, true); - mState = CHANAPP_TEXT_FADEIN; + mState = STATE_TEXT_FADEIN; } + void ChanAppBase::anmTextFadeout() { do_animation(ANIM_ERROR_TEXT_OUT, ANIM_TYPE_FORWARD, true); - mState = CHANAPP_TEXT_FADEOUT; + mState = STATE_TEXT_FADEOUT; } void ChanAppBase::anmArwAppear(bool arwR, bool arwL) { @@ -215,60 +208,61 @@ namespace ipl { gui::PaneComponent* paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId); const char* paneName = paneComponent->getPane()->GetName(); + controller::Interface* con = (controller::Interface*)data; + AnmPane* anmPane; switch (event) { - case ON_POINT: + case ON_POINT: { anmPane = get_anmpane(paneName); if (anmPane != NULL) { ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT); sceneChannelEdit->onPoint(anmPane); } break; - case ON_LEFT: + } + case ON_LEFT: { anmPane = get_anmpane(paneName); if (anmPane != NULL) { ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT); sceneChannelEdit->onLeft(anmPane); } break; - case ON_TRIG: - if (!((controller::Interface*)data)->downTrg(controller::BTN_INTERACT)) + } + case ON_TRIG: { + if (!con->downTrg(controller::BTN_INTERACT)) { break; + } anmPane = get_anmpane(paneName); if (anmPane != NULL) { ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT); sceneChannelEdit->onTrig(anmPane); } break; + } } } WAIT_FOR_ANIM_STATE(ChanAppBase::on_fadein1st, ANIM_DATA_IN, { do_animation(ANIM_SELECT_IN, ANIM_TYPE_FORWARD, true); - mState = CHANAPP_FADEIN2ND; + mState = STATE_FADE_IN_2ND; }); - WAIT_FOR_ANIM_STATE(ChanAppBase::on_fadein2nd, ANIM_SELECT_IN, mState = CHANAPP_IDLE); - WAIT_FOR_ANIM_STATE(ChanAppBase::on_fadeout, ANIM_DATA_OUT, mState = CHANAPP_IDLE); - WAIT_FOR_ANIM_STATE(ChanAppBase::on_change_wii_to_sd, ANIM_SELECT_SD_FLASH, mState = CHANAPP_IDLE); - WAIT_FOR_ANIM_STATE(ChanAppBase::on_change_sd_to_wii, ANIM_SELECT_WII_FLASH, mState = CHANAPP_IDLE); + WAIT_FOR_ANIM_STATE(ChanAppBase::on_fadein2nd, ANIM_SELECT_IN, mState = STATE_IDLE); + WAIT_FOR_ANIM_STATE(ChanAppBase::on_fadeout, ANIM_DATA_OUT, mState = STATE_IDLE); + WAIT_FOR_ANIM_STATE(ChanAppBase::on_change_wii_to_sd, ANIM_SELECT_SD_FLASH, mState = STATE_IDLE); + WAIT_FOR_ANIM_STATE(ChanAppBase::on_change_sd_to_wii, ANIM_SELECT_WII_FLASH, mState = STATE_IDLE); WAIT_FOR_ANIM_STATE(ChanAppBase::on_scroll_r, ANIM_ARROWS_MOVE_L, { get_animation(ANIM_ARROWS_MOVE_L)->animator->init(); - pLytObj->calc(); + mpLayout->calc(); - mState = CHANAPP_IDLE; + mState = STATE_IDLE; }); WAIT_FOR_ANIM_STATE(ChanAppBase::on_scroll_l, ANIM_ARROWS_MOVE_R, { get_animation(ANIM_ARROWS_MOVE_L)->animator->init(); - pLytObj->calc(); + mpLayout->calc(); - mState = CHANAPP_IDLE; + mState = STATE_IDLE; }); - WAIT_FOR_ANIM_STATE(ChanAppBase::on_text_fadein, ANIM_ERROR_TEXT_IN, mState = CHANAPP_IDLE); - WAIT_FOR_ANIM_STATE(ChanAppBase::on_text_fadeout, ANIM_ERROR_TEXT_OUT, mState = CHANAPP_IDLE); - - // void ChanAppBase::precleanup() { - // delete pLytObj; - // delete pPaneManager; - // } + WAIT_FOR_ANIM_STATE(ChanAppBase::on_text_fadein, ANIM_ERROR_TEXT_IN, mState = STATE_IDLE); + WAIT_FOR_ANIM_STATE(ChanAppBase::on_text_fadeout, ANIM_ERROR_TEXT_OUT, mState = STATE_IDLE); } // namespace scene } // namespace ipl diff --git a/src/scene/channelEdit/iplChanAppBox.cpp b/src/scene/channelEdit/iplChanAppBox.cpp index d382127b..43fc4a00 100644 --- a/src/scene/channelEdit/iplChanAppBox.cpp +++ b/src/scene/channelEdit/iplChanAppBox.cpp @@ -4,66 +4,58 @@ namespace ipl { namespace scene { - enum SavedataBoxAnimIdx { - ANIM_DATA_IN = 0x0, // 0x0 - ANIM_DATA_OUT = 0x1, // 0x1 - ANIM_DATA_FOCUS_IN = 0x2, // 0x2 - ANIM_DATA_FOCUS_OUT = 0x3, // 0x3 - }; + DECOMP_FORCE_LITERAL(iplChanAppBox_cpp, 0.5f); + DECOMP_FORCE_LITERAL(iplChanAppBox_cpp, 2.0f); // FIXME: Figure out how to do this in a less fakematch-y way void SAVEDATA_BOX_floatHoisting(u32 in) { - f32 a = 0.5f; - f32 b = 2.0f; f32 c = in; } - ChanAppBox::ChanAppBox(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName) - : AnmController(heap), ::gui::EventHandler(), mState(BOX_STATE_HIDDEN), pThumbnail(NULL), pTextBalloon(NULL), - mTextBalloonInitialized(false) { - pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName); + ChanAppBox::ChanAppBox(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName) + : AnmController(heap), ::gui::EventHandler(), mState(STATE_HIDDEN), mpThumbnail(NULL), mpBalloon(NULL), mbInitBalloon(false) { + mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName); add_animation("it_ObjChannelEdit_b_SaveDataIn.brlan", "G_Data"); add_animation("it_ObjChannelEdit_b_SaveDataOut.brlan", "G_Data"); add_animation("it_ObjChannelEdit_b_SaveDataFoucusIn.brlan", "G_Data"); add_animation("it_ObjChannelEdit_b_SaveDataFoucusOut.brlan", "G_Data"); - pLytObj->finishBinding(); + mpLayout->finishBinding(); set_visible("N_Data16x9", false); set_visible("N_Data4x3", false); - pPaneManager = new ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true); - pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt()); - pPaneManager->setAllComponentTriggerTarget(false); + mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true); + mpGui->createLayoutScene(*mpLayout->getNW4RLyt()); + mpGui->setAllComponentTriggerTarget(false); if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) { - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Data_01"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Data_01"), true); add_anmpane("B_Data_01", get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT)); } else { - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Data_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Data_00"), true); add_anmpane("B_Data_00", get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT)); } } - // static wchar_t CORRUPT_TITLE[] = L"???"; - ChanAppBox::~ChanAppBox() { - delete pLytObj; - delete pPaneManager; + delete mpLayout; + delete mpGui; } void ChanAppBox::calc() { AnmPane* anmPane; - pLytObj->calc(); - pPaneManager->calc(); + mpLayout->calc(); + mpGui->calc(); anmPane = NULL; - while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != 0) + while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) { anmPane->calc(); + } - if (mState != BOX_STATE_HIDDEN && pThumbnail != NULL && pThumbnail->getLytObj() != NULL) { + if (mState != STATE_HIDDEN && mpThumbnail != NULL && mpThumbnail->getLytObj() != NULL) { nw4r::ut::Rect rect4x3; System::getProjectionRect4x3(&rect4x3); nw4r::ut::Rect rect16x9; @@ -78,10 +70,10 @@ namespace ipl { translate.x *= widescreenScale; } - pThumbnail->getLytObj()->GetRootPane()->SetTranslate(translate); - pThumbnail->calc(); + mpThumbnail->getLytObj()->GetRootPane()->SetTranslate(translate); + mpThumbnail->calc(); - nw4r::math::VEC2 scale = pThumbnail->getLytObj()->GetRootPane()->GetScale(); + nw4r::math::VEC2 scale = mpThumbnail->getLytObj()->GetRootPane()->GetScale(); if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) { scale *= get_scale("N_Atari16x9").x; scale *= get_scale("N_Data_01").x; @@ -89,19 +81,22 @@ namespace ipl { scale *= get_scale("N_Atari4x3").x; scale *= get_scale("N_Data_00").x; } - pThumbnail->getLytObj()->GetRootPane()->SetScale(scale); + mpThumbnail->getLytObj()->GetRootPane()->SetScale(scale); } switch (mState) { - case BOX_STATE_HIDDEN: - case BOX_STATE_IDLE: + case STATE_HIDDEN: + case STATE_IDLE: { break; - case BOX_STATE_FADEIN: + } + case STATE_FADE_IN: { on_fadein(); break; - case BOX_STATE_FADEOUT: + } + case STATE_FADE_OUT: { on_fadeout(); break; + } } } @@ -109,35 +104,35 @@ namespace ipl { {38.400000f, 28.800001f}, {51.000004f, 28.800001f}, }; + void ChanAppBox::draw() { - if (mState == BOX_STATE_HIDDEN) + if (mState == STATE_HIDDEN) return; - pLytObj->draw(); + mpLayout->draw(); set_visible("DataBaseCover_00", false); set_visible("DataBaseCover_01", false); ChannelEdit* sceneChannelEdit = get_channel_edit(); - if (sceneChannelEdit->getState() == ChannelEdit::CHANEDIT_STATE_ON_SCROLL_R || - sceneChannelEdit->getState() == ChannelEdit::CHANEDIT_STATE_ON_SCROLL_L) + if (sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_R || sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_L) return; - if (mState == BOX_STATE_FADEIN) + if (mState == STATE_FADE_IN) return; - if (mState == BOX_STATE_FADEOUT) + if (mState == STATE_FADE_OUT) return; if (!get_visible("N_Data4x3") && !get_visible("N_Data16x9")) return; - if (pThumbnail == NULL) + if (mpThumbnail == NULL) { return; - if (pThumbnail->getLytObj() == NULL) + } + if (mpThumbnail->getLytObj() == NULL) { return; + } - f32 fScisHalfW; - f32 fScisHalfH; - fScisHalfW = offsets[SCGetAspectRatio()][0]; - fScisHalfH = offsets[SCGetAspectRatio()][1]; + f32 fScisHalfW = offsets[SCGetAspectRatio()][0]; + f32 fScisHalfH = offsets[SCGetAspectRatio()][1]; nw4r::ut::Rect projRect; System::getProjectionRect(&projRect); @@ -147,7 +142,7 @@ namespace ipl { u32 fbW = renderModeObj->fbWidth; u32 efbH = renderModeObj->efbHeight; - nw4r::math::VEC3 translate = pThumbnail->getLytObj()->GetRootPane()->GetTranslate(); + nw4r::math::VEC3 translate = mpThumbnail->getLytObj()->GetRootPane()->GetTranslate(); f32 scisL = (translate.x - fScisHalfW) * (fbW / projRect.GetWidth()) + fbW / 2.f; f32 scisT = efbH / 2.f - translate.y - fScisHalfH; @@ -155,22 +150,22 @@ namespace ipl { f32 scisH = fScisHalfH * 2.f; GXSetScissor(scisL, scisT, scisW, scisH); - pThumbnail->getLytObj()->GetRootPane()->CalculateMtx(*pLytObj->getDrawInfo()); - pThumbnail->draw(); + mpThumbnail->getLytObj()->GetRootPane()->CalculateMtx(*mpLayout->getDrawInfo()); + mpThumbnail->draw(); if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) { set_visible("DataBaseCover_01", true); - pLytObj->draw("DataBaseCover_01"); + mpLayout->draw("DataBaseCover_01"); } else { set_visible("DataBaseCover_00", true); - pLytObj->draw("DataBaseCover_00"); + mpLayout->draw("DataBaseCover_00"); } GXSetScissor(0, 0, System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight); } void ChanAppBox::update() { - pPaneManager->update(); + mpGui->update(); } void ChanAppBox::anmFadein() { @@ -182,24 +177,22 @@ namespace ipl { set_visible("N_Data4x3", true); } do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true); - mState = BOX_STATE_FADEIN; + mState = STATE_FADE_IN; } void ChanAppBox::anmFadeout() { - if (pTextBalloon != NULL) - pTextBalloon->terminate(); + if (mpBalloon != NULL) { + mpBalloon->terminate(); + } do_animation(ANIM_DATA_OUT, ANIM_TYPE_FORWARD, true); - mState = BOX_STATE_FADEOUT; + mState = STATE_FADE_OUT; } void ChanAppBox::onEvent(u32 compId, u32 event, void* data) { - const char* paneName; - gui::PaneComponent* paneComponent; - // ChannelEdit* sceneChannelEdit; - // AnmPane* anmPane; + gui::PaneComponent* paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId); + const char* paneName = paneComponent->getPane()->GetName(); - paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId); - paneName = paneComponent->getPane()->GetName(); + controller::Interface* con = (controller::Interface*)data; switch (event) { case ON_POINT: { @@ -210,69 +203,73 @@ namespace ipl { anmPane->incHoverCount(); get_channel_edit()->onPoint(anmPane); - if (pTextBalloon == NULL || pThumbnail == NULL || mTextBalloonInitialized) + if (mpBalloon == NULL || mpThumbnail == NULL || mbInitBalloon) { break; + } - mTextBalloonInitialized = true; - if (pThumbnail->getIsCorrupt()) { - pTextBalloon->init(L"???"); + mbInitBalloon = true; + if (mpThumbnail->getIsCorrupt()) { + mpBalloon->init(L"???"); } else { - if (pThumbnail->getMatchesTmpTitle()) { - pTextBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU)); + if (mpThumbnail->getMatchesTmpTitle()) { + mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU)); } else { - pTextBalloon->init(pThumbnail->getTitle(0)); + mpBalloon->init(mpThumbnail->getTitle(0)); } } - pTextBalloon->fadein(); + mpBalloon->fadein(); break; } - case ON_MOVE: { AnmPane* anmPane = get_anmpane(paneName); - if (anmPane == NULL) + if (anmPane == NULL) { break; - if (pTextBalloon == NULL || pThumbnail == NULL) + } + if (mpBalloon == NULL || mpThumbnail == NULL) { break; - if (mTextBalloonInitialized) + } + if (mbInitBalloon) { break; + } - mTextBalloonInitialized = true; - if (pThumbnail->getIsCorrupt()) { - pTextBalloon->init(L"???"); + mbInitBalloon = true; + if (mpThumbnail->getIsCorrupt()) { + mpBalloon->init(L"???"); } else { - if (pThumbnail->getMatchesTmpTitle()) { - pTextBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU)); + if (mpThumbnail->getMatchesTmpTitle()) { + mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU)); } else { - pTextBalloon->init(pThumbnail->getTitle(0)); + mpBalloon->init(mpThumbnail->getTitle(0)); } } - pTextBalloon->fadein(); + mpBalloon->fadein(); break; } - case ON_LEFT: { AnmPane* anmPane = get_anmpane(paneName); - if (anmPane == NULL) + if (anmPane == NULL) { break; + } anmPane->decHoverCount(); get_channel_edit()->onLeft(anmPane); - mTextBalloonInitialized = false; - if (pTextBalloon == NULL || pThumbnail == NULL) + mbInitBalloon = false; + if (mpBalloon == NULL || mpThumbnail == NULL) { break; + } - pTextBalloon->fadeout(); + mpBalloon->fadeout(); break; } - case ON_TRIG: { - if (!((controller::Interface*)data)->downTrg(controller::BTN_INTERACT)) + if (!con->downTrg(controller::BTN_INTERACT)) { break; + } AnmPane* anmPane = get_anmpane(paneName); - if (anmPane == NULL || pThumbnail == NULL) + if (anmPane == NULL || mpThumbnail == NULL) break; get_channel_edit()->onTrig(this); @@ -288,9 +285,9 @@ namespace ipl { clear_anmpane("B_Data_00"); } - if (pTextBalloon != NULL) { - pTextBalloon->terminate(); - mTextBalloonInitialized = false; + if (mpBalloon != NULL) { + mpBalloon->terminate(); + mbInitBalloon = false; } } @@ -298,11 +295,11 @@ namespace ipl { return (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT); } - WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadein, ANIM_DATA_IN, mState = BOX_STATE_IDLE); + WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadein, ANIM_DATA_IN, mState = STATE_IDLE); WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadeout, ANIM_DATA_OUT, { set_visible("N_Data16x9", false); set_visible("N_Data4x3", false); - mState = BOX_STATE_IDLE; + mState = STATE_IDLE; }); char ChanAppBox::s_all_pane_name[6] = "N_All"; diff --git a/src/scene/channelEdit/iplChanAppEdit.cpp b/src/scene/channelEdit/iplChanAppEdit.cpp index 08f1b4fd..d3b8aaaa 100644 --- a/src/scene/channelEdit/iplChanAppEdit.cpp +++ b/src/scene/channelEdit/iplChanAppEdit.cpp @@ -8,42 +8,18 @@ namespace ipl { namespace scene { const f32 offsets[2][2] = { - {64.000000f, 48.000000f}, - {85.000000f, 48.000000f}, + {64.f, 48.f}, + {85.f, 48.f}, }; - typedef struct { - wchar_t digits[10]; - } SCNumber; - static const SCNumber scNumber = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; - // TODO: Figure out what this might've been/why it isn't inlining void CHANAPPEDIT_dummyFunctionToKeepAConstructorStuffFromInlining(nw4r::math::VEC3& vec) { math::VEC3 end(vec); } - enum ChanAppEditAnimIdx { - ANIM_MASK_IN = 0, // 0x0 - ANIM_MASK_OUT, // 0x1 - ANIM_COPY_IN, // 0x2 - ANIM_COPY_OUT, // 0x3 - ANIM_COPY_FLASH, // 0x4 - ANIM_DEL_IN, // 0x5 - ANIM_DEL_OUT, // 0x6 - ANIM_DEL_FLASH, // 0x7 - ANIM_SELECT_OUT, // 0x8 - ANIM_TEXT_FADEIN, // 0x9 - ANIM_TEXT_FADEOUT, // 0xa - ANIM_WAIT, // 0xb - ANIM_COVER_IN, // 0xc - ANIM_MOVE_IN, // 0xd - ANIM_MOVE_OUT, // 0xe - ANIM_MOVE_FLASH, // 0xf - }; - - ChanAppEdit::ChanAppEdit(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName) - : AnmController(heap), ::gui::EventHandler(), mState(EDIT_STATE_IDLE), mLinearInterp(), pChanAppBox(NULL), mMsgId(0), pThumbnail(NULL) { - pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName); + ChanAppEdit::ChanAppEdit(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName) + : AnmController(heap), ::gui::EventHandler(), mState(STATE_IDLE), mLinearInterp(), mpChanAppBox(NULL), mMsgId(0), mpThumbnail(NULL) { + mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName); add_animation("mn_ChannelDetail_a_SeenIn.brlan", "G_Mask"); add_animation("mn_ChannelDetail_a_SeenOut.brlan", "G_Mask"); @@ -62,7 +38,7 @@ namespace ipl { add_animation("mn_ChannelDetail_a_MoveFoucusOut.brlan", "G_Move"); add_animation("mn_ChannelDetail_a_MoveFlash.brlan", "G_MoveFlash"); - pLytObj->finishBinding(); + mpLayout->finishBinding(); set_textbox("T_Move_00", MESG_SAVEDATA_EDIT_MOVE); set_textbox("T_Copy_00", MESG_SAVEDATA_EDIT_COPY); set_textbox("T_Del_00", MESG_SAVEDATA_EDIT_DEL); @@ -87,13 +63,13 @@ namespace ipl { set_visible("T_Move_off", false); set_visible("T_Move_off_00", false); - pPaneManager = new ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true); - pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt()); - pPaneManager->setAllComponentTriggerTarget(false); + mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true); + mpGui->createLayoutScene(*mpLayout->getNW4RLyt()); + mpGui->setAllComponentTriggerTarget(false); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Move_00"), true); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Copy_00"), true); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Del_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Move_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Copy_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Del_00"), true); add_anmpane("B_Move_00", get_animation(ANIM_MOVE_IN), get_animation(ANIM_MOVE_OUT)); add_anmpane("B_Copy_00", get_animation(ANIM_COPY_IN), get_animation(ANIM_COPY_OUT)); @@ -101,86 +77,100 @@ namespace ipl { } ChanAppEdit::~ChanAppEdit() { - delete pLytObj; - delete pPaneManager; + delete mpLayout; + delete mpGui; } void ChanAppEdit::calc() { AnmPane* anmPane; - pLytObj->calc(); - pPaneManager->calc(); + mpLayout->calc(); + mpGui->calc(); anmPane = NULL; while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) anmPane->calc(); - if (pThumbnail != NULL) - pThumbnail->calc(); + if (mpThumbnail != NULL) + mpThumbnail->calc(); switch (mState) { - case EDIT_STATE_IDLE: + case STATE_IDLE: { break; - case EDIT_STATE_FADEIN: + } + case STATE_FADEIN: { on_fadein(); break; - case EDIT_STATE_FADEOUT: + } + case STATE_FADEOUT: { on_fadeout(); break; - case EDIT_STATE_HIDE_BTN0_DIALOG: + } + case STATE_HIDE_BTN0_DIALOG: { on_hide_btn0_dialog(); break; - case EDIT_STATE_SHOW_BTN2_DIALOG1ST: + } + case STATE_SHOW_BTN2_DIALOG1ST: { on_show_btn2_dialog1st(); break; - case EDIT_STATE_SHOW_BTN2_DIALOG2ND: + } + case STATE_SHOW_BTN2_DIALOG2ND: { on_show_btn2_dialog2nd(); break; - case EDIT_STATE_SELECT_FADEIN: + } + case STATE_SELECT_FADEIN: { on_select_fadein(); break; - case EDIT_STATE_SELECT_FADEOUT1ST: + } + case STATE_SELECT_FADEOUT1ST: { on_select_fadeout1st(); break; - case EDIT_STATE_SELECT_FADEOUT2ND: + } + case STATE_SELECT_FADEOUT2ND: { on_select_fadeout2nd(); break; - case EDIT_STATE_TEXT_FADEIN: + } + case STATE_TEXT_FADEIN: { on_text_fadein(); break; - case EDIT_STATE_TEXT_FADEOUT: + } + case STATE_TEXT_FADEOUT: { on_text_fadeout(); break; - case EDIT_STATE_TRIG_DEL: + } + case STATE_TRIG_DEL: { on_trig_del(); break; - case EDIT_STATE_CLEAR: + } + case STATE_CLEAR: { on_clear(); break; + } } return; } void ChanAppEdit::draw() { - pLytObj->draw(); + mpLayout->draw(); // set_visible("DataBaseCover_00", false); // set_visible("DataBaseCover_01", false); // ChannelEdit* sceneChannelEdit = get_channel_edit(); - // if (sceneChannelEdit->getState() == ChannelEdit::CHANEDIT_STATE_ON_UNK_x05 || - // sceneChannelEdit->getState() == ChannelEdit::CHANEDIT_STATE_ON_UNK_x06) + // if (sceneChannelEdit->getState() == ChannelEdit::CHANSTATE_ON_UNK_x05 || + // sceneChannelEdit->getState() == ChannelEdit::CHANSTATE_ON_UNK_x06) // return; - if (!(mState != EDIT_STATE_FADEIN || get_animation(ANIM_MASK_IN)->animator->getCurrentFrame() > 15)) + if (!(mState != STATE_FADEIN || get_animation(ANIM_MASK_IN)->animator->getCurrentFrame() > 15)) { return; - if (pThumbnail == NULL) + } + if (mpThumbnail == NULL) { return; - if (pThumbnail->getLytObj() == NULL) + } + if (mpThumbnail->getLytObj() == NULL) { return; + } - f32 fScisHalfW; - f32 fScisHalfH; - fScisHalfW = offsets[SCGetAspectRatio()][0]; - fScisHalfH = offsets[SCGetAspectRatio()][1]; + f32 fScisHalfW = offsets[SCGetAspectRatio()][0]; + f32 fScisHalfH = offsets[SCGetAspectRatio()][1]; nw4r::ut::Rect projRect; System::getProjectionRect(&projRect); @@ -190,7 +180,7 @@ namespace ipl { u32 fbW = renderModeObj->fbWidth; u32 efbH = renderModeObj->efbHeight; - nw4r::math::VEC3 translate = pThumbnail->getLytObj()->GetRootPane()->GetTranslate(); + nw4r::math::VEC3 translate = mpThumbnail->getLytObj()->GetRootPane()->GetTranslate(); f32 scisL = (translate.x - fScisHalfW) * (fbW / projRect.GetWidth()) + fbW / 2.f; f32 scisT = efbH / 2.f - translate.y - fScisHalfH; @@ -198,20 +188,20 @@ namespace ipl { f32 scisH = fScisHalfH * 2.f; GXSetScissor(scisL, scisT, scisW, scisH); - pThumbnail->getLytObj()->GetRootPane()->CalculateMtx(*pLytObj->getDrawInfo()); - pThumbnail->draw(); + mpThumbnail->getLytObj()->GetRootPane()->CalculateMtx(*mpLayout->getDrawInfo()); + mpThumbnail->draw(); GXSetScissor(0, 0, System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight); - pLytObj->draw(SCGetAspectRatio() == SC_ASPECT_RATIO_16x9 ? "N_Mask16x9" : "N_Mask4x3"); + mpLayout->draw(SCGetAspectRatio() == SC_ASPECT_RATIO_16x9 ? "N_Mask16x9" : "N_Mask4x3"); } void ChanAppEdit::update() { - pPaneManager->update(); + mpGui->update(); } void ChanAppEdit::anmFadein(ChanAppBox* box) { - pChanAppBox = box; + mpChanAppBox = box; set_visible("Mask_00", true); set_visible("N_Window", true); set_visible("Cover_16x9_del", false); @@ -252,25 +242,31 @@ namespace ipl { set_visible("BlockLine", true); } - pThumbnail = new (System::getMem2App(), 4) Thumbnail(); + mpThumbnail = new (System::getMem2App(), 4) Thumbnail(); - pThumbnail->create(box->getThumbnail()->getLytHeapBufRef()); + mpThumbnail->create(box->getThumbnail()->getLytHeapBufRef()); - pThumbnail->getLytObj()->GetRootPane()->SetTranslate( + mpThumbnail->getLytObj()->GetRootPane()->SetTranslate( get_translate(SCGetAspectRatio() == SC_ASPECT_RATIO_16x9 ? "N_Atari16x9" : "N_Atari4x3")); u32 blockCount = box->getThumbnail()->getBlockCount(); - SCNumber scNumberData = scNumber; + + const wchar_t scNumber[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; + wchar_t blockTextDigits[5] = L""; wchar_t blockText[5] = L""; - blockTextDigits[0] = scNumberData.digits[blockCount / 1000]; - blockTextDigits[1] = scNumberData.digits[blockCount / 100 % 10]; - blockTextDigits[2] = scNumberData.digits[blockCount / 10 % 10]; - blockTextDigits[3] = scNumberData.digits[blockCount % 10]; + + blockTextDigits[0] = scNumber[blockCount / 1000]; + blockTextDigits[1] = scNumber[blockCount / 100 % 10]; + blockTextDigits[2] = scNumber[blockCount / 10 % 10]; + blockTextDigits[3] = scNumber[blockCount % 10]; + int zeroOffset; - for (zeroOffset = 0; zeroOffset < 3; zeroOffset++) - if (blockTextDigits[zeroOffset] != L'0') + for (zeroOffset = 0; zeroOffset < 3; zeroOffset++) { + if (blockTextDigits[zeroOffset] != L'0') { break; + } + } wcscpy(blockText, blockTextDigits + zeroOffset); set_textbox("T_Block_00", blockText); @@ -283,34 +279,38 @@ namespace ipl { change_button_text(MESG_CMN_BACK_ALT_3); AnmPane* anmPane = NULL; - while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) + while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) { clear_anmpane(anmPane->getName()); + } do_animation(ANIM_MASK_IN, ANIM_TYPE_FORWARD, true); - mState = EDIT_STATE_FADEIN; + mState = STATE_FADEIN; } + void ChanAppEdit::anmFadeout() { - pChanAppBox = NULL; + mpChanAppBox = NULL; change_button_text(MESG_CMN_BACK_ALT); - if (pThumbnail != NULL) { - delete pThumbnail; - pThumbnail = NULL; + if (mpThumbnail != NULL) { + delete mpThumbnail; + mpThumbnail = NULL; } do_animation(ANIM_MASK_OUT, ANIM_TYPE_FORWARD, true); - mState = EDIT_STATE_FADEOUT; + mState = STATE_FADEOUT; } void ChanAppEdit::anmHideBtn0Dialog() { System::getDialog()->terminate(); - mState = EDIT_STATE_HIDE_BTN0_DIALOG; + mState = STATE_HIDE_BTN0_DIALOG; } + void ChanAppEdit::anmShowBtn0Dialog(u32 msgId, bool dontWait, bool showLoading) { System::getDialog()->callBtn0(msgId, dontWait ? 0 : 180, showLoading); } + void ChanAppEdit::anmShowS2Btn2Dialog(u32 msgId) { set_textbox("T_Message_00", msgId); - mState = EDIT_STATE_SHOW_BTN2_DIALOG1ST; + mState = STATE_SHOW_BTN2_DIALOG1ST; } void ChanAppEdit::anmSelectFadein() { @@ -320,20 +320,21 @@ namespace ipl { change_button_text(MESG_CMN_BACK_ALT_3); AnmPane* anmPane = NULL; - while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) + while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) { clear_anmpane(anmPane->getName()); + } - mState = EDIT_STATE_SELECT_FADEIN; + mState = STATE_SELECT_FADEIN; } void ChanAppEdit::anmSelectFadeout(u32 msgId) { set_textbox("T_Message_00", msgId); - mState = EDIT_STATE_SELECT_FADEOUT1ST; + mState = STATE_SELECT_FADEOUT1ST; } void ChanAppEdit::anmTextFadein(u32 msgId) { mMsgId = msgId; do_animation(ANIM_TEXT_FADEIN, ANIM_TYPE_FORWARD, true); - mState = EDIT_STATE_TEXT_FADEIN; + mState = STATE_TEXT_FADEIN; } void ChanAppEdit::anmTextFadeout() { do_animation(ANIM_TEXT_FADEOUT, ANIM_TYPE_FORWARD, true); @@ -342,12 +343,12 @@ namespace ipl { sceneSettingButton->reserve(SettingButton::CMD_SET_TEXT, MESG_CMN_BACK_ALT); sceneSettingButton->reserve(SettingButton::CMD_SHOW_BTN, 0); - if (pThumbnail != NULL) { - delete pThumbnail; - pThumbnail = NULL; + if (mpThumbnail != NULL) { + delete mpThumbnail; + mpThumbnail = NULL; } - mState = EDIT_STATE_TEXT_FADEOUT; + mState = STATE_TEXT_FADEOUT; } void ChanAppEdit::anmStartWaitAnm() { @@ -372,13 +373,13 @@ namespace ipl { set_visible(SCGetAspectRatio() == SC_ASPECT_RATIO_16x9 ? "Cover_16x9_del" : "Cover_4x3_del", true); do_animation(ANIM_COVER_IN, ANIM_TYPE_FORWARD, true); - mState = EDIT_STATE_CLEAR; + mState = STATE_CLEAR; } void ChanAppEdit::clearAllThumbnails() { - if (pThumbnail != NULL) { - delete pThumbnail; - pThumbnail = NULL; + if (mpThumbnail != NULL) { + delete mpThumbnail; + mpThumbnail = NULL; } } @@ -386,47 +387,51 @@ namespace ipl { gui::PaneComponent* paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId); const char* paneName = paneComponent->getPane()->GetName(); - if (mState == EDIT_STATE_TRIG_DEL) + controller::Interface* con = (controller::Interface*)data; + + if (mState == STATE_TRIG_DEL) { return; + } AnmPane* anmPane; switch (event) { - case ON_POINT: + case ON_POINT: { anmPane = get_anmpane(paneName); if (anmPane != NULL) { - ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT); - sceneChannelEdit->onPoint(anmPane); + ((ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT))->onPoint(anmPane); } break; - case ON_LEFT: + } + case ON_LEFT: { anmPane = get_anmpane(paneName); if (anmPane != NULL) { ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT); sceneChannelEdit->onLeft(anmPane); } break; - case ON_TRIG: - if (!((controller::Interface*)data)->downTrg(controller::BTN_INTERACT)) + } + case ON_TRIG: { + if (!con->downTrg(controller::BTN_INTERACT)) { break; + } anmPane = get_anmpane(paneName); if (anmPane != NULL) { if (strcmp(anmPane->getName(), "B_Copy_00") == 0) { snd::getSystem()->startSE("WIPL_SE_DECIDE"); do_animation(ANIM_COPY_FLASH, ANIM_TYPE_FORWARD, true); - ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT); - sceneChannelEdit->onTrigCopy(); + ((ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT))->onTrigCopy(); } else if (strcmp(anmPane->getName(), "B_Move_00") == 0) { snd::getSystem()->startSE("WIPL_SE_DECIDE"); do_animation(ANIM_MOVE_FLASH, ANIM_TYPE_FORWARD, true); - ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT); - sceneChannelEdit->onTrigMove(); - } else if (strcmp(anmPane->getName(), "B_Del_00") == 0 && mState != EDIT_STATE_TRIG_DEL) { + ((ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT))->onTrigMove(); + } else if (strcmp(anmPane->getName(), "B_Del_00") == 0 && mState != STATE_TRIG_DEL) { snd::getSystem()->startSE("WIPL_SE_DECIDE"); do_animation(ANIM_DEL_FLASH, ANIM_TYPE_FORWARD, true); - mState = EDIT_STATE_TRIG_DEL; + mState = STATE_TRIG_DEL; } } break; + } } } @@ -438,53 +443,57 @@ namespace ipl { switch (msgId) { case MESG_CMN_BACK_ALT_3: - case MESG_CMN_BACK_ALT: + case MESG_CMN_BACK_ALT: { sceneSettingButton->setSoundType(SettingButton::CANCEL); break; - - case MESG_CMN_OK: + } + case MESG_CMN_OK: { sceneSettingButton->setSoundType(SettingButton::DECIDE); break; + } } } void ChanAppEdit::on_fadein() { mLinearInterp.calc(); set_translate("N_Window", mLinearInterp.get()); - if (is_animation(ANIM_MASK_IN)) + if (is_animation(ANIM_MASK_IN)) { return; - if (mLinearInterp.isPlaying()) + } + if (mLinearInterp.isPlaying()) { return; - mState = EDIT_STATE_IDLE; + } + mState = STATE_IDLE; } - WAIT_FOR_ANIM_STATE(ChanAppEdit::on_fadeout, ANIM_MASK_OUT, mState = EDIT_STATE_IDLE); + + WAIT_FOR_ANIM_STATE(ChanAppEdit::on_fadeout, ANIM_MASK_OUT, mState = STATE_IDLE); void ChanAppEdit::on_hide_btn0_dialog() { if (System::getDialog()->getLastResult() != DialogWindow::RESULT_PROGRESS && System::getDialog()->getLastResult() != DialogWindow::RESULT_TERMINATED) return; - mState = EDIT_STATE_IDLE; + mState = STATE_IDLE; } WAIT_FOR_ANIM_STATE(ChanAppEdit::on_show_btn2_dialog1st, ANIM_COPY_FLASH, { do_animation(ANIM_SELECT_OUT, ANIM_TYPE_FORWARD, true); SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); sceneSettingButton->hideBtn(); - mState = EDIT_STATE_SHOW_BTN2_DIALOG2ND; + mState = STATE_SHOW_BTN2_DIALOG2ND; }); WAIT_FOR_ANIM_STATE(ChanAppEdit::on_show_btn2_dialog2nd, ANIM_SELECT_OUT, { System::getDialog()->callS2Btn2(MESG_CMN_NO, MESG_CMN_YES, true); - mState = EDIT_STATE_IDLE; + mState = STATE_IDLE; }); - WAIT_FOR_ANIM_STATE(ChanAppEdit::on_select_fadein, ANIM_SELECT_OUT, mState = EDIT_STATE_IDLE); + WAIT_FOR_ANIM_STATE(ChanAppEdit::on_select_fadein, ANIM_SELECT_OUT, mState = STATE_IDLE); WAIT_FOR_ANIM_STATE(ChanAppEdit::on_select_fadeout1st, ANIM_COPY_FLASH, { do_animation(ANIM_SELECT_OUT, ANIM_TYPE_FORWARD, true); change_button_text(MESG_CMN_OK); - mState = EDIT_STATE_SELECT_FADEOUT2ND; + mState = STATE_SELECT_FADEOUT2ND; }); - WAIT_FOR_ANIM_STATE(ChanAppEdit::on_select_fadeout2nd, ANIM_SELECT_OUT, mState = EDIT_STATE_IDLE); + WAIT_FOR_ANIM_STATE(ChanAppEdit::on_select_fadeout2nd, ANIM_SELECT_OUT, mState = STATE_IDLE); void ChanAppEdit::on_text_fadein() { if (get_animation(ANIM_TEXT_FADEIN)->animator->getCurrentFrame() >= 20.0f) { @@ -495,20 +504,20 @@ namespace ipl { return; stop_animation(ANIM_TEXT_FADEIN); - mState = EDIT_STATE_IDLE; + mState = STATE_IDLE; } - WAIT_FOR_ANIM_STATE(ChanAppEdit::on_text_fadeout, ANIM_TEXT_FADEOUT, mState = EDIT_STATE_IDLE); + WAIT_FOR_ANIM_STATE(ChanAppEdit::on_text_fadeout, ANIM_TEXT_FADEOUT, mState = STATE_IDLE); WAIT_FOR_ANIM_STATE(ChanAppEdit::on_trig_del, ANIM_DEL_FLASH, { - mState = EDIT_STATE_IDLE; + mState = STATE_IDLE; ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT); sceneChannelEdit->onTrigDel(); }); WAIT_FOR_ANIM_STATE(ChanAppEdit::on_clear, ANIM_COVER_IN, { - if (pThumbnail != NULL) { - delete pThumbnail; - pThumbnail = NULL; + if (mpThumbnail != NULL) { + delete mpThumbnail; + mpThumbnail = NULL; } - mState = EDIT_STATE_IDLE; + mState = STATE_IDLE; }); } // namespace scene } // namespace ipl diff --git a/src/scene/channelEdit/iplChannelEdit.cpp b/src/scene/channelEdit/iplChannelEdit.cpp index cdae770f..c7309396 100644 --- a/src/scene/channelEdit/iplChannelEdit.cpp +++ b/src/scene/channelEdit/iplChannelEdit.cpp @@ -8,12 +8,6 @@ namespace ipl { namespace scene { - typedef struct { - wchar_t digits[10]; - } SCNumber; - static const SCNumber scNumber = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; - static const SCNumber scNumber2 = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; - // clang-format off static const char* panes[3][15] = { "N_Data_a_00", "N_Data_a_01", "N_Data_a_02", "N_Data_a_03", "N_Data_a_04", @@ -31,16 +25,17 @@ namespace ipl { // clang-format on ChannelEdit::ChannelEdit(EGG::Heap* heap) - : scene::Base(heap), mState(CHANEDIT_STATE_ON_NORMAL), pChanAppBase(NULL), pChanAppEdit(NULL), pNandSDCardManager(NULL), - mPage(CHANEDIT_PAGE_WII), pCurrBox(NULL), mPageOffset(0), mSdState(NandSDWorker::SD_STATE_INITIAL), mArwRVisible(false), - mArwLVisible(false), mProcessType(CHANEDIT_PROC_NUL), mActionIntent(CHANEDIT_INTENT_NONE) { + : scene::Base(heap), mState(STATE_ON_NORMAL), mpChanAppBase(NULL), mpChanAppEdit(NULL), mpNandSDCardManager(NULL), mPage(PAGE_WII), + mpCurrentBox(NULL), mPageOffset(0), mSDState(NandSDWorker::SD_STATE_INITIAL), mArwRVisible(false), mArwLVisible(false), + mProcessType(PROC_NUL), mActionIntent(INTENT_NONE) { System::stopReceiveSchedule(); nw4r::ut::List_Init(&mChanAppBoxList, offsetof(ChanAppBox, mLink)); } + ChannelEdit::~ChannelEdit() { - delete pChanAppBase; - delete pChanAppEdit; - delete pNandSDCardManager; + delete mpChanAppBase; + delete mpChanAppEdit; + delete mpNandSDCardManager; ChanAppBox* currBox = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, NULL); while (currBox != NULL) { @@ -49,18 +44,18 @@ namespace ipl { currBox = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, NULL); } - for (int i = 0; i < 15; i++) { - delete mTextBalloonArr[i]; + for (int i = 0; i < MAX_BALLOONS; i++) { + delete mpBalloons[i]; } } void ChannelEdit::prepare() { System::getBS2Manager()->abort(); - pChanEditLytFile = System::getNandManager()->readLayoutAsync(getSceneHeap(), "chanEdit.ash"); - pBalloonLytFile = System::getNandManager()->readLayoutAsync(getSceneHeap(), "balloon.ash"); - pCorruptIconFile = System::getNandManager()->readAsync(getSceneHeap(), "corrupt_icon.ash"); - pTmptitleIconFile = System::getNandManager()->readAsync(getSceneHeap(), "tmptitle_icon.ash"); + mpLayoutFile = System::getNandManager()->readLayoutAsync(getSceneHeap(), "chanEdit.ash"); + mpBalloonFile = System::getNandManager()->readLayoutAsync(getSceneHeap(), "balloon.ash"); + mpCorruptIconFile = System::getNandManager()->readAsync(getSceneHeap(), "corrupt_icon.ash"); + mpTmpTitleIconFile = System::getNandManager()->readAsync(getSceneHeap(), "tmptitle_icon.ash"); } void ChannelEdit::create() { @@ -77,175 +72,207 @@ namespace ipl { ES_SetUid(SYSMENU_TITLE_ID); - pChanAppBase = new ChanAppBase(System::getMem2App(), pChanEditLytFile, "arc", "it_ObjChannelEdit_a.brlyt"); - pChanAppBase->anmFadein(); + mpChanAppBase = new ChanAppBase(System::getMem2App(), mpLayoutFile, "arc", "it_ObjChannelEdit_a.brlyt"); + mpChanAppBase->anmFadein(); for (int i = 0; i < 45; i++) { - nw4r::ut::List_Append(&mChanAppBoxList, new ChanAppBox(System::getMem2App(), pChanEditLytFile, "arc", "it_ObjChannelEdit_b.brlyt")); + nw4r::ut::List_Append(&mChanAppBoxList, new ChanAppBox(System::getMem2App(), mpLayoutFile, "arc", "it_ObjChannelEdit_b.brlyt")); } - pChanAppEdit = new ChanAppEdit(System::getMem2App(), pChanEditLytFile, "arc", "mn_ChannelDetail_a.brlyt"); + mpChanAppEdit = new ChanAppEdit(System::getMem2App(), mpLayoutFile, "arc", "mn_ChannelDetail_a.brlyt"); - pNandSDCardManager = new (System::getMem2App(), 32) NandSDCardManager(NandSDCardManager::NAND_MANAGER_MODE_APPS); + mpNandSDCardManager = new (System::getMem2App(), 32) NandSDCardManager(NandSDCardManager::NAND_MODE_APPS); - for (int i = 0; i < 15; i++) { - nw4r::lyt::Pane* currPane = pChanAppBase->getLytObject()->FindPaneByName(panes[1][i]); + for (int i = 0; i < MAX_BALLOONS; i++) { + nw4r::lyt::Pane* currPane = mpChanAppBase->getLytObject()->FindPaneByName(panes[1][i]); nw4r::math::VEC3 translation(0, 0, 0); PSMTXMultVec(currPane->GetGlobalMtx(), translation, translation); translation.y -= 55.0f; - mTextBalloonArr[i] = new TextBalloon(getSceneHeap(), pBalloonLytFile, "arc", "my_IplTopBalloon_a.brlyt", translation, 90.f, 60.f); + mpBalloons[i] = new TextBalloon(getSceneHeap(), mpBalloonFile, "arc", "my_IplTopBalloon_a.brlyt", translation, 90.f, 60.f); ChanAppBox* box = (ChanAppBox*)nw4r::ut::List_GetNth(&mChanAppBoxList, i + 15); - box->setTextBalloon(mTextBalloonArr[i]); + box->setTextBalloon(mpBalloons[i]); } send_getthumbnail_cmd(true); - mState = CHANEDIT_STATE_ON_FADEIN1ST; + mState = STATE_ON_FADEIN1ST; } void ChannelEdit::calc() { - pNandSDCardManager->calc(); + mpNandSDCardManager->calc(); - SettingSelect* sceneSettingSelect = (SettingSelect*)System::getScene(SCENE_SETTING_SELECT); - if (!sceneSettingSelect->isWaitingChild()) + if (!((SettingSelect*)System::getScene(SCENE_SETTING_SELECT))->isWaitingChild()) { return; + } - pChanAppBase->calc(); + mpChanAppBase->calc(); ChanAppBox* currBox = NULL; - while (currBox = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, currBox), currBox != NULL) + while (currBox = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, currBox), currBox != NULL) { currBox->calc(); + } - pChanAppEdit->calc(); + mpChanAppEdit->calc(); - for (int i = 0; i < 15; i++) - mTextBalloonArr[i]->calc(); + for (int i = 0; i < MAX_BALLOONS; i++) { + mpBalloons[i]->calc(); + } switch (mState) { - case CHANEDIT_STATE_ON_NORMAL: + case STATE_ON_NORMAL: { on_normal(); break; - case CHANEDIT_STATE_ON_FADEIN1ST: + } + case STATE_ON_FADEIN1ST: { on_fadein1st(); break; - case CHANEDIT_STATE_ON_FADEIN2ND: + } + case STATE_ON_FADEIN2ND: { on_fadein2nd(); break; - case CHANEDIT_STATE_ON_FADEOUT1ST: + } + case STATE_ON_FADEOUT1ST: { on_fadeout1st(); break; - case CHANEDIT_STATE_ON_FADEOUT2ND: + } + case STATE_ON_FADEOUT2ND: { on_fadeout2nd(); break; - case CHANEDIT_STATE_ON_SCROLL_R: + } + case STATE_ON_SCROLL_R: { on_scroll_r(); break; - case CHANEDIT_STATE_ON_SCROLL_L: + } + case STATE_ON_SCROLL_L: { on_scroll_l(); break; - case CHANEDIT_STATE_ON_CHANGE_TAG1ST: + } + case STATE_ON_CHANGE_TAG1ST: { on_change_tag1st(); break; - case CHANEDIT_STATE_ON_CHANGE_TAG2ND: + } + case STATE_ON_CHANGE_TAG2ND: { on_change_tag2nd(); break; - case CHANEDIT_STATE_ON_TRIG_COPY: + } + case STATE_ON_TRIG_COPY: { on_trig_copy(); break; - case CHANEDIT_STATE_ON_EDIT: + } + case STATE_ON_EDIT: { on_edit(); break; - case CHANEDIT_STATE_ON_EDIT_FADEIN: + } + case STATE_ON_EDIT_FADEIN: { on_edit_fadein(); break; - case CHANEDIT_STATE_ON_EDIT_FADEOUT1ST: + } + case STATE_ON_EDIT_FADEOUT1ST: { on_edit_fadeout1st(); break; - case CHANEDIT_STATE_ON_EDIT_FADEOUT2ND: + } + case STATE_ON_EDIT_FADEOUT2ND: { on_edit_fadeout2nd(); break; - case CHANEDIT_STATE_ON_VERIFY1ST: + } + case STATE_ON_VERIFY1ST: { on_verify1st(); break; - case CHANEDIT_STATE_ON_VERIFY2ND: + } + case STATE_ON_VERIFY2ND: { on_verify2nd(); break; - case CHANEDIT_STATE_ON_VERIFY_COPY: + } + case STATE_ON_VERIFY_COPY: { on_verify_copy(); break; - case CHANEDIT_STATE_ON_VERIFY_DEL: + } + case STATE_ON_VERIFY_DEL: { on_verify_del(); break; - case CHANEDIT_STATE_ON_VERIFY_FORMAT: + } + case STATE_ON_VERIFY_FORMAT: { on_verify_format(); break; - case CHANEDIT_STATE_ON_END_FORMAT: + } + case STATE_ON_END_FORMAT: { on_end_format(); break; - case CHANEDIT_STATE_ON_END_DEL: + } + case STATE_ON_END_DEL: { on_end_del(); break; - case CHANEDIT_STATE_ON_SD_MOUNT: + } + case STATE_ON_SD_MOUNT: { on_sd_mount(); break; - case CHANEDIT_STATE_ON_SD_MESSAGE1ST: + } + case STATE_ON_SD_MESSAGE1ST: { on_sd_message1st(); break; - case CHANEDIT_STATE_ON_SD_MESSAGE2ND: + } + case STATE_ON_SD_MESSAGE2ND: { on_sd_message2nd(); break; - case CHANEDIT_STATE_ON_SD_MESSAGE3RD: + } + case STATE_ON_SD_MESSAGE3RD: { on_sd_message3rd(); break; - case CHANEDIT_STATE_ON_PROCESS: + } + case STATE_ON_PROCESS: { on_process(); break; - case CHANEDIT_STATE_ON_END_PROCESS: + } + case STATE_ON_END_PROCESS: { on_end_process(); break; - case CHANEDIT_STATE_ON_EXIST_APP: + } + case STATE_ON_EXIST_APP: { on_exist_app(); break; - case CHANEDIT_STATE_ON_SD_MOUNT_ONLY: + } + case STATE_ON_SD_MOUNT_ONLY: { on_sd_mount_only(); break; - case CHANEDIT_STATE_ON_TRIG_MOVE: + } + case STATE_ON_TRIG_MOVE: { on_trig_move(); break; - case CHANEDIT_STATE_ON_VERIFY_MOVE: + } + case STATE_ON_VERIFY_MOVE: { on_verify_move(); break; - case CHANEDIT_STATE_ON_END_MOVE: + } + case STATE_ON_END_MOVE: { on_end_move(); break; + } } } void ChannelEdit::setpos_chanapp_box() { - int i; - ChanAppBox* box; + int i = 0; + ChanAppBox* box = NULL; - i = 0; - box = NULL; while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { - nw4r::lyt::Pane* currPane = pChanAppBase->getLytObject()->FindPaneByName(panes[0][i]); + nw4r::lyt::Pane* currPane = mpChanAppBase->getLytObject()->FindPaneByName(panes[0][i]); nw4r::math::VEC3 translation(0, 0, 0); PSMTXMultVec(currPane->GetGlobalMtx(), translation, translation); box->setTranslate(translation); i++; if (box->getTextBalloon() != NULL) { - box->getTextBalloon()->terminate(); - box->setTextBalloonInitialized(false); + box->terminateBalloon(); } } } + void ChannelEdit::fadein_chanapp_box() { int i = 0; ChanAppBox* box = NULL; while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { - nw4r::lyt::Pane* currPane = pChanAppBase->getLytObject()->FindPaneByName(panes[0][i]); + nw4r::lyt::Pane* currPane = mpChanAppBase->getLytObject()->FindPaneByName(panes[0][i]); nw4r::math::VEC3 translation(0, 0, 0); PSMTXMultVec(currPane->GetGlobalMtx(), translation, translation); box->setTranslate(translation); @@ -254,9 +281,9 @@ namespace ipl { i++; } } + void ChannelEdit::fadeout_chanapp_box() { - ChanAppBox* box; - box = NULL; + ChanAppBox* box = NULL; while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { box->setThumbnail(NULL); box->anmFadeout(); @@ -264,21 +291,21 @@ namespace ipl { } void ChannelEdit::send_getthumbnail_cmd(bool isWiiNotSD) { - for (int i = 0; i < 15; i++) { + for (int i = 0; i < MAX_BALLOONS; i++) { ChanAppBox* box = (ChanAppBox*)nw4r::ut::List_GetNth(&mChanAppBoxList, i + 15); - pNandSDCardManager->cmdGetThumbnail(box, mPageOffset + i, isWiiNotSD); + mpNandSDCardManager->cmdGetThumbnail(box, mPageOffset + i, isWiiNotSD); } } void ChannelEdit::update_sdcard_slot() { - if (mPage != CHANEDIT_PAGE_SD) + if (mPage != PAGE_SD) return; - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); - if (mSdState == NandSDWorker::SD_STATE_READY) + mSDState = mpNandSDCardManager->getWorker()->get_sd_state(); + if (mSDState == NandSDWorker::SD_STATE_READY) return; - pNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->cmdCleanQueue(); mPageOffset = 0; @@ -286,84 +313,93 @@ namespace ipl { box = NULL; while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { if (box->getTextBalloon() != NULL) { - box->getTextBalloon()->terminate(); - box->setTextBalloonInitialized(false); + box->terminateBalloon(); } } - pChanAppEdit->clearAllThumbnails(); + mpChanAppEdit->clearAllThumbnails(); switch (mState) { - case CHANEDIT_STATE_ON_NORMAL: + case STATE_ON_NORMAL: { fadeout_chanapp_box(); - mState = CHANEDIT_STATE_ON_CHANGE_TAG1ST; + mState = STATE_ON_CHANGE_TAG1ST; break; - case CHANEDIT_STATE_ON_EDIT: - pChanAppEdit->anmClear(); - pChanAppEdit->anmFadeout(); - mState = CHANEDIT_STATE_ON_EDIT_FADEOUT2ND; + } + case STATE_ON_EDIT: { + mpChanAppEdit->anmClear(); + mpChanAppEdit->anmFadeout(); + mState = STATE_ON_EDIT_FADEOUT2ND; break; - case CHANEDIT_STATE_ON_VERIFY_COPY: - case CHANEDIT_STATE_ON_VERIFY_DEL: - case CHANEDIT_STATE_ON_VERIFY_MOVE: + } + case STATE_ON_VERIFY_COPY: + case STATE_ON_VERIFY_DEL: + case STATE_ON_VERIFY_MOVE: { System::getDialog()->terminate(); - pChanAppEdit->anmClear(); - pChanAppEdit->anmSelectFadein(); - mState = CHANEDIT_STATE_ON_EDIT_FADEIN; + mpChanAppEdit->anmClear(); + mpChanAppEdit->anmSelectFadein(); + mState = STATE_ON_EDIT_FADEIN; break; - case CHANEDIT_STATE_ON_VERIFY1ST: - pChanAppEdit->anmClear(); - pChanAppEdit->anmSelectFadein(); - mState = CHANEDIT_STATE_ON_VERIFY2ND; + } + case STATE_ON_VERIFY1ST: { + mpChanAppEdit->anmClear(); + mpChanAppEdit->anmSelectFadein(); + mState = STATE_ON_VERIFY2ND; break; - default: + } + default: { break; + } } } void ChannelEdit::update_arw() { if (!mArwRVisible && enable_scroll_r()) { - pChanAppBase->anmArwAppear(true, false); + mpChanAppBase->anmArwAppear(true, false); mArwRVisible = true; } else if (mArwRVisible && !enable_scroll_r()) { - pChanAppBase->anmArwDisappear(true, false); + mpChanAppBase->anmArwDisappear(true, false); mArwRVisible = false; } if (!mArwLVisible && enable_scroll_l()) { - pChanAppBase->anmArwAppear(false, true); + mpChanAppBase->anmArwAppear(false, true); mArwLVisible = true; } else if (mArwLVisible && !enable_scroll_l()) { - pChanAppBase->anmArwDisappear(false, true); + mpChanAppBase->anmArwDisappear(false, true); mArwLVisible = false; } } + void ChannelEdit::update_free() { - if (mPage == CHANEDIT_PAGE_WII) + if (mPage == PAGE_WII) { update_nand_free(); - else + } else { update_sd_free(); + } } + void ChannelEdit::update_nand_free() { - int blocksFree = pNandSDCardManager->getNandBlocksFree(); + int blocksFree = mpNandSDCardManager->getNandBlocksFree(); if (blocksFree < 0) { - pChanAppBase->set_visible("N_Capa_00", false); - pChanAppBase->set_visible("T_Capa_00", false); + mpChanAppBase->set_visible("N_Capa_00", false); + mpChanAppBase->set_visible("T_Capa_00", false); return; } - SCNumber scDigitData = scNumber; + const wchar_t scNumber[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; wchar_t digits[5] = L""; wchar_t blocksFreeMsg[0x40] = L""; - digits[0] = scDigitData.digits[blocksFree / 1000]; - digits[1] = scDigitData.digits[blocksFree / 100 % 10]; - digits[2] = scDigitData.digits[blocksFree / 10 % 10]; - digits[3] = scDigitData.digits[blocksFree % 10]; + digits[0] = scNumber[blocksFree / 1000]; + digits[1] = scNumber[blocksFree / 100 % 10]; + digits[2] = scNumber[blocksFree / 10 % 10]; + digits[3] = scNumber[blocksFree % 10]; int zeroOffset; - for (zeroOffset = 0; zeroOffset < 3; zeroOffset++) - if (digits[zeroOffset] != L'0') + for (zeroOffset = 0; zeroOffset < 3; zeroOffset++) { + if (digits[zeroOffset] != L'0') { break; + } + } int blockOpenOffset = 0; @@ -373,47 +409,51 @@ namespace ipl { while (true) { wchar_t chr = *blockOpenMsg++; blocksFreeMsg[blockOpenOffset++] = chr; - if (chr == L'\0') + if (chr == L'\0') { break; + } }; blocksFreeMsg[--blockOpenOffset] = L' '; wcscpy(blocksFreeMsg + blockOpenOffset, digits + zeroOffset); wcscat(blocksFreeMsg, unkMsg); - pChanAppBase->set_visible("T_Capa_00", true); - pChanAppBase->set_visible("N_Capa_00", true); - pChanAppBase->set_textbox("T_Capa_00", blocksFreeMsg); + mpChanAppBase->set_visible("T_Capa_00", true); + mpChanAppBase->set_visible("N_Capa_00", true); + mpChanAppBase->set_textbox("T_Capa_00", blocksFreeMsg); } + void ChannelEdit::update_sd_free() { - if (pNandSDCardManager->getWorker()->get_sd_state() != NandSDWorker::SD_STATE_READY) { - pChanAppBase->set_visible("N_Capa_00", false); - pChanAppBase->set_visible("T_Capa_00", false); + if (mpNandSDCardManager->getWorker()->get_sd_state() != NandSDWorker::SD_STATE_READY) { + mpChanAppBase->set_visible("N_Capa_00", false); + mpChanAppBase->set_visible("T_Capa_00", false); return; } - int blocksFree = pNandSDCardManager->getSDBlocksFree(); + int blocksFree = mpNandSDCardManager->getSDBlocksFree(); if (blocksFree < 0) { - pChanAppBase->set_visible("N_Capa_00", false); - pChanAppBase->set_visible("T_Capa_00", false); + mpChanAppBase->set_visible("N_Capa_00", false); + mpChanAppBase->set_visible("T_Capa_00", false); return; } - SCNumber scDigitData = scNumber2; + const wchar_t scNumber[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; wchar_t digits[7] = L""; wchar_t blocksFreeMsg[0x40] = L""; - digits[0] = scDigitData.digits[blocksFree / 100000]; - digits[1] = scDigitData.digits[blocksFree / 10000 % 10]; - digits[2] = scDigitData.digits[blocksFree / 1000 % 10]; - digits[3] = scDigitData.digits[blocksFree / 100 % 10]; - digits[4] = scDigitData.digits[blocksFree / 10 % 10]; - digits[5] = scDigitData.digits[blocksFree % 10]; + digits[0] = scNumber[blocksFree / 100000]; + digits[1] = scNumber[blocksFree / 10000 % 10]; + digits[2] = scNumber[blocksFree / 1000 % 10]; + digits[3] = scNumber[blocksFree / 100 % 10]; + digits[4] = scNumber[blocksFree / 10 % 10]; + digits[5] = scNumber[blocksFree % 10]; int zeroOffset; - for (zeroOffset = 0; zeroOffset < 5; zeroOffset++) - if (digits[zeroOffset] != L'0') + for (zeroOffset = 0; zeroOffset < 5; zeroOffset++) { + if (digits[zeroOffset] != L'0') { break; + } + } int blockOpenOffset = 0; @@ -423,17 +463,18 @@ namespace ipl { while (true) { wchar_t chr = *blockOpenMsg++; blocksFreeMsg[blockOpenOffset++] = chr; - if (chr == L'\0') + if (chr == L'\0') { break; + } }; blocksFreeMsg[--blockOpenOffset] = L' '; wcscpy(blocksFreeMsg + blockOpenOffset, digits + zeroOffset); wcscat(blocksFreeMsg, unkMsg); - pChanAppBase->set_visible("T_Capa_00", true); - pChanAppBase->set_visible("N_Capa_00", true); - pChanAppBase->set_textbox("T_Capa_00", blocksFreeMsg); + mpChanAppBase->set_visible("T_Capa_00", true); + mpChanAppBase->set_visible("N_Capa_00", true); + mpChanAppBase->set_textbox("T_Capa_00", blocksFreeMsg); } void ChannelEdit::start_process(int processType) { @@ -441,172 +482,191 @@ namespace ipl { mProcessType = processType; - pNandSDCardManager->disableThumbnailFetching(); + mpNandSDCardManager->disableThumbnailFetching(); snd::getSystem()->startSE("WIPL_SE_COPYING"); - if (processType == CHANEDIT_PROC_FMT) { - pChanAppEdit->anmShowBtn0Dialog(MESG_DATA_FORMATTING, true, true); + if (processType == PROC_FMT) { + mpChanAppEdit->anmShowBtn0Dialog(MESG_DATA_FORMATTING, true, true); } else { - pChanAppEdit->anmStartWaitAnm(); + mpChanAppEdit->anmStartWaitAnm(); } - mState = CHANEDIT_STATE_ON_PROCESS; + mState = STATE_ON_PROCESS; } + void ChannelEdit::stop_process() { - pNandSDCardManager->enableThumbnailFetching(); + mpNandSDCardManager->enableThumbnailFetching(); System::getHomeButtonMenu()->enable(); snd::getSystem()->startSE("WIPL_SE_COPY_FINISH"); - pChanAppEdit->anmStopWaitAnm(); + mpChanAppEdit->anmStopWaitAnm(); } void ChannelEdit::start_scroll_r(bool playButtonAnm, bool playSound) { - pNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->cmdCleanQueue(); ChanAppBox* box = NULL; - while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) + while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { box->clearEvent(); + } - if (playSound) + if (playSound) { snd::getSystem()->startSE("WSD_SELECT"); + } - pChanAppBase->anmScrollR(playButtonAnm); - mState = CHANEDIT_STATE_ON_SCROLL_R; + mpChanAppBase->anmScrollR(playButtonAnm); + mState = STATE_ON_SCROLL_R; } void ChannelEdit::start_scroll_l(bool playButtonAnm, bool playSound) { - pNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->cmdCleanQueue(); ChanAppBox* box = NULL; - while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) + while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { box->clearEvent(); + } - if (playSound) + if (playSound) { snd::getSystem()->startSE("WSD_SELECT"); + } - pChanAppBase->anmScrollL(playButtonAnm); - mState = CHANEDIT_STATE_ON_SCROLL_L; + mpChanAppBase->anmScrollL(playButtonAnm); + mState = STATE_ON_SCROLL_L; } bool ChannelEdit::enable_scroll_r() { - if (mState != CHANEDIT_STATE_ON_NORMAL) + if (mState != STATE_ON_NORMAL) { return false; + } - if (mPage == CHANEDIT_PAGE_WII) { - return pNandSDCardManager->getWorker()->get_nand_app_num() - mPageOffset > 15; + if (mPage == PAGE_WII) { + return mpNandSDCardManager->getWorker()->get_nand_app_num() - mPageOffset > 15; } else { - if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) - return pNandSDCardManager->getWorker()->get_sd_app_num() - mPageOffset > 15; - else + if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { + return mpNandSDCardManager->getWorker()->get_sd_app_num() - mPageOffset > 15; + } else { return false; + } } } + bool ChannelEdit::enable_scroll_l() { - if (mState != CHANEDIT_STATE_ON_NORMAL) + if (mState != STATE_ON_NORMAL) { return false; + } return mPageOffset > 0; } void ChannelEdit::draw() { - if (!System::onDefaultDrawLayer()) + if (!System::onDefaultDrawLayer()) { return; - - utility::Graphics::setOrtho(0); - pChanAppBase->draw(); - - ChanAppBox* box = NULL; - while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) - box->draw(); - - for (int i = 0; i < 15; i++) { - mTextBalloonArr[i]->draw(); } - pChanAppBase->getLytObject()->draw("N_ArwR"); - pChanAppBase->getLytObject()->draw("N_ArwL"); + utility::Graphics::setOrtho(0); + mpChanAppBase->draw(); - pChanAppEdit->draw(); + ChanAppBox* box = NULL; + while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { + box->draw(); + } + + for (int i = 0; i < MAX_BALLOONS; i++) { + mpBalloons[i]->draw(); + } + + mpChanAppBase->getLytObject()->draw("N_ArwR"); + mpChanAppBase->getLytObject()->draw("N_ArwL"); + + mpChanAppEdit->draw(); } BOOL ChannelEdit::isResetAcceptable() const { - return mProcessType == CHANEDIT_PROC_NUL; + return mProcessType == PROC_NUL; } void ChannelEdit::onPoint(AnmPane* pane) { - if ((strcmp(pane->getName(), "B_SelectWii_00") == 0 && mPage == CHANEDIT_PAGE_WII) || - (strcmp(pane->getName(), "B_SelectSd_00") == 0 && mPage == CHANEDIT_PAGE_SD)) + if ((strcmp(pane->getName(), "B_SelectWii_00") == 0 && mPage == PAGE_WII) || + (strcmp(pane->getName(), "B_SelectSd_00") == 0 && mPage == PAGE_SD)) { return; + } snd::getSystem()->startSE("WIPL_SE_BT_TARGETTING"); controller::Interface* controller = System::getYoungController(); - if (controller != NULL) + if (controller != NULL) { controller->rumble(); + } pane->on_cmd_recv(AnmPane::ANIM_CMD_POINT); } + void ChannelEdit::onLeft(AnmPane* pane) { - if ((strcmp(pane->getName(), "B_SelectWii_00") == 0 && mPage == CHANEDIT_PAGE_WII) || - (strcmp(pane->getName(), "B_SelectSd_00") == 0 && mPage == CHANEDIT_PAGE_SD)) + if ((strcmp(pane->getName(), "B_SelectWii_00") == 0 && mPage == PAGE_WII) || + (strcmp(pane->getName(), "B_SelectSd_00") == 0 && mPage == PAGE_SD)) { return; + } pane->on_cmd_recv(AnmPane::ANIM_CMD_LEFT); } + void ChannelEdit::onTrig(AnmPane* pane) { - if (mState != CHANEDIT_STATE_ON_NORMAL && mState != CHANEDIT_STATE_ON_SD_MESSAGE1ST) + if (mState != STATE_ON_NORMAL && mState != STATE_ON_SD_MESSAGE1ST) { return; + } - if (strcmp(pane->getName(), "B_SelectWii_00") == 0 && mPage == CHANEDIT_PAGE_SD) { + if (strcmp(pane->getName(), "B_SelectWii_00") == 0 && mPage == PAGE_SD) { ChanAppBox* box = NULL; - while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) + while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { box->setThumbnail(NULL); - - snd::getSystem()->startSE("WIPL_SE_BT_PUSH"); - - mPageOffset = 0; - pNandSDCardManager->cmdCleanQueue(); - pNandSDCardManager->cmdListNand(); - mPage = CHANEDIT_PAGE_WII; - - pChanAppBase->anmArwDisappear(mArwRVisible, mArwLVisible); - mArwRVisible = false; - mArwLVisible = false; - - pChanAppBase->set_visible("N_Capa_00", false); - pChanAppBase->set_visible("T_Capa_00", false); - - if (mState == CHANEDIT_STATE_ON_NORMAL) { - pChanAppBase->anmChangeWiitoSD(); - fadeout_chanapp_box(); - mState = CHANEDIT_STATE_ON_CHANGE_TAG1ST; - } else { - pChanAppBase->anmTextFadeout(); - mState = CHANEDIT_STATE_ON_SD_MESSAGE3RD; } - } else if (strcmp(pane->getName(), "B_SelectSd_00") == 0 && mPage == CHANEDIT_PAGE_WII) { - ChanAppBox* box = NULL; - while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) - box->setThumbnail(NULL); snd::getSystem()->startSE("WIPL_SE_BT_PUSH"); - pNandSDCardManager->cmdSDMount(); mPageOffset = 0; - pNandSDCardManager->cmdCleanQueue(); - pNandSDCardManager->cmdListSD(); - mPage = CHANEDIT_PAGE_SD; + mpNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->cmdListNand(); + mPage = PAGE_WII; - pChanAppBase->anmArwDisappear(mArwRVisible, mArwLVisible); + mpChanAppBase->anmArwDisappear(mArwRVisible, mArwLVisible); mArwRVisible = false; mArwLVisible = false; - pChanAppBase->set_visible("N_Capa_00", false); - pChanAppBase->set_visible("T_Capa_00", false); + mpChanAppBase->set_visible("N_Capa_00", false); + mpChanAppBase->set_visible("T_Capa_00", false); - if (mState == CHANEDIT_STATE_ON_NORMAL) { - pChanAppBase->anmChangeSDtoWii(); + if (mState == STATE_ON_NORMAL) { + mpChanAppBase->anmChangeWiitoSD(); fadeout_chanapp_box(); - mState = CHANEDIT_STATE_ON_CHANGE_TAG1ST; + mState = STATE_ON_CHANGE_TAG1ST; } else { - pChanAppBase->anmTextFadeout(); - mState = CHANEDIT_STATE_ON_SD_MESSAGE3RD; + mpChanAppBase->anmTextFadeout(); + mState = STATE_ON_SD_MESSAGE3RD; + } + } else if (strcmp(pane->getName(), "B_SelectSd_00") == 0 && mPage == PAGE_WII) { + ChanAppBox* box = NULL; + while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { + box->setThumbnail(NULL); + } + + snd::getSystem()->startSE("WIPL_SE_BT_PUSH"); + + mpNandSDCardManager->cmdSDMount(); + mPageOffset = 0; + mpNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->cmdListSD(); + mPage = PAGE_SD; + + mpChanAppBase->anmArwDisappear(mArwRVisible, mArwLVisible); + mArwRVisible = false; + mArwLVisible = false; + + mpChanAppBase->set_visible("N_Capa_00", false); + mpChanAppBase->set_visible("T_Capa_00", false); + + if (mState == STATE_ON_NORMAL) { + mpChanAppBase->anmChangeSDtoWii(); + fadeout_chanapp_box(); + mState = STATE_ON_CHANGE_TAG1ST; + } else { + mpChanAppBase->anmTextFadeout(); + mState = STATE_ON_SD_MESSAGE3RD; } } else if (strcmp(pane->getName(), "B_ArwR") == 0 && enable_scroll_r()) { start_scroll_r(true, true); @@ -614,80 +674,88 @@ namespace ipl { start_scroll_l(true, true); } } - void ChannelEdit::onTrig(ChanAppBox* box) { - if (mState != CHANEDIT_STATE_ON_NORMAL) - return; - pCurrBox = box; + void ChannelEdit::onTrig(ChanAppBox* box) { + if (mState != STATE_ON_NORMAL) { + return; + } + + mpCurrentBox = box; if (box->getTextBalloon() != NULL) box->getTextBalloon()->terminate(); - pChanAppEdit->anmFadein(box); + mpChanAppEdit->anmFadein(box); snd::getSystem()->startSE("WIPL_SE_DECIDE"); - mState = CHANEDIT_STATE_ON_EDIT_FADEIN; + mState = STATE_ON_EDIT_FADEIN; } - void ChannelEdit::onTrigButton(bool isErr) { - pChanAppBase->anmArwDisappear(mArwRVisible, mArwLVisible); - pChanAppBase->anmFadeout(isErr); + void ChannelEdit::onTrigButton(bool isErr) { + mpChanAppBase->anmArwDisappear(mArwRVisible, mArwLVisible); + + mpChanAppBase->anmFadeout(isErr); if (!isErr) { fadeout_chanapp_box(); } - pNandSDCardManager->cmdTerminate(); - mState = CHANEDIT_STATE_ON_FADEOUT1ST; + mpNandSDCardManager->cmdTerminate(); + mState = STATE_ON_FADEOUT1ST; } + void ChannelEdit::onTrigCopy() { - if (mPage == CHANEDIT_PAGE_WII) { - pNandSDCardManager->cmdSDMount(); + if (mPage == PAGE_WII) { + mpNandSDCardManager->cmdSDMount(); } else { - pNandSDCardManager->cmdExistNandApp(pCurrBox->getThumbnail()->getSDTitleId()); + mpNandSDCardManager->cmdExistNandApp(mpCurrentBox->getThumbnail()->getSDTitleId()); } - mActionIntent = CHANEDIT_INTENT_COPY; - mState = CHANEDIT_STATE_ON_TRIG_COPY; + mActionIntent = INTENT_COPY; + mState = STATE_ON_TRIG_COPY; return; } + void ChannelEdit::onTrigDel() { - if (mPage == CHANEDIT_PAGE_SD) { - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); - switch (mSdState) { - case NandSDWorker::SD_STATE_READY: - if (pNandSDCardManager->isSDWriteProtected()) { - pChanAppEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + if (mPage == PAGE_SD) { + mSDState = mpNandSDCardManager->getWorker()->get_sd_state(); + switch (mSDState) { + case NandSDWorker::SD_STATE_READY: { + if (mpNandSDCardManager->isSDWriteProtected()) { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); + mState = STATE_ON_VERIFY1ST; } else { - pChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_ERASE_Q); - mState = CHANEDIT_STATE_ON_VERIFY_DEL; + mpChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_ERASE_Q); + mState = STATE_ON_VERIFY_DEL; } break; - default: - pChanAppEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + } + default: { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_VERIFY1ST; break; + } } } else { - pChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_ERASE_Q); - mState = CHANEDIT_STATE_ON_VERIFY_DEL; + mpChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_ERASE_Q); + mState = STATE_ON_VERIFY_DEL; } } void ChannelEdit::onTrigMove() { - if (mPage == CHANEDIT_PAGE_WII) { - pNandSDCardManager->cmdSDMount(); + if (mPage == PAGE_WII) { + mpNandSDCardManager->cmdSDMount(); } else { - pNandSDCardManager->cmdExistNandApp(pCurrBox->getThumbnail()->getSDTitleId()); + mpNandSDCardManager->cmdExistNandApp(mpCurrentBox->getThumbnail()->getSDTitleId()); } - mActionIntent = CHANEDIT_INTENT_MOVE; - mState = CHANEDIT_STATE_ON_TRIG_MOVE; + mActionIntent = INTENT_MOVE; + mState = STATE_ON_TRIG_MOVE; } void ChannelEdit::on_normal() { - SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); - if (sceneSettingButton->update()) { + SettingButton* settingSel = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); + if (settingSel->update()) { onTrigButton(false); ChanAppBox* box = NULL; - while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) + while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { box->setThumbnail(NULL); + } return; } @@ -695,19 +763,20 @@ namespace ipl { update_arw(); update_free(); - pChanAppBase->update(); + mpChanAppBase->update(); ChanAppBox* box = NULL; - while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) + while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { box->update(); + } - if (mPage == CHANEDIT_PAGE_WII) { - if (mPageOffset == pNandSDCardManager->getWorker()->get_nand_app_num() && enable_scroll_l()) { + if (mPage == PAGE_WII) { + if (mPageOffset == mpNandSDCardManager->getWorker()->get_nand_app_num() && enable_scroll_l()) { start_scroll_l(false, false); return; } } else { - if (mPageOffset == pNandSDCardManager->getWorker()->get_sd_app_num() && enable_scroll_l()) { + if (mPageOffset == mpNandSDCardManager->getWorker()->get_sd_app_num() && enable_scroll_l()) { start_scroll_l(false, false); return; } @@ -722,646 +791,738 @@ namespace ipl { } } } + void ChannelEdit::on_fadein1st() { - if (!pChanAppBase->isIdle()) + if (!mpChanAppBase->isIdle()) { return; - if (pNandSDCardManager->isWorking()) + } + if (mpNandSDCardManager->isWorking()) { return; + } fadein_chanapp_box(); - mState = CHANEDIT_STATE_ON_FADEIN2ND; + mState = STATE_ON_FADEIN2ND; } + void ChannelEdit::on_fadein2nd() { ChanAppBox* box = NULL; while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { - if (!box->isIdle()) + if (!box->isIdle()) { return; + } } - mState = CHANEDIT_STATE_ON_NORMAL; + mState = STATE_ON_NORMAL; } + void ChannelEdit::on_fadeout1st() { - if (!pChanAppBase->isIdle()) + if (!mpChanAppBase->isIdle()) { return; + } - if (!pNandSDCardManager->isTerminated()) + if (!mpNandSDCardManager->isTerminated()) { return; + } - mState = CHANEDIT_STATE_ON_FADEOUT2ND; + mState = STATE_ON_FADEOUT2ND; } + void ChannelEdit::on_fadeout2nd() { requestSceneDestruction(); System::getBS2Manager()->restart(); OSReport(" ... bs2 manager restarted\n"); } + void ChannelEdit::on_scroll_r() { - if (pChanAppBase->isIdle() && sd_worker_ready(pNandSDCardManager)) { + if (mpChanAppBase->isIdle() && sd_worker_ready(mpNandSDCardManager)) { mPageOffset += 15; ChanAppBox* box = NULL; - while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) + while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { box->setThumbnail(NULL); + } - send_getthumbnail_cmd(mPage == CHANEDIT_PAGE_WII); - mState = CHANEDIT_STATE_ON_NORMAL; + send_getthumbnail_cmd(mPage == PAGE_WII); + mState = STATE_ON_NORMAL; } setpos_chanapp_box(); } + void ChannelEdit::on_scroll_l() { - if (pChanAppBase->isIdle() && sd_worker_ready(pNandSDCardManager)) { + if (mpChanAppBase->isIdle() && sd_worker_ready(mpNandSDCardManager)) { mPageOffset -= 15; ChanAppBox* box = NULL; - while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) + while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { box->setThumbnail(NULL); + } - send_getthumbnail_cmd(mPage == CHANEDIT_PAGE_WII); - mState = CHANEDIT_STATE_ON_NORMAL; + send_getthumbnail_cmd(mPage == PAGE_WII); + mState = STATE_ON_NORMAL; } setpos_chanapp_box(); } + void ChannelEdit::on_change_tag1st() { - if (pNandSDCardManager->isWorking() || !sd_worker_ready(pNandSDCardManager)) + if (mpNandSDCardManager->isWorking() || !sd_worker_ready(mpNandSDCardManager)) return; ChanAppBox* box = NULL; while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { - if (!box->isIdle()) + if (!box->isIdle()) { return; - if (box->getThumbnail() != NULL) + } + if (box->getThumbnail() != NULL) { box->setThumbnail(NULL); + } } - if (mPage == CHANEDIT_PAGE_SD) { - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); - switch (mSdState) { - case NandSDWorker::SD_STATE_SLOT_EMPTY: - if (!pChanAppBase->isIdle()) + if (mPage == PAGE_SD) { + mSDState = mpNandSDCardManager->getWorker()->get_sd_state(); + switch (mSDState) { + case NandSDWorker::SD_STATE_EJECTED: { + if (!mpChanAppBase->isIdle()) return; - pChanAppBase->anmTextFadein(MESG_DATA_NO_SD_CARD); - mState = CHANEDIT_STATE_ON_SD_MESSAGE1ST; + mpChanAppBase->anmTextFadein(MESG_DATA_NO_SD_CARD); + mState = STATE_ON_SD_MESSAGE1ST; break; - case NandSDWorker::SD_STATE_NOT_MOUNTED: - pNandSDCardManager->cmdSDMount(); - mState = CHANEDIT_STATE_ON_SD_MOUNT; + } + case NandSDWorker::SD_STATE_INSERTED: { + mpNandSDCardManager->cmdSDMount(); + mState = STATE_ON_SD_MOUNT; break; - case NandSDWorker::SD_STATE_BROKEN_MEDIA: - case NandSDWorker::SD_STATE_ILLEGAL_MEDIA: - if (!pChanAppBase->isIdle()) + } + case NandSDWorker::SD_STATE_BROKEN: + case NandSDWorker::SD_STATE_ILLEGAL: { + if (!mpChanAppBase->isIdle()) { return; - pChanAppBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); - mState = CHANEDIT_STATE_ON_SD_MESSAGE1ST; + } + mpChanAppBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); + mState = STATE_ON_SD_MESSAGE1ST; break; - case NandSDWorker::SD_STATE_READY: - if (!pChanAppBase->isIdle()) + } + case NandSDWorker::SD_STATE_READY: { + if (!mpChanAppBase->isIdle()) { return; + } send_getthumbnail_cmd(false); fadein_chanapp_box(); - mState = CHANEDIT_STATE_ON_CHANGE_TAG2ND; + mState = STATE_ON_CHANGE_TAG2ND; break; - case NandSDWorker::SD_STATE_ERRORED: - default: - OSReport("get async resutl = %d\n", pNandSDCardManager->getAsyncResult()); - if (pChanAppBase->isIdle()) { - pChanAppBase->anmTextFadein(0x97); - mState = CHANEDIT_STATE_ON_SD_MESSAGE1ST; + } + case NandSDWorker::SD_STATE_ERROR: + default: { + OSReport("get async resutl = %d\n", mpNandSDCardManager->getAsyncResult()); + if (mpChanAppBase->isIdle()) { + mpChanAppBase->anmTextFadein(0x97); + mState = STATE_ON_SD_MESSAGE1ST; } break; + } } } else { send_getthumbnail_cmd(true); fadein_chanapp_box(); - mState = CHANEDIT_STATE_ON_CHANGE_TAG2ND; + mState = STATE_ON_CHANGE_TAG2ND; } } + void ChannelEdit::on_change_tag2nd() { ChanAppBox* box = NULL; while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { - if (!box->isIdle()) - return; - } - mState = CHANEDIT_STATE_ON_NORMAL; - } - void ChannelEdit::on_trig_copy() { - if (pNandSDCardManager->isWorking()) - return; - - if (pCurrBox->getThumbnail()->getIsCorrupt()) { - pChanAppEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_COPIED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; - return; - } - - if (mPage == CHANEDIT_PAGE_WII) { - if (pCurrBox->getThumbnail()->getMatchesTmpTitle()) { - pChanAppEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_COPIED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + if (!box->isIdle()) { return; } - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); - switch (mSdState) { - case NandSDWorker::SD_STATE_SLOT_EMPTY: - pChanAppEdit->anmSelectFadeout(MESG_DATA_NO_SD_CARD); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + } + mState = STATE_ON_NORMAL; + } + + void ChannelEdit::on_trig_copy() { + if (mpNandSDCardManager->isWorking()) { + return; + } + + if (mpCurrentBox->getThumbnail()->getIsCorrupt()) { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_COPIED); + mState = STATE_ON_VERIFY1ST; + return; + } + + if (mPage == PAGE_WII) { + if (mpCurrentBox->getThumbnail()->getMatchesTmpTitle()) { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_COPIED); + mState = STATE_ON_VERIFY1ST; + return; + } + mSDState = mpNandSDCardManager->getWorker()->get_sd_state(); + switch (mSDState) { + case NandSDWorker::SD_STATE_EJECTED: { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_NO_SD_CARD); + mState = STATE_ON_VERIFY1ST; break; - case NandSDWorker::SD_STATE_NOT_MOUNTED: + } + case NandSDWorker::SD_STATE_INSERTED: { OSReport("NEED MOUNT\n"); - pNandSDCardManager->cmdSDMount(); - mState = CHANEDIT_STATE_ON_SD_MOUNT_ONLY; + mpNandSDCardManager->cmdSDMount(); + mState = STATE_ON_SD_MOUNT_ONLY; break; - case NandSDWorker::SD_STATE_BROKEN_MEDIA: - case NandSDWorker::SD_STATE_ILLEGAL_MEDIA: - pChanAppEdit->anmSelectFadeout(MESG_DATA_SD_DEVICE_BAD); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_BROKEN: + case NandSDWorker::SD_STATE_ILLEGAL: { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_SD_DEVICE_BAD); + mState = STATE_ON_VERIFY1ST; break; - case NandSDWorker::SD_STATE_READY: - if (pNandSDCardManager->isSDWriteProtected()) { - pChanAppEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_READY: { + if (mpNandSDCardManager->isSDWriteProtected()) { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); + mState = STATE_ON_VERIFY1ST; return; } - pNandSDCardManager->cmdExistSDApp(pCurrBox->getThumbnail()->getWiiTitleId()); - mState = CHANEDIT_STATE_ON_EXIST_APP; + mpNandSDCardManager->cmdExistSDApp(mpCurrentBox->getThumbnail()->getWiiTitleId()); + mState = STATE_ON_EXIST_APP; break; - case NandSDWorker::SD_STATE_ERRORED: - default: - pChanAppEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_ERROR: + default: { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_VERIFY1ST; break; + } } } else { - if (pNandSDCardManager->getAsyncResult() != NandSDWorker::WORKER_RESULT_OK) { - if (pCurrBox->getThumbnail()->getSDTitleId() == (ESTitleId32)pNandSDCardManager->getTmpTitle()) { + if (mpNandSDCardManager->getAsyncResult() != NandSDWorker::RESULT_OK) { + if (mpCurrentBox->getThumbnail()->getSDTitleId() == (ESTitleId32)mpNandSDCardManager->getTmpTitle()) { u32 numFreeChannels; SCGetFreeChannelAppCount(&numFreeChannels); if (numFreeChannels == 0) { - pChanAppEdit->anmSelectFadeout(MESG_DATA_TOO_FEW_RESOURCES); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + mpChanAppEdit->anmSelectFadeout(MESG_DATA_TOO_FEW_RESOURCES); + mState = STATE_ON_VERIFY1ST; } else { - pChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_COPY_TO_WII_Q); - mState = CHANEDIT_STATE_ON_VERIFY_COPY; + mpChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_COPY_TO_WII_Q); + mState = STATE_ON_VERIFY_COPY; } } else { - pChanAppEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_WII); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + mpChanAppEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_WII); + mState = STATE_ON_VERIFY1ST; } } else { - pChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_COPY_TO_WII_Q); - mState = CHANEDIT_STATE_ON_VERIFY_COPY; + mpChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_COPY_TO_WII_Q); + mState = STATE_ON_VERIFY_COPY; } } } + void ChannelEdit::on_edit_fadein() { - if (!pChanAppEdit->isIdle()) + if (!mpChanAppEdit->isIdle()) { return; - mState = CHANEDIT_STATE_ON_EDIT; + } + mState = STATE_ON_EDIT; } + void ChannelEdit::on_edit() { - if (pChanAppEdit->isIdle()) { - SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); - if (sceneSettingButton->update()) { - mState = CHANEDIT_STATE_ON_EDIT_FADEOUT1ST; + if (mpChanAppEdit->isIdle()) { + SettingButton* settingSel = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); + if (settingSel->update()) { + mState = STATE_ON_EDIT_FADEOUT1ST; return; } } - pChanAppEdit->update(); + mpChanAppEdit->update(); update_sdcard_slot(); } + void ChannelEdit::on_edit_fadeout1st() { - SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); - if (!sceneSettingButton->isPlaying()) { - pChanAppEdit->anmFadeout(); - mState = CHANEDIT_STATE_ON_EDIT_FADEOUT2ND; + SettingButton* settingSel = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); + if (!settingSel->isPlaying()) { + mpChanAppEdit->anmFadeout(); + mState = STATE_ON_EDIT_FADEOUT2ND; } } + void ChannelEdit::on_edit_fadeout2nd() { - if (!pChanAppEdit->isIdle()) + if (!mpChanAppEdit->isIdle()) { return; - mState = CHANEDIT_STATE_ON_NORMAL; + } + mState = STATE_ON_NORMAL; } + void ChannelEdit::on_verify1st() { - if (pChanAppEdit->isIdle()) { - SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); - if (sceneSettingButton->update()) { - pChanAppEdit->anmSelectFadein(); - mState = CHANEDIT_STATE_ON_VERIFY2ND; + if (mpChanAppEdit->isIdle()) { + SettingButton* settingSel = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); + if (settingSel->update()) { + mpChanAppEdit->anmSelectFadein(); + mState = STATE_ON_VERIFY2ND; } } - mActionIntent = CHANEDIT_INTENT_NONE; + mActionIntent = INTENT_NONE; update_sdcard_slot(); } + void ChannelEdit::on_verify2nd() { - if (!pChanAppEdit->isIdle()) + if (!mpChanAppEdit->isIdle()) { return; - mState = CHANEDIT_STATE_ON_EDIT; + } + mState = STATE_ON_EDIT; } + void ChannelEdit::on_verify_copy() { - if (!pChanAppEdit->isIdle() || pNandSDCardManager->isWorking()) + if (!mpChanAppEdit->isIdle() || mpNandSDCardManager->isWorking()) return; switch (System::getDialog()->getLastResult()) { - case DialogWindow::RESULT_LEFT_BUTTON: - if (mPage == CHANEDIT_PAGE_WII) { - if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { - start_process(CHANEDIT_PROC_CPY); - pNandSDCardManager->cmdCopyAppNandToSD(pCurrBox->getThumbnail()->getWiiTitleId()); - pChanAppEdit->anmTextFadein(MESG_DATA_COPYING_TO_SD); - } else if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_SLOT_EMPTY) { - pChanAppEdit->anmTextFadein(MESG_DATA_NO_SD_CARD); - mState = CHANEDIT_STATE_ON_END_PROCESS; + case DialogWindow::RESULT_LEFT_BUTTON: { + if (mPage == PAGE_WII) { + if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { + start_process(PROC_CPY); + mpNandSDCardManager->cmdCopyAppNandToSD(mpCurrentBox->getThumbnail()->getWiiTitleId()); + mpChanAppEdit->anmTextFadein(MESG_DATA_COPYING_TO_SD); + } else if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_EJECTED) { + mpChanAppEdit->anmTextFadein(MESG_DATA_NO_SD_CARD); + mState = STATE_ON_END_PROCESS; return; } else { - pChanAppEdit->anmTextFadein(MESG_DATA_SD_PROCESS_FAILED); - mState = CHANEDIT_STATE_ON_END_PROCESS; + mpChanAppEdit->anmTextFadein(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_END_PROCESS; return; } } else { - start_process(CHANEDIT_PROC_CPY); - pNandSDCardManager->cmdCopyAppSDToNand(pCurrBox->getThumbnail()->getSDTitleId()); - pChanAppEdit->anmTextFadein(MESG_DATA_COPYING_TO_WII); + start_process(PROC_CPY); + mpNandSDCardManager->cmdCopyAppSDToNand(mpCurrentBox->getThumbnail()->getSDTitleId()); + mpChanAppEdit->anmTextFadein(MESG_DATA_COPYING_TO_WII); } break; - case DialogWindow::RESULT_RIGHT_BUTTON: - pChanAppEdit->anmSelectFadein(); - mState = CHANEDIT_STATE_ON_EDIT_FADEIN; + } + case DialogWindow::RESULT_RIGHT_BUTTON: { + mpChanAppEdit->anmSelectFadein(); + mState = STATE_ON_EDIT_FADEIN; break; + } } update_sdcard_slot(); } + void ChannelEdit::on_verify_del() { - if (!pChanAppEdit->isIdle()) + if (!mpChanAppEdit->isIdle()) return; switch (System::getDialog()->getLastResult()) { case DialogWindow::RESULT_LEFT_BUTTON: - start_process(CHANEDIT_PROC_DEL); - if (mPage == CHANEDIT_PAGE_WII) { - pNandSDCardManager->cmdDelNandApp(pCurrBox); - if (TVRCManager::getHandle()->isTVRCChannel(ES_TITLE_CODE(pCurrBox->getThumbnail()->getWiiTitleId()))) { + start_process(PROC_DEL); + if (mPage == PAGE_WII) { + mpNandSDCardManager->cmdDelNandApp(mpCurrentBox); + if (TVRCManager::getHandle()->isTVRCChannel(ES_TITLE_CODE(mpCurrentBox->getThumbnail()->getWiiTitleId()))) { TVRCManager::getHandle()->resetProcessAsync(TRUE); } - pChanAppEdit->anmTextFadein(MESG_DATA_ERASING); + mpChanAppEdit->anmTextFadein(MESG_DATA_ERASING); } else { - pNandSDCardManager->cmdDelSDApp(pCurrBox); - pChanAppEdit->anmTextFadein(MESG_DATA_ERASING_SD); + mpNandSDCardManager->cmdDelSDApp(mpCurrentBox); + mpChanAppEdit->anmTextFadein(MESG_DATA_ERASING_SD); } break; case DialogWindow::RESULT_RIGHT_BUTTON: - pChanAppEdit->anmSelectFadein(); - mState = CHANEDIT_STATE_ON_EDIT_FADEIN; + mpChanAppEdit->anmSelectFadein(); + mState = STATE_ON_EDIT_FADEIN; break; } update_sdcard_slot(); } + void ChannelEdit::on_verify_format() { - if (!pChanAppEdit->isIdle()) + if (!mpChanAppEdit->isIdle()) { return; + } switch (System::getDialog()->getLastResult()) { - case DialogWindow::RESULT_LEFT_BUTTON: - start_process(CHANEDIT_PROC_FMT); - pNandSDCardManager->cmdSDFormat(); + case DialogWindow::RESULT_LEFT_BUTTON: { + start_process(PROC_FMT); + mpNandSDCardManager->cmdSDFormat(); break; - case DialogWindow::RESULT_RIGHT_BUTTON: - if (mPage == CHANEDIT_PAGE_WII) { - mState = CHANEDIT_STATE_ON_EDIT; + } + case DialogWindow::RESULT_RIGHT_BUTTON: { + if (mPage == PAGE_WII) { + mState = STATE_ON_EDIT; } else { - pChanAppBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); - mState = CHANEDIT_STATE_ON_SD_MESSAGE1ST; + mpChanAppBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); + mState = STATE_ON_SD_MESSAGE1ST; } break; + } } } - void ChannelEdit::on_end_format() { - if (System::getDialog()->getLastResult() != DialogWindow::RESULT_WAIT) - return; - if (mPage == CHANEDIT_PAGE_WII) { - mState = CHANEDIT_STATE_ON_EDIT; - } else if (pNandSDCardManager->getWorker()->get_sd_state() != NandSDWorker::SD_STATE_INITIAL) { - pChanAppBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); - mState = CHANEDIT_STATE_ON_SD_MESSAGE1ST; - } - } - void ChannelEdit::on_end_del() { - if (!pChanAppEdit->isIdle()) - return; - pNandSDCardManager->cmdCleanQueue(); - pNandSDCardManager->calc(); + void ChannelEdit::on_end_format() { + if (System::getDialog()->getLastResult() != DialogWindow::RESULT_WAIT) { + return; + } + + if (mPage == PAGE_WII) { + mState = STATE_ON_EDIT; + } else if (mpNandSDCardManager->getWorker()->get_sd_state() != NandSDWorker::SD_STATE_INITIAL) { + mpChanAppBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); + mState = STATE_ON_SD_MESSAGE1ST; + } + } + + void ChannelEdit::on_end_del() { + if (!mpChanAppEdit->isIdle()) { + return; + } + + mpNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->calc(); ChanAppBox* box = NULL; - while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) + while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { box->setThumbnail(NULL); + } if (mPage == 0) { - pNandSDCardManager->cmdGetNandFree(); + mpNandSDCardManager->cmdGetNandFree(); send_getthumbnail_cmd(true); } else { - pNandSDCardManager->cmdGetSDFree(); + mpNandSDCardManager->cmdGetSDFree(); send_getthumbnail_cmd(false); } - pChanAppEdit->anmTextFadein(MESG_DATA_ERASED); + + mpChanAppEdit->anmTextFadein(MESG_DATA_ERASED); stop_process(); - mState = CHANEDIT_STATE_ON_END_PROCESS; + mState = STATE_ON_END_PROCESS; } - void ChannelEdit::on_sd_mount() { - if (pNandSDCardManager->isWorking()) - return; - pNandSDCardManager->cmdListSD(); - mState = CHANEDIT_STATE_ON_CHANGE_TAG1ST; - } - void ChannelEdit::on_sd_message1st() { - if (!pChanAppEdit->isIdle()) - return; - SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); - if (sceneSettingButton->update()) { + void ChannelEdit::on_sd_mount() { + if (mpNandSDCardManager->isWorking()) { + return; + } + mpNandSDCardManager->cmdListSD(); + mState = STATE_ON_CHANGE_TAG1ST; + } + + void ChannelEdit::on_sd_message1st() { + if (!mpChanAppEdit->isIdle()) { + return; + } + + SettingButton* settingSel = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); + if (settingSel->update()) { onTrigButton(true); return; } - if (mSdState != pNandSDCardManager->getWorker()->get_sd_state() && pChanAppBase->isIdle()) { - pChanAppBase->anmTextFadeout(); - mState = CHANEDIT_STATE_ON_SD_MESSAGE2ND; + if (mSDState != mpNandSDCardManager->getWorker()->get_sd_state() && mpChanAppBase->isIdle()) { + mpChanAppBase->anmTextFadeout(); + mState = STATE_ON_SD_MESSAGE2ND; } else { - pChanAppBase->update(); + mpChanAppBase->update(); } } + void ChannelEdit::on_sd_message2nd() { - if (!pChanAppBase->isIdle()) + if (!mpChanAppBase->isIdle()) { return; - mState = CHANEDIT_STATE_ON_CHANGE_TAG1ST; + } + mState = STATE_ON_CHANGE_TAG1ST; } + void ChannelEdit::on_sd_message3rd() { - if (!pChanAppBase->isIdle()) + if (!mpChanAppBase->isIdle()) { return; - if (mPage == CHANEDIT_PAGE_WII) { - pChanAppBase->anmChangeWiitoSD(); - mState = CHANEDIT_STATE_ON_CHANGE_TAG1ST; + } + if (mPage == PAGE_WII) { + mpChanAppBase->anmChangeWiitoSD(); + mState = STATE_ON_CHANGE_TAG1ST; } else { - pChanAppBase->anmChangeSDtoWii(); - mState = CHANEDIT_STATE_ON_CHANGE_TAG1ST; + mpChanAppBase->anmChangeSDtoWii(); + mState = STATE_ON_CHANGE_TAG1ST; } } + void ChannelEdit::on_process() { - if (pNandSDCardManager->isWorking()) + if (mpNandSDCardManager->isWorking()) { return; + } - if (!pChanAppEdit->isIdle()) + if (!mpChanAppEdit->isIdle()) { return; + } - int result = pNandSDCardManager->getAsyncResult(); + int result = mpNandSDCardManager->getAsyncResult(); if (result == 0) { - if (mProcessType == CHANEDIT_PROC_FMT) { - pChanAppEdit->anmHideBtn0Dialog(); - } else if (mProcessType == CHANEDIT_PROC_CPY) { - pChanAppEdit->anmTextFadein(MESG_DATA_COPIED); + if (mProcessType == PROC_FMT) { + mpChanAppEdit->anmHideBtn0Dialog(); + } else if (mProcessType == PROC_CPY) { + mpChanAppEdit->anmTextFadein(MESG_DATA_COPIED); System::getChannelManager()->reserveRefresh(); - } else if (mProcessType == CHANEDIT_PROC_DEL) { + } else if (mProcessType == PROC_DEL) { System::getChannelManager()->reserveRefresh(); - pChanAppEdit->anmClear(); - mState = CHANEDIT_STATE_ON_END_DEL; + mpChanAppEdit->anmClear(); + mState = STATE_ON_END_DEL; return; - } else if (mProcessType == CHANEDIT_PROC_MOV) { + } else if (mProcessType == PROC_MOV) { System::getChannelManager()->reserveRefresh(); - pChanAppEdit->anmClear(); - mState = CHANEDIT_STATE_ON_END_MOVE; + mpChanAppEdit->anmClear(); + mState = STATE_ON_END_MOVE; return; } } else { - if (result == NandSDWorker::WORKER_RESULT_ALREADY_EXISTS) { - pChanAppEdit->anmTextFadein(mPage == CHANEDIT_PAGE_WII ? MESG_DATA_ALREADY_EXISTS_SD : MESG_DATA_ALREADY_EXISTS_WII); - } else if (result == NandSDWorker::WORKER_RESULT_NO_SPACE) { - pChanAppEdit->anmTextFadein(mPage == CHANEDIT_PAGE_WII ? MESG_DATA_NOT_ENOUGH_FREE_SD : MESG_DATA_TOO_FEW_RESOURCES); - } else if (result == NandSDWorker::WORKER_RESULT_UNK_N12) { - pChanAppEdit->anmTextFadein(MESG_DATA_FILENAME_CONFLICT); - } else if (result == NandSDWorker::WORKER_RESULT_NOT_TRANSFERRABLE) { - pChanAppEdit->anmTextFadein(mProcessType == CHANEDIT_PROC_MOV ? MESG_DATA_CANT_MOV_CHAN_2_WII : MESG_DATA_CANT_CPY_CHAN_2_WII); - } else if (result == NandSDWorker::WORKER_RESULT_VERSION_ERR) { - pChanAppEdit->anmTextFadein(mProcessType == CHANEDIT_PROC_MOV ? MESG_DATA_CANT_MOV_VERSION_ERR : MESG_DATA_CANT_CPY_VERSION_ERR); + if (result == NandSDWorker::RESULT_ALREADY_EXISTS) { + mpChanAppEdit->anmTextFadein(mPage == PAGE_WII ? MESG_DATA_ALREADY_EXISTS_SD : MESG_DATA_ALREADY_EXISTS_WII); + } else if (result == NandSDWorker::RESULT_OUT_OF_SPACE) { + mpChanAppEdit->anmTextFadein(mPage == PAGE_WII ? MESG_DATA_NOT_ENOUGH_FREE_SD : MESG_DATA_TOO_FEW_RESOURCES); + } else if (result == NandSDWorker::RESULT_UNK_N12) { + mpChanAppEdit->anmTextFadein(MESG_DATA_FILENAME_CONFLICT); + } else if (result == NandSDWorker::RESULT_NOT_TRANSFERRABLE) { + mpChanAppEdit->anmTextFadein(mProcessType == PROC_MOV ? MESG_DATA_CANT_MOV_CHAN_2_WII : MESG_DATA_CANT_CPY_CHAN_2_WII); + } else if (result == NandSDWorker::RESULT_VERSION_ERR) { + mpChanAppEdit->anmTextFadein(mProcessType == PROC_MOV ? MESG_DATA_CANT_MOV_VERSION_ERR : MESG_DATA_CANT_CPY_VERSION_ERR); } else { OSReport("fail: async result = %d\n", result); switch (mProcessType) { - case CHANEDIT_PROC_CPY: - pChanAppEdit->anmTextFadein(MESG_DATA_COPY_UNK_ERROR); + case PROC_CPY: { + mpChanAppEdit->anmTextFadein(MESG_DATA_COPY_UNK_ERROR); break; - case CHANEDIT_PROC_DEL: - pChanAppEdit->anmTextFadein(MESG_DATA_DEL_UNK_ERROR); + } + case PROC_DEL: { + mpChanAppEdit->anmTextFadein(MESG_DATA_DEL_UNK_ERROR); break; - case CHANEDIT_PROC_FMT: - pChanAppEdit->anmHideBtn0Dialog(); + } + case PROC_FMT: { + mpChanAppEdit->anmHideBtn0Dialog(); break; - case CHANEDIT_PROC_MOV: - pChanAppEdit->anmTextFadein(MESG_DATA_MOVE_UNK_ERROR); + } + case PROC_MOV: { + mpChanAppEdit->anmTextFadein(MESG_DATA_MOVE_UNK_ERROR); break; + } } } } stop_process(); - mState = CHANEDIT_STATE_ON_END_PROCESS; + mState = STATE_ON_END_PROCESS; } + void ChannelEdit::on_end_process() { - if (!pChanAppEdit->isIdle()) + if (!mpChanAppEdit->isIdle()) return; - if (mProcessType == CHANEDIT_PROC_FMT) { - if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { - pChanAppEdit->anmShowBtn0Dialog(MESG_DATA_SD_FORMATTED, false, false); - mState = CHANEDIT_STATE_ON_END_FORMAT; + if (mProcessType == PROC_FMT) { + if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { + mpChanAppEdit->anmShowBtn0Dialog(MESG_DATA_SD_FORMATTED, false, false); + mState = STATE_ON_END_FORMAT; } else { - pChanAppEdit->anmShowBtn0Dialog(MESG_DATA_SD_NOT_FORMATTED, false, false); - mState = CHANEDIT_STATE_ON_END_FORMAT; + mpChanAppEdit->anmShowBtn0Dialog(MESG_DATA_SD_NOT_FORMATTED, false, false); + mState = STATE_ON_END_FORMAT; } } else { - pChanAppEdit->anmTextFadeout(); - mState = CHANEDIT_STATE_ON_EDIT_FADEOUT2ND; + mpChanAppEdit->anmTextFadeout(); + mState = STATE_ON_EDIT_FADEOUT2ND; } - mProcessType = CHANEDIT_PROC_NUL; + mProcessType = PROC_NUL; } + void ChannelEdit::on_exist_app() { - if (pNandSDCardManager->isWorking()) + if (mpNandSDCardManager->isWorking()) { return; + } - if (pNandSDCardManager->getAsyncResult() == 0) { + if (mpNandSDCardManager->getAsyncResult() == 0) { switch (mActionIntent) { - case CHANEDIT_INTENT_COPY: - pChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_COPY_Q); - mState = CHANEDIT_STATE_ON_VERIFY_COPY; + case INTENT_COPY: { + mpChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_COPY_Q); + mState = STATE_ON_VERIFY_COPY; break; - - case CHANEDIT_INTENT_MOVE: - pChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_MOVE_Q); - mState = CHANEDIT_STATE_ON_VERIFY_MOVE; + } + case INTENT_MOVE: { + mpChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_MOVE_Q); + mState = STATE_ON_VERIFY_MOVE; break; - - default: + } + default: { break; + } } - mActionIntent = CHANEDIT_INTENT_NONE; - } else if (pNandSDCardManager->getAsyncResult() == 1) { - pChanAppEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_SD); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + mActionIntent = INTENT_NONE; + } else if (mpNandSDCardManager->getAsyncResult() == 1) { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_SD); + mState = STATE_ON_VERIFY1ST; } else { - pChanAppEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + mpChanAppEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_VERIFY1ST; } } + void ChannelEdit::on_sd_mount_only() { - if (pNandSDCardManager->isWorking()) + if (mpNandSDCardManager->isWorking()) { return; + } switch (mActionIntent) { - case CHANEDIT_INTENT_COPY: - mState = CHANEDIT_STATE_ON_TRIG_COPY; + case INTENT_COPY: { + mState = STATE_ON_TRIG_COPY; break; - - case CHANEDIT_INTENT_MOVE: - mState = CHANEDIT_STATE_ON_TRIG_MOVE; + } + case INTENT_MOVE: { + mState = STATE_ON_TRIG_MOVE; break; - - default: + } + default: { break; + } } } void ChannelEdit::on_trig_move() { - if (pNandSDCardManager->isWorking()) - return; - - if (pCurrBox->getThumbnail()->getIsCorrupt()) { - pChanAppEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_MOVED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + if (mpNandSDCardManager->isWorking()) { return; } - if (mPage == CHANEDIT_PAGE_WII) { - if (pCurrBox->getThumbnail()->getMatchesTmpTitle()) { - pChanAppEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_MOVED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + if (mpCurrentBox->getThumbnail()->getIsCorrupt()) { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_MOVED); + mState = STATE_ON_VERIFY1ST; + return; + } + + if (mPage == PAGE_WII) { + if (mpCurrentBox->getThumbnail()->getMatchesTmpTitle()) { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_MOVED); + mState = STATE_ON_VERIFY1ST; return; } - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); - switch (mSdState) { - case NandSDWorker::SD_STATE_SLOT_EMPTY: - pChanAppEdit->anmSelectFadeout(MESG_DATA_NO_SD_CARD); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + mSDState = mpNandSDCardManager->getWorker()->get_sd_state(); + switch (mSDState) { + case NandSDWorker::SD_STATE_EJECTED: { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_NO_SD_CARD); + mState = STATE_ON_VERIFY1ST; break; - case NandSDWorker::SD_STATE_NOT_MOUNTED: + } + case NandSDWorker::SD_STATE_INSERTED: { OSReport("NEED MOUNT\n"); - pNandSDCardManager->cmdSDMount(); - mState = CHANEDIT_STATE_ON_SD_MOUNT_ONLY; + mpNandSDCardManager->cmdSDMount(); + mState = STATE_ON_SD_MOUNT_ONLY; break; - case NandSDWorker::SD_STATE_BROKEN_MEDIA: - case NandSDWorker::SD_STATE_ILLEGAL_MEDIA: - pChanAppEdit->anmSelectFadeout(MESG_DATA_SD_DEVICE_BAD); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_BROKEN: + case NandSDWorker::SD_STATE_ILLEGAL: { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_SD_DEVICE_BAD); + mState = STATE_ON_VERIFY1ST; break; - case NandSDWorker::SD_STATE_READY: - if (pNandSDCardManager->isSDWriteProtected()) { - pChanAppEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_READY: { + if (mpNandSDCardManager->isSDWriteProtected()) { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); + mState = STATE_ON_VERIFY1ST; return; } - pNandSDCardManager->cmdExistSDApp(pCurrBox->getThumbnail()->getWiiTitleId()); - mState = CHANEDIT_STATE_ON_EXIST_APP; - mActionIntent = CHANEDIT_INTENT_MOVE; + mpNandSDCardManager->cmdExistSDApp(mpCurrentBox->getThumbnail()->getWiiTitleId()); + mState = STATE_ON_EXIST_APP; + mActionIntent = INTENT_MOVE; break; - - case NandSDWorker::SD_STATE_ERRORED: - default: - pChanAppEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_ERROR: + default: { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_VERIFY1ST; break; + } } } else { - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); - switch (mSdState) { - case NandSDWorker::SD_STATE_READY: - if (pNandSDCardManager->isSDWriteProtected()) { - pChanAppEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; - } else if (pNandSDCardManager->getAsyncResult() != NandSDWorker::WORKER_RESULT_OK) { - if (pCurrBox->getThumbnail()->getSDTitleId() == (ESTitleId32)pNandSDCardManager->getTmpTitle()) { + mSDState = mpNandSDCardManager->getWorker()->get_sd_state(); + switch (mSDState) { + case NandSDWorker::SD_STATE_READY: { + if (mpNandSDCardManager->isSDWriteProtected()) { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); + mState = STATE_ON_VERIFY1ST; + } else if (mpNandSDCardManager->getAsyncResult() != NandSDWorker::RESULT_OK) { + if (mpCurrentBox->getThumbnail()->getSDTitleId() == (ESTitleId32)mpNandSDCardManager->getTmpTitle()) { u32 numFreeChannels; SCGetFreeChannelAppCount(&numFreeChannels); if (numFreeChannels == 0) { - pChanAppEdit->anmSelectFadeout(MESG_DATA_TOO_FEW_RESOURCES); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + mpChanAppEdit->anmSelectFadeout(MESG_DATA_TOO_FEW_RESOURCES); + mState = STATE_ON_VERIFY1ST; } else { - pChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_MOVE_TO_WII_Q); - mState = CHANEDIT_STATE_ON_VERIFY_MOVE; + mpChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_MOVE_TO_WII_Q); + mState = STATE_ON_VERIFY_MOVE; } } else { - pChanAppEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_WII); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + mpChanAppEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_WII); + mState = STATE_ON_VERIFY1ST; } } else { - pChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_MOVE_TO_WII_Q); - mState = CHANEDIT_STATE_ON_VERIFY_MOVE; + mpChanAppEdit->anmShowS2Btn2Dialog(MESG_DATA_MOVE_TO_WII_Q); + mState = STATE_ON_VERIFY_MOVE; } break; - default: - pChanAppEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); - mState = CHANEDIT_STATE_ON_VERIFY1ST; + } + default: { + mpChanAppEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_VERIFY1ST; break; + } } } } void ChannelEdit::on_verify_move() { - if (!pChanAppEdit->isIdle() || pNandSDCardManager->isWorking()) + if (!mpChanAppEdit->isIdle() || mpNandSDCardManager->isWorking()) { return; + } switch (System::getDialog()->getLastResult()) { - case DialogWindow::RESULT_LEFT_BUTTON: - if (mPage == CHANEDIT_PAGE_WII) { - if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { - start_process(CHANEDIT_PROC_MOV); - pNandSDCardManager->cmdMoveAppNandToSD(pCurrBox); - if (TVRCManager::getHandle()->isTVRCChannel(ES_TITLE_CODE(pCurrBox->getThumbnail()->getWiiTitleId()))) { + case DialogWindow::RESULT_LEFT_BUTTON: { + if (mPage == PAGE_WII) { + if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { + start_process(PROC_MOV); + mpNandSDCardManager->cmdMoveAppNandToSD(mpCurrentBox); + if (TVRCManager::getHandle()->isTVRCChannel(ES_TITLE_CODE(mpCurrentBox->getThumbnail()->getWiiTitleId()))) { TVRCManager::getHandle()->resetProcessAsync(TRUE); } - pChanAppEdit->anmTextFadein(MESG_DATA_MOVING_TO_SD); - } else if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_SLOT_EMPTY) { - pChanAppEdit->anmTextFadein(MESG_DATA_NO_SD_CARD); - mState = CHANEDIT_STATE_ON_END_PROCESS; + mpChanAppEdit->anmTextFadein(MESG_DATA_MOVING_TO_SD); + } else if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_EJECTED) { + mpChanAppEdit->anmTextFadein(MESG_DATA_NO_SD_CARD); + mState = STATE_ON_END_PROCESS; return; } else { - pChanAppEdit->anmTextFadein(MESG_DATA_SD_PROCESS_FAILED); - mState = CHANEDIT_STATE_ON_END_PROCESS; + mpChanAppEdit->anmTextFadein(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_END_PROCESS; return; } } else { - start_process(CHANEDIT_PROC_MOV); - pNandSDCardManager->cmdMoveAppSDToNand(pCurrBox); - pChanAppEdit->anmTextFadein(MESG_DATA_MOVING_TO_WII); + start_process(PROC_MOV); + mpNandSDCardManager->cmdMoveAppSDToNand(mpCurrentBox); + mpChanAppEdit->anmTextFadein(MESG_DATA_MOVING_TO_WII); } break; - case DialogWindow::RESULT_RIGHT_BUTTON: - pChanAppEdit->anmSelectFadein(); - mState = CHANEDIT_STATE_ON_EDIT_FADEIN; + } + case DialogWindow::RESULT_RIGHT_BUTTON: { + mpChanAppEdit->anmSelectFadein(); + mState = STATE_ON_EDIT_FADEIN; break; + } } update_sdcard_slot(); } void ChannelEdit::on_end_move() { - if (!pChanAppEdit->isIdle()) + if (!mpChanAppEdit->isIdle()) { return; + } - pNandSDCardManager->cmdCleanQueue(); - pNandSDCardManager->calc(); + mpNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->calc(); ChanAppBox* box = NULL; - while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) + while (box = (ChanAppBox*)nw4r::ut::List_GetNext(&mChanAppBoxList, box), box != NULL) { box->setThumbnail(NULL); + } - if (mPage == CHANEDIT_PAGE_WII) { - pNandSDCardManager->cmdGetNandFree(); + if (mPage == PAGE_WII) { + mpNandSDCardManager->cmdGetNandFree(); send_getthumbnail_cmd(true); } else { - pNandSDCardManager->cmdGetSDFree(); + mpNandSDCardManager->cmdGetSDFree(); send_getthumbnail_cmd(false); } - pChanAppEdit->anmTextFadein(MESG_DATA_MOVED); + + mpChanAppEdit->anmTextFadein(MESG_DATA_MOVED); stop_process(); - mState = CHANEDIT_STATE_ON_END_PROCESS; + + mState = STATE_ON_END_PROCESS; } } // namespace scene } // namespace ipl diff --git a/src/scene/channelEdit/iplNandSDCardManager.cpp b/src/scene/channelEdit/iplNandSDCardManager.cpp index a8fe0786..696a27d7 100644 --- a/src/scene/channelEdit/iplNandSDCardManager.cpp +++ b/src/scene/channelEdit/iplNandSDCardManager.cpp @@ -1,4 +1,7 @@ #include "scene/channelEdit/iplNandSDCardManager.h" +#include "scene/channelEdit/iplChannelEdit.h" + +#include "titledb.h" // actually needed to match. #pragma sym on @@ -8,11 +11,11 @@ namespace ipl { #define COMMAND_FN(FUNCTION_HEADER, TAG, APP_BOX, SAVE_BOX, WII_TITLE_ID, SD_TITLE_ID) \ void NandSDCardManager::FUNCTION_HEADER { \ Command cmd; \ - cmd.mTag = TAG; \ - cmd.pChanAppBox = APP_BOX; \ - cmd.pSavedataBox = SAVE_BOX; \ - cmd.mWiiTitleId = WII_TITLE_ID; \ - cmd.mSDTitleId = SD_TITLE_ID; \ + cmd.tag = TAG; \ + cmd.chanAppBox = APP_BOX; \ + cmd.savedataBox = SAVE_BOX; \ + cmd.wiiTitleId = WII_TITLE_ID; \ + cmd.sdTitleId = SD_TITLE_ID; \ mCmdQueue.push(cmd); \ } @@ -24,40 +27,41 @@ namespace ipl { } NandSDCardManager::NandSDCardManager(Mode mode) - : mState(MANAGER_STATE_INIT), mMode(mode), pWorker(NULL), pWorkerWorkBuf(NULL), pWorkerDataBuf(NULL), pNandTitleIds(NULL), - pSDTitleIds(NULL), mThumbnailArr(), mBannerArr(), pActiveChanAppBox(NULL), pActiveThumbnail(NULL), pActiveSavedataBox(NULL), - pActiveBanner(NULL), mNandBlocksFree(-1), mSDBlocksFree(-1), mDisableThumbnailFetching(false), mTmpTitleId(0), unk_0xe87a0(false) { - pWorker = new (System::getMem2App()) NandSDWorker(); - pWorkerWorkBuf = System::getMem2App()->alloc(0x3ea60, 0x40); + : mState(STATE_INIT), mMode(mode), mpWorker(NULL), mpWorkerWorkBuf(NULL), mpWorkerDataBuf(NULL), mpNandTitleIds(NULL), mpSDTitleIds(NULL), + mThumbnails(), mBanners(), mpActiveChanAppBox(NULL), mpActiveThumbnail(NULL), mpActiveSavedataBox(NULL), mpActiveBanner(NULL), + mNandBlocksFree(-1), mSDBlocksFree(-1), mbDisableThumbFetch(false), mTmpTitleId(0), unk_0xE87A0(false) { + mpWorker = new (System::getMem2App()) NandSDWorker(); + mpWorkerWorkBuf = System::getMem2App()->alloc(0x3ea60, 0x40); - if (mMode == NAND_MANAGER_MODE_APPS) { + if (mMode == NAND_MODE_APPS) { int heapSize = MEMCalcHeapSizeForUnitHeap(0x19620, 0x60, 0x20); - pWorkerDataBuf = System::getMem2App()->alloc(heapSize + 0x40000, 0x40); + mpWorkerDataBuf = System::getMem2App()->alloc(heapSize + 0x40000, 0x40); } else { int heapSize = MEMCalcHeapSizeForUnitHeap(0xf0c0, 0x5a, 0x20); - pWorkerDataBuf = System::getMem2App()->alloc(heapSize + 0x40000, 0x40); + mpWorkerDataBuf = System::getMem2App()->alloc(heapSize + 0x40000, 0x40); } nw4r::ut::List_Init(&mNandListingList, 0xc); nw4r::ut::List_Init(&mSDListingList, 0xc); for (int i = 0; i < 15; i++) { - mThumbnailArr[i].init(); - mBannerArr[i].init(); + mThumbnails[i].init(); + mBanners[i].init(); } } NandSDCardManager::~NandSDCardManager() { - System::getMem2App()->free(pWorkerWorkBuf); - System::getMem2App()->free(pWorkerDataBuf); - delete pWorker; + System::getMem2App()->free(mpWorkerWorkBuf); + System::getMem2App()->free(mpWorkerDataBuf); + delete mpWorker; TitleListing* listing; listing = NULL; while (listing = (TitleListing*)nw4r::ut::List_GetNext(&mNandListingList, listing), listing != NULL) { - if (listing == NULL) + if (listing == NULL) { break; + } nw4r::ut::List_Remove(&mNandListingList, listing); delete listing; listing = NULL; @@ -65,8 +69,9 @@ namespace ipl { listing = NULL; while (listing = (TitleListing*)nw4r::ut::List_GetNext(&mSDListingList, listing), listing != NULL) { - if (listing == NULL) + if (listing == NULL) { break; + } nw4r::ut::List_Remove(&mSDListingList, listing); delete listing; listing = NULL; @@ -75,97 +80,126 @@ namespace ipl { void NandSDCardManager::calc() { switch (mState) { - case MANAGER_STATE_INIT: + case STATE_INIT: { on_init(); break; - case MANAGER_STATE_CHECK_EXIST: + } + case STATE_CHECK_EXIST: { on_check_exist(); break; - case MANAGER_STATE_STARTUP: + } + case STATE_STARTUP: { on_startup(); break; - case MANAGER_STATE_MOUNT_SD: + } + case STATE_MOUNT_SD: { on_mount_sd(); break; - case MANAGER_STATE_LIST_NANDAPP: + } + case STATE_LIST_NANDAPP: { on_list_nandapp(); break; - case MANAGER_STATE_LIST_SDAPP: + } + case STATE_LIST_SDAPP: { on_list_sdapp(); break; - case MANAGER_STATE_GET_NAND_FREE: + } + case STATE_GET_NAND_FREE: { on_get_nand_free(); break; - case MANAGER_STATE_GET_SD_FREE: + } + case STATE_GET_SD_FREE: { on_get_sd_free(); break; - case MANAGER_STATE_NORMAL: + } + case STATE_NORMAL: { on_normal(); break; - case MANAGER_STATE_TERMINATE: + } + case STATE_TERMINATE: { on_terminate(); break; - case MANAGER_STATE_COPY_NANDSAVE_TO_SD: + } + case STATE_COPY_NANDSAVE_TO_SD: { on_copy_nandsave_to_sd(); break; - case MANAGER_STATE_COPY_SDSAVE_TO_NAND: + } + case STATE_COPY_SDSAVE_TO_NAND: { on_copy_sdsave_to_nand(); break; - case MANAGER_STATE_COPY_NANDAPP_TO_SD: + } + case STATE_COPY_NANDAPP_TO_SD: { on_copy_nandapp_to_sd(); break; - case MANAGER_STATE_COPY_SDAPP_TO_NAND: + } + case STATE_COPY_SDAPP_TO_NAND: { on_copy_sdapp_to_nand(); break; - case MANAGER_STATE_DEL_NANDAPP: + } + case STATE_DEL_NANDAPP: { on_del_nandapp(); break; - case MANAGER_STATE_DEL_NANDSAVE: + } + case STATE_DEL_NANDSAVE: { on_del_nandsave(); break; - case MANAGER_STATE_DEL_SDSAVE: + } + case STATE_DEL_SDSAVE: { on_del_sdsave(); break; - case MANAGER_STATE_DEL_SDAPP: + } + case STATE_DEL_SDAPP: { on_del_sdapp(); break; - case MANAGER_STATE_GET_THUMBNAIL: + } + case STATE_GET_THUMBNAIL: { on_get_thumbnail(); break; - case MANAGER_STATE_GET_THUMBNAIL_SIZE: + } + case STATE_GET_THUMBNAIL_SIZE: { on_get_thumbnail_size(); break; - case MANAGER_STATE_GET_WIIBANNER: + } + case STATE_GET_WIIBANNER: { on_get_wiibanner(); break; - case MANAGER_STATE_GET_WIIBANNER_SIZE: + } + case STATE_GET_WIIBANNER_SIZE: { on_get_wiibanner_size(); break; - case MANAGER_STATE_GET_WIIBANNER_PERMS: + } + case STATE_GET_WIIBANNER_PERMS: { on_get_wiibanner_perms(); break; - case MANAGER_STATE_SC_FLUSH: + } + case STATE_SC_FLUSH: { on_sc_flush(); break; - case MANAGER_STATE_CHANGE_NAND_APP_COUNT: + } + case STATE_CHANGE_NAND_APP_COUNT: { on_change_nand_app_count(); break; - case MANAGER_STATE_MOVE_NANDAPP_TO_SD: + } + case STATE_MOVE_NANDAPP_TO_SD: { on_move_nandapp_to_sd(); break; - case MANAGER_STATE_MOVE_SDAPP_TO_NAND: + } + case STATE_MOVE_SDAPP_TO_NAND: { on_move_sdapp_to_nand(); break; - case MANAGER_STATE_MOVE_NANDSAVE_TO_SD: + } + case STATE_MOVE_NANDSAVE_TO_SD: { on_move_nandsave_to_sd(); break; - case MANAGER_STATE_MOVE_SDSAVE_TO_NAND: + } + case STATE_MOVE_SDSAVE_TO_NAND: { on_move_sdsave_to_nand(); break; - case MANAGER_STATE_CHECK_SD_TITLE_RESTORABLE: + } + case STATE_CHECK_SD_TITLE_RESTORABLE: { on_check_sd_title_restorable(); break; - + } default: break; } @@ -173,45 +207,46 @@ namespace ipl { void NandSDCardManager::cmdGetThumbnail(ChanAppBox* box, int idx, bool isWiiNotSD) { GetThumbnailCmd thumbnailCmd; - thumbnailCmd.pChannelBox = box; - thumbnailCmd.pSavedataBox = NULL; - thumbnailCmd.mIdx = idx; - thumbnailCmd.mIsWiiNotSD = isWiiNotSD; + thumbnailCmd.channelBox = box; + thumbnailCmd.savedataBox = NULL; + thumbnailCmd.idx = idx; + thumbnailCmd.isWii = isWiiNotSD; mThumbCmdQueue.push(thumbnailCmd); } + void NandSDCardManager::cmdGetWiiBanner(SavedataBox* box, int idx, bool isWiiNotSD) { GetThumbnailCmd thumbnailCmd; - thumbnailCmd.pChannelBox = NULL; - thumbnailCmd.pSavedataBox = box; - thumbnailCmd.mIdx = idx; - thumbnailCmd.mIsWiiNotSD = isWiiNotSD; + thumbnailCmd.channelBox = NULL; + thumbnailCmd.savedataBox = box; + thumbnailCmd.idx = idx; + thumbnailCmd.isWii = isWiiNotSD; mThumbCmdQueue.push(thumbnailCmd); } GATED_STATE(NandSDCardManager::on_init, System::isReceiveScheduleStopped(), { - if (mMode == NAND_MANAGER_MODE_APPS) { - pWorker->create(pWorkerWorkBuf, NULL, pWorkerDataBuf, 18); + if (mMode == NAND_MODE_APPS) { + mpWorker->create(mpWorkerWorkBuf, NULL, mpWorkerDataBuf, 18); } else { - pWorker->create(pWorkerWorkBuf, pWorkerDataBuf, NULL, 18); + mpWorker->create(mpWorkerWorkBuf, mpWorkerDataBuf, NULL, 18); } - pWorker->startup_async(); - mState = MANAGER_STATE_STARTUP; + mpWorker->startup_async(); + mState = STATE_STARTUP; }) - GATED_STATE(NandSDCardManager::on_startup, !pWorker->is_working(), { - if (mMode == NAND_MANAGER_MODE_APPS) { - pNandTitleIds = new (System::getMem2App(), 4) ESTitleId[pWorker->get_nand_app_num()]; - pWorker->list_nand_app_async(pNandTitleIds); + GATED_STATE(NandSDCardManager::on_startup, !mpWorker->is_working(), { + if (mMode == NAND_MODE_APPS) { + mpNandTitleIds = new (System::getMem2App(), 4) ESTitleId[mpWorker->get_nand_app_num()]; + mpWorker->list_nand_app_async(mpNandTitleIds); } else { - pNandTitleIds = new (System::getMem2App(), 4) ESTitleId[pWorker->get_nand_save_num()]; - pWorker->list_nand_save_async(pNandTitleIds); + mpNandTitleIds = new (System::getMem2App(), 4) ESTitleId[mpWorker->get_nand_save_num()]; + mpWorker->list_nand_save_async(mpNandTitleIds); } - mState = MANAGER_STATE_LIST_NANDAPP; + mState = STATE_LIST_NANDAPP; }) - GATED_STATE(NandSDCardManager::on_check_exist, !pWorker->is_working(), mState = MANAGER_STATE_NORMAL) - GATED_STATE(NandSDCardManager::on_mount_sd, !pWorker->is_working(), mState = MANAGER_STATE_NORMAL) - GATED_STATE(NandSDCardManager::on_list_nandapp, !pWorker->is_working(), { + GATED_STATE(NandSDCardManager::on_check_exist, !mpWorker->is_working(), mState = STATE_NORMAL) + GATED_STATE(NandSDCardManager::on_mount_sd, !mpWorker->is_working(), mState = STATE_NORMAL) + GATED_STATE(NandSDCardManager::on_list_nandapp, !mpWorker->is_working(), { TitleListing* listing = NULL; while (listing = (TitleListing*)nw4r::ut::List_GetNext(&mNandListingList, listing), listing != NULL) { nw4r::ut::List_Remove(&mNandListingList, listing); @@ -220,32 +255,32 @@ namespace ipl { } mTmpTitleId = SCGetTmpTitleID(); - if (mMode == NAND_MANAGER_MODE_APPS) { - for (int i = 0; i < pWorker->get_nand_app_num(); i++) { - if (mTmpTitleId != 0 && pNandTitleIds[i] == mTmpTitleId) { - nw4r::ut::List_Prepend(&mNandListingList, new (System::getMem2App(), 4) TitleListing(pNandTitleIds[i])); + if (mMode == NAND_MODE_APPS) { + for (int i = 0; i < mpWorker->get_nand_app_num(); i++) { + if (mTmpTitleId != 0 && mpNandTitleIds[i] == mTmpTitleId) { + nw4r::ut::List_Prepend(&mNandListingList, new (System::getMem2App(), 4) TitleListing(mpNandTitleIds[i])); } else { - nw4r::ut::List_Append(&mNandListingList, new (System::getMem2App(), 4) TitleListing(pNandTitleIds[i])); + nw4r::ut::List_Append(&mNandListingList, new (System::getMem2App(), 4) TitleListing(mpNandTitleIds[i])); } } } else { - for (int i = 0; i < pWorker->get_nand_save_num(); i++) { - nw4r::ut::List_Append(&mNandListingList, new (System::getMem2App(), 4) TitleListing(pNandTitleIds[i])); + for (int i = 0; i < mpWorker->get_nand_save_num(); i++) { + nw4r::ut::List_Append(&mNandListingList, new (System::getMem2App(), 4) TitleListing(mpNandTitleIds[i])); } } - delete[] pNandTitleIds; - pWorker->get_nand_user_free_area_async(); - mState = MANAGER_STATE_GET_NAND_FREE; + delete[] mpNandTitleIds; + mpWorker->get_nand_user_free_area_async(); + mState = STATE_GET_NAND_FREE; }) - GATED_STATE(NandSDCardManager::on_get_nand_free, !pWorker->is_working(), { + GATED_STATE(NandSDCardManager::on_get_nand_free, !mpWorker->is_working(), { mNandBlocksFree = (f32)floor((f32)getAsyncResult() / 128 / 1024); - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; }) - GATED_STATE(NandSDCardManager::on_get_sd_free, !pWorker->is_working(), { + GATED_STATE(NandSDCardManager::on_get_sd_free, !mpWorker->is_working(), { mSDBlocksFree = (f32)floor((f32)mSDBytesFree / 128 / 1024); - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; }) - GATED_STATE(NandSDCardManager::on_list_sdapp, !pWorker->is_working(), { + GATED_STATE(NandSDCardManager::on_list_sdapp, !mpWorker->is_working(), { u8* buf = NULL; while (buf = (u8*)nw4r::ut::List_GetNext(&mSDListingList, buf), buf != NULL) { nw4r::ut::List_Remove(&mSDListingList, buf); @@ -253,185 +288,214 @@ namespace ipl { buf = NULL; } - if (mMode == NAND_MANAGER_MODE_APPS) { - for (int i = 0; i < pWorker->get_sd_app_num(); i++) { - nw4r::ut::List_Append(&mSDListingList, new (System::getMem2App(), 4) TitleListing(pSDTitleIds[i])); + if (mMode == NAND_MODE_APPS) { + for (int i = 0; i < mpWorker->get_sd_app_num(); i++) { + nw4r::ut::List_Append(&mSDListingList, new (System::getMem2App(), 4) TitleListing(mpSDTitleIds[i])); } } else { - for (int i = 0; i < pWorker->get_sd_save_num(); i++) { - nw4r::ut::List_Append(&mSDListingList, new (System::getMem2App(), 4) TitleListing(pSDTitleIds[i])); + for (int i = 0; i < mpWorker->get_sd_save_num(); i++) { + nw4r::ut::List_Append(&mSDListingList, new (System::getMem2App(), 4) TitleListing(mpSDTitleIds[i])); } } - delete[] pSDTitleIds; + delete[] mpSDTitleIds; - if (pWorker->get_sd_state() == 6) { - pWorker->get_sd_free_area_async(&mSDBytesFree); - mState = MANAGER_STATE_GET_SD_FREE; + if (mpWorker->get_sd_state() == 6) { + mpWorker->get_sd_free_area_async(&mSDBytesFree); + mState = STATE_GET_SD_FREE; } else { - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; } }) GATED_STATE(NandSDCardManager::on_normal, true, { if (mCmdQueue.current != 0) { Command cmd = mCmdQueue.get_popped_item(); - switch (cmd.mTag) { - case CMD_NUL: + switch (cmd.tag) { + case CMD_NUL: { break; - case CMD_TERMINATE: - pWorker->terminate_async(); - mState = MANAGER_STATE_TERMINATE; + } + case CMD_TERMINATE: { + mpWorker->terminate_async(); + mState = STATE_TERMINATE; break; - case CMD_MOUNT_SD: - pWorker->mount_sd_async(); - mState = MANAGER_STATE_MOUNT_SD; + } + case CMD_MOUNT_SD: { + mpWorker->mount_sd_async(); + mState = STATE_MOUNT_SD; break; - case CMD_FORMAT_SD: - pWorker->format_sd_async(); - mState = MANAGER_STATE_CHECK_EXIST; + } + case CMD_FORMAT_SD: { + mpWorker->format_sd_async(); + mState = STATE_CHECK_EXIST; break; - case CMD_GET_NAND_FREE: - pWorker->get_nand_user_free_area_async(); - mState = MANAGER_STATE_GET_NAND_FREE; + } + case CMD_GET_NAND_FREE: { + mpWorker->get_nand_user_free_area_async(); + mState = STATE_GET_NAND_FREE; break; - case CMD_GET_SD_FREE: - pWorker->get_sd_free_area_async(&mSDBytesFree); - mState = MANAGER_STATE_GET_SD_FREE; + } + case CMD_GET_SD_FREE: { + mpWorker->get_sd_free_area_async(&mSDBytesFree); + mState = STATE_GET_SD_FREE; break; - case CMD_COPY_NANDSAVE_TO_SD: - pWorker->copy_nand_save_to_sd_async(cmd.mWiiTitleId); - mState = MANAGER_STATE_COPY_NANDSAVE_TO_SD; + } + case CMD_COPY_NANDSAVE_TO_SD: { + mpWorker->copy_nand_save_to_sd_async(cmd.wiiTitleId); + mState = STATE_COPY_NANDSAVE_TO_SD; break; - case CMD_COPY_SDSAVE_TO_NAND: - pWorker->copy_sd_save_to_nand_async(cmd.mSDTitleId); - mState = MANAGER_STATE_COPY_SDSAVE_TO_NAND; + } + case CMD_COPY_SDSAVE_TO_NAND: { + mpWorker->copy_sd_save_to_nand_async(cmd.sdTitleId); + mState = STATE_COPY_SDSAVE_TO_NAND; break; - case CMD_COPY_NANDAPP_TO_SD: - pWorker->copy_nand_app_to_sd_async(cmd.mWiiTitleId); - mState = MANAGER_STATE_COPY_NANDAPP_TO_SD; + } + case CMD_COPY_NANDAPP_TO_SD: { + mpWorker->copy_nand_app_to_sd_async(cmd.wiiTitleId); + mState = STATE_COPY_NANDAPP_TO_SD; break; - case CMD_COPY_SDAPP_TO_NAND: - if (cmd.mSDTitleId == (ESTitleId32)mTmpTitleId) { - unk_0xe87a0 = false; - pWorker->check_sd_title_restorable_async(cmd.mSDTitleId); - mState = MANAGER_STATE_CHECK_SD_TITLE_RESTORABLE; + } + case CMD_COPY_SDAPP_TO_NAND: { + if (cmd.sdTitleId == (ESTitleId32)mTmpTitleId) { + unk_0xE87A0 = false; + mpWorker->check_sd_title_restorable_async(cmd.sdTitleId); + mState = STATE_CHECK_SD_TITLE_RESTORABLE; } else { - pWorker->copy_sd_app_to_nand_async(cmd.mSDTitleId, 0); - mState = MANAGER_STATE_COPY_SDAPP_TO_NAND; + mpWorker->copy_sd_app_to_nand_async(cmd.sdTitleId, 0); + mState = STATE_COPY_SDAPP_TO_NAND; } break; - case CMD_DEL_NANDAPP: - // 0x00010000-HAZA is the "Photo Channel 1.1 dummy" - if ((cmd.mWiiTitleId & ~0xFF) == ES_TITLE_ID(0x00010000, 'HAZ\0') || cmd.mWiiTitleId == mTmpTitleId) { - pActiveChanAppBox = cmd.pChanAppBox; - pWorker->delete_nand_app_async(cmd.mWiiTitleId, true); - mState = MANAGER_STATE_DEL_NANDAPP; + } + case CMD_DEL_NANDAPP: { + if ((cmd.wiiTitleId & 0xFFFFFFFFFFFFFF00) == TITLE_PHOTO_2_CHECK || cmd.wiiTitleId == mTmpTitleId) { + mpActiveChanAppBox = cmd.chanAppBox; + mpWorker->delete_nand_app_async(cmd.wiiTitleId, true); + mState = STATE_DEL_NANDAPP; } else { - pActiveChanAppBox = cmd.pChanAppBox; - pWorker->delete_nand_app_async(cmd.mWiiTitleId, false); - mState = MANAGER_STATE_DEL_NANDAPP; + mpActiveChanAppBox = cmd.chanAppBox; + mpWorker->delete_nand_app_async(cmd.wiiTitleId, false); + mState = STATE_DEL_NANDAPP; } break; - case CMD_DEL_SDAPP: - pActiveChanAppBox = cmd.pChanAppBox; - pWorker->delete_sd_app_async(cmd.mSDTitleId); - mState = MANAGER_STATE_DEL_SDAPP; + } + case CMD_DEL_SDAPP: { + mpActiveChanAppBox = cmd.chanAppBox; + mpWorker->delete_sd_app_async(cmd.sdTitleId); + mState = STATE_DEL_SDAPP; break; - case CMD_DEL_NANDSAVE: - pActiveSavedataBox = cmd.pSavedataBox; - pWorker->delete_nand_save_async(cmd.mWiiTitleId); - mState = MANAGER_STATE_DEL_NANDSAVE; + } + case CMD_DEL_NANDSAVE: { + mpActiveSavedataBox = cmd.savedataBox; + mpWorker->delete_nand_save_async(cmd.wiiTitleId); + mState = STATE_DEL_NANDSAVE; break; - case CMD_DEL_SDSAVE: - pActiveSavedataBox = cmd.pSavedataBox; - pWorker->delete_sd_save_async(cmd.mSDTitleId); - mState = MANAGER_STATE_DEL_SDSAVE; + } + case CMD_DEL_SDSAVE: { + mpActiveSavedataBox = cmd.savedataBox; + mpWorker->delete_sd_save_async(cmd.sdTitleId); + mState = STATE_DEL_SDSAVE; break; - case CMD_CLEAN_QUEUE: + } + case CMD_CLEAN_QUEUE: { clean_command_queue(); break; - case CMD_LIST_NAND: - if (mMode == NAND_MANAGER_MODE_APPS) { - pNandTitleIds = new (System::getMem2App(), -32) ESTitleId[pWorker->get_nand_app_num()]; - pWorker->list_nand_app_async(pNandTitleIds); - mState = MANAGER_STATE_LIST_NANDAPP; + } + case CMD_LIST_NAND: { + if (mMode == NAND_MODE_APPS) { + mpNandTitleIds = new (System::getMem2App(), -32) ESTitleId[mpWorker->get_nand_app_num()]; + mpWorker->list_nand_app_async(mpNandTitleIds); + mState = STATE_LIST_NANDAPP; } else { - pNandTitleIds = new (System::getMem2App(), -32) ESTitleId[pWorker->get_nand_save_num()]; - pWorker->list_nand_save_async(pNandTitleIds); - mState = MANAGER_STATE_LIST_NANDAPP; + mpNandTitleIds = new (System::getMem2App(), -32) ESTitleId[mpWorker->get_nand_save_num()]; + mpWorker->list_nand_save_async(mpNandTitleIds); + mState = STATE_LIST_NANDAPP; } break; - case CMD_LIST_SD: - if (pWorker->get_sd_state() == NandSDWorker::SD_STATE_READY) { - if (mMode == NAND_MANAGER_MODE_APPS) { - pSDTitleIds = new (System::getMem2App(), -32) ESTitleId32[pWorker->get_sd_app_num()]; - pWorker->list_sd_app_async(pSDTitleIds); - mState = MANAGER_STATE_LIST_SDAPP; + } + case CMD_LIST_SD: { + if (mpWorker->get_sd_state() == NandSDWorker::SD_STATE_READY) { + if (mMode == NAND_MODE_APPS) { + mpSDTitleIds = new (System::getMem2App(), -32) ESTitleId32[mpWorker->get_sd_app_num()]; + mpWorker->list_sd_app_async(mpSDTitleIds); + mState = STATE_LIST_SDAPP; } else { - pSDTitleIds = new (System::getMem2App(), -32) ESTitleId32[pWorker->get_sd_save_num()]; - pWorker->list_sd_save_async(pSDTitleIds); - mState = MANAGER_STATE_LIST_SDAPP; + mpSDTitleIds = new (System::getMem2App(), -32) ESTitleId32[mpWorker->get_sd_save_num()]; + mpWorker->list_sd_save_async(mpSDTitleIds); + mState = STATE_LIST_SDAPP; } } else { - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; } break; - case CMD_NAND_APP_EXIST: - pWorker->both_app_exist_async(cmd.mSDTitleId); - mState = MANAGER_STATE_CHECK_EXIST; + } + case CMD_NAND_APP_EXIST: { + mpWorker->both_app_exist_async(cmd.sdTitleId); + mState = STATE_CHECK_EXIST; break; - case CMD_NAND_SAVE_EXIST: - pWorker->nand_save_exist_lo_async(cmd.mSDTitleId); - mState = MANAGER_STATE_CHECK_EXIST; + } + case CMD_NAND_SAVE_EXIST: { + mpWorker->nand_save_exist_lo_async(cmd.sdTitleId); + mState = STATE_CHECK_EXIST; break; - case CMD_SD_APP_EXIST: - pWorker->sd_app_exist_async(cmd.mSDTitleId); - mState = MANAGER_STATE_CHECK_EXIST; + } + case CMD_SD_APP_EXIST: { + mpWorker->sd_app_exist_async(cmd.sdTitleId); + mState = STATE_CHECK_EXIST; break; - case CMD_SD_SAVE_EXIST: - pWorker->sd_save_exist_async(cmd.mSDTitleId); - mState = MANAGER_STATE_CHECK_EXIST; + } + case CMD_SD_SAVE_EXIST: { + mpWorker->sd_save_exist_async(cmd.sdTitleId); + mState = STATE_CHECK_EXIST; break; - case CMD_MOVE_NANDAPP_TO_SD: - pActiveChanAppBox = cmd.pChanAppBox; - pWorker->move_nand_app_to_sd_async(cmd.mWiiTitleId); - mState = MANAGER_STATE_MOVE_NANDAPP_TO_SD; + } + case CMD_MOVE_NANDAPP_TO_SD: { + mpActiveChanAppBox = cmd.chanAppBox; + mpWorker->move_nand_app_to_sd_async(cmd.wiiTitleId); + mState = STATE_MOVE_NANDAPP_TO_SD; break; - case CMD_MOVE_SDAPP_TO_NAND: - if (cmd.mSDTitleId == (ESTitleId32)mTmpTitleId) { - pActiveChanAppBox = cmd.pChanAppBox; - unk_0xe87a0 = true; - pWorker->check_sd_title_restorable_async(cmd.mSDTitleId); - mState = MANAGER_STATE_CHECK_SD_TITLE_RESTORABLE; + } + case CMD_MOVE_SDAPP_TO_NAND: { + if (cmd.sdTitleId == (ESTitleId32)mTmpTitleId) { + mpActiveChanAppBox = cmd.chanAppBox; + unk_0xE87A0 = true; + mpWorker->check_sd_title_restorable_async(cmd.sdTitleId); + mState = STATE_CHECK_SD_TITLE_RESTORABLE; } else { - pActiveChanAppBox = cmd.pChanAppBox; - pWorker->move_sd_app_to_nand_async(cmd.mSDTitleId); - mState = MANAGER_STATE_MOVE_SDAPP_TO_NAND; + mpActiveChanAppBox = cmd.chanAppBox; + mpWorker->move_sd_app_to_nand_async(cmd.sdTitleId); + mState = STATE_MOVE_SDAPP_TO_NAND; } break; - case CMD_MOVE_NANDSAVE_TO_SD: - pActiveSavedataBox = cmd.pSavedataBox; - pWorker->move_nand_save_to_sd_async(cmd.mWiiTitleId); - mState = MANAGER_STATE_MOVE_NANDSAVE_TO_SD; + } + case CMD_MOVE_NANDSAVE_TO_SD: { + mpActiveSavedataBox = cmd.savedataBox; + mpWorker->move_nand_save_to_sd_async(cmd.wiiTitleId); + mState = STATE_MOVE_NANDSAVE_TO_SD; break; - case CMD_MOVE_SDSAVE_TO_NAND: - pActiveSavedataBox = cmd.pSavedataBox; - pWorker->move_sd_save_to_nand_async(cmd.mSDTitleId); - mState = MANAGER_STATE_MOVE_SDSAVE_TO_NAND; + } + case CMD_MOVE_SDSAVE_TO_NAND: { + mpActiveSavedataBox = cmd.savedataBox; + mpWorker->move_sd_save_to_nand_async(cmd.sdTitleId); + mState = STATE_MOVE_SDSAVE_TO_NAND; break; + } + default: { + break; + } } mCmdQueue.pop(); } else if (mThumbCmdQueue.current != 0) { - if (pWorker->is_working()) + if (mpWorker->is_working()) { return; + } - if (mDisableThumbnailFetching) + if (mbDisableThumbFetch) { return; + } GetThumbnailCmd thumbnailCmd = mThumbCmdQueue.get_popped_item(); - if (mMode == NAND_MANAGER_MODE_APPS) { + if (mMode == NAND_MODE_APPS) { get_thumbnail(thumbnailCmd); } else { get_wiibanner(thumbnailCmd); @@ -439,328 +503,330 @@ namespace ipl { mThumbCmdQueue.pop(); } }) - GATED_STATE(NandSDCardManager::on_terminate, pWorker->is_terminated(), mState = MANAGER_STATE_STOPPED) - GATED_STATE(NandSDCardManager::on_copy_nandsave_to_sd, !pWorker->is_working(), mState = MANAGER_STATE_NORMAL) - GATED_STATE(NandSDCardManager::on_copy_sdsave_to_nand, !pWorker->is_working(), mState = MANAGER_STATE_NORMAL) - GATED_STATE(NandSDCardManager::on_copy_nandapp_to_sd, !pWorker->is_working(), mState = MANAGER_STATE_NORMAL) - GATED_STATE(NandSDCardManager::on_copy_sdapp_to_nand, !pWorker->is_working(), mState = MANAGER_STATE_NORMAL) - GATED_STATE(NandSDCardManager::on_del_nandapp, !pWorker->is_working(), { + GATED_STATE(NandSDCardManager::on_terminate, mpWorker->is_terminated(), mState = STATE_STOPPED) + GATED_STATE(NandSDCardManager::on_copy_nandsave_to_sd, !mpWorker->is_working(), mState = STATE_NORMAL) + GATED_STATE(NandSDCardManager::on_copy_sdsave_to_nand, !mpWorker->is_working(), mState = STATE_NORMAL) + GATED_STATE(NandSDCardManager::on_copy_nandapp_to_sd, !mpWorker->is_working(), mState = STATE_NORMAL) + GATED_STATE(NandSDCardManager::on_copy_sdapp_to_nand, !mpWorker->is_working(), mState = STATE_NORMAL) + GATED_STATE(NandSDCardManager::on_del_nandapp, !mpWorker->is_working(), { TitleListing* listing = NULL; while (listing = (TitleListing*)nw4r::ut::List_GetNext(&mNandListingList, listing), listing != NULL) { - ESTitleId titleId = pActiveChanAppBox->getThumbnail()->getWiiTitleId(); - if (titleId == listing->mWiiTitleId) { + ESTitleId titleId = mpActiveChanAppBox->getThumbnail()->getWiiTitleId(); + if (titleId == listing->wiiTitleId) { nw4r::ut::List_Remove(&mNandListingList, listing); delete listing; break; } } - if (pActiveChanAppBox->getThumbnail()->getMatchesTmpTitle()) { + if (mpActiveChanAppBox->getThumbnail()->getMatchesTmpTitle()) { SCSetTmpTitleID(0); SCFlushAsync(NULL); - mState = MANAGER_STATE_SC_FLUSH; + mState = STATE_SC_FLUSH; } else { - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; } }) - GATED_STATE(NandSDCardManager::on_del_nandsave, !pWorker->is_working(), { + GATED_STATE(NandSDCardManager::on_del_nandsave, !mpWorker->is_working(), { TitleListing* listing = NULL; while (listing = (TitleListing*)nw4r::ut::List_GetNext(&mNandListingList, listing), listing != NULL) { - ESTitleId titleId = pActiveSavedataBox->getBanner()->getWiiTitleId(); - if (titleId == listing->mWiiTitleId) { + ESTitleId titleId = mpActiveSavedataBox->getBanner()->getWiiTitleId(); + if (titleId == listing->wiiTitleId) { nw4r::ut::List_Remove(&mNandListingList, listing); delete listing; break; } } - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; }) - GATED_STATE(NandSDCardManager::on_del_sdsave, !pWorker->is_working(), { + GATED_STATE(NandSDCardManager::on_del_sdsave, !mpWorker->is_working(), { TitleListing* listing = NULL; while (listing = (TitleListing*)nw4r::ut::List_GetNext(&mSDListingList, listing), listing != NULL) { - u32 titleId = pActiveSavedataBox->getBanner()->getSDTitleId(); - if (titleId == listing->mSDTitleId) { + u32 titleId = mpActiveSavedataBox->getBanner()->getSDTitleId(); + if (titleId == listing->sdTitleId) { nw4r::ut::List_Remove(&mSDListingList, listing); delete listing; break; } } - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; }) - GATED_STATE(NandSDCardManager::on_del_sdapp, !pWorker->is_working(), { + GATED_STATE(NandSDCardManager::on_del_sdapp, !mpWorker->is_working(), { TitleListing* listing = NULL; while (listing = (TitleListing*)nw4r::ut::List_GetNext(&mSDListingList, listing), listing != NULL) { - u32 titleId = pActiveChanAppBox->getThumbnail()->getSDTitleId(); - if (titleId == listing->mSDTitleId) { + u32 titleId = mpActiveChanAppBox->getThumbnail()->getSDTitleId(); + if (titleId == listing->sdTitleId) { nw4r::ut::List_Remove(&mSDListingList, listing); delete listing; break; } } - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; }) - GATED_STATE(NandSDCardManager::on_get_thumbnail, !pWorker->is_working(), { - if (getAsyncResult() > NandSDWorker::WORKER_RESULT_OK || getAsyncResult() == NandSDWorker::WORKER_RESULT_BAD_FILE) { - if (getAsyncResult() == NandSDWorker::WORKER_RESULT_BAD_FILE) { - pActiveThumbnail->setIsCorrupt(true); - ChannelEdit* channelEdit = pActiveChanAppBox->get_channel_edit(); - void* something = *(void**)((int)channelEdit + 0x60); - OSReport("[SSK] HatenaLayout - %p\n", something); - memcpy(pActiveThumbnail->getLytHeapBufRef(), *(void**)((int)something + 0xa0), *(u32*)((int)something + 0x98)); + GATED_STATE(NandSDCardManager::on_get_thumbnail, !mpWorker->is_working(), { + if (getAsyncResult() > NandSDWorker::RESULT_OK || getAsyncResult() == NandSDWorker::RESULT_BAD_FILE) { + if (getAsyncResult() == NandSDWorker::RESULT_BAD_FILE) { + mpActiveThumbnail->setIsCorrupt(true); + + nand::File* hatenaLayout = mpActiveChanAppBox->get_channel_edit()->getHatenaLayout(); + OSReport("[SSK] HatenaLayout - %p\n", hatenaLayout); + memcpy(mpActiveThumbnail->getLytHeapBufRef(), hatenaLayout->getBuffer(), hatenaLayout->getLength()); } - if (pActiveThumbnail->getWiiTitleId() != 0) { - ESTitleId titleId = pActiveThumbnail->getWiiTitleId(); + if (mpActiveThumbnail->getWiiTitleId() != 0) { + ESTitleId titleId = mpActiveThumbnail->getWiiTitleId(); ESTitleId tmpId = mTmpTitleId; if (titleId == tmpId) { - pActiveThumbnail->setMatchesTmpTitle(true); - ChannelEdit* channelEdit = pActiveChanAppBox->get_channel_edit(); - void* something = *(void**)((int)channelEdit + 0x64); - OSReport("NandSDCardManager: %016llx is tmp title.\n", pActiveThumbnail->getWiiTitleId()); - memcpy(pActiveThumbnail->getLytHeapBufRef(), *(void**)((int)something + 0xa0), *(u32*)((int)something + 0x98)); + mpActiveThumbnail->setMatchesTmpTitle(true); + + nand::File* tmpTitleLayout = mpActiveChanAppBox->get_channel_edit()->geTmpTitleLayout(); + OSReport("NandSDCardManager: %016llx is tmp title.\n", mpActiveThumbnail->getWiiTitleId()); + memcpy(mpActiveThumbnail->getLytHeapBufRef(), tmpTitleLayout->getBuffer(), tmpTitleLayout->getLength()); } } - if (pActiveThumbnail->getWiiTitleId() != 0) - pWorker->get_nand_app_size_async(pActiveThumbnail->getWiiTitleId()); - else - pWorker->get_sd_app_size_async(pActiveThumbnail->getSDTitleId()); - - mState = MANAGER_STATE_GET_THUMBNAIL_SIZE; - } else { - OSReport("サムネイルの取得に失敗 %d\n", getAsyncResult()); - mState = MANAGER_STATE_NORMAL; - } - }) - GATED_STATE(NandSDCardManager::on_get_thumbnail_size, !pWorker->is_working(), { - pActiveThumbnail->create(NULL); - pActiveThumbnail->setBlockCount((f32)ceil((f32)getAsyncResult() / 128 / 1024)); - - pActiveChanAppBox->setThumbnail(pActiveThumbnail); - - mState = MANAGER_STATE_NORMAL; - }) - GATED_STATE(NandSDCardManager::on_get_wiibanner, !pWorker->is_working(), { - if (getAsyncResult() == NandSDWorker::WORKER_RESULT_OK) { - if (pActiveBanner->getWiiTitleId() != 0) { - pWorker->get_nand_save_size_async(pActiveBanner->getWiiTitleId()); + if (mpActiveThumbnail->getWiiTitleId() != 0) { + mpWorker->get_nand_app_size_async(mpActiveThumbnail->getWiiTitleId()); } else { - pWorker->get_sd_save_size_async(pActiveBanner->getSDTitleId()); + mpWorker->get_sd_app_size_async(mpActiveThumbnail->getSDTitleId()); } - pActiveBanner->setCorrupt(false); - mState = MANAGER_STATE_GET_WIIBANNER_SIZE; - } else if (getAsyncResult() == NandSDWorker::WORKER_RESULT_BAD_FILE) { - if (pActiveBanner->getWiiTitleId() != 0) { - pWorker->get_nand_save_size_async(pActiveBanner->getWiiTitleId()); - } else { - pWorker->get_sd_save_size_async(pActiveBanner->getSDTitleId()); - } - pActiveBanner->setCorrupt(true); - mState = MANAGER_STATE_GET_WIIBANNER_SIZE; - } else { - mState = MANAGER_STATE_NORMAL; - } - }) - GATED_STATE(NandSDCardManager::on_get_wiibanner_size, !pWorker->is_working(), { - pActiveBanner->create(); - pActiveBanner->setBlockCount((f32)ceil((f32)getAsyncResult() / 128 / 1024)); - if (pActiveBanner->getWiiTitleId() != 0) { - pWorker->get_nand_save_perms_async(pActiveBanner->getWiiTitleId()); + mState = STATE_GET_THUMBNAIL_SIZE; } else { - pWorker->get_sd_save_perms_async(pActiveBanner->getSDTitleId()); + OSReport("サムネイルの取得に失敗 %d\n", getAsyncResult()); /* "Failed to get thumbnail" */ + mState = STATE_NORMAL; } - mState = MANAGER_STATE_GET_WIIBANNER_PERMS; }) - GATED_STATE(NandSDCardManager::on_get_wiibanner_perms, !pWorker->is_working(), { - pActiveBanner->setFilePerms(getAsyncResult()); - pActiveSavedataBox->setBannerFileInfo(pActiveBanner); - mState = MANAGER_STATE_NORMAL; + GATED_STATE(NandSDCardManager::on_get_thumbnail_size, !mpWorker->is_working(), { + mpActiveThumbnail->create(NULL); + mpActiveThumbnail->setBlockCount((f32)ceil((f32)getAsyncResult() / 128 / 1024)); + + mpActiveChanAppBox->setThumbnail(mpActiveThumbnail); + + mState = STATE_NORMAL; + }) + GATED_STATE(NandSDCardManager::on_get_wiibanner, !mpWorker->is_working(), { + if (getAsyncResult() == NandSDWorker::RESULT_OK) { + if (mpActiveBanner->getWiiTitleId() != 0) { + mpWorker->get_nand_save_size_async(mpActiveBanner->getWiiTitleId()); + } else { + mpWorker->get_sd_save_size_async(mpActiveBanner->getSDTitleId()); + } + mpActiveBanner->setCorrupt(false); + mState = STATE_GET_WIIBANNER_SIZE; + } else if (getAsyncResult() == NandSDWorker::RESULT_BAD_FILE) { + if (mpActiveBanner->getWiiTitleId() != 0) { + mpWorker->get_nand_save_size_async(mpActiveBanner->getWiiTitleId()); + } else { + mpWorker->get_sd_save_size_async(mpActiveBanner->getSDTitleId()); + } + mpActiveBanner->setCorrupt(true); + mState = STATE_GET_WIIBANNER_SIZE; + } else { + mState = STATE_NORMAL; + } + }) + GATED_STATE(NandSDCardManager::on_get_wiibanner_size, !mpWorker->is_working(), { + mpActiveBanner->create(); + mpActiveBanner->setBlockCount((f32)ceil((f32)getAsyncResult() / 128 / 1024)); + + if (mpActiveBanner->getWiiTitleId() != 0) { + mpWorker->get_nand_save_perms_async(mpActiveBanner->getWiiTitleId()); + } else { + mpWorker->get_sd_save_perms_async(mpActiveBanner->getSDTitleId()); + } + mState = STATE_GET_WIIBANNER_PERMS; + }) + GATED_STATE(NandSDCardManager::on_get_wiibanner_perms, !mpWorker->is_working(), { + mpActiveBanner->setFilePerms(getAsyncResult()); + mpActiveSavedataBox->setBannerFileInfo(mpActiveBanner); + mState = STATE_NORMAL; }) GATED_STATE(NandSDCardManager::on_sc_flush, SCCheckStatus() != SC_STATUS_BUSY, { mTmpTitleId = 0; System::getChannelManager()->reserveRefresh(); - if (unk_0xe87a0) { - pWorker->delete_sd_app_async(pActiveChanAppBox->getThumbnail()->getSDTitleId()); - mState = MANAGER_STATE_DEL_SDAPP; + if (unk_0xE87A0) { + mpWorker->delete_sd_app_async(mpActiveChanAppBox->getThumbnail()->getSDTitleId()); + mState = STATE_DEL_SDAPP; } else { - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; } }) - GATED_STATE(NandSDCardManager::on_change_nand_app_count, !pWorker->is_working(), { + GATED_STATE(NandSDCardManager::on_change_nand_app_count, !mpWorker->is_working(), { SCSetTmpTitleID(0); SCFlushAsync(NULL); - mState = MANAGER_STATE_SC_FLUSH; + mState = STATE_SC_FLUSH; }) - GATED_STATE(NandSDCardManager::on_check_sd_title_restorable, !pWorker->is_working(), { - if (getAsyncResult() == NandSDWorker::WORKER_RESULT_OK) { - pWorker->change_nand_app_count_async(1); - mState = MANAGER_STATE_CHANGE_NAND_APP_COUNT; + GATED_STATE(NandSDCardManager::on_check_sd_title_restorable, !mpWorker->is_working(), { + if (getAsyncResult() == NandSDWorker::RESULT_OK) { + mpWorker->change_nand_app_count_async(1); + mState = STATE_CHANGE_NAND_APP_COUNT; } else { - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; } }) - GATED_STATE(NandSDCardManager::on_move_nandapp_to_sd, !pWorker->is_working(), { - if (getAsyncResult() == NandSDWorker::WORKER_RESULT_OK) { + GATED_STATE(NandSDCardManager::on_move_nandapp_to_sd, !mpWorker->is_working(), { + if (getAsyncResult() == NandSDWorker::RESULT_OK) { TitleListing* listing = NULL; while (listing = (TitleListing*)nw4r::ut::List_GetNext(&mNandListingList, listing), listing != NULL) { - ESTitleId titleId = pActiveChanAppBox->getThumbnail()->getWiiTitleId(); - if (titleId == listing->mWiiTitleId) { + ESTitleId titleId = mpActiveChanAppBox->getThumbnail()->getWiiTitleId(); + if (titleId == listing->wiiTitleId) { nw4r::ut::List_Remove(&mNandListingList, listing); delete listing; break; } } } - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; }) - GATED_STATE(NandSDCardManager::on_move_sdapp_to_nand, !pWorker->is_working(), { - if (getAsyncResult() == NandSDWorker::WORKER_RESULT_OK) { + GATED_STATE(NandSDCardManager::on_move_sdapp_to_nand, !mpWorker->is_working(), { + if (getAsyncResult() == NandSDWorker::RESULT_OK) { TitleListing* listing = NULL; while (listing = (TitleListing*)nw4r::ut::List_GetNext(&mSDListingList, listing), listing != NULL) { - u32 titleId = pActiveChanAppBox->getThumbnail()->getSDTitleId(); - if (titleId == listing->mSDTitleId) { + u32 titleId = mpActiveChanAppBox->getThumbnail()->getSDTitleId(); + if (titleId == listing->sdTitleId) { nw4r::ut::List_Remove(&mSDListingList, listing); delete listing; break; } } } - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; }) - GATED_STATE(NandSDCardManager::on_move_nandsave_to_sd, !pWorker->is_working(), { - if (getAsyncResult() == NandSDWorker::WORKER_RESULT_OK) { + GATED_STATE(NandSDCardManager::on_move_nandsave_to_sd, !mpWorker->is_working(), { + if (getAsyncResult() == NandSDWorker::RESULT_OK) { TitleListing* listing = NULL; while (listing = (TitleListing*)nw4r::ut::List_GetNext(&mNandListingList, listing), listing != NULL) { - ESTitleId titleId = pActiveSavedataBox->getBanner()->getWiiTitleId(); - if (titleId == listing->mWiiTitleId) { + ESTitleId titleId = mpActiveSavedataBox->getBanner()->getWiiTitleId(); + if (titleId == listing->wiiTitleId) { nw4r::ut::List_Remove(&mNandListingList, listing); delete listing; break; } } } - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; }) - GATED_STATE(NandSDCardManager::on_move_sdsave_to_nand, !pWorker->is_working(), { - if (getAsyncResult() == NandSDWorker::WORKER_RESULT_OK) { + GATED_STATE(NandSDCardManager::on_move_sdsave_to_nand, !mpWorker->is_working(), { + if (getAsyncResult() == NandSDWorker::RESULT_OK) { TitleListing* listing = NULL; while (listing = (TitleListing*)nw4r::ut::List_GetNext(&mSDListingList, listing), listing != NULL) { - u32 titleId = pActiveSavedataBox->getBanner()->getSDTitleId(); - if (titleId == listing->mSDTitleId) { + u32 titleId = mpActiveSavedataBox->getBanner()->getSDTitleId(); + if (titleId == listing->sdTitleId) { nw4r::ut::List_Remove(&mSDListingList, listing); delete listing; break; } } } - mState = MANAGER_STATE_NORMAL; + mState = STATE_NORMAL; }) void NandSDCardManager::clean_command_queue() { OSReport("NandSDCardManager: Clear command que\n"); - while (mThumbCmdQueue.current > 0) + while (mThumbCmdQueue.current > 0) { mThumbCmdQueue.pop(); + } - pActiveChanAppBox = NULL; - pActiveThumbnail = NULL; - pActiveSavedataBox = NULL; - pActiveBanner = NULL; + mpActiveChanAppBox = NULL; + mpActiveThumbnail = NULL; + mpActiveSavedataBox = NULL; + mpActiveBanner = NULL; for (int i = 0; i < 15; i++) { - mThumbnailArr[i].init(); - mBannerArr[i].init(); + mThumbnails[i].init(); + mBanners[i].init(); } } int NandSDCardManager::getAsyncResult() { - int result = pWorker->get_async_result(); - if (result == NandSDWorker::WORKER_RESULT_SYSFILES_CORRUPT) { - System::getErrorHandler()->log("NandSDWorker", NandSDWorker::WORKER_RESULT_SYSFILES_CORRUPT, "iplNandSDCardManager.cpp", 0x4b9); - System::getErrorHandler()->set(ErrorHandler::DEFAULT, MESG_ERR_FILE); - } else if (result == NandSDWorker::WORKER_RESULT_NAND_CORRUPT) { - System::getErrorHandler()->set(ErrorHandler::DEFAULT, MESG_ERR_NAND); + int result = mpWorker->get_async_result(); + if (result == NandSDWorker::RESULT_FA_ERROR) { + IPLErrorLogAndDisplay(MESG_ERR_FILE, "NandSDWorker", NandSDWorker::RESULT_FA_ERROR, 1209); + } else if (result == NandSDWorker::RESULT_NAND_CORRUPT) { + IPLErrorDisplay(MESG_ERR_NAND); } return result; } void NandSDCardManager::get_thumbnail(GetThumbnailCmd cmd) { - if (cmd.mIsWiiNotSD) { - if (cmd.mIdx >= pWorker->get_nand_app_num()) { - cmd.pChannelBox->setThumbnail(NULL); + if (cmd.isWii) { + if (cmd.idx >= mpWorker->get_nand_app_num()) { + cmd.channelBox->setThumbnail(NULL); return; } Thumbnail* freeThumbnail = get_free_thumbnail(); - TitleListing* listing = (TitleListing*)nw4r::ut::List_GetNth(&mNandListingList, cmd.mIdx); + TitleListing* listing = (TitleListing*)nw4r::ut::List_GetNth(&mNandListingList, cmd.idx); if (listing == NULL) { - cmd.pChannelBox->setThumbnail(NULL); + cmd.channelBox->setThumbnail(NULL); return; } - ESTitleId titleId = listing->mWiiTitleId; + ESTitleId titleId = listing->wiiTitleId; freeThumbnail->setWiiTitleId(titleId); freeThumbnail->setSDTitleId(0); - pWorker->get_nand_app_thumbnail_async(titleId, freeThumbnail->getLytHeapBufRef(), freeThumbnail->getChanMetaRef()); - pActiveChanAppBox = cmd.pChannelBox; - pActiveThumbnail = freeThumbnail; - mState = MANAGER_STATE_GET_THUMBNAIL; + mpWorker->get_nand_app_thumbnail_async(titleId, freeThumbnail->getLytHeapBufRef(), freeThumbnail->getChanMetaRef()); + mpActiveChanAppBox = cmd.channelBox; + mpActiveThumbnail = freeThumbnail; + mState = STATE_GET_THUMBNAIL; } else { - if (cmd.mIdx >= pWorker->get_sd_app_num()) { - cmd.pChannelBox->setThumbnail(NULL); + if (cmd.idx >= mpWorker->get_sd_app_num()) { + cmd.channelBox->setThumbnail(NULL); return; } Thumbnail* freeThumbnail = get_free_thumbnail(); - TitleListing* listing = (TitleListing*)nw4r::ut::List_GetNth(&mSDListingList, cmd.mIdx); + TitleListing* listing = (TitleListing*)nw4r::ut::List_GetNth(&mSDListingList, cmd.idx); if (listing == NULL) { - cmd.pChannelBox->setThumbnail(NULL); + cmd.channelBox->setThumbnail(NULL); return; } freeThumbnail->setWiiTitleId(0); - ESTitleId32 titleId = listing->mSDTitleId; + ESTitleId32 titleId = listing->sdTitleId; freeThumbnail->setSDTitleId(titleId); - pWorker->get_sd_app_thumbnail_async(titleId, freeThumbnail->getLytHeapBufRef(), freeThumbnail->getChanMetaRef()); - pActiveChanAppBox = cmd.pChannelBox; - pActiveThumbnail = freeThumbnail; - mState = MANAGER_STATE_GET_THUMBNAIL; + mpWorker->get_sd_app_thumbnail_async(titleId, freeThumbnail->getLytHeapBufRef(), freeThumbnail->getChanMetaRef()); + mpActiveChanAppBox = cmd.channelBox; + mpActiveThumbnail = freeThumbnail; + mState = STATE_GET_THUMBNAIL; } } + void NandSDCardManager::get_wiibanner(GetThumbnailCmd cmd) { - if (cmd.mIsWiiNotSD) { - if (cmd.mIdx >= pWorker->get_nand_save_num()) { - cmd.pSavedataBox->setBannerFileInfo(NULL); + if (cmd.isWii) { + if (cmd.idx >= mpWorker->get_nand_save_num()) { + cmd.savedataBox->setBannerFileInfo(NULL); return; } WiiBannerFileInfo* freeBanner = get_free_banner(); - TitleListing* listing = (TitleListing*)nw4r::ut::List_GetNth(&mNandListingList, cmd.mIdx); + TitleListing* listing = (TitleListing*)nw4r::ut::List_GetNth(&mNandListingList, cmd.idx); if (listing == NULL) { - cmd.pSavedataBox->setBannerFileInfo(NULL); + cmd.savedataBox->setBannerFileInfo(NULL); return; } - ESTitleId titleId = listing->mWiiTitleId; + ESTitleId titleId = listing->wiiTitleId; freeBanner->setWiiTitleId(titleId); freeBanner->setSDTitleId(0); - pWorker->get_nand_save_banner_async(titleId, freeBanner->getDataRef()); - pActiveSavedataBox = cmd.pSavedataBox; - pActiveBanner = freeBanner; - mState = MANAGER_STATE_GET_WIIBANNER; + mpWorker->get_nand_save_banner_async(titleId, freeBanner->getData()); + mpActiveSavedataBox = cmd.savedataBox; + mpActiveBanner = freeBanner; + mState = STATE_GET_WIIBANNER; } else { - if (cmd.mIdx >= pWorker->get_sd_save_num()) { - cmd.pSavedataBox->setBannerFileInfo(NULL); + if (cmd.idx >= mpWorker->get_sd_save_num()) { + cmd.savedataBox->setBannerFileInfo(NULL); return; } WiiBannerFileInfo* freeBanner = get_free_banner(); - TitleListing* listing = (TitleListing*)nw4r::ut::List_GetNth(&mSDListingList, cmd.mIdx); + TitleListing* listing = (TitleListing*)nw4r::ut::List_GetNth(&mSDListingList, cmd.idx); if (listing == NULL) { - cmd.pSavedataBox->setBannerFileInfo(NULL); + cmd.savedataBox->setBannerFileInfo(NULL); return; } freeBanner->setWiiTitleId(0); - ESTitleId32 titleId = listing->mSDTitleId; + ESTitleId32 titleId = listing->sdTitleId; freeBanner->setSDTitleId(titleId); - pWorker->get_sd_save_banner_async(titleId, freeBanner->getDataRef()); - pActiveSavedataBox = cmd.pSavedataBox; - pActiveBanner = freeBanner; - mState = MANAGER_STATE_GET_WIIBANNER; + mpWorker->get_sd_save_banner_async(titleId, freeBanner->getData()); + mpActiveSavedataBox = cmd.savedataBox; + mpActiveBanner = freeBanner; + mState = STATE_GET_WIIBANNER; } } @@ -785,27 +851,28 @@ namespace ipl { COMMAND_FN(cmdExistNandSave(ESTitleId32 titleId), CMD_NAND_SAVE_EXIST, NULL, NULL, 0, titleId); COMMAND_FN(cmdExistSDApp(ESTitleId32 titleId), CMD_SD_APP_EXIST, NULL, NULL, 0, titleId); COMMAND_FN(cmdExistSDSave(ESTitleId32 titleId), CMD_SD_SAVE_EXIST, NULL, NULL, 0, titleId); - COMMAND_FN(cmdMoveAppNandToSD(ChanAppBox* box), CMD_MOVE_NANDAPP_TO_SD, box, NULL, box->getThumbnail()->getWiiTitleId(), 0); - COMMAND_FN(cmdMoveAppSDToNand(ChanAppBox* box), CMD_MOVE_SDAPP_TO_NAND, box, NULL, 0, box->getThumbnail()->getSDTitleId()); + COMMAND_FN(cmdMoveAppNandToSD(ChanAppBox* box), CMD_MOVE_NANDAPP_TO_SD, box, NULL, box->getThumbnail()->getWiiTitleId(), 0); + COMMAND_FN(cmdMoveAppSDToNand(ChanAppBox* box), CMD_MOVE_SDAPP_TO_NAND, box, NULL, 0, box->getThumbnail()->getSDTitleId()); COMMAND_FN(cmdMoveSaveNandToSD(SavedataBox* box), CMD_MOVE_NANDSAVE_TO_SD, NULL, box, box->getBanner()->getWiiTitleId(), 0); COMMAND_FN(cmdMoveSaveSDToNand(SavedataBox* box), CMD_MOVE_SDSAVE_TO_NAND, NULL, box, 0, box->getBanner()->getSDTitleId()); // clang-format on Thumbnail* NandSDCardManager::get_free_thumbnail() { for (int i = 0; i < 15; i++) { - if (mThumbnailArr[i].getWiiTitleId() == 0) { - if (mThumbnailArr[i].getSDTitleId() == 0) { - return &mThumbnailArr[i]; + if (mThumbnails[i].getWiiTitleId() == 0) { + if (mThumbnails[i].getSDTitleId() == 0) { + return &mThumbnails[i]; } } } return NULL; } + WiiBannerFileInfo* NandSDCardManager::get_free_banner() { for (int i = 0; i < 15; i++) { - if (mBannerArr[i].getWiiTitleId() == 0) { - if (mBannerArr[i].getSDTitleId() == 0) { - return &mBannerArr[i]; + if (mBanners[i].getWiiTitleId() == 0) { + if (mBanners[i].getSDTitleId() == 0) { + return &mBanners[i]; } } } diff --git a/src/scene/kitayamaTest/iplKitayamaTest.cpp b/src/scene/kitayamaTest/iplKitayamaTest.cpp index d2874c85..94a6793d 100644 --- a/src/scene/kitayamaTest/iplKitayamaTest.cpp +++ b/src/scene/kitayamaTest/iplKitayamaTest.cpp @@ -8,6 +8,8 @@ #include "iplSystem.h" #include "utility/iplGraphics.h" +#include "system/iplSaveBanner.h" + namespace ipl { namespace kitayama { class NandSDWorker_AutoTest { @@ -93,7 +95,6 @@ namespace ipl { } break; } - case 2: { s32 result; NANDFileInfo bannerInfo; @@ -105,82 +106,82 @@ namespace ipl { ISFS_OpenLib(); nand::wrapper::Delete("/title/00010000/30303030/data/banner.bin"); - result = nand::wrapper::Create("/title/00010000/30303030/data/banner.bin", 0x3F, 0); + result = nand::wrapper::Create("/title/00010000/30303030/data/banner.bin", NAND_PERM_ALL_RW, 0); if (result == 0) { - result = nand::wrapper::Open("/title/00010000/30303030/data/banner.bin", &bannerInfo, 2); + result = nand::wrapper::Open("/title/00010000/30303030/data/banner.bin", &bannerInfo, NAND_ACCESS_WRITE); if (result != 0) { OSReport(" NANDOpen failed: %d\n", result); - OSPanic("iplKitayamaTest.cpp", 0xAD, "Terminated.\n"); + OSHalt("Terminated.\n", 173); } - buffer = (u8*)unk_0x58->alloc(0xF0A0, 0x20); - memset(buffer, 0x55, 0xF0A0); - ((u32*)buffer)[0] = 0x5749424E; + buffer = (u8*)unk_0x58->alloc(sizeof(WIISaveBannerFile), 32); + memset(buffer, 0x55, sizeof(WIISaveBannerFile)); + ((u32*)buffer)[0] = 'WBIN'; ((u32*)buffer)[1] = 0; - result = nand::wrapper::Write(&bannerInfo, buffer, 0xF0A0); - if ((u32)result != 0xF0A0) { - OSReport(" NANDWrite failed: %d\n", result); - OSPanic("iplKitayamaTest.cpp", 0xB8, "Terminated.\n"); + u32 read = nand::wrapper::Write(&bannerInfo, buffer, sizeof(WIISaveBannerFile)); + if (read != sizeof(WIISaveBannerFile)) { + OSReport(" NANDWrite failed: %d\n", read); + OSHalt("Terminated.\n", 184); } result = nand::wrapper::Close(&bannerInfo); - if (result != 0) { + if (result != NAND_RESULT_OK) { OSReport(" NANDClose failed: %d\n", result); - OSPanic("iplKitayamaTest.cpp", 0xBE, "Terminated.\n"); + OSHalt("Terminated.\n", 190); } unk_0x58->free(buffer); - } else if (result == -6) { + } else if (result == NAND_RESULT_EXISTS) { OSReport("banner.bin already exist.\n"); } else { OSReport(" NANDCreate failed: %d\n", result); - OSPanic("iplKitayamaTest.cpp", 0xC6, "Terminated.\n"); + OSHalt("Terminated.\n", 198); } - result = nand::wrapper::Create("/title/00010000/30303030/data/test1.bin", 0x3F, 0); + result = nand::wrapper::Create("/title/00010000/30303030/data/test1.bin", NAND_PERM_ALL_RW, 0); if (result == 0) { - result = nand::wrapper::Open("/title/00010000/30303030/data/test1.bin", &testInfo, 2); + result = nand::wrapper::Open("/title/00010000/30303030/data/test1.bin", &testInfo, NAND_ACCESS_WRITE); if (result != 0) { OSReport(" NANDOpen failed: %d\n", result); - OSPanic("iplKitayamaTest.cpp", 0xD5, "Terminated.\n"); + OSHalt("Terminated.\n", 213); } - buffer = (u8*)unk_0x58->alloc(0xF0A0, 0x20); - memset(buffer, 0x55, 0xF0A0); - ((u32*)buffer)[0] = 0x5749424E; + buffer = (u8*)unk_0x58->alloc(sizeof(WIISaveBannerFile), 32); + memset(buffer, 0x55, sizeof(WIISaveBannerFile)); + ((u32*)buffer)[0] = 'WBIN'; ((u32*)buffer)[1] = 0; - result = nand::wrapper::Write(&testInfo, buffer, 0xF0A0); - if ((u32)result != 0xF0A0) { - OSReport(" NANDWrite failed: %d\n", result); - OSPanic("iplKitayamaTest.cpp", 0xE0, "Terminated.\n"); + u32 read = nand::wrapper::Write(&testInfo, buffer, sizeof(WIISaveBannerFile)); + if (read != sizeof(WIISaveBannerFile)) { + OSReport(" NANDWrite failed: %d\n", read); + OSHalt("Terminated.\n", 224); } result = nand::wrapper::Close(&testInfo); if (result != 0) { OSReport(" NANDClose failed: %d\n", result); - OSPanic("iplKitayamaTest.cpp", 0xE6, "Terminated.\n"); + OSHalt("Terminated.\n", 230); } unk_0x58->free(buffer); - } else if (result == -6) { + } else if (result == NAND_RESULT_EXISTS) { OSReport("test1.bin already exist.\n"); } else { OSReport(" NANDCreate failed: %d\n", result); - OSPanic("iplKitayamaTest.cpp", 0xEE, "Terminated.\n"); + OSHalt("Terminated.\n", 238); } - result = nand::wrapper::CreateDir("/title/00010000/30303030/data/nocopy", 0x3F, 0); - if (result != 0 && result != -6) { + result = nand::wrapper::CreateDir("/title/00010000/30303030/data/nocopy", NAND_PERM_ALL_RW, 0); + if (result != 0 && result != NAND_RESULT_EXISTS) { OSReport(" NANDCreateDir failed: %d\n", result); - OSPanic("iplKitayamaTest.cpp", 0xF8, "Terminated.\n"); + OSHalt("Terminated.\n", 248); } - result = nand::wrapper::Create("/title/00010000/30303030/data/nocopy/test1.txt", 0x3F, 0); - if (result != 0 && result != -6) { + result = nand::wrapper::Create("/title/00010000/30303030/data/nocopy/test1.txt", NAND_PERM_ALL_RW, 0); + if (result != 0 && result != NAND_RESULT_EXISTS) { OSReport(" NANDCreate failed: %d\n", result); - OSPanic("iplKitayamaTest.cpp", 0xFE, "Terminated.\n"); + OSHalt("Terminated.\n", 254); } ES_SetUid(SYSMENU_TITLE_ID); @@ -193,13 +194,11 @@ namespace ipl { unk_0x60 = 3; break; } - case 3: { unk_0x64->start_save_test((void*)unk_0x68, (void*)unk_0x6C, 0x18); unk_0x60 = 4; break; } - case 4: { if (unk_0x64->process() == 0x51) { unk_0x60 = 12; @@ -208,13 +207,11 @@ namespace ipl { } break; } - case 5: { unk_0x64->start_app_test((void*)unk_0x68, (void*)unk_0x6C, 0x18); unk_0x60 = 6; break; } - case 6: { if (unk_0x64->process() == 0x51) { unk_0x60 = 12; @@ -223,14 +220,12 @@ namespace ipl { } break; } - case 7: { System::stopReceiveSchedule(); unk_0x68 = (u32)System::getMem2App()->alloc(0x3EA60, 0x40); unk_0x60 = 8; break; } - case 8: { if (System::isReceiveScheduleStopped()) { System::getNandManager()->closeContentsAll(); @@ -249,14 +244,12 @@ namespace ipl { } break; } - case 9: { if (unk_0x64->process() == 0x51 || unk_0x64->process() == 0x52) { unk_0x60 = 10; } break; } - case 10: { int result = unk_0x64->get_result(); System::getNandManager()->openContentsAll(); @@ -272,7 +265,6 @@ namespace ipl { } break; } - case 11: case 12: { if (controller->downTrg(controller::REVO_BTN_1)) { diff --git a/src/scene/memory/iplMemory.cpp b/src/scene/memory/iplMemory.cpp index 06c1ed85..c0d94187 100644 --- a/src/scene/memory/iplMemory.cpp +++ b/src/scene/memory/iplMemory.cpp @@ -8,12 +8,6 @@ namespace ipl { namespace scene { - typedef struct { - wchar_t digits[10]; - } SCNumber; - static const SCNumber scNumber = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; - static const SCNumber scNumber2 = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; - // clang-format off const char* panes[3][15] = { "N_Data_a_00", "N_Data_a_01", "N_Data_a_02", "N_Data_a_03", "N_Data_a_04", @@ -31,16 +25,17 @@ namespace ipl { // clang-format on Memory::Memory(EGG::Heap* heap) - : scene::Base(heap), mState(MEMORY_STATE_ON_NORMAL), pSavedataBase(NULL), pSavedataEdit(NULL), pNandSDCardManager(NULL), - mPage(MEMORY_PAGE_WII), pCurrBox(NULL), mPageOffset(0), mSdState(NandSDWorker::SD_STATE_INITIAL), mArwRVisible(false), - mArwLVisible(false), mProcessType(MEMORY_PROC_NUL) { + : scene::Base(heap), mState(STATE_ON_NORMAL), mpSavedataBase(NULL), mpSavedataEdit(NULL), mpNandSDCardManager(NULL), + mPage(MEMORY_PAGE_WII), mpCurrentBox(NULL), mPageOffset(0), mSdState(NandSDWorker::SD_STATE_INITIAL), mArwRVisible(false), + mArwLVisible(false), mProcessType(PROC_NUL) { System::stopReceiveSchedule(); nw4r::ut::List_Init(&mSavedataBoxList, offsetof(SavedataBox, mLink)); } + Memory::~Memory() { - delete pSavedataBase; - delete pSavedataEdit; - delete pNandSDCardManager; + delete mpSavedataBase; + delete mpSavedataEdit; + delete mpNandSDCardManager; SavedataBox* currBox = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, NULL); while (currBox != NULL) { @@ -50,16 +45,16 @@ namespace ipl { } for (int i = 0; i < 15; i++) { - delete mTextBalloonArr[i]; + delete mpBalloons[i]; } } void Memory::prepare() { System::getBS2Manager()->abort(); - pWiiMemLytFile = System::getNandManager()->readLayoutAsync(getSceneHeap(), "wiiMem.ash"); - pBalloonLytFile = System::getNandManager()->readLayoutAsync(getSceneHeap(), "balloon.ash"); - pCorruptTexFile = System::getNandManager()->readAsync(getSceneHeap(), "corrupt_texture.tpl"); + mpLayout = System::getNandManager()->readLayoutAsync(getSceneHeap(), "wiiMem.ash"); + mpBalloonFilm = System::getNandManager()->readLayoutAsync(getSceneHeap(), "balloon.ash"); + mpCorruptFile = System::getNandManager()->readAsync(getSceneHeap(), "corrupt_texture.tpl"); } void Memory::create() { @@ -76,172 +71,201 @@ namespace ipl { ES_SetUid(SYSMENU_TITLE_ID); - pSavedataBase = new SavedataBase(System::getMem2App(), pWiiMemLytFile, "arc", "it_ObjCubeEdit_a.brlyt"); - pSavedataBase->anmFadein(); + mpSavedataBase = new SavedataBase(System::getMem2App(), mpLayout, "arc", "it_ObjCubeEdit_a.brlyt"); + mpSavedataBase->anmFadein(); for (int i = 0; i < 45; i++) { - nw4r::ut::List_Append(&mSavedataBoxList, new SavedataBox(System::getMem2App(), pWiiMemLytFile, "arc", "it_ObjDataEdit_b.brlyt")); + nw4r::ut::List_Append(&mSavedataBoxList, new SavedataBox(System::getMem2App(), mpLayout, "arc", "it_ObjDataEdit_b.brlyt")); } - pSavedataEdit = new SavedataEdit(System::getMem2App(), pWiiMemLytFile, "arc", "081210_sys4_mn_DataDetail_a.brlyt"); + mpSavedataEdit = new SavedataEdit(System::getMem2App(), mpLayout, "arc", "081210_sys4_mn_DataDetail_a.brlyt"); - pNandSDCardManager = new (System::getMem2App(), 32) NandSDCardManager(NandSDCardManager::NAND_MANAGER_MODE_SAVES); + mpNandSDCardManager = new (System::getMem2App(), 32) NandSDCardManager(NandSDCardManager::NAND_MODE_SAVES); - for (int i = 0; i < 15; i++) { - nw4r::lyt::Pane* currPane = pSavedataBase->getLytObject()->FindPaneByName(panes[1][i]); + for (int i = 0; i < MAX_BALLOONS; i++) { + nw4r::lyt::Pane* currPane = mpSavedataBase->getLytObject()->FindPaneByName(panes[1][i]); nw4r::math::VEC3 translation(0, 0, 0); PSMTXMultVec(currPane->GetGlobalMtx(), translation, translation); translation.y -= 55.0f; - mTextBalloonArr[i] = new TextBalloon(getSceneHeap(), pBalloonLytFile, "arc", "my_IplTopBalloon_a.brlyt", translation, 90.f, 60.f); + mpBalloons[i] = new TextBalloon(getSceneHeap(), mpBalloonFilm, "arc", "my_IplTopBalloon_a.brlyt", translation, 90.f, 60.f); SavedataBox* box = (SavedataBox*)nw4r::ut::List_GetNth(&mSavedataBoxList, i + 15); - box->setTextBalloon(mTextBalloonArr[i]); + box->setTextBalloon(mpBalloons[i]); } - TPLBind((TPLPalette*)pCorruptTexFile->getBuffer()); + TPLBind((TPLPalette*)mpCorruptFile->getBuffer()); send_getbanner_cmd(true); - mState = MEMORY_STATE_ON_FADEIN1ST; + mState = STATE_ON_FADEIN1ST; } void Memory::calc() { - pNandSDCardManager->calc(); + mpNandSDCardManager->calc(); SettingSelect* sceneSettingSelect = (SettingSelect*)System::getScene(SCENE_SETTING_SELECT); if (!sceneSettingSelect->isWaitingChild()) return; - pSavedataBase->calc(); + mpSavedataBase->calc(); SavedataBox* currBox = NULL; while (currBox = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, currBox), currBox != NULL) currBox->calc(); - pSavedataEdit->calc(); + mpSavedataEdit->calc(); - for (int i = 0; i < 15; i++) - mTextBalloonArr[i]->calc(); + for (int i = 0; i < MAX_BALLOONS; i++) + mpBalloons[i]->calc(); switch (mState) { - case MEMORY_STATE_ON_NORMAL: + case STATE_ON_NORMAL: { on_normal(); break; - case MEMORY_STATE_ON_FADEIN1ST: + } + case STATE_ON_FADEIN1ST: { on_fadein1st(); break; - case MEMORY_STATE_ON_FADEIN2ND: + } + case STATE_ON_FADEIN2ND: { on_fadein2nd(); break; - case MEMORY_STATE_ON_FADEOUT1ST: + } + case STATE_ON_FADEOUT1ST: { on_fadeout1st(); break; - case MEMORY_STATE_ON_FADEOUT2ND: + } + case STATE_ON_FADEOUT2ND: { on_fadeout2nd(); break; - case MEMORY_STATE_ON_SCROLL_R: + } + case STATE_ON_SCROLL_R: { on_scroll_r(); break; - case MEMORY_STATE_ON_SCROLL_L: + } + case STATE_ON_SCROLL_L: { on_scroll_l(); break; - case MEMORY_STATE_ON_CHANGE_TAG1ST: + } + case STATE_ON_CHANGE_TAG1ST: { on_change_tag1st(); break; - case MEMORY_STATE_ON_CHANGE_TAG2ND: + } + case STATE_ON_CHANGE_TAG2ND: { on_change_tag2nd(); break; - case MEMORY_STATE_ON_TRIG_COPY: + } + case STATE_ON_TRIG_COPY: { on_trig_copy(); break; - case MEMORY_STATE_ON_UNUSED_0x0A: + } + case STATE_10: { break; - case MEMORY_STATE_ON_EDIT: + } + case STATE_ON_EDIT: { on_edit(); break; - case MEMORY_STATE_ON_EDIT_FADEIN: + } + case STATE_ON_EDIT_FADEIN: { on_edit_fadein(); break; - case MEMORY_STATE_ON_EDIT_FADEOUT1ST: + } + case STATE_ON_EDIT_FADEOUT1ST: { on_edit_fadeout1st(); break; - case MEMORY_STATE_ON_EDIT_FADEOUT2ND: + } + case STATE_ON_EDIT_FADEOUT2ND: { on_edit_fadeout2nd(); break; - case MEMORY_STATE_ON_VERIFY1ST: + } + case STATE_ON_VERIFY1ST: { on_verify1st(); break; - case MEMORY_STATE_ON_VERIFY2ND: + } + case STATE_ON_VERIFY2ND: { on_verify2nd(); break; - case MEMORY_STATE_ON_VERIFY_COPY: + } + case STATE_ON_VERIFY_COPY: { on_verify_copy(); break; - case MEMORY_STATE_ON_VERIFY_DEL: + } + case STATE_ON_VERIFY_DEL: { on_verify_del(); break; - case MEMORY_STATE_ON_VERIFY_FORMAT: + } + case STATE_ON_VERIFY_FORMAT: { on_verify_format(); break; - case MEMORY_STATE_ON_END_FORMAT: + } + case STATE_ON_END_FORMAT: { on_end_format(); break; - case MEMORY_STATE_ON_SD_MOUNT: + } + case STATE_ON_SD_MOUNT: { on_sd_mount(); break; - case MEMORY_STATE_ON_SD_MESSAGE1ST: + } + case STATE_ON_SD_MESSAGE1ST: { on_sd_message1st(); break; - case MEMORY_STATE_ON_SD_MESSAGE2ND: + } + case STATE_ON_SD_MESSAGE2ND: { on_sd_message2nd(); break; - case MEMORY_STATE_ON_SD_MESSAGE3RD: + } + case STATE_ON_SD_MESSAGE3RD: { on_sd_message3rd(); break; - case MEMORY_STATE_ON_PROCESS: + } + case STATE_ON_PROCESS: { on_process(); break; - case MEMORY_STATE_ON_END_PROCESS: + } + case STATE_ON_END_PROCESS: { on_end_process(); break; - case MEMORY_STATE_ON_EXIST_SAVE: + } + case STATE_ON_EXIST_SAVE: { on_exist_save(); break; - case MEMORY_STATE_ON_SD_MOUNT_ONLY: + } + case STATE_ON_SD_MOUNT_ONLY: { on_sd_mount_only(); break; - case MEMORY_STATE_ON_TRIG_MOVE: + } + case STATE_ON_TRIG_MOVE: { on_trig_move(); break; - case MEMORY_STATE_ON_VERIFY_MOVE: + } + case STATE_ON_VERIFY_MOVE: { on_verify_move(); break; + } } } void Memory::setpos_savedata_box() { - int i; - SavedataBox* box; + int i = 0; + SavedataBox* box = NULL; - i = 0; - box = NULL; while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { - nw4r::lyt::Pane* currPane = pSavedataBase->getLytObject()->FindPaneByName(panes[0][i]); + nw4r::lyt::Pane* currPane = mpSavedataBase->getLytObject()->FindPaneByName(panes[0][i]); nw4r::math::VEC3 translation(0, 0, 0); PSMTXMultVec(currPane->GetGlobalMtx(), translation, translation); box->setTranslate(translation); i++; if (box->getTextBalloon() != NULL) { - box->getTextBalloon()->terminate(); - box->setTextBalloonInitialized(false); + box->terminateBalloon(); } } } + void Memory::fadein_savedata_box() { int i = 0; SavedataBox* box = NULL; while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { - nw4r::lyt::Pane* currPane = pSavedataBase->getLytObject()->FindPaneByName(panes[0][i]); + nw4r::lyt::Pane* currPane = mpSavedataBase->getLytObject()->FindPaneByName(panes[0][i]); nw4r::math::VEC3 translation(0, 0, 0); PSMTXMultVec(currPane->GetGlobalMtx(), translation, translation); box->setTranslate(translation); @@ -250,6 +274,7 @@ namespace ipl { i++; } } + void Memory::fadeout_savedata_box() { SavedataBox* box; box = NULL; @@ -260,21 +285,23 @@ namespace ipl { } void Memory::send_getbanner_cmd(bool isWiiNotSD) { - for (int i = 0; i < 15; i++) { + for (int i = 0; i < MAX_BALLOONS; i++) { SavedataBox* box = (SavedataBox*)nw4r::ut::List_GetNth(&mSavedataBoxList, i + 15); - pNandSDCardManager->cmdGetWiiBanner(box, mPageOffset + i, isWiiNotSD); + mpNandSDCardManager->cmdGetWiiBanner(box, mPageOffset + i, isWiiNotSD); } } void Memory::update_sdcard_slot() { - if (mPage != MEMORY_PAGE_SD) + if (mPage != MEMORY_PAGE_SD) { return; + } - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); - if (mSdState == NandSDWorker::SD_STATE_READY) + mSdState = mpNandSDCardManager->getWorker()->get_sd_state(); + if (mSdState == NandSDWorker::SD_STATE_READY) { return; + } - pNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->cmdCleanQueue(); mPageOffset = 0; @@ -282,82 +309,91 @@ namespace ipl { box = NULL; while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { if (box->getTextBalloon() != NULL) { - box->getTextBalloon()->terminate(); - box->setTextBalloonInitialized(false); + box->terminateBalloon(); } } switch (mState) { - case MEMORY_STATE_ON_NORMAL: + case STATE_ON_NORMAL: { fadeout_savedata_box(); - mState = MEMORY_STATE_ON_CHANGE_TAG1ST; + mState = STATE_ON_CHANGE_TAG1ST; break; - case MEMORY_STATE_ON_EDIT: - pSavedataEdit->anmClear(); - pSavedataEdit->anmFadeout(); - mState = MEMORY_STATE_ON_EDIT_FADEOUT2ND; + } + case STATE_ON_EDIT: { + mpSavedataEdit->anmClear(); + mpSavedataEdit->anmFadeout(); + mState = STATE_ON_EDIT_FADEOUT2ND; break; - case MEMORY_STATE_ON_VERIFY_COPY: - case MEMORY_STATE_ON_VERIFY_DEL: - case MEMORY_STATE_ON_VERIFY_MOVE: + } + case STATE_ON_VERIFY_COPY: + case STATE_ON_VERIFY_DEL: + case STATE_ON_VERIFY_MOVE: { System::getDialog()->terminate(); - pSavedataEdit->anmClear(); - pSavedataEdit->anmSelectFadein(); - mState = MEMORY_STATE_ON_EDIT_FADEIN; + mpSavedataEdit->anmClear(); + mpSavedataEdit->anmSelectFadein(); + mState = STATE_ON_EDIT_FADEIN; break; - case MEMORY_STATE_ON_VERIFY1ST: - pSavedataEdit->anmClear(); - pSavedataEdit->anmSelectFadein(); - mState = MEMORY_STATE_ON_VERIFY2ND; + } + case STATE_ON_VERIFY1ST: { + mpSavedataEdit->anmClear(); + mpSavedataEdit->anmSelectFadein(); + mState = STATE_ON_VERIFY2ND; break; - default: + } + default: { break; + } } } void Memory::update_arw() { if (!mArwRVisible && enable_scroll_r()) { - pSavedataBase->anmArwAppear(true, false); + mpSavedataBase->anmArwAppear(true, false); mArwRVisible = true; } else if (mArwRVisible && !enable_scroll_r()) { - pSavedataBase->anmArwDisappear(true, false); + mpSavedataBase->anmArwDisappear(true, false); mArwRVisible = false; } if (!mArwLVisible && enable_scroll_l()) { - pSavedataBase->anmArwAppear(false, true); + mpSavedataBase->anmArwAppear(false, true); mArwLVisible = true; } else if (mArwLVisible && !enable_scroll_l()) { - pSavedataBase->anmArwDisappear(false, true); + mpSavedataBase->anmArwDisappear(false, true); mArwLVisible = false; } } + void Memory::update_free() { - if (!mPage) + if (!mPage) { update_nand_free(); - else + } else { update_sd_free(); + } } + void Memory::update_nand_free() { - int blocksFree = pNandSDCardManager->getNandBlocksFree(); + int blocksFree = mpNandSDCardManager->getNandBlocksFree(); if (blocksFree < 0) { - pSavedataBase->set_visible("N_Capa_00", false); - pSavedataBase->set_visible("T_Capa_00", false); + mpSavedataBase->set_visible("N_Capa_00", false); + mpSavedataBase->set_visible("T_Capa_00", false); return; } - SCNumber scDigitData = scNumber; + const wchar_t scNumber[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; wchar_t digits[5] = L""; wchar_t blocksFreeMsg[0x40] = L""; - digits[0] = scDigitData.digits[blocksFree / 1000]; - digits[1] = scDigitData.digits[blocksFree / 100 % 10]; - digits[2] = scDigitData.digits[blocksFree / 10 % 10]; - digits[3] = scDigitData.digits[blocksFree % 10]; + digits[0] = scNumber[blocksFree / 1000]; + digits[1] = scNumber[blocksFree / 100 % 10]; + digits[2] = scNumber[blocksFree / 10 % 10]; + digits[3] = scNumber[blocksFree % 10]; int zeroOffset; - for (zeroOffset = 0; zeroOffset < 3; zeroOffset++) - if (digits[zeroOffset] != L'0') + for (zeroOffset = 0; zeroOffset < 3; zeroOffset++) { + if (digits[zeroOffset] != L'0') { break; + } + } int blockOpenOffset = 0; @@ -367,47 +403,51 @@ namespace ipl { while (true) { wchar_t chr = *blockOpenMsg++; blocksFreeMsg[blockOpenOffset++] = chr; - if (chr == L'\0') + if (chr == L'\0') { break; + } }; blocksFreeMsg[--blockOpenOffset] = L' '; wcscpy(blocksFreeMsg + blockOpenOffset, digits + zeroOffset); wcscat(blocksFreeMsg, unkMsg); - pSavedataBase->set_visible("T_Capa_00", true); - pSavedataBase->set_visible("N_Capa_00", true); - pSavedataBase->set_textbox("T_Capa_00", blocksFreeMsg); + mpSavedataBase->set_visible("T_Capa_00", true); + mpSavedataBase->set_visible("N_Capa_00", true); + mpSavedataBase->set_textbox("T_Capa_00", blocksFreeMsg); } + void Memory::update_sd_free() { - if (pNandSDCardManager->getWorker()->get_sd_state() != NandSDWorker::SD_STATE_READY) { - pSavedataBase->set_visible("N_Capa_00", false); - pSavedataBase->set_visible("T_Capa_00", false); + if (mpNandSDCardManager->getWorker()->get_sd_state() != NandSDWorker::SD_STATE_READY) { + mpSavedataBase->set_visible("N_Capa_00", false); + mpSavedataBase->set_visible("T_Capa_00", false); return; } - int blocksFree = pNandSDCardManager->getSDBlocksFree(); + int blocksFree = mpNandSDCardManager->getSDBlocksFree(); if (blocksFree < 0) { - pSavedataBase->set_visible("N_Capa_00", false); - pSavedataBase->set_visible("T_Capa_00", false); + mpSavedataBase->set_visible("N_Capa_00", false); + mpSavedataBase->set_visible("T_Capa_00", false); return; } - SCNumber scDigitData = scNumber2; + const wchar_t scNumber[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; wchar_t digits[7] = L""; wchar_t blocksFreeMsg[0x40] = L""; - digits[0] = scDigitData.digits[blocksFree / 100000]; - digits[1] = scDigitData.digits[blocksFree / 10000 % 10]; - digits[2] = scDigitData.digits[blocksFree / 1000 % 10]; - digits[3] = scDigitData.digits[blocksFree / 100 % 10]; - digits[4] = scDigitData.digits[blocksFree / 10 % 10]; - digits[5] = scDigitData.digits[blocksFree % 10]; + digits[0] = scNumber[blocksFree / 100000]; + digits[1] = scNumber[blocksFree / 10000 % 10]; + digits[2] = scNumber[blocksFree / 1000 % 10]; + digits[3] = scNumber[blocksFree / 100 % 10]; + digits[4] = scNumber[blocksFree / 10 % 10]; + digits[5] = scNumber[blocksFree % 10]; int zeroOffset; - for (zeroOffset = 0; zeroOffset < 5; zeroOffset++) - if (digits[zeroOffset] != L'0') + for (zeroOffset = 0; zeroOffset < 5; zeroOffset++) { + if (digits[zeroOffset] != L'0') { break; + } + } int blockOpenOffset = 0; @@ -417,17 +457,18 @@ namespace ipl { while (true) { wchar_t chr = *blockOpenMsg++; blocksFreeMsg[blockOpenOffset++] = chr; - if (chr == L'\0') + if (chr == L'\0') { break; + } }; blocksFreeMsg[--blockOpenOffset] = L' '; wcscpy(blocksFreeMsg + blockOpenOffset, digits + zeroOffset); wcscat(blocksFreeMsg, unkMsg); - pSavedataBase->set_visible("T_Capa_00", true); - pSavedataBase->set_visible("N_Capa_00", true); - pSavedataBase->set_textbox("T_Capa_00", blocksFreeMsg); + mpSavedataBase->set_visible("T_Capa_00", true); + mpSavedataBase->set_visible("N_Capa_00", true); + mpSavedataBase->set_textbox("T_Capa_00", blocksFreeMsg); } void Memory::start_process(int processType) { @@ -436,168 +477,185 @@ namespace ipl { mProcessType = processType; snd::getSystem()->startSE("WIPL_SE_COPYING"); - if (processType == MEMORY_PROC_FMT) { - pSavedataEdit->anmShowBtn0Dialog(MESG_DATA_FORMATTING, true, true); + if (processType == PROC_FMT) { + mpSavedataEdit->anmShowBtn0Dialog(MESG_DATA_FORMATTING, true, true); } else { - pSavedataEdit->anmStartWaitAnm(); + mpSavedataEdit->anmStartWaitAnm(); } - mState = MEMORY_STATE_ON_PROCESS; + mState = STATE_ON_PROCESS; } + void Memory::stop_process() { System::getHomeButtonMenu()->enable(); snd::getSystem()->startSE("WIPL_SE_COPY_FINISH"); - pSavedataEdit->anmStopWaitAnm(); + mpSavedataEdit->anmStopWaitAnm(); } void Memory::start_scroll_r(bool playButtonAnm, bool playSound) { - pNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->cmdCleanQueue(); SavedataBox* box = NULL; - while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) + while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { box->clearEvent(); + } - if (playSound) + if (playSound) { snd::getSystem()->startSE("WSD_SELECT"); + } - pSavedataBase->anmScrollR(playButtonAnm); - mState = MEMORY_STATE_ON_SCROLL_R; + mpSavedataBase->anmScrollR(playButtonAnm); + mState = STATE_ON_SCROLL_R; } void Memory::start_scroll_l(bool playButtonAnm, bool playSound) { - pNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->cmdCleanQueue(); SavedataBox* box = NULL; - while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) + while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { box->clearEvent(); + } - if (playSound) + if (playSound) { snd::getSystem()->startSE("WSD_SELECT"); + } - pSavedataBase->anmScrollL(playButtonAnm); - mState = MEMORY_STATE_ON_SCROLL_L; + mpSavedataBase->anmScrollL(playButtonAnm); + mState = STATE_ON_SCROLL_L; } bool Memory::enable_scroll_r() { - if (mState != MEMORY_STATE_ON_NORMAL) + if (mState != STATE_ON_NORMAL) return false; if (mPage == MEMORY_PAGE_WII) { - return pNandSDCardManager->getWorker()->get_nand_save_num() - mPageOffset > 15; + return mpNandSDCardManager->getWorker()->get_nand_save_num() - mPageOffset > 15; } else { - if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) - return pNandSDCardManager->getWorker()->get_sd_save_num() - mPageOffset > 15; - else + if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { + return mpNandSDCardManager->getWorker()->get_sd_save_num() - mPageOffset > 15; + } else { return false; + } } } + bool Memory::enable_scroll_l() { - if (mState != MEMORY_STATE_ON_NORMAL) + if (mState != STATE_ON_NORMAL) return false; return mPageOffset > 0; } void Memory::draw() { - if (!System::onDefaultDrawLayer()) + if (!System::onDefaultDrawLayer()) { return; - - utility::Graphics::setOrtho(0); - pSavedataBase->draw(); - - SavedataBox* box = NULL; - while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) - box->draw(); - - for (int i = 0; i < 15; i++) { - mTextBalloonArr[i]->draw(); } - pSavedataBase->getLytObject()->draw("N_ArwR"); - pSavedataBase->getLytObject()->draw("N_ArwL"); + utility::Graphics::setOrtho(0); + mpSavedataBase->draw(); - pSavedataEdit->draw(); + SavedataBox* box = NULL; + while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { + box->draw(); + } + + for (int i = 0; i < MAX_BALLOONS; i++) { + mpBalloons[i]->draw(); + } + + mpSavedataBase->getLytObject()->draw("N_ArwR"); + mpSavedataBase->getLytObject()->draw("N_ArwL"); + + mpSavedataEdit->draw(); } BOOL Memory::isResetAcceptable() const { - return mProcessType == MEMORY_PROC_NUL; + return mProcessType == PROC_NUL; } void Memory::onPoint(AnmPane* pane) { if ((strcmp(pane->getName(), "B_SelectWii_00") == 0 && mPage == MEMORY_PAGE_WII) || - (strcmp(pane->getName(), "B_SelectSd_00") == 0 && mPage == MEMORY_PAGE_SD)) + (strcmp(pane->getName(), "B_SelectSd_00") == 0 && mPage == MEMORY_PAGE_SD)) { return; + } snd::getSystem()->startSE("WIPL_SE_BT_TARGETTING"); controller::Interface* controller = System::getYoungController(); - if (controller != NULL) + if (controller != NULL) { controller->rumble(); + } pane->on_cmd_recv(AnmPane::ANIM_CMD_POINT); } + void Memory::onLeft(AnmPane* pane) { if ((strcmp(pane->getName(), "B_SelectWii_00") == 0 && mPage == MEMORY_PAGE_WII) || - (strcmp(pane->getName(), "B_SelectSd_00") == 0 && mPage == MEMORY_PAGE_SD)) + (strcmp(pane->getName(), "B_SelectSd_00") == 0 && mPage == MEMORY_PAGE_SD)) { return; + } pane->on_cmd_recv(AnmPane::ANIM_CMD_LEFT); } + void Memory::onTrig(AnmPane* pane) { - if (mState != MEMORY_STATE_ON_NORMAL && mState != MEMORY_STATE_ON_SD_MESSAGE1ST) + if (mState != STATE_ON_NORMAL && mState != STATE_ON_SD_MESSAGE1ST) { return; + } if (strcmp(pane->getName(), "B_SelectWii_00") == 0 && mPage == MEMORY_PAGE_SD) { SavedataBox* box = NULL; - while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) + while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { box->setBannerFileInfo(NULL); + } snd::getSystem()->startSE("WIPL_SE_BT_PUSH"); mPageOffset = 0; - pNandSDCardManager->cmdCleanQueue(); - pNandSDCardManager->cmdListNand(); + mpNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->cmdListNand(); mPage = MEMORY_PAGE_WII; - pSavedataBase->anmArwDisappear(mArwRVisible, mArwLVisible); + mpSavedataBase->anmArwDisappear(mArwRVisible, mArwLVisible); mArwRVisible = false; mArwLVisible = false; - pSavedataBase->set_visible("N_Capa_00", false); - pSavedataBase->set_visible("T_Capa_00", false); + mpSavedataBase->set_visible("N_Capa_00", false); + mpSavedataBase->set_visible("T_Capa_00", false); - if (mState == MEMORY_STATE_ON_NORMAL) { - pSavedataBase->anmChangeWiitoSD(); + if (mState == STATE_ON_NORMAL) { + mpSavedataBase->anmChangeWiitoSD(); fadeout_savedata_box(); - mState = MEMORY_STATE_ON_CHANGE_TAG1ST; + mState = STATE_ON_CHANGE_TAG1ST; } else { - pSavedataBase->anmTextFadeout(); - mState = MEMORY_STATE_ON_SD_MESSAGE3RD; + mpSavedataBase->anmTextFadeout(); + mState = STATE_ON_SD_MESSAGE3RD; } } else if (strcmp(pane->getName(), "B_SelectSd_00") == 0 && mPage == MEMORY_PAGE_WII) { SavedataBox* box = NULL; - while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) + while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { box->setBannerFileInfo(NULL); + } snd::getSystem()->startSE("WIPL_SE_BT_PUSH"); - pNandSDCardManager->cmdSDMount(); + mpNandSDCardManager->cmdSDMount(); mPageOffset = 0; - pNandSDCardManager->cmdCleanQueue(); - pNandSDCardManager->cmdListSD(); + mpNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->cmdListSD(); mPage = MEMORY_PAGE_SD; - pSavedataBase->anmArwDisappear(mArwRVisible, mArwLVisible); + mpSavedataBase->anmArwDisappear(mArwRVisible, mArwLVisible); mArwRVisible = false; mArwLVisible = false; - pSavedataBase->set_visible("N_Capa_00", false); - pSavedataBase->set_visible("T_Capa_00", false); + mpSavedataBase->set_visible("N_Capa_00", false); + mpSavedataBase->set_visible("T_Capa_00", false); - if (mState == MEMORY_STATE_ON_NORMAL) { - pSavedataBase->anmChangeSDtoWii(); + if (mState == STATE_ON_NORMAL) { + mpSavedataBase->anmChangeSDtoWii(); fadeout_savedata_box(); - mState = MEMORY_STATE_ON_CHANGE_TAG1ST; + mState = STATE_ON_CHANGE_TAG1ST; } else { - pSavedataBase->anmTextFadeout(); - mState = MEMORY_STATE_ON_SD_MESSAGE3RD; + mpSavedataBase->anmTextFadeout(); + mState = STATE_ON_SD_MESSAGE3RD; } } else if (strcmp(pane->getName(), "B_ArwR") == 0 && enable_scroll_r()) { start_scroll_r(true, true); @@ -605,77 +663,86 @@ namespace ipl { start_scroll_l(true, true); } } + void Memory::onTrig(SavedataBox* box) { - if (mState != MEMORY_STATE_ON_NORMAL) + if (mState != STATE_ON_NORMAL) { return; + } - pCurrBox = box; - if (box->getTextBalloon() != NULL) + mpCurrentBox = box; + if (box->getTextBalloon() != NULL) { box->getTextBalloon()->terminate(); + } - pSavedataEdit->anmFadein(box); + mpSavedataEdit->anmFadein(box); snd::getSystem()->startSE("WIPL_SE_DECIDE"); - mState = MEMORY_STATE_ON_EDIT_FADEIN; + mState = STATE_ON_EDIT_FADEIN; } - void Memory::onTrigButton(bool isErr) { - pSavedataBase->anmArwDisappear(mArwRVisible, mArwLVisible); - pSavedataBase->anmFadeout(isErr); + void Memory::onTrigButton(bool isErr) { + mpSavedataBase->anmArwDisappear(mArwRVisible, mArwLVisible); + + mpSavedataBase->anmFadeout(isErr); if (!isErr) { fadeout_savedata_box(); } - pNandSDCardManager->cmdTerminate(); - mState = MEMORY_STATE_ON_FADEOUT1ST; + mpNandSDCardManager->cmdTerminate(); + mState = STATE_ON_FADEOUT1ST; } + void Memory::onTrigCopy() { if (mPage == MEMORY_PAGE_WII) { - pNandSDCardManager->cmdSDMount(); + mpNandSDCardManager->cmdSDMount(); } else { - pNandSDCardManager->cmdExistNandSave(pCurrBox->getBanner()->getSDTitleId()); + mpNandSDCardManager->cmdExistNandSave(mpCurrentBox->getBanner()->getSDTitleId()); } mActionIntent = MEMORY_INTENT_COPY; - mState = MEMORY_STATE_ON_TRIG_COPY; + mState = STATE_ON_TRIG_COPY; return; } + void Memory::onTrigDel() { if (mPage == MEMORY_PAGE_SD) { - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); + mSdState = mpNandSDCardManager->getWorker()->get_sd_state(); switch (mSdState) { - case NandSDWorker::SD_STATE_READY: - if (pNandSDCardManager->isSDWriteProtected()) { - pSavedataEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); - mState = MEMORY_STATE_ON_VERIFY1ST; + case NandSDWorker::SD_STATE_READY: { + if (mpNandSDCardManager->isSDWriteProtected()) { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); + mState = STATE_ON_VERIFY1ST; } else { - pSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_ERASE_Q); - mState = MEMORY_STATE_ON_VERIFY_DEL; + mpSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_ERASE_Q); + mState = STATE_ON_VERIFY_DEL; } break; - default: - pSavedataEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); - mState = MEMORY_STATE_ON_VERIFY1ST; + } + default: { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_VERIFY1ST; break; + } } } else { - pSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_ERASE_Q); - mState = MEMORY_STATE_ON_VERIFY_DEL; + mpSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_ERASE_Q); + mState = STATE_ON_VERIFY_DEL; } } void Memory::onTrigMove() { if (mPage == MEMORY_PAGE_WII) { - pNandSDCardManager->cmdSDMount(); + mpNandSDCardManager->cmdSDMount(); } else { - pNandSDCardManager->cmdExistNandSave(pCurrBox->getBanner()->getSDTitleId()); + mpNandSDCardManager->cmdExistNandSave(mpCurrentBox->getBanner()->getSDTitleId()); } mActionIntent = MEMORY_INTENT_MOVE; - mState = MEMORY_STATE_ON_TRIG_MOVE; + mState = STATE_ON_TRIG_MOVE; } void Memory::getCorruptIconTexture(GXTexObj* out) const { - TPLGetGXTexObjFromPalette((TPLPalette*)pCorruptTexFile->getBuffer(), out, 1); + TPLGetGXTexObjFromPalette((TPLPalette*)mpCorruptFile->getBuffer(), out, 1); } + void Memory::getCorruptBannerTexture(GXTexObj* out) const { - TPLGetGXTexObjFromPalette((TPLPalette*)pCorruptTexFile->getBuffer(), out, 0); + TPLGetGXTexObjFromPalette((TPLPalette*)mpCorruptFile->getBuffer(), out, 0); } void Memory::on_normal() { @@ -689,19 +756,19 @@ namespace ipl { update_arw(); update_free(); - pSavedataBase->update(); + mpSavedataBase->update(); SavedataBox* box = NULL; while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) box->update(); if (mPage == MEMORY_PAGE_WII) { - if (mPageOffset == pNandSDCardManager->getWorker()->get_nand_save_num() && enable_scroll_l()) { + if (mPageOffset == mpNandSDCardManager->getWorker()->get_nand_save_num() && enable_scroll_l()) { start_scroll_l(false, false); return; } } else { - if (mPageOffset == pNandSDCardManager->getWorker()->get_sd_save_num() && enable_scroll_l()) { + if (mPageOffset == mpNandSDCardManager->getWorker()->get_sd_save_num() && enable_scroll_l()) { start_scroll_l(false, false); return; } @@ -716,309 +783,368 @@ namespace ipl { } } } + void Memory::on_fadein1st() { - if (!pSavedataBase->isIdle()) + if (!mpSavedataBase->isIdle()) { return; - if (pNandSDCardManager->isWorking()) + } + if (mpNandSDCardManager->isWorking()) { return; + } fadein_savedata_box(); - mState = MEMORY_STATE_ON_FADEIN2ND; + mState = STATE_ON_FADEIN2ND; } + void Memory::on_fadein2nd() { SavedataBox* box = NULL; while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { - if (!box->isIdle()) + if (!box->isIdle()) { return; + } } - mState = MEMORY_STATE_ON_NORMAL; + mState = STATE_ON_NORMAL; } + void Memory::on_fadeout1st() { - if (!pSavedataBase->isIdle()) + if (!mpSavedataBase->isIdle()) { return; + } - if (!pNandSDCardManager->isTerminated()) + if (!mpNandSDCardManager->isTerminated()) { return; + } - mState = MEMORY_STATE_ON_FADEOUT2ND; + mState = STATE_ON_FADEOUT2ND; } + void Memory::on_fadeout2nd() { requestSceneDestruction(); System::getBS2Manager()->restart(); OSReport(" ... bs2 manager restarted\n"); } + void Memory::on_scroll_r() { - if (pSavedataBase->isIdle()) { + if (mpSavedataBase->isIdle()) { mPageOffset += 15; SavedataBox* box = NULL; - while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) + while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { box->setBannerFileInfo(NULL); + } send_getbanner_cmd(mPage == MEMORY_PAGE_WII); - mState = MEMORY_STATE_ON_NORMAL; + mState = STATE_ON_NORMAL; } setpos_savedata_box(); } + void Memory::on_scroll_l() { - if (pSavedataBase->isIdle()) { + if (mpSavedataBase->isIdle()) { mPageOffset -= 15; SavedataBox* box = NULL; - while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) + while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { box->setBannerFileInfo(NULL); + } send_getbanner_cmd(mPage == MEMORY_PAGE_WII); - mState = MEMORY_STATE_ON_NORMAL; + mState = STATE_ON_NORMAL; } setpos_savedata_box(); } + void Memory::on_change_tag1st() { - if (pNandSDCardManager->isWorking() || !pNandSDCardManager->sdWorkerReadyMaybe()) + if (mpNandSDCardManager->isWorking() || !mpNandSDCardManager->sdWorkerReadyMaybe()) { return; + } SavedataBox* box = NULL; while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { - if (!box->isIdle()) + if (!box->isIdle()) { return; - if (box->getBanner() != NULL) + } + if (box->getBanner() != NULL) { box->setBannerFileInfo(NULL); + } } if (mPage == MEMORY_PAGE_SD) { - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); + mSdState = mpNandSDCardManager->getWorker()->get_sd_state(); switch (mSdState) { - case NandSDWorker::SD_STATE_SLOT_EMPTY: - if (!pSavedataBase->isIdle()) + case NandSDWorker::SD_STATE_EJECTED: { + if (!mpSavedataBase->isIdle()) { return; - pSavedataBase->anmTextFadein(MESG_DATA_NO_SD_CARD); - mState = MEMORY_STATE_ON_SD_MESSAGE1ST; + } + mpSavedataBase->anmTextFadein(MESG_DATA_NO_SD_CARD); + mState = STATE_ON_SD_MESSAGE1ST; break; - case NandSDWorker::SD_STATE_NOT_MOUNTED: - pNandSDCardManager->cmdSDMount(); - mState = MEMORY_STATE_ON_SD_MOUNT; + } + case NandSDWorker::SD_STATE_INSERTED: { + mpNandSDCardManager->cmdSDMount(); + mState = STATE_ON_SD_MOUNT; break; - case NandSDWorker::SD_STATE_BROKEN_MEDIA: - case NandSDWorker::SD_STATE_ILLEGAL_MEDIA: - if (!pSavedataBase->isIdle()) + } + case NandSDWorker::SD_STATE_BROKEN: + case NandSDWorker::SD_STATE_ILLEGAL: { + if (!mpSavedataBase->isIdle()) { return; - pSavedataBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); - mState = MEMORY_STATE_ON_SD_MESSAGE1ST; + } + mpSavedataBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); + mState = STATE_ON_SD_MESSAGE1ST; break; - case NandSDWorker::SD_STATE_READY: - if (!pSavedataBase->isIdle()) + } + case NandSDWorker::SD_STATE_READY: { + if (!mpSavedataBase->isIdle()) { return; + } send_getbanner_cmd(false); fadein_savedata_box(); - mState = MEMORY_STATE_ON_CHANGE_TAG2ND; + mState = STATE_ON_CHANGE_TAG2ND; break; - case NandSDWorker::SD_STATE_ERRORED: - default: - if (!pSavedataBase->isIdle()) + } + case NandSDWorker::SD_STATE_ERROR: + default: { + if (!mpSavedataBase->isIdle()) { return; - pSavedataBase->anmTextFadein(MESG_DATA_SD_PROCESS_FAILED); - mState = MEMORY_STATE_ON_SD_MESSAGE1ST; + } + mpSavedataBase->anmTextFadein(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_SD_MESSAGE1ST; break; + } } } else { send_getbanner_cmd(true); fadein_savedata_box(); - mState = MEMORY_STATE_ON_CHANGE_TAG2ND; + mState = STATE_ON_CHANGE_TAG2ND; } } + void Memory::on_change_tag2nd() { SavedataBox* box = NULL; while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { - if (!box->isIdle()) + if (!box->isIdle()) { return; + } } - mState = MEMORY_STATE_ON_NORMAL; + mState = STATE_ON_NORMAL; } + void Memory::on_trig_copy() { - if (pCurrBox->getBanner()->getFilePerms() == 1) { - pSavedataEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_COPIED); - mState = MEMORY_STATE_ON_VERIFY1ST; + if (mpCurrentBox->getBanner()->getFilePerms() == 1) { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_COPIED); + mState = STATE_ON_VERIFY1ST; return; } - if (pNandSDCardManager->isWorking()) + if (mpNandSDCardManager->isWorking()) return; if (mPage == MEMORY_PAGE_WII) { - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); + mSdState = mpNandSDCardManager->getWorker()->get_sd_state(); switch (mSdState) { - case NandSDWorker::SD_STATE_SLOT_EMPTY: - pSavedataEdit->anmSelectFadeout(MESG_DATA_NO_SD_CARD); - mState = MEMORY_STATE_ON_VERIFY1ST; + case NandSDWorker::SD_STATE_EJECTED: { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_NO_SD_CARD); + mState = STATE_ON_VERIFY1ST; break; - case NandSDWorker::SD_STATE_NOT_MOUNTED: + } + case NandSDWorker::SD_STATE_INSERTED: { OSReport("NEED MOUNT\n"); - pNandSDCardManager->cmdSDMount(); - mState = MEMORY_STATE_ON_SD_MOUNT_ONLY; + mpNandSDCardManager->cmdSDMount(); + mState = STATE_ON_SD_MOUNT_ONLY; break; - case NandSDWorker::SD_STATE_BROKEN_MEDIA: - case NandSDWorker::SD_STATE_ILLEGAL_MEDIA: - pSavedataEdit->anmSelectFadeout(MESG_DATA_SD_DEVICE_BAD); - mState = MEMORY_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_BROKEN: + case NandSDWorker::SD_STATE_ILLEGAL: { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_SD_DEVICE_BAD); + mState = STATE_ON_VERIFY1ST; break; - case NandSDWorker::SD_STATE_READY: - if (pNandSDCardManager->isSDWriteProtected()) { - pSavedataEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); - mState = MEMORY_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_READY: { + if (mpNandSDCardManager->isSDWriteProtected()) { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); + mState = STATE_ON_VERIFY1ST; return; } - pNandSDCardManager->cmdExistSDSave(pCurrBox->getBanner()->getWiiTitleId()); - mState = MEMORY_STATE_ON_EXIST_SAVE; + mpNandSDCardManager->cmdExistSDSave(mpCurrentBox->getBanner()->getWiiTitleId()); + mState = STATE_ON_EXIST_SAVE; break; - case NandSDWorker::SD_STATE_ERRORED: - default: - pSavedataEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); - mState = MEMORY_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_ERROR: + default: { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_VERIFY1ST; break; + } } } else { - if (pNandSDCardManager->getAsyncResult()) { - pSavedataEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_WII); - mState = MEMORY_STATE_ON_VERIFY1ST; + if (mpNandSDCardManager->getAsyncResult()) { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_WII); + mState = STATE_ON_VERIFY1ST; } else { - pSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_COPY_TO_WII_Q); - mState = MEMORY_STATE_ON_VERIFY_COPY; + mpSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_COPY_TO_WII_Q); + mState = STATE_ON_VERIFY_COPY; } } } + void Memory::on_edit_fadein() { - if (!pSavedataEdit->isIdle()) + if (!mpSavedataEdit->isIdle()) { return; - mState = MEMORY_STATE_ON_EDIT; + } + mState = STATE_ON_EDIT; } + void Memory::on_edit() { - if (pSavedataEdit->isIdle()) { + if (mpSavedataEdit->isIdle()) { SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); if (sceneSettingButton->update()) { - mState = MEMORY_STATE_ON_EDIT_FADEOUT1ST; + mState = STATE_ON_EDIT_FADEOUT1ST; return; } } - pSavedataEdit->update(); + mpSavedataEdit->update(); update_sdcard_slot(); } + void Memory::on_edit_fadeout1st() { SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); if (!sceneSettingButton->isPlaying()) { - pSavedataEdit->anmFadeout(); - mState = MEMORY_STATE_ON_EDIT_FADEOUT2ND; + mpSavedataEdit->anmFadeout(); + mState = STATE_ON_EDIT_FADEOUT2ND; } } + void Memory::on_edit_fadeout2nd() { - if (!pSavedataEdit->isIdle()) + if (!mpSavedataEdit->isIdle()) { return; - mState = MEMORY_STATE_ON_NORMAL; + } + mState = STATE_ON_NORMAL; } + void Memory::on_verify1st() { - if (pSavedataEdit->isIdle()) { + if (mpSavedataEdit->isIdle()) { SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); if (sceneSettingButton->update()) { - pSavedataEdit->anmSelectFadein(); - mState = MEMORY_STATE_ON_VERIFY2ND; + mpSavedataEdit->anmSelectFadein(); + mState = STATE_ON_VERIFY2ND; } } mActionIntent = MEMORY_INTENT_NONE; update_sdcard_slot(); } + void Memory::on_verify2nd() { - if (!pSavedataEdit->isIdle()) + if (!mpSavedataEdit->isIdle()) { return; - mState = MEMORY_STATE_ON_EDIT; + } + mState = STATE_ON_EDIT; } + void Memory::on_verify_copy() { - if (!pSavedataEdit->isIdle() || pNandSDCardManager->isWorking()) + if (!mpSavedataEdit->isIdle() || mpNandSDCardManager->isWorking()) { return; + } switch (System::getDialog()->getLastResult()) { - case DialogWindow::RESULT_LEFT_BUTTON: + case DialogWindow::RESULT_LEFT_BUTTON: { if (mPage == MEMORY_PAGE_WII) { - if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { - start_process(MEMORY_PROC_CPY); - pNandSDCardManager->cmdCopySaveNandToSD(pCurrBox->getBanner()->getWiiTitleId()); - pSavedataEdit->anmTextFadein(MESG_DATA_COPYING_TO_SD); - } else if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_SLOT_EMPTY) { - pSavedataEdit->anmTextFadein(MESG_DATA_NO_SD_CARD); - mState = MEMORY_STATE_ON_END_PROCESS; + if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { + start_process(PROC_CPY); + mpNandSDCardManager->cmdCopySaveNandToSD(mpCurrentBox->getBanner()->getWiiTitleId()); + mpSavedataEdit->anmTextFadein(MESG_DATA_COPYING_TO_SD); + } else if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_EJECTED) { + mpSavedataEdit->anmTextFadein(MESG_DATA_NO_SD_CARD); + mState = STATE_ON_END_PROCESS; return; } else { - pSavedataEdit->anmTextFadein(MESG_DATA_SD_PROCESS_FAILED); - mState = MEMORY_STATE_ON_END_PROCESS; + mpSavedataEdit->anmTextFadein(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_END_PROCESS; return; } } else { - start_process(MEMORY_PROC_CPY); - pNandSDCardManager->cmdCopySaveSDToNand(pCurrBox->getBanner()->getSDTitleId()); - pSavedataEdit->anmTextFadein(MESG_DATA_COPYING_TO_WII); + start_process(PROC_CPY); + mpNandSDCardManager->cmdCopySaveSDToNand(mpCurrentBox->getBanner()->getSDTitleId()); + mpSavedataEdit->anmTextFadein(MESG_DATA_COPYING_TO_WII); } break; - case DialogWindow::RESULT_RIGHT_BUTTON: - pSavedataEdit->anmSelectFadein(); - mState = MEMORY_STATE_ON_EDIT_FADEIN; + } + case DialogWindow::RESULT_RIGHT_BUTTON: { + mpSavedataEdit->anmSelectFadein(); + mState = STATE_ON_EDIT_FADEIN; break; + } } update_sdcard_slot(); } + void Memory::on_verify_del() { - if (!pSavedataEdit->isIdle()) + if (!mpSavedataEdit->isIdle()) { return; + } switch (System::getDialog()->getLastResult()) { - case DialogWindow::RESULT_LEFT_BUTTON: - start_process(MEMORY_PROC_DEL); + case DialogWindow::RESULT_LEFT_BUTTON: { + start_process(PROC_DEL); if (mPage == MEMORY_PAGE_WII) { - pNandSDCardManager->cmdDelNandSave(pCurrBox); - pSavedataEdit->anmTextFadein(MESG_DATA_ERASING); + mpNandSDCardManager->cmdDelNandSave(mpCurrentBox); + mpSavedataEdit->anmTextFadein(MESG_DATA_ERASING); } else { - pNandSDCardManager->cmdDelSDSave(pCurrBox); - pSavedataEdit->anmTextFadein(MESG_DATA_ERASING_SD); + mpNandSDCardManager->cmdDelSDSave(mpCurrentBox); + mpSavedataEdit->anmTextFadein(MESG_DATA_ERASING_SD); } break; - case DialogWindow::RESULT_RIGHT_BUTTON: - pSavedataEdit->anmSelectFadein(); - mState = MEMORY_STATE_ON_EDIT_FADEIN; + } + case DialogWindow::RESULT_RIGHT_BUTTON: { + mpSavedataEdit->anmSelectFadein(); + mState = STATE_ON_EDIT_FADEIN; break; + } } update_sdcard_slot(); } + void Memory::on_verify_format() { - if (!pSavedataEdit->isIdle()) + if (!mpSavedataEdit->isIdle()) { return; + } switch (System::getDialog()->getLastResult()) { - case DialogWindow::RESULT_LEFT_BUTTON: - start_process(MEMORY_PROC_FMT); - pNandSDCardManager->cmdSDFormat(); + case DialogWindow::RESULT_LEFT_BUTTON: { + start_process(PROC_FMT); + mpNandSDCardManager->cmdSDFormat(); break; - case DialogWindow::RESULT_RIGHT_BUTTON: + } + case DialogWindow::RESULT_RIGHT_BUTTON: { if (mPage == MEMORY_PAGE_WII) { - mState = MEMORY_STATE_ON_EDIT; + mState = STATE_ON_EDIT; } else { - pSavedataBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); - mState = MEMORY_STATE_ON_SD_MESSAGE1ST; + mpSavedataBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); + mState = STATE_ON_SD_MESSAGE1ST; } break; + } } } + void Memory::on_end_format() { if (System::getDialog()->getLastResult() != DialogWindow::RESULT_WAIT) return; if (mPage == MEMORY_PAGE_WII) { - mState = MEMORY_STATE_ON_EDIT; - } else if (pNandSDCardManager->getWorker()->get_sd_state() != NandSDWorker::SD_STATE_INITIAL) { - pSavedataBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); - mState = MEMORY_STATE_ON_SD_MESSAGE1ST; + mState = STATE_ON_EDIT; + } else if (mpNandSDCardManager->getWorker()->get_sd_state() != NandSDWorker::SD_STATE_INITIAL) { + mpSavedataBase->anmTextFadein(MESG_DATA_SD_DEVICE_BAD); + mState = STATE_ON_SD_MESSAGE1ST; } } + void Memory::on_sd_mount() { - if (pNandSDCardManager->isWorking()) + if (mpNandSDCardManager->isWorking()) { return; - pNandSDCardManager->cmdListSD(); - mState = MEMORY_STATE_ON_CHANGE_TAG1ST; + } + mpNandSDCardManager->cmdListSD(); + mState = STATE_ON_CHANGE_TAG1ST; } + void Memory::on_sd_message1st() { - if (!pSavedataEdit->isIdle()) + if (!mpSavedataEdit->isIdle()) return; SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); @@ -1027,293 +1153,323 @@ namespace ipl { return; } - if (mSdState != pNandSDCardManager->getWorker()->get_sd_state() && pSavedataBase->isIdle()) { - pSavedataBase->anmTextFadeout(); - mState = MEMORY_STATE_ON_SD_MESSAGE2ND; + if (mSdState != mpNandSDCardManager->getWorker()->get_sd_state() && mpSavedataBase->isIdle()) { + mpSavedataBase->anmTextFadeout(); + mState = STATE_ON_SD_MESSAGE2ND; } else { - pSavedataBase->update(); + mpSavedataBase->update(); } } + void Memory::on_sd_message2nd() { - if (!pSavedataBase->isIdle()) + if (!mpSavedataBase->isIdle()) return; - mState = MEMORY_STATE_ON_CHANGE_TAG1ST; + mState = STATE_ON_CHANGE_TAG1ST; } + void Memory::on_sd_message3rd() { - if (!pSavedataBase->isIdle()) + if (!mpSavedataBase->isIdle()) return; if (mPage == MEMORY_PAGE_WII) { - pSavedataBase->anmChangeWiitoSD(); - mState = MEMORY_STATE_ON_CHANGE_TAG1ST; + mpSavedataBase->anmChangeWiitoSD(); + mState = STATE_ON_CHANGE_TAG1ST; } else { - pSavedataBase->anmChangeSDtoWii(); - mState = MEMORY_STATE_ON_CHANGE_TAG1ST; + mpSavedataBase->anmChangeSDtoWii(); + mState = STATE_ON_CHANGE_TAG1ST; } } + void Memory::on_process() { - if (pNandSDCardManager->isWorking()) + if (mpNandSDCardManager->isWorking()) { return; + } - if (!pSavedataEdit->isIdle()) + if (!mpSavedataEdit->isIdle()) { return; + } - int result = pNandSDCardManager->getAsyncResult(); + int result = mpNandSDCardManager->getAsyncResult(); if (result == 0) { - if (mProcessType == MEMORY_PROC_FMT) { - pSavedataEdit->anmHideBtn0Dialog(); - } else if (mProcessType == MEMORY_PROC_CPY) { - pSavedataEdit->anmTextFadein(MESG_DATA_COPIED); - } else if (mProcessType == MEMORY_PROC_DEL) { - pSavedataEdit->anmTextFadein(MESG_DATA_ERASED); - } else if (mProcessType == MEMORY_PROC_MOV) { - switch (pCurrBox->getBanner()->getFilePerms()) { - case 0: - pSavedataEdit->anmTextFadein(MESG_DATA_MOVED); + if (mProcessType == PROC_FMT) { + mpSavedataEdit->anmHideBtn0Dialog(); + } else if (mProcessType == PROC_CPY) { + mpSavedataEdit->anmTextFadein(MESG_DATA_COPIED); + } else if (mProcessType == PROC_DEL) { + mpSavedataEdit->anmTextFadein(MESG_DATA_ERASED); + } else if (mProcessType == PROC_MOV) { + switch (mpCurrentBox->getBanner()->getFilePerms()) { + case 0: { + mpSavedataEdit->anmTextFadein(MESG_DATA_MOVED); break; - case 4: - pSavedataEdit->anmTextFadein(MESG_DATA_MOVED_PARTIAL_LOCK); + } + case 4: { + mpSavedataEdit->anmTextFadein(MESG_DATA_MOVED_PARTIAL_LOCK); break; + } case 3: - case 5: - pSavedataEdit->anmTextFadein(MESG_DATA_MOVED_CONSOLE_LOCK); + case 5: { + mpSavedataEdit->anmTextFadein(MESG_DATA_MOVED_CONSOLE_LOCK); break; + } } } - if (mProcessType == MEMORY_PROC_DEL || mProcessType == MEMORY_PROC_MOV) { - pSavedataEdit->anmClear(); - pNandSDCardManager->cmdCleanQueue(); - pNandSDCardManager->calc(); + if (mProcessType == PROC_DEL || mProcessType == PROC_MOV) { + mpSavedataEdit->anmClear(); + mpNandSDCardManager->cmdCleanQueue(); + mpNandSDCardManager->calc(); SavedataBox* box = NULL; - while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) + while (box = (SavedataBox*)nw4r::ut::List_GetNext(&mSavedataBoxList, box), box != NULL) { box->setBannerFileInfo(NULL); + } if (mPage == MEMORY_PAGE_WII) { - pNandSDCardManager->cmdGetNandFree(); + mpNandSDCardManager->cmdGetNandFree(); send_getbanner_cmd(true); } else { - pNandSDCardManager->cmdGetSDFree(); + mpNandSDCardManager->cmdGetSDFree(); send_getbanner_cmd(false); } } } else { - if (0 < result && (result & 0b001) && mProcessType == MEMORY_PROC_CPY && mPage == MEMORY_PAGE_WII) { - pSavedataEdit->anmTextFadein(MESG_DATA_COPIED_SOME_NON_SD); - } else if (0 < result && (result & 0b010) && mProcessType == MEMORY_PROC_CPY && mPage == MEMORY_PAGE_WII) { - // int iVar2 = ; - switch (pCurrBox->getBanner()->getFilePerms()) { - case 3: - pSavedataEdit->anmTextFadein(MESG_DATA_COPIED_CONSOLE_LOCK); + if (0 < result && (result & 0x01) && mProcessType == PROC_CPY && mPage == MEMORY_PAGE_WII) { + mpSavedataEdit->anmTextFadein(MESG_DATA_COPIED_SOME_NON_SD); + } else if (0 < result && (result & 0x02) && mProcessType == PROC_CPY && mPage == MEMORY_PAGE_WII) { + switch (mpCurrentBox->getBanner()->getFilePerms()) { + case 3: { + mpSavedataEdit->anmTextFadein(MESG_DATA_COPIED_CONSOLE_LOCK); break; + } case 4: - default: - pSavedataEdit->anmTextFadein(MESG_DATA_COPIED_PARTIAL_LOCK); + default: { + mpSavedataEdit->anmTextFadein(MESG_DATA_COPIED_PARTIAL_LOCK); break; + } } - } else if (0 < result && (result & 0b100) && mProcessType == MEMORY_PROC_CPY && mPage == MEMORY_PAGE_WII) { - pSavedataEdit->anmTextFadein(MESG_DATA_COPIED_CONSOLE_LOCK); + } else if (0 < result && (result & 0b100) && mProcessType == PROC_CPY && mPage == MEMORY_PAGE_WII) { + mpSavedataEdit->anmTextFadein(MESG_DATA_COPIED_CONSOLE_LOCK); } else if (0 < result && result == 1 && mPage == MEMORY_PAGE_SD) { - pSavedataEdit->anmTextFadein(mProcessType == MEMORY_PROC_CPY ? MESG_DATA_NOT_FULLY_COPIED : MESG_DATA_NOT_FULLY_MOVED); + mpSavedataEdit->anmTextFadein(mProcessType == PROC_CPY ? MESG_DATA_NOT_FULLY_COPIED : MESG_DATA_NOT_FULLY_MOVED); } else { if (result == -6) { - pSavedataEdit->anmTextFadein(mPage == MEMORY_PAGE_WII ? MESG_DATA_ALREADY_EXISTS_SD : MESG_DATA_ALREADY_EXISTS_WII); + mpSavedataEdit->anmTextFadein(mPage == MEMORY_PAGE_WII ? MESG_DATA_ALREADY_EXISTS_SD : MESG_DATA_ALREADY_EXISTS_WII); } else if (result == -7) { - pSavedataEdit->anmTextFadein(mPage == MEMORY_PAGE_WII ? MESG_DATA_NOT_ENOUGH_FREE_SD : MESG_DATA_NOT_ENOUGH_FREE_WII); + mpSavedataEdit->anmTextFadein(mPage == MEMORY_PAGE_WII ? MESG_DATA_NOT_ENOUGH_FREE_SD : MESG_DATA_NOT_ENOUGH_FREE_WII); } else if (result == -12) { - pSavedataEdit->anmTextFadein(MESG_DATA_FILENAME_CONFLICT); + mpSavedataEdit->anmTextFadein(MESG_DATA_FILENAME_CONFLICT); } else if (result == -14) { - pSavedataEdit->anmTextFadein(mProcessType == MEMORY_PROC_CPY ? MESG_DATA_MUST_PLAY_TO_COPY : MESG_DATA_MUST_PLAY_TO_MOVE); + mpSavedataEdit->anmTextFadein(mProcessType == PROC_CPY ? MESG_DATA_MUST_PLAY_TO_COPY : MESG_DATA_MUST_PLAY_TO_MOVE); } else if (result == -13) { - pSavedataEdit->anmTextFadein(MESG_DATA_FILE_CANT_BE_COPIED); + mpSavedataEdit->anmTextFadein(MESG_DATA_FILE_CANT_BE_COPIED); } else if (result == -15) { - pSavedataEdit->anmTextFadein(mProcessType == MEMORY_PROC_CPY ? MESG_DATA_CANT_COPY_TO_WII : MESG_DATA_CANT_MOVE_TO_WII); + mpSavedataEdit->anmTextFadein(mProcessType == PROC_CPY ? MESG_DATA_CANT_COPY_TO_WII : MESG_DATA_CANT_MOVE_TO_WII); } else { OSReport("fail: async result = %d\n", result); switch (mProcessType) { - case MEMORY_PROC_CPY: - pSavedataEdit->anmTextFadein(MESG_DATA_COPY_UNK_ERROR); + case PROC_CPY: { + mpSavedataEdit->anmTextFadein(MESG_DATA_COPY_UNK_ERROR); break; - case MEMORY_PROC_DEL: - pSavedataEdit->anmTextFadein(MESG_DATA_DEL_UNK_ERROR); + } + case PROC_DEL: { + mpSavedataEdit->anmTextFadein(MESG_DATA_DEL_UNK_ERROR); break; - case MEMORY_PROC_FMT: - pSavedataEdit->anmHideBtn0Dialog(); + } + case PROC_FMT: { + mpSavedataEdit->anmHideBtn0Dialog(); break; - case MEMORY_PROC_MOV: - pSavedataEdit->anmTextFadein(MESG_DATA_MOVE_UNK_ERROR); + } + case PROC_MOV: { + mpSavedataEdit->anmTextFadein(MESG_DATA_MOVE_UNK_ERROR); break; + } } } } } stop_process(); - mState = MEMORY_STATE_ON_END_PROCESS; + mState = STATE_ON_END_PROCESS; } - void Memory::on_end_process() { - if (!pSavedataEdit->isIdle()) - return; - if (mProcessType == MEMORY_PROC_FMT) { - if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { - pSavedataEdit->anmShowBtn0Dialog(MESG_DATA_SD_FORMATTED, false, false); - mState = MEMORY_STATE_ON_END_FORMAT; + void Memory::on_end_process() { + if (!mpSavedataEdit->isIdle()) { + return; + } + + if (mProcessType == PROC_FMT) { + if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { + mpSavedataEdit->anmShowBtn0Dialog(MESG_DATA_SD_FORMATTED, false, false); + mState = STATE_ON_END_FORMAT; } else { - pSavedataEdit->anmShowBtn0Dialog(MESG_DATA_SD_NOT_FORMATTED, false, false); - mState = MEMORY_STATE_ON_END_FORMAT; + mpSavedataEdit->anmShowBtn0Dialog(MESG_DATA_SD_NOT_FORMATTED, false, false); + mState = STATE_ON_END_FORMAT; } } else { - pSavedataEdit->anmTextFadeout(); - mState = MEMORY_STATE_ON_EDIT_FADEOUT2ND; + mpSavedataEdit->anmTextFadeout(); + mState = STATE_ON_EDIT_FADEOUT2ND; } - mProcessType = MEMORY_PROC_NUL; + mProcessType = PROC_NUL; } + void Memory::on_exist_save() { - if (pNandSDCardManager->isWorking()) + if (mpNandSDCardManager->isWorking()) { return; + } - if (pNandSDCardManager->getAsyncResult() == 0) { + if (mpNandSDCardManager->getAsyncResult() == 0) { switch (mActionIntent) { - case MEMORY_INTENT_COPY: - pSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_COPY_Q); - mState = MEMORY_STATE_ON_VERIFY_COPY; + case MEMORY_INTENT_COPY: { + mpSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_COPY_Q); + mState = STATE_ON_VERIFY_COPY; break; - - case MEMORY_INTENT_MOVE: - pSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_MOVE_Q); - mState = MEMORY_STATE_ON_VERIFY_MOVE; + } + case MEMORY_INTENT_MOVE: { + mpSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_MOVE_Q); + mState = STATE_ON_VERIFY_MOVE; break; - - default: + } + default: { break; + } } mActionIntent = MEMORY_INTENT_NONE; - } else if (pNandSDCardManager->getAsyncResult() == 1) { - pSavedataEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_SD); - mState = MEMORY_STATE_ON_VERIFY1ST; + } else if (mpNandSDCardManager->getAsyncResult() == 1) { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_SD); + mState = STATE_ON_VERIFY1ST; } else { - pSavedataEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); - mState = MEMORY_STATE_ON_VERIFY1ST; + mpSavedataEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_VERIFY1ST; } } void Memory::on_sd_mount_only() { - if (pNandSDCardManager->isWorking()) + if (mpNandSDCardManager->isWorking()) return; switch (mActionIntent) { - case MEMORY_INTENT_COPY: - mState = MEMORY_STATE_ON_TRIG_COPY; + case MEMORY_INTENT_COPY: { + mState = STATE_ON_TRIG_COPY; break; - - case MEMORY_INTENT_MOVE: - mState = MEMORY_STATE_ON_TRIG_MOVE; + } + case MEMORY_INTENT_MOVE: { + mState = STATE_ON_TRIG_MOVE; break; - - default: + } + default: { break; + } } } void Memory::on_trig_move() { - if (pCurrBox->getBanner()->getFilePerms() == 1) { - pSavedataEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_MOVED); - mState = MEMORY_STATE_ON_VERIFY1ST; + if (mpCurrentBox->getBanner()->getFilePerms() == 1) { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_FILE_CANT_BE_MOVED); + mState = STATE_ON_VERIFY1ST; return; } - if (pNandSDCardManager->isWorking()) + if (mpNandSDCardManager->isWorking()) { return; + } if (mPage == MEMORY_PAGE_WII) { - if (pCurrBox->getBanner()->getFilePerms() == 2) { - pSavedataEdit->anmSelectFadeout(MESG_DATA_NO_MOVE_BC_COPY_BAN); - mState = MEMORY_STATE_ON_VERIFY1ST; + if (mpCurrentBox->getBanner()->getFilePerms() == 2) { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_NO_MOVE_BC_COPY_BAN); + mState = STATE_ON_VERIFY1ST; return; } - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); + mSdState = mpNandSDCardManager->getWorker()->get_sd_state(); switch (mSdState) { - case NandSDWorker::SD_STATE_SLOT_EMPTY: - pSavedataEdit->anmSelectFadeout(MESG_DATA_NO_SD_CARD); - mState = MEMORY_STATE_ON_VERIFY1ST; + case NandSDWorker::SD_STATE_EJECTED: { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_NO_SD_CARD); + mState = STATE_ON_VERIFY1ST; break; - case NandSDWorker::SD_STATE_NOT_MOUNTED: + } + case NandSDWorker::SD_STATE_INSERTED: { OSReport("NEED MOUNT\n"); - pNandSDCardManager->cmdSDMount(); - mState = MEMORY_STATE_ON_SD_MOUNT_ONLY; + mpNandSDCardManager->cmdSDMount(); + mState = STATE_ON_SD_MOUNT_ONLY; break; - case NandSDWorker::SD_STATE_BROKEN_MEDIA: - case NandSDWorker::SD_STATE_ILLEGAL_MEDIA: - pSavedataEdit->anmSelectFadeout(MESG_DATA_SD_DEVICE_BAD); - mState = MEMORY_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_BROKEN: + case NandSDWorker::SD_STATE_ILLEGAL: { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_SD_DEVICE_BAD); + mState = STATE_ON_VERIFY1ST; break; - case NandSDWorker::SD_STATE_READY: - if (pNandSDCardManager->isSDWriteProtected()) { - pSavedataEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); - mState = MEMORY_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_READY: { + if (mpNandSDCardManager->isSDWriteProtected()) { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); + mState = STATE_ON_VERIFY1ST; return; } - pNandSDCardManager->cmdExistSDSave(pCurrBox->getBanner()->getWiiTitleId()); - mState = MEMORY_STATE_ON_EXIST_SAVE; + mpNandSDCardManager->cmdExistSDSave(mpCurrentBox->getBanner()->getWiiTitleId()); + mState = STATE_ON_EXIST_SAVE; mActionIntent = MEMORY_INTENT_MOVE; break; - - case NandSDWorker::SD_STATE_ERRORED: - default: - pSavedataEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); - mState = MEMORY_STATE_ON_VERIFY1ST; + } + case NandSDWorker::SD_STATE_ERROR: + default: { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_VERIFY1ST; break; + } } } else { - mSdState = pNandSDCardManager->getWorker()->get_sd_state(); + mSdState = mpNandSDCardManager->getWorker()->get_sd_state(); switch (mSdState) { - case NandSDWorker::SD_STATE_READY: - if (pNandSDCardManager->isSDWriteProtected()) { - pSavedataEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); - mState = MEMORY_STATE_ON_VERIFY1ST; - } else if (pNandSDCardManager->getAsyncResult()) { - pSavedataEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_WII); - mState = MEMORY_STATE_ON_VERIFY1ST; + case NandSDWorker::SD_STATE_READY: { + if (mpNandSDCardManager->isSDWriteProtected()) { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_SD_CARD_LOCKED); + mState = STATE_ON_VERIFY1ST; + } else if (mpNandSDCardManager->getAsyncResult()) { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_ALREADY_EXISTS_WII); + mState = STATE_ON_VERIFY1ST; } else { - pSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_MOVE_TO_WII_Q); - mState = MEMORY_STATE_ON_VERIFY_MOVE; + mpSavedataEdit->anmShowS2Btn2Dialog(MESG_DATA_MOVE_TO_WII_Q); + mState = STATE_ON_VERIFY_MOVE; } break; - default: - pSavedataEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); - mState = MEMORY_STATE_ON_VERIFY1ST; + } + default: { + mpSavedataEdit->anmSelectFadeout(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_VERIFY1ST; + } } } } void Memory::on_verify_move() { - if (!pSavedataEdit->isIdle() || pNandSDCardManager->isWorking()) + if (!mpSavedataEdit->isIdle() || mpNandSDCardManager->isWorking()) { return; + } switch (System::getDialog()->getLastResult()) { - case DialogWindow::RESULT_LEFT_BUTTON: + case DialogWindow::RESULT_LEFT_BUTTON: { if (mPage == MEMORY_PAGE_WII) { - if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { - start_process(MEMORY_PROC_MOV); - pNandSDCardManager->cmdMoveSaveNandToSD(pCurrBox); - pSavedataEdit->anmTextFadein(MESG_DATA_MOVING_TO_SD); - } else if (pNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_SLOT_EMPTY) { - pSavedataEdit->anmTextFadein(MESG_DATA_NO_SD_CARD); - mState = MEMORY_STATE_ON_END_PROCESS; + if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_READY) { + start_process(PROC_MOV); + mpNandSDCardManager->cmdMoveSaveNandToSD(mpCurrentBox); + mpSavedataEdit->anmTextFadein(MESG_DATA_MOVING_TO_SD); + } else if (mpNandSDCardManager->getWorker()->get_sd_state() == NandSDWorker::SD_STATE_EJECTED) { + mpSavedataEdit->anmTextFadein(MESG_DATA_NO_SD_CARD); + mState = STATE_ON_END_PROCESS; return; } else { - pSavedataEdit->anmTextFadein(MESG_DATA_SD_PROCESS_FAILED); - mState = MEMORY_STATE_ON_END_PROCESS; + mpSavedataEdit->anmTextFadein(MESG_DATA_SD_PROCESS_FAILED); + mState = STATE_ON_END_PROCESS; return; } } else { - start_process(MEMORY_PROC_MOV); - pNandSDCardManager->cmdMoveSaveSDToNand(pCurrBox); - pSavedataEdit->anmTextFadein(MESG_DATA_MOVING_TO_WII); + start_process(PROC_MOV); + mpNandSDCardManager->cmdMoveSaveSDToNand(mpCurrentBox); + mpSavedataEdit->anmTextFadein(MESG_DATA_MOVING_TO_WII); } break; - case DialogWindow::RESULT_RIGHT_BUTTON: - pSavedataEdit->anmSelectFadein(); - mState = MEMORY_STATE_ON_EDIT_FADEIN; + } + case DialogWindow::RESULT_RIGHT_BUTTON: { + mpSavedataEdit->anmSelectFadein(); + mState = STATE_ON_EDIT_FADEIN; break; + } } update_sdcard_slot(); } diff --git a/src/scene/nakamuraTest/iplContest.c b/src/scene/nakamuraTest/iplContest.c index 76fcdb60..fb1e6272 100644 --- a/src/scene/nakamuraTest/iplContest.c +++ b/src/scene/nakamuraTest/iplContest.c @@ -5,16 +5,16 @@ #include "gamespy/natneg/natneg.h" #include -#include +#include #include typedef enum { HTTP_TEST_NOT_STARTED = 0, - HTTP_TEST_STARTED = 1, - HTTP_TEST_REQUEST_MADE = 2, - HTTP_TEST_RESPONSE_RECEIVED = 3, - HTTP_TEST_RESPONSE_ERRORED = 4, - HTTP_TEST_DONE = 5, + HTTP_TEST_STARTED, + HTTP_TEST_REQUEST_MADE, + HTTP_TEST_RESPONSE_RECEIVED, + HTTP_TEST_RESPONSE_ERRORED, + HTTP_TEST_DONE, } HTTPTestState; typedef struct { @@ -29,7 +29,7 @@ typedef struct { undefined4 unk_0x034; undefined4 unk_0x038; undefined4 unk_0x03c; - s64 detectStartTime; + OSTime detectStartTime; NHTTPConnection httpConnection; NHTTPRequest* httpRequest; NHTTPResponse* httpResponse; @@ -67,7 +67,7 @@ void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) { g_session.heap = MEMCreateExpHeapEx(heapBuf, 0x10000, 0); OSInitMutex(&g_session.mutex); g_session.state = 0; - g_session.result = 0xff00; + g_session.result = 0xFF00; g_session.errCode = 0; g_session.httpTestState = HTTP_TEST_NOT_STARTED; g_session.unk_0x030 = 0; @@ -85,20 +85,22 @@ void IPLContestStart() { g_session.state = 1; } -int IPLContestProcess(void) { +int IPLContestProcess() { const char* xOrganizationHeader; u32 total; u32 complete; switch (g_session.state) { - case 0: + case 0: { break; - case 1: + } + case 1: { g_session.state = 2; - case 2: + } + case 2: { switch (g_session.httpTestState) { - case HTTP_TEST_NOT_STARTED: - if (NHTTPStartup(IPLContestNHTTPAlloc, IPLContestNHTTPFree, 0x11) == -1) { + case HTTP_TEST_NOT_STARTED: { + if (NHTTPStartup(IPLContestNHTTPAlloc, IPLContestNHTTPFree, 17) == NHTTP_ERROR_SYSTEM) { g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED; g_session.result |= 4; g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200; @@ -109,7 +111,8 @@ int IPLContestProcess(void) { OSReport("Starting HTTP conectting test.\n"); } break; - case HTTP_TEST_STARTED: + } + case HTTP_TEST_STARTED: { g_session.httpRequest = NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.unk_0x7f0, 0x400, sNHTTPReqCallback, 0); if (g_session.httpRequest == 0) { @@ -117,7 +120,7 @@ int IPLContestProcess(void) { g_session.result |= 4; g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200; OSReport("[error] Failed to create request.\n"); - } else if (g_session.proxy.http.mode == 1 && NHTTPSetProxyDefault(g_session.httpRequest) != 0) { + } else if (g_session.proxy.http.mode == 1 && NHTTPSetProxyDefault(g_session.httpRequest) != NHTTP_ERROR_NONE) { g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED; g_session.result |= 4; g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52400; @@ -140,16 +143,19 @@ int IPLContestProcess(void) { } } break; - case HTTP_TEST_REQUEST_MADE: + } + case HTTP_TEST_REQUEST_MADE: { NHTTPGetProgress(&complete, &total); OSReport("received:%d/%d\n", complete, total); - if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks(90000LL) || g_session.httpConnection < 0) + if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks((OSTime)90000) || g_session.httpConnection < 0) { break; + } NHTTPCancelRequestAsync(g_session.httpConnection); OSReport("[error] NHTTP timeout.\n"); g_session.httpConnection = -1; break; - case HTTP_TEST_RESPONSE_RECEIVED: + } + case HTTP_TEST_RESPONSE_RECEIVED: { if (NHTTPGetHeaderField(g_session.httpResponse, "X-Organization", &xOrganizationHeader) == strlen("Nintendo") && strcmp("Nintendo", xOrganizationHeader) == 0) { if (g_session.httpResponse != NULL) { @@ -170,7 +176,8 @@ int IPLContestProcess(void) { OSReport("[error] Invalid response header.\n"); } break; - case HTTP_TEST_RESPONSE_ERRORED: + } + case HTTP_TEST_RESPONSE_ERRORED: { if (g_session.httpResponse != NULL) { NHTTPDestroyResponse(g_session.httpResponse); g_session.httpResponse = NULL; @@ -183,78 +190,94 @@ int IPLContestProcess(void) { NHTTPCleanupAsync(sNHTTPCleanupCallback); OSReport("HTTP test has been completed with error.\n"); break; - case HTTP_TEST_DONE: + } + case HTTP_TEST_DONE: { break; + } } break; - case 3: - if (((g_session.result & 1) != 0) || ((g_session.result & 4) != 0)) { + } + case 3: { + if ((g_session.result & 1) || (g_session.result & 4)) { g_session.state = 4; - g_session.result = g_session.result & 0xffff00ff; + g_session.result = g_session.result & 0xFFFF00FF; OSReport("Port mapping detectioning test has been skipped.\n"); } else switch (g_session.unk_0x030) { - case 0: + case 0: { gsiMemoryCallbacksSet(IPLContestGSMalloc, IPLContestGSFree, IPLContestGSRealloc, IPLContestGSMemalign); GSIStartAvailableCheckA("wiinat"); g_session.unk_0x030 = 1; OSReport("Starting GameSpy available check.\n"); break; - case 1: + } + case 1: { switch (GSIAvailableCheckThink()) { - case GSIACWaiting: + case GSIACWaiting: { break; - case GSIACAvailable: + } + case GSIACAvailable: { g_session.unk_0x034 = 1; g_session.unk_0x030 = 2; OSReport("GameSpy server is currently available.\n"); break; - default: + } + default: { g_session.unk_0x034 = 0; g_session.unk_0x030 = 5; OSReport("GameSpy server is currently unavailable.\n"); break; + } } break; - case 2: + } + case 2: { NNStartNatDetection(iplContest_813D54F8); g_session.unk_0x030 = 3; OSReport("Port mapping detectioning test has been started.\n"); g_session.detectStartTime = OSGetTime(); break; - case 3: + } + case 3: { NNThink(); - if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks(90000LL)) + if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks((OSTime)90000)) { break; + } g_session.unk_0x030 = 5; g_session.unk_0x038 = 1; OSReport("[error] NAT timeout.\n"); break; - case 4: + } + case 4: { NNFreeNegotiateList(); g_session.state = 4; - g_session.result = g_session.result & 0xffff00ff; + g_session.result = g_session.result & 0xFFFF00FF; OSReport("Port mapping detectioning test has been completed.\n"); break; - case 5: + } + case 5: { g_session.state = 4; - g_session.result = g_session.result & 0xffff00ff; + g_session.result = g_session.result & 0xFFFF00FF; break; + } } break; - case 4: + } + case 4: { break; + } } return g_session.state; } int IPLContestGetResult() { - if ((g_session.result & 0xff00) != 0) { - return 0xff00; + if ((g_session.result & 0xFF00) != 0) { + return 0xFF00; } return g_session.result; } + int IPLContestGetErrorCode(int conntype) { return -(g_session.errCode - conntype); } @@ -296,15 +319,18 @@ int IPLGetNATSupportCode(int conntype) { code = 11190; } switch (conntype / 10) { - case 2: + case 2: { code += 1; break; - case 3: + } + case 3: { code += 2; break; - case 4: + } + case 4: { code += 3; break; + } } OSReport("Wii Support Code:%d\n", code); return code; @@ -320,8 +346,9 @@ void IPLContestShutdown() { void* IPLContestNHTTPAlloc(u32 size, int align) { void* block; - if (align < 4) + if (align < 4) { align = 4; + } OSLockMutex(&g_session.mutex); block = MEMAllocFromExpHeapEx(g_session.heap, size, align); @@ -393,41 +420,49 @@ void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) { g_session.httpResponse = httpRes; if (param_1 == 0) { switch (NHTTPGetResultCode(httpRes)) { - case 200: + case 200: { g_session.httpTestState = HTTP_TEST_RESPONSE_RECEIVED; return; - case 407: + } + case 407: { g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED; g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52500; g_session.result |= 4; return; - default: + } + default: { g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED; g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200; g_session.result |= 4; return; + } } } g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED; switch (param_1) { - case 0x4: + case 0x4: { g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52100; break; - case 0xc: + } + case 0xC: { g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52400; break; - case 0xd: + } + case 0xD: { g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52400; break; - default: + } + default: { g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200; break; + } } g_session.result |= 4; OSReport("[error] NHTTPReqCallback errorcode:%d\n", NHTTPGetError()); return; } + void sNHTTPCleanupCallback() { g_session.state = 3; } diff --git a/src/scene/nakamuraTest/iplNakamuraTest.cpp b/src/scene/nakamuraTest/iplNakamuraTest.cpp index a0dd0469..b769db3f 100644 --- a/src/scene/nakamuraTest/iplNakamuraTest.cpp +++ b/src/scene/nakamuraTest/iplNakamuraTest.cpp @@ -3,48 +3,56 @@ #include "scene/nakamuratest/iplContest.h" #include "scene/setting/iplSetting.h" -#include +#include +#include +#include #include +#include #include +#include #include "system/iplSystem.h" +#include "titledb.h" + namespace ipl { namespace scene { EGG::Heap* NakamuraTest::spHeap; BOOL NakamuraTest::sNHTTPFinished; NakamuraTest::NakamuraTest(EGG::Heap* heap) : scene::FaderSceneBase(heap), mNetSetup() { - pNetSetupHeapBuf = NULL; - pNUPHeapBuf = 0; - unk_0x2b88 = 0; - mState = 0x00; + mpNetSetupHeapBuf = NULL; + mpNUPHeapBuf = 0; + unk_0x2B88 = 0; + mState = 0; - pAppHeapBuf = System::getMem2App()->alloc(0x299999, 4); - pAppHeap = EGG::ExpHeap::create(pAppHeapBuf, 0x299999, 2); - spHeap = pAppHeap; + mpAppHeapBuf = System::getMem2App()->alloc(0x299999, 4); + mpAppHeap = EGG::ExpHeap::create(mpAppHeapBuf, 0x299999, 2); + spHeap = mpAppHeap; } NakamuraTest::~NakamuraTest() { - pAppHeap->destroy(); - System::getMem2App()->free(pAppHeapBuf); + mpAppHeap->destroy(); + System::getMem2App()->free(mpAppHeapBuf); } void NakamuraTest::prepare() { } + void NakamuraTest::create() { OSReport("Nakamuratest scene created.\n"); - pNetSetupHeapBuf = NULL; - pNUPHeapBuf = NULL; - pNUPHeap = NULL; - mState = 0x01; + mpNetSetupHeapBuf = NULL; + mpNUPHeapBuf = NULL; + mNUPHeap = NULL; + mState = 1; mNetSetupLastErr = 0; mConnTestResult = 0; mFoundUpdate = false; mAmtCompleted = 0; mAmtTotal = 0; - pNUPInstance = NULL; + mpNUPInstance = NULL; } + void NakamuraTest::destroy() { OSReport("Nakamuratest scene destroyed.\n"); } @@ -52,114 +60,103 @@ namespace ipl { void NakamuraTest::calcCommon() { } - // TODO: Put these in iplContest - extern "C" { - int WADGetInstalledVersion(ESTitleId titleID, u16* version); - - // int NHTTPStartup(void* (*)(u32, int), void (*)(void*), int); - // int NHTTPCleanupAsync(void (*)()); - - int NETGetStartupErrorCode(int); - - void* NUP_Init(MEMAllocator* allocator); - int NUP_Start(void* instance, const char* nus, const char* isoCountryCode, void* productAreaString, int); - int NUP_GetStatus(void* instance, u64*); - int NUP_Finish(void* instance); - - const char* SCUTILGetISOCountryCodeA2(); - } FaderSceneCommand NakamuraTest::calcNormal() { FaderSceneCommand cmd = FADER_SCN_CONTINUE; System::getMasterController(); switch (mState) { - case 0x00: + case 0: { break; - case 0x01: + } + case 1: { if (System::isReceiveScheduleStopped() == FALSE) { System::stopReceiveSchedule(); OSReport("[Receive Scheduler] Wait..\n"); } else { - pNetSetupHeapBuf = pAppHeap->alloc(0x10000, 4); + mpNetSetupHeapBuf = mpAppHeap->alloc(0x10000, 4); mNetSetupLastErr = 0; - Setting* settingScene = (Setting*)System::getSceneManager()->getScene(SCENE_SETTING); - u32 profileId = settingScene->getProfileID(); - if (mNetSetup.setup(pNetSetupHeapBuf, profileId)) { - mState = 0x02; + u32 profileId = ((Setting*)System::getScene(SCENE_SETTING))->getProfileID(); + if (mNetSetup.setup(mpNetSetupHeapBuf, profileId)) { + mState = 2; OSReport("NetSetup Start\n"); } else { - mState = 0x11; + mState = 17; mNetSetupLastErr = mNetSetup.getlasterror(); - if (pNetSetupHeapBuf != NULL) { - pAppHeap->free(pNetSetupHeapBuf); - pNetSetupHeapBuf = NULL; + if (mpNetSetupHeapBuf != NULL) { + mpAppHeap->free(mpNetSetupHeapBuf); + mpNetSetupHeapBuf = NULL; } OSReport("[error] NetSetup failed\n"); } } break; - - case 0x02: + } + case 2: { switch (mNetSetup.getstate()) { - case NetSetup::NET_SETUP_SUCCESS: - mState = 0x03; + case NetSetup::NET_SETUP_SUCCESS: { + mState = 3; OSReport("NetSetup Completed\n"); OSReport("Starting Connecting Test\n"); break; - case NetSetup::NET_SETUP_UNK_4: - mState = 0x11; + } + case NetSetup::NET_SETUP_UNK_4: { + mState = 17; mNetSetup.cleanup(); mNetSetupLastErr = mNetSetup.getlasterror(); - if (pNetSetupHeapBuf != NULL) { - pAppHeap->free(pNetSetupHeapBuf); - pNetSetupHeapBuf = NULL; + if (mpNetSetupHeapBuf != NULL) { + mpAppHeap->free(mpNetSetupHeapBuf); + mpNetSetupHeapBuf = NULL; } - OSReport("[error] %d\n", this->mNetSetupLastErr); + OSReport("[error] %d\n", mNetSetupLastErr); break; - case NetSetup::NET_SETUP_ERROR: - mState = 0x11; + } + case NetSetup::NET_SETUP_ERROR: { + mState = 17; mNetSetup.cleanup(); mNetSetupLastErr = mNetSetup.getlasterror(); - if (pNetSetupHeapBuf != NULL) { - pAppHeap->free(pNetSetupHeapBuf); - pNetSetupHeapBuf = NULL; + if (mpNetSetupHeapBuf != NULL) { + mpAppHeap->free(mpNetSetupHeapBuf); + mpNetSetupHeapBuf = NULL; } - OSReport("[error] %d\n", this->mNetSetupLastErr); + OSReport("[error] %d\n", mNetSetupLastErr); break; - - default: + } + default: { break; + } } break; + } + case 3: { + mpNUPHeapBuf = mpAppHeap->alloc(0x10000, 4); - case 0x03: - pNUPHeapBuf = pAppHeap->alloc(0x10000, 4); - IPLContestInitialize(pNUPHeapBuf, mNetSetup.getproxy()); - pConnTestThreadStack = pAppHeap->alloc(0x4000, 4); - OSCreateThread(&mConnTestThread, conntestthread, NULL, (u8*)pConnTestThreadStack + 0x4000, 0x4000, 0x12, 1); + IPLContestInitialize(mpNUPHeapBuf, mNetSetup.getproxy()); + mpConnTestThreadStack = mpAppHeap->alloc(0x4000, 4); + + OSCreateThread(&mConnTestThread, conntestthread, NULL, (u8*)mpConnTestThreadStack + 0x4000, 0x4000, 0x12, 1); OSResumeThread(&mConnTestThread); - mState = 0x04; + mState = 4; break; - - case 0x04: + } + case 4: { if (OSIsThreadTerminated(&mConnTestThread)) { - if (pConnTestThreadStack != NULL) { - pAppHeap->free(pConnTestThreadStack); - pConnTestThreadStack = NULL; + if (mpConnTestThreadStack != NULL) { + mpAppHeap->free(mpConnTestThreadStack); + mpConnTestThreadStack = NULL; } - mState = 0x05; + mState = 5; System::resetNWC24Regist(); } break; - - case 0x05: - mState = 0x06; + } + case 5: { + mState = 6; if (IPLContestGetResult() == 0 && System::processNWC24Regist() == 0) { - mState = 0x05; + mState = 5; } break; - - case 0x06: + } + case 6: { mConnTestResult = IPLContestGetResult(); if (System::getNWC24RegistErr() != 0) { OSReport("WiiID ErrorOccur\n"); @@ -182,151 +179,171 @@ namespace ipl { mNetSetupLastErr = IPLContestGetErrorCode(mNetSetup.getconntype()); } } else { - Setting* settingsScene = (Setting*)System::getScene(SCENE_SETTING); - - settingsScene->setConnectTestResult(1, mNetSetupLastErr, mFoundUpdate, IPLGetNATSupportCode(mNetSetup.getconntype())); + ((Setting*)System::getScene(SCENE_SETTING)) + ->setConnectTestResult(1, mNetSetupLastErr, mFoundUpdate, IPLGetNATSupportCode(mNetSetup.getconntype())); } - mState = 0x07; + mState = 7; break; - - case 0x07: + } + case 7: { IPLContestShutdown(); - if (pNUPHeapBuf != NULL) { - pAppHeap->free(pNUPHeapBuf); - pNUPHeapBuf = NULL; + if (mpNUPHeapBuf != NULL) { + mpAppHeap->free(mpNUPHeapBuf); + mpNUPHeapBuf = NULL; } if (mNetSetupLastErr != 0) { - mState = 0x11; + mState = 17; mNetSetup.cleanup(); - if (pNetSetupHeapBuf != NULL) { - pAppHeap->free(pNetSetupHeapBuf); - pNetSetupHeapBuf = NULL; + if (mpNetSetupHeapBuf != NULL) { + mpAppHeap->free(mpNetSetupHeapBuf); + mpNetSetupHeapBuf = NULL; } } else { - mState = 0x08; - } - break; - - case 0x08: { - Setting* settingsScene = (Setting*)System::getScene(SCENE_SETTING); - if (settingsScene->getUpdateTiming() == 4) { - mState = 0x09; - } else if (settingsScene->getUpdateTiming() == 10) { - mState = 0x0e; + mState = 8; } break; } - case 0x09: { + case 8: { + Setting* settingsScene = (Setting*)System::getScene(SCENE_SETTING); + if (settingsScene->getUpdateTiming() == 4) { + mState = 9; + } else if (settingsScene->getUpdateTiming() == 10) { + mState = 14; + } + break; + } + case 9: { u16 menuVersion; System::getNandManager()->closeContentsAll(); - WADGetInstalledVersion(0x0000000100000002ULL, &menuVersion); + WADGetInstalledVersion(SYSMENU_TITLE_ID, &menuVersion); mCurrVersion = menuVersion; NHTTPStartup(nhttpalloc, nhttpfree, 0x13); - pNUPHeapBuf = pAppHeap->alloc(0x270000, 4); - pNUPHeap = MEMCreateExpHeapEx(pNUPHeapBuf, 0x270000, 0); - MEMInitAllocatorForExpHeap(&mNUPAllocator, pNUPHeap, 4); - pNUPInstance = NUP_Init(&mNUPAllocator); - if (pNUPInstance != (void*)0x0) { + mpNUPHeapBuf = mpAppHeap->alloc(0x270000, 4); + mNUPHeap = MEMCreateExpHeapEx(mpNUPHeapBuf, 0x270000, 0); + MEMInitAllocatorForExpHeap(&mNUPAllocator, mNUPHeap, 4); + + mpNUPInstance = NUP_Init(&mNUPAllocator); + + if (mpNUPInstance != NULL) { char productAreaString[8]; char nus[] = "nus.shop.wii.com"; SCGetProductAreaString(productAreaString, 4); OSReport("NUP region code : %s\n", productAreaString); const char* isoCountryCode = SCUTILGetISOCountryCodeA2(); OSReport("NUP country code : %s\n", isoCountryCode); - int iVar8 = NUP_Start(pNUPInstance, nus, isoCountryCode, productAreaString, 0); + int iVar8 = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0); OSReport("NUP_Start()\n"); if (iVar8 < 0) { switch (iVar8) { - case -5000: + case -5000: { OSReport("FAIL ALLOC\n"); - case -5001: + } + case -5001: { OSReport("FAIL INTERNAL\n"); - case -5002: + } + case -5002: { OSReport("INVALID_FLAG\n"); - case -5003: + } + case -5003: { OSReport("NOT READY\n"); - case -5011: + } + case -5011: { OSReport("BAD HEAP\n"); - case -5012: + } + case -5012: { OSReport("BAD SIZE\n"); mNetSetupLastErr = 32004; break; - case -5005: + } + case -5005: { mNetSetupLastErr = 32001; break; + } case -5009: case -5008: case -5007: case -5006: - case -5004: + case -5004: { mNetSetupLastErr = 32002; break; - case -5010: + } + case -5010: { mNetSetupLastErr = 32003; break; - default: + } + default: { mNetSetupLastErr = 32004; break; + } } - mState = 0x0c; + mState = 12; break; } } - mState = 0x0a; + mState = 10; break; } - case 0x0a: { + case 10: { u16 menuVersion; u64 nupStatus[3]; - int nupErrno = NUP_GetStatus(pNUPInstance, nupStatus); + int nupErrno = NUP_GetStatus(mpNUPInstance, nupStatus); if (nupStatus[1] != 0) { mAmtCompleted = nupStatus[2]; mAmtTotal = nupStatus[1]; } if (nupErrno == 0) { mFoundUpdate = true; - mState = 0x0c; + mState = 12; } else if (nupErrno < 0) { OSReport("NUP failed errorcode :%d\n", nupErrno); - WADGetInstalledVersion(0x0000000100000002ULL, &menuVersion); + WADGetInstalledVersion(SYSMENU_TITLE_ID, &menuVersion); if (mCurrVersion != menuVersion) { mFoundUpdate = true; } else { mFoundUpdate = false; } switch (nupErrno) { - case -5000: + case -5000: { OSReport("FAIL ALLOC\n"); - case -5001: + } + case -5001: { OSReport("FAIL INTERNAL\n"); - case -5002: + } + case -5002: { OSReport("INVALID_FLAG\n"); - case -5003: + } + case -5003: { OSReport("NOT READY\n"); - case -5011: + } + case -5011: { OSReport("BAD HEAP\n"); - case -5012: + } + case -5012: { OSReport("BAD SIZE\n"); mNetSetupLastErr = 32004; break; - case -5005: + } + case -5005: { mNetSetupLastErr = 32001; break; + } case -5009: case -5008: case -5007: case -5006: - case -5004: + case -5004: { mNetSetupLastErr = 32002; break; - case -5010: + } + case -5010: { mNetSetupLastErr = 32003; break; - default: + } + default: { if (-1001 >= nupErrno && nupErrno >= -1007) { mNetSetupLastErr = 32005; } else if (-6000 >= nupErrno && nupErrno > -7000) { @@ -338,62 +355,62 @@ namespace ipl { } else { mNetSetupLastErr = 32004; } + } } - mState = 0x0c; + mState = 12; } break; } - - case 0x0c: { - NUP_Finish(pNUPInstance); - if (pNUPHeap != NULL) { - MEMDestroyExpHeap(pNUPHeap); - pNUPHeap = NULL; + case 12: { + NUP_Finish(mpNUPInstance); + if (mNUPHeap != NULL) { + MEMDestroyExpHeap(mNUPHeap); + mNUPHeap = NULL; } - if (pNUPHeapBuf != NULL) { - pAppHeap->free(pNUPHeapBuf); - pNUPHeapBuf = NULL; + if (mpNUPHeapBuf != NULL) { + mpAppHeap->free(mpNUPHeapBuf); + mpNUPHeapBuf = NULL; } sNHTTPFinished = false; NHTTPCleanupAsync(nhttpcleanupcallback); - mState = 0x0d; + mState = 13; u16 menuVersion; - WADGetInstalledVersion(0x0000000100000002ULL, &menuVersion); + WADGetInstalledVersion(SYSMENU_TITLE_ID, &menuVersion); OSReport("systemmenu ver. before:%d after:%d\n", mCurrVersion, menuVersion); mFoundUpdate = true; break; } - - case 0x0d: + case 13: { if (sNHTTPFinished) - mState = 0x0b; + mState = 11; break; - case 0x0b: - mState = 0x0f; + } + case 11: { + mState = 15; break; - - case 0x0e: - mState = 0x0f; + } + case 14: { + mState = 15; OSReport("Network update has been skipped.\n"); break; - - case 0x0f: + } + case 15: { OSReport("Disconnecting from network.\n"); mNetSetup.cleanup(); OSReport("Finished\n"); - if (pNetSetupHeapBuf != NULL) { - pAppHeap->free(pNetSetupHeapBuf); - pNetSetupHeapBuf = NULL; + if (mpNetSetupHeapBuf != NULL) { + mpAppHeap->free(mpNetSetupHeapBuf); + mpNetSetupHeapBuf = NULL; } if (mNetSetupLastErr == 0) { - mState = 0x10; + mState = 16; } else { - mState = 0x11; + mState = 17; } break; - - case 0x10: + } + case 16: { if (mAmtTotal == 0) { Setting* settingScene = (Setting*)System::getScene(SCENE_SETTING); settingScene->setConnectTestResult(3, mNetSetupLastErr, mFoundUpdate, 0); @@ -404,14 +421,11 @@ namespace ipl { cmd = FADER_SCN_NEXT; } break; - - case 0x11: + } + case 17: { int val; int len = 4; - // local_50 = 4; - int level = 0xfffe; - int optname = 0x1003; - if (SOGetInterfaceOpt(NULL, level, optname, &val, &len) == 0 && val == -111) { + if (SOGetInterfaceOpt(NULL, SO_SOL_CONFIG, SO_CONFIG_ERROR, &val, &len) == 0 && val == -111) { int iVar7 = NETGetStartupErrorCode(-111); mNetSetupLastErr = (-iVar7 / 100) * 100; mNetSetupLastErr = mNetSetup.getconntype(); @@ -420,9 +434,9 @@ namespace ipl { settingScene->setConnectTestResult(2, mNetSetupLastErr, mFoundUpdate, 0); cmd = FADER_SCN_NEXT; break; + } } return cmd; - // WADGetInstalledVersion; } FaderSceneCommand NakamuraTest::calcFadeout() { @@ -433,7 +447,7 @@ namespace ipl { if (System::getSceneManager()->onDefaultDrawLayer() != TRUE) { return; } - utility::Graphics::setOrtho(0); + utility::Graphics::setOrtho(); } void* NakamuraTest::conntestthread(void*) { @@ -442,14 +456,15 @@ namespace ipl { IPLContestStart(); while (true) { switch (IPLContestProcess()) { - case 4: + case 4: { return NULL; - + } case 0: case 1: case 2: - case 3: + case 3: { break; + } } OSSleepTicks(OSMicrosecondsToTicks(1)); } @@ -460,9 +475,11 @@ namespace ipl { align = 4; return spHeap->alloc(size, align); } + void NakamuraTest::nhttpfree(void* buf) { return spHeap->free(buf); } + void NakamuraTest::nhttpcleanupcallback() { sNHTTPFinished = TRUE; } @@ -470,6 +487,5 @@ namespace ipl { BOOL NakamuraTest::isResetAcceptable() const { return FALSE; } - } // namespace scene } // namespace ipl diff --git a/src/scene/nakamuraTest/iplNetSetup.cpp b/src/scene/nakamuraTest/iplNetSetup.cpp index 38688a13..2eff8260 100644 --- a/src/scene/nakamuraTest/iplNetSetup.cpp +++ b/src/scene/nakamuraTest/iplNetSetup.cpp @@ -14,25 +14,25 @@ namespace ipl { void* NetSetup::iSOStartupEXThread(void* param_1) { s32 cfgSetResult; int soStartupRes; - undefined* puVar3; SOInAddr soAddr; OSReport("NCDSetIpConfig()\n"); cfgSetResult = NCDSetIpConfig(sSOStartupInfo.ipcfg); if (cfgSetResult != 0) { switch (cfgSetResult) { - case -3: + case -3: { sSOStartupInfo.state = NET_SETUP_ERROR; sSOStartupInfo.lastErr = 50300; break; - + } case -1: case -2: case -4: - default: + default: { sSOStartupInfo.state = NET_SETUP_ERROR; sSOStartupInfo.lastErr = 50100; break; + } } return NULL; } @@ -41,18 +41,19 @@ namespace ipl { cfgSetResult = NCDSetIfConfig(sSOStartupInfo.ifcfg); if (cfgSetResult != 0) { switch (cfgSetResult) { - case -3: + case -3: { sSOStartupInfo.state = NET_SETUP_ERROR; sSOStartupInfo.lastErr = 50300; break; - + } case -1: case -2: case -4: - default: + default: { sSOStartupInfo.state = NET_SETUP_ERROR; sSOStartupInfo.lastErr = 50100; break; + } } return NULL; } @@ -132,6 +133,7 @@ namespace ipl { } else { mConnType = mProfileId + 40; } + mState = NET_SETUP_REQUESTED_STARTUP; return TRUE; } @@ -143,14 +145,18 @@ namespace ipl { SOLibraryConfig soLibCfg; switch (mState) { - case NET_SETUP_REQUESTED_STARTUP: + case NET_SETUP_REQUESTED_STARTUP: { memset(&soLibCfg, 0, 8); + soLibCfg.alloc = allocfunc; soLibCfg.free = freefunc; + SOInit(&soLibCfg); - pThreadStack = (void*)allocfunc(0x4000, 0x20); - stackEnd = (void*)((int)pThreadStack + 0x4000); - if (OSCreateThread(&mThread, iSOStartupEXThread, (void*)mConnType, stackEnd, 0x4000, 0x11, 1) == 0) { + + mpThreadStack = (void*)allocfunc(0x4000, 0x20); + stackEnd = (void*)((int)mpThreadStack + 0x4000); + + if (OSCreateThread(&mThread, iSOStartupEXThread, (void*)mConnType, stackEnd, 0x4000, 17, 1) == 0) { mLastErr = -(-50100 + -mConnType); mState = NET_SETUP_ERROR; OSReport("OSCreateThread failed\n"); @@ -159,10 +165,10 @@ namespace ipl { mState = NET_SETUP_RUNNING; } break; - - case NET_SETUP_RUNNING: + } + case NET_SETUP_RUNNING: { if (OSIsThreadTerminated(&mThread)) { - threadStack = pThreadStack; + threadStack = mpThreadStack; mState = sSOStartupInfo.state; mLastErr = sSOStartupInfo.lastErr; if (threadStack != NULL) { @@ -171,20 +177,21 @@ namespace ipl { MEMFreeToExpHeap(sHeap, threadStack); OSUnlockMutex(&sAllocLock); } - pThreadStack = NULL; + mpThreadStack = NULL; } } break; - - case NET_SETUP_SUCCESS: + } + case NET_SETUP_SUCCESS: { NCDGetLinkStatus(); break; - + } case NET_SETUP_NOT_STARTED: case NET_SETUP_UNK_4: case NET_SETUP_ERROR: - default: + default: { break; + } } return mState; } @@ -192,7 +199,7 @@ namespace ipl { void NetSetup::cleanup() { SOCleanup(); SOFinish(); - memset(&mNcdIfCfg, 0, 0x15e); + memset(&mNcdIfCfg, 0, sizeof(mNcdIfCfg)); mNcdIfCfg.selectedMedia = 0; NCDSetIfConfig(&mNcdIfCfg); MEMDestroyExpHeap(sHeap); @@ -202,13 +209,14 @@ namespace ipl { void* ptr = NULL; if (size > 0) { OSLockMutex(&sAllocLock); - ptr = MEMAllocFromExpHeapEx(sHeap, size, 0x20); + ptr = MEMAllocFromExpHeapEx(sHeap, size, 32); OSUnlockMutex(&sAllocLock); } return ptr; } + void NetSetup::freefunc(u32, void* buf, s32) { - if (buf != (void*)0x0) { + if (buf != NULL) { OSLockMutex(&sAllocLock); MEMFreeToExpHeap(sHeap, buf); OSUnlockMutex(&sAllocLock); diff --git a/src/scene/saveDataEdit/iplSaveDataBase.cpp b/src/scene/saveDataEdit/iplSaveDataBase.cpp index c6a5c988..47bb5221 100644 --- a/src/scene/saveDataEdit/iplSaveDataBase.cpp +++ b/src/scene/saveDataEdit/iplSaveDataBase.cpp @@ -10,37 +10,9 @@ namespace ipl { namespace scene { - enum SavedataBaseAnimIdx { - ANIM_SWITCH = 0x00, // 0x00 - ANIM_DATA_IN = 0x01, // 0x01 - ANIM_DATA_OUT = 0x02, // 0x02 - ANIM_SELECT_IN = 0x03, // 0x03 - ANIM_SELECT_WII_IN = 0x04, // 0x04 - ANIM_SELECT_WII_OUT = 0x05, // 0x05 - ANIM_SELECT_WII_FLASH = 0x06, // 0x06 - ANIM_SELECT_SD_IN = 0x07, // 0x07 - ANIM_SELECT_SD_OUT = 0x08, // 0x08 - ANIM_SELECT_SD_FLASH = 0x09, // 0x09 - ANIM_ARROWS_MOVE_L = 0x0a, // 0x0a - ANIM_ARROWS_MOVE_R = 0x0b, // 0x0b - ANIM_ARROW_R_SELECT = 0x0c, // 0x0c - ANIM_ARROW_L_SELECT = 0x0d, // 0x0d - ANIM_ARROW_R_FOCUS_ON = 0x0e, // 0x0e - ANIM_ARROW_L_FOCUS_ON = 0x0f, // 0x0f - ANIM_ARROW_R_FOCUS_OFF = 0x10, // 0x10 - ANIM_ARROW_L_FOCUS_OFF = 0x11, // 0x11 - ANIM_ARROW_R_LOOP = 0x12, // 0x12 - ANIM_ARROW_R_END = 0x13, // 0x13 - ANIM_ARROW_L_END = 0x14, // 0x14 - ANIM_ARROW_R_LOST = 0x15, // 0x15 - ANIM_ARROW_L_LOST = 0x16, // 0x16 - ANIM_ERROR_TEXT_IN = 0x17, // 0x17 - ANIM_ERROR_TEXT_OUT = 0x18, // 0x18 - }; - - SavedataBase::SavedataBase(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName) - : AnmController(heap), ::gui::EventHandler(), mState(SAVEDATA_IDLE) { - pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName); + SavedataBase::SavedataBase(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName) + : AnmController(heap), ::gui::EventHandler(), mState(STATE_IDLE) { + mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName); add_animation("it_ObjCubeEdit_a_WiiSwitch.brlan", "G_Switch"); add_animation("it_ObjCubeEdit_a_DataIn.brlan", "G_DataAll"); @@ -72,7 +44,7 @@ namespace ipl { get_animation(ANIM_SELECT_WII_OUT)->animator->setAnmType(ANIM_TYPE_BACKWARD); get_animation(ANIM_SELECT_SD_OUT)->animator->setAnmType(ANIM_TYPE_BACKWARD); do_animation(ANIM_SWITCH, ANIM_TYPE_FORWARD, true); - pLytObj->finishBinding(); + mpLayout->finishBinding(); set_textbox("T_SelectWii_00", MESG_SAVEDATA_EDIT_WII); set_textbox("T_SelectWii_01", MESG_SAVEDATA_EDIT_WII); @@ -86,14 +58,14 @@ namespace ipl { set_visible("N_Capa_00", false); set_visible("T_Capa_00", false); - pPaneManager = new (heap) ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true); - pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt()); - pPaneManager->setAllComponentTriggerTarget(false); + mpGui = new (heap) gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true); + mpGui->createLayoutScene(*mpLayout->getNW4RLyt()); + mpGui->setAllComponentTriggerTarget(false); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_ArwR"), true); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_ArwL"), true); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_SelectWii_00"), true); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_SelectSd_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_ArwR"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_ArwL"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_SelectWii_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_SelectSd_00"), true); add_anmpane("B_ArwR", get_animation(ANIM_ARROW_R_FOCUS_ON), get_animation(ANIM_ARROW_R_FOCUS_OFF)); add_anmpane("B_ArwL", get_animation(ANIM_ARROW_L_FOCUS_ON), get_animation(ANIM_ARROW_L_FOCUS_OFF)); @@ -102,102 +74,121 @@ namespace ipl { } SavedataBase::~SavedataBase() { - delete pLytObj; - delete pPaneManager; + delete mpLayout; + delete mpGui; } void SavedataBase::calc() { AnmPane* anmPane; - pLytObj->calc(); - pPaneManager->calc(); + mpLayout->calc(); + mpGui->calc(); anmPane = NULL; - while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) + while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) { anmPane->calc(); + } switch (mState) { - case SAVEDATA_IDLE: + case STATE_IDLE: { break; - case SAVEDATA_FADEIN1ST: + } + case STATE_FADEIN1ST: { on_fadein1st(); break; - case SAVEDATA_FADEIN2ND: + } + case STATE_FADEIN2ND: { on_fadein2nd(); break; - case SAVEDATA_FADEOUT: + } + case STATE_FADEOUT: { on_fadeout(); break; - case SAVEDATA_CHANGE_SD_TO_WII: + } + case STATE_CHANGE_SD_TO_WII: { on_change_sd_to_wii(); break; - case SAVEDATA_CHANGE_WII_TO_SD: + } + case STATE_CHANGE_WII_TO_SD: { on_change_wii_to_sd(); break; - case SAVEDATA_SCROLL_R: + } + case STATE_SCROLL_R: { on_scroll_r(); break; - case SAVEDATA_SCROLL_L: + } + case STATE_SCROLL_L: { on_scroll_l(); break; - case SAVEDATA_TEXT_FADEIN: + } + case STATE_TEXT_FADEIN: { on_text_fadein(); break; - case SAVEDATA_TEXT_FADEOUT: + } + case STATE_TEXT_FADEOUT: { on_text_fadeout(); break; + } + default: { + break; + } } } void SavedataBase::draw() { - pLytObj->draw(); + mpLayout->draw(); } void SavedataBase::update() { - pPaneManager->update(); + mpGui->update(); } void SavedataBase::anmFadein() { do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true); - mState = SAVEDATA_FADEIN1ST; + mState = STATE_FADEIN1ST; } + void SavedataBase::anmFadeout(bool isErr) { do_animation(ANIM_DATA_OUT, ANIM_TYPE_FORWARD, true); if (isErr) { do_animation(ANIM_ERROR_TEXT_OUT, ANIM_TYPE_FORWARD, true); } - mState = SAVEDATA_FADEOUT; + mState = STATE_FADEOUT; } void SavedataBase::anmChangeWiitoSD() { do_animation(ANIM_SELECT_SD_FLASH, ANIM_TYPE_FORWARD, true); - mState = SAVEDATA_CHANGE_WII_TO_SD; + mState = STATE_CHANGE_WII_TO_SD; } + void SavedataBase::anmChangeSDtoWii() { do_animation(ANIM_SELECT_WII_FLASH, ANIM_TYPE_FORWARD, true); - mState = SAVEDATA_CHANGE_SD_TO_WII; + mState = STATE_CHANGE_SD_TO_WII; } void SavedataBase::anmScrollR(bool playButtonAnm) { do_animation(ANIM_ARROWS_MOVE_L, ANIM_TYPE_FORWARD, true); if (playButtonAnm) do_animation(ANIM_ARROW_R_SELECT, ANIM_TYPE_FORWARD, true); - mState = SAVEDATA_SCROLL_R; + mState = STATE_SCROLL_R; } + void SavedataBase::anmScrollL(bool playButtonAnm) { do_animation(ANIM_ARROWS_MOVE_R, ANIM_TYPE_FORWARD, true); - if (playButtonAnm) + if (playButtonAnm) { do_animation(ANIM_ARROW_L_SELECT, ANIM_TYPE_FORWARD, true); - mState = SAVEDATA_SCROLL_L; + } + mState = STATE_SCROLL_L; } void SavedataBase::anmTextFadein(u32 msgId) { set_textbox("T_Error_00", msgId); do_animation(ANIM_ERROR_TEXT_IN, ANIM_TYPE_FORWARD, true); - mState = SAVEDATA_TEXT_FADEIN; + mState = STATE_TEXT_FADEIN; } + void SavedataBase::anmTextFadeout() { do_animation(ANIM_ERROR_TEXT_OUT, ANIM_TYPE_FORWARD, true); - mState = SAVEDATA_TEXT_FADEOUT; + mState = STATE_TEXT_FADEOUT; } void SavedataBase::anmArwAppear(bool arwR, bool arwL) { @@ -225,55 +216,61 @@ namespace ipl { gui::PaneComponent* paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId); const char* paneName = paneComponent->getPane()->GetName(); + controller::Interface* con = (controller::Interface*)data; + AnmPane* anmPane; switch (event) { - case ON_POINT: + case ON_POINT: { anmPane = get_anmpane(paneName); if (anmPane != NULL) { Memory* sceneMemory = (Memory*)System::getScene(SCENE_MEMORY); sceneMemory->onPoint(anmPane); } break; - case ON_LEFT: + } + case ON_LEFT: { anmPane = get_anmpane(paneName); if (anmPane != NULL) { Memory* sceneMemory = (Memory*)System::getScene(SCENE_MEMORY); sceneMemory->onLeft(anmPane); } break; - case ON_TRIG: - if (!((controller::Interface*)data)->downTrg(controller::BTN_INTERACT)) + } + case ON_TRIG: { + if (!con->downTrg(controller::BTN_INTERACT)) { break; + } anmPane = get_anmpane(paneName); if (anmPane != NULL) { Memory* sceneMemory = (Memory*)System::getScene(SCENE_MEMORY); sceneMemory->onTrig(anmPane); } break; + } } } WAIT_FOR_ANIM_STATE(SavedataBase::on_fadein1st, ANIM_DATA_IN, { do_animation(ANIM_SELECT_IN, ANIM_TYPE_FORWARD, true); - mState = SAVEDATA_FADEIN2ND; + mState = STATE_FADEIN2ND; }); - WAIT_FOR_ANIM_STATE(SavedataBase::on_fadein2nd, ANIM_SELECT_IN, mState = SAVEDATA_IDLE); - WAIT_FOR_ANIM_STATE(SavedataBase::on_fadeout, ANIM_DATA_OUT, mState = SAVEDATA_IDLE); - WAIT_FOR_ANIM_STATE(SavedataBase::on_change_wii_to_sd, ANIM_SELECT_SD_FLASH, mState = SAVEDATA_IDLE); - WAIT_FOR_ANIM_STATE(SavedataBase::on_change_sd_to_wii, ANIM_SELECT_WII_FLASH, mState = SAVEDATA_IDLE); + WAIT_FOR_ANIM_STATE(SavedataBase::on_fadein2nd, ANIM_SELECT_IN, mState = STATE_IDLE); + WAIT_FOR_ANIM_STATE(SavedataBase::on_fadeout, ANIM_DATA_OUT, mState = STATE_IDLE); + WAIT_FOR_ANIM_STATE(SavedataBase::on_change_wii_to_sd, ANIM_SELECT_SD_FLASH, mState = STATE_IDLE); + WAIT_FOR_ANIM_STATE(SavedataBase::on_change_sd_to_wii, ANIM_SELECT_WII_FLASH, mState = STATE_IDLE); WAIT_FOR_ANIM_STATE(SavedataBase::on_scroll_r, ANIM_ARROWS_MOVE_L, { get_animation(ANIM_ARROWS_MOVE_L)->animator->init(); - pLytObj->calc(); + mpLayout->calc(); - mState = SAVEDATA_IDLE; + mState = STATE_IDLE; }); WAIT_FOR_ANIM_STATE(SavedataBase::on_scroll_l, ANIM_ARROWS_MOVE_R, { get_animation(ANIM_ARROWS_MOVE_L)->animator->init(); - pLytObj->calc(); + mpLayout->calc(); - mState = SAVEDATA_IDLE; + mState = STATE_IDLE; }); - WAIT_FOR_ANIM_STATE(SavedataBase::on_text_fadein, ANIM_ERROR_TEXT_IN, mState = SAVEDATA_IDLE); - WAIT_FOR_ANIM_STATE(SavedataBase::on_text_fadeout, ANIM_ERROR_TEXT_OUT, mState = SAVEDATA_IDLE); + WAIT_FOR_ANIM_STATE(SavedataBase::on_text_fadein, ANIM_ERROR_TEXT_IN, mState = STATE_IDLE); + WAIT_FOR_ANIM_STATE(SavedataBase::on_text_fadeout, ANIM_ERROR_TEXT_OUT, mState = STATE_IDLE); } // namespace scene } // namespace ipl diff --git a/src/scene/saveDataEdit/iplSaveDataBox.cpp b/src/scene/saveDataEdit/iplSaveDataBox.cpp index 0bee9d97..257b3b66 100644 --- a/src/scene/saveDataEdit/iplSaveDataBox.cpp +++ b/src/scene/saveDataEdit/iplSaveDataBox.cpp @@ -4,62 +4,55 @@ namespace ipl { namespace scene { - enum SavedataBoxAnimIdx { - ANIM_DATA_IN = 0x0, // 0x0 - ANIM_DATA_OUT = 0x1, // 0x1 - ANIM_DATA_FOCUS_IN = 0x2, // 0x2 - ANIM_DATA_FOCUS_OUT = 0x3, // 0x3 - }; - - SavedataBox::SavedataBox(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName) - : AnmController(heap), ::gui::EventHandler(), mState(BOX_STATE_IDLE), pBannerFileInfo(NULL), pTextBalloon(NULL), - mTextBalloonInitialized(false) { - pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName); + SavedataBox::SavedataBox(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName) + : AnmController(heap), ::gui::EventHandler(), mState(STATE_IDLE), mpBannerFileInfo(NULL), mpBalloon(NULL), mbInitBalloon(false) { + mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName); add_animation("it_ObjCubeEdit_b_SaveDataIn.brlan", "G_Data"); add_animation("it_ObjCubeEdit_b_SaveDataOut.brlan", "G_Data"); add_animation("it_ObjCubeEdit_b_SaveDataFoucusIn.brlan", "G_Data"); add_animation("it_ObjCubeEdit_b_SaveDataFoucusOut.brlan", "G_Data"); - pLytObj->finishBinding(); + mpLayout->finishBinding(); set_visible("N_Data_00", false); set_visible("DataBanner_00", false); - pPaneManager = new ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true); - pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt()); - pPaneManager->setAllComponentTriggerTarget(false); + mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true); + mpGui->createLayoutScene(*mpLayout->getNW4RLyt()); + mpGui->setAllComponentTriggerTarget(false); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Data_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Data_00"), true); add_anmpane("B_Data_00", get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT)); } SavedataBox::~SavedataBox() { - delete pLytObj; - delete pPaneManager; + delete mpLayout; + delete mpGui; } void SavedataBox::calc() { - Memory* sceneMemory; + Memory* memory; GXTexObj corruptIconTex; AnmPane* anmPane; - pLytObj->calc(); - pPaneManager->calc(); + mpLayout->calc(); + mpGui->calc(); anmPane = NULL; - while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != 0) + while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) { anmPane->calc(); + } - if (mState != BOX_STATE_FADEOUT && pBannerFileInfo != NULL) { + if (mState != STATE_FADEOUT && mpBannerFileInfo != NULL) { set_visible("DataBanner_00", true); - if (!pBannerFileInfo->isCorrupt()) { - set_texture("DataBanner_00", *pBannerFileInfo->loadIconTexture()); - pBannerFileInfo->update(); + if (!mpBannerFileInfo->isCorrupt()) { + set_texture("DataBanner_00", *mpBannerFileInfo->loadIconTexture()); + mpBannerFileInfo->update(); } else { - sceneMemory = (Memory*)System::getScene(SCENE_MEMORY); - sceneMemory->getCorruptIconTexture(&corruptIconTex); + memory = (Memory*)System::getScene(SCENE_MEMORY); + memory->getCorruptIconTexture(&corruptIconTex); set_texture("DataBanner_00", corruptIconTex); } } else { @@ -67,124 +60,139 @@ namespace ipl { } switch (mState) { - case BOX_STATE_IDLE: + case STATE_IDLE: { break; - case BOX_STATE_FADEIN: + } + case STATE_FADEIN: { on_fadein(); break; - case BOX_STATE_FADEOUT: + } + case STATE_FADEOUT: { on_fadeout(); break; + } } } void SavedataBox::draw() { - pLytObj->draw(); + mpLayout->draw(); } void SavedataBox::update() { - pPaneManager->update(); + mpGui->update(); } void SavedataBox::anmFadein() { set_visible("N_Data_00", true); do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true); - mState = BOX_STATE_FADEIN; + mState = STATE_FADEIN; } void SavedataBox::anmFadeout() { - if (pTextBalloon != NULL) - pTextBalloon->terminate(); + if (mpBalloon != NULL) + mpBalloon->terminate(); do_animation(ANIM_DATA_OUT, ANIM_TYPE_FORWARD, true); - mState = BOX_STATE_FADEOUT; + mState = STATE_FADEOUT; } void SavedataBox::onEvent(u32 compId, u32 event, void* data) { const char* paneName; gui::PaneComponent* paneComponent; - AnmPane* anmPane; - Memory* sceneMemory; paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId); paneName = paneComponent->getPane()->GetName(); + controller::Interface* con = (controller::Interface*)data; + + AnmPane* anmPane; + Memory* memory; + switch (event) { - case ON_POINT: + case ON_POINT: { anmPane = get_anmpane(paneName); - if (anmPane == NULL) + if (anmPane == NULL) { break; - + } anmPane->incHoverCount(); - sceneMemory = (Memory*)System::getScene(SCENE_MEMORY); - sceneMemory->onPoint(anmPane); - if (pTextBalloon == NULL || pBannerFileInfo == NULL) + ((Memory*)System::getScene(SCENE_MEMORY))->onPoint(anmPane); + if (mpBalloon == NULL || mpBannerFileInfo == NULL) { break; - if (!pBannerFileInfo->isCorrupt()) { - pTextBalloon->init(pBannerFileInfo->getSaveName()); - } else { - pTextBalloon->init(L"???"); } - mTextBalloonInitialized = true; - pTextBalloon->fadein(); - break; - case ON_MOVE: - anmPane = get_anmpane(paneName); - if (anmPane == NULL) - break; - if (pTextBalloon == NULL || pBannerFileInfo == NULL) - break; - if (mTextBalloonInitialized) - break; - - if (!pBannerFileInfo->isCorrupt()) { - pTextBalloon->init(pBannerFileInfo->getSaveName()); + if (!mpBannerFileInfo->isCorrupt()) { + mpBalloon->init(mpBannerFileInfo->getSaveName()); } else { - pTextBalloon->init(L"???"); + mpBalloon->init(L"???"); } - mTextBalloonInitialized = true; - pTextBalloon->fadein(); - break; - case ON_LEFT: + mbInitBalloon = true; + mpBalloon->fadein(); + break; + } + case ON_MOVE: { anmPane = get_anmpane(paneName); - if (anmPane == NULL) + if (anmPane == NULL) { break; + } + if (mpBalloon == NULL || mpBannerFileInfo == NULL) { + break; + } + if (mbInitBalloon) { + break; + } + + if (!mpBannerFileInfo->isCorrupt()) { + mpBalloon->init(mpBannerFileInfo->getSaveName()); + } else { + mpBalloon->init(L"???"); + } + mbInitBalloon = true; + mpBalloon->fadein(); + break; + } + case ON_LEFT: { + anmPane = get_anmpane(paneName); + if (anmPane == NULL) { + break; + } anmPane->decHoverCount(); - sceneMemory = (Memory*)System::getScene(SCENE_MEMORY); - sceneMemory->onLeft(anmPane); - mTextBalloonInitialized = false; + ((Memory*)System::getScene(SCENE_MEMORY))->onLeft(anmPane); + mbInitBalloon = false; - if (pTextBalloon == NULL || pBannerFileInfo == NULL) + if (mpBalloon == NULL || mpBannerFileInfo == NULL) { break; - pTextBalloon->fadeout(); + } + mpBalloon->fadeout(); break; - - case ON_TRIG: - if (!((controller::Interface*)data)->downTrg(controller::BTN_INTERACT)) + } + case ON_TRIG: { + if (!con->downTrg(controller::BTN_INTERACT)) { break; + } anmPane = get_anmpane(paneName); - if (anmPane == NULL) + if (anmPane == NULL) { break; - if (pBannerFileInfo == NULL) + } + if (mpBannerFileInfo == NULL) { break; - sceneMemory = (Memory*)System::getScene(SCENE_MEMORY); - sceneMemory->onTrig(this); + } + ((Memory*)System::getScene(SCENE_MEMORY))->onTrig(this); break; + } } } void SavedataBox::clearEvent() { clear_anmpane("B_Data_00"); - if (pTextBalloon != NULL) { - pTextBalloon->terminate(); - mTextBalloonInitialized = false; + if (mpBalloon != NULL) { + mpBalloon->terminate(); + mbInitBalloon = false; } } - WAIT_FOR_ANIM_STATE(SavedataBox::on_fadein, ANIM_DATA_IN, mState = BOX_STATE_IDLE); - WAIT_FOR_ANIM_STATE(SavedataBox::on_fadeout, ANIM_DATA_OUT, mState = BOX_STATE_IDLE); + WAIT_FOR_ANIM_STATE(SavedataBox::on_fadein, ANIM_DATA_IN, mState = STATE_IDLE); + WAIT_FOR_ANIM_STATE(SavedataBox::on_fadeout, ANIM_DATA_OUT, mState = STATE_IDLE); } // namespace scene } // namespace ipl diff --git a/src/scene/saveDataEdit/iplSaveDataEdit.cpp b/src/scene/saveDataEdit/iplSaveDataEdit.cpp index 1e037bcf..ef0c7a6e 100644 --- a/src/scene/saveDataEdit/iplSaveDataEdit.cpp +++ b/src/scene/saveDataEdit/iplSaveDataEdit.cpp @@ -13,38 +13,16 @@ namespace ipl { namespace scene { - typedef struct { - wchar_t digits[10]; - } SCNumber; - static const SCNumber scNumber = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; - - // TODO: Figure out what this might've been/why it isn't inlining - void dummyFunctionToKeepAConstructorStuffFromInlining(nw4r::math::VEC3& vec) { + // stripped out function generated a weak + void forceWeakFunc(nw4r::math::VEC3& vec) { math::VEC3 end(vec); } - enum SavedataEditAnimIdx { - ANIM_MASK_IN = 0x0, // 0x0 - ANIM_MASK_OUT = 0x1, // 0x1 - ANIM_COPY_IN = 0x2, // 0x2 - ANIM_COPY_OUT = 0x3, // 0x3 - ANIM_COPY_FLASH = 0x4, // 0x4 - ANIM_DEL_IN = 0x5, // 0x5 - ANIM_DEL_OUT = 0x6, // 0x6 - ANIM_DEL_FLASH = 0x7, // 0x7 - ANIM_SELECT_OUT = 0x8, // 0x8 - ANIM_TEXT_FADEIN = 0x9, // 0x9 - ANIM_TEXT_FADEOUT = 0xa, // 0xa - ANIM_WAIT = 0xb, // 0xb - ANIM_MOVE_IN = 0xc, // 0xc - ANIM_MOVE_OUT = 0xd, // 0xd - ANIM_MOVE_FLASH = 0xe, // 0xe - }; - - SavedataEdit::SavedataEdit(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName) - : AnmController(heap), ::gui::EventHandler(), mState(EDIT_STATE_IDLE), mLinearInterp(), pSavedataBox(NULL), mMsgId(0) { - pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName); + SavedataEdit::SavedataEdit(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName) + : AnmController(heap), ::gui::EventHandler(), mState(STATE_IDLE), mLinearInterp(), mpSavedataBox(NULL), mMsgId(0) { + mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName); + // New filenames for 4.0 (10th December 2008) add_animation("081210_sys4_mn_DataDetail_a_SeenIn.brlan", "G_Mask"); add_animation("081210_sys4_mn_DataDetail_a_SeenOut.brlan", "G_Mask"); add_animation("081210_sys4_mn_DataDetail_a_CopyFoucusIn.brlan", "G_Copy"); @@ -61,7 +39,7 @@ namespace ipl { add_animation("081210_sys4_mn_DataDetail_a_MoveFoucusOut.brlan", "G_Move"); add_animation("081210_sys4_mn_DataDetail_a_MoveFlash.brlan", "G_MoveFlash"); - pLytObj->finishBinding(); + mpLayout->finishBinding(); set_textbox("T_Move_00", MESG_SAVEDATA_EDIT_MOVE); set_textbox("T_Copy_00", MESG_SAVEDATA_EDIT_COPY); set_textbox("T_Del_00", MESG_SAVEDATA_EDIT_DEL); @@ -81,13 +59,13 @@ namespace ipl { set_visible("T_Move_off", false); set_visible("T_Move_off_00", false); - pPaneManager = new ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true); - pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt()); - pPaneManager->setAllComponentTriggerTarget(false); + mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true); + mpGui->createLayoutScene(*mpLayout->getNW4RLyt()); + mpGui->setAllComponentTriggerTarget(false); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Move_00"), true); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Copy_00"), true); - pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Del_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Move_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Copy_00"), true); + mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Del_00"), true); add_anmpane("B_Move_00", get_animation(ANIM_MOVE_IN), get_animation(ANIM_MOVE_OUT)); add_anmpane("B_Copy_00", get_animation(ANIM_COPY_IN), get_animation(ANIM_COPY_OUT)); @@ -95,53 +73,53 @@ namespace ipl { } SavedataEdit::~SavedataEdit() { - delete pLytObj; - delete pPaneManager; + delete mpLayout; + delete mpGui; } void SavedataEdit::calc() { AnmPane* anmPane; - pLytObj->calc(); - pPaneManager->calc(); + mpLayout->calc(); + mpGui->calc(); anmPane = NULL; while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) anmPane->calc(); switch (mState) { - case EDIT_STATE_IDLE: + case STATE_IDLE: break; - case EDIT_STATE_FADEIN: + case STATE_FADEIN: on_fadein(); break; - case EDIT_STATE_FADEOUT: + case STATE_FADEOUT: on_fadeout(); break; - case EDIT_STATE_HIDE_BTN0_DIALOG: + case STATE_HIDE_BTN0_DIALOG: on_hide_btn0_dialog(); break; - case EDIT_STATE_SHOW_BTN2_DIALOG1ST: + case STATE_SHOW_BTN2_DIALOG1ST: on_show_btn2_dialog1st(); break; - case EDIT_STATE_SHOW_BTN2_DIALOG2ND: + case STATE_SHOW_BTN2_DIALOG2ND: on_show_btn2_dialog2nd(); break; - case EDIT_STATE_SELECT_FADEIN: + case STATE_SELECT_FADEIN: on_select_fadein(); break; - case EDIT_STATE_SELECT_FADEOUT1ST: + case STATE_SELECT_FADEOUT1ST: on_select_fadeout1st(); break; - case EDIT_STATE_SELECT_FADEOUT2ND: + case STATE_SELECT_FADEOUT2ND: on_select_fadeout2nd(); break; - case EDIT_STATE_TEXT_FADEIN: + case STATE_TEXT_FADEIN: on_text_fadein(); break; - case EDIT_STATE_TEXT_FADEOUT: + case STATE_TEXT_FADEOUT: on_text_fadeout(); break; - case EDIT_STATE_TRIG_DEL: + case STATE_TRIG_DEL: on_trig_del(); break; } @@ -149,15 +127,15 @@ namespace ipl { } void SavedataEdit::draw() { - pLytObj->draw(); + mpLayout->draw(); } void SavedataEdit::update() { - pPaneManager->update(); + mpGui->update(); } void SavedataEdit::anmFadein(SavedataBox* box) { - pSavedataBox = box; + mpSavedataBox = box; set_visible("Mask_00", true); set_visible("N_Window", true); set_visible("Banner_00", true); @@ -199,13 +177,17 @@ namespace ipl { set_texture("Banner_00", corruptIconTex); } u32 blockCount = box->getBanner()->getBlockCount(); - SCNumber scNumberData = scNumber; + + const wchar_t scNumber[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}; + wchar_t blockTextDigits[5] = L""; wchar_t blockText[5] = L""; - blockTextDigits[0] = scNumberData.digits[blockCount / 1000]; - blockTextDigits[1] = scNumberData.digits[blockCount / 100 % 10]; - blockTextDigits[2] = scNumberData.digits[blockCount / 10 % 10]; - blockTextDigits[3] = scNumberData.digits[blockCount % 10]; + + blockTextDigits[0] = scNumber[blockCount / 1000]; + blockTextDigits[1] = scNumber[blockCount / 100 % 10]; + blockTextDigits[2] = scNumber[blockCount / 10 % 10]; + blockTextDigits[3] = scNumber[blockCount % 10]; + int zeroOffset; for (zeroOffset = 0; zeroOffset < 3; zeroOffset++) if (blockTextDigits[zeroOffset] != L'0') @@ -225,25 +207,25 @@ namespace ipl { clear_anmpane(anmPane->getName()); do_animation(ANIM_MASK_IN, ANIM_TYPE_FORWARD, true); - mState = EDIT_STATE_FADEIN; + mState = STATE_FADEIN; } void SavedataEdit::anmFadeout() { - pSavedataBox = NULL; + mpSavedataBox = NULL; change_button_text(MESG_CMN_BACK_ALT); do_animation(ANIM_MASK_OUT, ANIM_TYPE_FORWARD, true); - mState = EDIT_STATE_FADEOUT; + mState = STATE_FADEOUT; } void SavedataEdit::anmHideBtn0Dialog() { System::getDialog()->terminate(); - mState = EDIT_STATE_HIDE_BTN0_DIALOG; + mState = STATE_HIDE_BTN0_DIALOG; } void SavedataEdit::anmShowBtn0Dialog(u32 msgId, bool dontWait, bool showLoading) { System::getDialog()->callBtn0(msgId, dontWait ? 0 : 180, showLoading); } void SavedataEdit::anmShowS2Btn2Dialog(u32 msgId) { set_textbox("T_Message_00", msgId); - mState = EDIT_STATE_SHOW_BTN2_DIALOG1ST; + mState = STATE_SHOW_BTN2_DIALOG1ST; } void SavedataEdit::anmSelectFadein() { @@ -256,17 +238,17 @@ namespace ipl { while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) clear_anmpane(anmPane->getName()); - mState = EDIT_STATE_SELECT_FADEIN; + mState = STATE_SELECT_FADEIN; } void SavedataEdit::anmSelectFadeout(u32 msgId) { set_textbox("T_Message_00", msgId); - mState = EDIT_STATE_SELECT_FADEOUT1ST; + mState = STATE_SELECT_FADEOUT1ST; } void SavedataEdit::anmTextFadein(u32 msgId) { mMsgId = msgId; do_animation(ANIM_TEXT_FADEIN, ANIM_TYPE_FORWARD, true); - mState = EDIT_STATE_TEXT_FADEIN; + mState = STATE_TEXT_FADEIN; } void SavedataEdit::anmTextFadeout() { do_animation(ANIM_TEXT_FADEOUT, ANIM_TYPE_FORWARD, true); @@ -275,7 +257,7 @@ namespace ipl { sceneSettingButton->reserve(SettingButton::CMD_SET_TEXT, MESG_CMN_BACK_ALT); sceneSettingButton->reserve(SettingButton::CMD_SHOW_BTN, 0); - mState = EDIT_STATE_TEXT_FADEOUT; + mState = STATE_TEXT_FADEOUT; } void SavedataEdit::anmStartWaitAnm() { @@ -301,8 +283,9 @@ namespace ipl { gui::PaneComponent* paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId); const char* paneName = paneComponent->getPane()->GetName(); - if (mState == EDIT_STATE_TRIG_DEL) + if (mState == STATE_TRIG_DEL) { return; + } AnmPane* anmPane; switch (event) { @@ -335,10 +318,10 @@ namespace ipl { do_animation(ANIM_MOVE_FLASH, ANIM_TYPE_FORWARD, true); Memory* sceneMemory = (Memory*)System::getScene(SCENE_MEMORY); sceneMemory->onTrigMove(); - } else if (strcmp(anmPane->getName(), "B_Del_00") == 0 && mState != EDIT_STATE_TRIG_DEL) { + } else if (strcmp(anmPane->getName(), "B_Del_00") == 0 && mState != STATE_TRIG_DEL) { snd::getSystem()->startSE("WIPL_SE_DECIDE"); do_animation(ANIM_DEL_FLASH, ANIM_TYPE_FORWARD, true); - mState = EDIT_STATE_TRIG_DEL; + mState = STATE_TRIG_DEL; } } break; @@ -353,68 +336,73 @@ namespace ipl { switch (msgId) { case MESG_CMN_BACK_ALT_3: - case MESG_CMN_BACK_ALT: + case MESG_CMN_BACK_ALT: { sceneSettingButton->setSoundType(SettingButton::CANCEL); break; - - case MESG_CMN_OK: + } + case MESG_CMN_OK: { sceneSettingButton->setSoundType(SettingButton::DECIDE); break; + } } } void SavedataEdit::on_fadein() { mLinearInterp.calc(); set_translate("N_Window", mLinearInterp.get()); - if (is_animation(ANIM_MASK_IN)) + if (is_animation(ANIM_MASK_IN)) { return; - if (mLinearInterp.isPlaying()) + } + if (mLinearInterp.isPlaying()) { return; - mState = EDIT_STATE_IDLE; + } + mState = STATE_IDLE; } - WAIT_FOR_ANIM_STATE(SavedataEdit::on_fadeout, ANIM_MASK_OUT, mState = EDIT_STATE_IDLE); + WAIT_FOR_ANIM_STATE(SavedataEdit::on_fadeout, ANIM_MASK_OUT, mState = STATE_IDLE); void SavedataEdit::on_hide_btn0_dialog() { if (System::getDialog()->getLastResult() != DialogWindow::RESULT_PROGRESS && - System::getDialog()->getLastResult() != DialogWindow::RESULT_TERMINATED) + System::getDialog()->getLastResult() != DialogWindow::RESULT_TERMINATED) { return; + } - mState = EDIT_STATE_IDLE; + mState = STATE_IDLE; } WAIT_FOR_ANIM_STATE(SavedataEdit::on_show_btn2_dialog1st, ANIM_COPY_FLASH, { do_animation(ANIM_SELECT_OUT, ANIM_TYPE_FORWARD, true); SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON); sceneSettingButton->hideBtn(); - mState = EDIT_STATE_SHOW_BTN2_DIALOG2ND; + mState = STATE_SHOW_BTN2_DIALOG2ND; }); WAIT_FOR_ANIM_STATE(SavedataEdit::on_show_btn2_dialog2nd, ANIM_SELECT_OUT, { System::getDialog()->callS2Btn2(MESG_CMN_NO, MESG_CMN_YES, true); - mState = EDIT_STATE_IDLE; + mState = STATE_IDLE; }); - WAIT_FOR_ANIM_STATE(SavedataEdit::on_select_fadein, ANIM_SELECT_OUT, mState = EDIT_STATE_IDLE); + WAIT_FOR_ANIM_STATE(SavedataEdit::on_select_fadein, ANIM_SELECT_OUT, mState = STATE_IDLE); WAIT_FOR_ANIM_STATE(SavedataEdit::on_select_fadeout1st, ANIM_COPY_FLASH, { do_animation(ANIM_SELECT_OUT, ANIM_TYPE_FORWARD, true); change_button_text(MESG_CMN_OK); - mState = EDIT_STATE_SELECT_FADEOUT2ND; + mState = STATE_SELECT_FADEOUT2ND; }); - WAIT_FOR_ANIM_STATE(SavedataEdit::on_select_fadeout2nd, ANIM_SELECT_OUT, mState = EDIT_STATE_IDLE); + WAIT_FOR_ANIM_STATE(SavedataEdit::on_select_fadeout2nd, ANIM_SELECT_OUT, mState = STATE_IDLE); void SavedataEdit::on_text_fadein() { if (get_animation(ANIM_TEXT_FADEIN)->animator->getCurrentFrame() >= 20.0f) { set_textbox("T_Message_00", mMsgId); } - if (is_animation(ANIM_TEXT_FADEIN)) + if (is_animation(ANIM_TEXT_FADEIN)) { return; + } stop_animation(ANIM_TEXT_FADEIN); - mState = EDIT_STATE_IDLE; + mState = STATE_IDLE; } - WAIT_FOR_ANIM_STATE(SavedataEdit::on_text_fadeout, ANIM_TEXT_FADEOUT, mState = EDIT_STATE_IDLE); + WAIT_FOR_ANIM_STATE(SavedataEdit::on_text_fadeout, ANIM_TEXT_FADEOUT, mState = STATE_IDLE); WAIT_FOR_ANIM_STATE(SavedataEdit::on_trig_del, ANIM_DEL_FLASH, { - mState = EDIT_STATE_IDLE; + mState = STATE_IDLE; Memory* sceneMemory = (Memory*)System::getScene(SCENE_MEMORY); sceneMemory->onTrigDel(); }); diff --git a/src/scene/saveDataEdit/iplWiiBannerFileInfo.cpp b/src/scene/saveDataEdit/iplWiiBannerFileInfo.cpp index 45a90d21..62402168 100644 --- a/src/scene/saveDataEdit/iplWiiBannerFileInfo.cpp +++ b/src/scene/saveDataEdit/iplWiiBannerFileInfo.cpp @@ -16,15 +16,15 @@ namespace ipl { mAnim_AltBackward = 0; // Init name - wmemset(mSaveName, 0, SAVE_NAME_LENGTH + 1); - wmemset(mSaveSubName, 0, SAVE_NAME_LENGTH + 1); + wmemset(mSaveName, 0, WII_SAVE_BANNER_LENGTH + 1); + wmemset(mSaveSubName, 0, WII_SAVE_BANNER_LENGTH + 1); // Init banner - memset(mpBannerData, 0, SAVE_BANNER_TEX_SIZE); + memset(mpBannerData, 0, WII_SAVE_BANNER_BNR_TEXSIZE); // Init icons - for (int i = 0; i < SAVE_ICON_COUNT; i++) { - memset(mpIconData[i], 0, SAVE_ICON_TEX_SIZE); + for (int i = 0; i < WII_SAVE_BANNER_ICON_COUNT; i++) { + memset(mpIconData[i], 0, WII_SAVE_BANNER_ICON_TEXSIZE); } // Init data @@ -45,17 +45,17 @@ namespace ipl { resolve_icon(); // Setup name - memcpy(mSaveName, mData.name, SAVE_NAME_LENGTH * sizeof(wchar_t)); - memcpy(mSaveSubName, mData.subName, SAVE_NAME_LENGTH * sizeof(wchar_t)); + memcpy(mSaveName, mData.name, WII_SAVE_BANNER_LENGTH * sizeof(wchar_t)); + memcpy(mSaveSubName, mData.subName, WII_SAVE_BANNER_LENGTH * sizeof(wchar_t)); // Setup banner - memcpy(mpBannerData, mData.bannerData, SAVE_BANNER_TEX_SIZE); - DCStoreRange(mpBannerData, SAVE_BANNER_TEX_SIZE); + memcpy(mpBannerData, mData.bannerData, WII_SAVE_BANNER_BNR_TEXSIZE); + DCStoreRange(mpBannerData, WII_SAVE_BANNER_BNR_TEXSIZE); // Setup icons - for (int i = 0; i < SAVE_ICON_COUNT; i++) { - memcpy(mpIconData[i], (&mData.iconData0)[i], SAVE_ICON_TEX_SIZE); - DCStoreRange(mpIconData[i], SAVE_ICON_TEX_SIZE); + for (int i = 0; i < WII_SAVE_BANNER_ICON_COUNT; i++) { + memcpy(mpIconData[i], (&mData.iconData)[i], WII_SAVE_BANNER_ICON_TEXSIZE); + DCStoreRange(mpIconData[i], WII_SAVE_BANNER_ICON_TEXSIZE); } } @@ -66,7 +66,7 @@ namespace ipl { // If tick reached to last frame if (mAnim_FrameTick >= mAnim_MaxFrameTicks) { // For alternate, play backwards - if (mAnim_AltFlag == FLAG_ALTERNATE_ANIMATION) { + if (mAnim_AltFlag == WII_SAVE_BANNER_FLAG_ALTERNATE) { mAnim_FrameTick = (mAnim_MaxFrameTicks - mAnim_AltBackward) - 1; mAnim_Incrementer = -1; } @@ -80,7 +80,7 @@ namespace ipl { // If tick reached to first frame if (mAnim_FrameTick < 0) { // For alternate, play forwards - if (mAnim_AltFlag == FLAG_ALTERNATE_ANIMATION) { + if (mAnim_AltFlag == WII_SAVE_BANNER_FLAG_ALTERNATE) { mAnim_FrameTick = mAnim_AltForward; } // For loop, reset to first frame @@ -99,10 +99,11 @@ namespace ipl { if (mAnim_FrameTick <= speed) { break; } - } while (i < SAVE_ICON_COUNT); + } while (i < WII_SAVE_BANNER_ICON_COUNT); // Init current frame texture - GXInitTexObj(&mCurIconTex, mpIconData[i - 1], SAVE_ICON_TEX_WIDTH, SAVE_ICON_TEX_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE); + GXInitTexObj(&mCurIconTex, mpIconData[i - 1], WII_SAVE_BANNER_ICON_WIDTH, WII_SAVE_BANNER_ICON_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, + GX_FALSE); } GXTexObj* WiiBannerFileInfo::loadIconTexture() { @@ -115,10 +116,11 @@ namespace ipl { if (mAnim_FrameTick <= speed) { break; } - } while (i < SAVE_ICON_COUNT); + } while (i < WII_SAVE_BANNER_ICON_COUNT); // Load current icon frame texture - GXInitTexObj(&mCurIconTex, mpIconData[i - 1], SAVE_ICON_TEX_WIDTH, SAVE_ICON_TEX_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE); + GXInitTexObj(&mCurIconTex, mpIconData[i - 1], WII_SAVE_BANNER_ICON_WIDTH, WII_SAVE_BANNER_ICON_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, + GX_FALSE); GXLoadTexObj(&mCurIconTex, GX_TEXMAP0); return &mCurIconTex; @@ -126,7 +128,8 @@ namespace ipl { GXTexObj* WiiBannerFileInfo::loadBannerTexture() { // Load current banner texture - GXInitTexObj(&mCurBannerTex, mpBannerData, SAVE_BANNER_TEX_WIDTH, SAVE_BANNER_TEX_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE); + GXInitTexObj(&mCurBannerTex, mpBannerData, WII_SAVE_BANNER_BNR_WIDTH, WII_SAVE_BANNER_BNR_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, + GX_FALSE); GXLoadTexObj(&mCurBannerTex, GX_TEXMAP0); return &mCurBannerTex; @@ -142,7 +145,7 @@ namespace ipl { // Set max frame ticks int i = 0; - for (i = 0; i < SAVE_ICON_COUNT; i++) { + for (i = 0; i < WII_SAVE_BANNER_ICON_COUNT; i++) { if (get_iconspeed(i) == 0) break; // A frame with the speed of 0 indicates the end. mAnim_MaxFrameTicks += (get_iconspeed_ticks(i)); @@ -159,9 +162,9 @@ namespace ipl { mFrameCount++; } i++; - } while (i < SAVE_ICON_COUNT); + } while (i < WII_SAVE_BANNER_ICON_COUNT); - mAnim_AltFlag = (mFlags & FLAG_ALTERNATE_ANIMATION); + mAnim_AltFlag = (mFlags & WII_SAVE_BANNER_FLAG_ALTERNATE); mAnim_Incrementer = 1; } } @@ -174,7 +177,7 @@ namespace ipl { (01010101 01111111) 3, 3, 3, 1, 1, 1, 1, 1 */ - if (frame < 0 || frame > SAVE_ICON_COUNT) { + if (frame < 0 || frame > WII_SAVE_BANNER_ICON_COUNT) { return 0; } return (mFrameSpeed >> (frame * 2)) & 0b00000011; diff --git a/src/scene/setting/iplNCDSetting.cpp b/src/scene/setting/iplNCDSetting.cpp index 36b304a8..8c907d36 100644 --- a/src/scene/setting/iplNCDSetting.cpp +++ b/src/scene/setting/iplNCDSetting.cpp @@ -14,6 +14,23 @@ namespace ipl { namespace ncd { + // If you change one thing in this function, checkFlag will not match. + // Probably some stripped out function, but... I don't get MWCC +#ifndef NON_MATCHING + void NCDSetting::matchHack() { + u16 myNewMode; + + if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode == 2 || + (strlen((const char*)mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.wep104.key) > 20)) { + myNewMode = 2; + } + + if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode != myNewMode) { + mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode = myNewMode; + } + } +#endif + NCDConfig NCDSetting::mConfig; NCDConfig NCDSetting::mSaveConfig; u8 NCDSetting::mMac[0x20]; @@ -32,36 +49,20 @@ namespace ipl { mID = setID; } - // If you change one thing in this function, checkFlag will not match. - // Probably some stripped out function, but... I don't get MWCC -#ifndef NON_MATCHING - void NCDSetting::matchHack() { - u16 sVar2; - - if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode == 2 || - (strlen((const char*)mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.wep104.key) > 20)) { - sVar2 = 2; - } - - if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode != sVar2) { - mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode = sVar2; - } - } -#endif - int NCDSetting::checkFlag(int id) { int ret = 0; int flags = mConfig.profiles[id].flags; + if (flags & NCD_DHCP_FLAG) { return 1; } + if (mConfig.profiles[id].netif.wireless.config.manual.ssidLength == 0 && mConfig.profiles[id].netif.wireless.configMethod == 0 && mConfig.profiles[id].netif.wireless.config.manual.privacy.mode == 0) { return 0; } - int bVar1 = mConfig.profiles[id].netif.wireless.configMethod; - switch (bVar1) { + switch (mConfig.profiles[id].netif.wireless.configMethod) { case 0: { ret = 2; break; @@ -88,7 +89,7 @@ namespace ipl { bool NCDSetting::checkAllFlag() { for (int i = 0; i < 3; i++) { - if (checkFlag(i) & 0xff) { + if (checkFlag(i) & 0xFF) { return true; } } @@ -114,8 +115,8 @@ namespace ipl { void NCDSetting::checkDHCP_() { if (checkDNSFlag()) { - memset(&mConfig.profiles[mID].ip.dns1, 0, 4); - memset(&mConfig.profiles[mID].ip.dns2, 0, 4); + memset(&mConfig.profiles[mID].ip.dns1, 0, sizeof(mConfig.profiles[mID].ip.dns1)); + memset(&mConfig.profiles[mID].ip.dns2, 0, sizeof(mConfig.profiles[mID].ip.dns2)); } else { // im sorry for this int i = 0; @@ -142,9 +143,9 @@ namespace ipl { } } if (checkDHCPFlag()) { - memset(&mConfig.profiles[mID].ip.addr, 0, 4); - memset(&mConfig.profiles[mID].ip.netmask, 0, 4); - memset(&mConfig.profiles[mID].ip.gateway, 0, 4); + memset(&mConfig.profiles[mID].ip.addr, 0, sizeof(mConfig.profiles[mID].ip.addr)); + memset(&mConfig.profiles[mID].ip.netmask, 0, sizeof(mConfig.profiles[mID].ip.netmask)); + memset(&mConfig.profiles[mID].ip.gateway, 0, sizeof(mConfig.profiles[mID].ip.gateway)); } return; } @@ -162,7 +163,7 @@ namespace ipl { return (u8)(configMethod + (u8)-1) > 1; } - bool NCDSetting::convert16toASCII(char hexHi, char hexLo, unsigned char* byte) { + bool NCDSetting::convert16toASCII(char hexHi, char hexLo, u8* byte) { bool inRange = true; if (hexHi >= '0' && hexHi <= '9') { @@ -206,7 +207,7 @@ namespace ipl { } else if (keyLen == 64) { for (int i = 0; i < 64; i++) { char c = key[i]; - if ((((c < '0') || ('9' < c)) && ((c < 'A' || ('F' < c)))) && ((c < 'a' || ('f' < c)))) { + if ((c < '0' || '9' < c) && (c < 'A' || 'F' < c) && (c < 'a' || 'f' < c)) { return -1; } } @@ -250,10 +251,12 @@ namespace ipl { int i; len = strlen(proxy); - if (len >= 256) + if (len >= 256) { return false; - if (proxy[0] == '.') + } + if (proxy[0] == '.') { return false; + } for (i = 0; i < len; i++) { c = proxy[i]; @@ -315,22 +318,24 @@ namespace ipl { void NCDSetting::adjustSelectMedia_(int exclude) { u8 flag = checkFlag(exclude); switch (flag) { - case 1: + case 1: { mConfig.selectedMedia = 2; break; + } case 2: case 3: case 4: - case 5: + case 5: { mConfig.selectedMedia = 1; break; + } } } void NCDSetting::adjustEnableFlag_(int exclude) { for (int i = 0; i < 3; i++) { if (exclude != i) { - mConfig.profiles[i].flags &= 0x7f; + mConfig.profiles[i].flags &= 0x7F; } } } @@ -342,7 +347,7 @@ namespace ipl { if (mID == i) { mConfig.profiles[mID].flags |= 0x80; } else { - mConfig.profiles[i].flags &= 0x7f; + mConfig.profiles[i].flags &= 0x7F; } } } @@ -351,7 +356,7 @@ namespace ipl { NCDWriteConfig(&mConfig); } - void NCDSetting::setDHCPFlag(unsigned char newFlag) { + void NCDSetting::setDHCPFlag(u8 newFlag) { if (newFlag != 0) { mConfig.profiles[mID].flags = mConfig.profiles[mID].flags | 2; return; @@ -359,7 +364,7 @@ namespace ipl { mConfig.profiles[mID].flags = mConfig.profiles[mID].flags & ~2; } - void NCDSetting::setDNSFlag(unsigned char newFlag) { + void NCDSetting::setDNSFlag(u8 newFlag) { if (newFlag != 0) { mConfig.profiles[mID].flags = mConfig.profiles[mID].flags | 4; return; @@ -367,7 +372,7 @@ namespace ipl { mConfig.profiles[mID].flags = mConfig.profiles[mID].flags & ~4; } - void NCDSetting::setProxyFlag(unsigned char newFlag) { + void NCDSetting::setProxyFlag(u8 newFlag) { mConfig.profiles[mID].proxy.http.mode = newFlag; mConfig.profiles[mID].proxy.ssl.mode = newFlag; if (newFlag != 0) { @@ -377,7 +382,7 @@ namespace ipl { mConfig.profiles[mID].flags = mConfig.profiles[mID].flags & ~0x10; } - void NCDSetting::setBasicFlag(unsigned char newFlag) { + void NCDSetting::setBasicFlag(u8 newFlag) { mConfig.profiles[mID].proxy.http.authType = newFlag; mConfig.profiles[mID].proxy.ssl.authType = newFlag; } @@ -390,7 +395,7 @@ namespace ipl { } void NCDSetting::setWireless(u8 configMethod) { - memset(&mConfig.profiles[mID], 0, 0x91c); + memset(&mConfig.profiles[mID], 0, sizeof(NCDProfile)); mConfig.version = 0; mConfig.linkTimeout = 0; @@ -415,35 +420,41 @@ namespace ipl { } void NCDSetting::setPrivacyMode(u16 newMode) { - u16 sVar2; + u16 myNewMode; switch (newMode) { - case 0: - sVar2 = 0; + case 0: { + myNewMode = 0; break; - case 1: + } + case 1: { if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode == 2 || (strlen((const char*)mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.wep104.key) > 20)) { - sVar2 = 2; + myNewMode = 2; } else { - sVar2 = 1; + myNewMode = 1; } break; - case 2: - sVar2 = 4; + } + case 2: { + myNewMode = 4; break; - case 3: - sVar2 = 6; + } + case 3: { + myNewMode = 6; break; - case 4: - sVar2 = 5; + } + case 4: { + myNewMode = 5; break; - default: - sVar2 = 0; + } + default: { + myNewMode = 0; break; + } } - if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode != sVar2) { - mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode = sVar2; + if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode != myNewMode) { + mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode = myNewMode; } } @@ -451,39 +462,48 @@ namespace ipl { u16 uVar1; switch (mode) { - case 0: + case 0: { uVar1 = 0; break; - case 1: + } + case 1: { uVar1 = 1; break; - case 2: + } + case 2: { uVar1 = 2; break; - case 4: + } + case 4: { uVar1 = 4; break; - case 5: + } + case 5: { uVar1 = 5; break; - case 6: + } + case 6: { uVar1 = 6; break; - case 7: + } + case 7: { uVar1 = 4; break; - case 8: + } + case 8: { uVar1 = 1; break; - default: + } + default: { uVar1 = 0; break; + } } memset(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104, 0, 0x44); mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = uVar1; } - void NCDSetting::setPrivacy(unsigned char* newKey, int len) { + void NCDSetting::setPrivacy(u8* newKey, int len) { int i; u8 mode; mode = mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep40.reserved[0]; @@ -494,60 +514,65 @@ namespace ipl { } else { switch (mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode) { case 1: - case 2: + case 2: { for (i = 0; i < 4; i++) { if (len == 5) { mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = 1; - memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep40.key[i], newKey, 5); + memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep40.key[i], newKey, + sizeof(mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep40.key[i])); } else if (len == 0xd) { mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = 2; - memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104.key[i], newKey, 13); + memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104.key[i], newKey, + sizeof(mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104.key[i])); } } break; - case 4: + } + case 4: { memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.aes.key, newKey, len); mConfig.profiles[mID].netif.wireless.config.manual.privacy.aes.keyLen = len; break; + } case 5: - case 6: + case 6: { memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.tkip.key, newKey, len); mConfig.profiles[mID].netif.wireless.config.manual.privacy.tkip.keyLen = len; break; + } } } } void NCDSetting::setIP(NCDIpProfile* ip) { - memcpy(&mConfig.profiles[mID].ip.addr, ip->addr, 4); - memcpy(&mConfig.profiles[mID].ip.netmask, ip->netmask, 4); - memcpy(&mConfig.profiles[mID].ip.gateway, ip->gateway, 4); + memcpy(&mConfig.profiles[mID].ip.addr, ip->addr, sizeof(mConfig.profiles[mID].ip.addr)); + memcpy(&mConfig.profiles[mID].ip.netmask, ip->netmask, sizeof(mConfig.profiles[mID].ip.netmask)); + memcpy(&mConfig.profiles[mID].ip.gateway, ip->gateway, sizeof(mConfig.profiles[mID].ip.gateway)); } void NCDSetting::setDNS(NCDIpProfile* ip) { - memcpy(&mConfig.profiles[mID].ip.dns1, ip->dns1, 4); - memcpy(&mConfig.profiles[mID].ip.dns2, ip->dns2, 4); + memcpy(&mConfig.profiles[mID].ip.dns1, ip->dns1, sizeof(mConfig.profiles[mID].ip.dns1)); + memcpy(&mConfig.profiles[mID].ip.dns2, ip->dns2, sizeof(mConfig.profiles[mID].ip.dns2)); } - void NCDSetting::setMTU(long mtu) { + void NCDSetting::setMTU(s32 mtu) { mConfig.profiles[mID].adjust.maxTransferUnit = mtu; mConfig.profiles[mID].adjust.tcpRetransTimeout = 0; mConfig.profiles[mID].adjust.dhcpRetransCount = 0; } void NCDSetting::setProxy(NCDProxyServerProfile* proxyServerProfile) { - memcpy(&mConfig.profiles[mID].proxy.http.server, proxyServerProfile->server, 256); - memcpy(&mConfig.profiles[mID].proxy.ssl.server, proxyServerProfile->server, 256); + memcpy(&mConfig.profiles[mID].proxy.http.server, proxyServerProfile->server, sizeof(mConfig.profiles[mID].proxy.http.server)); + memcpy(&mConfig.profiles[mID].proxy.ssl.server, proxyServerProfile->server, sizeof(mConfig.profiles[mID].proxy.ssl.server)); mConfig.profiles[mID].proxy.http.port = proxyServerProfile->port; mConfig.profiles[mID].proxy.ssl.port = proxyServerProfile->port; } void NCDSetting::setBasic(NCDProxyServerProfile* proxyServerProfile) { - memcpy(mConfig.profiles[mID].proxy.http.username, proxyServerProfile->username, 33); - memcpy(mConfig.profiles[mID].proxy.ssl.username, proxyServerProfile->username, 33); - memcpy(mConfig.profiles[mID].proxy.http.password, proxyServerProfile->password, 33); - memcpy(mConfig.profiles[mID].proxy.ssl.password, proxyServerProfile->password, 33); + memcpy(mConfig.profiles[mID].proxy.http.username, proxyServerProfile->username, sizeof(mConfig.profiles[mID].proxy.http.username)); + memcpy(mConfig.profiles[mID].proxy.ssl.username, proxyServerProfile->username, sizeof(mConfig.profiles[mID].proxy.ssl.username)); + memcpy(mConfig.profiles[mID].proxy.http.password, proxyServerProfile->password, sizeof(mConfig.profiles[mID].proxy.http.password)); + memcpy(mConfig.profiles[mID].proxy.ssl.password, proxyServerProfile->password, sizeof(mConfig.profiles[mID].proxy.ssl.password)); } void NCDSetting::clearData() { @@ -576,11 +601,11 @@ namespace ipl { } void NCDSetting::backupData() { - memcpy(&mSaveConfig, &mConfig, 0x1b5c); + memcpy(&mSaveConfig, &mConfig, sizeof(mSaveConfig)); } void NCDSetting::resetData() { - memcpy(&mConfig, &mSaveConfig, 0x1b5c); + memcpy(&mConfig, &mSaveConfig, sizeof(mConfig)); } void NCDSetting::setUseProfileID() { @@ -593,7 +618,7 @@ namespace ipl { mConfig.selectedMedia = 1; } } else { - mConfig.profiles[i].flags &= 0x7f; + mConfig.profiles[i].flags &= 0x7F; } } NCDWriteConfig(&mConfig); @@ -608,7 +633,7 @@ namespace ipl { } u16 NCDSetting::getID() { - return mID & 0xff; + return mID & 0xFF; } NCDApConfig* NCDSetting::getSSID() { @@ -616,12 +641,12 @@ namespace ipl { } u16 NCDSetting::getUseProfileID() { - if (!(checkAllFlag() & 0xff)) { + if (!(checkAllFlag() & 0xFF)) { return 3; } else { for (int i = 0; i < 3; i++) { if (mConfig.profiles[i].flags & 0x80 && mConfig.profiles[i].flags & 0x20) { - return i & 0xff; + return i & 0xFF; } } } @@ -633,28 +658,35 @@ namespace ipl { if (mConfig.profiles[mID].netif.wireless.configMethod == 0 || mConfig.profiles[mID].netif.wireless.configMethod == 3) { u16 mode = mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode; switch (mode) { - case 0: + case 0: { ret = 0; break; - case 1: + } + case 1: { ret = 1; break; - case 2: + } + case 2: { ret = 1; break; - case 4: + } + case 4: { ret = 2; break; - case 5: + } + case 5: { ret = 4; break; - case 6: + } + case 6: { ret = 3; break; - case 3: - default: - ret = 0; - break; + } + case 3: { + default: + ret = 0; + break; + } } } return ret; @@ -740,7 +772,7 @@ namespace ipl { NCDErr err = NETGetWirelessMacAddress(macAddress); switch (err) { - case 0: + case NCD_RESULT_SUCCESS: { sprintf(mac.str, "%02x-%02x-%02x-%02x-%02x-%02x", macAddress[0], macAddress[1], macAddress[2], macAddress[3], macAddress[4], macAddress[5]); OSReport("MAC: %s\n", &mac); @@ -753,15 +785,16 @@ namespace ipl { mMacNum = mac.num % 100000000; OSReport("%lld %d\n", mMacNum, mac.num, mMacNum); return; - - case -8: - case -4: - OSPanic(__FILE__, 0x436, "try again!!"); + } + case NCD_RESULT_INPROGRESS: + case NCD_RESULT_4: { + OSHalt("try again!!", 1078); return; - - default: - OSPanic(__FILE__, 0x43b, "Unrecoverable Error!!"); + } + default: { + OSHalt("Unrecoverable Error!!", 1083); return; + } } } @@ -804,7 +837,7 @@ namespace ipl { mConfig.nwc24Permission = 0; if (wcFlags && SCGetEULA()) { mConfig.nwc24Permission |= 4; - if (!(parental::Parental::checkFlags() & 0xFF) || ((parental::Parental::checkFlags() & 0xFF) && !(contentRestrictions))) { + if (!(parental::Parental::checkFlags() & 0xFF) || ((parental::Parental::checkFlags() & 0xFF) && !contentRestrictions)) { mConfig.nwc24Permission |= 3; } } diff --git a/src/scene/setting/iplParental.cpp b/src/scene/setting/iplParental.cpp index c8b86337..e7d55bb5 100644 --- a/src/scene/setting/iplParental.cpp +++ b/src/scene/setting/iplParental.cpp @@ -197,18 +197,18 @@ namespace ipl { void Parental::setRestrictions(u32 restrictions) { m_sc.netContentRestrict = 0; + + m_sc.netContentRestrict |= (restrictions >> 3) & 0x01; + m_sc.netContentRestrict |= -((restrictions >> 1) & 1) & 0x02; + m_sc.netContentRestrict |= -((restrictions >> 0) & 1) & 0x04; + m_sc.wwwRestrict = (restrictions >> 2) & 1; - m_sc.netContentRestrict |= -((restrictions >> 1) & 1) & 0b010; - m_sc.netContentRestrict |= (restrictions >> 3) & 0b001; - m_sc.netContentRestrict |= -((restrictions >> 0) & 1) & 0b100; - // m_sc.netContentRestrict = newNetContentRestrict; - // m_sc.netContentRestrict = ((((((restrictions >> 1) & 1) * -1) & 2 & ~1) | ((restrictions >> 3) & 1)) & ~4) | (-(restrictions & 1) & 4); } void Parental::adjustOgn(u8 country) { m_sc.info.rating = 20; - switch (country) { // irregular + switch (country) { case SC_COUNTRY_DE: { m_sc.info.org = SC_PARENTAL_ORG_USK; break; diff --git a/src/sound/iplSound.cpp b/src/sound/iplSound.cpp index f93c46ee..a8ec19c9 100644 --- a/src/sound/iplSound.cpp +++ b/src/sound/iplSound.cpp @@ -4,7 +4,6 @@ namespace ipl { namespace snd { void System::shutup(BOOL shutUpDMA) { - // if (ipl::snd::is) } } // namespace snd } // namespace ipl diff --git a/src/system/iplCdbBackup.cpp b/src/system/iplCdbBackup.cpp index cd0c9e9d..8fdb850f 100644 --- a/src/system/iplCdbBackup.cpp +++ b/src/system/iplCdbBackup.cpp @@ -120,7 +120,7 @@ namespace ipl { if (System::isSafeMode()) { } switch (sdVfWorker->get_sd_state()) { - case SDVFWorker::SD_STATE_UNAVAILABLE: { + case SDVFWorker::SD_STATE_INITIAL: { break; } case SDVFWorker::SD_STATE_EJECTED: { @@ -230,7 +230,7 @@ namespace ipl { void CdbBackup::stt_check_sd_err() { SDVFWorker* sdVfWorker = System::getCdbManager()->getSDWorker(); switch (sdVfWorker->get_sd_state()) { - case SDVFWorker::SD_STATE_AVAILABLE: { + case SDVFWorker::SD_STATE_READY: { if (sdVfWorker->is_sd_write_protected()) { System::getDialog()->callBtn1(MESG_CDBBACKUP_SD_LOCKED, MESG_CMN_OK); mState = STATE_WAIT_RET; diff --git a/src/system/iplChannelManager.cpp b/src/system/iplChannelManager.cpp index 7f3db5c5..f9b03150 100644 --- a/src/system/iplChannelManager.cpp +++ b/src/system/iplChannelManager.cpp @@ -232,20 +232,16 @@ namespace ipl { } ESTitleId Manager::hasChannel(ESTitleId titleId, int* outPage, int* outIndex) const { - u64 typeMask; - if (ES_TITLE_TYPE(titleId) != 0) { - typeMask = 0xFFFFFFFFFFFFFFFF; - } else { - typeMask = 0x00000000FFFFFFFF; - } + ESTitleId titleCodeRegion = ES_TITLE_TYPE(titleId) != 0 ? 0xFFFFFFFFFFFFFFFF : 0x00000000FFFFFFFF; + ESTitleId titleCode = TITLE_NO_REGION(titleCodeRegion); for (int page = 0; page < MAX_CHANNEL_PAGE; page++) { for (int index = 0; index < MAX_CHANNEL_INDEX; index++) { if (mChannels[page][index].loadedBnr) { if (mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_CHANNEL) { ESTitleId tId = ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode); - if (titleId == (tId & typeMask) || - TITLE_NO_REGION(tId & typeMask) == TITLE_NO_REGION(titleId & typeMask) && TITLE_REGION(titleId) == TITLE_REGION_ALL) { + if (titleId == (tId & titleCodeRegion) || + (tId & titleCode) == (titleId & titleCode) && TITLE_REGION(titleId) == TITLE_REGION_ALL) { if (outPage) { *outPage = page; } @@ -367,7 +363,7 @@ namespace ipl { if (!mChannels[page][index].loadedBnr || mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_DISK) { return NULL; } else { - u32 rsoIndex = getChannel(page, index).loadedBnr ? mChannels[page][index].metaHdr->blockHdr.iconRSOIdx : 0; + u32 rsoIndex = getMetaHdr_IconRSOIdx(page, index); if (rsoIndex == 0) { return NULL; @@ -382,7 +378,7 @@ namespace ipl { if (!mChannels[page][index].loadedBnr || mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_DISK) { return NULL; } else { - u32 rsoIndex = mChannels[page][index].loadedBnr ? mChannels[page][index].metaHdr->blockHdr.bannerRSOIdx : 0; + u32 rsoIndex = getMetaHdr_BannerRSOIdx(page, index); if (rsoIndex == 0) { return NULL; @@ -397,7 +393,7 @@ namespace ipl { if (!mChannels[page][index].loadedBnr || mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_DISK) { return NULL; } else { - u32 rsoIndex = mChannels[page][index].loadedBnr ? mChannels[page][index].metaHdr->blockHdr.iconCSIdx : 0; + u32 rsoIndex = getMetaHdr_IconCSIdx(page, index); if (rsoIndex == 0) { return NULL; @@ -412,7 +408,7 @@ namespace ipl { if (!mChannels[page][index].loadedBnr || mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_DISK) { return NULL; } else { - u32 rsoIndex = mChannels[page][index].loadedBnr ? mChannels[page][index].metaHdr->blockHdr.bannerCSIdx : 0; + u32 rsoIndex = getMetaHdr_BannerCSIdx(page, index); if (rsoIndex == 0) { return NULL; @@ -471,6 +467,8 @@ namespace ipl { return NULL; } + u32 lang; + // Get title name via language if (mChannels[page][index].metaHdr->names[System::getLanguage()][nameIndex][0] != 0) { return mChannels[page][index].metaHdr->names[System::getLanguage()][nameIndex]; @@ -481,7 +479,7 @@ namespace ipl { u32* lookup = (u32*)scLangLookup[System::getRegion()]; for (int i = 0; i < ARRAY_LENGTH(scLangLookup[0]); i++) { - u32 lang = lookup[i]; + lang = lookup[i]; if (mChannels[page][index].metaHdr->names[lang][nameIndex][0] != 0) { return mChannels[page][index].metaHdr->names[lang][nameIndex]; } @@ -701,9 +699,10 @@ namespace ipl { channel->bnrFile = NULL; } else { // Search for meta header - channel->headerOffset = System::getChannelManager()->searchMetaHeader(channel->bnrFile->getBuffer() + META_PAD); - if (channel->headerOffset < 0 || !System::getChannelManager()->checkHeaderBase( - (u8*)(channel->headerOffset + channel->bnrFile->getBuffer() + META_PAD), &channel->headerSize)) { + channel->headerOffset = System::getChannelManager()->searchMetaHeader(channel->bnrFile->getBuffer() + META_RESERVED_PADDING); + if (channel->headerOffset < 0 || + !System::getChannelManager()->checkHeaderBase( + (u8*)(channel->headerOffset + (u32)channel->bnrFile->getBuffer() + META_RESERVED_PADDING), &channel->headerSize)) { memset(channel, 0, sizeof(SEntry)); delete channel->bnrFile; channel->bnrFile = NULL; @@ -717,7 +716,7 @@ namespace ipl { memset(channel, 0, sizeof(SEntry)); } else { // Alright, prepare the ARC! - channel->arcData = (u8*)(channel->bnrFile->getBuffer() + channel->headerSize + channel->headerOffset); + channel->arcData = (u8*)(channel->headerSize + channel->headerOffset + (u32)channel->bnrFile->getBuffer()); ARCInitHandle(channel->arcData, &channel->arc); channel->loadedBnr = true; } @@ -726,21 +725,22 @@ namespace ipl { channel->state = CHAN_STATE_LOADED; } - +#pragma push +#pragma ppc_iro_level 0 void Manager::loadMetaHeaderAsync(int page, int index) { - if (mTmpChannel.state != CHAN_STATE_UNLOADED) { + if (mChannels[page][index].state != CHAN_STATE_UNLOADED) { return; } SInfo info = System::getSaveData()->getChanInfo(page, index); mChannels[page][index].info = info; - if (info.primaryType == channel::PRIMARY_TYPE_NONE) { + if (mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_NONE) { // Invalid!!!! memset(&mChannels[page][index], 0, sizeof(SEntry)); mNumFinished++; mChannels[page][index].state = CHAN_STATE_LOADED; - } else if (info.primaryType == channel::PRIMARY_TYPE_DISK) { + } else if (mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_DISK) { // Load disk banner mChannels[page][index].loadedBnr = true; if (mChannels[page][index].info.sceneID == SCENE_ID_DISK_CHANNEL) { @@ -755,17 +755,17 @@ namespace ipl { } else { // Load channel banner ESTitleId titleId = ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode); - s32 ret = utility::ESMisc::GetValidTicketIndex(System::getMem2Sys(), titleId); - if (ret == -1) { - ret = 0; + s32 ticketIdx = utility::ESMisc::GetValidTicketIndex(System::getMem2Sys(), titleId); + if (ticketIdx == -1) { + ticketIdx = 0; mChannels[page][index].missingTicket = TRUE; } - mChannels[page][index].ticketIdx = ret; + mChannels[page][index].ticketIdx = ticketIdx; // Get tmd ESTmdView* tmdView = NULL; - ret = utility::ESMisc::GetTmdView(System::getMem2Sys(), titleId, &tmdView); + s32 ret = utility::ESMisc::GetTmdView(System::getMem2Sys(), titleId, &tmdView); if (ret != ES_ERR_OK) { IPLErrorLogAndDisplay(MESG_ERR_FILE, "ES", ret, 1468); } @@ -787,6 +787,7 @@ namespace ipl { mChannels[page][index].state = CHAN_STATE_LOADED_META; } } +#pragma pop void Manager::cbReadMetaHeader(void* work) { SEntry* channel = (SEntry*)work; @@ -800,9 +801,10 @@ namespace ipl { channel->bnrFile = NULL; } else { // Search for meta header - channel->headerOffset = System::getChannelManager()->searchMetaHeader(channel->bnrFile->getBuffer() + META_PAD); - if (channel->headerOffset < 0 || !System::getChannelManager()->checkHeaderBase( - (u8*)(channel->headerOffset + channel->bnrFile->getBuffer() + META_PAD), &channel->headerSize)) { + channel->headerOffset = System::getChannelManager()->searchMetaHeader(channel->bnrFile->getBuffer() + META_RESERVED_PADDING); + if (channel->headerOffset < 0 || + !System::getChannelManager()->checkHeaderBase( + (u8*)(channel->headerOffset + (u32)channel->bnrFile->getBuffer() + META_RESERVED_PADDING), &channel->headerSize)) { memset(channel, 0, sizeof(SEntry)); delete channel->bnrFile; channel->bnrFile = NULL; @@ -816,7 +818,7 @@ namespace ipl { memset(channel, 0, sizeof(SEntry)); } else { // Alright, prepare the ARC! - channel->arcData = (u8*)(channel->bnrFile->getBuffer() + channel->headerSize + channel->headerOffset); + channel->arcData = (u8*)(channel->headerSize + channel->headerOffset + (u32)channel->bnrFile->getBuffer()); ARCInitHandle(channel->arcData, &channel->arc); channel->loadedBnr = true; @@ -902,7 +904,7 @@ namespace ipl { const char* magic = "IMET"; int next = 0; - for (int i = 0; i < ((META_PAD * 2) + 0x20); i++, buffer++) { + for (int i = 0; i < ((META_RESERVED_PADDING * 2) + 0x20); i++, buffer++) { // Found one character? if (*buffer == magic[next]) { // Look for the next one @@ -950,7 +952,7 @@ namespace ipl { } // Reset padding - memset(buffer, 0, META_PAD); + memset(buffer, 0, META_RESERVED_PADDING); // Do not include sum in buffer memset(buffer + (size - NET_MD5_DIGEST_SIZE), 0, NET_MD5_DIGEST_SIZE); @@ -1178,16 +1180,16 @@ namespace ipl { SEntry* Manager::fn_8133A4E0(ESTitleId titleId) { for (int page = 0; page < MAX_CHANNEL_PAGE; page++) { for (int index = 0; index < MAX_CHANNEL_INDEX; index++) { - if (mChannels[page][index].loadedBnr) { - if (ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode) == titleId) { - return &mChannels[page][index]; - } + ESTitleId cmp = ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode); + if (mChannels[page][index].loadedBnr && cmp == titleId) { + return &mChannels[page][index]; } } } if (mTmpChannel.loadedBnr) { - if (ES_TITLE_ID(mTmpChannel.info.titleType, mTmpChannel.info.titleCode) == titleId) { + ESTitleId cmp = ES_TITLE_ID(mTmpChannel.info.titleType, mTmpChannel.info.titleCode); + if (cmp == titleId) { return &mTmpChannel; } } diff --git a/src/system/iplController.cpp b/src/system/iplController.cpp index f0ca8095..01232cbc 100644 --- a/src/system/iplController.cpp +++ b/src/system/iplController.cpp @@ -11,62 +11,63 @@ #include "system/iplController.h" #include "system/iplSystem.h" -const f32 lbl_8160D2C0[] = { 0.2, 0.3, 0, 0 }; +const f32 lbl_8160D2C0[] = {0.2, 0.3, 0, 0}; namespace ipl { namespace controller { void Base::read() { - if (this->isValidBtn()) { - if (this->downTrg(BTN_INTERACT)) { - this->mButton = 1; + if (isValidBtn()) { + if (downTrg(BTN_INTERACT)) { + mButton = 1; } - if (this->pinch()) { - this->mButton = 0; + if (pinch()) { + mButton = 0; } - if (this->mButton != 0) { - if (this->down(BTN_INTERACT)) { - this->mUnk8++; + if (mButton != 0) { + if (down(BTN_INTERACT)) { + unk_0x08++; } else { - this->mUnk8 = 0; - this->mButton = 0; + unk_0x08 = 0; + mButton = 0; } } else { - this->mUnk8 = 0; + unk_0x08 = 0; } } else { - this->mButton = 0; - this->mUnk8 = 0; + mButton = 0; + unk_0x08 = 0; } - switch (this->mRumbleType) { + switch (mRumbleType) { case 0: case 1: { - u32 time = (OSGetTick() - this->mLastRumbleTime) / ((__OSBusClock >> 2) / 1000); - float f1 = (float)time / 1000.0f; + u32 time = OSTicksToMilliseconds(OSGetTick() - mLastRumbleTime); + f32 f1 = (f32)time / 1000.0f; if (f1 < 7.0f / 120.0f) { - WPADControlMotor(this->mChan, 0x1); - } else if (f1 < lbl_8160D2C0[this->mRumbleType]) { - WPADControlMotor(this->mChan, 0x0); - } else if (this->getKPADStatus() == NULL || this->getKPADStatus()->wpad_err == 0) { - this->mLastRumbleTime = 0; - this->mRumbleType = -1; - WPADControlMotor(this->mChan, 0x0); + WPADControlMotor(mChan, 1); + } else if (f1 < lbl_8160D2C0[mRumbleType]) { + WPADControlMotor(mChan, 0); + } else if (getKPADStatus() == NULL || getKPADStatus()->wpad_err == 0) { + mLastRumbleTime = 0; + mRumbleType = -1; + WPADControlMotor(mChan, 0); } - if (this->downTrg(BTN_INTERACT) != 0 || this->decide() != 0) { - WPADControlMotor(this->mChan, 0x0); - this->mRumbleType = 2; + if (downTrg(BTN_INTERACT) != 0 || decide() != 0) { + WPADControlMotor(mChan, 0); + mRumbleType = 2; } break; - } case 2: { - u32 time = (OSGetTick() - this->mLastRumbleTime) / ((__OSBusClock >> 2) / 1000); - float f1 = (float)time / 1000.0f; + } + case 2: { + u32 time = OSTicksToMilliseconds(OSGetTick() - mLastRumbleTime); + f32 f1 = (f32)time / 1000.0f; if (f1 < lbl_8160D2C0[1]) { - WPADControlMotor(this->mChan, 0x0); - } else if (this->getKPADStatus() == NULL || this->getKPADStatus()->wpad_err == 0) { - this->mLastRumbleTime = 0; - this->mRumbleType = -1; - WPADControlMotor(this->mChan, 0x0); + WPADControlMotor(mChan, 0); + } else if (getKPADStatus() == NULL || getKPADStatus()->wpad_err == 0) { + mLastRumbleTime = 0; + mRumbleType = -1; + WPADControlMotor(mChan, 0); } break; } @@ -94,71 +95,71 @@ namespace ipl { } int Base::decide() const { - return (unsigned int)__cntlzw(this->mUnk8 - 5) >> 5; + return (unk_0x08 - 5) == 0; } int Base::rumble(int type) { - int ret = 0; - if (WPADIsMotorEnabled() && this->mRumbleType == -1) { - this->mLastRumbleTime = OSGetTick(); - ret = 1; - this->mRumbleType = type; + int ret = FALSE; + if (WPADIsMotorEnabled() && mRumbleType == -1) { + mLastRumbleTime = OSGetTick(); + ret = TRUE; + mRumbleType = type; } return ret; } void Base::cancelRumbling() { - if (this->mRumbleType != -1) { - WPADControlMotor(this->mChan, 0x0); + if (mRumbleType != -1) { + WPADControlMotor(mChan, 0); } - this->mLastRumbleTime = 0; - this->mRumbleType = -1; + mLastRumbleTime = 0; + mRumbleType = -1; } void Revolution::read() { - if (!this->isValidDpd()) { - this->mUnk20->pos.y = 1.0f / 0.0f; - this->mUnk20->pos.x = 1.0f / 0.0f; - this->mUnk20->speed = 0.0f; - this->mUnk20->vec.y = 0.0f; - this->mUnk20->vec.x = 0.0f; + if (!isValidDpd()) { + unk_0x20->pos.y = 1.0f / 0.0f; + unk_0x20->pos.x = 1.0f / 0.0f; + unk_0x20->speed = 0.0f; + unk_0x20->vec.y = 0.0f; + unk_0x20->vec.x = 0.0f; } - this->mUnk1E = this->mUnk1D; + unk_0x1E = unk_0x1D; - if (this->isValidBtn()) { - if (this->mUnk1E == 0) { - if (this->down(REVO_BTN_A) && this->down(REVO_BTN_B)) { - this->mUnk1D = 1; + if (isValidBtn()) { + if (unk_0x1E == 0) { + if (down(REVO_BTN_A) && down(REVO_BTN_B)) { + unk_0x1D = 1; } - } else if (!this->down(REVO_BTN_A) || !this->down(REVO_BTN_B)) { - this->mUnk1D = 0; + } else if (!down(REVO_BTN_A) || !down(REVO_BTN_B)) { + unk_0x1D = 0; } } else { - this->mUnk1D = 0; + unk_0x1D = 0; } Interface::read(); } bool Revolution::isValidDpd() const { - if (this->mUnk1C != 0) { + if (unk_0x1C != 0) { return false; } - return (this->mUnk20->wpad_err == 0 || this->mUnk20->wpad_err == -7) && this->mUnk20->dpd_valid_fg != 0; + return (unk_0x20->wpad_err == 0 || unk_0x20->wpad_err == -7) && unk_0x20->dpd_valid_fg != 0; } bool Revolution::isValidBtn() const { - u8 val = this->mUnk20->wpad_err; + u8 val = unk_0x20->wpad_err; return (u8)(val + 7) <= 7 && ((1 << (val + 7)) & 0xA1) != 0; } int Revolution::down(u32 mButton) const { bool ret = false; - if (this->isValidBtn()) { - if (this->mUnk20->hold & (mButton & 0xFFFF)) { + if (isValidBtn()) { + if (unk_0x20->hold & (mButton & 0xFFFF)) { ret = true; } } @@ -170,8 +171,8 @@ namespace ipl { math::VEC2 Revolution::getDpdProjectionPos() const { math::VEC2 ret; Vec2 dest; - Vec2 src = { this->mUnk20->pos.x, this->mUnk20->pos.y }; - nw4r::ut::Rect nw4r_rect; // constructor shouldn't be inlined + Vec2 src = {unk_0x20->pos.x, unk_0x20->pos.y}; + nw4r::ut::Rect nw4r_rect; // constructor shouldn't be inlined Rect kpad_rect; System::getProjectionRect(&nw4r_rect); @@ -199,55 +200,58 @@ namespace ipl { } // // - ret.set(dest.x, dest.y); // shouldn't be inlined + ret.set(dest.x, dest.y); // shouldn't be inlined return ret; } - Classic::Classic(int arg0, KPADStatus &arg1) : Revolution(arg0, arg1) { - this->unk24.y = 0.01f; - this->unk24.x = 0.01f; - this->unk2C = 0; + Classic::Classic(int arg0, KPADStatus& arg1) : Revolution(arg0, arg1) { + unk_0x24.y = 0.01f; + unk_0x24.x = 0.01f; + unk_0x2C = 0; } - Base::~Base() {} + Base::~Base() { + } - Revolution::~Revolution() {} + Revolution::~Revolution() { + } void Classic::read() { if (!Revolution::isValidDpd()) { - math::VEC2 lstick(this->mUnk20->ex_status.cl.lstick.x, this->mUnk20->ex_status.cl.lstick.y); + math::VEC2 lstick(unk_0x20->ex_status.cl.lstick.x, unk_0x20->ex_status.cl.lstick.y); if (lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f) { - this->unk24.x = math::abs_clamp(this->unk24.x + this->mUnk20->ex_status.cl.lstick.x * 0.05f, 1.8f); - this->unk24.y = math::abs_clamp(this->unk24.y - this->mUnk20->ex_status.cl.lstick.y * 0.05f, 1.2f); + unk_0x24.x = math::abs_clamp(unk_0x24.x + unk_0x20->ex_status.cl.lstick.x * 0.05f, 1.8f); + unk_0x24.y = math::abs_clamp(unk_0x24.y - unk_0x20->ex_status.cl.lstick.y * 0.05f, 1.2f); } - math::VEC2 rstick = math::VEC2(this->mUnk20->ex_status.cl.rstick.x, this->mUnk20->ex_status.cl.rstick.y); - if (this->getClassicHoldFlag() != 0 || lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f || rstick.x * rstick.x + rstick.y * rstick.y > 0.0036f) { - this->unk2C = 180; + math::VEC2 rstick = math::VEC2(unk_0x20->ex_status.cl.rstick.x, unk_0x20->ex_status.cl.rstick.y); + if (getClassicHoldFlag() != 0 || lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f || + rstick.x * rstick.x + rstick.y * rstick.y > 0.0036f) { + unk_0x2C = 180; } - if (--this->unk2C < 0) { - this->unk2C = 0; + if (--unk_0x2C < 0) { + unk_0x2C = 0; } } else { - this->unk24.y = 0.01f; - this->unk24.x = 0.01f; - this->unk2C = 0; + unk_0x24.y = 0.01f; + unk_0x24.x = 0.01f; + unk_0x2C = 0; } Revolution::read(); } int Classic::getClassicHoldFlag() const { - return this->mUnk20->ex_status.cl.hold; + return unk_0x20->ex_status.cl.hold; } math::VEC2 Classic::getHorizon() const { math::VEC2 ret; if (Revolution::isValidDpd()) { - ret.set(this->mUnk20->horizon.x, this->mUnk20->horizon.y); + ret.set(unk_0x20->horizon.x, unk_0x20->horizon.y); return ret; } else { return math::VEC2(1.0f, -0.2679492f); @@ -257,15 +261,15 @@ namespace ipl { math::VEC2 Classic::getDpdPos() const { math::VEC2 ret; if (Revolution::isValidDpd()) { - ret.set(this->mUnk20->pos.x, this->mUnk20->pos.y); + ret.set(unk_0x20->pos.x, unk_0x20->pos.y); return ret; } - if (this->unk2C != 0) { - ret = this->unk24; + if (unk_0x2C != 0) { + ret = unk_0x24; return ret; } return math::VEC2(1.0f / 0.0f, 1.0f / 0.0f); } - } -} + } // namespace controller +} // namespace ipl diff --git a/src/system/iplNandSDWorker.cpp b/src/system/iplNandSDWorker.cpp index 49996d49..77cb5ce5 100644 --- a/src/system/iplNandSDWorker.cpp +++ b/src/system/iplNandSDWorker.cpp @@ -2,9 +2,11 @@ #include "system/iplNandSDWorker.h" -#pragma sym on +#include "titledb.h" -// (for now :P) +#pragma sym on // required to match (fakematch?) + +// (for now, unless dtk makes the ATTRIBUTE_ALIGN part optional :P) // stub ATTRIBUTE_ALIGN #undef ATTRIBUTE_ALIGN #define ATTRIBUTE_ALIGN(num) @@ -12,11 +14,11 @@ #undef ALIGN32 #define ALIGN32 __attribute__((aligned(32))) +// Encryption keys. These are extracted from the executable. #include "system/nandsdworker/es_encrypt.inc" #include "system/nandsdworker/md5_secret_key.inc" #include "system/rvl_dec.h" -#include #include "utility/iplESMisc.h" #include "utility/iplStack.h" @@ -25,27 +27,28 @@ #include -#include +#include +#include -typedef struct SMetaBlockHeader { - char sig[4]; // 0x00 - u32 headSize; // 0x04 - u32 version; // 0x08 (always 3) -} SMetaBlockHeader; +#include +#include + +#include namespace ipl { -#define DO_NOT_INLINE \ - *((u32*)NULL); \ - *((u32*)NULL); \ - *((u32*)NULL); \ - *((u32*)NULL); \ - *((u32*)NULL); \ - *((u32*)NULL) +#ifndef NON_MATCHING + // this could work as a seperate unit??? + void forceStackWeaks() { + ut::FreeList freeList; + freeList.init(NULL, 0, 0); + freeList.get(); -#define FS_BLK_SIZE (16 * 1024) -#define USR_FS_BLK_CNT 0x4400 -#define USR_INODE_CNT 4000 -#define NAND_USR_FREE_AREA_SIZE (USR_FS_BLK_CNT * FS_BLK_SIZE) + ut::Stack stack; + stack.init(NULL, 0, 0); + stack.push(NULL); + stack.pop(NULL); + } +#endif const char* NandSDWorker::c_banner_file_name = "banner.bin"; const char* NandSDWorker::c_nocopy_folder_name = "nocopy"; @@ -60,905 +63,1122 @@ namespace ipl { const char* NandSDWorker::c_ignore_list_for_wiimenu[2] = {"setting.txt", "cache.dat"}; const char* NandSDWorker::c_wii_menu_save_path = "/title/00000001/00000002/data"; - NandSDWorker::SDState NandSDWorker::s_sd_state = SD_STATE_INITIAL; + NandSDWorker::WorkSDState NandSDWorker::s_sd_state = SD_STATE_INITIAL; int NandSDWorker::s_completion_pct = 0; - NandSDWorker::NandSDWorker() : pWork(NULL) { + NandSDWorker::NandSDWorker() : myWork(NULL) { } + NandSDWorker::~NandSDWorker() { } - void NandSDWorker::create(void* work, void* savesBuf, void* appsBuf, int prio) { - pWork = (Work*)work; - Work* offsetWorkForStack = (Work*)((u8*)pWork + sizeof(pWork->mThreadStack)); - OSCreateThread(&pWork->mThread, thread_main, this, offsetWorkForStack->mThreadStack, sizeof(pWork->mThreadStack), prio, - OS_THREAD_ATTR_DETACH); - OSInitMessageQueue(&pWork->mMsgQueue, pWork->mMsgQueueBuf, ARRAY_LENGTH(pWork->mMsgQueueBuf)); - OSInitMutex(&pWork->mMutex); - pWork->pHeap19000 = MEMCreateExpHeapEx(pWork->mHeap19000Buf, sizeof(pWork->mHeap19000Buf), 0); - pWork->pBothHeap = NULL; + void NandSDWorker::create(void* work, void* savesBuf, void* appsBuf, int priority) { + myWork = (Work*)work; + + /* Setup important stuff */ + + Work* workForStackP = (Work*)((u8*)myWork + sizeof(myWork->threadStack)); + OSCreateThread(&myWork->thread, thread_main, this, workForStackP->threadStack, sizeof(myWork->threadStack), priority, OS_THREAD_ATTR_DETACH); + + OSInitMessageQueue(&myWork->msgQueue, myWork->messages, ARRAY_LENGTH(myWork->messages)); + OSInitMutex(&myWork->mutex); + + myWork->mainHeap = MEMCreateExpHeapEx(myWork->mHeap19000Buf, sizeof(myWork->mHeap19000Buf), 0); + myWork->unkHeap = NULL; + + /* Setup Save Data list */ + if (savesBuf != NULL) { - nw4r::ut::List_Init(&pWork->mSavesListNand, offsetof(SaveCacheEntry, mLink)); - nw4r::ut::List_Init(&pWork->mSavesListSD, offsetof(SaveCacheEntry, mLink)); - pWork->pSaveCacheHeap = MEMCreateUnitHeapEx(savesBuf, saveCacheHeapSize(), sizeof(SaveCacheEntry), 0x20, 0); - pWork->pBothHeap = MEMCreateExpHeapEx((u8*)savesBuf + saveCacheHeapSize(), 0x40000, 0); - MEMInitAllocatorForExpHeap(&pWork->mBothHeapAllocator, pWork->pBothHeap, 0x40); + nw4r::ut::List_Init(&myWork->nandSaveList, offsetof(SaveCacheEntry, link)); + nw4r::ut::List_Init(&myWork->sdSaveList, offsetof(SaveCacheEntry, link)); + + myWork->saveCacheHeap = MEMCreateUnitHeapEx(savesBuf, saveCacheHeapSize(), sizeof(SaveCacheEntry), 32, 0); + myWork->unkHeap = MEMCreateExpHeapEx((u8*)savesBuf + saveCacheHeapSize(), 0x40000, 0); + + MEMInitAllocatorForExpHeap(&myWork->unkAllocator, myWork->unkHeap, 64); } else { - pWork->pSaveCacheHeap = NULL; + myWork->saveCacheHeap = NULL; } + + /* Setup app list */ + if (appsBuf != NULL) { - nw4r::ut::List_Init(&pWork->mAppsListNand, offsetof(AppCacheEntry, mLink)); - nw4r::ut::List_Init(&pWork->mAppsListSD, offsetof(AppCacheEntry, mLink)); - pWork->pAppCacheHeap = MEMCreateUnitHeapEx(appsBuf, appCacheHeapSize(), sizeof(AppCacheEntry), 0x20, 0); - if (pWork->pBothHeap == NULL) { - pWork->pBothHeap = MEMCreateExpHeapEx((u8*)appsBuf + appCacheHeapSize(), 0x40000, 0); - MEMInitAllocatorForExpHeap(&pWork->mBothHeapAllocator, pWork->pBothHeap, 0x40); + nw4r::ut::List_Init(&myWork->nandAppList, offsetof(AppCacheEntry, link)); + nw4r::ut::List_Init(&myWork->sdAppList, offsetof(AppCacheEntry, link)); + + myWork->appCacheHeap = MEMCreateUnitHeapEx(appsBuf, appCacheHeapSize(), sizeof(AppCacheEntry), 32, 0); + + if (myWork->unkHeap == NULL) { + myWork->unkHeap = MEMCreateExpHeapEx((u8*)appsBuf + appCacheHeapSize(), 0x40000, 0); + MEMInitAllocatorForExpHeap(&myWork->unkAllocator, myWork->unkHeap, 64); } } else { - pWork->pAppCacheHeap = NULL; + myWork->appCacheHeap = NULL; } + + /* Setup FA system */ + FAInit(FA_FLAG_FILENAME_CHECK); - FASetThreadPriority(prio); + + FASetThreadPriority(priority); FARegistCB(FA_DEVICE_SD, sd_insert_callback, sd_eject_callback); - pWork->mFatCacheSetting.pages = pWork->mFatCachePages; - pWork->mFatCacheSetting.buffers = pWork->mFatCacheBuf; - pWork->mFatCacheSetting.numFatPages = 8; - pWork->mFatCacheSetting.numDataPages = 0x20; - pWork->mFatCacheSetting.numFatBufSize = 1; - pWork->mFatCacheSetting.numDataBufSize = 1; - OSReport("NandSDWorker: num FAT cache : %d\n", 8); - OSReport("NandSDWorker: num Data cache: %d\n", 0x20); - pWork->mFatDriveTable.pPart = NULL; - pWork->mFatDriveTable.pCache = &pWork->mFatCacheSetting; - pWork->mState = WORKER_STATE_IDLE; - pWork->mAsyncResult = WORKER_RESULT_WORKING; - pWork->mNandSaveNum = -1; - pWork->mNandAppNum = -1; - pWork->mSdSaveNum = -1; - pWork->mSdAppNum = -1; + + myWork->cacheSetting.pages = myWork->cachePages; + myWork->cacheSetting.buffers = myWork->cacheBuf; + myWork->cacheSetting.numFatPages = FAT_PAGES; + myWork->cacheSetting.numDataPages = DATA_PAGES; + myWork->cacheSetting.numFatBufSize = 1; + myWork->cacheSetting.numDataBufSize = 1; + + OSReport("NandSDWorker: num FAT cache : %d\n", FAT_PAGES); + OSReport("NandSDWorker: num Data cache: %d\n", DATA_PAGES); + + myWork->driveTable.pPart = NULL; + myWork->driveTable.pCache = &myWork->cacheSetting; + + /* Setup other work stuff */ + + myWork->state = STATE_IDLE; + myWork->asyncResult = RESULT_WORKING; + myWork->nandSaveNum = -1; + myWork->nandAppNum = -1; + myWork->sdSaveNum = -1; + myWork->sdAppNum = -1; + s_sd_state = SD_STATE_INITIAL; - pWork->mUid = SYSMENU_TITLE_ID; - pWork->mIsSDWriteProtected = FALSE; - pWork->mSdMountErr = -1; - unk_0x4 = false; - OSResumeThread(&pWork->mThread); + myWork->curUId = SYSMENU_TITLE_ID; + myWork->sdWriteProtected = FALSE; + myWork->prevAsyncResult = RESULT_WORKING; + + unk_0x04 = false; + + OSResumeThread(&myWork->thread); } BOOL NandSDWorker::is_terminated() { - return pWork == NULL; + return myWork == NULL; } + BOOL NandSDWorker::is_working() { - return get_state() == WORKER_STATE_WORKING; + return get_state() == STATE_WORKING; } int NandSDWorker::get_async_result() { - return is_working() ? WORKER_RESULT_WORKING : pWork->mAsyncResult; + return is_working() ? RESULT_WORKING : myWork->asyncResult; } - NandSDWorker::SDState NandSDWorker::get_sd_state() { + + NandSDWorker::WorkSDState NandSDWorker::get_sd_state() { return s_sd_state; } + u32 NandSDWorker::get_nand_save_num() { - return pWork->mNandSaveNum; + return myWork->nandSaveNum; } + u32 NandSDWorker::get_nand_app_num() { - return pWork->mNandAppNum; + return myWork->nandAppNum; } WIISaveBannerFile* NandSDWorker::get_cached_nand_save_banner(ESTitleId titleId) { - SaveCacheEntry* entry = find_save_cache(&pWork->mSavesListNand, titleId); - if (entry != NULL && entry->mBanner.magic != 0) - return &entry->mBanner; - else + SaveCacheEntry* entry = find_save_cache(&myWork->nandSaveList, titleId); + if (entry != NULL && entry->banner.signature != 0) { + return &entry->banner; + } else { return NULL; + } } + void* NandSDWorker::get_cached_nand_app_thumbnail(ESTitleId titleId, u32* sizeOut) { - AppCacheEntry* entry = find_app_cache(&pWork->mAppsListNand, titleId); - if (entry != NULL && entry->mThumbnailSize != -1) { - if (sizeOut != NULL) - *sizeOut = entry->mThumbnailSize; - return entry->mThumbnail; + AppCacheEntry* entry = find_app_cache(&myWork->nandAppList, titleId); + if (entry != NULL && entry->thumbSize != -1) { + if (sizeOut != NULL) { + *sizeOut = entry->thumbSize; + } + return entry->thumbnail; } else { return NULL; } } channel::SChanMgrMetaHeader* NandSDWorker::get_cached_nand_app_meta_header(ESTitleId titleId) { - AppCacheEntry* entry = find_app_cache(&pWork->mAppsListNand, titleId); - if (entry != NULL && entry->mThumbnailSize != -1) - return &entry->mMetaHdr; - else + AppCacheEntry* entry = find_app_cache(&myWork->nandAppList, titleId); + if (entry != NULL && entry->thumbSize != -1) { + return &entry->metaHdr; + } else { return NULL; + } } - channel::SChanMgrMetaHeader* NandSDWorker::get_cached_sd_app_meta_header(ESTitleId32 titleId) { - if (s_sd_state != SD_STATE_READY) - return NULL; - AppCacheEntry* entry = find_app_cache(&pWork->mAppsListSD, titleId); - if (entry != NULL && entry->mThumbnailSize != -1) - return &entry->mMetaHdr; - else + channel::SChanMgrMetaHeader* NandSDWorker::get_cached_sd_app_meta_header(ESTitleId32 titleId) { + if (s_sd_state != SD_STATE_READY) { return NULL; + } + + AppCacheEntry* entry = find_app_cache(&myWork->sdAppList, titleId); + if (entry != NULL && entry->thumbSize != -1) { + return &entry->metaHdr; + } else { + return NULL; + } } + s32 NandSDWorker::get_cached_nand_save_size(ESTitleId titleId) { - SaveCacheEntry* entry = find_save_cache(&pWork->mSavesListNand, titleId); - if (entry != NULL && entry->mSize != -1) - return entry->mSize; - else + SaveCacheEntry* entry = find_save_cache(&myWork->nandSaveList, titleId); + if (entry != NULL && entry->size != -1) { + return entry->size; + } else { return -1; + } } + s32 NandSDWorker::get_cached_nand_app_size(ESTitleId titleId) { - AppCacheEntry* entry = find_app_cache(&pWork->mAppsListNand, titleId); - if (entry != NULL && entry->mFileSize != -1) - return entry->mFileSize; - else + AppCacheEntry* entry = find_app_cache(&myWork->nandAppList, titleId); + if (entry != NULL && entry->fileSize != -1) { + return entry->fileSize; + } else { return -1; + } } s32 NandSDWorker::get_sd_save_num() { - return s_sd_state == SD_STATE_READY ? pWork->mSdSaveNum : -1; + return s_sd_state == SD_STATE_READY ? myWork->sdSaveNum : -1; } + s32 NandSDWorker::get_sd_app_num() { - return s_sd_state == SD_STATE_READY ? pWork->mSdAppNum : -1; + return s_sd_state == SD_STATE_READY ? myWork->sdAppNum : -1; } WIISaveBannerFile* NandSDWorker::get_cached_sd_save_banner(ESTitleId32 titleId) { - if (s_sd_state != SD_STATE_READY) + if (s_sd_state != SD_STATE_READY) { return NULL; + } - SaveCacheEntry* entry = find_save_cache(&pWork->mSavesListSD, titleId); - if (entry != NULL && entry->mBanner.magic != 0) - return &entry->mBanner; - else + SaveCacheEntry* entry = find_save_cache(&myWork->sdSaveList, titleId); + if (entry != NULL && entry->banner.signature != 0) { + return &entry->banner; + } else { return NULL; + } } - void* NandSDWorker::get_cached_sd_app_thumbnail(ESTitleId32 titleId, u32* sizeOut) { - if (s_sd_state != SD_STATE_READY) - return NULL; - AppCacheEntry* entry = find_app_cache(&pWork->mAppsListSD, titleId); - if (entry != NULL && entry->mThumbnailSize != -1) { - if (sizeOut != NULL) - *sizeOut = entry->mThumbnailSize; - return entry->mThumbnail; + void* NandSDWorker::get_cached_sd_app_thumbnail(ESTitleId32 titleId, u32* sizeOut) { + if (s_sd_state != SD_STATE_READY) { + return NULL; + } + + AppCacheEntry* entry = find_app_cache(&myWork->sdAppList, titleId); + if (entry != NULL && entry->thumbSize != -1) { + if (sizeOut != NULL) { + *sizeOut = entry->thumbSize; + } + return entry->thumbnail; } else { return NULL; } } s32 NandSDWorker::get_cached_sd_save_size(ESTitleId32 titleId) { - if (s_sd_state != SD_STATE_READY) + if (s_sd_state != SD_STATE_READY) { return NULL; + } - SaveCacheEntry* entry = find_save_cache(&pWork->mSavesListSD, titleId); - if (entry != NULL && entry->mSize != -1) - return entry->mSize; - else + SaveCacheEntry* entry = find_save_cache(&myWork->sdSaveList, titleId); + if (entry != NULL && entry->size != -1) { + return entry->size; + } else { return -1; + } } - s32 NandSDWorker::get_cached_sd_app_size(ESTitleId32 titleId) { - if (s_sd_state != SD_STATE_READY) - return NULL; - AppCacheEntry* entry = find_app_cache(&pWork->mAppsListSD, titleId); - if (entry != NULL && entry->mFileSize != -1) - return entry->mFileSize; - else + s32 NandSDWorker::get_cached_sd_app_size(ESTitleId32 titleId) { + if (s_sd_state != SD_STATE_READY) { + return NULL; + } + + AppCacheEntry* entry = find_app_cache(&myWork->sdAppList, titleId); + if (entry != NULL && entry->fileSize != -1) { + return entry->fileSize; + } else { return -1; + } } BOOL NandSDWorker::is_sd_write_protected() { - return s_sd_state == SD_STATE_READY ? pWork->mIsSDWriteProtected : FALSE; + return s_sd_state == SD_STATE_READY ? myWork->sdWriteProtected : FALSE; } + char NandSDWorker::get_sd_drive_letter() { - return s_sd_state == SD_STATE_READY ? pWork->mFatDriveTable.drive : '\0'; + return s_sd_state == SD_STATE_READY ? myWork->driveTable.drive : '\0'; } void NandSDWorker::startup_async() { - send_work(MSG_STARTUP); + send_work(MESSAGE_STARTUP); } + void NandSDWorker::terminate_async() { - if (!is_working()) - send_work(MSG_TERMINATE); + if (!is_working()) { + send_work(MESSAGE_TERMINATE); + } } + void NandSDWorker::mount_sd_async() { - send_work(MSG_MOUNT_SD); + send_work(MESSAGE_MOUNT_SD); } - void NandSDWorker::list_nand_save_async(ESTitleId* outputBuf) { - pWork->pParamA = outputBuf; - send_work(MSG_LIST_NAND_SAVE); + + void NandSDWorker::list_nand_save_async(ESTitleId* titleIdOut) { + myWork->paramA = titleIdOut; + send_work(MESSAGE_LIST_NAND_SAVE); } + void NandSDWorker::get_nand_save_banner_async(ESTitleId titleId, WIISaveBannerFile* fileOut) { - pWork->mTitleId = titleId; - pWork->pParamA = fileOut; - send_work(MSG_GET_NAND_SAVE_BANNER); + myWork->curTitleId = titleId; + myWork->paramA = fileOut; + send_work(MESSAGE_GET_NAND_SAVE_BANNER); } - void NandSDWorker::list_sd_save_async(ESTitleId32* outputBuf) { - pWork->pParamA = outputBuf; - send_work(MSG_LIST_SD_SAVE); + + void NandSDWorker::list_sd_save_async(ESTitleId32* titleIdOut) { + myWork->paramA = titleIdOut; + send_work(MESSAGE_LIST_SD_SAVE); } - void NandSDWorker::list_sd_app_async(ESTitleId32* outputBuf) { - pWork->pParamA = outputBuf; - send_work(MSG_LIST_SD_APP); + + void NandSDWorker::list_sd_app_async(ESTitleId32* titleIdOut) { + myWork->paramA = titleIdOut; + send_work(MESSAGE_LIST_SD_APP); } + void NandSDWorker::get_sd_save_banner_async(ESTitleId32 titleId, WIISaveBannerFile* fileOut) { - pWork->mTitleId = titleId; - pWork->pParamA = fileOut; - send_work(MSG_GET_SD_SAVE_BANNER); + myWork->curTitleId = titleId; + myWork->paramA = fileOut; + send_work(MESSAGE_GET_SD_SAVE_BANNER); } - void NandSDWorker::get_sd_app_thumbnail_async(ESTitleId32 titleId, u8* lytBuf, channel::SChanMgrMetaHeader* file) { - pWork->mTitleId = titleId; - pWork->pParamA = lytBuf; - pWork->pParamB = file; - send_work(MSG_GET_SD_APP_THUMBNAIL); + void NandSDWorker::get_sd_app_thumbnail_async(ESTitleId32 titleId, u8* thumbnailBuf, channel::SChanMgrMetaHeader* file) { + myWork->curTitleId = titleId; + myWork->paramA = thumbnailBuf; + myWork->paramB = file; + send_work(MESSAGE_GET_SD_APP_THUMBNAIL); } - void NandSDWorker::iplNandSD_81348DFC(ESTitleId32 titleId, void* ptrA, void* ptrB) { - pWork->mTitleId = titleId; - pWork->pParamA = ptrA; - pWork->pParamB = ptrB; - send_work(MSG_UNK_x29); + void NandSDWorker::get_sd_app_meta_async(ESTitleId32 titleId, u8* thumbnailBuf, SDAppMetaEntry* metaEntries) { + myWork->curTitleId = titleId; + myWork->paramA = thumbnailBuf; + myWork->paramB = metaEntries; + send_work(MESSAGE_GET_SD_APP_META); } - void NandSDWorker::update_loc_dat_async(ESTitleId32* titleIds) { - pWork->pParamA = titleIds; - send_work(MSG_UPDATE_LOC_DAT); + + void NandSDWorker::update_sd_app_location_async(ESTitleId32* titleIds) { + myWork->paramA = titleIds; + send_work(MESSAGE_UPDATE_SD_APP_LOCATION); } - void NandSDWorker::read_loc_dat_async(ESTitleId32* titleIds) { - pWork->pParamA = titleIds; - send_work(MSG_READ_LOC_DAT); + + void NandSDWorker::read_sd_app_location_async(ESTitleId32* titleIds) { + myWork->paramA = titleIds; + send_work(MESSAGE_READ_SD_APP_LOCATION); } - void NandSDWorker::iplNandSD_81348E58(ESTitleId titleId, void* ptrA, void* ptrB) { - pWork->mTitleId = titleId; - pWork->pParamA = ptrA; - pWork->pParamB = ptrB; - send_work(MSG_UNK_x2c); + + void NandSDWorker::check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks) { + myWork->curTitleId = titleId; + myWork->paramA = usedBlocks; + myWork->paramB = freeBlocks; + send_work(MESSAGE_CHECK_FOR_SD_APP_TO_NAND); } + void NandSDWorker::check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles) { - pWork->pParamA = newTitles; - pWork->pParamB = replacingTitles; - send_work(MSG_CHECK_BACKUP_FITS); + myWork->paramA = newTitles; + myWork->paramB = replacingTitles; + send_work(MESSAGE_CHECK_BACKUP_FITS); } + void NandSDWorker::iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC) { - pWork->pParamA = ptrA; - pWork->pParamB = ptrB; - pWork->pParamC = ptrC; - send_work(MSG_UNK_x31); + myWork->paramA = ptrA; + myWork->paramB = ptrB; + myWork->paramC = ptrC; + send_work(MESSAGE_UNK_49); } void NandSDWorker::get_nand_save_size_async(ESTitleId titleId) { - pWork->mTitleId = titleId; - send_work(MSG_GET_NAND_SAVE_SIZE); + myWork->curTitleId = titleId; + send_work(MESSAGE_GET_NAND_SAVE_SIZE); } + void NandSDWorker::get_nand_app_size_async(ESTitleId titleId) { - pWork->mTitleId = titleId; - send_work(MSG_GET_NAND_APP_SIZE); + myWork->curTitleId = titleId; + send_work(MESSAGE_GET_NAND_APP_SIZE); } + void NandSDWorker::delete_nand_save_async(ESTitleId titleId) { - pWork->mTitleId = titleId; - send_work(MSG_DEL_NAND_SAVE); + myWork->curTitleId = titleId; + send_work(MESSAGE_DEL_NAND_SAVE); } void NandSDWorker::get_sd_save_size_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_GET_SD_SAVE_SIZE); + myWork->curTitleId = titleId; + send_work(MESSAGE_GET_SD_SAVE_SIZE); } + void NandSDWorker::get_sd_app_size_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_GET_SD_APP_SIZE); + myWork->curTitleId = titleId; + send_work(MESSAGE_GET_SD_APP_SIZE); } + void NandSDWorker::delete_sd_save_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_DEL_SD_SAVE); + myWork->curTitleId = titleId; + send_work(MESSAGE_DEL_SD_SAVE); } + void NandSDWorker::delete_sd_app_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_DEL_SD_APP); + myWork->curTitleId = titleId; + send_work(MESSAGE_DEL_SD_APP); } void NandSDWorker::initialize_nand_async() { - send_work(MSG_INITIALIZE_NAND); + send_work(MESSAGE_INITIALIZE_NAND); } void NandSDWorker::get_nand_user_free_area_async() { - send_work(MSG_GET_NAND_USER_FREE_AREA); + send_work(MESSAGE_GET_NAND_USER_FREE_AREA); } + void NandSDWorker::copy_nand_save_to_sd_async(ESTitleId titleId) { - pWork->mTitleId = titleId; - send_work(MSG_COPY_NAND_SAVE_TO_SD); + myWork->curTitleId = titleId; + send_work(MESSAGE_COPY_NAND_SAVE_TO_SD); } + void NandSDWorker::copy_sd_save_to_nand_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_COPY_SD_SAVE_TO_NAND); + myWork->curTitleId = titleId; + send_work(MESSAGE_COPY_SD_SAVE_TO_NAND); } + void NandSDWorker::format_sd_async() { - send_work(MSG_FORMAT_SD); - } - void NandSDWorker::get_sd_free_area_async(u64* out) { - pWork->pParamA = out; - send_work(MSG_GET_SD_FREE_AREA); - } - void NandSDWorker::list_nand_app_async(ESTitleId* outputBuf) { - pWork->pParamA = outputBuf; - send_work(MSG_LIST_NAND_APP); + send_work(MESSAGE_FORMAT_SD); } - void NandSDWorker::iplNandSD_81349000(void* ptrA, void* ptrB) { - pWork->pParamA = ptrA; - pWork->pParamB = ptrB; - send_work(MSG_LIST_NAND_APPS_USAGES); + void NandSDWorker::get_sd_free_area_async(ESTitleId* titleIdOut /*?*/) { + myWork->paramA = titleIdOut; + send_work(MESSAGE_GET_SD_FREE_AREA); } - void NandSDWorker::get_nand_app_thumbnail_async(ESTitleId titleId, void* lytBuf, channel::SChanMgrMetaHeader* file) { - pWork->mTitleId = titleId; - pWork->pParamA = lytBuf; - pWork->pParamB = file; - send_work(MSG_GET_NAND_APP_THUMBNAIL); + void NandSDWorker::list_nand_app_async(ESTitleId* titleIdOut) { + myWork->paramA = titleIdOut; + send_work(MESSAGE_LIST_NAND_APP); } - void NandSDWorker::delete_nand_app_async(ESTitleId titleId, bool unk) { - pWork->mTitleId = titleId; - if (unk) { - send_work(MSG_DEL_NAND_APP_B); + + void NandSDWorker::list_nand_apps_usage_async(void* ptrA, void* ptrB) { + myWork->paramA = ptrA; + myWork->paramB = ptrB; + send_work(MESSAGE_LIST_NAND_APPS_USAGE); + } + + void NandSDWorker::get_nand_app_thumbnail_async(ESTitleId titleId, void* thumbnailBuf, channel::SChanMgrMetaHeader* file) { + myWork->curTitleId = titleId; + myWork->paramA = thumbnailBuf; + myWork->paramB = file; + send_work(MESSAGE_GET_NAND_APP_THUMBNAIL); + } + + void NandSDWorker::delete_nand_app_async(ESTitleId titleId, bool hidden) { + myWork->curTitleId = titleId; + if (hidden) { + send_work(MESSAGE_DEL_NAND_APP_HIDDEN); } else { - send_work(MSG_DEL_NAND_APP_A); + send_work(MESSAGE_DEL_NAND_APP); } } + void NandSDWorker::copy_nand_app_to_sd_async(ESTitleId titleId) { - pWork->mTitleId = titleId; + myWork->curTitleId = titleId; s_completion_pct = 0; - send_work(MSG_COPY_NAND_APP_TO_SD); + send_work(MESSAGE_COPY_NAND_APP_TO_SD); } - void NandSDWorker::copy_sd_app_to_nand_async(ESTitleId32 titleId, bool unk) { - pWork->mTitleId = titleId; + + void NandSDWorker::copy_sd_app_to_nand_async(ESTitleId32 titleId, bool hidden) { + myWork->curTitleId = titleId; s_completion_pct = 0; - if (unk) { - send_work(MSG_COPY_SD_APP_TO_NAND_B); + if (hidden) { + send_work(MESSAGE_COPY_SD_APP_TO_NAND); } else { - send_work(MSG_COPY_SD_APP_TO_NAND_A); + send_work(MESSAGE_COPY_SD_APP_TO_NAND_HIDDEN); } } void NandSDWorker::nocopy_exist_nand_save_async(ESTitleId titleId) { - pWork->mTitleId = titleId; - send_work(MSG_NOCOPY_EXIST_NAND_SAVE); + myWork->curTitleId = titleId; + send_work(MESSAGE_NOCOPY_EXIST_NAND_SAVE); } + void NandSDWorker::nand_save_exist_async(ESTitleId titleId) { - pWork->mTitleId = titleId; - send_work(MSG_NAND_SAVE_EXIST); + myWork->curTitleId = titleId; + send_work(MESSAGE_NAND_SAVE_EXIST); } + void NandSDWorker::nand_save_exist_lo_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_NAND_SAVE_EXIST_LO); + myWork->curTitleId = titleId; + send_work(MESSAGE_NAND_SAVE_EXIST_LO); } + void NandSDWorker::nand_app_exist_async(ESTitleId titleId) { - pWork->mTitleId = titleId; - send_work(MSG_NAND_APP_EXIST); + myWork->curTitleId = titleId; + send_work(MESSAGE_NAND_APP_EXIST); } + void NandSDWorker::both_app_exist_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_BOTH_APP_EXIST); + myWork->curTitleId = titleId; + send_work(MESSAGE_BOTH_APP_EXIST); } + void NandSDWorker::sd_save_exist_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_SD_SAVE_EXIST); + myWork->curTitleId = titleId; + send_work(MESSAGE_SD_SAVE_EXIST); } + void NandSDWorker::sd_app_exist_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_SD_APP_EXIST); + myWork->curTitleId = titleId; + send_work(MESSAGE_SD_APP_EXIST); } void NandSDWorker::get_nand_save_perms_async(ESTitleId titleId) { - pWork->mTitleId = titleId; - send_work(MSG_GET_NAND_SAVE_PERMS); - } - void NandSDWorker::get_sd_save_perms_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_GET_SD_SAVE_PERMS); - } - void NandSDWorker::move_nand_app_to_sd_async(ESTitleId titleId) { - pWork->mTitleId = titleId; - send_work(MSG_MOVE_NAND_APP_TO_SD); - } - void NandSDWorker::move_sd_app_to_nand_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_MOVE_SD_APP_TO_NAND); - } - void NandSDWorker::move_nand_save_to_sd_async(ESTitleId titleId) { - pWork->mTitleId = titleId; - send_work(MSG_MOVE_NAND_SAVE_TO_SD); - } - void NandSDWorker::move_sd_save_to_nand_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_MOVE_SD_SAVE_TO_NAND); - } - void NandSDWorker::change_nand_app_count_async(s32 delta) { - pWork->pParamA = (void*)delta; - send_work(MSG_CHANGE_NAND_APP_COUNT); - } - void NandSDWorker::check_sd_title_restorable_async(ESTitleId32 titleId) { - pWork->mTitleId = titleId; - send_work(MSG_CHECK_SD_TITLE_RESTORABLE); + myWork->curTitleId = titleId; + send_work(MESSAGE_GET_NAND_SAVE_PERMS); } -#define SUBTYPE_SIMPLE_DISC 0 -#define SUBTYPE_WII_SHOP 1 -#define SUBTYPE_PREINSTALL 2 -#define SUBTYPE_UNK3 3 -#define SUBTYPE_CHANNEL_DISC 4 -#define SUBTYPE_DLC 5 -#define SUBTYPE_UNK6 6 -#define SUBTYPE_UNK7 7 -#define SUBTYPE_HIDDEN 8 -#define SUBTYPE_MASK ((1 << SUBTYPE_SIMPLE_DISC) | (1 << SUBTYPE_WII_SHOP) | (1 << SUBTYPE_CHANNEL_DISC) | (1 << SUBTYPE_UNK6) | (1 << SUBTYPE_UNK7)) + void NandSDWorker::get_sd_save_perms_async(ESTitleId32 titleId) { + myWork->curTitleId = titleId; + send_work(MESSAGE_GET_SD_SAVE_PERMS); + } + + void NandSDWorker::move_nand_app_to_sd_async(ESTitleId titleId) { + myWork->curTitleId = titleId; + send_work(MESSAGE_MOVE_NAND_APP_TO_SD); + } + + void NandSDWorker::move_sd_app_to_nand_async(ESTitleId32 titleId) { + myWork->curTitleId = titleId; + send_work(MESSAGE_MOVE_SD_APP_TO_NAND); + } + + void NandSDWorker::move_nand_save_to_sd_async(ESTitleId titleId) { + myWork->curTitleId = titleId; + send_work(MESSAGE_MOVE_NAND_SAVE_TO_SD); + } + + void NandSDWorker::move_sd_save_to_nand_async(ESTitleId32 titleId) { + myWork->curTitleId = titleId; + send_work(MESSAGE_MOVE_SD_SAVE_TO_NAND); + } + + void NandSDWorker::change_nand_app_count_async(s32 delta) { + myWork->paramA = (void*)delta; + send_work(MESSAGE_CHANGE_NAND_APP_COUNT); + } + + void NandSDWorker::check_sd_title_restorable_async(ESTitleId32 titleId) { + myWork->curTitleId = titleId; + send_work(MESSAGE_CHECK_SD_TITLE_RESTORABLE); + } bool NandSDWorker::is_disk_or_user_nand_app(ESTitleId titleId) { u32 titleType = ES_TITLE_TYPE_NOMASK(titleId); // This is here so it doesn't inline. Idek anymore. - return (u32)ES_TITLE_TYPE_NOMASK(titleId) == 0x10000 || is_user_nand_app(titleId); + return (u32)ES_TITLE_TYPE_NOMASK(titleId) == TITLE_TYPE_DISC || is_user_nand_app(titleId); } + bool NandSDWorker::is_user_nand_app(ESTitleId titleId) { - bool titleSubtypeMatches = false, valid = false; - u32 titleSubtype = (u32)ES_TITLE_TYPE_NOMASK(titleId) - 0x10000; - if ((titleSubtype <= SUBTYPE_UNK7) && ((1 << titleSubtype) & SUBTYPE_MASK)) { - titleSubtypeMatches = true; +#define USER_APP_TYPE_MASK \ + ((1 << TITLE_TYPE_LO(TITLE_TYPE_DISC)) | (1 << TITLE_TYPE_LO(TITLE_TYPE_CHANNEL)) | (1 << TITLE_TYPE_LO(TITLE_TYPE_DISC_CHANNEL)) | \ + (1 << TITLE_TYPE_LO(TITLE_TYPE_UNK6)) | (1 << TITLE_TYPE_LO(TITLE_TYPE_UNK7))) + + bool valid = false; + bool matchUserAppType = false; + + /* + Check if the title type is either: + 0x00010000 + 0x00010001 + 0x00010004 + 0x00010006 + 0x00010007 + */ + u32 titleSubtype = (u32)ES_TITLE_TYPE_NOMASK(titleId) - TITLE_TYPE_DISC; + if (titleSubtype <= TITLE_TYPE_LO(TITLE_TYPE_UNK7) && ((1 << titleSubtype) & USER_APP_TYPE_MASK)) { + matchUserAppType = true; } - if (titleSubtypeMatches && !is_data_only_title(titleId)) { + + if (matchUserAppType && !is_data_only_title(titleId)) { valid = true; } + return valid; + +#undef USER_APP_TYPE_MASK } + + /* Data only titles are normally for game save data. */ bool NandSDWorker::is_data_only_title(ESTitleId titleId) { bool isGood = false; - int codeLet = ((u32)ES_TITLE_CODE(titleId) >> 0x18); + int codeLet = ((u32)ES_TITLE_CODE(titleId) >> 24); + // Check if last letter is a valid ASCII character return ((u32)codeLet >= ' ' && (u32)codeLet <= '~') && !('A' <= codeLet && codeLet <= 'Z') && !('0' <= codeLet && codeLet <= '9'); } + bool NandSDWorker::is_available_data_only_titleidlo(ESTitleId32 titleId) { return (titleId & 0xFF000000) && (titleId & 0x00FF0000) && (titleId & 0x0000FF00) && (titleId & 0x000000FF) && is_data_only_title(titleId); } void get_nand_data_only_title_save_path(ESTitleId titleId, char* outStr) { - snprintf(outStr, 0x40, "/title/%08x/%08x/data", (u32)ES_TITLE_TYPE_NOMASK(titleId), (u32)ES_TITLE_CODE(titleId)); + snprintf(outStr, NAND_MAX_PATH, "/title/%08x/%08x/data", (u32)ES_TITLE_TYPE_NOMASK(titleId), (u32)ES_TITLE_CODE(titleId)); } - void get_nand_not_data_only_title_save_path(ESTitleId titleId, char* outStr) { - snprintf(outStr, 0x40, "/title/%08x/%08x", (u32)ES_TITLE_TYPE_NOMASK(titleId), (u32)ES_TITLE_CODE(titleId)); + + void get_nand_title_save_path(ESTitleId titleId, char* outStr) { + snprintf(outStr, NAND_MAX_PATH, "/title/%08x/%08x", (u32)ES_TITLE_TYPE_NOMASK(titleId), (u32)ES_TITLE_CODE(titleId)); } + void get_nand_save_path(ESTitleId titleId, char* outStr) { - if (NandSDWorker::is_data_only_title(titleId)) + if (NandSDWorker::is_data_only_title(titleId)) { get_nand_data_only_title_save_path(titleId, outStr); - else - get_nand_not_data_only_title_save_path(titleId, outStr); + } else { + get_nand_title_save_path(titleId, outStr); + } } + void get_nand_app_path(ESTitleId titleId, char* outStr) { - snprintf(outStr, 0x40, "/title/%08x/%08x/content", (u32)ES_TITLE_TYPE_NOMASK(titleId), (u32)ES_TITLE_CODE(titleId)); + snprintf(outStr, NAND_MAX_PATH, "/title/%08x/%08x/content", (u32)ES_TITLE_TYPE_NOMASK(titleId), (u32)ES_TITLE_CODE(titleId)); } + void get_nand_meta_file_path(ESTitleId titleId, char* outStr) { - snprintf(outStr, 0x40, "/meta/%08x/%08x/title.met", (u32)ES_TITLE_TYPE_NOMASK(titleId), (u32)ES_TITLE_CODE(titleId)); + snprintf(outStr, NAND_MAX_PATH, "/meta/%08x/%08x/title.met", (u32)ES_TITLE_TYPE_NOMASK(titleId), (u32)ES_TITLE_CODE(titleId)); } + void get_nand_meta_dir_path(ESTitleId titleId, char* outStr) { - snprintf(outStr, 0x40, "/meta/%08x/%08x", (u32)ES_TITLE_TYPE_NOMASK(titleId), (u32)ES_TITLE_CODE(titleId)); + snprintf(outStr, NAND_MAX_PATH, "/meta/%08x/%08x", (u32)ES_TITLE_TYPE_NOMASK(titleId), (u32)ES_TITLE_CODE(titleId)); } + void NandSDWorker::get_sd_save_path(ESTitleId titleId, char* outStr) { ESTitleId32 titleCode = ES_TITLE_CODE(titleId); if (is_data_only_title(titleId)) { - snprintf(outStr, 0x40, "/private/wii/title/%08x/data.bin", titleCode); + snprintf(outStr, NAND_MAX_PATH, "/private/wii/title/%08x/data.bin", titleCode); } else { - snprintf(outStr, 0x40, "/private/wii/title/%c%c%c%c/data.bin", (u8)(titleCode >> 0x18), (u8)(titleCode >> 0x10), (u8)(titleCode >> 0x08), - (u8)(titleCode >> 0x00)); + snprintf(outStr, NAND_MAX_PATH, "/private/wii/title/%c%c%c%c/data.bin", (u8)(titleCode >> 0x18), (u8)(titleCode >> 0x10), + (u8)(titleCode >> 0x08), (u8)titleCode); } } + void NandSDWorker::get_sd_app_path(ESTitleId titleId, char* outStr) { ESTitleId32 titleCode = ES_TITLE_CODE(titleId); - snprintf(outStr, 0x40, "/private/wii/title/%c%c%c%c/content.bin", (u8)(titleCode >> 0x18), (u8)(titleCode >> 0x10), (u8)(titleCode >> 0x08), - (u8)(titleCode >> 0x00)); + snprintf(outStr, NAND_MAX_PATH, "/private/wii/title/%c%c%c%c/content.bin", (u8)(titleCode >> 0x18), (u8)(titleCode >> 0x10), + (u8)(titleCode >> 0x08), (u8)(titleCode >> 0x00)); } ESTitleId32 NandSDWorker::gamecode_to_titleid_lo(const char* gamecode) { return (gamecode[0] << 0x18) + (gamecode[1] << 0x10) + (gamecode[2] << 0x08) + (gamecode[3] << 0x00); } - void* NandSDWorker::thread_main(void* arg) { + void* NandSDWorker::thread_main(void* work) { OSInitFastCast(); - return ((NandSDWorker*)arg)->run(); + + NandSDWorker* nandSdWorker = reinterpret_cast(work); + return nandSdWorker->run(); } int NandSDWorker::delete_meta_file(ESTitleId titleId) { - char str[0x40]; + char str[NAND_MAX_PATH]; get_nand_meta_dir_path(titleId, str); - int nandCode = nand::wrapper::Delete(str); - if (check_nand_corrupt(nandCode, NULL)) - return WORKER_RESULT_NAND_CORRUPT; + // Attempt to delete + s32 err = nand::wrapper::Delete(str); + if (check_nand_corrupt(err, NULL)) { + return RESULT_NAND_CORRUPT; + } - if (nandCode == NAND_RESULT_OK) { + // Error code report + if (err == NAND_RESULT_OK) { OSReport("NandSDWorker: delete [%s]\n", str); - } else if (nandCode == NAND_RESULT_NOEXISTS) { + } else if (err == NAND_RESULT_NOEXISTS) { OSReport("NandSDWorker: [%s] no exists\n", str); } else { - OSReport("NandSDWorker: NANDDelete %s failed [%d]\n", str, nandCode); - return WORKER_RESULT_GENERIC_ERR; + OSReport("NandSDWorker: NANDDelete %s failed [%d]\n", str, err); + return RESULT_FATAL_SD_ERROR; } - return WORKER_RESULT_OK; + + return RESULT_OK; } void* NandSDWorker::run() { + FAError faErr; + bool terminated = false; + while (true) { switch (wait_work()) { - case MSG_TERMINATE: + case MESSAGE_TERMINATE: { if (s_sd_state != SD_STATE_INITIAL) { - OSReport("NandSDWorker: unmount sd [%d]\n", FAUnmount(pWork->mFatDriveTable.drive, TRUE)); - OSReport("NandSDWorker: detach sd [%d]\n", FADetach(pWork->mFatDriveTable.drive)); - } - MEMDestroyExpHeap(pWork->pHeap19000); + faErr = FAUnmount(myWork->driveTable.drive, TRUE); + OSReport("NandSDWorker: unmount sd [%d]\n", faErr); + + faErr = FADetach(myWork->driveTable.drive); + OSReport("NandSDWorker: detach sd [%d]\n", faErr); + } + + MEMDestroyExpHeap(myWork->mainHeap); + + if (myWork->saveCacheHeap != NULL) { + MEMDestroyUnitHeap(myWork->saveCacheHeap); + } + if (myWork->appCacheHeap != NULL) { + MEMDestroyUnitHeap(myWork->appCacheHeap); + } + if (myWork->unkHeap != NULL) { + MEMDestroyExpHeap(myWork->unkHeap); + } - if (pWork->pSaveCacheHeap != NULL) - MEMDestroyUnitHeap(pWork->pSaveCacheHeap); - if (pWork->pAppCacheHeap != NULL) - MEMDestroyUnitHeap(pWork->pAppCacheHeap); - if (pWork->pBothHeap != NULL) - MEMDestroyExpHeap(pWork->pBothHeap); terminated = true; - break; - case MSG_STARTUP: - do_startup(); - break; - case MSG_MOUNT_SD: - do_mount_sd(); - if (s_sd_state == SD_STATE_BROKEN_MEDIA || s_sd_state == SD_STATE_ILLEGAL_MEDIA) { - pWork->mSdMountErr = pWork->mAsyncResult; - } else { - pWork->mSdMountErr = -1; - } - break; - case MSG_LIST_NAND_SAVE: - do_list_nand_save(); - break; - case MSG_GET_NAND_SAVE_BANNER: { - WIISaveBannerFile* bannerTmp = (WIISaveBannerFile*)MEMAllocFromExpHeapEx(pWork->pHeap19000, sizeof(WIISaveBannerFile), 0x20); - pWork->mAsyncResult = get_nand_save_banner(pWork->mTitleId, bannerTmp, NULL); - if (pWork->mAsyncResult == WORKER_RESULT_OK) { - memcpy(pWork->pParamA, bannerTmp, sizeof(WIISaveBannerFile)); - } - MEMFreeToExpHeap(pWork->pHeap19000, bannerTmp); + break; } - case MSG_LIST_SD_SAVE: - pWork->mAsyncResult = get_sd_save_list((ESTitleId32*)pWork->pParamA); + case MESSAGE_STARTUP: { + do_startup(); break; - case MSG_LIST_SD_APP: - pWork->mAsyncResult = get_sd_app_list((ESTitleId32*)pWork->pParamA); + } + case MESSAGE_MOUNT_SD: { + do_mount_sd(); + if (s_sd_state == SD_STATE_BROKEN || s_sd_state == SD_STATE_ILLEGAL) { + myWork->prevAsyncResult = myWork->asyncResult; + } else { + myWork->prevAsyncResult = RESULT_WORKING; + } break; - case MSG_GET_SD_SAVE_BANNER: + } + case MESSAGE_LIST_NAND_SAVE: { + do_list_nand_save(); + break; + } + case MESSAGE_GET_NAND_SAVE_BANNER: { + WIISaveBannerFile* bannerTmp = (WIISaveBannerFile*)MEMAllocFromExpHeapEx(myWork->mainHeap, sizeof(WIISaveBannerFile), 32); + myWork->asyncResult = get_nand_save_banner(myWork->curTitleId, bannerTmp, NULL); + if (myWork->asyncResult == RESULT_OK) { + memcpy(myWork->paramA, bannerTmp, sizeof(WIISaveBannerFile)); + } + MEMFreeToExpHeap(myWork->mainHeap, bannerTmp); + break; + } + case MESSAGE_LIST_SD_SAVE: { + myWork->asyncResult = get_sd_save_list((ESTitleId32*)myWork->paramA); + break; + } + case MESSAGE_LIST_SD_APP: { + myWork->asyncResult = get_sd_app_list((ESTitleId32*)myWork->paramA); + break; + } + case MESSAGE_GET_SD_SAVE_BANNER: { do_get_sd_save_banner(); break; - case MSG_GET_SD_APP_THUMBNAIL: + } + case MESSAGE_GET_SD_APP_THUMBNAIL: { do_get_sd_app_thumbnail(); break; - case MSG_UNK_x29: - do_unk_8134B728(); + } + case MESSAGE_GET_SD_APP_META: { + do_get_sd_app_meta(); break; - case MSG_UPDATE_LOC_DAT: - do_update_loc_dat(); + } + case MESSAGE_UPDATE_SD_APP_LOCATION: { + do_update_sd_app_location(); break; - case MSG_READ_LOC_DAT: - do_read_loc_dat(); + } + case MESSAGE_READ_SD_APP_LOCATION: { + do_read_sd_app_location(); break; - case MSG_UNK_x2c: - do_unk_8134BED0(); + } + case MESSAGE_CHECK_FOR_SD_APP_TO_NAND: { + do_check_for_sd_app_to_nand(); break; - case MSG_CHECK_BACKUP_FITS: + } + case MESSAGE_CHECK_BACKUP_FITS: { check_backup_fits(); break; - case MSG_UNK_x31: + } + case MESSAGE_UNK_49: { do_unk_8134C838(); break; - case MSG_GET_NAND_SAVE_SIZE: + } + case MESSAGE_GET_NAND_SAVE_SIZE: { do_get_nand_save_size(); break; - case MSG_DEL_NAND_SAVE: - if (is_data_only_title(pWork->mTitleId)) { - u32 delResult = utility::ESMisc::DeleteTitle(System::getMem2Sys(), pWork->mTitleId); - if (delResult != 0) { - OSReport("NandSDWorker: ESMisc::DeleteTitle failed [%d]\n", delResult); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + } + case MESSAGE_DEL_NAND_SAVE: { + // If the title only has the "data" directory, delete the whole title + if (is_data_only_title(myWork->curTitleId)) { + ESError err = utility::ESMisc::DeleteTitle(System::getMem2Sys(), myWork->curTitleId); + if (err != ES_ERR_OK) { + OSReport("NandSDWorker: ESMisc::DeleteTitle failed [%d]\n", err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; } else { - pWork->mAsyncResult = WORKER_RESULT_OK; + myWork->asyncResult = RESULT_OK; } - pWork->mAsyncResult = delete_meta_file(pWork->mTitleId); + myWork->asyncResult = delete_meta_file(myWork->curTitleId); + // Otherwise, delete the "data" directory contents. } else { - pWork->mAsyncResult = recursion_nand_save(pWork->mTitleId, RECURSIVE_DELETE, NULL, 0); - delete_download_task(pWork->mTitleId); + myWork->asyncResult = recursion_nand_save(myWork->curTitleId, RECURSIVE_DELETE, NULL, 0); + delete_download_task(myWork->curTitleId); } - if (pWork->mAsyncResult == WORKER_RESULT_OK) { - pWork->mNandSaveNum--; - delete_save_cache(&pWork->mSavesListNand, pWork->mTitleId); + + if (myWork->asyncResult == RESULT_OK) { + myWork->nandSaveNum--; + delete_save_cache(&myWork->nandSaveList, myWork->curTitleId); } break; - case MSG_GET_SD_SAVE_SIZE: - pWork->mAsyncResult = get_sd_save_size(pWork->mTitleId); + } + case MESSAGE_GET_SD_SAVE_SIZE: { + myWork->asyncResult = get_sd_save_size(myWork->curTitleId); break; - case MSG_DEL_SD_SAVE: + } + case MESSAGE_DEL_SD_SAVE: { do_delete_sd_save(); break; - case MSG_DEL_SD_APP: + } + case MESSAGE_DEL_SD_APP: { do_delete_sd_app(); break; - case MSG_INITIALIZE_NAND: + } + case MESSAGE_INITIALIZE_NAND: { do_initialize_nand(); break; - case MSG_GET_NAND_USER_FREE_AREA: + } + case MESSAGE_GET_NAND_USER_FREE_AREA: { do_get_nand_user_free_area(); - if (pWork->mAsyncResult < 0) { + if (myWork->asyncResult < 0) { OSReport("NandSDWorker: nand user area limit over. return 0.\n"); - pWork->mAsyncResult = 0; + myWork->asyncResult = 0; } break; - case MSG_COPY_NAND_SAVE_TO_SD: + } + case MESSAGE_COPY_NAND_SAVE_TO_SD: { do_copy_nand_save_to_sd(); break; - case MSG_COPY_SD_SAVE_TO_NAND: + } + case MESSAGE_COPY_SD_SAVE_TO_NAND: { do_copy_sd_save_to_nand(); break; - case MSG_FORMAT_SD: + } + case MESSAGE_FORMAT_SD: { do_format_sd(); break; - case MSG_GET_SD_FREE_AREA: { - u64* sizeOutPtr = (u64*)pWork->pParamA; + } + case MESSAGE_GET_SD_FREE_AREA: { + u64* sizeOutPtr = (u64*)myWork->paramA; s64 size = get_sd_free_area(); if (size >= 0) { - pWork->mAsyncResult = WORKER_RESULT_OK; + myWork->asyncResult = RESULT_OK; *sizeOutPtr = size; } else { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; *sizeOutPtr = 0; } break; } - case MSG_DEL_NAND_APP_A: - pWork->mAsyncResult = delete_nand_app_content(pWork->mTitleId); - if (pWork->mAsyncResult == WORKER_RESULT_OK) { - pWork->mNandAppNum--; + case MESSAGE_DEL_NAND_APP: { + // Delete NAND app... + myWork->asyncResult = delete_nand_app_content(myWork->curTitleId); + if (myWork->asyncResult == RESULT_OK) { + myWork->nandAppNum--; + // ...and update the NAND app count for the user. change_nand_app_count(-1); - delete_app_cache(&pWork->mAppsListNand, pWork->mTitleId); + delete_app_cache(&myWork->nandAppList, myWork->curTitleId); } break; - case MSG_DEL_NAND_APP_B: - pWork->mAsyncResult = delete_nand_app_content(pWork->mTitleId); - if (pWork->mAsyncResult == WORKER_RESULT_OK) { - pWork->mNandAppNum--; - delete_app_cache(&pWork->mAppsListNand, pWork->mTitleId); + } + case MESSAGE_DEL_NAND_APP_HIDDEN: { + // Delete NAND app... + myWork->asyncResult = delete_nand_app_content(myWork->curTitleId); + if (myWork->asyncResult == RESULT_OK) { + myWork->nandAppNum--; + // ...and don't update the NAND app count. (secret!!!) + delete_app_cache(&myWork->nandAppList, myWork->curTitleId); } break; - case MSG_COPY_NAND_APP_TO_SD: + } + case MESSAGE_COPY_NAND_APP_TO_SD: { do_copy_nand_app_to_sd(); break; - case MSG_COPY_SD_APP_TO_NAND_A: + } + case MESSAGE_COPY_SD_APP_TO_NAND_HIDDEN: { do_copy_sd_app_to_nand(false); break; - case MSG_COPY_SD_APP_TO_NAND_B: + } + case MESSAGE_COPY_SD_APP_TO_NAND: { do_copy_sd_app_to_nand(true); break; - case MSG_LIST_NAND_APP: + } + case MESSAGE_LIST_NAND_APP: { do_list_nand_app(); break; - case MSG_LIST_NAND_APPS_USAGES: - do_list_nand_apps_usages(); + } + case MESSAGE_LIST_NAND_APPS_USAGE: { + do_list_nand_apps_usage(); break; - case MSG_GET_NAND_APP_THUMBNAIL: - pWork->mAsyncResult = get_nand_app_thumbnail(pWork->mTitleId, (u8*)pWork->pParamA, (channel::SChanMgrMetaHeader*)pWork->pParamB); + } + case MESSAGE_GET_NAND_APP_THUMBNAIL: { + myWork->asyncResult = + get_nand_app_thumbnail(myWork->curTitleId, (u8*)myWork->paramA, (channel::SChanMgrMetaHeader*)myWork->paramB); break; - case MSG_GET_SD_APP_SIZE: - pWork->mAsyncResult = get_sd_app_size(pWork->mTitleId); + } + case MESSAGE_GET_SD_APP_SIZE: { + myWork->asyncResult = get_sd_app_size(myWork->curTitleId); break; - case MSG_GET_NAND_APP_SIZE: + } + case MESSAGE_GET_NAND_APP_SIZE: { do_get_nand_app_size(); break; - case MSG_NOCOPY_EXIST_NAND_SAVE: - pWork->mAsyncResult = item_exist_nand_save_folder(pWork->mTitleId, c_nocopy_folder_name); - break; - case MSG_NAND_SAVE_EXIST: - pWork->mAsyncResult = check_nand_save_banner_exist(pWork->mTitleId); - change_uid(SYSMENU_TITLE_ID); - break; - case MSG_NAND_SAVE_EXIST_LO: - pWork->mAsyncResult = check_nand_save_exist_lo(pWork->mTitleId); - change_uid(SYSMENU_TITLE_ID); - break; - case MSG_NAND_APP_EXIST: - pWork->mAsyncResult = nand_app_exist(pWork->mTitleId); - break; - case MSG_BOTH_APP_EXIST: - pWork->mAsyncResult = both_app_exist(pWork->mTitleId); - break; - case MSG_SD_SAVE_EXIST: { - char savePath[0x40]; - get_sd_save_path(pWork->mTitleId, savePath); - pWork->mAsyncResult = sd_file_exist(savePath, sizeof(SaveCacheEntry)); + } + case MESSAGE_NOCOPY_EXIST_NAND_SAVE: { + myWork->asyncResult = item_exist_nand_save_folder(myWork->curTitleId, c_nocopy_folder_name); break; } - case MSG_SD_APP_EXIST: { - char savePath[0x40]; - get_sd_app_path(pWork->mTitleId, savePath); - pWork->mAsyncResult = sd_file_exist(savePath, sizeof(SDAppBanner)); + case MESSAGE_NAND_SAVE_EXIST: { + myWork->asyncResult = check_nand_save_banner_exist(myWork->curTitleId); + change_uid(SYSMENU_TITLE_ID); break; } - case MSG_GET_NAND_SAVE_PERMS: - pWork->mAsyncResult = get_nand_save_perms(pWork->mTitleId); + case MESSAGE_NAND_SAVE_EXIST_LO: { + myWork->asyncResult = check_nand_save_exist_lo(myWork->curTitleId); + change_uid(SYSMENU_TITLE_ID); break; - case MSG_GET_SD_SAVE_PERMS: - pWork->mAsyncResult = get_sd_save_perms(pWork->mTitleId); + } + case MESSAGE_NAND_APP_EXIST: { + myWork->asyncResult = nand_app_exist(myWork->curTitleId); break; - case MSG_MOVE_NAND_APP_TO_SD: + } + case MESSAGE_BOTH_APP_EXIST: { + myWork->asyncResult = both_app_exist(myWork->curTitleId); + break; + } + case MESSAGE_SD_SAVE_EXIST: { + char savePath[NAND_MAX_PATH]; + get_sd_save_path(myWork->curTitleId, savePath); + myWork->asyncResult = sd_file_exist(savePath, sizeof(SaveCacheEntry)); + break; + } + case MESSAGE_SD_APP_EXIST: { + char savePath[NAND_MAX_PATH]; + get_sd_app_path(myWork->curTitleId, savePath); + myWork->asyncResult = sd_file_exist(savePath, sizeof(SDAppBanner)); + break; + } + case MESSAGE_GET_NAND_SAVE_PERMS: { + myWork->asyncResult = get_nand_save_perms(myWork->curTitleId); + break; + } + case MESSAGE_GET_SD_SAVE_PERMS: { + myWork->asyncResult = get_sd_save_perms(myWork->curTitleId); + break; + } + case MESSAGE_MOVE_NAND_APP_TO_SD: { do_move_nand_app_to_sd(); break; - case MSG_MOVE_SD_APP_TO_NAND: + } + case MESSAGE_MOVE_SD_APP_TO_NAND: { do_move_sd_app_to_nand(); break; - case MSG_MOVE_NAND_SAVE_TO_SD: + } + case MESSAGE_MOVE_NAND_SAVE_TO_SD: { do_move_nand_save_to_sd(); break; - case MSG_MOVE_SD_SAVE_TO_NAND: + } + case MESSAGE_MOVE_SD_SAVE_TO_NAND: { do_move_sd_save_to_nand(); break; - case MSG_CHANGE_NAND_APP_COUNT: - change_nand_app_count((s32)pWork->pParamA); + } + case MESSAGE_CHANGE_NAND_APP_COUNT: { + change_nand_app_count((s32)myWork->paramA); break; - case MSG_CHECK_SD_TITLE_RESTORABLE: - pWork->mAsyncResult = check_sd_title_restorable(pWork->mTitleId); + } + case MESSAGE_CHECK_SD_TITLE_RESTORABLE: { + myWork->asyncResult = check_sd_title_restorable(myWork->curTitleId); break; + } + default: { + break; + } } - if (*(int*)(pWork->mThread).stackEnd != 0xDEADBABE) { - OSPanic("iplNandSDWorker.cpp", 2259, "NandSDWorker: stack over!\n"); + + if (*(u32*)myWork->thread.stackEnd != 0xDEADBABE) { + OSHalt("NandSDWorker: stack over!\n", 2259); } - if (terminated) + + if (terminated) { break; - set_state(WORKER_STATE_IDLE); + } + + set_state(STATE_IDLE); } - pWork = NULL; + + myWork = NULL; s_sd_state = SD_STATE_INITIAL; + return this; } - extern "C" { - extern void NETGetWirelessMacAddress(u8*); - } - void NandSDWorker::do_startup() { - u32 countTitlesIds = 0; - u32 numNandSaves; - u32 numNandApps; - int nandRet; + u32 numTitleIds = 0; + u32 numNandSaves, numNandApps; + + s32 err; + ESTitleId* titleIds; u8* buf = NULL; - pWork->mAsyncResult = WORKER_RESULT_OK; - ES_ListTitlesOnCard(NULL, &countTitlesIds); - titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(pWork->pHeap19000, countTitlesIds * sizeof(ESTitleId), 0x20); - ES_ListTitlesOnCard(titleIds, &countTitlesIds); - if (clean_duplicated_nand_app(titleIds, countTitlesIds) == WORKER_RESULT_NAND_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; - goto CLEANUP; + + // Get title ID count + myWork->asyncResult = RESULT_OK; + ES_ListTitlesOnCard(NULL, &numTitleIds); + + // Get title ID list + titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(myWork->mainHeap, numTitleIds * sizeof(ESTitleId), 32); + ES_ListTitlesOnCard(titleIds, &numTitleIds); + + // Delete any duplicates possibly found + if (clean_duplicated_nand_app(titleIds, numTitleIds) == RESULT_NAND_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; + goto clean_up; } + // Delete update partition titles numNandSaves = 0; numNandApps = 0; - if (pWork->pAppCacheHeap != NULL) { - int cleanPartialRet = clean_partial_nand_app(titleIds, countTitlesIds, &numNandApps); - if (cleanPartialRet == WORKER_RESULT_NAND_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; - goto CLEANUP; + if (myWork->appCacheHeap != NULL) { + int result = clean_partial_nand_app(titleIds, numTitleIds, &numNandApps); + if (result == RESULT_NAND_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; + goto clean_up; } - if (cleanPartialRet == WORKER_RESULT_UNK_N18) { - pWork->mAsyncResult = WORKER_RESULT_UNK_N18; - goto CLEANUP; + if (result == RESULT_UNK_18) { + myWork->asyncResult = RESULT_UNK_18; + goto clean_up; } - pWork->mNandAppNum = numNandApps; - OSReport("NandSDWorker: nand app num = %d\n", pWork->mNandAppNum); + myWork->nandAppNum = numNandApps; + OSReport("NandSDWorker: nand app num = %d\n", myWork->nandAppNum); } - if (pWork->pSaveCacheHeap != NULL) { - int cleanPartialSaveRet = clean_partial_nand_save(titleIds, countTitlesIds, &numNandSaves); - if (cleanPartialSaveRet == WORKER_RESULT_NAND_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; - goto CLEANUP; + // Delete "partial Save Data" + if (myWork->saveCacheHeap != NULL) { + int result = clean_partial_nand_save(titleIds, numTitleIds, &numNandSaves); + if (result == RESULT_NAND_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; + goto clean_up; } - pWork->mNandSaveNum = numNandSaves; - OSReport("NandSDWorker: nand save num = %d\n", pWork->mNandSaveNum); + myWork->nandSaveNum = numNandSaves; + OSReport("NandSDWorker: nand save num = %d\n", myWork->nandSaveNum); } - if (pWork->pSaveCacheHeap == NULL) - goto CLEANUP; - if (nand_get_length(c_transferid_path) != 0x20) { - nandRet = nand::wrapper::PrivateDelete(c_transferid_path); - if (nandRet != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateDelete %s failed.[%d]\n", c_transferid_path, nandRet); - if (nandRet == NAND_RESULT_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; - goto CLEANUP; + if (myWork->saveCacheHeap == NULL) { + goto clean_up; + } + + if (nand_get_length(c_transferid_path) != (int)OSRoundUp32B(NCD_MAC_ADDRESS_LENGTH)) { // If transfer.id is invalid + // Delete old one + err = nand::wrapper::PrivateDelete(c_transferid_path); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateDelete %s failed.[%d]\n", c_transferid_path, err); + if (err == NAND_RESULT_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; + goto clean_up; } } - u8 nandType; - nandRet = nand::wrapper::PrivateGetType(c_succession_path, &nandType); - if (nandRet != NAND_RESULT_OK || nandType != NAND_TYPE_DIR) { - if (nandRet == NAND_RESULT_OK && nandType != NAND_TYPE_DIR) { - nandRet = nand::wrapper::PrivateDelete(c_succession_path); - if (nandRet != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateDelete %s failed.[%d]\n", c_succession_path, nandRet); - if (nandRet == NAND_RESULT_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; - goto CLEANUP; + u8 type; + err = nand::wrapper::PrivateGetType(c_succession_path, &type); + if (err != NAND_RESULT_OK || type != NAND_TYPE_DIR) { + // Is "succession" a file? + if (err == NAND_RESULT_OK && type != NAND_TYPE_DIR) { + // Delete file. It's supposed to be a directory. + err = nand::wrapper::PrivateDelete(c_succession_path); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateDelete %s failed.[%d]\n", c_succession_path, err); + if (err == NAND_RESULT_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; + goto clean_up; } } } else { - if (check_nand_free_area(1, 0, 0, 0) != WORKER_RESULT_OK) { + if (check_nand_free_area(1, 0, 0, 0) != RESULT_OK) { OSReport("NandSDWorker: cannot make %s because of system area shortage.\n", c_succession_path); - goto CLEANUP; + goto clean_up; } } - nandRet = nand::wrapper::PrivateCreateDir(c_succession_path, NAND_PERM_ALL_RW, 0); - if (nandRet != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateCreateDir %s failed.[%d]\n", c_succession_path, nandRet); - if (nandRet == NAND_RESULT_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; + + // Recreate directory + err = nand::wrapper::PrivateCreateDir(c_succession_path, NAND_PERM_ALL_RW, 0); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateCreateDir %s failed.[%d]\n", c_succession_path, err); + if (err == NAND_RESULT_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; } - goto CLEANUP; + goto clean_up; } } - if (check_nand_free_area(1, 1, 0, 0) != WORKER_RESULT_OK) { + if (check_nand_free_area(1, 1, 0, 0) != RESULT_OK) { OSReport("NandSDWorker: cannot make %s because of system area shortage.\n", c_transferid_path); - goto CLEANUP; + goto clean_up; } - nandRet = nand::wrapper::PrivateCreate(c_transferid_path, NAND_PERM_ALL_RW, 0); - if (nandRet != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateCreate %s failed.[%d]\n", c_transferid_path, nandRet); - if (nandRet == NAND_RESULT_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; + // Recreate transfer.id + err = nand::wrapper::PrivateCreate(c_transferid_path, NAND_PERM_ALL_RW, 0); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateCreate %s failed.[%d]\n", c_transferid_path, err); + if (err == NAND_RESULT_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; } - goto CLEANUP; + goto clean_up; } - NANDFileInfo finfo; - nandRet = nand::wrapper::PrivateOpen(c_transferid_path, &finfo, NAND_ACCESS_WRITE); - if (nandRet != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateOpen %s failed.[%d]\n", c_transferid_path, nandRet); - goto CLEANUP; + // Let's write some stuff to the file... + NANDFileInfo fileInfo; + err = nand::wrapper::PrivateOpen(c_transferid_path, &fileInfo, NAND_ACCESS_WRITE); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateOpen %s failed.[%d]\n", c_transferid_path, err); + goto clean_up; } - buf = (u8*)MEMAllocFromExpHeapEx(pWork->pHeap19000, 0x20, 0x20); - memset(buf, 0, 0x20); + // Let's write the MAC address... + buf = (u8*)MEMAllocFromExpHeapEx(myWork->mainHeap, OSRoundUp32B(NCD_MAC_ADDRESS_LENGTH), 32); + memset(buf, 0, OSRoundUp32B(NCD_MAC_ADDRESS_LENGTH)); NETGetWirelessMacAddress(buf); - nandRet = nand::wrapper::Write(&finfo, buf, 0x20); - if (nandRet != 0x20) { - OSReport("NandSDWorker: NANDWrite %s failed.[%d]\n", c_transferid_path, nandRet); - if (nandRet == NAND_RESULT_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; + + // and that's it. + + // Write the buffer to the file! + err = nand::wrapper::Write(&fileInfo, buf, OSRoundUp32B(NCD_MAC_ADDRESS_LENGTH)); + if (err != (s32)OSRoundUp32B(NCD_MAC_ADDRESS_LENGTH)) { + OSReport("NandSDWorker: NANDWrite %s failed.[%d]\n", c_transferid_path, err); + if (err == NAND_RESULT_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; } - nand::wrapper::Close(&finfo); - goto CLEANUP; + nand::wrapper::Close(&fileInfo); + goto clean_up; } - nandRet = nand::wrapper::Close(&finfo); - if (nandRet != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDClose %s failed.[%d]\n", c_transferid_path, nandRet); - if (nandRet == NAND_RESULT_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; + // We're done with the file now. Close... + err = nand::wrapper::Close(&fileInfo); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDClose %s failed.[%d]\n", c_transferid_path, err); + if (err == NAND_RESULT_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; } - goto CLEANUP; + goto clean_up; } OSReport("NandSDWorker: %s created.[%02x%02x%02x%02x%02x%02x]\n", c_transferid_path, buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]); } else { + // transfer.id is valid. Do nothing. OSReport("NandSDWorker: %s already exist.\n", c_transferid_path); - goto CLEANUP; + goto clean_up; } - CLEANUP: + clean_up: change_uid(SYSMENU_TITLE_ID); if (titleIds != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, titleIds); + MEMFreeToExpHeap(myWork->mainHeap, titleIds); } if (buf != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, buf); + MEMFreeToExpHeap(myWork->mainHeap, buf); } } @@ -966,37 +1186,48 @@ namespace ipl { int result; OSReport("NandSDWorker: cleaning duplicated nand app...\n"); for (int i = 0; i < titleIdCount; i++) { - u64 titleIdA = titleIds[i]; + ESTitleId titleIdA = titleIds[i]; if (is_user_nand_app(titleIdA) && is_all_region(titleIdA) && nand_app_exist_ex(titleIdA) != EXISTENCE_NOEXIST) { for (int j = 0; j < titleIdCount; j++) { ESTitleId titleIdB = titleIds[j]; - if ((titleIdA != titleIdB && is_same_title(titleIdA, titleIdB)) && nand_app_exist_ex(titleIds[j]) != EXISTENCE_NOEXIST) { + if (titleIdA != titleIdB && is_same_title(titleIdA, titleIdB) && nand_app_exist_ex(titleIds[j]) != EXISTENCE_NOEXIST) { + // Goodbye ticket result = delete_ticket(titleIdA); - if (result != WORKER_RESULT_OK) + if (result != RESULT_OK) { OSReport("NandSDWorker: delete ticket 0x%016llx failed.[%d]\n", titleIdA, result); + } + // Goodbye content (.app files) result = delete_nand_app_content(titleIdA); - if (result == WORKER_RESULT_NAND_CORRUPT) - goto RET; - if (result != WORKER_RESULT_OK) + if (result == RESULT_NAND_CORRUPT) { + goto ret; + } + if (result != RESULT_OK) { OSReport("NandSDWorker: delete title 0x%016llx content failed.[%d]\n", titleIdA, result); + } + // Goodbye savedata result = recursion_nand_save(titleIdA, RECURSIVE_DELETE, NULL, 0); - if (result == WORKER_RESULT_NAND_CORRUPT) - goto RET; - if (result != WORKER_RESULT_OK) + if (result == RESULT_NAND_CORRUPT) { + goto ret; + } + if (result != RESULT_OK) { OSReport("NandSDWorker: delete title 0x%016llx content failed.[%d]\n", titleIdA, result); + } OSReport("NandSDWorker: delete title 0x%016llx duplicated by 0x%016llx.\n", titleIdA, titleIds[j]); delete_download_task(titleIdA); titleIds[i] = 0; + + // TMD is not deleted however. + break; } } } } - result = WORKER_RESULT_OK; - RET: + result = RESULT_OK; + ret: return result; } @@ -1004,32 +1235,39 @@ namespace ipl { int result; OSReport("NandSDWorker: cleaning partial nand app...\n"); for (int i = 0; i < titleIdCount; i++) { - if (unk_0x4 != false) - return WORKER_RESULT_UNK_N18; - if (is_user_nand_app(titleIds[i]) && (((u32)ES_TITLE_CODE(titleIds[i]) & 0xffffff00) != 0x00555000)) { - int existResult = nand_app_exist_ex(titleIds[i]); - if (existResult == EXISTENCE_NOEXIST) { + if (unk_0x04 != false) { + return RESULT_UNK_18; + } + + // The titles that we are going to delete are: + // Update partition titles. + if (is_user_nand_app(titleIds[i]) && (((u32)ES_TITLE_CODE(titleIds[i]) & 0xFFFFFF00) != ES_TITLE_CODE(TITLE_UPDATE_PART))) { + int result2 = nand_app_exist_ex(titleIds[i]); + if (result2 == EXISTENCE_NOEXIST) { + // If we can actually delete the title. if (utility::ESMisc::CheckSafeDeleteTitle(System::getMem2Sys(), titleIds[i]) > 0) { - int delResult = utility::ESMisc::DeleteTitle(System::getMem2Sys(), titleIds[i]); - if (delResult != 0) { - OSReport("NandSDWorker: delete title 0x%016llx failed.[%d]\n", titleIds[i], delResult); + ESError err = utility::ESMisc::DeleteTitle(System::getMem2Sys(), titleIds[i]); + if (err != ES_ERR_OK) { + OSReport("NandSDWorker: delete title 0x%016llx failed.[%d]\n", titleIds[i], err); } else { OSReport("NandSDWorker: clean empty title %016llx\n", titleIds[i]); } } - } else if (existResult == EXISTENCE_INCOMPLETE) { + } else if (result2 == EXISTENCE_INCOMPLETE) { result = delete_nand_app_content(titleIds[i]); - if (result == WORKER_RESULT_NAND_CORRUPT) - goto RET; - if (result != WORKER_RESULT_OK) + if (result == RESULT_NAND_CORRUPT) { + goto ret; + } + if (result != RESULT_OK) { OSReport("NandSDWorker: delete title 0x%016llx content failed.[%d]\n", titleIds[i], result); - } else if (existResult == EXISTENCE_COMPLETE) { + } + } else if (result2 == EXISTENCE_COMPLETE) { (*numNandAppsOut)++; } } } - result = WORKER_RESULT_OK; - RET: + result = RESULT_OK; + ret: return result; } @@ -1040,21 +1278,22 @@ namespace ipl { if (is_disk_or_user_nand_app(titleIds[i])) { u32 dirEntryCnt = 0; if (change_uid(titleIds[i])) { - // This is somewhere between 0x41 and 0x50, but 0x41 seems to make the nmost sense because it's 0x40 + NULL byte - char path[0x41]; + char path[NAND_MAX_PATH + 1]; + get_nand_data_only_title_save_path(titleIds[i], path); if (nand::wrapper::ReadDir(path, NULL, &dirEntryCnt) == NAND_RESULT_OK && dirEntryCnt != 0) { if (check_nand_save_banner_exist(titleIds[i])) { (*numNandSavesOut)++; } else { - strncat(path, "/noerase", 0x40); + strncat(path, "/noerase", NAND_MAX_PATH); u8 fileType; if (nand::wrapper::GetType(path, &fileType) == NAND_RESULT_OK && fileType == NAND_TYPE_DIR) { OSReport("NandSDWorker: ignore nand save 0x%016llx becase of noerase\n", titleIds[i]); } else { result = recursion_nand_save(titleIds[i], RECURSIVE_DELETE, NULL, 0); - if (result == WORKER_RESULT_NAND_CORRUPT) - return WORKER_RESULT_NAND_CORRUPT; + if (result == RESULT_NAND_CORRUPT) { + return RESULT_NAND_CORRUPT; + } delete_download_task(titleIds[i]); } } @@ -1065,674 +1304,752 @@ namespace ipl { if (nand_app_exist_ex(titleIds[i]) == EXISTENCE_COMPLETE) { (*numNandSavesOut)++; } else { - s32 delResult = utility::ESMisc::DeleteTitle(System::getMem2Sys(), titleIds[i]); - if (delResult != 0) { - OSReport("NandSDWorker: ESMisc::DeleteTitle failed [%d]\n", delResult); - return WORKER_RESULT_GENERIC_ERR; + ESError err = utility::ESMisc::DeleteTitle(System::getMem2Sys(), titleIds[i]); + if (err != ES_ERR_OK) { + OSReport("NandSDWorker: ESMisc::DeleteTitle failed [%d]\n", err); + return RESULT_FATAL_SD_ERROR; } OSReport("NandSDWorker: clean data title %016llx\n", titleIds[i]); } } } - result = WORKER_RESULT_OK; - RET: + result = RESULT_OK; + ret: return result; } void NandSDWorker::do_mount_sd() { - // FAError FVar1; - int faMountResult; + int result; switch (s_sd_state) { - default: - break; - case SD_STATE_INITIAL: - if (FAAttach(FA_DEVICE_SD, NULL, 0, &pWork->mFatDriveTable) == FA_ERR_SUCCESS) { - OSReport("NandSDWorker: attach SD card drive = %c\n", pWork->mFatDriveTable.drive); - s_sd_state = SD_STATE_ERRORED; - faMountResult = call_fa_mount(); - if (faMountResult == WORKER_RESULT_OK) { + case SD_STATE_INITIAL: { + if (FAAttach(FA_DEVICE_SD, NULL, 0, &myWork->driveTable) == FA_ERR_SUCCESS) { + OSReport("NandSDWorker: attach SD card drive = %c\n", myWork->driveTable.drive); + s_sd_state = SD_STATE_ERROR; + + // Attempt to mount SD Card drive + result = call_fa_mount(); + if (result == RESULT_OK) { + // Alright we mounted. Get SD apps and save data! s_sd_state = SD_STATE_MOUNTED; - if (pWork->pSaveCacheHeap != NULL) { - clear_save_cache(&pWork->mSavesListSD); + if (myWork->saveCacheHeap != NULL) { + clear_save_cache(&myWork->sdSaveList); get_sd_save_list(NULL); } - if (pWork->pAppCacheHeap != NULL) { - clear_app_cache(&pWork->mAppsListSD); + if (myWork->appCacheHeap != NULL) { + clear_app_cache(&myWork->sdAppList); get_sd_app_list(NULL); } - if (s_sd_state == SD_STATE_MOUNTED) + if (s_sd_state == SD_STATE_MOUNTED) { s_sd_state = SD_STATE_READY; - } else if (faMountResult == WORKER_RESULT_BROKEN_MEDIA) { + } + // Error reports + } else if (result == RESULT_BROKEN_MEDIA) { OSReport("NandSDWorker:: Broken Media\n"); - s_sd_state = SD_STATE_BROKEN_MEDIA; - } else if (faMountResult == WORKER_RESULT_ILLEGAL_MEDIA) { + s_sd_state = SD_STATE_BROKEN; + } else if (result == RESULT_ILLEGAL_MEDIA) { OSReport("NandSDWorker:: Illegal Media\n"); - s_sd_state = SD_STATE_ILLEGAL_MEDIA; + s_sd_state = SD_STATE_ILLEGAL; } else { OSReport("NandSDWorker:: not inserted\n"); - s_sd_state = SD_STATE_SLOT_EMPTY; + s_sd_state = SD_STATE_EJECTED; } - pWork->mAsyncResult = faMountResult; + myWork->asyncResult = result; } else { OSReport("NandSDWorker: FAAttach failed.[%d]\n", FAErrnum()); s_sd_state = SD_STATE_INITIAL; - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; } break; - - case SD_STATE_SLOT_EMPTY: - if (pWork->mSdMountErr == -1) - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - else - pWork->mAsyncResult = pWork->mSdMountErr; + } + case SD_STATE_EJECTED: { + if (myWork->prevAsyncResult == RESULT_WORKING) { + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + } else { + myWork->asyncResult = myWork->prevAsyncResult; + } break; + } + case SD_STATE_INSERTED: { + s_sd_state = SD_STATE_ERROR; - case SD_STATE_NOT_MOUNTED: - s_sd_state = SD_STATE_ERRORED; - faMountResult = call_fa_mount(); - if (faMountResult == WORKER_RESULT_OK) { + // Attempt to mount + result = call_fa_mount(); + if (result == RESULT_OK) { + // Alright we mounted. Get SD apps and save data! s_sd_state = SD_STATE_MOUNTED; - if (pWork->pSaveCacheHeap != NULL) { - clear_save_cache(&pWork->mSavesListSD); + if (myWork->saveCacheHeap != NULL) { + clear_save_cache(&myWork->sdSaveList); get_sd_save_list(NULL); } - if (pWork->pAppCacheHeap != NULL) { - clear_app_cache(&pWork->mAppsListSD); + if (myWork->appCacheHeap != NULL) { + clear_app_cache(&myWork->sdAppList); get_sd_app_list(NULL); } - if (s_sd_state == SD_STATE_MOUNTED) + if (s_sd_state == SD_STATE_MOUNTED) { s_sd_state = SD_STATE_READY; - } else if (faMountResult == WORKER_RESULT_BROKEN_MEDIA) { - s_sd_state = SD_STATE_BROKEN_MEDIA; - } else if (faMountResult == WORKER_RESULT_ILLEGAL_MEDIA) { - s_sd_state = SD_STATE_ILLEGAL_MEDIA; + } + // Error reports + } else if (result == RESULT_BROKEN_MEDIA) { + s_sd_state = SD_STATE_BROKEN; + } else if (result == RESULT_ILLEGAL_MEDIA) { + s_sd_state = SD_STATE_ILLEGAL; } else { - s_sd_state = SD_STATE_SLOT_EMPTY; + s_sd_state = SD_STATE_EJECTED; } - pWork->mAsyncResult = faMountResult; + myWork->asyncResult = result; break; - - case SD_STATE_READY: - pWork->mAsyncResult = WORKER_RESULT_OK; + } + case SD_STATE_READY: { + myWork->asyncResult = RESULT_OK; break; + } + default: { + break; + } } } int NandSDWorker::call_fa_mount() { + FAError faErr; + + // Unmount if already mounted if (s_sd_state != SD_STATE_INITIAL) { - OSReport("NandSDWorker: force unmount sd before mounting[%d]\n", FAUnmount(pWork->mFatDriveTable.drive, true)); - OSReport("NandSDWorker: detach sd [%d]\n", FADetach(pWork->mFatDriveTable.drive)); - OSReport("NandSDWorker: attach sd [%d]\n", FAAttach(FA_DEVICE_SD, NULL, 0, &pWork->mFatDriveTable)); + faErr = FAUnmount(myWork->driveTable.drive, TRUE); + OSReport("NandSDWorker: force unmount sd before mounting[%d]\n", faErr); + + faErr = FADetach(myWork->driveTable.drive); + OSReport("NandSDWorker: detach sd [%d]\n", faErr); + + faErr = FAAttach(FA_DEVICE_SD, NULL, 0, &myWork->driveTable); + OSReport("NandSDWorker: attach sd [%d]\n", faErr); } - if (FAMount(pWork->mFatDriveTable.drive) == FA_ERR_SUCCESS) { - OSReport("NandSDWorker: mount SD card drive = %c\n", pWork->mFatDriveTable.drive); - FAError bufferingErr = FABuffering(pWork->mFatDriveTable.drive, 2); - if (bufferingErr == FA_ERR_SUCCESS) { - pWork->mIsSDWriteProtected = FALSE; - return WORKER_RESULT_OK; + // Mount if not mounted. + if (FAMount(myWork->driveTable.drive) == FA_ERR_SUCCESS) { + OSReport("NandSDWorker: mount SD card drive = %c\n", myWork->driveTable.drive); + faErr = FABuffering(myWork->driveTable.drive, 2); + if (faErr == FA_ERR_SUCCESS) { + myWork->sdWriteProtected = FALSE; + return RESULT_OK; } else if (FAErrnum() == FA_ERR_EWRTPROTECT) { OSReport("NandSDWorker: SD card is write protected.\n"); - pWork->mIsSDWriteProtected = TRUE; - return WORKER_RESULT_OK; + myWork->sdWriteProtected = TRUE; + return RESULT_OK; } else { - return handle_sd_error(bufferingErr, NULL); + return handle_sd_error(faErr, NULL); } } else { + // Error handling FAError errnum = FAErrnum(); if (errnum == FA_ERR_ENOEXEC) { - return (pWork->mFatDriveTable.stat & 0x10) != 0 ? WORKER_RESULT_BROKEN_MEDIA : WORKER_RESULT_GENERIC_ERR; + return FA_INSERTED(myWork->driveTable) ? RESULT_BROKEN_MEDIA : RESULT_FATAL_SD_ERROR; } else if (errnum == FA_ERR_EINVAL) { - return WORKER_RESULT_GENERIC_ERR; + return RESULT_FATAL_SD_ERROR; } else if (errnum == FA_ERR_EIO) { - OSReport("NandSDWorker:: stat : %08x\n", pWork->mFatDriveTable.stat); - return s_sd_state == SD_STATE_SLOT_EMPTY ? WORKER_RESULT_GENERIC_ERR : WORKER_RESULT_ILLEGAL_MEDIA; + OSReport("NandSDWorker:: stat : %08x\n", myWork->driveTable.stat); + return s_sd_state == SD_STATE_EJECTED ? RESULT_FATAL_SD_ERROR : RESULT_ILLEGAL_MEDIA; } else { - return WORKER_RESULT_ILLEGAL_MEDIA; + return RESULT_ILLEGAL_MEDIA; } } } void NandSDWorker::do_list_nand_save() { ESTitleId* titleIds; - ESTitleId* titleIdsOut; - u32 numTitles; + ESTitleId* titleIdsOut = (ESTitleId*)myWork->paramA; + u32 numTitles = 0; - titleIdsOut = (ESTitleId*)pWork->pParamA; - - numTitles = 0; + // Get title ID count ES_ListTitlesOnCard(NULL, &numTitles); - titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(pWork->pHeap19000, numTitles * sizeof(ESTitleId), 0x20); + + // Get title ID list + titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(myWork->mainHeap, numTitles * sizeof(ESTitleId), 32); ES_ListTitlesOnCard(titleIds, &numTitles); - for (int iOut = 0, i = 0; i < numTitles; i++) { + for (int dest = 0, i = 0; i < numTitles; i++) { if (is_disk_or_user_nand_app(titleIds[i])) { - char path[0x41]; + char path[NAND_MAX_PATH + 1]; get_nand_data_only_title_save_path(titleIds[i], path); - u32 fsblocks; - u32 inodes; - if (nand::wrapper::SecretGetUsage(path, &fsblocks, &inodes) == NAND_RESULT_OK) { + u32 blocks, inodes; + if (nand::wrapper::SecretGetUsage(path, &blocks, &inodes) == NAND_RESULT_OK) { + // If there is at least one file if (inodes > 1) { - titleIdsOut[iOut++] = titleIds[i]; + // Count it! + titleIdsOut[dest++] = titleIds[i]; } } + // If the title only has a data folder } else if (is_data_only_title(titleIds[i])) { - titleIdsOut[iOut++] = titleIds[i]; + // Count it! + titleIdsOut[dest++] = titleIds[i]; } } + change_uid(SYSMENU_TITLE_ID); - MEMFreeToExpHeap(pWork->pHeap19000, titleIds); - pWork->mAsyncResult = WORKER_RESULT_OK; + + MEMFreeToExpHeap(myWork->mainHeap, titleIds); + + myWork->asyncResult = RESULT_OK; } bool NandSDWorker::check_nand_save_banner_exist(ESTitleId titleId) { u8 fileType = 0; - char path[0x41]; + char path[NAND_MAX_PATH + 1]; - if (!change_uid(titleId)) + if (!change_uid(titleId)) { return false; + } + // Construct path get_nand_data_only_title_save_path(titleId, path); - strncat(path, "/", 0x40); - strncat(path, c_banner_file_name, 0x40); - int getTypeRes = nand::wrapper::GetType(path, &fileType); - if (getTypeRes == NAND_RESULT_OK && fileType == NAND_TYPE_FILE) - return true; + strncat(path, "/", NAND_MAX_PATH); + strncat(path, c_banner_file_name, NAND_MAX_PATH); - if (getTypeRes != NAND_RESULT_NOEXISTS) - OSReport("NandSDWorker: NANDGetType %s failed.[%d/%d]\n", path, getTypeRes, fileType); + // If the banner is a file + s32 result = nand::wrapper::GetType(path, &fileType); + if (result == NAND_RESULT_OK && fileType == NAND_TYPE_FILE) { + return true; + } + + if (result != NAND_RESULT_NOEXISTS) { + OSReport("NandSDWorker: NANDGetType %s failed.[%d/%d]\n", path, result, fileType); + } return false; } - int NandSDWorker::get_nand_save_banner(ESTitleId titleId, WIISaveBannerFile* fileOut, u32* sizeOut) { - int errno; - u32 amtRead; + int NandSDWorker::get_nand_save_banner(ESTitleId titleId, WIISaveBannerFile* bannerFile, u32* sizeOut) { + s32 err; s32 ret; - u32 fileLength; - char path[0x40]; - NANDFileInfo finfo; - ret = WORKER_RESULT_OK; - SaveCacheEntry* cached = find_save_cache(&pWork->mSavesListNand, pWork->mTitleId); - if (cached == NULL || cached->mBanner.magic == 0) { - fileLength = 0; + ret = RESULT_OK; + SaveCacheEntry* cached = find_save_cache(&myWork->nandSaveList, myWork->curTitleId); + if (cached == NULL || cached->banner.signature == 0) { + u32 fileLength = 0; bool fileOpened = false; - memset(fileOut, 0, 0xf0a0); + memset(bannerFile, 0, WII_SAVE_BANNER_FULL_SIZE); + if (is_data_only_title(titleId)) { - ret = get_save_banner_for_data_only_title(titleId, fileOut, sizeOut); + ret = get_save_banner_for_data_only_title(titleId, bannerFile, sizeOut); } else { + char path[NAND_MAX_PATH]; + NANDFileInfo fileInfo; + u32 readSize; + + // Construct save path get_nand_data_only_title_save_path(titleId, path); - strncat(path, "/", 0x40); - strncat(path, c_banner_file_name, 0x40); + strncat(path, "/", NAND_MAX_PATH); + strncat(path, c_banner_file_name, NAND_MAX_PATH); + if (!change_uid(titleId)) { - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - errno = nand::wrapper::Open(path, &finfo, NAND_ACCESS_READ); - if (errno != NAND_RESULT_OK) { - OSReport("NandSDWorker: failed to open %s [%d]\n", path, errno); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + + // Open file + err = nand::wrapper::Open(path, &fileInfo, NAND_ACCESS_READ); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: failed to open %s [%d]\n", path, err); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } fileOpened = true; - errno = nand::wrapper::GetLength(&finfo, &fileLength); - if (errno != NAND_RESULT_OK) { - OSReport("NandSDWorker: failed to get length %s [%d]\n", path, errno); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + + // Grab size of file + err = nand::wrapper::GetLength(&fileInfo, &fileLength); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: failed to get length %s [%d]\n", path, err); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - if (fileLength < offsetof(WIISaveBannerFile, iconData1)) { + // Check file size for normal or animated banner + if (fileLength < WII_SAVE_BANNER_NORMAL_SIZE) { OSReport("NandSDWorker: banner file %s is too small [%d]\n", path, fileLength); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; - } else if (fileLength > sizeof(WIISaveBannerFile)) { + ret = RESULT_BAD_FILE; + goto clean_up; + } else if (fileLength > WII_SAVE_BANNER_FULL_SIZE) { OSReport("NandSDWorker: banner file %s is too large [%d]\n", path, fileLength); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } - if (sizeOut != NULL) + if (sizeOut != NULL) { *sizeOut = fileLength; - - amtRead = nand::wrapper::Read(&finfo, fileOut, fileLength); - if (check_nand_corrupt(amtRead, &ret)) - goto CLEANUP; - - if (amtRead != fileLength) { - OSReport("NandSDWorker: failed to read %s [%d]\n", path, amtRead); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; } - errno = nand::wrapper::Close(&finfo); - if (check_nand_corrupt(errno, &ret)) - goto CLEANUP; - if (errno != NAND_RESULT_OK) { - OSReport("NandSDWorker: failed to close %s [%d]\n", path, errno); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + // Now let's check on the file contents + readSize = nand::wrapper::Read(&fileInfo, bannerFile, fileLength); + if (check_nand_corrupt(readSize, &ret)) { + goto clean_up; + } + + if (readSize != fileLength) { + OSReport("NandSDWorker: failed to read %s [%d]\n", path, readSize); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; + } + + err = nand::wrapper::Close(&fileInfo); + if (check_nand_corrupt(err, &ret)) { + goto clean_up; + } + + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: failed to close %s [%d]\n", path, err); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } fileOpened = false; - if (fileOut->magic != 'WIBN') { + // Verify signature in file + if (bannerFile->signature != WII_SAVE_BANNER_SIGNATURE) { OSReport("NandSDWorker: banner file %s signature is not correct\n", path); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } - ret = WORKER_RESULT_OK; + ret = RESULT_OK; - CLEANUP: + clean_up: if (fileOpened) { - errno = nand::wrapper::Close(&finfo); - if (!check_nand_corrupt(errno, &ret) && errno != NAND_RESULT_OK) { - OSReport("NandSDWorker: failed to close %s [%d]\n", path, errno); - ret = WORKER_RESULT_GENERIC_ERR; + err = nand::wrapper::Close(&fileInfo); + if (!check_nand_corrupt(err, &ret) && err != NAND_RESULT_OK) { + OSReport("NandSDWorker: failed to close %s [%d]\n", path, err); + ret = RESULT_FATAL_SD_ERROR; } } change_uid(SYSMENU_TITLE_ID); } - if (ret == WORKER_RESULT_OK) { + if (ret == RESULT_OK) { if (cached != NULL) { - memcpy(cached, fileOut, sizeof(WIISaveBannerFile)); + memcpy(cached, bannerFile, sizeof(WIISaveBannerFile)); } else { - add_save_cache(&pWork->mSavesListNand, titleId, fileOut, -1); + add_save_cache(&myWork->nandSaveList, titleId, bannerFile, -1); } } } else { - memcpy(fileOut, &cached->mBanner, sizeof(WIISaveBannerFile)); - ret = WORKER_RESULT_OK; + memcpy(bannerFile, &cached->banner, sizeof(WIISaveBannerFile)); + ret = RESULT_OK; } return ret; } void NandSDWorker::do_get_sd_save_banner() { - SaveCacheEntry* cacheEntry = find_save_cache(&pWork->mSavesListSD, pWork->mTitleId); - if (cacheEntry == NULL || cacheEntry->mBanner.magic == 0) { - SDSaveBanner* newBanner = (SDSaveBanner*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, sizeof(SDSaveBanner)); - int result = get_sd_save_banner(pWork->mTitleId, newBanner); - if (result == WORKER_RESULT_OK) { - memcpy(pWork->pParamA, &newBanner->mBanner, sizeof(WIISaveBannerFile)); + SaveCacheEntry* cacheEntry = find_save_cache(&myWork->sdSaveList, myWork->curTitleId); + if (cacheEntry == NULL || cacheEntry->banner.signature == 0) { + SDSaveBanner* sdSaveBanner = (SDSaveBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDSaveBanner)); + int result = get_sd_save_banner(myWork->curTitleId, sdSaveBanner); + if (result == RESULT_OK) { + memcpy(myWork->paramA, &sdSaveBanner->banner, sizeof(WIISaveBannerFile)); + if (cacheEntry != NULL) { - memcpy(cacheEntry, &newBanner->mBanner, sizeof(WIISaveBannerFile)); + memcpy(cacheEntry, &sdSaveBanner->banner, sizeof(WIISaveBannerFile)); } else { - add_save_cache(&pWork->mSavesListSD, pWork->mTitleId, &newBanner->mBanner, -1); + add_save_cache(&myWork->sdSaveList, myWork->curTitleId, &sdSaveBanner->banner, -1); } - pWork->mAsyncResult = WORKER_RESULT_OK; + + myWork->asyncResult = RESULT_OK; } else { - pWork->mAsyncResult = result; + myWork->asyncResult = result; } - MEMFreeToAllocator(&pWork->mBothHeapAllocator, newBanner); + MEMFreeToAllocator(&myWork->unkAllocator, sdSaveBanner); } else { - memcpy(pWork->pParamA, &cacheEntry->mBanner, sizeof(WIISaveBannerFile)); - pWork->mAsyncResult = WORKER_RESULT_OK; + memcpy(myWork->paramA, &cacheEntry->banner, sizeof(WIISaveBannerFile)); + myWork->asyncResult = RESULT_OK; } } + void NandSDWorker::do_get_sd_app_thumbnail() { - AppCacheEntry* cacheEntry = find_app_cache(&pWork->mAppsListSD, pWork->mTitleId); - if (cacheEntry == NULL || cacheEntry->mThumbnailSize == -1) { - SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, sizeof(SDAppBanner)); - int getBannerRes = get_sd_app_banner(pWork->mTitleId, sdAppBanner); - if (getBannerRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = getBannerRes; + AppCacheEntry* cacheEntry = find_app_cache(&myWork->sdAppList, myWork->curTitleId); + if (cacheEntry == NULL || cacheEntry->thumbSize == -1) { + SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppBanner)); + int result = get_sd_app_banner(myWork->curTitleId, sdAppBanner); + if (result != RESULT_OK) { + myWork->asyncResult = result; } else { - int thumbnailSize = get_sd_app_thumbnail(sdAppBanner, (u8*)pWork->pParamA); + int thumbnailSize = get_sd_app_thumbnail(sdAppBanner, (u8*)myWork->paramA); if (thumbnailSize < 0) { - pWork->mAsyncResult = thumbnailSize; + myWork->asyncResult = thumbnailSize; } else { - if (pWork->pParamB != NULL) { - memcpy(pWork->pParamB, &sdAppBanner->mMetaHdr, sizeof(channel::SChanMgrMetaHeader)); + if (myWork->paramB != NULL) { + memcpy(myWork->paramB, &sdAppBanner->metaHdr, sizeof(channel::SChanMgrMetaHeader)); } + if (cacheEntry != NULL) { - memcpy(cacheEntry->mThumbnail, pWork->pParamA, thumbnailSize); - cacheEntry->mThumbnailSize = thumbnailSize; + memcpy(cacheEntry->thumbnail, myWork->paramA, thumbnailSize); + cacheEntry->thumbSize = thumbnailSize; } else { - add_app_cache(&pWork->mAppsListSD, pWork->mTitleId, (u8*)pWork->pParamA, thumbnailSize, &sdAppBanner->mMetaHdr, -1); + add_app_cache(&myWork->sdAppList, myWork->curTitleId, (u8*)myWork->paramA, thumbnailSize, &sdAppBanner->metaHdr, -1); } - pWork->mAsyncResult = thumbnailSize; + + myWork->asyncResult = thumbnailSize; } } if (sdAppBanner != NULL) { - MEMFreeToAllocator(&pWork->mBothHeapAllocator, sdAppBanner); + MEMFreeToAllocator(&myWork->unkAllocator, sdAppBanner); } } else { - memcpy(pWork->pParamA, cacheEntry->mThumbnail, cacheEntry->mThumbnailSize); - if (pWork->pParamB != NULL) { - memcpy(pWork->pParamB, &cacheEntry->mMetaHdr, sizeof(channel::SChanMgrMetaHeader)); + memcpy(myWork->paramA, cacheEntry->thumbnail, cacheEntry->thumbSize); + if (myWork->paramB != NULL) { + memcpy(myWork->paramB, &cacheEntry->metaHdr, sizeof(channel::SChanMgrMetaHeader)); } - pWork->mAsyncResult = cacheEntry->mThumbnailSize; + myWork->asyncResult = cacheEntry->thumbSize; } } - void NandSDWorker::do_unk_8134B728() { - // TODO: Figure this out more - typedef struct { - ESTitleId titleId; - channel::SChanMgrMetaHeader metaHdr; - } WorkBStruct; - - AppCacheEntry* cacheEntry = find_app_cache(&pWork->mAppsListSD, pWork->mTitleId); - if (cacheEntry == NULL || cacheEntry->mThumbnailSize == -1) { - SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, sizeof(SDAppBanner)); - int getBannerRes = get_sd_app_banner(pWork->mTitleId, sdAppBanner); - if (getBannerRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = getBannerRes; + void NandSDWorker::do_get_sd_app_meta() { + AppCacheEntry* cacheEntry = find_app_cache(&myWork->sdAppList, myWork->curTitleId); + if (cacheEntry == NULL || cacheEntry->thumbSize == -1) { + SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppBanner)); + int result = get_sd_app_banner(myWork->curTitleId, sdAppBanner); + if (result != RESULT_OK) { + myWork->asyncResult = result; } else { - int thumbnailSize = get_sd_app_thumbnail(sdAppBanner, (u8*)pWork->pParamA); + int thumbnailSize = get_sd_app_thumbnail(sdAppBanner, (u8*)myWork->paramA); if (thumbnailSize < 0) { - pWork->mAsyncResult = thumbnailSize; + myWork->asyncResult = thumbnailSize; } else { - if (pWork->pParamB != NULL) { - WorkBStruct* paramB = (WorkBStruct*)pWork->pParamB; - paramB->titleId = sdAppBanner->mTitleId; - memcpy(¶mB->metaHdr, &sdAppBanner->mMetaHdr, sizeof(channel::SChanMgrMetaHeader)); + if (myWork->paramB != NULL) { + SDAppMetaEntry* paramB = (SDAppMetaEntry*)myWork->paramB; + paramB->titleId = sdAppBanner->titleId; + memcpy(¶mB->metaHdr, &sdAppBanner->metaHdr, sizeof(channel::SChanMgrMetaHeader)); } if (cacheEntry != NULL) { - memcpy(cacheEntry->mThumbnail, pWork->pParamA, thumbnailSize); - cacheEntry->mThumbnailSize = thumbnailSize; + memcpy(cacheEntry->thumbnail, myWork->paramA, thumbnailSize); + cacheEntry->thumbSize = thumbnailSize; } else { - add_app_cache(&pWork->mAppsListSD, sdAppBanner->mTitleId, (u8*)pWork->pParamA, thumbnailSize, &sdAppBanner->mMetaHdr, -1); + add_app_cache(&myWork->sdAppList, sdAppBanner->titleId, (u8*)myWork->paramA, thumbnailSize, &sdAppBanner->metaHdr, -1); } - pWork->mAsyncResult = thumbnailSize; + myWork->asyncResult = thumbnailSize; } } if (sdAppBanner != NULL) { - MEMFreeToAllocator(&pWork->mBothHeapAllocator, sdAppBanner); + MEMFreeToAllocator(&myWork->unkAllocator, sdAppBanner); } } else { - memcpy(pWork->pParamA, cacheEntry->mThumbnail, cacheEntry->mThumbnailSize); - if (pWork->pParamB != NULL) { - WorkBStruct* paramB = (WorkBStruct*)pWork->pParamB; + memcpy(myWork->paramA, cacheEntry->thumbnail, cacheEntry->thumbSize); + if (myWork->paramB != NULL) { + SDAppMetaEntry* paramB = (SDAppMetaEntry*)myWork->paramB; paramB->titleId = cacheEntry->titleId; - memcpy(¶mB->metaHdr, &cacheEntry->mMetaHdr, sizeof(channel::SChanMgrMetaHeader)); + memcpy(¶mB->metaHdr, &cacheEntry->metaHdr, sizeof(channel::SChanMgrMetaHeader)); } - pWork->mAsyncResult = cacheEntry->mThumbnailSize; + myWork->asyncResult = cacheEntry->thumbSize; } } - void NandSDWorker::do_update_loc_dat() { + void NandSDWorker::do_update_sd_app_location() { FAFileStat stat; - u8 md5Digest[0x10]; - NETMD5Context md5Ctx; + NETMD5Sum MD5Sum; - const char* paths[2] = {"/private/wii/loc.dat", "/private/wii/loc.bak"}; - LocDat* unencFile = (LocDat*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, sizeof(LocDat)); - LocDat* encFile = (LocDat*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, sizeof(LocDat)); - unencFile->mMagic[0] = 's'; - unencFile->mMagic[1] = 'd'; - unencFile->mMagic[2] = 'a'; - unencFile->mMagic[3] = 'l'; + const char* c_sd_app_location_paths[2] = {"/private/wii/loc.dat", "/private/wii/loc.bak"}; + SDAppLocation* sdAppLoc = (SDAppLocation*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppLocation)); + SDAppLocation* sdAppLocEncrypt = (SDAppLocation*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppLocation)); + // "sdal" (SD App Location?) + sdAppLoc->signature[0] = 's'; + sdAppLoc->signature[1] = 'd'; + sdAppLoc->signature[2] = 'a'; + sdAppLoc->signature[3] = 'l'; - memcpy(unencFile->mMd5Digest, c_md5_secret_key, sizeof(unencFile->mMd5Digest)); - memcpy(unencFile->mTitleIds, pWork->pParamA, sizeof(unencFile->mTitleIds)); - memset(unencFile->mPadding, 0, sizeof(unencFile->mPadding)); - NETMD5Init(&md5Ctx); - NETMD5Update(&md5Ctx, unencFile, sizeof(LocDat)); - NETMD5GetDigest(&md5Ctx, md5Digest); - memcpy(unencFile->mMd5Digest, md5Digest, sizeof(unencFile->mMd5Digest)); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + // Copy blank MD5 (for now) + memcpy(sdAppLoc->MD5Sum, c_md5_secret_key, sizeof(sdAppLoc->MD5Sum)); + // Copy Title ID order + memcpy(sdAppLoc->titleIds, myWork->paramA, sizeof(sdAppLoc->titleIds)); + // Copy padding + memset(sdAppLoc->padding, 0, sizeof(sdAppLoc->padding)); - if (encrypt(unencFile, sizeof(LocDat), encFile) != WORKER_RESULT_OK) { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + // Nowe we calculate MD5 + NETCalcMD5(MD5Sum, sdAppLoc, sizeof(SDAppLocation)); + memcpy(sdAppLoc->MD5Sum, MD5Sum, NET_MD5_DIGEST_SIZE); + + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + + // And then encrypt the file. + if (encrypt(sdAppLoc, sizeof(SDAppLocation), sdAppLocEncrypt) != RESULT_OK) { + myWork->asyncResult = RESULT_FATAL_SD_ERROR; } else { bool fileExists; const char* fileName; - for (int i = 0; i < 2; i++) { - fileName = paths[i]; + for (int i = 0; i < (int)ARRAY_LENGTH(c_sd_app_location_paths); i++) { + fileName = c_sd_app_location_paths[i]; + // Check if it's a file if (FAFstat(fileName, &stat) == FA_ERR_SUCCESS) { if (is_fa_file(stat.stat)) { fileExists = true; } else { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; break; } } else { - FAError statErr = FAErrnum(); - if (statErr == FA_ERR_ENOENT || statErr == FA_ERR_EINVAL) { + // Error handling + FAError err = FAErrnum(); + if (err == FA_ERR_ENOENT || err == FA_ERR_EINVAL) { fileExists = false; } else { - handle_sd_error_for_entry(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error_for_entry(FA_ERR_SYSTEM, &myWork->asyncResult); break; } } FAFILE* fileStream; if (!fileExists) { + // Find some free space in SD s64 freeArea = get_sd_free_area(); if (freeArea < 0) { - pWork->mAsyncResult = freeArea; + myWork->asyncResult = freeArea; break; } - if (freeArea < (s32)sizeof(LocDat)) { - pWork->mAsyncResult = WORKER_RESULT_NO_SPACE; + if (freeArea < (s32)sizeof(SDAppLocation)) { + myWork->asyncResult = RESULT_OUT_OF_SPACE; break; } + // Some free space available? Create the file! fileStream = FACreate(fileName, 0); if (fileStream == NULL) { - handle_sd_error_for_entry(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error_for_entry(FA_ERR_SYSTEM, &myWork->asyncResult); break; } } else { + // If the file already exists, open existing file fileStream = FAFopen(fileName, "r+"); if (fileStream == NULL) { - handle_sd_error_for_entry(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error_for_entry(FA_ERR_SYSTEM, &myWork->asyncResult); break; } } - if (FAFwrite(encFile, sizeof(LocDat), 1, fileStream) != 1) { + + // Write new contents + if (FAFwrite(sdAppLocEncrypt, sizeof(SDAppLocation), 1, fileStream) != 1) { FAFclose(fileStream); - handle_sd_error_for_entry(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error_for_entry(FA_ERR_SYSTEM, &myWork->asyncResult); break; } + if (FAFclose(fileStream) == FA_ERR_SYSTEM) { - handle_sd_error_for_entry(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error_for_entry(FA_ERR_SYSTEM, &myWork->asyncResult); break; } } } - MEMFreeToAllocator(&pWork->mBothHeapAllocator, unencFile); - MEMFreeToAllocator(&pWork->mBothHeapAllocator, encFile); + + MEMFreeToAllocator(&myWork->unkAllocator, sdAppLoc); + MEMFreeToAllocator(&myWork->unkAllocator, sdAppLocEncrypt); } - void NandSDWorker::do_read_loc_dat() { + void NandSDWorker::do_read_sd_app_location() { FAFileStat stat; - u8 md5Digest[0x10]; + NETMD5Sum MD5Sum; NETMD5Context md5Ctx; - const char* paths[2] = {"/private/wii/loc.dat", "/private/wii/loc.bak"}; - LocDat* encFile = (LocDat*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, sizeof(LocDat)); - LocDat* unencFile = (LocDat*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, sizeof(LocDat)); + const char* c_sd_app_location_paths[2] = {"/private/wii/loc.dat", "/private/wii/loc.bak"}; + SDAppLocation* sdAppLocEncrypt = (SDAppLocation*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppLocation)); + SDAppLocation* sdAppLoc = (SDAppLocation*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppLocation)); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; get_sd_free_area(); // why? bool hadSuccess = false; bool errored = false; - for (int i = 0; i < 2; i++) { - const char* fileName = paths[i]; - if (sd_file_exist(fileName, sizeof(LocDat) - 1) > 0) { + for (int i = 0; i < (int)ARRAY_LENGTH(c_sd_app_location_paths); i++) { + const char* fileName = c_sd_app_location_paths[i]; + if (sd_file_exist(fileName, sizeof(SDAppLocation) - 1) > 0) { FAFILE* fileStream = FAFopen(fileName, "r"); if (fileStream != NULL) { - if (FAFread(encFile, sizeof(LocDat), 1, fileStream) == 1) { + // Read contents of file + if (FAFread(sdAppLocEncrypt, sizeof(SDAppLocation), 1, fileStream) == 1) { if (FAFclose(fileStream) != FA_ERR_SYSTEM) { - if (decrypt(encFile, sizeof(LocDat), unencFile) == WORKER_RESULT_OK) { - memcpy(md5Digest, unencFile->mMd5Digest, 0x10); - memcpy(unencFile->mMd5Digest, c_md5_secret_key, 0x10); - if (check_md5(md5Digest, (u8*)unencFile, sizeof(LocDat))) { - pWork->mAsyncResult = WORKER_RESULT_OK; + // Decrypt the file + if (decrypt(sdAppLocEncrypt, sizeof(SDAppLocation), sdAppLoc) == RESULT_OK) { + memcpy(MD5Sum, sdAppLoc->MD5Sum, NET_MD5_DIGEST_SIZE); + memcpy(sdAppLoc->MD5Sum, c_md5_secret_key, NET_MD5_DIGEST_SIZE); + + if (check_md5(MD5Sum, (u8*)sdAppLoc, sizeof(SDAppLocation))) { + myWork->asyncResult = RESULT_OK; if (!hadSuccess) { hadSuccess = true; - memcpy(pWork->pParamA, unencFile->mTitleIds, sizeof(unencFile->mTitleIds)); + memcpy(myWork->paramA, sdAppLoc->titleIds, sizeof(sdAppLoc->titleIds)); } } else { - pWork->mAsyncResult = WORKER_RESULT_BAD_FILE; + myWork->asyncResult = RESULT_BAD_FILE; } } } else { - handle_sd_error_for_entry(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error_for_entry(FA_ERR_SYSTEM, &myWork->asyncResult); } } else { - handle_sd_error_for_entry(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error_for_entry(FA_ERR_SYSTEM, &myWork->asyncResult); } } else { - handle_sd_error_for_entry(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error_for_entry(FA_ERR_SYSTEM, &myWork->asyncResult); } } else { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; } - if (pWork->mAsyncResult != WORKER_RESULT_OK) + if (myWork->asyncResult != RESULT_OK) { errored = true; + } } if (hadSuccess && errored) { - pWork->mAsyncResult = -17; + myWork->asyncResult = RESULT_SD_APP_LOC_NOT_FOUND; } - MEMFreeToAllocator(&pWork->mBothHeapAllocator, encFile); - MEMFreeToAllocator(&pWork->mBothHeapAllocator, unencFile); + MEMFreeToAllocator(&myWork->unkAllocator, sdAppLocEncrypt); + MEMFreeToAllocator(&myWork->unkAllocator, sdAppLoc); } - void NandSDWorker::do_unk_8134BED0() { + void NandSDWorker::do_check_for_sd_app_to_nand() { // TODO: Clean up paramA and paramB types - SDAppBanner* appBnr = (SDAppBanner*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, sizeof(SDAppBanner)); + SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppBanner)); u16 nandTitleVersion, sdTitleVersion; u32 numTicketViews; ESTitleId wadTitleId; - char appPath[0x40]; + char appPath[NAND_MAX_PATH]; nandTitleVersion = 0; - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; numTicketViews = 0; - int errno = ES_GetTicketViews(pWork->mTitleId, NULL, &numTicketViews); - if (errno != ES_ERR_OK) { - OSReport("NandSDWorker: ES_GetTicketViews failed [%d]\n", errno); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + + // Get ticket count + s32 err = ES_GetTicketViews(myWork->curTitleId, NULL, &numTicketViews); + if (err != ES_ERR_OK) { + OSReport("NandSDWorker: ES_GetTicketViews failed [%d]\n", err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } + if (numTicketViews == 0) { - pWork->mAsyncResult = WORKER_RESULT_ES_ERROR; - goto CLEANUP; + myWork->asyncResult = RESULT_ES_ERROR; + goto clean_up; } - int getSdAppBannerRes; - getSdAppBannerRes = get_sd_app_banner(pWork->mTitleId, appBnr); - if (getSdAppBannerRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = getSdAppBannerRes; - goto CLEANUP; + int result; + result = get_sd_app_banner(myWork->curTitleId, sdAppBanner); + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } - get_sd_app_path(pWork->mTitleId, appPath); - errno = - WADGetTitleVersionEx(appPath, &wadTitleId, &sdTitleVersion, WAD_LOC_SD_CARD, ROUNDUP(appBnr->mThumbnailSize, 0x40) + sizeof(SDAppBanner)); - if (errno != 0) { - OSReport("NandSDWorker: WADGetTitleVersionEx failed.[%d]\n", errno); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + // Get title info of SD App + get_sd_app_path(myWork->curTitleId, appPath); + err = WADGetTitleVersionEx(appPath, &wadTitleId, &sdTitleVersion, WAD_LOCATION_SD_CARD, + ROUNDUP(sdAppBanner->thumbSize, 64) + sizeof(SDAppBanner)); + if (err != 0) { + OSReport("NandSDWorker: WADGetTitleVersionEx failed.[%d]\n", err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - if (wadTitleId != appBnr->mTitleId) { - OSReport("NandSDWorker: titleid %016llx in wad is different from %016llx in banner %s.\n", wadTitleId, appBnr->mTitleId, appPath); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + if (wadTitleId != sdAppBanner->titleId) { + OSReport("NandSDWorker: titleid %016llx in wad is different from %016llx in banner %s.\n", wadTitleId, sdAppBanner->titleId, appPath); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - WADBlocks wadblocks; - errno = WADImportGetBlocks(appPath, &pWork->mBothHeapAllocator, WAD_LOC_SD_CARD, ROUNDUP(appBnr->mThumbnailSize, 0x40) + sizeof(SDAppBanner), - 1, &wadblocks, NULL); - if (errno == -3008) { - OSReport("NandSDWorker: WADImportGetBlocks failed, not original Wii.[%d]\n", errno); - pWork->mAsyncResult = WORKER_RESULT_NOT_TRANSFERRABLE; - goto CLEANUP; - } else if (errno != 0) { - OSReport("NandSDWorker: WADImportGetBlocks failed.[%d]\n", errno); - pWork->mAsyncResult = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + // Get WAD blocks + WADBlocks wadBlocks; + err = WADImportGetBlocks(appPath, &myWork->unkAllocator, WAD_LOCATION_SD_CARD, ROUNDUP(sdAppBanner->thumbSize, 64) + sizeof(SDAppBanner), 1, + &wadBlocks, NULL); + if (err == WAD_ERROR_INCORRECT_DEVICE) { + OSReport("NandSDWorker: WADImportGetBlocks failed, not original Wii.[%d]\n", err); + myWork->asyncResult = RESULT_NOT_TRANSFERRABLE; + goto clean_up; + } else if (err != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADImportGetBlocks failed.[%d]\n", err); + myWork->asyncResult = RESULT_BAD_FILE; + goto clean_up; } - *(u32*)pWork->pParamA = (wadblocks.privateBlocks + wadblocks.unkBlocks) * FS_BLK_SIZE; - *(u32*)((int)pWork->pParamA + 4) = wadblocks.privateInodes + wadblocks.unkInodes; - if (pWork->pParamB != NULL) { - u32 sysInodes, sysFsblocks; - s32 usrInodes, usrFsblocks; - errno = get_nand_free_area(&sysInodes, &sysFsblocks, &usrInodes, &usrFsblocks); - if (errno != WORKER_RESULT_OK) { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + // Calculate required blocks + ((AppBlocksInfo*)myWork->paramA)->bytes = NAND_BLOCKS_TO_BYTES(wadBlocks.privateBlocks + wadBlocks.unkBlocks); + ((AppBlocksInfo*)myWork->paramA)->blocks = wadBlocks.privateInodes + wadBlocks.unkInodes; + + // Calculate free blocks + if (myWork->paramB != NULL) { + u32 sysNodes, sysBlocks; + s32 userNodes, userBlocks; + err = get_nand_free_area(&sysNodes, &sysBlocks, &userNodes, &userBlocks); + if (err != RESULT_OK) { + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - *(int*)pWork->pParamB = usrFsblocks * FS_BLK_SIZE; - *(s32*)((int)pWork->pParamB + 4) = usrInodes; + ((AppBlocksInfo*)myWork->paramB)->bytes = NAND_BLOCKS_TO_BYTES(userBlocks); + ((AppBlocksInfo*)myWork->paramB)->blocks = userNodes; } - if (getSdAppBannerRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = getSdAppBannerRes; - goto CLEANUP; + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } - if (nand_app_exist_ex(appBnr->mTitleId) == EXISTENCE_COMPLETE) { - OSReport("NandSDWorker: titleid = 0x%016llx is already in nand.\n", appBnr->mTitleId); - pWork->mAsyncResult = WORKER_RESULT_ALREADY_EXISTS; - goto CLEANUP; + // If the file already exists + if (nand_app_exist_ex(sdAppBanner->titleId) == EXISTENCE_COMPLETE) { + OSReport("NandSDWorker: titleid = 0x%016llx is already in nand.\n", sdAppBanner->titleId); + myWork->asyncResult = RESULT_ALREADY_EXISTS; + goto clean_up; } - errno = get_nand_title_version(appBnr->mTitleId, &nandTitleVersion); - if (errno != WORKER_RESULT_OK) { - pWork->mAsyncResult = errno; - goto CLEANUP; + err = get_nand_title_version(sdAppBanner->titleId, &nandTitleVersion); + if (err != RESULT_OK) { + myWork->asyncResult = err; + goto clean_up; } + // Compare version int nandTitleMajor, sdTitleMajor; nandTitleMajor = (u16)(nandTitleVersion >> 8); sdTitleMajor = (u16)(sdTitleVersion >> 8); if (nandTitleMajor > sdTitleMajor) { - OSReport("NandSDWorker: titleid %016llx has higher version than that of sd (%d vs %d)\n", appBnr->mTitleId, nandTitleVersion, + OSReport("NandSDWorker: titleid %016llx has higher version than that of sd (%d vs %d)\n", sdAppBanner->titleId, nandTitleVersion, sdTitleVersion); - pWork->mAsyncResult = WORKER_RESULT_VERSION_ERR; + myWork->asyncResult = RESULT_VERSION_ERR; } else { - pWork->mAsyncResult = WORKER_RESULT_OK; + myWork->asyncResult = RESULT_OK; } - CLEANUP: - MEMFreeToAllocator(&pWork->mBothHeapAllocator, appBnr); + clean_up: + MEMFreeToAllocator(&myWork->unkAllocator, sdAppBanner); } void NandSDWorker::check_backup_fits() { - u32 newTitleCount = ((TitleIdList*)pWork->pParamA)->mCount; - ESTitleId* newTitleIds = ((TitleIdList*)pWork->pParamA)->pTitleIds; + u32 newTitleCount = ((TitleIdList*)myWork->paramA)->count; + ESTitleId* newTitleIds = ((TitleIdList*)myWork->paramA)->titleIds; - u32 replacingTitleCount = ((TitleIdList*)pWork->pParamB)->mCount; - ESTitleId* replacingTitleIds = ((TitleIdList*)pWork->pParamB)->pTitleIds; + u32 replacingTitleCount = ((TitleIdList*)myWork->paramB)->count; + ESTitleId* replacingTitleIds = ((TitleIdList*)myWork->paramB)->titleIds; - ContentBin* contentBin = (ContentBin*)MEMAllocFromExpHeapEx(pWork->pHeap19000, sizeof(ContentBin), 0x20); + SDAppBackupData* backupData = (SDAppBackupData*)MEMAllocFromExpHeapEx(myWork->mainHeap, sizeof(SDAppBackupData), 32); s64 sdFreeArea = get_sd_free_area(); if (sdFreeArea < 0) { - pWork->mAsyncResult = sdFreeArea; - goto CLEANUP; + myWork->asyncResult = sdFreeArea; + goto clean_up; } u64 totalBackupSize; totalBackupSize = 0; for (int i = 0; i < newTitleCount; i++) { if (s_sd_state != SD_STATE_READY) { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - int getAppBannerRes = get_app_banner_from_meta(newTitleIds[i], &contentBin->hdr); - if (getAppBannerRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = getAppBannerRes; - goto CLEANUP; + + // Get app banner + int result = get_app_banner_from_meta(newTitleIds[i], backupData); + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } u32 backupSize = 0; - u32 wadOffset = sizeof(SDAppBanner) + ROUNDUP(contentBin->hdr.mThumbnailSize, 0x40); - int backupRes = WADBackupEx(newTitleIds[i], 1, &pWork->mBothHeapAllocator, NULL, &backupSize, WAD_LOC_SD_CARD, wadOffset, NULL); - if (backupRes != 0) { - OSReport("NandSDWorker: WADBackup failed.[%d]\n", backupRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + u32 wadOffset = sizeof(SDAppBanner) + ROUNDUP(backupData->head.thumbSize, 64); + + s32 err = WADBackupEx(newTitleIds[i], 1, &myWork->unkAllocator, NULL, &backupSize, WAD_LOCATION_SD_CARD, wadOffset, NULL); + if (err != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADBackup failed.[%d]\n", err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } totalBackupSize += wadOffset; totalBackupSize += backupSize; @@ -1740,21 +2057,24 @@ namespace ipl { for (int i = 0; i < replacingTitleCount; i++) { if (s_sd_state != SD_STATE_READY) { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - int getAppBannerRes = get_app_banner_from_meta(replacingTitleIds[i], &contentBin->hdr); - if (getAppBannerRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = getAppBannerRes; - goto CLEANUP; + + int result = get_app_banner_from_meta(replacingTitleIds[i], backupData); + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } + u32 backupSize = 0; - u32 wadOffset = sizeof(SDAppBanner) + ROUNDUP(contentBin->hdr.mThumbnailSize, 0x40); - int backupRes = WADBackupEx(replacingTitleIds[i], 1, &pWork->mBothHeapAllocator, NULL, &backupSize, WAD_LOC_SD_CARD, wadOffset, NULL); - if (backupRes != 0) { - OSReport("NandSDWorker: WADBackup failed.[%d]\n", backupRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + u32 wadOffset = sizeof(SDAppBanner) + ROUNDUP(backupData->head.thumbSize, 64); + + s32 err = WADBackupEx(replacingTitleIds[i], 1, &myWork->unkAllocator, NULL, &backupSize, WAD_LOCATION_SD_CARD, wadOffset, NULL); + if (err != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADBackup failed.[%d]\n", err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } totalBackupSize += wadOffset; @@ -1765,24 +2085,24 @@ namespace ipl { totalDeletableSize = 0; for (int i = 0; i < replacingTitleCount; i++) { if (s_sd_state != SD_STATE_READY) { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - char sdAppPath[0x40]; + char sdAppPath[NAND_MAX_PATH]; get_sd_app_path(replacingTitleIds[i], sdAppPath); - FAFileStat fStat; - if (FAFstat(sdAppPath, &fStat) == FA_ERR_SUCCESS) { - if (is_fa_file(fStat.stat)) { - totalDeletableSize += fStat.size; + FAFileStat fileStat; + if (FAFstat(sdAppPath, &fileStat) == FA_ERR_SUCCESS) { + if (is_fa_file(fileStat.stat)) { + totalDeletableSize += fileStat.size; } else { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } } else { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } } @@ -1790,338 +2110,376 @@ namespace ipl { netSize = totalBackupSize - totalDeletableSize; if (netSize + 0x19000 > sdFreeArea) { OSReport("NandSDWorker: total backup size [%d] is too large for SD card. \n", netSize + 0x19000); - pWork->mAsyncResult = netSize + 0x19000; - goto CLEANUP; + myWork->asyncResult = netSize + 0x19000; + goto clean_up; } - pWork->mAsyncResult = WORKER_RESULT_OK; + myWork->asyncResult = RESULT_OK; - CLEANUP: - MEMFreeToExpHeap(pWork->pHeap19000, contentBin); + clean_up: + MEMFreeToExpHeap(myWork->mainHeap, backupData); } - void NandSDWorker::do_list_nand_apps_usages() { + + void NandSDWorker::do_list_nand_apps_usage() { ESTitleId* titleIds; - TitleUsage* output = (TitleUsage*)pWork->pParamA; + TitleUsage* output = (TitleUsage*)myWork->paramA; u32 titleIdCount = 0; - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + + // Get title ID count ES_ListTitlesOnCard(NULL, &titleIdCount); - titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(pWork->pHeap19000, titleIdCount * sizeof(ESTitleId), 0x20); + + // Get title ID list + titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(myWork->mainHeap, titleIdCount * sizeof(ESTitleId), 32); ES_ListTitlesOnCard(titleIds, &titleIdCount); - u32 outI, capacity; - capacity = (u32)pWork->pParamB; - outI = 0; + u32 dest, capacity; + capacity = (u32)myWork->paramB; + dest = 0; for (int i = 0; i < titleIdCount; i++) { - if (outI >= capacity) + if (dest >= capacity) { break; + } - if (!is_user_nand_app(titleIds[i])) + if (!is_user_nand_app(titleIds[i])) { continue; + } - if (!nand_app_exist(titleIds[i])) + if (!nand_app_exist(titleIds[i])) { continue; + } - u32 usedFsblocks = 0, usedInodes = 0; - char path[0x40]; + u32 usedBlocks = 0, usedInodes = 0; + + // Get path to NAND title + char path[NAND_MAX_PATH]; get_nand_app_path(titleIds[i], path); - int getUsageRes = nand::wrapper::SecretGetUsage(path, &usedFsblocks, &usedInodes); - if (getUsageRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDSecretGetUsage[%s] failed %d\n", path, getUsageRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + // Get usage of NAND app path + s32 err = nand::wrapper::SecretGetUsage(path, &usedBlocks, &usedInodes); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDSecretGetUsage[%s] failed %d\n", path, err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - output[outI].mTitleId = titleIds[i]; - output[outI].mSize = usedFsblocks * FS_BLK_SIZE; - output[outI].mInode = usedInodes; - OSReport("NandSDWorker: nand app 0x%016llx size is [%d] inode is [%d]\n", output[outI].mTitleId, output[outI].mSize, output[outI].mInode); - outI++; + + // Save the information. + output[dest].curTitleId = titleIds[i]; + output[dest].size = NAND_BLOCKS_TO_BYTES(usedBlocks); + output[dest].inode = usedInodes; + + OSReport("NandSDWorker: nand app 0x%016llx size is [%d] inode is [%d]\n", output[dest].curTitleId, output[dest].size, output[dest].inode); + + dest++; } - pWork->mAsyncResult = WORKER_RESULT_OK; - CLEANUP: - MEMFreeToExpHeap(pWork->pHeap19000, titleIds); + myWork->asyncResult = RESULT_OK; + + clean_up: + MEMFreeToExpHeap(myWork->mainHeap, titleIds); } void NandSDWorker::do_unk_8134C838() { - SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, 0x640); - TitleIdList* inListA = (TitleIdList*)pWork->pParamA; - TitleIdList* outListB = (TitleIdList*)pWork->pParamB; - TitleIdList* outListC = (TitleIdList*)pWork->pParamC; + SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppBanner)); - ESTitleId* titleIdsInA = inListA->pTitleIds; - ESTitleId* titleIdsOutB = outListB->pTitleIds; - ESTitleId* titleIdsOutC = outListC->pTitleIds; + /* i guess */ + TitleIdList* titleIdList = (TitleIdList*)myWork->paramA; + TitleIdList* foundTitleIdList = (TitleIdList*)myWork->paramB; + TitleIdList* badTitleIdList = (TitleIdList*)myWork->paramC; - u32 titleIdCount = inListA->mCount; + ESTitleId* titleIds = titleIdList->titleIds; + ESTitleId* foundTitleIds = foundTitleIdList->titleIds; + ESTitleId* badTitleIds = badTitleIdList->titleIds; - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + u32 titleIdCount = titleIdList->count; + + myWork->asyncResult = RESULT_FATAL_SD_ERROR; ESDeviceId deviceId; ES_GetDeviceId(&deviceId); - int countOutB = 0, countOutC = 0; + int foundCount = 0, badCount = 0; + for (int i = 0; i < titleIdCount; i++) { if (s_sd_state != SD_STATE_READY) { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; break; } - char path[0x40]; - get_sd_app_path(titleIdsInA[i], path); - int getAppBannerRes = get_sd_app_banner(titleIdsInA[i], sdAppBanner); - if (getAppBannerRes == WORKER_RESULT_OK) { + char path[NAND_MAX_PATH]; + get_sd_app_path(titleIds[i], path); + + // Attempt to get banner + int result = get_sd_app_banner(titleIds[i], sdAppBanner); + if (result == RESULT_OK) { ESTitleId sdTitleId; u16 sdVersion; - int wadGetTitleVersionRes = - WADGetTitleVersionEx(path, &sdTitleId, &sdVersion, WAD_LOC_SD_CARD, (sdAppBanner->mThumbnailSize + 0x3f & 0xffffffc0) + 0x640); - if (wadGetTitleVersionRes != 0) { - OSReport("NandSDWorker: WADGetTitleVersionEx failed.[%d]\n", wadGetTitleVersionRes); - titleIdsOutB[countOutB++] = titleIdsInA[i]; + s32 err = WADGetTitleVersionEx(path, &sdTitleId, &sdVersion, WAD_LOCATION_SD_CARD, + ROUNDUP(sdAppBanner->thumbSize, 64) + sizeof(SDAppBanner)); + if (err != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADGetTitleVersionEx failed.[%d]\n", err); + foundTitleIds[foundCount++] = titleIds[i]; continue; } - if (sdTitleId != titleIdsInA[i]) { - OSReport("NandSDWorker: titleid %llx in wad is different from %llx in banner %s.\n", sdTitleId, sdAppBanner->mTitleId, path); - titleIdsOutB[countOutB++] = titleIdsInA[i]; + if (sdTitleId != titleIds[i]) { + OSReport("NandSDWorker: titleid %llx in wad is different from %llx in banner %s.\n", sdTitleId, sdAppBanner->titleId, path); + foundTitleIds[foundCount++] = titleIds[i]; continue; } - WADBackupHeader wadHdr; - int getSdWadheaderRes = get_sd_wad_header(titleIdsInA[i], &wadHdr, ROUNDUP(sdAppBanner->mThumbnailSize, 0x40)); - if (getSdWadheaderRes != WORKER_RESULT_OK) { - titleIdsOutB[countOutB++] = titleIdsInA[i]; + WADBackupHeader wadBackupHeader; + result = get_sd_wad_header(titleIds[i], &wadBackupHeader, ROUNDUP(sdAppBanner->thumbSize, 64)); + if (result != RESULT_OK) { + foundTitleIds[foundCount++] = titleIds[i]; } - if (wadHdr.deviceId == deviceId) { + if (wadBackupHeader.deviceId == deviceId) { u16 titleVersion; - get_nand_title_version(titleIdsInA[i], &titleVersion); + get_nand_title_version(titleIds[i], &titleVersion); if (titleVersion != sdVersion) { - titleIdsOutB[countOutB++] = titleIdsInA[i]; + foundTitleIds[foundCount++] = titleIds[i]; } } else { - titleIdsOutB[countOutB++] = titleIdsInA[i]; + foundTitleIds[foundCount++] = titleIds[i]; } - } else if (getAppBannerRes == WORKER_RESULT_GENERIC_ERR) { - titleIdsOutC[countOutC++] = titleIdsInA[i]; + } else if (result == RESULT_FATAL_SD_ERROR) { + badTitleIds[badCount++] = titleIds[i]; } else { - titleIdsOutB[countOutB++] = titleIdsInA[i]; + foundTitleIds[foundCount++] = titleIds[i]; } } - outListC->mCount = countOutC; - outListB->mCount = countOutB; - pWork->mAsyncResult = WORKER_RESULT_OK; - MEMFreeToAllocator(&pWork->mBothHeapAllocator, sdAppBanner); + + badTitleIdList->count = badCount; + foundTitleIdList->count = foundCount; + + myWork->asyncResult = RESULT_OK; + + MEMFreeToAllocator(&myWork->unkAllocator, sdAppBanner); } + void NandSDWorker::do_get_nand_save_size() { - SaveCacheEntry* cacheEntry = (SaveCacheEntry*)find_save_cache(&pWork->mSavesListNand, pWork->mTitleId); - if (cacheEntry == NULL || cacheEntry->mSize == -1) { + SaveCacheEntry* cacheEntry = (SaveCacheEntry*)find_save_cache(&myWork->nandSaveList, myWork->curTitleId); + if (cacheEntry == NULL || cacheEntry->size == -1) { u32 usedBlocks = 0; u32 usedInodes = 0; - char path[0x40]; - if (is_data_only_title(pWork->mTitleId)) { - get_nand_not_data_only_title_save_path(pWork->mTitleId, path); + + char path[NAND_MAX_PATH]; + if (is_data_only_title(myWork->curTitleId)) { + get_nand_title_save_path(myWork->curTitleId, path); } else { - get_nand_data_only_title_save_path(pWork->mTitleId, path); + get_nand_data_only_title_save_path(myWork->curTitleId, path); } - int secretGetUsageRes = nand::wrapper::SecretGetUsage(path, &usedBlocks, &usedInodes); - if (secretGetUsageRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDSecretGetUsage[%s] failed %d\n", path, secretGetUsageRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + s32 err = nand::wrapper::SecretGetUsage(path, &usedBlocks, &usedInodes); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDSecretGetUsage[%s] failed %d\n", path, err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; return; } - if (is_data_only_title(pWork->mTitleId)) { - get_nand_meta_file_path(pWork->mTitleId, path); - s32 metaFileLen = nand_get_length(path); - if (metaFileLen > 0) { - usedBlocks = usedBlocks + ((u32)metaFileLen + (FS_BLK_SIZE - 1)) / FS_BLK_SIZE; + if (is_data_only_title(myWork->curTitleId)) { + get_nand_meta_file_path(myWork->curTitleId, path); + s32 metaFileSize = nand_get_length(path); + if (metaFileSize > 0) { + usedBlocks += ((u32)metaFileSize + (NAND_BLOCK_SIZE - 1)) / NAND_BLOCK_SIZE; } else { - if (metaFileLen != WORKER_RESULT_GENERIC_ERR) { - OSReport("NandSDWorker: failed to get meta file size.[%d]\n", metaFileLen); - pWork->mAsyncResult = metaFileLen; + if (metaFileSize != RESULT_FATAL_SD_ERROR) { + OSReport("NandSDWorker: failed to get meta file size.[%d]\n", metaFileSize); + myWork->asyncResult = metaFileSize; return; } } } - pWork->mAsyncResult = usedBlocks * FS_BLK_SIZE; - OSReport("NandSDWorker: save size under %s is [%d] : [inodes:%d]\n", path, pWork->mAsyncResult, usedInodes); + + myWork->asyncResult = NAND_BLOCKS_TO_BYTES(usedBlocks); + + OSReport("NandSDWorker: save size under %s is [%d] : [inodes:%d]\n", path, myWork->asyncResult, usedInodes); if (cacheEntry != NULL) { - cacheEntry->mSize = pWork->mAsyncResult; + cacheEntry->size = myWork->asyncResult; } else { - add_save_cache(&pWork->mSavesListNand, pWork->mTitleId, NULL, pWork->mAsyncResult); + add_save_cache(&myWork->nandSaveList, myWork->curTitleId, NULL, myWork->asyncResult); } } else { - pWork->mAsyncResult = cacheEntry->mSize; + myWork->asyncResult = cacheEntry->size; } } + void NandSDWorker::do_get_nand_app_size() { - AppCacheEntry* cacheEntry = find_app_cache(&pWork->mAppsListNand, pWork->mTitleId); - if (cacheEntry == NULL || cacheEntry->mFileSize == -1) { + AppCacheEntry* cacheEntry = find_app_cache(&myWork->nandAppList, myWork->curTitleId); + if (cacheEntry == NULL || cacheEntry->fileSize == -1) { u32 usedBlocks = 0; u32 usedInodes = 0; - char path[0x40]; + char path[NAND_MAX_PATH]; - get_nand_app_path(pWork->mTitleId, path); - int secretGetUsageRes = nand::wrapper::SecretGetUsage(path, &usedBlocks, &usedInodes); - if (secretGetUsageRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDSecretGetUsage[%s] failed %d\n", path, secretGetUsageRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + get_nand_app_path(myWork->curTitleId, path); + s32 err = nand::wrapper::SecretGetUsage(path, &usedBlocks, &usedInodes); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDSecretGetUsage[%s] failed %d\n", path, err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; return; } - get_nand_meta_file_path(pWork->mTitleId, path); - s32 metaFileLen = nand_get_length(path); - if (metaFileLen > 0) { - usedBlocks = usedBlocks + ((u32)metaFileLen + (FS_BLK_SIZE - 1)) / FS_BLK_SIZE; + get_nand_meta_file_path(myWork->curTitleId, path); + s32 metaFileSize = nand_get_length(path); + if (metaFileSize > 0) { + usedBlocks = usedBlocks + ((u32)metaFileSize + (NAND_BLOCK_SIZE - 1)) / NAND_BLOCK_SIZE; } else { - if (metaFileLen != WORKER_RESULT_GENERIC_ERR) { - OSReport("NandSDWorker: failed to get meta file size.[%d]\n", metaFileLen); - pWork->mAsyncResult = metaFileLen; + if (metaFileSize != RESULT_FATAL_SD_ERROR) { + OSReport("NandSDWorker: failed to get meta file size.[%d]\n", metaFileSize); + myWork->asyncResult = metaFileSize; return; } } - pWork->mAsyncResult = usedBlocks * FS_BLK_SIZE; - OSReport("NandSDWorker: nand app 0x%016llx size is [%d]\n", pWork->mTitleId, pWork->mAsyncResult); + myWork->asyncResult = NAND_BLOCKS_TO_BYTES(usedBlocks); + OSReport("NandSDWorker: nand app 0x%016llx size is [%d]\n", myWork->curTitleId, myWork->asyncResult); if (cacheEntry != NULL) { - cacheEntry->mFileSize = pWork->mAsyncResult; + cacheEntry->fileSize = myWork->asyncResult; } else { - add_app_cache(&pWork->mAppsListNand, pWork->mTitleId, NULL, 0, NULL, pWork->mAsyncResult); + add_app_cache(&myWork->nandAppList, myWork->curTitleId, NULL, 0, NULL, myWork->asyncResult); } } else { - pWork->mAsyncResult = cacheEntry->mFileSize; + myWork->asyncResult = cacheEntry->fileSize; } } int NandSDWorker::get_sd_save_size(ESTitleId32 titleId) { s32 size; - SaveCacheEntry* cacheEntry = find_save_cache(&pWork->mSavesListSD, titleId); - if (cacheEntry == NULL || cacheEntry->mSize == -1) { - char path[0x40]; + + SaveCacheEntry* cacheEntry = find_save_cache(&myWork->sdSaveList, titleId); + if (cacheEntry == NULL || cacheEntry->size == -1) { + char path[NAND_MAX_PATH]; get_sd_save_path(titleId, path); - FAFileStat fStat; - FAError statErr = FAFstat(path, &fStat); - if (statErr == FA_ERR_SUCCESS) { - if (statErr == FA_ERR_SUCCESS && fStat.size > sizeof(SaveCacheEntry) && is_fa_file(fStat.stat)) { - OSReport("NandSDWorker: file %s size = %d\n", path, fStat.size); - size = fStat.size; + FAFileStat fileStat; + FAError err = FAFstat(path, &fileStat); + if (err == FA_ERR_SUCCESS) { + if (err == FA_ERR_SUCCESS && fileStat.size > sizeof(SaveCacheEntry) && is_fa_file(fileStat.stat)) { + OSReport("NandSDWorker: file %s size = %d\n", path, fileStat.size); + size = fileStat.size; if (cacheEntry != NULL) { - cacheEntry->mSize = fStat.size; + cacheEntry->size = fileStat.size; } else { - add_save_cache(&pWork->mSavesListSD, titleId, NULL, fStat.size); + add_save_cache(&myWork->sdSaveList, titleId, NULL, fileStat.size); } } else { - size = WORKER_RESULT_GENERIC_ERR; + size = RESULT_FATAL_SD_ERROR; } } else { OSReport("NandSDWorker: FAFstat failed.\n"); handle_sd_error_for_entry(FA_ERR_SYSTEM, &size); } } else { - size = cacheEntry->mSize; + size = cacheEntry->size; } return size; } + int NandSDWorker::get_sd_app_size(ESTitleId32 titleId) { s32 size; - AppCacheEntry* cacheEntry = find_app_cache(&pWork->mAppsListSD, titleId); - if (cacheEntry == NULL || cacheEntry->mFileSize == -1) { - char path[0x40]; + AppCacheEntry* cacheEntry = find_app_cache(&myWork->sdAppList, titleId); + if (cacheEntry == NULL || cacheEntry->fileSize == -1) { + char path[NAND_MAX_PATH]; get_sd_app_path(titleId, path); - FAFileStat fStat; - FAError statErr = FAFstat(path, &fStat); - if (statErr == FA_ERR_SUCCESS) { - if (statErr == FA_ERR_SUCCESS && fStat.size > sizeof(SDAppBanner) && is_fa_file(fStat.stat)) { - OSReport("NandSDWorker: file %s size = %d\n", path, fStat.size); - size = fStat.size; + FAFileStat fileStat; + FAError err = FAFstat(path, &fileStat); + if (err == FA_ERR_SUCCESS) { + if (err == FA_ERR_SUCCESS && fileStat.size > sizeof(SDAppBanner) && is_fa_file(fileStat.stat)) { + OSReport("NandSDWorker: file %s size = %d\n", path, fileStat.size); + size = fileStat.size; if (cacheEntry != NULL) { - cacheEntry->mFileSize = fStat.size; + cacheEntry->fileSize = fileStat.size; } else { - add_app_cache(&pWork->mAppsListSD, titleId, NULL, 0, NULL, fStat.size); + add_app_cache(&myWork->sdAppList, titleId, NULL, 0, NULL, fileStat.size); } } else { - size = WORKER_RESULT_GENERIC_ERR; + size = RESULT_FATAL_SD_ERROR; } } else { OSReport("NandSDWorker: FAFstat failed.\n"); handle_sd_error_for_entry(FA_ERR_SYSTEM, &size); } } else { - size = cacheEntry->mFileSize; + size = cacheEntry->fileSize; } return size; } + void NandSDWorker::do_delete_sd_save() { - char path[0x40]; - get_sd_save_path(pWork->mTitleId, path); + char path[NAND_MAX_PATH]; + get_sd_save_path(myWork->curTitleId, path); if (FARemove(path) == FA_ERR_SUCCESS) { OSReport("NandSDWorker: delete file %s\n", path); - pWork->mSdSaveNum--; - delete_save_cache(&pWork->mSavesListSD, pWork->mTitleId); - pWork->mAsyncResult = WORKER_RESULT_OK; + myWork->sdSaveNum--; + delete_save_cache(&myWork->sdSaveList, myWork->curTitleId); + myWork->asyncResult = RESULT_OK; } else { OSReport("NandSDWorker: FARemove failed.\n"); - handle_sd_error_for_entry(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error_for_entry(FA_ERR_SYSTEM, &myWork->asyncResult); } } + void NandSDWorker::do_delete_sd_app() { - char path[0x40]; - get_sd_app_path(pWork->mTitleId, path); + char path[NAND_MAX_PATH]; + get_sd_app_path(myWork->curTitleId, path); if (FARemove(path) == FA_ERR_SUCCESS) { OSReport("NandSDWorker: delete file %s\n", path); - pWork->mSdAppNum--; - delete_app_cache(&pWork->mAppsListSD, pWork->mTitleId); - pWork->mAsyncResult = WORKER_RESULT_OK; + myWork->sdAppNum--; + delete_app_cache(&myWork->sdAppList, myWork->curTitleId); + myWork->asyncResult = RESULT_OK; } else { OSReport("NandSDWorker: FARemove failed.\n"); - handle_sd_error_for_entry(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error_for_entry(FA_ERR_SYSTEM, &myWork->asyncResult); } } void NandSDWorker::do_initialize_nand() { - int recursionNandRes = recursion_nand("/shared2", NULL, RECURSIVE_DELETE, c_ignore_list_for_shared2, ARRAY_LENGTH(c_ignore_list_for_shared2)); - if (recursionNandRes != WORKER_RESULT_OK && recursionNandRes != WORKER_RESULT_GENERIC_ERR) { - pWork->mAsyncResult = recursionNandRes; + // Clear shared2 directory. + int result = recursion_nand("/shared2", NULL, RECURSIVE_DELETE, c_ignore_list_for_shared2, ARRAY_LENGTH(c_ignore_list_for_shared2)); + if (result != RESULT_OK && result != RESULT_FATAL_SD_ERROR) { + myWork->asyncResult = result; return; } OSReport("NandSDWorker: successfully initialize under /shared2.\n"); - int initMetaRes = initialize_meta(); - if (initMetaRes != WORKER_RESULT_OK && initMetaRes != WORKER_RESULT_GENERIC_ERR) { - pWork->mAsyncResult = initMetaRes; + // Clear meta directory. + result = initialize_meta(); + if (result != RESULT_OK && result != RESULT_FATAL_SD_ERROR) { + myWork->asyncResult = result; return; } OSReport("NandSDWorker: successfully initialize under /meta.\n"); - int delNandDiskAppRes = delete_nand_disk_app_with_ticket(); - if (delNandDiskAppRes != WORKER_RESULT_OK && delNandDiskAppRes != WORKER_RESULT_GENERIC_ERR) { - pWork->mAsyncResult = delNandDiskAppRes; + // Delete user titles + result = delete_nand_disk_app_with_ticket(); + if (result != RESULT_OK && result != RESULT_FATAL_SD_ERROR) { + myWork->asyncResult = result; return; } - int delNandTitlesRes = delete_nand_titles(); - if (delNandTitlesRes != WORKER_RESULT_OK && delNandTitlesRes != WORKER_RESULT_GENERIC_ERR) { - pWork->mAsyncResult = delNandTitlesRes; + result = delete_nand_titles(); + if (result != RESULT_OK && result != RESULT_FATAL_SD_ERROR) { + myWork->asyncResult = result; return; } - int privateDeleteRes = nand::wrapper::PrivateDelete("/shared2/sys"); - if (privateDeleteRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateDelete /shared2/sys failed.[%d]\n", privateDeleteRes); - if (privateDeleteRes == NAND_RESULT_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; + // Clear system configuration + result = nand::wrapper::PrivateDelete("/shared2/sys"); + if (result != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateDelete /shared2/sys failed.[%d]\n", result); + if (result == NAND_RESULT_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; return; } } OSReport("NandSDWorker: successfully delete /shared2/sys.\n"); - BOOL level = OSDisableInterrupts(); + BOOL enabled = OSDisableInterrupts(); SCBtDeviceInfoArray btDeviceInfo; + // Resetup SYSCONF memset(&btDeviceInfo, 0, sizeof(btDeviceInfo)); if (SCGetBtDeviceInfoArray(&btDeviceInfo)) { __SCClearConfBuf(); @@ -2140,7 +2498,8 @@ namespace ipl { OSReport("NandSDWorker: SCSetConfigDoneFlag2 failed.\n"); } - OSRestoreInterrupts(level); + OSRestoreInterrupts(enabled); + int scFlushRes = SCFlush(); if (scFlushRes == 0) { OSReport("NandSDWorker: successfully initialize SC.\n"); @@ -2148,227 +2507,255 @@ namespace ipl { OSReport("NandSDWorker: SCFlush failed.[%d]\n", scFlushRes); } - void* nwc24Work = MEMAllocFromExpHeapEx(pWork->pHeap19000, NWC24_LIB_WORK_SIZE, 0x20); - int nwc24InitRes = NWC24InitFilesIndividually(nwc24Work, FALSE, TRUE, TRUE, TRUE); - MEMFreeToExpHeap(pWork->pHeap19000, nwc24Work); - if (nwc24InitRes == NWC24_ERR_NAND_CORRUPT) { + // Initialize NWC24 files in NAND + void* nwc24Work = MEMAllocFromExpHeapEx(myWork->mainHeap, NWC24_LIB_WORK_SIZE, 32); + NWC24Err nwc24Err = NWC24InitFilesIndividually(nwc24Work, FALSE, TRUE, TRUE, TRUE); + MEMFreeToExpHeap(myWork->mainHeap, nwc24Work); + if (nwc24Err == NWC24_ERR_NAND_CORRUPT) { OSReport("NandSDWorker: NWC24InitFiles failed with NAND currupt.\n"); - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; + myWork->asyncResult = RESULT_NAND_CORRUPT; } else { - if (nwc24InitRes == NWC24_OK) { + if (nwc24Err == NWC24_OK) { OSReport("NandSDWorker: successfully initialize NWC24.\n"); } else { - OSReport("NandSDWorker: NWC24InitFiles failed.[%d]\n", nwc24InitRes); + OSReport("NandSDWorker: NWC24InitFiles failed.[%d]\n", nwc24Err); } - pWork->mAsyncResult = WORKER_RESULT_OK; + myWork->asyncResult = RESULT_OK; } } int NandSDWorker::initialize_meta() { - int resDel00010000 = nand::wrapper::PrivateDelete("/meta/00010000"); - if (check_nand_corrupt(resDel00010000, NULL)) - return WORKER_RESULT_NAND_CORRUPT; - if (resDel00010000 != NAND_RESULT_OK && resDel00010000 != NAND_RESULT_NOEXISTS) - OSReport("NandSDWorker: NANDPrivateDelete /meta/00010000 failed [%d]\n", resDel00010000); + int result = nand::wrapper::PrivateDelete("/meta/00010000"); + if (check_nand_corrupt(result, NULL)) { + return RESULT_NAND_CORRUPT; + } + if (result != NAND_RESULT_OK && result != NAND_RESULT_NOEXISTS) { + OSReport("NandSDWorker: NANDPrivateDelete /meta/00010000 failed [%d]\n", result); + } - int resDel00010001 = nand::wrapper::PrivateDelete("/meta/00010001"); - if (check_nand_corrupt(resDel00010001, NULL)) - return WORKER_RESULT_NAND_CORRUPT; - if (resDel00010001 != NAND_RESULT_OK && resDel00010001 != NAND_RESULT_NOEXISTS) - OSReport("NandSDWorker: NANDPrivateDelete /meta/00010001 failed [%d]\n", resDel00010001); + result = nand::wrapper::PrivateDelete("/meta/00010001"); + if (check_nand_corrupt(result, NULL)) { + return RESULT_NAND_CORRUPT; + } + if (result != NAND_RESULT_OK && result != NAND_RESULT_NOEXISTS) { + OSReport("NandSDWorker: NANDPrivateDelete /meta/00010001 failed [%d]\n", result); + } - return WORKER_RESULT_OK; + return RESULT_OK; } int NandSDWorker::delete_nand_disk_app_with_ticket() { int ret; ESTitleId* titleIds = NULL; - u32 titleidCount = 0; + u32 titleIdCount = 0; - int listOwnedTitlesRes; - listOwnedTitlesRes = ES_ListOwnedTitles(NULL, &titleidCount); - if (listOwnedTitlesRes != ES_ERR_OK) { - OSReport("NandSDWorker: ES_ListOwnedTitles failed [%d]\n", listOwnedTitlesRes); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + // Get title ID count + ESError esErr = ES_ListOwnedTitles(NULL, &titleIdCount); + if (esErr != ES_ERR_OK) { + OSReport("NandSDWorker: ES_ListOwnedTitles failed [%d]\n", esErr); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(pWork->pHeap19000, titleidCount * sizeof(ESTitleId), 0x20); - listOwnedTitlesRes = ES_ListOwnedTitles(titleIds, &titleidCount); - if (listOwnedTitlesRes != ES_ERR_OK) { - OSReport("NandSDWorker: ES_ListOwnedTitles failed [%d]\n", listOwnedTitlesRes); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + // Get title ID list + titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(myWork->mainHeap, titleIdCount * sizeof(ESTitleId), 32); + esErr = ES_ListOwnedTitles(titleIds, &titleIdCount); + if (esErr != ES_ERR_OK) { + OSReport("NandSDWorker: ES_ListOwnedTitles failed [%d]\n", esErr); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - for (int i = 0; i < titleidCount; i++) { - if (!is_disk_or_user_nand_app(titleIds[i]) && !is_data_only_title(titleIds[i])) + for (int i = 0; i < titleIdCount; i++) { + // Check if it's a disc title (title type 00010000 and only has "data" folder) + if (!is_disk_or_user_nand_app(titleIds[i]) && !is_data_only_title(titleIds[i])) { continue; - - int delTikRes = delete_ticket(titleIds[i]); - if (delTikRes != WORKER_RESULT_OK && delTikRes != WORKER_RESULT_ES_ERROR) { - OSReport("NandSDWorker: delete ticket 0x%016llx failed [%d]\n", titleIds[i], delTikRes); } - int delTitleRes = utility::ESMisc::DeleteTitle(System::getMem2Sys(), titleIds[i]); - if (delTitleRes != 0 && delTitleRes != -106) { - OSReport("NandSDWorker: ESMisc::DeleteTitle 0x%016llx failed [%d]\n", titleIds[i], delTitleRes); + + // Goodbye ticket! + int result = delete_ticket(titleIds[i]); + if (result != RESULT_OK && result != RESULT_ES_ERROR) { + OSReport("NandSDWorker: delete ticket 0x%016llx failed [%d]\n", titleIds[i], result); + } + + // Goodbye title! + esErr = utility::ESMisc::DeleteTitle(System::getMem2Sys(), titleIds[i]); + if (esErr != ES_ERR_OK && esErr != ES_ERR_DONT_EXISTS) { + OSReport("NandSDWorker: ESMisc::DeleteTitle 0x%016llx failed [%d]\n", titleIds[i], esErr); } OSReport("NandSDWorker: delete title [0x%016llx]\n", titleIds[i]); } - ret = WORKER_RESULT_OK; + ret = RESULT_OK; - CLEANUP: + clean_up: if (titleIds != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, titleIds); + MEMFreeToExpHeap(myWork->mainHeap, titleIds); } return ret; } int NandSDWorker::delete_ticket(ESTitleId titleId) { ESTicketView* ticketViewList = NULL; - u32 viewCnt = 0; + u32 tikCount = 0; - int esCallRes; - esCallRes = ES_GetTicketViews(titleId, (ESTicketView*)0x0, &viewCnt); - if (esCallRes) { - OSReport("NandSDWorker: ES_GetTicketViews failed [%d]\n", esCallRes); - if (esCallRes == ES_ERR_DONT_EXISTS) - return WORKER_RESULT_ES_ERROR; - else - return WORKER_RESULT_GENERIC_ERR; + // Get ticket count + ESError esErr = ES_GetTicketViews(titleId, NULL, &tikCount); + if (esErr != ES_ERR_OK) { + OSReport("NandSDWorker: ES_GetTicketViews failed [%d]\n", esErr); + if (esErr == ES_ERR_DONT_EXISTS) { + return RESULT_ES_ERROR; + } else { + return RESULT_FATAL_SD_ERROR; + } } - if (viewCnt != 0) { - u32 listSize = viewCnt * sizeof(ESTicketView); - ticketViewList = (ESTicketView*)MEMAllocFromExpHeapEx(pWork->pHeap19000, ROUNDUP(listSize, 0x20), 0x20); + if (tikCount != 0) { + u32 listSize = tikCount * sizeof(ESTicketView); + ticketViewList = (ESTicketView*)MEMAllocFromExpHeapEx(myWork->mainHeap, OSRoundUp32B(listSize), 32); - esCallRes = ES_GetTicketViews(titleId, ticketViewList, &viewCnt); - if (esCallRes != ES_ERR_OK) { - OSReport("NandSDWorker: ES_GetTicketViews failed [%d]\n", esCallRes); - MEMFreeToExpHeap(pWork->pHeap19000, ticketViewList); + // Get tickets + esErr = ES_GetTicketViews(titleId, ticketViewList, &tikCount); + if (esErr != ES_ERR_OK) { + OSReport("NandSDWorker: ES_GetTicketViews failed [%d]\n", esErr); + MEMFreeToExpHeap(myWork->mainHeap, ticketViewList); - if (esCallRes == ES_ERR_DONT_EXISTS) - return WORKER_RESULT_ES_ERROR; - else - return WORKER_RESULT_GENERIC_ERR; + if (esErr == ES_ERR_DONT_EXISTS) { + return RESULT_ES_ERROR; + } else { + return RESULT_FATAL_SD_ERROR; + } } - for (int i = 0; i < viewCnt; i++) { - ESTicketView currTikView ALIGN32; + for (int i = 0; i < tikCount; i++) { + ESTicketView ticketView ALIGN32; - currTikView.version = ticketViewList[i].version; - currTikView.ticketId = ticketViewList[i].ticketId; - currTikView.deviceId = ticketViewList[i].deviceId; - currTikView.titleId = ticketViewList[i].titleId; - currTikView.accessMask[0] = ticketViewList[i].accessMask[0]; - currTikView.accessMask[1] = ticketViewList[i].accessMask[1]; - currTikView.ticketVersion = ticketViewList[i].ticketVersion; - currTikView.accessTitleID = ticketViewList[i].accessTitleID; - currTikView.accessTitleMask = ticketViewList[i].accessTitleMask; - currTikView.license = ticketViewList[i].license; - currTikView.reserved = ticketViewList[i].reserved; - currTikView.unk_0x55 = ticketViewList[i].unk_0x55; - currTikView.cidxMask = ticketViewList[i].cidxMask; - currTikView.limits = ticketViewList[i].limits; + // Thank you, EAD + ticketView.version = ticketViewList[i].version; + ticketView.ticketId = ticketViewList[i].ticketId; + ticketView.deviceId = ticketViewList[i].deviceId; + ticketView.titleId = ticketViewList[i].titleId; + ticketView.accessMask[0] = ticketViewList[i].accessMask[0]; + ticketView.accessMask[1] = ticketViewList[i].accessMask[1]; + ticketView.ticketVersion = ticketViewList[i].ticketVersion; + ticketView.accessTitleID = ticketViewList[i].accessTitleID; + ticketView.accessTitleMask = ticketViewList[i].accessTitleMask; + ticketView.license = ticketViewList[i].license; + ticketView.reserved = ticketViewList[i].reserved; + ticketView.unk_0x55 = ticketViewList[i].unk_0x55; + ticketView.cidxMask = ticketViewList[i].cidxMask; + ticketView.limits = ticketViewList[i].limits; + esErr = ES_DeleteTicket(&ticketView); - esCallRes = ES_DeleteTicket(&currTikView); - if (esCallRes != ES_ERR_OK) { - OSReport("NandSDWorker: ES_DeleteTicket failed [%d]\n", esCallRes); - MEMFreeToExpHeap(pWork->pHeap19000, ticketViewList); - if (esCallRes == ES_ERR_DONT_EXISTS) - return WORKER_RESULT_ES_ERROR; - else - return WORKER_RESULT_GENERIC_ERR; + if (esErr != ES_ERR_OK) { + OSReport("NandSDWorker: ES_DeleteTicket failed [%d]\n", esErr); + MEMFreeToExpHeap(myWork->mainHeap, ticketViewList); + if (esErr == ES_ERR_DONT_EXISTS) { + return RESULT_ES_ERROR; + } else { + return RESULT_FATAL_SD_ERROR; + } } OSReport("NandSDWorker: delete ticket [#%d] in 0x%016llx\n", i, titleId); } - MEMFreeToExpHeap(pWork->pHeap19000, ticketViewList); + MEMFreeToExpHeap(myWork->mainHeap, ticketViewList); } - return WORKER_RESULT_OK; + return RESULT_OK; } int NandSDWorker::delete_empty_title(ESTitleId titleId, bool force) { - int checkSafeRes = utility::ESMisc::CheckSafeDeleteTitle(System::getMem2Sys(), titleId); - if (checkSafeRes == 1 || force) { - int deleteRes = utility::ESMisc::DeleteTitle(System::getMem2Sys(), titleId); - if (deleteRes != 0) { - OSReport("NandSDWorker: ESMisc::DeleteTitle failed [%d]\n", deleteRes); - return deleteRes; + int result = utility::ESMisc::CheckSafeDeleteTitle(System::getMem2Sys(), titleId); + if (result == 1 || force) { + s32 esErr = utility::ESMisc::DeleteTitle(System::getMem2Sys(), titleId); + if (esErr != ES_ERR_OK) { + OSReport("NandSDWorker: ESMisc::DeleteTitle failed [%d]\n", esErr); + return esErr; } - } else if (checkSafeRes < 0) { - OSReport("NandSDWorker: ESMisc::CheckSafeDeleteTitle failed [%d]\n", checkSafeRes); - return checkSafeRes; + } else if (result < 0) { + OSReport("NandSDWorker: ESMisc::CheckSafeDeleteTitle failed [%d]\n", result); + return result; } - return WORKER_RESULT_OK; + return RESULT_OK; } int NandSDWorker::delete_nand_titles() { - int ret; - int iVar1; + s32 ret; + ESTitleId* titleIds = NULL; u32 titleCount = 0; - int listTitlesOnCardRes = ES_ListTitlesOnCard(NULL, &titleCount); - if (listTitlesOnCardRes != ES_ERR_OK) { - OSReport("NandSDWorker: ES_ListTitlesOnCard failed [%d]\n", listTitlesOnCardRes); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + + // Get title ID count + ESError esErr = ES_ListTitlesOnCard(NULL, &titleCount); + if (esErr != ES_ERR_OK) { + OSReport("NandSDWorker: ES_ListTitlesOnCard failed [%d]\n", esErr); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(pWork->pHeap19000, titleCount * sizeof(ESTitleId), 0x20); - listTitlesOnCardRes = ES_ListTitlesOnCard(titleIds, &titleCount); - if (listTitlesOnCardRes != ES_ERR_OK) { - OSReport("NandSDWorker: ES_ListTitlesOnCard failed [%d]\n", listTitlesOnCardRes); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + // Get title ID list + titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(myWork->mainHeap, titleCount * sizeof(ESTitleId), 32); + esErr = ES_ListTitlesOnCard(titleIds, &titleCount); + if (esErr != ES_ERR_OK) { + OSReport("NandSDWorker: ES_ListTitlesOnCard failed [%d]\n", esErr); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } + // Now let's delete all titles! Except the system titles of course for (int i = 0; i < titleCount; i++) { switch ((u32)ES_TITLE_TYPE_NOMASK(titleIds[i])) { - case ES_TITLE_TYPE(SYSMENU_TITLE_ID): + case ES_TITLE_TYPE(SYSMENU_TITLE_ID): { + // Delete Wii Menu save data. if ((u32)ES_TITLE_CODE(titleIds[i]) == (u32)ES_TITLE_CODE(SYSMENU_TITLE_ID)) { ret = recursion_nand_save(titleIds[i], RECURSIVE_DELETE, c_ignore_list_for_wiimenu, ARRAY_LENGTH(c_ignore_list_for_wiimenu)); - if (ret != WORKER_RESULT_OK && ret != WORKER_RESULT_GENERIC_ERR) { + if (ret != RESULT_OK && ret != RESULT_FATAL_SD_ERROR) { OSReport("NandSDWorker: failed to delete wii menu data.\n"); - goto CLEANUP; + goto clean_up; } OSReport("NandSDWorker: successfully initialize wii menu data.\n"); } break; - case 0x00010000 | SUBTYPE_SIMPLE_DISC: - case 0x00010000 | SUBTYPE_WII_SHOP: - case 0x00010000 | SUBTYPE_CHANNEL_DISC: - case 0x00010000 | SUBTYPE_DLC: - case 0x00010000 | SUBTYPE_UNK6: - case 0x00010000 | SUBTYPE_UNK7: + } + case TITLE_TYPE_DISC: + case TITLE_TYPE_CHANNEL: + case TITLE_TYPE_DISC_CHANNEL: + case TITLE_TYPE_SHARED: + case TITLE_TYPE_UNK6: + case TITLE_TYPE_UNK7: { + // Delete user installed titles ret = utility::ESMisc::DeleteTitle(System::getMem2Sys(), titleIds[i]); - if (ret != 0 && ret != -106) { + if (ret != ES_ERR_OK && ret != ES_ERR_DONT_EXISTS) { OSReport("NandSDWorker: ESMisc::DeleteTitle 0x%016llx failed [%d]\n", titleIds[i], ret); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } OSReport("NandSDWorker: successfully delete app [0x%016llx].\n", titleIds[i]); break; - case 0x00010000 | SUBTYPE_PREINSTALL: - case 0x00010000 | SUBTYPE_UNK3: - case 0x00010000 | SUBTYPE_HIDDEN: + } + case TITLE_TYPE_SYSTEM_CHANNEL: + case TITLE_TYPE_UNK3: + case TITLE_TYPE_HIDDEN_CHANNEL: { + // Delete save data for hidden and system channels. ret = recursion_nand_save(titleIds[i], RECURSIVE_DELETE, NULL, 0); - if (ret != WORKER_RESULT_OK && ret != WORKER_RESULT_GENERIC_ERR) { + if (ret != RESULT_OK && ret != RESULT_FATAL_SD_ERROR) { OSReport("NandSDWorker: failed to delete 0x%016llx save data.\n", titleIds[i]); - goto CLEANUP; + goto clean_up; } break; - default: + } + default: { + // Unknown channel type. Don't bother to do anything with it. OSReport("NandSDWorker: don't process for 0x%016llx\n", titleIds[i]); break; + } } } - ret = WORKER_RESULT_OK; + ret = RESULT_OK; - CLEANUP: + clean_up: if (titleIds != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, titleIds); + MEMFreeToExpHeap(myWork->mainHeap, titleIds); } return ret; } @@ -2376,65 +2763,73 @@ namespace ipl { void NandSDWorker::do_get_nand_user_free_area() { u32 usedBlocks = 0; u32 usedINodes = 0; - int getUserUsageRes = nand::wrapper::SecretGetUserUsage(&usedBlocks, &usedINodes); - if (getUserUsageRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDSecretGetUserUsage failed [%d]\n", getUserUsageRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + + s32 err = nand::wrapper::SecretGetUserUsage(&usedBlocks, &usedINodes); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDSecretGetUserUsage failed [%d]\n", err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; return; } + OSReport("NandSDWorker: user fsBlock = %d\n", usedBlocks); OSReport("NandSDWorker: user inode = %d\n", usedINodes); - pWork->mAsyncResult = NAND_USR_FREE_AREA_SIZE - usedBlocks * FS_BLK_SIZE; - OSReport("NandSDWorker: user free area = %d/%d\n", pWork->mAsyncResult, NAND_USR_FREE_AREA_SIZE); + + myWork->asyncResult = NAND_BLOCKS_TO_BYTES(NAND_MAX_USER_BLOCKS) - NAND_BLOCKS_TO_BYTES(usedBlocks); + + OSReport("NandSDWorker: user free area = %d/%d\n", myWork->asyncResult, NAND_BLOCKS_TO_BYTES(NAND_MAX_USER_BLOCKS)); } - int NandSDWorker::get_nand_free_area(u32* sysInodes, u32* sysFsblocks, s32* usrInodes, s32* usrFsblocks) { + + int NandSDWorker::get_nand_free_area(u32* sysNodes, u32* sysBlocks, s32* userNodes, s32* userBlocks) { int ret; NANDFileSystemStatus fsStatus; - u32 usedUsrFsblocks, usedUsrInodes; + u32 usedUserBlocks, usedUserInodes; nand::wrapper::SecretGetFileSystemStatus(&fsStatus); - int getUserUsageRes = nand::wrapper::SecretGetUserUsage(&usedUsrFsblocks, &usedUsrInodes); - if (getUserUsageRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDSecretGetUserUsage failed [%d]\n", getUserUsageRes); - return WORKER_RESULT_GENERIC_ERR; - } - *usrFsblocks = USR_FS_BLK_CNT - usedUsrFsblocks; - *usrInodes = USR_INODE_CNT - usedUsrInodes; - OSReport("NandSDWorker: user free area fsblocks/inodes = %d/%d\n", *usrFsblocks, *usrInodes); - int getSysAvailRes = nand::wrapper::SecretGetSystemAvailableArea(&fsStatus, usedUsrFsblocks, usedUsrInodes, sysFsblocks, sysInodes); - if (getSysAvailRes == NAND_RESULT_OK) { - OSReport("NandSDWorker: system free area fsblocks/inodes = %d/%d\n", *sysFsblocks, *sysInodes); + s32 err = nand::wrapper::SecretGetUserUsage(&usedUserBlocks, &usedUserInodes); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDSecretGetUserUsage failed [%d]\n", err); + return RESULT_FATAL_SD_ERROR; + } + + *userBlocks = NAND_MAX_USER_BLOCKS - usedUserBlocks; + *userNodes = NAND_MAX_USER_INODES - usedUserInodes; + OSReport("NandSDWorker: user free area fsblocks/inodes = %d/%d\n", *userBlocks, *userNodes); + + err = nand::wrapper::SecretGetSystemAvailableArea(&fsStatus, usedUserBlocks, usedUserInodes, sysBlocks, sysNodes); + if (err == NAND_RESULT_OK) { + OSReport("NandSDWorker: system free area fsblocks/inodes = %d/%d\n", *sysBlocks, *sysNodes); } else { - OSReport("NandSDWorker: user area overs limit.[%d]\n", getSysAvailRes); - *sysFsblocks = 0; - *sysInodes = 0; + OSReport("NandSDWorker: user area overs limit.[%d]\n", err); + *sysBlocks = 0; + *sysNodes = 0; } - return WORKER_RESULT_OK; + return RESULT_OK; } - int NandSDWorker::check_nand_free_area(u32 sysInodes, u32 sysFsblocks, s32 usrInodes, s32 usrFsblocks) { - u32 freeSysInodes, freeSysFsblocks; - s32 freeUsrInodes, freeUsrFsblocks; - if (get_nand_free_area(&freeSysInodes, &freeSysFsblocks, &freeUsrInodes, &freeUsrFsblocks) != WORKER_RESULT_OK) { - return WORKER_RESULT_GENERIC_ERR; + + int NandSDWorker::check_nand_free_area(u32 sysNodes, u32 sysBlocks, s32 userNodes, s32 userBlocks) { + u32 freeSysInodes, freeSysBlocks; + s32 freeUserInodes, freeUserBlocks; + if (get_nand_free_area(&freeSysInodes, &freeSysBlocks, &freeUserInodes, &freeUserBlocks) != RESULT_OK) { + return RESULT_FATAL_SD_ERROR; } - if (freeSysInodes < sysInodes) { - OSReport("NandSDWorker: in short of system inodes. %d/%d \n", sysInodes, freeSysInodes); - return WORKER_RESULT_NO_SPACE; + if (freeSysInodes < sysNodes) { + OSReport("NandSDWorker: in short of system inodes. %d/%d \n", sysNodes, freeSysInodes); + return RESULT_OUT_OF_SPACE; } - if (freeSysFsblocks < sysFsblocks) { - OSReport("NandSDWorker: in short of system fsblocks. %d/%d \n", sysFsblocks, freeSysFsblocks); - return WORKER_RESULT_NO_SPACE; + if (freeSysBlocks < sysBlocks) { + OSReport("NandSDWorker: in short of system fsblocks. %d/%d \n", sysBlocks, freeSysBlocks); + return RESULT_OUT_OF_SPACE; } - if (freeUsrInodes < usrInodes) { - OSReport("NandSDWorker: in short of user inodes. %d/%d \n", usrInodes, freeUsrInodes); - return WORKER_RESULT_NO_SPACE; + if (freeUserInodes < userNodes) { + OSReport("NandSDWorker: in short of user inodes. %d/%d \n", userNodes, freeUserInodes); + return RESULT_OUT_OF_SPACE; } - if (freeUsrFsblocks < usrFsblocks) { - OSReport("NandSDWorker: in short of user fsblocks. %d/%d \n", usrFsblocks, freeUsrFsblocks); - return WORKER_RESULT_NO_SPACE; + if (freeUserBlocks < userBlocks) { + OSReport("NandSDWorker: in short of user fsblocks. %d/%d \n", userBlocks, freeUserBlocks); + return RESULT_OUT_OF_SPACE; } - return WORKER_RESULT_OK; + return RESULT_OK; } void NandSDWorker::do_copy_nand_save_to_sd() { @@ -2444,241 +2839,251 @@ namespace ipl { bool changedDir = false; bool backedUp = false; int isDataOnlyTitle = false; - // int isDataOnlyTitleRes; - char bnrPath[0x40]; - char savePath[0x40]; - get_sd_save_path(pWork->mTitleId, savePath); + char bnrPath[NAND_MAX_PATH]; + char savePath[NAND_MAX_PATH]; + s32 bnrLen; + get_sd_save_path(myWork->curTitleId, savePath); s64 sdFreeArea; u32 backupWadSize; NANDStatus bnrFileStatus; - s32 uVar1; - int prepSdCopyRes = prepare_sd_copy(savePath); - if (prepSdCopyRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = prepSdCopyRes; - goto CLEANUP; + + s32 err; + + int result = prepare_sd_copy(savePath); + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } sdFreeArea = get_sd_free_area(); if (sdFreeArea < 0) { - pWork->mAsyncResult = sdFreeArea; - goto CLEANUP; + myWork->asyncResult = sdFreeArea; + goto clean_up; } - sdSaveBnr = (SDSaveBanner*)MEMAllocFromExpHeapEx(pWork->pHeap19000, sizeof(SDSaveBanner), 0x20); + sdSaveBnr = (SDSaveBanner*)MEMAllocFromExpHeapEx(myWork->mainHeap, sizeof(SDSaveBanner), 32); memset(sdSaveBnr, 0, sizeof(SDSaveBanner)); - int getNandSaveBannerRes; - getNandSaveBannerRes = get_nand_save_banner(pWork->mTitleId, &sdSaveBnr->mBanner, &sdSaveBnrSize); - if (getNandSaveBannerRes != WORKER_RESULT_OK) { - OSReport("NandSDWorker: get banner failed.[%d]\n", getNandSaveBannerRes); - pWork->mAsyncResult = getNandSaveBannerRes; - goto CLEANUP; + result = get_nand_save_banner(myWork->curTitleId, &sdSaveBnr->banner, &sdSaveBnrSize); + if (result != RESULT_OK) { + OSReport("NandSDWorker: get banner failed.[%d]\n", result); + myWork->asyncResult = result; + goto clean_up; } - sdSaveBnr->mHdrSize = sdSaveBnrSize; - if ((sdSaveBnr->mBanner.flags & 1) != 0) { + // Cannot copy with the nocopy flag (this is prevented by iplMemory anyway) + sdSaveBnr->headerSize = sdSaveBnrSize; + if ((sdSaveBnr->banner.flags & WII_SAVE_BANNER_FLAG_NOCOPY) != 0) { OSReport("NandSDWorker: this save data has nocopy flag.\n"); - pWork->mAsyncResult = WORKER_RESULT_NOCOPY; - goto CLEANUP; + myWork->asyncResult = RESULT_NOCOPY; + goto clean_up; } - sdSaveBnr->mTitleId = pWork->mTitleId; + sdSaveBnr->curTitleId = myWork->curTitleId; - if (is_data_only_title(pWork->mTitleId)) + if (is_data_only_title(myWork->curTitleId)) { isDataOnlyTitle = true; - - if (isDataOnlyTitle) - goto START_BACKUP; - - if (!change_uid(pWork->mTitleId)) { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; } - get_nand_data_only_title_save_path(pWork->mTitleId, bnrPath); - strncat(bnrPath, "/", 0x40); - strncat(bnrPath, c_banner_file_name, 0x40); - int getStatusRes; - getStatusRes = nand::wrapper::GetStatus(bnrPath, &bnrFileStatus); - if (check_nand_corrupt(getStatusRes, &pWork->mAsyncResult)) - goto CLEANUP; - if (getStatusRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDGetStatus[%s] failed %d\n", bnrPath, getStatusRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + if (isDataOnlyTitle) { + goto start_backup; } - sdSaveBnr->mPerms = bnrFileStatus.permission; - sdSaveBnr->mAttrib = bnrFileStatus.attribute; - uVar1 = nand_get_length(bnrPath); - if (uVar1 < 0) { - pWork->mAsyncResult = uVar1; - goto CLEANUP; + if (!change_uid(myWork->curTitleId)) { + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - sdSaveBnr->mHdrSize = uVar1; - get_nand_data_only_title_save_path(pWork->mTitleId, bnrPath); + get_nand_data_only_title_save_path(myWork->curTitleId, bnrPath); - int changeDirRes; - changeDirRes = nand::wrapper::ChangeDir(bnrPath); - if (changeDirRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDChangeDir %s failed.[%d]\n", bnrPath, changeDirRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + strncat(bnrPath, "/", NAND_MAX_PATH); + strncat(bnrPath, c_banner_file_name, NAND_MAX_PATH); + + err = nand::wrapper::GetStatus(bnrPath, &bnrFileStatus); + if (check_nand_corrupt(err, &myWork->asyncResult)) + goto clean_up; + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDGetStatus[%s] failed %d\n", bnrPath, err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; + } + sdSaveBnr->perms = bnrFileStatus.permission; + sdSaveBnr->attr = bnrFileStatus.attribute; + + bnrLen = nand_get_length(bnrPath); + if (bnrLen < 0) { + myWork->asyncResult = bnrLen; + goto clean_up; + } + sdSaveBnr->headerSize = bnrLen; + get_nand_data_only_title_save_path(myWork->curTitleId, bnrPath); + + err = nand::wrapper::ChangeDir(bnrPath); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDChangeDir %s failed.[%d]\n", bnrPath, err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } changedDir = true; - START_BACKUP: + start_backup: backupWadSize = 0; - int wadBackupRes; + s32 wadErr; + + // Attempt to backup if (isDataOnlyTitle) { - wadBackupRes = - WADBackupEx(pWork->mTitleId, 1, &pWork->mBothHeapAllocator, NULL, &backupWadSize, WAD_LOC_SD_CARD, sizeof(SDSaveBanner), NULL); + wadErr = + WADBackupEx(myWork->curTitleId, 1, &myWork->unkAllocator, NULL, &backupWadSize, WAD_LOCATION_SD_CARD, sizeof(SDSaveBanner), NULL); } else { - wadBackupRes = - WADBackupEx(pWork->mTitleId, 14, &pWork->mBothHeapAllocator, NULL, &backupWadSize, WAD_LOC_SD_CARD, sizeof(SDSaveBanner), NULL); + wadErr = + WADBackupEx(myWork->curTitleId, 14, &myWork->unkAllocator, NULL, &backupWadSize, WAD_LOCATION_SD_CARD, sizeof(SDSaveBanner), NULL); } - if (wadBackupRes == -3002) { - OSReport("NandSDWorker: WADBackup 0x%016llx failed, this save data has nocopy only.[%d]\n", pWork->mTitleId, wadBackupRes); - pWork->mAsyncResult = WORKER_RESULT_NOCOPY; - goto CLEANUP; - } else if (wadBackupRes != 0) { - OSReport("NandSDWorker: WADBackup %s failed.[%d]\n", bnrPath, wadBackupRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + if (wadErr == WAD_ERROR_NOCOPY) { + OSReport("NandSDWorker: WADBackup 0x%016llx failed, this save data has nocopy only.[%d]\n", myWork->curTitleId, wadErr); + myWork->asyncResult = RESULT_NOCOPY; + goto clean_up; + } else if (wadErr != 0) { + OSReport("NandSDWorker: WADBackup %s failed.[%d]\n", bnrPath, wadErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } if (backupWadSize + sizeof(SDSaveBanner) > sdFreeArea) { OSReport("NandSDWorker: backup size [%d] is too large for SD card.\n", backupWadSize); - pWork->mAsyncResult = WORKER_RESULT_NO_SPACE; - goto CLEANUP; + myWork->asyncResult = RESULT_OUT_OF_SPACE; + goto clean_up; } - memcpy(sdSaveBnr->mMd5Digest, c_md5_secret_key, 0x10); - NETMD5Context md5Ctx; - u8 md5Digest[0x10]; - NETMD5Init(&md5Ctx); - NETMD5Update(&md5Ctx, sdSaveBnr, sizeof(SDSaveBanner)); - NETMD5GetDigest(&md5Ctx, md5Digest); - memcpy(sdSaveBnr->mMd5Digest, md5Digest, 0x10); - encSaveBnr = MEMAllocFromAllocator(&pWork->mBothHeapAllocator, sizeof(SDSaveBanner)); - if (encrypt(sdSaveBnr, sizeof(SDSaveBanner), encSaveBnr) != WORKER_RESULT_OK) { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + memcpy(sdSaveBnr->MD5Sum, c_md5_secret_key, NET_MD5_DIGEST_SIZE); + + NETMD5Sum MD5Sum; + NETCalcMD5(MD5Sum, sdSaveBnr, sizeof(SDSaveBanner)); + + memcpy(sdSaveBnr->MD5Sum, MD5Sum, NET_MD5_DIGEST_SIZE); + encSaveBnr = MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDSaveBanner)); + if (encrypt(sdSaveBnr, sizeof(SDSaveBanner), encSaveBnr) != RESULT_OK) { + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } backedUp = true; if (isDataOnlyTitle) { - wadBackupRes = WADBackupEx(pWork->mTitleId, 1, &pWork->mBothHeapAllocator, savePath, &backupWadSize, WAD_LOC_SD_CARD, 0xf0c0, NULL); + wadErr = WADBackupEx(myWork->curTitleId, 1, &myWork->unkAllocator, savePath, &backupWadSize, WAD_LOCATION_SD_CARD, 0xf0c0, NULL); } else { - wadBackupRes = WADBackupEx(pWork->mTitleId, 14, &pWork->mBothHeapAllocator, savePath, &backupWadSize, WAD_LOC_SD_CARD, 0xf0c0, NULL); + wadErr = WADBackupEx(myWork->curTitleId, 14, &myWork->unkAllocator, savePath, &backupWadSize, WAD_LOCATION_SD_CARD, 0xf0c0, NULL); } - if (wadBackupRes == -3002) { - OSReport("NandSDWorker: WADBackup 0x%016llx failed, this save data has nocopy only.[%d]\n", pWork->mTitleId, wadBackupRes); - pWork->mAsyncResult = WORKER_RESULT_NOCOPY; - goto CLEANUP; - } else if (wadBackupRes != 0) { - OSReport("NandSDWorker: WADBackup %s failed.[%d]\n", bnrPath, wadBackupRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + if (wadErr == WAD_ERROR_NOCOPY) { + OSReport("NandSDWorker: WADBackup 0x%016llx failed, this save data has nocopy only.[%d]\n", myWork->curTitleId, wadErr); + myWork->asyncResult = RESULT_NOCOPY; + goto clean_up; + } else if (wadErr != 0) { + OSReport("NandSDWorker: WADBackup %s failed.[%d]\n", bnrPath, wadErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } OSReport("NandSDWorker: make wad backup, size = [%d].\n", backupWadSize); + FAFILE* stream; stream = FAFopen(savePath, "r+"); if (stream == NULL) { OSReport("NandSDWorker: FAFopen %s failed.\n", savePath); - handle_sd_error(FA_ERR_SYSTEM, &pWork->mAsyncResult); - goto CLEANUP; + handle_sd_error(FA_ERR_SYSTEM, &myWork->asyncResult); + goto clean_up; } OSReport("NandSDWorker: create %s in sd.\n", savePath); - if (handle_sd_error(FAFseek(stream, 0, FA_SEEK_ORIGIN_BEGIN), &pWork->mAsyncResult) != WORKER_RESULT_OK) { + if (handle_sd_error(FAFseek(stream, 0, FA_SEEK_ORIGIN_BEGIN), &myWork->asyncResult) != RESULT_OK) { OSReport("NandSDWorker: FAFseek %s failed.\n", savePath); FAFclose(stream); - goto CLEANUP; + goto clean_up; } size_t fwriteRes; fwriteRes = FAFwrite(encSaveBnr, sizeof(SDSaveBanner), 1, stream); if (fwriteRes != 1) { OSReport("NandSDWorker: FAFwrite %s failed.[%d]\n", savePath, fwriteRes); - handle_sd_error(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error(FA_ERR_SYSTEM, &myWork->asyncResult); FAFclose(stream); - goto CLEANUP; + goto clean_up; } - if (handle_sd_error(FAFclose(stream), &pWork->mAsyncResult) != WORKER_RESULT_OK) { + if (handle_sd_error(FAFclose(stream), &myWork->asyncResult) != RESULT_OK) { OSReport("NandSDWorker: FAFclose %s failed.\n", savePath); - goto CLEANUP; + goto clean_up; } int nocopyExists, notransferExists; - nocopyExists = item_exist_nand_save_folder(pWork->mTitleId, c_nocopy_folder_name); - notransferExists = item_exist_nand_save_folder(pWork->mTitleId, c_notransfer_folder_name); + nocopyExists = item_exist_nand_save_folder(myWork->curTitleId, c_nocopy_folder_name); + notransferExists = item_exist_nand_save_folder(myWork->curTitleId, c_notransfer_folder_name); bool dataOnlyTitle; dataOnlyTitle = false; - if (isDataOnlyTitle) + if (isDataOnlyTitle) { dataOnlyTitle = true; - pWork->mAsyncResult = nocopyExists | (notransferExists << 1) | (dataOnlyTitle << 2); - pWork->mSdSaveNum++; + } + myWork->asyncResult = nocopyExists | (notransferExists << 1) | (dataOnlyTitle << 2); + myWork->sdSaveNum++; - CLEANUP: + clean_up: if (sdSaveBnr != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, sdSaveBnr); + MEMFreeToExpHeap(myWork->mainHeap, sdSaveBnr); } if (encSaveBnr != NULL) { - MEMFreeToAllocator(&pWork->mBothHeapAllocator, encSaveBnr); + MEMFreeToAllocator(&myWork->unkAllocator, encSaveBnr); } + change_uid(SYSMENU_TITLE_ID); if (changedDir) { - int changeDirRes = nand::wrapper::ChangeDir(c_wii_menu_save_path); - if (changeDirRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDChangeDir %s failed.[%d]\n", c_wii_menu_save_path, changeDirRes); + err = nand::wrapper::ChangeDir(c_wii_menu_save_path); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDChangeDir %s failed.[%d]\n", c_wii_menu_save_path, err); } } - if (pWork->mAsyncResult < WORKER_RESULT_OK && backedUp) { - int handleSdErrRes = handle_sd_error_for_entry(FARemove(savePath), NULL); - if (handleSdErrRes == WORKER_RESULT_OK) { + if (myWork->asyncResult < RESULT_OK && backedUp) { + int result = handle_sd_error_for_entry(FARemove(savePath), NULL); + if (result == RESULT_OK) { OSReport("NandSDWorker: remove %s because copy is not done correctly.\n", savePath); } else { - OSReport("NandSDWorker: FARemove %s failed.[%d]\n", savePath, handleSdErrRes); + OSReport("NandSDWorker: FARemove %s failed.[%d]\n", savePath, result); } } } + int NandSDWorker::prepare_sd_copy(const char* path) { - FAFileStat fStat; - int errno; - FAError statFaErr = FAFstat(path, &fStat); - errno = handle_sd_error_for_entry(statFaErr, NULL); - if (errno == WORKER_RESULT_OK) { - if (fStat.size > sizeof(SDSaveBanner) && is_fa_file(fStat.stat)) { + FAFileStat fileStat; + int err; + + FAError faErr = FAFstat(path, &fileStat); + + err = handle_sd_error_for_entry(faErr, NULL); + if (err == RESULT_OK) { + if (fileStat.size > sizeof(SDSaveBanner) && is_fa_file(fileStat.stat)) { OSReport("NandSDWorker: sd data [%s] already exists.\n", path); - return WORKER_RESULT_ALREADY_EXISTS; + return RESULT_ALREADY_EXISTS; } - if (statFaErr == FA_ERR_SUCCESS) { - errno = handle_sd_error_for_entry(FARemove(path), NULL); - if (errno != WORKER_RESULT_OK && errno != WORKER_RESULT_GENERIC_ERR) { - OSReport("NandSDWorker: FARemove %s failed.[%d]\n", path, errno); - return errno; + if (faErr == FA_ERR_SUCCESS) { + err = handle_sd_error_for_entry(FARemove(path), NULL); + if (err != RESULT_OK && err != RESULT_FATAL_SD_ERROR) { + OSReport("NandSDWorker: FARemove %s failed.[%d]\n", path, err); + return err; } } - } else if (errno == WORKER_RESULT_GENERIC_ERR) { - errno = create_sd_backup_dir(pWork->mTitleId); - if (errno != WORKER_RESULT_OK) { - OSReport("NandSDWorker: create sd backup dir failed.[%d]\n", errno); - return errno; + } else if (err == RESULT_FATAL_SD_ERROR) { + err = create_sd_backup_dir(myWork->curTitleId); + if (err != RESULT_OK) { + OSReport("NandSDWorker: create sd backup dir failed.[%d]\n", err); + return err; } } else { - OSReport("NandSDWorker: FAFstat %s failed.[%d]\n", path, errno); - return errno; + OSReport("NandSDWorker: FAFstat %s failed.[%d]\n", path, err); + return err; } - return WORKER_RESULT_OK; + return RESULT_OK; } int NandSDWorker::create_sd_backup_dir(ESTitleId titleId) { - char path[0x40]; + char path[NAND_MAX_PATH]; ESTitleId32 titleCode = ES_TITLE_CODE(titleId); - const char* paths[4] = { + const char* c_sd_app_location_paths[4] = { NULL, "/private/wii/title", "/private/wii", @@ -2686,363 +3091,372 @@ namespace ipl { }; if (is_data_only_title(titleId)) { - snprintf(path, 0x40, "/private/wii/title/%08x", titleCode); + snprintf(path, NAND_MAX_PATH, "/private/wii/title/%08x", titleCode); } else { - snprintf(path, 0x40, "/private/wii/title/%c%c%c%c", (u8)(titleCode >> 0x18), (u8)(titleCode >> 0x10), (u8)(titleCode >> 0x08), - (u8)(titleCode >> 0x00)); + snprintf(path, NAND_MAX_PATH, "/private/wii/title/%c%c%c%c", (u8)(titleCode >> 0x18), (u8)(titleCode >> 0x10), (u8)(titleCode >> 0x08), + (u8)titleCode); } - paths[0] = path; + c_sd_app_location_paths[0] = path; const char* fileName; u32 i; - for (i = 0; i < 4; i++) { - fileName = paths[i]; + for (i = 0; i < (int)ARRAY_LENGTH(c_sd_app_location_paths); i++) { + fileName = c_sd_app_location_paths[i]; - FAFileStat fStat; - int handleSdErrRes = handle_sd_error_for_entry(FAFstat(fileName, &fStat), NULL); - if (handleSdErrRes == WORKER_RESULT_OK) { - if ((fStat.stat & 0x10) == 0) { - OSReport("NandSDWorker: %s is not a dir.[%d]\n", fileName, fStat.stat); - return WORKER_RESULT_UNK_N12; + FAFileStat fileStat; + int result = handle_sd_error_for_entry(FAFstat(fileName, &fileStat), NULL); + if (result == RESULT_OK) { + if ((fileStat.stat & FA_FILE_STAT_DIR) == 0) { + OSReport("NandSDWorker: %s is not a dir.[%d]\n", fileName, fileStat.stat); + return RESULT_UNK_N12; } break; } - if (handleSdErrRes != WORKER_RESULT_GENERIC_ERR) { - OSReport("NandSDWorker: FAFstat %s failed.[%d]\n", fileName, handleSdErrRes); - return handleSdErrRes; + if (result != RESULT_FATAL_SD_ERROR) { + OSReport("NandSDWorker: FAFstat %s failed.[%d]\n", fileName, result); + return result; } } - if (i != 0) - return create_sd_dir(paths[i - 1], path); - else - return WORKER_RESULT_OK; + if (i != 0) { + return create_sd_dir(c_sd_app_location_paths[i - 1], path); + } else { + return RESULT_OK; + } } int NandSDWorker::create_sd_dir(const char* base, const char* final) { - char currPath[0x40]; - int createDirRes; + char curPath[NAND_MAX_PATH]; + int result; - u32 currLen = strlen(base); + u32 curLen = strlen(base); u32 finalLen = strlen(final); - strncpy(currPath, base, 0x40); - while (true) { - FADta fData; - memset(&fData, 0, sizeof(FADta)); - createDirRes = handle_sd_error_for_entry(FACreatedir(currPath, 0, &fData), NULL); - if (createDirRes != WORKER_RESULT_OK) { - OSReport("NandSDWorker: FACreatedir %s failed.[%d]\n", currPath, createDirRes); - return createDirRes; - } - OSReport("NandSDWorker: create sd card dir [%s].\n", currPath); - if (currLen + 1 >= finalLen) - break; - strncpy(currPath, final, 0x40); + strncpy(curPath, base, NAND_MAX_PATH); - char* nextSlash = strstr(currLen + 1 + currPath, "/"); + while (true) { + FADta fileDta; + memset(&fileDta, 0, sizeof(FADta)); + result = handle_sd_error_for_entry(FACreatedir(curPath, 0, &fileDta), NULL); + if (result != RESULT_OK) { + OSReport("NandSDWorker: FACreatedir %s failed.[%d]\n", curPath, result); + return result; + } + + OSReport("NandSDWorker: create sd card dir [%s].\n", curPath); + if (curLen + 1 >= finalLen) { + break; + } + + strncpy(curPath, final, NAND_MAX_PATH); + + char* nextSlash = strstr(curLen + 1 + curPath, "/"); if (nextSlash != NULL) { *nextSlash = '\0'; } - currLen = strlen(currPath); + curLen = strlen(curPath); } - return WORKER_RESULT_OK; + return RESULT_OK; } void NandSDWorker::do_copy_sd_save_to_nand() { bool hasNotransfer = false; - SDSaveBanner* saveBnr; + SDSaveBanner* saveBanner; - char sdSavePath[0x40]; - char pathC[0x40]; - char pathB[0x40]; - char pathA[0x40] = ""; + char sdSavePath[NAND_MAX_PATH]; + char targetPath[NAND_MAX_PATH]; + char tmpPath[NAND_MAX_PATH]; + char unusedPath[NAND_MAX_PATH] = ""; bool changedDir = false; bool isDataOnlyTitle = false; - get_sd_save_path(pWork->mTitleId, sdSavePath); - saveBnr = (SDSaveBanner*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, sizeof(SDSaveBanner)); - int getSaveBannerRes = get_sd_save_banner(pWork->mTitleId, saveBnr); - if (getSaveBannerRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = getSaveBannerRes; - goto CLEANUP; + get_sd_save_path(myWork->curTitleId, sdSavePath); + saveBanner = (SDSaveBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDSaveBanner)); + int getSaveBannerRes = get_sd_save_banner(myWork->curTitleId, saveBanner); + if (getSaveBannerRes != RESULT_OK) { + myWork->asyncResult = getSaveBannerRes; + goto clean_up; } ESTitleId wadTitleId; u16 titleVersion; - int getTitleVersionRes; - getTitleVersionRes = WADGetTitleVersionEx(sdSavePath, &wadTitleId, &titleVersion, WAD_LOC_SD_CARD, sizeof(SDSaveBanner)); - if (getTitleVersionRes != 0) { - OSReport("NandSDWorker: WADGetTitleVersionEx failed.[%d]\n", getTitleVersionRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + + s32 wadErr; + wadErr = WADGetTitleVersionEx(sdSavePath, &wadTitleId, &titleVersion, WAD_LOCATION_SD_CARD, sizeof(SDSaveBanner)); + if (wadErr != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADGetTitleVersionEx failed.[%d]\n", wadErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - if (wadTitleId != saveBnr->mTitleId) { - OSReport("NandSDWorker: titleid %016llx in wad is different from %016llx in banner %s.\n", wadTitleId, saveBnr->mTitleId, sdSavePath); - pWork->mAsyncResult = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + if (wadTitleId != saveBanner->curTitleId) { + OSReport("NandSDWorker: titleid %016llx in wad is different from %016llx in banner %s.\n", wadTitleId, saveBanner->curTitleId, + sdSavePath); + myWork->asyncResult = RESULT_BAD_FILE; + goto clean_up; } - if (is_data_only_title(saveBnr->mTitleId)) { + if (is_data_only_title(saveBanner->curTitleId)) { isDataOnlyTitle = true; - if (nand_app_exist_ex(saveBnr->mTitleId)) { - OSReport("NandSDWorker: titleid = 0x%016llx is already in nand.\n", saveBnr->mTitleId); - pWork->mAsyncResult = WORKER_RESULT_ALREADY_EXISTS; - goto CLEANUP; + if (nand_app_exist_ex(saveBanner->curTitleId)) { + OSReport("NandSDWorker: titleid = 0x%016llx is already in nand.\n", saveBanner->curTitleId); + myWork->asyncResult = RESULT_ALREADY_EXISTS; + goto clean_up; } } if (!isDataOnlyTitle) { - ESError prepTitleDirRes = utility::ESMisc::PrepareTitleDir(saveBnr->mTitleId, System::getMem2Sys()); - if (prepTitleDirRes == ES_ERR_NO_TMD_FILE_FOUND) { - OSReport("NandSDWorker: titleid = 0x%016llx is not installed.\n", saveBnr->mTitleId); - pWork->mAsyncResult = WORKER_RESULT_ES_ERROR; - goto CLEANUP; + ESError esErr = utility::ESMisc::PrepareTitleDir(saveBanner->curTitleId, System::getMem2Sys()); + if (esErr == ES_ERR_NO_TMD_FILE_FOUND) { + OSReport("NandSDWorker: titleid = 0x%016llx is not installed.\n", saveBanner->curTitleId); + myWork->asyncResult = RESULT_ES_ERROR; + goto clean_up; } - if (prepTitleDirRes != 0) { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + if (esErr != ES_ERR_OK) { + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - if (!change_uid(saveBnr->mTitleId)) { - OSReport("NandSDWorker: titleid = 0x%016llx is not installed.\n", saveBnr->mTitleId); - pWork->mAsyncResult = WORKER_RESULT_ES_ERROR; - goto CLEANUP; + if (!change_uid(saveBanner->curTitleId)) { + OSReport("NandSDWorker: titleid = 0x%016llx is not installed.\n", saveBanner->curTitleId); + myWork->asyncResult = RESULT_ES_ERROR; + goto clean_up; } - if (check_nand_save_banner_exist(saveBnr->mTitleId)) { - OSReport("NandSDWorker: titleid = 0x%016llx is already in nand.\n", saveBnr->mTitleId); - pWork->mAsyncResult = WORKER_RESULT_ALREADY_EXISTS; - goto CLEANUP; + if (check_nand_save_banner_exist(saveBanner->curTitleId)) { + OSReport("NandSDWorker: titleid = 0x%016llx is already in nand.\n", saveBanner->curTitleId); + myWork->asyncResult = RESULT_ALREADY_EXISTS; + goto clean_up; } - get_nand_data_only_title_save_path(saveBnr->mTitleId, pathC); + get_nand_data_only_title_save_path(saveBanner->curTitleId, targetPath); - int delRes = nand::wrapper::Delete(c_tmp_work_path); - if (check_nand_corrupt(delRes, &pWork->mAsyncResult)) - goto CLEANUP; - - int createDirRes = nand::wrapper::CreateDir(c_tmp_work_path, NAND_PERM_USER_READ | NAND_PERM_USER_WRITE, 0); - if (check_nand_corrupt(createDirRes, &pWork->mAsyncResult)) - goto CLEANUP; - if (createDirRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDCreateDir %s failed.[%d]\n", c_tmp_work_path, createDirRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + s32 nandErr = nand::wrapper::Delete(c_tmp_work_path); + if (check_nand_corrupt(nandErr, &myWork->asyncResult)) { + goto clean_up; } - int changeDirRes = nand::wrapper::ChangeDir(c_tmp_work_path); - if (changeDirRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDChangeDir %s failed.[%d]\n", c_tmp_work_path, changeDirRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + + nandErr = nand::wrapper::CreateDir(c_tmp_work_path, NAND_PERM_USER_READ | NAND_PERM_USER_WRITE, 0); + if (check_nand_corrupt(nandErr, &myWork->asyncResult)) { + goto clean_up; + } + if (nandErr != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDCreateDir %s failed.[%d]\n", c_tmp_work_path, nandErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; + } + nandErr = nand::wrapper::ChangeDir(c_tmp_work_path); + if (nandErr != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDChangeDir %s failed.[%d]\n", c_tmp_work_path, nandErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } changedDir = true; } WADBlocks wadBlocks; - int getBlocksRes; - getBlocksRes = WADImportGetBlocks(sdSavePath, &pWork->mBothHeapAllocator, WAD_LOC_SD_CARD, sizeof(SDSaveBanner), 1, &wadBlocks, NULL); - if (getBlocksRes == -3008) { - OSReport("NandSDWorker: WADImportGetBlocks failed, not original Wii.[%d]\n", getBlocksRes); - pWork->mAsyncResult = WORKER_RESULT_NOT_TRANSFERRABLE; - goto CLEANUP; - } else if (getBlocksRes != 0) { - OSReport("NandSDWorker: WADImportGetBlocks failed.[%d]\n", getBlocksRes); - pWork->mAsyncResult = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + wadErr = WADImportGetBlocks(sdSavePath, &myWork->unkAllocator, WAD_LOCATION_SD_CARD, sizeof(SDSaveBanner), 1, &wadBlocks, NULL); + if (wadErr == WAD_ERROR_INCORRECT_DEVICE) { + OSReport("NandSDWorker: WADImportGetBlocks failed, not original Wii.[%d]\n", wadErr); + myWork->asyncResult = RESULT_NOT_TRANSFERRABLE; + goto clean_up; + } else if (wadErr != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADImportGetBlocks failed.[%d]\n", wadErr); + myWork->asyncResult = RESULT_BAD_FILE; + goto clean_up; } OSReport("NandSDWorker: shared content inodes/blocks = %d/%d\n", wadBlocks.sharedInodes, wadBlocks.sharedBlocks); OSReport("NandSDWorker: private content inodes/blocks = %d/%d\n", wadBlocks.privateInodes, wadBlocks.privateBlocks); OSReport("NandSDWorker: file inodes/blocks = %d/%d\n", wadBlocks.fileInodes, wadBlocks.fileBlocks); - int checkFreeAreaRes; - checkFreeAreaRes = check_nand_free_area(wadBlocks.sharedInodes, wadBlocks.sharedBlocks, wadBlocks.privateInodes + wadBlocks.fileInodes + 1, - (saveBnr->mHdrSize + FS_BLK_SIZE - 1) / FS_BLK_SIZE + wadBlocks.fileBlocks + wadBlocks.privateBlocks); - if (checkFreeAreaRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = checkFreeAreaRes; - goto CLEANUP; + int result; + result = + check_nand_free_area(wadBlocks.sharedInodes, wadBlocks.sharedBlocks, wadBlocks.privateInodes + wadBlocks.fileInodes + 1, + (saveBanner->headerSize + NAND_BLOCK_SIZE - 1) / NAND_BLOCK_SIZE + wadBlocks.fileBlocks + wadBlocks.privateBlocks); + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } if (!isDataOnlyTitle) { - WADBackupHeader wadHdr; - int getSdWadHeaderRes = get_sd_wad_header(pWork->mTitleId, &wadHdr, 0); - if (getSdWadHeaderRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = getSdWadHeaderRes; - goto CLEANUP; + WADBackupHeader wadBackupHeader; + result = get_sd_wad_header(myWork->curTitleId, &wadBackupHeader, 0); + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } if (wadBlocks.fileInodes == 0) { - if (wadHdr.numFiles != 0) { + if (wadBackupHeader.numFiles != 0) { OSReport("NandSDWorker: this save data includes only notransfer.\n"); - pWork->mAsyncResult = WORKER_RESULT_NOT_TRANSFERRABLE; - goto CLEANUP; + myWork->asyncResult = RESULT_NOT_TRANSFERRABLE; + goto clean_up; } } - if (wadBlocks.fileInodes < wadHdr.numFiles - 1) { + if (wadBlocks.fileInodes < wadBackupHeader.numFiles - 1) { OSReport("NandSDWorker: this save data includes notransfer, %d files/directries not copied.\n", - wadHdr.numFiles - wadBlocks.fileInodes); + wadBackupHeader.numFiles - wadBlocks.fileInodes); hasNotransfer = true; } } - int wadImportRes; - wadImportRes = WADImportEx(sdSavePath, &pWork->mBothHeapAllocator, WAD_LOC_SD_CARD, sizeof(SDSaveBanner), 8, NULL); - if (wadImportRes != 0) { - OSReport("NandSDWorker: WADRestoreSDEx failed.[%d]\n", wadImportRes); + wadErr = WADImportEx(sdSavePath, &myWork->unkAllocator, WAD_LOCATION_SD_CARD, sizeof(SDSaveBanner), 8, NULL); + if (wadErr != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADRestoreSDEx failed.[%d]\n", wadErr); if (isDataOnlyTitle) { - if (nand_app_exist_ex(saveBnr->mTitleId) != EXISTENCE_COMPLETE) { - int delNandAppContentRes = delete_nand_app_content(saveBnr->mTitleId); - if (delNandAppContentRes == WORKER_RESULT_NAND_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; - goto CLEANUP; + if (nand_app_exist_ex(saveBanner->curTitleId) != EXISTENCE_COMPLETE) { + int delNandAppContentRes = delete_nand_app_content(saveBanner->curTitleId); + if (delNandAppContentRes == RESULT_NAND_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; + goto clean_up; } - if (delNandAppContentRes != WORKER_RESULT_OK) { - OSReport("NandSDWorker: delete title 0x%016llx content failed.[%d]\n", saveBnr->mTitleId, delNandAppContentRes); + if (delNandAppContentRes != RESULT_OK) { + OSReport("NandSDWorker: delete title 0x%016llx content failed.[%d]\n", saveBanner->curTitleId, delNandAppContentRes); } } } - pWork->mAsyncResult = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + myWork->asyncResult = RESULT_BAD_FILE; + goto clean_up; } if (!isDataOnlyTitle) { - strncpy(pathB, c_tmp_work_path, 0x40); - strncat(pathB, "/", 0x40); - strncat(pathB, c_banner_file_name, 0x40); + strncpy(tmpPath, c_tmp_work_path, NAND_MAX_PATH); + strncat(tmpPath, "/", NAND_MAX_PATH); + strncat(tmpPath, c_banner_file_name, NAND_MAX_PATH); - int createRes = nand::wrapper::Create(pathB, saveBnr->mPerms, saveBnr->mAttrib); - if (check_nand_corrupt(createRes, &pWork->mAsyncResult)) - goto CLEANUP; - if (createRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDCreate %s failed [%d]\n", pathB, createRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + s32 nandErr = nand::wrapper::Create(tmpPath, saveBanner->perms, saveBanner->attr); + if (check_nand_corrupt(nandErr, &myWork->asyncResult)) { + goto clean_up; + } + if (nandErr != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDCreate %s failed [%d]\n", tmpPath, nandErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - NANDFileInfo fInfo; - int openRes = nand::wrapper::Open(pathB, &fInfo, NAND_ACCESS_WRITE); - if (openRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDOpen %s failed [%d]\n", pathB, openRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + NANDFileInfo fileInfo; + s32 err = nand::wrapper::Open(tmpPath, &fileInfo, NAND_ACCESS_WRITE); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDOpen %s failed [%d]\n", tmpPath, err); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - s32 writeRes = nand::wrapper::Write(&fInfo, &saveBnr->mBanner, saveBnr->mHdrSize); - if (check_nand_corrupt(writeRes, &pWork->mAsyncResult)) { - nand::wrapper::Close(&fInfo); - goto CLEANUP; + nandErr = nand::wrapper::Write(&fileInfo, &saveBanner->banner, saveBanner->headerSize); + if (check_nand_corrupt(nandErr, &myWork->asyncResult)) { + nand::wrapper::Close(&fileInfo); + goto clean_up; } - if (writeRes < saveBnr->mHdrSize) { - OSReport("NandSDWorker: NANDWrite %s failed [%d]\n", pathB, writeRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - nand::wrapper::Close(&fInfo); - goto CLEANUP; + if (nandErr < saveBanner->headerSize) { + OSReport("NandSDWorker: NANDWrite %s failed [%d]\n", tmpPath, nandErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + nand::wrapper::Close(&fileInfo); + goto clean_up; } - int closeRes = nand::wrapper::Close(&fInfo); - if (check_nand_corrupt(closeRes, &pWork->mAsyncResult)) - goto CLEANUP; - if (closeRes != 0) { - OSReport("NandSDWorker: NANDClose %s failed [%d]\n", pathB, closeRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + nandErr = nand::wrapper::Close(&fileInfo); + if (check_nand_corrupt(nandErr, &myWork->asyncResult)) + goto clean_up; + if (nandErr != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDClose %s failed [%d]\n", tmpPath, nandErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - int recursionNandRes = recursion_nand(c_tmp_work_path, pathC, RECURSIVE_MOVE, NULL, 0); - if (recursionNandRes != WORKER_RESULT_OK) { - OSReport("NandSDWorker: failed to move files from %s to %s.\n", c_tmp_work_path, pathC); - pWork->mAsyncResult = recursionNandRes; - goto CLEANUP; + result = recursion_nand(c_tmp_work_path, targetPath, RECURSIVE_MOVE, NULL, 0); + if (result != RESULT_OK) { + OSReport("NandSDWorker: failed to move files from %s to %s.\n", c_tmp_work_path, targetPath); + myWork->asyncResult = result; + goto clean_up; } - OSReport("NandSDWorker: import save data titleid = 0x%016llx.\n", saveBnr->mTitleId); + OSReport("NandSDWorker: import save data titleid = 0x%016llx.\n", saveBanner->curTitleId); if (hasNotransfer) { - pWork->mAsyncResult = 1; + myWork->asyncResult = 1; } else { - pWork->mAsyncResult = 0; + myWork->asyncResult = 0; } } - pWork->mNandSaveNum++; - CLEANUP: + myWork->nandSaveNum++; + clean_up: if (!isDataOnlyTitle) { - check_nand_corrupt(nand::wrapper::Delete(c_tmp_work_path), &pWork->mAsyncResult); + check_nand_corrupt(nand::wrapper::Delete(c_tmp_work_path), &myWork->asyncResult); change_uid(SYSMENU_TITLE_ID); if (changedDir) { - int changeDirRes = nand::wrapper::ChangeDir(c_wii_menu_save_path); - if (changeDirRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDChangeDir %s failed.[%d]\n", c_wii_menu_save_path, changeDirRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + s32 nandErr = nand::wrapper::ChangeDir(c_wii_menu_save_path); + if (nandErr != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDChangeDir %s failed.[%d]\n", c_wii_menu_save_path, nandErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; } } } - if (saveBnr != NULL) { - MEMFreeToAllocator(&pWork->mBothHeapAllocator, saveBnr); + if (saveBanner != NULL) { + MEMFreeToAllocator(&myWork->unkAllocator, saveBanner); } } int NandSDWorker::get_sd_save_banner(ESTitleId32 titleId, SDSaveBanner* banner) { s32 ret; - SDSaveBanner* encBanner = (SDSaveBanner*)MEMAllocFromExpHeapEx(pWork->pHeap19000, sizeof(SDSaveBanner), 0x20); + SDSaveBanner* encBanner = (SDSaveBanner*)MEMAllocFromExpHeapEx(myWork->mainHeap, sizeof(SDSaveBanner), 32); if (banner == NULL || encBanner == NULL) { OSReport("NandSDWorker: Failed to allocate buffer.\n"); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - char sdSavePath[0x40]; + char sdSavePath[NAND_MAX_PATH]; get_sd_save_path(titleId, sdSavePath); FAFILE* fStream; fStream = FAFopen(sdSavePath, "r"); if (fStream == NULL) { OSReport("NandSDWorker: FAFopen %s failed.\n", sdSavePath); handle_sd_error_for_entry(FA_ERR_SYSTEM, &ret); - goto CLEANUP; + goto clean_up; } if (FAFread(encBanner, sizeof(SDSaveBanner), 1, fStream) != 1) { ret = handle_sd_error_for_entry(FA_ERR_SYSTEM, NULL); - if (ret == WORKER_RESULT_OK || ret == WORKER_RESULT_GENERIC_ERR) { - ret = WORKER_RESULT_BAD_FILE; + if (ret == RESULT_OK || ret == RESULT_FATAL_SD_ERROR) { + ret = RESULT_BAD_FILE; } FAFclose(fStream); - goto CLEANUP; + goto clean_up; } - if (handle_sd_error_for_entry(FAFclose(fStream), &ret) != WORKER_RESULT_OK) { + if (handle_sd_error_for_entry(FAFclose(fStream), &ret) != RESULT_OK) { OSReport("NandSDWorker: FAFclose failed.\n"); - goto CLEANUP; + goto clean_up; } - if (decrypt(encBanner, sizeof(SDSaveBanner), banner) != WORKER_RESULT_OK) { - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + if (decrypt(encBanner, sizeof(SDSaveBanner), banner) != RESULT_OK) { + ret = RESULT_BAD_FILE; + goto clean_up; } - u8 md5Digest[0x10]; - memcpy(md5Digest, banner->mMd5Digest, 0x10); - memcpy(banner->mMd5Digest, &c_md5_secret_key, 0x10); + NETMD5Sum MD5Sum; + memcpy(MD5Sum, banner->MD5Sum, NET_MD5_DIGEST_SIZE); + memcpy(banner->MD5Sum, &c_md5_secret_key, NET_MD5_DIGEST_SIZE); - if (!check_md5(md5Digest, (u8*)banner, sizeof(SDSaveBanner))) { + if (!check_md5(MD5Sum, (u8*)banner, sizeof(SDSaveBanner))) { OSReport("NandSDWorker: banner file %s md5 digest is not correct.\n", sdSavePath); - ret = WORKER_RESULT_BAD_FILE; - } else if ((titleId == (ESTitleId32)ES_TITLE_CODE(banner->mTitleId)) && (banner->mBanner.magic == 'WIBN')) { - ret = WORKER_RESULT_OK; + ret = RESULT_BAD_FILE; + } else if (titleId == (ESTitleId32)ES_TITLE_CODE(banner->curTitleId) && banner->banner.signature == WII_SAVE_BANNER_SIGNATURE) { + ret = RESULT_OK; } else { OSReport("NandSDWorker: banner file %s signature is not correct\n", sdSavePath); - ret = WORKER_RESULT_BAD_FILE; + ret = RESULT_BAD_FILE; } - CLEANUP: - MEMFreeToExpHeap(pWork->pHeap19000, encBanner); + clean_up: + MEMFreeToExpHeap(myWork->mainHeap, encBanner); return ret; } - int NandSDWorker::get_sd_wad_header(ESTitleId32 titleId, WADBackupHeader* wadHdr, u32 offsetIn) { + int NandSDWorker::get_sd_wad_header(ESTitleId32 titleId, WADBackupHeader* wadBackupHeader, u32 offset) { s32 ret; - char path[0x40]; + char path[NAND_MAX_PATH]; - u32 offset; - if (offsetIn == 0) { - offset = sizeof(SDSaveBanner); + u32 fileOffset; + if (offset == 0) { + fileOffset = sizeof(SDSaveBanner); get_sd_save_path(titleId, path); } else { - offset = offsetIn + sizeof(SDAppBanner); + fileOffset = offset + sizeof(SDAppBanner); get_sd_app_path(titleId, path); } @@ -3050,72 +3464,72 @@ namespace ipl { if (fStream == NULL) { OSReport("NandSDWorker: FAFopen %s failed.\n", path); handle_sd_error_for_entry(FA_ERR_SYSTEM, &ret); - goto RETURN; + goto ret; } - if (handle_sd_error_for_entry(FAFseek(fStream, offset, FA_SEEK_ORIGIN_BEGIN), &ret) != WORKER_RESULT_OK) { + if (handle_sd_error_for_entry(FAFseek(fStream, fileOffset, FA_SEEK_ORIGIN_BEGIN), &ret) != RESULT_OK) { OSReport("NandSDWorker: FAFseek %s failed.\n", path); FAFclose(fStream); - goto RETURN; + goto ret; } - if (FAFread(wadHdr, 0x70, 1, fStream) != 1) { + if (FAFread(wadBackupHeader, sizeof(WADBackupHeader), 1, fStream) != 1) { ret = handle_sd_error_for_entry(FA_ERR_SYSTEM, NULL); - if (ret == WORKER_RESULT_OK) { - ret = WORKER_RESULT_BAD_FILE; + if (ret == RESULT_OK) { + ret = RESULT_BAD_FILE; } FAFclose(fStream); - goto RETURN; + goto ret; } - if (handle_sd_error_for_entry(FAFclose(fStream), &ret) != WORKER_RESULT_OK) { + if (handle_sd_error_for_entry(FAFclose(fStream), &ret) != RESULT_OK) { OSReport("NandSDWorker: FAFclose failed.\n"); - goto RETURN; + goto ret; } - ret = WORKER_RESULT_OK; - RETURN: + ret = RESULT_OK; + ret: return ret; } void NandSDWorker::do_format_sd() { - if (s_sd_state != SD_STATE_READY && s_sd_state != SD_STATE_BROKEN_MEDIA) { + if (s_sd_state != SD_STATE_READY && s_sd_state != SD_STATE_BROKEN) { OSReport("NandSDWorker: cannot format sd because of illegal sd state.[%d]\n", s_sd_state); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + myWork->asyncResult = RESULT_FATAL_SD_ERROR; return; } - FAError formatFaError = FAFormat(pWork->mFatDriveTable.drive, 0); - if (formatFaError != FA_ERR_SUCCESS && FAErrnum() == FA_ERR_ENOEXEC) { + FAError faErr = FAFormat(myWork->driveTable.drive, 0); + if (faErr != FA_ERR_SUCCESS && FAErrnum() == FA_ERR_ENOEXEC) { OSReport("NandSDWorker: SD card MBR is broken. cannot use this media.\n"); - s_sd_state = SD_STATE_BROKEN_MEDIA; - pWork->mAsyncResult = WORKER_RESULT_BROKEN_MEDIA; + s_sd_state = SD_STATE_BROKEN; + myWork->asyncResult = RESULT_BROKEN_MEDIA; return; } - if (handle_sd_error(formatFaError, &pWork->mAsyncResult) == WORKER_RESULT_OK) { + if (handle_sd_error(faErr, &myWork->asyncResult) == RESULT_OK) { OSReport("NandSDWorker: successfully format sd.\n"); s_sd_state = SD_STATE_READY; - if (pWork->pSaveCacheHeap != NULL) { - clear_save_cache(&pWork->mSavesListSD); - pWork->mSdSaveNum = 0; + if (myWork->saveCacheHeap != NULL) { + clear_save_cache(&myWork->sdSaveList); + myWork->sdSaveNum = 0; } - if (pWork->pAppCacheHeap != NULL) { - clear_app_cache(&pWork->mAppsListSD); - pWork->mSdAppNum = 0; + if (myWork->appCacheHeap != NULL) { + clear_app_cache(&myWork->sdAppList); + myWork->sdAppNum = 0; } } else { - OSReport("NandSDWorker: FAFormat failed.[%d]\n", pWork->mAsyncResult); + OSReport("NandSDWorker: FAFormat failed.[%d]\n", myWork->asyncResult); } } u64 NandSDWorker::get_sd_free_area() { - u32 deviceInfo[4]; - FAError faErr = FAGetdev(pWork->mFatDriveTable.drive, deviceInfo); + FADevInf devInf; + FAError faErr = FAGetdev(myWork->driveTable.drive, &devInf); int handleSdErr = handle_sd_error(faErr, NULL); if (handleSdErr == NULL) { - OSReport("NandSDWorker: SD card free area = %llu\n", (u64)deviceInfo[1] * deviceInfo[3] * deviceInfo[2]); - return (s64)deviceInfo[1] * deviceInfo[3] * deviceInfo[2]; + OSReport("NandSDWorker: SD card free area = %llu\n", (u64)devInf.ecl * devInf.spc * devInf.bps); + return (s64)devInf.ecl * devInf.spc * devInf.bps; } else { OSReport("NandSDWorker: FAGetdev failed.[%d]\n", handleSdErr); return handleSdErr; @@ -3124,46 +3538,49 @@ namespace ipl { int NandSDWorker::delete_download_task(ESTitleId32 titleId) { void* nwc24Work; - int ret = WORKER_RESULT_OK; - nwc24Work = MEMAllocFromExpHeapEx(pWork->pHeap19000, 0x4000, 0x20); + int ret = RESULT_OK; + nwc24Work = MEMAllocFromExpHeapEx(myWork->mainHeap, NWC24_LIB_WORK_SIZE, 32); OSTick startTick = OSGetTick(); - goto ATTEMPT_OPEN; + + goto open_lib; while (true) { OSReport("NandSDWorker: waiting NWC24Open.\n"); - OSSleepTicks(OSMillisecondsToTicks(30ll)); + OSSleepTicks(OSMillisecondsToTicks((OSTime)30)); if (OSTicksToMilliseconds(OSGetTick() - startTick) > 3000) { - ret = WORKER_RESULT_GENERIC_ERR; + ret = RESULT_FATAL_SD_ERROR; OSReport("NandSDWorker: NWC24Open failed.\n"); break; } - ATTEMPT_OPEN: - if (NWC24OpenLib(nwc24Work) != NWC24_OK) + open_lib: + if (NWC24OpenLib(nwc24Work) != NWC24_OK) { continue; + } u16 dlId = 0; - for (int iterRes = NWC24IterateDlTask(&dlId, TRUE); iterRes >= 0; iterRes = NWC24IterateDlTask(&dlId, FALSE)) { + NWC24Err nwc24Err; + for (nwc24Err = NWC24IterateDlTask(&dlId, TRUE); nwc24Err >= NWC24_OK; nwc24Err = NWC24IterateDlTask(&dlId, FALSE)) { NWC24DlTask dlTask; - NWC24Err getDlTaskRes = NWC24GetDlTask(&dlTask, dlId); - if (getDlTaskRes != NWC24_OK) { - OSReport("NandSDWorker: NWC24GetDlTask failed - [%d] -> continue\n", getDlTaskRes); + nwc24Err = NWC24GetDlTask(&dlTask, dlId); + if (nwc24Err != NWC24_OK) { + OSReport("NandSDWorker: NWC24GetDlTask failed - [%d] -> continue\n", nwc24Err); continue; } u32 dlAppId; - NWC24Err getDlAppIdRes = NWC24GetDlAppId(&dlTask, &dlAppId); - if (getDlAppIdRes != NWC24_OK) { - OSReport("NandSDWorker: NWC24GetDlAppId failed - [%d] -> continue\n", getDlAppIdRes); + nwc24Err = NWC24GetDlAppId(&dlTask, &dlAppId); + if (nwc24Err != NWC24_OK) { + OSReport("NandSDWorker: NWC24GetDlAppId failed - [%d] -> continue\n", nwc24Err); continue; } if (dlAppId == titleId) { OSReport("NandSDWorker: found dl task owned same titleid [%p]\n", &dlTask); - NWC24Err delDlTaskRes = NWC24DeleteDlTask(&dlTask); - if (delDlTaskRes != NWC24_OK) { + nwc24Err = NWC24DeleteDlTask(&dlTask); + if (nwc24Err != NWC24_OK) { // @bug this should say NWC24DeleteDlTask, looks like it was copy-pasted from above - OSReport("NandSDWorker: NWC24GetDlAppId failed - [%d] -> continue\n", delDlTaskRes); + OSReport("NandSDWorker: NWC24GetDlAppId failed - [%d] -> continue\n", nwc24Err); } else { OSReport("NandSDWorker: delete download task for index : %d\n", dlId); } @@ -3171,16 +3588,16 @@ namespace ipl { OSReport("NandSDWorker: ignore title id %d: %08x \n", dlId, dlAppId); } } - int closeLibRes = NWC24CloseLib(); - if (closeLibRes != 0) { - OSReport("NandSDWorker: NWC24CloseLib failed - [%d] -> continue\n", closeLibRes); + nwc24Err = NWC24CloseLib(); + if (nwc24Err != NWC24_OK) { + OSReport("NandSDWorker: NWC24CloseLib failed - [%d] -> continue\n", nwc24Err); } break; } - CLEANUP: + clean_up: if (nwc24Work != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, nwc24Work); + MEMFreeToExpHeap(myWork->mainHeap, nwc24Work); } OSReport("NandSDWorker: delete download task for %08x\n", titleId); return ret; @@ -3189,120 +3606,118 @@ namespace ipl { int NandSDWorker::delete_nand_app_content(ESTitleId titleId) { if (!is_user_nand_app(titleId)) { OSReport("NandSDWorker: 0x%016llx is not nand app, cannot delete.\n", titleId); - return WORKER_RESULT_GENERIC_ERR; + return RESULT_FATAL_SD_ERROR; } - int delMetaFileRes = delete_meta_file(titleId); - if (delMetaFileRes != WORKER_RESULT_OK) { - return delMetaFileRes; + int result = delete_meta_file(titleId); + if (result != RESULT_OK) { + return result; } - int delTitleContentRes = ES_DeleteTitleContent(titleId); - if (delTitleContentRes != WORKER_RESULT_OK) { - OSReport("NandSDWorker: ES_DeleteTitleContent failed [%d]\n", delTitleContentRes); - return WORKER_RESULT_GENERIC_ERR; + result = ES_DeleteTitleContent(titleId); + if (result != RESULT_OK) { + OSReport("NandSDWorker: ES_DeleteTitleContent failed [%d]\n", result); + return RESULT_FATAL_SD_ERROR; } OSReport("NandSDWorker: delete title 0x%016llx content.\n", titleId); - // Force deletion on TV Remote channel - int delEmptyTitleRes = delete_empty_title(titleId, (titleId & 0x00000000FFFFFF00) == 'HAO\0'); - if (delEmptyTitleRes != WORKER_RESULT_OK) { - return WORKER_RESULT_GENERIC_ERR; + + // Force delete TV Remote channel + result = delete_empty_title(titleId, ES_TITLE_CODE(titleId & 0xFFFFFF00) == ES_TITLE_CODE(TITLE_TVRC)); + if (result != RESULT_OK) { + return RESULT_FATAL_SD_ERROR; } - int delDownloadTaskRes = delete_download_task(titleId); - if (delDownloadTaskRes != WORKER_RESULT_OK) { - OSReport("NandSDWorker: delete download task failed [%d]\n", delDownloadTaskRes); + result = delete_download_task(titleId); + if (result != RESULT_OK) { + OSReport("NandSDWorker: delete download task failed [%d]\n", result); } - return delDownloadTaskRes; + + return result; } void NandSDWorker::do_copy_nand_app_to_sd() { - ContentBin* sdBanner = (ContentBin*)MEMAllocFromExpHeapEx(pWork->pHeap19000, sizeof(ContentBin), 0x20); - ContentBin* encBuf = NULL; + SDAppBackupData* sdBanner = (SDAppBackupData*)MEMAllocFromExpHeapEx(myWork->mainHeap, sizeof(SDAppBackupData), 32); + SDAppBackupData* encBanner = NULL; bool backedUp = false; - char sdAppPath[0x40]; - get_sd_app_path(pWork->mTitleId, sdAppPath); + char sdAppPath[NAND_MAX_PATH]; + get_sd_app_path(myWork->curTitleId, sdAppPath); - int prepSdCopyRes; - prepSdCopyRes = prepare_sd_copy(sdAppPath); - if (prepSdCopyRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = prepSdCopyRes; - goto CLEANUP; + int result; + result = prepare_sd_copy(sdAppPath); + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } s64 sdFreeArea; sdFreeArea = get_sd_free_area(); if (sdFreeArea < 0) { - pWork->mAsyncResult = sdFreeArea; - goto CLEANUP; + myWork->asyncResult = sdFreeArea; + goto clean_up; } - int getAppBannerRes; - getAppBannerRes = get_app_banner_from_meta(pWork->mTitleId, &sdBanner->hdr); - if (getAppBannerRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = getAppBannerRes; - goto CLEANUP; + result = get_app_banner_from_meta(myWork->curTitleId, sdBanner); + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } - sdBanner->hdr.mTitleId = pWork->mTitleId; + sdBanner->head.titleId = myWork->curTitleId; u32 wadSize, wadOffset; wadSize = 0; - // inputSize = ; - wadOffset = ROUNDUP(sdBanner->hdr.mThumbnailSize, 0x40) + sizeof(SDAppBanner); + wadOffset = ROUNDUP(sdBanner->head.thumbSize, 64) + sizeof(SDAppBanner); - int wadCalcSizeRes; - wadCalcSizeRes = WADBackupEx(pWork->mTitleId, 1, &pWork->mBothHeapAllocator, NULL, &wadSize, WAD_LOC_SD_CARD, wadOffset, NULL); - if (wadCalcSizeRes != 0) { - OSReport("NandSDWorker: WADBackup failed.[%d]\n", wadCalcSizeRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + result = WADBackupEx(myWork->curTitleId, 1, &myWork->unkAllocator, NULL, &wadSize, WAD_LOCATION_SD_CARD, wadOffset, NULL); + if (result != 0) { + OSReport("NandSDWorker: WADBackup failed.[%d]\n", result); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } if (wadOffset + wadSize > sdFreeArea) { OSReport("NandSDWorker: backup size [%d] is too large for SD card.\n", wadSize); - pWork->mAsyncResult = WORKER_RESULT_NO_SPACE; - goto CLEANUP; + myWork->asyncResult = RESULT_OUT_OF_SPACE; + goto clean_up; } - u8 md5Digest[0x10]; - NETMD5Context iconBinMd5Ctx; - NETMD5Context hdrMd5Ctx; - NETMD5Init(&iconBinMd5Ctx); - void* iconPtr; - iconPtr = sdBanner->icon; - NETMD5Update(&iconBinMd5Ctx, iconPtr, wadOffset - sizeof(SDAppBanner)); - NETMD5GetDigest(&iconBinMd5Ctx, md5Digest); - memcpy((sdBanner->hdr).mIconMd5, md5Digest, 0x10); - memcpy((sdBanner->hdr).mHdrMd5, &c_md5_secret_key, 0x10); + NETMD5Sum MD5Sum; - NETMD5Init(&hdrMd5Ctx); - NETMD5Update(&hdrMd5Ctx, sdBanner, sizeof(SDAppBanner)); - NETMD5GetDigest(&hdrMd5Ctx, md5Digest); - memcpy(sdBanner->hdr.mHdrMd5, md5Digest, 0x10); + // FAKEMATCH: Should be using NETCalcMD5, but thumbPtr had to ruin everything. + NETMD5Context context; + NETMD5Init(&context); + void* thumbPtr; + thumbPtr = sdBanner->thumbnail; + NETMD5Update(&context, thumbPtr, wadOffset - sizeof(SDAppBanner)); + NETMD5GetDigest(&context, MD5Sum); + memcpy(sdBanner->head.iconMD5, MD5Sum, NET_MD5_DIGEST_SIZE); + memcpy(sdBanner->head.headerMD5, &c_md5_secret_key, NET_MD5_DIGEST_SIZE); - encBuf = (ContentBin*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, wadOffset); - if (encrypt(&sdBanner->hdr, sizeof(SDAppBanner), &encBuf->hdr) != WORKER_RESULT_OK) { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + NETCalcMD5(MD5Sum, sdBanner, sizeof(SDAppBanner)); + memcpy(sdBanner->head.headerMD5, MD5Sum, NET_MD5_DIGEST_SIZE); + + encBanner = (SDAppBackupData*)MEMAllocFromAllocator(&myWork->unkAllocator, wadOffset); + if (encrypt(&sdBanner->head, sizeof(SDAppBanner), &encBanner->head) != RESULT_OK) { + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - if (encrypt(iconPtr, wadOffset - sizeof(SDAppBanner), encBuf->icon) != WORKER_RESULT_OK) { - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + if (encrypt(thumbPtr, wadOffset - sizeof(SDAppBanner), encBanner->thumbnail) != RESULT_OK) { + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } backedUp = true; - int wadBackupRes; - wadBackupRes = WADBackupEx(pWork->mTitleId, 1, &pWork->mBothHeapAllocator, sdAppPath, &wadSize, WAD_LOC_SD_CARD, wadOffset, - wad_backup_progress_callback); - if (wadBackupRes != 0) { - OSReport("NandSDWorker: WADBackup failed.[%d]\n", wadBackupRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + s32 wadErr; + wadErr = WADBackupEx(myWork->curTitleId, 1, &myWork->unkAllocator, sdAppPath, &wadSize, WAD_LOCATION_SD_CARD, wadOffset, + wad_backup_progress_callback); + if (wadErr != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADBackup failed.[%d]\n", wadErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } OSReport("NandSDWorker: make wad backup, size = [%d].\n", wadSize); @@ -3310,44 +3725,44 @@ namespace ipl { fStream = FAFopen(sdAppPath, "r+"); if (fStream == NULL) { OSReport("NandSDWorker: FAFopen %s failed.\n", sdAppPath); - handle_sd_error(FA_ERR_SYSTEM, &pWork->mAsyncResult); - goto CLEANUP; + handle_sd_error(FA_ERR_SYSTEM, &myWork->asyncResult); + goto clean_up; } OSReport("NandSDWorker: create %s in sd.\n", sdAppPath); - if (handle_sd_error(FAFseek(fStream, 0, FA_SEEK_ORIGIN_BEGIN), &pWork->mAsyncResult) != WORKER_RESULT_OK) { + if (handle_sd_error(FAFseek(fStream, 0, FA_SEEK_ORIGIN_BEGIN), &myWork->asyncResult) != RESULT_OK) { OSReport("NandSDWorker: FAFseek %s failed.\n", sdAppPath); FAFclose(fStream); - goto CLEANUP; + goto clean_up; } - wadOffset = FAFwrite(encBuf, wadOffset, 1, fStream); + wadOffset = FAFwrite(encBanner, wadOffset, 1, fStream); if (wadOffset != 1) { OSReport("NandSDWorker: FAFwrite %s failed.[%d]\n", sdAppPath, wadOffset); - handle_sd_error(FA_ERR_SYSTEM, &pWork->mAsyncResult); + handle_sd_error(FA_ERR_SYSTEM, &myWork->asyncResult); FAFclose(fStream); - goto CLEANUP; + goto clean_up; } - if (handle_sd_error(FAFclose(fStream), &pWork->mAsyncResult) != WORKER_RESULT_OK) { + if (handle_sd_error(FAFclose(fStream), &myWork->asyncResult) != RESULT_OK) { OSReport("NandSDWorker: FAFclose %s failed.\n", sdAppPath); - goto CLEANUP; + goto clean_up; } - pWork->mSdAppNum++; - pWork->mAsyncResult = WORKER_RESULT_OK; + myWork->sdAppNum++; + myWork->asyncResult = RESULT_OK; - CLEANUP: - MEMFreeToExpHeap(pWork->pHeap19000, sdBanner); - if (encBuf != NULL) { - MEMFreeToAllocator(&pWork->mBothHeapAllocator, encBuf); + clean_up: + MEMFreeToExpHeap(myWork->mainHeap, sdBanner); + if (encBanner != NULL) { + MEMFreeToAllocator(&myWork->unkAllocator, encBanner); } - if (pWork->mAsyncResult < WORKER_RESULT_OK && backedUp) { - int faRemoveRes = handle_sd_error_for_entry(FARemove(sdAppPath), NULL); - if (faRemoveRes == WORKER_RESULT_OK) { + if (myWork->asyncResult < RESULT_OK && backedUp) { + result = handle_sd_error_for_entry(FARemove(sdAppPath), NULL); + if (result == RESULT_OK) { OSReport("NandSDWorker: remove %s because copy is not done correctly.\n", sdAppPath); } else { - OSReport("NandSDWorker: FARemove %s failed.[%d]\n", sdAppPath, faRemoveRes); + OSReport("NandSDWorker: FARemove %s failed.[%d]\n", sdAppPath, result); } } } @@ -3355,327 +3770,333 @@ namespace ipl { int NandSDWorker::get_save_banner_for_data_only_title(ESTitleId titleId, WIISaveBannerFile* fileOut, u32* sizeOut) { int ret; u32 contentSize; - ESTicketView* tikView; - tikView = 0; + ESTicketView* ticketView = NULL; - s32 openNandAppRes = open_nand_app_content(titleId, 0, &contentSize, &tikView); - if (openNandAppRes < WORKER_RESULT_OK) { + int result = open_nand_app_content(titleId, 0, &contentSize, &ticketView); + if (result < RESULT_OK) { OSReport("NandSDWorker: can't open banner file for data only title [0x%016llx]\n", titleId); - return WORKER_RESULT_GENERIC_ERR; + return RESULT_FATAL_SD_ERROR; } - void* fd = (void*)openNandAppRes; + void* fd = (void*)result; contentSize -= 0x40; - if (contentSize < offsetof(WIISaveBannerFile, iconData1)) { + if (contentSize < WII_SAVE_BANNER_NORMAL_SIZE) { OSReport("NandSDWorker: banner file is too small [%d]\n", contentSize); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; - } else if (contentSize > sizeof(WIISaveBannerFile)) { + ret = RESULT_BAD_FILE; + goto clean_up; + } else if (contentSize > WII_SAVE_BANNER_FULL_SIZE) { OSReport("NandSDWorker: banner file is too large [%d]\n", contentSize); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } - if (sizeOut != NULL) + if (sizeOut != NULL) { *sizeOut = contentSize; + } ret = read_file(fd, FILEKIND_ES_CONTENT, 0x40, contentSize, fileOut); - if (ret != WORKER_RESULT_OK) { + if (ret != RESULT_OK) { OSReport("NandSDWorker: failed to read from content.\n"); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - if (fileOut->magic != 'WIBN') { + if (fileOut->signature != WII_SAVE_BANNER_SIGNATURE) { OSReport("NandSDWorker: banner file signature is not correct\n"); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } - ret = WORKER_RESULT_OK; + ret = RESULT_OK; - CLEANUP: + clean_up: ES_CloseContentFile((ESFd)fd); - if (tikView != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, tikView); + if (ticketView != NULL) { + MEMFreeToExpHeap(myWork->mainHeap, ticketView); } return ret; } - int NandSDWorker::get_app_banner_from_meta(ESTitleId titleId, SDAppBanner* appBnrOut) { - NANDFileInfo nandFileInfo; - char metaPath[0x40]; - ARCHandle archandle; - ARCFileInfo arcFinfo; + int NandSDWorker::get_app_banner_from_meta(ESTitleId titleId, SDAppBackupData* appBnrOut) { + NANDFileInfo fileInfo; + char metaPath[NAND_MAX_PATH]; + ARCHandle arcHandle; + ARCFileInfo arcFile; s32 ret; u32 contentSize; - int openRes; + s32 openRes; -#define META_HDR_BUF_SIZE (0x80 + sizeof(SMetaBlockHeader)) -#define META_HDR_BUF_SIZE_ALIGNED ROUNDUP(META_HDR_BUF_SIZE, 0x20) + // TODO: maybe move this somewhere else? +#define META_HDR_BUF_SIZE (0x40 + channel::META_RESERVED_PADDING + channel::META_HEAD_BLOCK_SIZE) - u8* openingBnrBuf = (u8*)MEMAllocFromExpHeapEx(pWork->pHeap19000, 0x1400, 0x20); - u8* metaHdrBuf = (u8*)MEMAllocFromExpHeapEx(pWork->pHeap19000, ROUNDUP(META_HDR_BUF_SIZE, 0x20), 0x20); - ARCHeader* arcHdrBuf = (ARCHeader*)MEMAllocFromExpHeapEx(pWork->pHeap19000, sizeof(ARCHeader), 0x20); + u8* openingBnrBuf = (u8*)MEMAllocFromExpHeapEx(myWork->mainHeap, 0x1400, 32); + u8* metaHdrBuf = (u8*)MEMAllocFromExpHeapEx(myWork->mainHeap, OSRoundUp32B(META_HDR_BUF_SIZE), 32); + ARCHeader* arcHeader = (ARCHeader*)MEMAllocFromExpHeapEx(myWork->mainHeap, sizeof(ARCHeader), 32); void* fd; - FileKind fileKind; - fileKind = (FileKind)0; + FileKind fileKind = FILEKIND_NONE; - ESTicketView* tikView; - tikView = NULL; + ESTicketView* ticketView = NULL; - s32 openNandAppContentRes; - openNandAppContentRes = open_nand_app_content(titleId, 0, &contentSize, &tikView); - ret = openNandAppContentRes; + int result; + result = open_nand_app_content(titleId, 0, &contentSize, &ticketView); + ret = result; - if (openNandAppContentRes >= 0 && contentSize > 4) { + if (result >= 0 && contentSize > 4) { fileKind = FILEKIND_ES_CONTENT; - fd = (void*)openNandAppContentRes; + fd = (void*)result; } else { get_nand_meta_file_path(titleId, metaPath); - openRes = nand::wrapper::Open(metaPath, &nandFileInfo, NAND_ACCESS_READ); + openRes = nand::wrapper::Open(metaPath, &fileInfo, NAND_ACCESS_READ); if (check_nand_corrupt(openRes, &ret)) - goto CLEANUP; + goto clean_up; if (openRes != NAND_RESULT_OK) { OSReport("NandSDWorker: NANDOpen %s failed.[%d]\n", metaPath, openRes); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } - fd = &nandFileInfo; + fd = &fileInfo; fileKind = FILEKIND_NAND; } - memset(metaHdrBuf, 0, ROUNDUP(META_HDR_BUF_SIZE, 0x20)); + memset(metaHdrBuf, 0, OSRoundUp32B(META_HDR_BUF_SIZE)); ret = read_file(fd, fileKind, 0x40, META_HDR_BUF_SIZE, metaHdrBuf); - if (ret != WORKER_RESULT_OK) - goto CLEANUP; + if (ret != RESULT_OK) { + goto clean_up; + } s32 hdrOffset; hdrOffset = search_meta_header(metaHdrBuf); if (hdrOffset < 0) { OSReport("NandSDWorker: cannot find meta offset: %d\n", hdrOffset); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } u32 headerSize; headerSize = 0; if (!check_header_base(metaHdrBuf + hdrOffset, &headerSize)) { OSReport("NandSDWorker: illegal header.\n"); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } OSReport("NandSDWorker: headder size = %d\n", headerSize); - memset(&appBnrOut->mMetaHdr, 0, sizeof(channel::SChanMgrMetaHeader)); - ret = read_file(fd, fileKind, hdrOffset, headerSize, &appBnrOut->mMetaHdr); - if (ret != WORKER_RESULT_OK) - goto CLEANUP; + memset(&appBnrOut->head.metaHdr, 0, sizeof(channel::SChanMgrMetaHeader)); + ret = read_file(fd, fileKind, hdrOffset, headerSize, &appBnrOut->head.metaHdr); + if (ret != RESULT_OK) { + goto clean_up; + } - bool checkHeaderRes; - checkHeaderRes = check_header_md5((u8*)&appBnrOut->mMetaHdr); - if (!checkHeaderRes) { + if (!check_header_md5((u8*)&appBnrOut->head.metaHdr)) { // @bug They left out the format parameter :( OSReport("NandSDWorker: hash check failed.[%d]\n"); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } - ret = read_file(fd, fileKind, hdrOffset + headerSize, 0x20, arcHdrBuf); - if (ret != WORKER_RESULT_OK) - goto CLEANUP; - - ret = read_file(fd, fileKind, hdrOffset + headerSize, ROUNDUP(arcHdrBuf->fileStart, 0x20), openingBnrBuf); - if (ret != WORKER_RESULT_OK) { - goto CLEANUP; + ret = read_file(fd, fileKind, hdrOffset + headerSize, sizeof(ARCHeader), arcHeader); + if (ret != RESULT_OK) { + goto clean_up; } - int initArcHandleRes; - initArcHandleRes = ARCInitHandle(openingBnrBuf, &archandle); - if (initArcHandleRes == 0) { + ret = read_file(fd, fileKind, hdrOffset + headerSize, OSRoundUp32B(arcHeader->fileStart), openingBnrBuf); + if (ret != RESULT_OK) { + goto clean_up; + } + + if (!ARCInitHandle(openingBnrBuf, &arcHandle)) { // @bug Uses the wrong variable as the format parameter OSReport("NandSDWorker: ARCInitHandle failed.[%d]\n", openRes); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } - int arcOpenRes; - arcOpenRes = ARCOpen(&archandle, "/meta/icon.bin", &arcFinfo); - if (arcOpenRes == 0) { + if (!ARCOpen(&arcHandle, "/meta/icon.bin", &arcFile)) { // @bug Uses the wrong variable as the format parameter OSReport("NandSDWorker: ARCOpen failed.[%d]\n", openRes); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } u32 thumbnailSize; - thumbnailSize = ARCGetLength(&arcFinfo); - if (ROUNDUP(thumbnailSize, 0x20) > sizeof(((ContentBin*)appBnrOut)->icon)) { + thumbnailSize = ARCGetLength(&arcFile); + if (OSRoundUp32B(thumbnailSize) > SD_APP_BACKUP_THUMBNAIL_LENGTH) { OSReport("NandSDWorker: illegal thumbnail size.[%d]\n", thumbnailSize); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } - appBnrOut->mThumbnailSize = thumbnailSize; + appBnrOut->head.thumbSize = thumbnailSize; OSReport("NandSDWorker: thumbnail size = %d\n", thumbnailSize); u32 iconBinOffset; - iconBinOffset = hdrOffset + headerSize + ARCGetStartOffset(&arcFinfo); + iconBinOffset = hdrOffset + headerSize + ARCGetStartOffset(&arcFile); - ret = read_file(fd, fileKind, iconBinOffset, thumbnailSize, ((ContentBin*)appBnrOut)->icon); - if (ret == WORKER_RESULT_OK) { - ret = WORKER_RESULT_OK; + ret = read_file(fd, fileKind, iconBinOffset, thumbnailSize, ((SDAppBackupData*)appBnrOut)->thumbnail); + if (ret == RESULT_OK) { + ret = RESULT_OK; } - CLEANUP: + clean_up: if (fileKind == FILEKIND_ES_CONTENT) { ES_CloseContentFile((ESFd)fd); } else if (fileKind == FILEKIND_NAND) { - int closeRes = nand::wrapper::Close(&nandFileInfo); + int closeRes = nand::wrapper::Close(&fileInfo); if (!check_nand_corrupt(closeRes, &ret) && closeRes != NAND_RESULT_OK) { OSReport("NandSDWorker: failed to close %s [%d]\n", metaPath, closeRes); - ret = WORKER_RESULT_GENERIC_ERR; + ret = RESULT_FATAL_SD_ERROR; } } - MEMFreeToExpHeap(pWork->pHeap19000, openingBnrBuf); - MEMFreeToExpHeap(pWork->pHeap19000, metaHdrBuf); - MEMFreeToExpHeap(pWork->pHeap19000, arcHdrBuf); - if (tikView != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, tikView); + + MEMFreeToExpHeap(myWork->mainHeap, openingBnrBuf); + MEMFreeToExpHeap(myWork->mainHeap, metaHdrBuf); + MEMFreeToExpHeap(myWork->mainHeap, arcHeader); + + if (ticketView != NULL) { + MEMFreeToExpHeap(myWork->mainHeap, ticketView); } return ret; } - s32 NandSDWorker::open_nand_app_content(ESTitleId titleId, u16 contentIdx, u32* contentSizeOut, ESTicketView** tikViewOut) { + s32 NandSDWorker::open_nand_app_content(ESTitleId titleId, u16 contentIdx, u32* contentSizeOut, ESTicketView** ticketViewOut) { s32 ret; - u32 tikViewCount; + u32 ticketViewCount; ESTmdView* tmdView; - *tikViewOut = NULL; + *ticketViewOut = NULL; tmdView = NULL; - ret = get_nand_app_tmdview(titleId, &tmdView); - if (ret != WORKER_RESULT_OK) - goto CLEANUP; - if (content_exist(tmdView, contentIdx) == 0) { - OSReport("NandSDWorker: titleid 0x%016llx cidx %d not exist.\n", titleId, contentIdx); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + ret = get_nand_app_tmdview(titleId, &tmdView); + if (ret != RESULT_OK) { + goto clean_up; } - ret = ES_GetTicketViews(titleId, NULL, &tikViewCount); + if (!content_exist(tmdView, contentIdx)) { + OSReport("NandSDWorker: titleid 0x%016llx cidx %d not exist.\n", titleId, contentIdx); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; + } + + ret = ES_GetTicketViews(titleId, NULL, &ticketViewCount); if (ret != ES_ERR_OK) { OSReport("NandSDWorker: ES_GetTicketViews titleid 0x%016llx failed.\n", titleId); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - if (tikViewCount == 0) { + if (ticketViewCount == 0) { OSReport("NandSDWorker: titleid 0x%016llx has no ticket.\n", titleId); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } ESTicketView* ticketViewList; - ticketViewList = (ESTicketView*)MEMAllocFromExpHeapEx(pWork->pHeap19000, ROUNDUP(tikViewCount * sizeof(ESTicketView), 0x20), 0x20); - *tikViewOut = ticketViewList; - ret = ES_GetTicketViews(titleId, ticketViewList, &tikViewCount); + ticketViewList = (ESTicketView*)MEMAllocFromExpHeapEx(myWork->mainHeap, OSRoundUp32B(ticketViewCount * sizeof(ESTicketView)), 32); + *ticketViewOut = ticketViewList; + ret = ES_GetTicketViews(titleId, ticketViewList, &ticketViewCount); if (ret != ES_ERR_OK) { OSReport("NandSDWorker: ES_GetTicketViews titleid 0x%016llx failed.\n", titleId); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - s32 openTitleContentFileRes; - openTitleContentFileRes = ES_OpenTitleContentFile(titleId, *tikViewOut, contentIdx); - if (openTitleContentFileRes < ES_ERR_OK) { - OSReport("NandSDWorker: ES_OpenTitleContentFile titleid 0x%016llx cidx %d failed.[%d]\n", titleId, contentIdx, openTitleContentFileRes); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + s32 err; + err = ES_OpenTitleContentFile(titleId, *ticketViewOut, contentIdx); + if (err < ES_ERR_OK) { + OSReport("NandSDWorker: ES_OpenTitleContentFile titleid 0x%016llx cidx %d failed.[%d]\n", titleId, contentIdx, err); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - ret = openTitleContentFileRes; + ret = err; *contentSizeOut = tmdView->contents[contentIdx].size; OSReport("NandSDWorker: successfully open titleid 0x%016llx cidx %d. fd = %d, size = %d.\n", titleId, contentIdx, ret, *contentSizeOut); - CLEANUP: + clean_up: if (tmdView != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, tmdView); + MEMFreeToExpHeap(myWork->mainHeap, tmdView); } - if (ret != WORKER_RESULT_OK) { - if (*tikViewOut != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, *tikViewOut); + + if (ret != RESULT_OK) { + if (*ticketViewOut != NULL) { + MEMFreeToExpHeap(myWork->mainHeap, *ticketViewOut); } - *tikViewOut = NULL; + *ticketViewOut = NULL; } return ret; } + int NandSDWorker::read_file(void* file, FileKind kind, s32 offset, u32 size, void* buf) { if (kind == FILEKIND_NAND) { - int seekRes = nand::wrapper::Seek((NANDFileInfo*)file, offset, NAND_SEEK_BEG); - if (seekRes < offset) { - OSReport("NandSDWorker: NANDSeek failed: %d\n", seekRes); - return WORKER_RESULT_BAD_FILE; + s32 seek = nand::wrapper::Seek((NANDFileInfo*)file, offset, NAND_SEEK_BEG); + if (seek < offset) { + OSReport("NandSDWorker: NANDSeek failed: %d\n", seek); + return RESULT_BAD_FILE; } - u32 readSize = nand::wrapper::Read((NANDFileInfo*)file, buf, ROUNDUP(size, 0x20)); + u32 readSize = nand::wrapper::Read((NANDFileInfo*)file, buf, OSRoundUp32B(size)); if (check_nand_corrupt(readSize, NULL)) { - return WORKER_RESULT_NAND_CORRUPT; + return RESULT_NAND_CORRUPT; } if (readSize < size) { OSReport("NandSDWorker: NANDRead failed.[%d]\n", readSize); - return WORKER_RESULT_BAD_FILE; + return RESULT_BAD_FILE; } - return WORKER_RESULT_OK; + return RESULT_OK; } else if (kind == FILEKIND_ES_CONTENT) { - int seekRes = ES_SeekContentFile((ESFd)file, offset, ES_SEEK_BEG); - if (seekRes < ES_ERR_OK) { - OSReport("NandSDWorker: ES_SeekContentFile failed.[%d]\n", seekRes); - return WORKER_RESULT_BAD_FILE; + s32 seek = ES_SeekContentFile((ESFd)file, offset, ES_SEEK_BEG); + if (seek < ES_ERR_OK) { + OSReport("NandSDWorker: ES_SeekContentFile failed.[%d]\n", seek); + return RESULT_BAD_FILE; } - u32 readSize = ES_ReadContentFile((ESFd)file, buf, ROUNDUP(size, 0x20)); + u32 readSize = ES_ReadContentFile((ESFd)file, buf, OSRoundUp32B(size)); if (readSize < size) { OSReport("NandSDWorker: ES_ReadContentFile failed.[%d]\n", readSize); - return WORKER_RESULT_BAD_FILE; + return RESULT_BAD_FILE; } - return WORKER_RESULT_OK; + return RESULT_OK; } - return WORKER_RESULT_GENERIC_ERR; + return RESULT_FATAL_SD_ERROR; } - s32 NandSDWorker::search_meta_header(const u8* buf) { - const char* magic = "IMET"; + int NandSDWorker::search_meta_header(const u8* buffer) { + const char* magic = IPL_META_MAGIC; + int next = 0; - int magicIdx = 0; - for (int i = 0; i < 0xa0; i++) { - if (buf[i] == magic[magicIdx]) { - magicIdx++; - if (magicIdx == 4) { + for (int i = 0; i < ((channel::META_RESERVED_PADDING * 2) + 0x20); i++, buffer++) { + // Found one character? + if (*buffer == magic[next]) { + // Look for the next one + next++; + + // Found them all? Well theres the offset! + if (next == 4) { return i - 3; } } else { - magicIdx = 0; + // Otherwise, try again!! + next = 0; } } return -1; } bool NandSDWorker::check_header_base(const u8* bnrData, u32* headerSize) { - SMetaBlockHeader* header = (SMetaBlockHeader*)(bnrData); + channel::SMetaBlockHeader* header = (channel::SMetaBlockHeader*)(bnrData); - u32 headSize = header->headSize; + u32 headSize = header->headerSize; if (headerSize != NULL) { *headerSize = headSize; } // Check signature - if (!NAND_CHECK_MAGIC4(header->sig, 'I', 'M', 'E', 'T') || headSize < sizeof(channel::SMetaBlockHeader)) { + if (!NAND_CHECK_MAGIC4(header->magic, 'I', 'M', 'E', 'T') || headSize < sizeof(channel::SMetaBlockHeader)) { OSReport("BANNER WARNING: invalid signature or header size %d\n", headSize); return false; } @@ -3689,26 +4110,23 @@ namespace ipl { return true; } - bool NandSDWorker::check_header_md5(u8* hdr) { - u8 digest[0x10]; + bool NandSDWorker::check_header_md5(u8* head) { + NETMD5Sum digest; - u32 dataLen = ((channel::SChanMgrMetaHeader*)hdr)->blockHdr.headerSize; - for (int i = 0; i < 0x10; i++) { - digest[i] = (hdr + (dataLen - 0x10))[i]; + u32 dataLen = ((channel::SChanMgrMetaHeader*)head)->blockHdr.headerSize; + for (int i = 0; i < NET_MD5_DIGEST_SIZE; i++) { + digest[i] = (head + (dataLen - NET_MD5_DIGEST_SIZE))[i]; } - memset(hdr, 0, 0x40); - memset(hdr + (dataLen - 0x10), 0, 0x10); - return check_md5(digest, hdr, dataLen); + memset(head, 0, 0x40); + memset(head + (dataLen - NET_MD5_DIGEST_SIZE), 0, NET_MD5_DIGEST_SIZE); + return check_md5(digest, head, dataLen); } bool NandSDWorker::check_md5(const u8* digest, const u8* input, u32 dataLen) { - NETMD5Context md5Ctx; - u8 calculated[0x10]; + NETMD5Sum calculated; - NETMD5Init(&md5Ctx); - NETMD5Update(&md5Ctx, input, dataLen); - NETMD5GetDigest(&md5Ctx, calculated); - for (int i = 0; i < 0x10; i++) { + NETCalcMD5(calculated, input, dataLen); + for (int i = 0; i < NET_MD5_DIGEST_SIZE; i++) { if (digest[i] != calculated[i]) { OSReport("BANNER WARNING: invalid md5 value ( data )\n"); return false; @@ -3718,138 +4136,137 @@ namespace ipl { } void NandSDWorker::wad_backup_progress_callback(u32 complete, u32 total, BOOL done) { - if (total != 0) + if (total != 0) { s_completion_pct = complete * 100.f / total; + } } - void NandSDWorker::do_copy_sd_app_to_nand(bool ignoreSC) { - SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, 0x640); + void NandSDWorker::do_copy_sd_app_to_nand(bool changeAppCount) { + SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppBanner)); u16 titleVersion = 0; u16 wadVersion = 0; - if (!ignoreSC) { + if (!changeAppCount) { u32 numFreeSlots; if (SCGetFreeChannelAppCount(&numFreeSlots) != 0) { OSReport("NandSDWorker: free nand app count = %d.\n", numFreeSlots); if (numFreeSlots == 0) { OSReport("NandSDWorker: there is no free count to install application.\n"); - pWork->mAsyncResult = WORKER_RESULT_NO_SPACE; - goto CLEANUP; + myWork->asyncResult = RESULT_OUT_OF_SPACE; + goto clean_up; } } else { OSReport("NandSDWorker: SCGetFreeChannelAppCount failed.\n"); } } - int getSdAppBannerRes; - getSdAppBannerRes = get_sd_app_banner(pWork->mTitleId, sdAppBanner); - if (getSdAppBannerRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = getSdAppBannerRes; - goto CLEANUP; + + int result; + result = get_sd_app_banner(myWork->curTitleId, sdAppBanner); + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } - if (nand_app_exist_ex(sdAppBanner->mTitleId) == 2) { - OSReport("NandSDWorker: titleid = 0x%016llx is already in nand.\n", sdAppBanner->mTitleId); - pWork->mAsyncResult = WORKER_RESULT_ALREADY_EXISTS; - goto CLEANUP; + if (nand_app_exist_ex(sdAppBanner->titleId) == 2) { + OSReport("NandSDWorker: titleid = 0x%016llx is already in nand.\n", sdAppBanner->titleId); + myWork->asyncResult = RESULT_ALREADY_EXISTS; + goto clean_up; } - int getTitleVersionRes; - getTitleVersionRes = get_nand_title_version(sdAppBanner->mTitleId, &titleVersion); - if (getTitleVersionRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = getTitleVersionRes; - goto CLEANUP; + result = get_nand_title_version(sdAppBanner->titleId, &titleVersion); + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } - char sdAppPath[0x40]; - get_sd_app_path(pWork->mTitleId, sdAppPath); + char sdAppPath[NAND_MAX_PATH]; + get_sd_app_path(myWork->curTitleId, sdAppPath); u64 wadTitleId; - int wadGetTitleVersionRes; - wadGetTitleVersionRes = - WADGetTitleVersionEx(sdAppPath, &wadTitleId, &wadVersion, WAD_LOC_SD_CARD, ROUNDUP(sdAppBanner->mThumbnailSize, 0x40) + 0x640); - if (wadGetTitleVersionRes != 0) { - OSReport("NandSDWorker: WADGetTitleVersionEx failed.[%d]\n", wadGetTitleVersionRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + s32 wadErr; + wadErr = WADGetTitleVersionEx(sdAppPath, &wadTitleId, &wadVersion, WAD_LOCATION_SD_CARD, + ROUNDUP(sdAppBanner->thumbSize, 64) + sizeof(SDAppBanner)); + if (wadErr != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADGetTitleVersionEx failed.[%d]\n", wadErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; + goto clean_up; } - if (wadTitleId != sdAppBanner->mTitleId) { - OSReport("NandSDWorker: titleid %016llx in wad is different from %016llx in banner %s.\n", wadTitleId, sdAppBanner->mTitleId, sdAppPath); - pWork->mAsyncResult = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + if (wadTitleId != sdAppBanner->titleId) { + OSReport("NandSDWorker: titleid %016llx in wad is different from %016llx in banner %s.\n", wadTitleId, sdAppBanner->titleId, sdAppPath); + myWork->asyncResult = RESULT_BAD_FILE; + goto clean_up; } if ((titleVersion >> 8) > (wadVersion >> 8)) { - OSReport("NandSDWorker: titleid %016llx has higher version than that of sd (%d vs %d)\n", sdAppBanner->mTitleId, titleVersion, - wadVersion); - pWork->mAsyncResult = WORKER_RESULT_VERSION_ERR; - goto CLEANUP; + OSReport("NandSDWorker: titleid %016llx has higher version than that of sd (%d vs %d)\n", sdAppBanner->titleId, titleVersion, wadVersion); + myWork->asyncResult = RESULT_VERSION_ERR; + goto clean_up; } WADBlocks wadBlocks; - int wadGetBlocksRes; - wadGetBlocksRes = WADImportGetBlocks(sdAppPath, &pWork->mBothHeapAllocator, WAD_LOC_SD_CARD, - ROUNDUP(sdAppBanner->mThumbnailSize, 0x40) + 0x640, 1, &wadBlocks, NULL); - if (wadGetBlocksRes == -3008) { - OSReport("NandSDWorker: WADImportGetBlocks failed, not original Wii.[%d]\n", wadGetBlocksRes); - pWork->mAsyncResult = WORKER_RESULT_NOT_TRANSFERRABLE; - goto CLEANUP; - } else if (wadGetBlocksRes != 0) { - OSReport("NandSDWorker: WADImportGetBlocks failed.[%d]\n", wadGetBlocksRes); - pWork->mAsyncResult = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + wadErr = WADImportGetBlocks(sdAppPath, &myWork->unkAllocator, WAD_LOCATION_SD_CARD, ROUNDUP(sdAppBanner->thumbSize, 64) + sizeof(SDAppBanner), + 1, &wadBlocks, NULL); + if (wadErr == WAD_ERROR_INCORRECT_DEVICE) { + OSReport("NandSDWorker: WADImportGetBlocks failed, not original Wii.[%d]\n", wadErr); + myWork->asyncResult = RESULT_NOT_TRANSFERRABLE; + goto clean_up; + } else if (wadErr != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADImportGetBlocks failed.[%d]\n", wadErr); + myWork->asyncResult = RESULT_BAD_FILE; + goto clean_up; } OSReport("NandSDWorker: shared content inodes/blocks = %d/%d\n", wadBlocks.sharedInodes, wadBlocks.sharedBlocks); OSReport("NandSDWorker: private content inodes/blocks = %d/%d\n", wadBlocks.privateInodes, wadBlocks.privateBlocks); OSReport("NandSDWorker: file inodes/blocks = %d/%d\n", wadBlocks.fileInodes, wadBlocks.fileBlocks); - int checkNandFreeRes; - checkNandFreeRes = check_nand_free_area(wadBlocks.sharedInodes, wadBlocks.sharedBlocks, wadBlocks.privateInodes + wadBlocks.fileInodes, - wadBlocks.privateBlocks + wadBlocks.fileBlocks); - if (checkNandFreeRes != WORKER_RESULT_OK) { - pWork->mAsyncResult = checkNandFreeRes; - goto CLEANUP; + result = check_nand_free_area(wadBlocks.sharedInodes, wadBlocks.sharedBlocks, wadBlocks.privateInodes + wadBlocks.fileInodes, + wadBlocks.privateBlocks + wadBlocks.fileBlocks); + if (result != RESULT_OK) { + myWork->asyncResult = result; + goto clean_up; } - int restoreSdExRes; - restoreSdExRes = WADImportEx(sdAppPath, &pWork->mBothHeapAllocator, WAD_LOC_SD_CARD, ROUNDUP(sdAppBanner->mThumbnailSize, 0x40) + 0x640, 8, - wad_backup_progress_callback); - if (restoreSdExRes == -3008) { - OSReport("NandSDWorker: WADRestoreSDEx failed, not original Wii.[%d]\n", restoreSdExRes); - pWork->mAsyncResult = WORKER_RESULT_NOT_TRANSFERRABLE; - goto CLEANUP; - } else if (restoreSdExRes != 0) { - OSReport("NandSDWorker: WADRestoreSDEx failed.[%d]\n", restoreSdExRes); - if (nand_app_exist_ex(sdAppBanner->mTitleId) == 1) { - int delNandAppContentRes = delete_nand_app_content(sdAppBanner->mTitleId); - if (delNandAppContentRes == WORKER_RESULT_NAND_CORRUPT) { - pWork->mAsyncResult = WORKER_RESULT_NAND_CORRUPT; - goto CLEANUP; + wadErr = WADImportEx(sdAppPath, &myWork->unkAllocator, WAD_LOCATION_SD_CARD, ROUNDUP(sdAppBanner->thumbSize, 64) + sizeof(SDAppBanner), 8, + wad_backup_progress_callback); + if (wadErr == WAD_ERROR_INCORRECT_DEVICE) { + OSReport("NandSDWorker: WADRestoreSDEx failed, not original Wii.[%d]\n", wadErr); + myWork->asyncResult = RESULT_NOT_TRANSFERRABLE; + goto clean_up; + } else if (wadErr != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADRestoreSDEx failed.[%d]\n", wadErr); + if (nand_app_exist_ex(sdAppBanner->titleId) == 1) { + result = delete_nand_app_content(sdAppBanner->titleId); + if (result == RESULT_NAND_CORRUPT) { + myWork->asyncResult = RESULT_NAND_CORRUPT; + goto clean_up; } - if (delNandAppContentRes != WORKER_RESULT_OK) { - OSReport("NandSDWorker: delete title 0x%016llx content failed.[%d]\n", sdAppBanner->mTitleId, delNandAppContentRes); + if (result != RESULT_OK) { + OSReport("NandSDWorker: delete title 0x%016llx content failed.[%d]\n", sdAppBanner->titleId, result); } } - pWork->mAsyncResult = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + myWork->asyncResult = RESULT_BAD_FILE; + goto clean_up; } - OSReport("NandSDWorker: import app data titleid = 0x%016llx.\n", sdAppBanner->mTitleId); - pWork->mNandAppNum++; - if (!ignoreSC) + OSReport("NandSDWorker: import app data titleid = 0x%016llx.\n", sdAppBanner->titleId); + myWork->nandAppNum++; + if (!changeAppCount) { change_nand_app_count(1); + } - pWork->mAsyncResult = WORKER_RESULT_OK; + myWork->asyncResult = RESULT_OK; - CLEANUP: + clean_up: if (sdAppBanner != NULL) { - MEMFreeToAllocator(&pWork->mBothHeapAllocator, sdAppBanner); + MEMFreeToAllocator(&myWork->unkAllocator, sdAppBanner); } return; } void NandSDWorker::change_nand_app_count(s32 delta) { - if (delta == 0) + if (delta == 0) { return; + } u32 installedCount = 0; if (SCGetInstalledChannelAppCount(&installedCount) == 0) { @@ -3861,159 +4278,160 @@ namespace ipl { installedCount += delta; SCSetInstalledChannelAppCount(installedCount); - SCSetFreeChannelAppCount(0x30 - installedCount); + SCSetFreeChannelAppCount(MAX_CHANNEL_TOTAL - installedCount); OSReport("NandSDWorker: new installed nand app count = %d.\n", installedCount); - OSReport("NandSDWorker: new free nand app count = %d.\n", 0x30 - installedCount); + OSReport("NandSDWorker: new free nand app count = %d.\n", MAX_CHANNEL_TOTAL - installedCount); SCFlush(); } int NandSDWorker::get_sd_app_banner(ESTitleId32 titleId, SDAppBanner* appBanner) { s32 ret; - SDAppBanner* encBuffer = (SDAppBanner*)MEMAllocFromExpHeapEx(pWork->pHeap19000, 0x640, 0x20); + SDAppBanner* encBuffer = (SDAppBanner*)MEMAllocFromExpHeapEx(myWork->mainHeap, sizeof(SDAppBanner), 32); if (appBanner == NULL || encBuffer == NULL) { OSReport("NandSDWorker: Failed to allocate buffer.\n"); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - char appPath[0x40]; + char appPath[NAND_MAX_PATH]; FAFILE* fStream; get_sd_app_path(titleId, appPath); fStream = FAFopen(appPath, "r"); if (fStream == NULL) { OSReport("NandSDWorker: FAFopen %s failed.\n", appPath); handle_sd_error_for_entry(FA_ERR_SYSTEM, &ret); - goto CLEANUP; + goto clean_up; } - if (FAFread(encBuffer, 0x640, 1, fStream) != 1) { - ret = handle_sd_error_for_entry(FA_ERR_SYSTEM, (s32*)0x0); - if (ret == WORKER_RESULT_OK || ret == WORKER_RESULT_GENERIC_ERR) { - ret = WORKER_RESULT_BAD_FILE; + if (FAFread(encBuffer, sizeof(SDAppBanner), 1, fStream) != 1) { + ret = handle_sd_error_for_entry(FA_ERR_SYSTEM, NULL); + if (ret == RESULT_OK || ret == RESULT_FATAL_SD_ERROR) { + ret = RESULT_BAD_FILE; } FAFclose(fStream); - goto CLEANUP; + goto clean_up; } - if (handle_sd_error_for_entry(FAFclose(fStream), &ret) != WORKER_RESULT_OK) { + if (handle_sd_error_for_entry(FAFclose(fStream), &ret) != RESULT_OK) { OSReport("NandSDWorker: FAFclose failed.\n"); - goto CLEANUP; + goto clean_up; } - if (decrypt(encBuffer, 0x640, appBanner) != WORKER_RESULT_OK) { - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + if (decrypt(encBuffer, sizeof(SDAppBanner), appBanner) != RESULT_OK) { + ret = RESULT_BAD_FILE; + goto clean_up; } - u8 md5Digest[0x10]; - memcpy(md5Digest, appBanner->mHdrMd5, 0x10); - memcpy(appBanner->mHdrMd5, &c_md5_secret_key, 0x10); - if (!check_md5(md5Digest, (u8*)appBanner, 0x640)) { + NETMD5Sum MD5Sum; + memcpy(MD5Sum, appBanner->headerMD5, NET_MD5_DIGEST_SIZE); + memcpy(appBanner->headerMD5, &c_md5_secret_key, NET_MD5_DIGEST_SIZE); + if (!check_md5(MD5Sum, (u8*)appBanner, sizeof(SDAppBanner))) { OSReport("NandSDWorker: banner file %s md5 digest is not correct.\n", appPath); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } - if (titleId == (u32)ES_TITLE_CODE(appBanner->mTitleId)) - ret = WORKER_RESULT_OK; - else - ret = WORKER_RESULT_BAD_FILE; + if (titleId == (u32)ES_TITLE_CODE(appBanner->titleId)) { + ret = RESULT_OK; + } else { + ret = RESULT_BAD_FILE; + } - FAFileStat fStat; - memset(&fStat, 0, 0x14); - if (handle_sd_error_for_entry(FAFstat(appPath, &fStat), &ret) != WORKER_RESULT_OK) { + FAFileStat fileStat; + memset(&fileStat, 0, sizeof(FAFileStat)); + if (handle_sd_error_for_entry(FAFstat(appPath, &fileStat), &ret) != RESULT_OK) { // @bug this should say FAFstat, looks like it was copy-pasted from above OSReport("NandSDWorker: FAFclose failed.\n"); - goto CLEANUP; + goto clean_up; } - if (fStat.size <= ROUNDUP(appBanner->mThumbnailSize, 0x40) + 0x640) { - ret = WORKER_RESULT_BAD_FILE; + if (fileStat.size <= ROUNDUP(appBanner->thumbSize, 64) + sizeof(SDAppBanner)) { + ret = RESULT_BAD_FILE; } - CLEANUP: - MEMFreeToExpHeap(pWork->pHeap19000, encBuffer); + clean_up: + MEMFreeToExpHeap(myWork->mainHeap, encBuffer); return ret; } - s32 NandSDWorker::get_sd_app_thumbnail(const SDAppBanner* appBanner, u8* thumbnailOut) { + s32 NandSDWorker::get_sd_app_thumbnail(const SDAppBanner* appBanner, u8* thumbnailBuf) { s32 ret; u8* cmprBuf = NULL; - u8* encBuf = NULL; - char appPath[0x40]; - get_sd_app_path(appBanner->mTitleId, appPath); - if (appBanner->mThumbnailSize > 0xc800) { - OSReport("NandSDWorker: %s has illegal thumbnail size.[%d]\n", appPath, appBanner->mThumbnailSize); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + u8* encBanner = NULL; + char appPath[NAND_MAX_PATH]; + get_sd_app_path(appBanner->titleId, appPath); + if (appBanner->thumbSize > SD_APP_BACKUP_THUMBNAIL_LENGTH) { + OSReport("NandSDWorker: %s has illegal thumbnail size.[%d]\n", appPath, appBanner->thumbSize); + ret = RESULT_BAD_FILE; + goto clean_up; } - cmprBuf = (u8*)MEMAllocFromExpHeapEx(pWork->pHeap19000, ROUNDUP(appBanner->mThumbnailSize, 0x40), 0x20); - encBuf = (u8*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, ROUNDUP(appBanner->mThumbnailSize, 0x40)); + cmprBuf = (u8*)MEMAllocFromExpHeapEx(myWork->mainHeap, ROUNDUP(appBanner->thumbSize, 64), 32); + encBanner = (u8*)MEMAllocFromAllocator(&myWork->unkAllocator, ROUNDUP(appBanner->thumbSize, 64)); FAFILE* stream; stream = FAFopen(appPath, "r"); if (stream == NULL) { OSReport("NandSDWorker: FAFopen %s failed.\n", appPath); handle_sd_error_for_entry(FA_ERR_SYSTEM, &ret); - goto CLEANUP; + goto clean_up; } - if (handle_sd_error_for_entry(FAFseek(stream, 0x640, FA_SEEK_ORIGIN_BEGIN), &ret) != WORKER_RESULT_OK) { + if (handle_sd_error_for_entry(FAFseek(stream, sizeof(SDAppBanner), FA_SEEK_ORIGIN_BEGIN), &ret) != RESULT_OK) { OSReport("NandSDWorker: FAFseek failed.\n"); FAFclose(stream); - goto CLEANUP; + goto clean_up; } - if (FAFread(encBuf, ROUNDUP(appBanner->mThumbnailSize, 0x40), 1, stream) != 1) { + if (FAFread(encBanner, ROUNDUP(appBanner->thumbSize, 64), 1, stream) != 1) { ret = handle_sd_error_for_entry(FA_ERR_SYSTEM, NULL); - if (ret == WORKER_RESULT_OK || ret == WORKER_RESULT_GENERIC_ERR) { - ret = WORKER_RESULT_BAD_FILE; + if (ret == RESULT_OK || ret == RESULT_FATAL_SD_ERROR) { + ret = RESULT_BAD_FILE; } FAFclose(stream); - goto CLEANUP; + goto clean_up; } - if (handle_sd_error_for_entry(FAFclose(stream), &ret) != WORKER_RESULT_OK) { + if (handle_sd_error_for_entry(FAFclose(stream), &ret) != RESULT_OK) { OSReport("NandSDWorker: FAFclose failed.\n"); - goto CLEANUP; + goto clean_up; } - if (decrypt(encBuf, ROUNDUP(appBanner->mThumbnailSize, 0x40), cmprBuf) != WORKER_RESULT_OK) { - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + if (decrypt(encBanner, ROUNDUP(appBanner->thumbSize, 64), cmprBuf) != RESULT_OK) { + ret = RESULT_BAD_FILE; + goto clean_up; } - if (!check_md5(appBanner->mIconMd5, cmprBuf, ROUNDUP(appBanner->mThumbnailSize, 0x40))) { + if (!check_md5(appBanner->iconMD5, cmprBuf, ROUNDUP(appBanner->thumbSize, 64))) { OSReport("NandSDWorker: banner file %s md5 digest is not correct.\n", appPath); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = RESULT_BAD_FILE; + goto clean_up; } - ret = uncompress_app_thumbnail(cmprBuf, appBanner->mThumbnailSize, thumbnailOut); - if (ret < WORKER_RESULT_OK) { - OSReport("NandSDWorker: cannot uncompress thumbnail of %016llx [%d].\n", appBanner->mTitleId, ret); - ret = WORKER_RESULT_BAD_FILE; - goto CLEANUP; + ret = uncompress_app_thumbnail(cmprBuf, appBanner->thumbSize, thumbnailBuf); + if (ret < RESULT_OK) { + OSReport("NandSDWorker: cannot uncompress thumbnail of %016llx [%d].\n", appBanner->titleId, ret); + ret = RESULT_BAD_FILE; + goto clean_up; } OSReport("NandSDWorker: uncompress thumbnail size = %d.\n", ret); - CLEANUP: - MEMFreeToExpHeap(pWork->pHeap19000, cmprBuf); - MEMFreeToAllocator(&pWork->mBothHeapAllocator, encBuf); + clean_up: + MEMFreeToExpHeap(myWork->mainHeap, cmprBuf); + MEMFreeToAllocator(&myWork->unkAllocator, encBanner); return ret; } bool NandSDWorker::nand_app_exist(ESTitleId titleId) { - DO_NOT_INLINE; return nand_app_exist_ex(titleId) == EXISTENCE_COMPLETE; } + int NandSDWorker::nand_app_exist_ex(ESTitleId titleId) { - char contentPath[0x40]; + char contentPath[NAND_MAX_PATH]; ESContentId contentIds[0x200] ALIGN32; - ESTmdView* tmdView = (ESTmdView*)0x0; + ESTmdView* tmdView = NULL; u32 numContents; u32 usedBlocks = 0; u32 usedInodes = 0; @@ -4026,25 +4444,25 @@ namespace ipl { u32 titleCode = ES_TITLE_CODE(titleId); sprintf(contentPath, "/title/%08x/%08x/content", (u32)ES_TITLE_TYPE_NOMASK(titleId), titleCode); - int getUsageRes = nand::wrapper::SecretGetUsage(contentPath, &usedBlocks, &usedInodes); - if (getUsageRes != NAND_RESULT_OK && getUsageRes != NAND_RESULT_NOEXISTS) { - OSReport("NandSDWorker: NANDSecretGetUsage failed.[%d]\n", getUsageRes); + int result = nand::wrapper::SecretGetUsage(contentPath, &usedBlocks, &usedInodes); + if (result != NAND_RESULT_OK && result != NAND_RESULT_NOEXISTS) { + OSReport("NandSDWorker: NANDSecretGetUsage failed.[%d]\n", result); ret = EXISTENCE_NOEXIST; - goto CLEANUP; + goto clean_up; } - if (getUsageRes == NAND_RESULT_NOEXISTS || usedInodes <= 2) { + if (result == NAND_RESULT_NOEXISTS || usedInodes <= 2) { OSReport("NandSDWorker: no content for 0x%016llx.\n", titleId); ret = EXISTENCE_NOEXIST; - goto CLEANUP; + goto clean_up; } expectedContents = usedInodes - 2; - if (get_nand_app_tmdview(titleId, &tmdView) == WORKER_RESULT_GENERIC_ERR) { - MEMFreeToExpHeap(pWork->pHeap19000, tmdView); + if (get_nand_app_tmdview(titleId, &tmdView) == RESULT_FATAL_SD_ERROR) { + MEMFreeToExpHeap(myWork->mainHeap, tmdView); ret = EXISTENCE_NOEXIST; - goto CLEANUP; + goto clean_up; } for (u32 i = 0; i < tmdView->head.numContents; i++) { @@ -4054,26 +4472,25 @@ namespace ipl { } if (expectedContents == actualContents) { ret = EXISTENCE_COMPLETE; - goto CLEANUP; + goto clean_up; } OSReport("NandSDWorker: private content num for 0x%016llx is now/tmd = %d/%d.\n", titleId, expectedContents, actualContents); - int getNumTitleContentsOnCardRes; - getNumTitleContentsOnCardRes = ES_ListTitleContentsOnCard(titleId, (ESContentId*)0x0, &numContents); - if (getNumTitleContentsOnCardRes != ES_ERR_OK) { - OSReport("NandSDWorker: ES_ListTitleContentsOnCard failed.[%d]\n", getNumTitleContentsOnCardRes); + ESError esErr; + esErr = ES_ListTitleContentsOnCard(titleId, NULL, &numContents); + if (esErr != ES_ERR_OK) { + OSReport("NandSDWorker: ES_ListTitleContentsOnCard failed.[%d]\n", esErr); ret = EXISTENCE_NOEXIST; - goto CLEANUP; + goto clean_up; } if (numContents == 0) { OSReport("NandSDWorker: no content for 0x%016llx.\n", titleId); ret = EXISTENCE_NOEXIST; - goto CLEANUP; + goto clean_up; } - int listTitleContentsOnCardRes; - listTitleContentsOnCardRes = ES_ListTitleContentsOnCard(titleId, contentIds, &numContents); - if (listTitleContentsOnCardRes == ES_ERR_OK) { + esErr = ES_ListTitleContentsOnCard(titleId, contentIds, &numContents); + if (esErr == ES_ERR_OK) { bool foundNonOptionalMatch = false; for (u32 i = 0; i < numContents && !foundNonOptionalMatch; i++) { for (u32 j = 0; j < tmdView->head.numContents; j++) { @@ -4086,7 +4503,7 @@ namespace ipl { if (!foundNonOptionalMatch) { OSReport("NandSDWorker: 0x%016llx is already deleted.\n", titleId); ret = EXISTENCE_NOEXIST; - goto CLEANUP; + goto clean_up; } ret = EXISTENCE_NOEXIST; @@ -4101,20 +4518,20 @@ namespace ipl { if (count == numContents && (tmdView->contents[i].type & 0x4000) == 0) { OSReport("NandSDWorker: not complete: non-optional cidx %d missing for 0x%016llx.\n", tmdView->contents[i].index, titleId); ret = EXISTENCE_INCOMPLETE; - goto CLEANUP; + goto clean_up; } } OSReport("NandSDWorker: complete: only missing non-optional contents for 0x%016llx.\n", titleId); ret = EXISTENCE_COMPLETE; } else { - OSReport("NandSDWorker: ES_ListTitleContentsOnCard failed.[%d]\n", listTitleContentsOnCardRes); + OSReport("NandSDWorker: ES_ListTitleContentsOnCard failed.[%d]\n", esErr); ret = EXISTENCE_NOEXIST; - goto CLEANUP; + goto clean_up; } - CLEANUP: + clean_up: if (tmdView != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, tmdView); + MEMFreeToExpHeap(myWork->mainHeap, tmdView); } return ret; } @@ -4122,21 +4539,21 @@ namespace ipl { int NandSDWorker::get_nand_app_tmdview(ESTitleId titleId, ESTmdView** tmdViewOut) { u32 tmdSize; - int getTmdViewRes = ES_GetTmdView(titleId, NULL, &tmdSize); - if (getTmdViewRes != ES_ERR_OK) { - OSReport("NandSDWorker: failed to get TMD of 0x%016llx.[%d]\n", titleId, getTmdViewRes); - return WORKER_RESULT_GENERIC_ERR; + ESError err = ES_GetTmdView(titleId, NULL, &tmdSize); + if (err != ES_ERR_OK) { + OSReport("NandSDWorker: failed to get TMD of 0x%016llx.[%d]\n", titleId, err); + return RESULT_FATAL_SD_ERROR; } - ESTmdView* tmdViewBuf = (ESTmdView*)MEMAllocFromExpHeapEx(pWork->pHeap19000, ROUNDUP(tmdSize, 0x20), 0x20); + ESTmdView* tmdViewBuf = (ESTmdView*)MEMAllocFromExpHeapEx(myWork->mainHeap, OSRoundUp32B(tmdSize), 32); *tmdViewOut = tmdViewBuf; - getTmdViewRes = ES_GetTmdView(titleId, tmdViewBuf, &tmdSize); - if (getTmdViewRes != ES_ERR_OK) { - OSReport("NandSDWorker: failed to get TMD of 0x%016llx.[%d]\n", titleId, getTmdViewRes); - return WORKER_RESULT_GENERIC_ERR; + err = ES_GetTmdView(titleId, tmdViewBuf, &tmdSize); + if (err != ES_ERR_OK) { + OSReport("NandSDWorker: failed to get TMD of 0x%016llx.[%d]\n", titleId, err); + return RESULT_FATAL_SD_ERROR; } - return WORKER_RESULT_OK; + return RESULT_OK; } bool NandSDWorker::content_exist(ESTmdView* tmdView, u32 contentIdx) { @@ -4151,100 +4568,102 @@ namespace ipl { break; } } - if (i == tmdView->head.numContents) + if (i == tmdView->head.numContents) { return false; + } u32 numContents; ESContentId contentIds[0x200] ALIGN32; - if (ES_ListTitleContentsOnCard(titleId, NULL, &numContents) != ES_ERR_OK) + if (ES_ListTitleContentsOnCard(titleId, NULL, &numContents) != ES_ERR_OK) { return false; - if (ES_ListTitleContentsOnCard(titleId, contentIds, &numContents) != ES_ERR_OK) + } + if (ES_ListTitleContentsOnCard(titleId, contentIds, &numContents) != ES_ERR_OK) { return false; + } for (i = 0; i < numContents; i++) { - if (cid == contentIds[i]) + if (cid == contentIds[i]) { return true; + } } return false; } void NandSDWorker::do_list_nand_app() { ESTitleId* titleIds; - ESTitleId* titleIdsOut; + ESTitleId* titleIdsOut = (ESTitleId*)myWork->paramA; - u32 titleCount; + u32 titleCount = 0; - titleIdsOut = (ESTitleId*)pWork->pParamA; - titleCount = 0; ES_ListTitlesOnCard(NULL, &titleCount); - titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(pWork->pHeap19000, titleCount * sizeof(ESTitleId), 0x20); + titleIds = (ESTitleId*)MEMAllocFromExpHeapEx(myWork->mainHeap, titleCount * sizeof(ESTitleId), 32); ES_ListTitlesOnCard(titleIds, &titleCount); - int outI = 0; + int dest = 0; for (int i = 0; i < titleCount; i++) { if (is_user_nand_app(titleIds[i])) { if (nand_app_exist(titleIds[i])) { - titleIdsOut[outI++] = titleIds[i]; + titleIdsOut[dest++] = titleIds[i]; } } } - MEMFreeToExpHeap(pWork->pHeap19000, titleIds); - pWork->mAsyncResult = WORKER_RESULT_OK; + MEMFreeToExpHeap(myWork->mainHeap, titleIds); + myWork->asyncResult = RESULT_OK; } - s32 NandSDWorker::get_nand_app_thumbnail(ESTitleId titleId, u8* thumbnailOut, channel::SChanMgrMetaHeader* metaHdrOut) { - s32 sizeOrErr; - AppCacheEntry* cacheEntry = find_app_cache(&pWork->mAppsListNand, titleId); - if (cacheEntry == NULL || cacheEntry->mThumbnailSize == -1) { - ContentBin* contentBin = (ContentBin*)MEMAllocFromExpHeapEx(pWork->pHeap19000, sizeof(ContentBin), 0x20); - sizeOrErr = get_app_banner_from_meta(titleId, &contentBin->hdr); - if (sizeOrErr == WORKER_RESULT_OK) { + s32 NandSDWorker::get_nand_app_thumbnail(ESTitleId titleId, u8* thumbnailBuf, channel::SChanMgrMetaHeader* metaHdrOut) { + int result; + AppCacheEntry* cacheEntry = find_app_cache(&myWork->nandAppList, titleId); + if (cacheEntry == NULL || cacheEntry->thumbSize == -1) { + SDAppBackupData* backupData = (SDAppBackupData*)MEMAllocFromExpHeapEx(myWork->mainHeap, sizeof(SDAppBackupData), 32); + result = get_app_banner_from_meta(titleId, backupData); + if (result == RESULT_OK) { OSReport("NandSDWorker: get 0x%016llx app thumbnail from meta.\n", titleId); - sizeOrErr = uncompress_app_thumbnail(contentBin->icon, (contentBin->hdr).mThumbnailSize, thumbnailOut); - if (sizeOrErr < WORKER_RESULT_OK) { - OSReport("NandSDWorker: cannot uncompress thumbnail of %016llx [%d].\n", titleId, sizeOrErr); - sizeOrErr = WORKER_RESULT_BAD_FILE; + result = uncompress_app_thumbnail(backupData->thumbnail, backupData->head.thumbSize, thumbnailBuf); + if (result < RESULT_OK) { + OSReport("NandSDWorker: cannot uncompress thumbnail of %016llx [%d].\n", titleId, result); + result = RESULT_BAD_FILE; } else { - OSReport("NandSDWorker: uncompress thumbnail size = %d.\n", sizeOrErr); + OSReport("NandSDWorker: uncompress thumbnail size = %d.\n", result); if (metaHdrOut != NULL) { - memcpy(metaHdrOut, &(contentBin->hdr).mMetaHdr, 0x600); + memcpy(metaHdrOut, &backupData->head.metaHdr, sizeof(channel::SChanMgrMetaHeader)); } if (cacheEntry != NULL) { - memcpy(cacheEntry->mThumbnail, thumbnailOut, (contentBin->hdr).mThumbnailSize); - cacheEntry->mThumbnailSize = sizeOrErr; + memcpy(cacheEntry->thumbnail, thumbnailBuf, backupData->head.thumbSize); + cacheEntry->thumbSize = result; } else { - add_app_cache(&pWork->mAppsListNand, titleId, thumbnailOut, sizeOrErr, &(contentBin->hdr).mMetaHdr, -1); + add_app_cache(&myWork->nandAppList, titleId, thumbnailBuf, result, &backupData->head.metaHdr, -1); } } } - MEMFreeToExpHeap(this->pWork->pHeap19000, contentBin); + MEMFreeToExpHeap(myWork->mainHeap, backupData); } else { - memcpy(thumbnailOut, cacheEntry->mThumbnail, cacheEntry->mThumbnailSize); + memcpy(thumbnailBuf, cacheEntry->thumbnail, cacheEntry->thumbSize); if (metaHdrOut != NULL) { - memcpy(metaHdrOut, &cacheEntry->mMetaHdr, 0x600); + memcpy(metaHdrOut, &cacheEntry->metaHdr, sizeof(channel::SChanMgrMetaHeader)); } - sizeOrErr = cacheEntry->mThumbnailSize; + result = cacheEntry->thumbSize; } - return sizeOrErr; + return result; } s32 NandSDWorker::uncompress_app_thumbnail(const u8* cmpr, u32 uncmprSize, u8* uncmpr) { s32 size; - u8 md5Digest[0x10]; + NETMD5Sum MD5Sum; bool hasMd5 = false; u32 dataLen = 0; u32 offset = 0; if (NAND_CHECK_MAGIC4(cmpr, 'I', 'M', 'D', '5')) { dataLen = *(u32*)(cmpr + 4); hasMd5 = true; - memcpy(md5Digest, cmpr + 0x10, 0x10); + memcpy(MD5Sum, cmpr + 0x10, 0x10); offset = 0x20; } if (is_compressed(cmpr + offset)) { size = get_decode_size(cmpr + offset); if (size > 0x19000) { - return WORKER_RESULT_GENERIC_ERR; + return RESULT_FATAL_SD_ERROR; } if (is_lz7_compressed(cmpr + offset)) { @@ -4253,13 +4672,13 @@ namespace ipl { Rvl_decode(uncmpr, (u8*)cmpr + offset); } - if (hasMd5 && !check_md5(md5Digest, cmpr + offset, dataLen)) { + if (hasMd5 && !check_md5(MD5Sum, cmpr + offset, dataLen)) { size = -1; } } else { size = uncmprSize - offset; memcpy(uncmpr, cmpr + offset, size); - if (hasMd5 && !check_md5(md5Digest, uncmpr, dataLen)) { + if (hasMd5 && !check_md5(MD5Sum, uncmpr, dataLen)) { size = -1; } } @@ -4269,109 +4688,119 @@ namespace ipl { bool NandSDWorker::is_sli_compressed(const u8* data) { return NAND_CHECK_MAGIC3(data, 'Y', 'a', 'z'); } + bool NandSDWorker::is_asr_compressed(const u8* data) { return NAND_CHECK_MAGIC3(data, 'A', 'S', 'R'); } + bool NandSDWorker::is_ash_compressed(const u8* data) { return NAND_CHECK_MAGIC3(data, 'A', 'S', 'H'); } + bool NandSDWorker::is_lz7_compressed(const u8* data) { // @bug This checks the 3rd byte twice instead of the 4th return NAND_CHECK_MAGIC3(data, 'L', 'Z', '7') && data[2] == '7'; } bool NandSDWorker::is_compressed(const u8* data) { - if (is_sli_compressed(data) || is_asr_compressed(data) || is_ash_compressed(data) || is_lz7_compressed(data)) + if (is_sli_compressed(data) || is_asr_compressed(data) || is_ash_compressed(data) || is_lz7_compressed(data)) { return true; - else + } else { return false; + } } u32 NandSDWorker::get_decode_size(const u8* data) { if (data[0] == 'Y') { - return (data[4] << 0x18) | (data[5] << 0x10) | (data[6] << 0x8) | data[7]; + return Rvl_decode_szs_size(data); } if (data[0] == 'L') { return CXGetUncompressedSize(data + 4); } - return (data[5] << 0x10) | (data[6] << 0x8) | data[7]; + return Rvl_decode_ash_size(data); } void NandSDWorker::send_work(WorkMessage msg) { if (!is_working()) { - set_state(WORKER_STATE_WORKING); - OSSendMessage(&pWork->mMsgQueue, (OSMessage)msg, 0); + set_state(STATE_WORKING); + OSSendMessage(&myWork->msgQueue, (OSMessage)msg, 0); } } NandSDWorker::WorkMessage NandSDWorker::wait_work() { OSMessage cmd = NULL; - OSReceiveMessage(&pWork->mMsgQueue, &cmd, 1); + OSReceiveMessage(&myWork->msgQueue, &cmd, 1); OSReport("NandSDWorker: recieve message = %d\n", cmd); return (WorkMessage)(u32)cmd; } NandSDWorker::WorkState NandSDWorker::get_state() { - OSLockMutex(&pWork->mMutex); - WorkState state = pWork->mState; - OSUnlockMutex(&pWork->mMutex); + OSLockMutex(&myWork->mutex); + WorkState state = myWork->state; + OSUnlockMutex(&myWork->mutex); return state; } + void NandSDWorker::set_state(WorkState newState) { - OSLockMutex(&pWork->mMutex); - pWork->mState = newState; - OSUnlockMutex(&pWork->mMutex); + OSLockMutex(&myWork->mutex); + myWork->state = newState; + OSUnlockMutex(&myWork->mutex); } void NandSDWorker::sd_insert_callback(s8 driveLetter) { OSReport("NandSDWorker: SD card inserted !! %c drive\n", driveLetter); - if (s_sd_state != SD_STATE_INITIAL) - s_sd_state = SD_STATE_NOT_MOUNTED; + if (s_sd_state != SD_STATE_INITIAL) { + s_sd_state = SD_STATE_INSERTED; + } } + void NandSDWorker::sd_eject_callback(s8 driveLetter) { OSReport("NandSDWorker: SD card ejected !! %c drive\n", driveLetter); - if (s_sd_state != SD_STATE_INITIAL) - s_sd_state = SD_STATE_SLOT_EMPTY; + if (s_sd_state != SD_STATE_INITIAL) { + s_sd_state = SD_STATE_EJECTED; + } } void NandSDWorker::add_save_cache(nw4r::ut::List* list, ESTitleId titleId, WIISaveBannerFile* saveData, s32 size) { if (list->numObjects >= 45) { SaveCacheEntry* lastEntry = (SaveCacheEntry*)nw4r::ut::List_GetPrev(list, NULL); nw4r::ut::List_Remove(list, lastEntry); - MEMFreeToUnitHeap(pWork->pSaveCacheHeap, lastEntry); + MEMFreeToUnitHeap(myWork->saveCacheHeap, lastEntry); } - SaveCacheEntry* entry = (SaveCacheEntry*)MEMAllocFromUnitHeap(pWork->pSaveCacheHeap); - entry->mTitleId = titleId; + SaveCacheEntry* entry = (SaveCacheEntry*)MEMAllocFromUnitHeap(myWork->saveCacheHeap); + entry->titleId = titleId; if (saveData != NULL) { - entry->mBanner = *saveData; + entry->banner = *saveData; } else { - entry->mBanner.magic = 0; + entry->banner.signature = 0; } - entry->mSize = size; + entry->size = size; nw4r::ut::List_Prepend(list, entry); } NandSDWorker::SaveCacheEntry* NandSDWorker::find_save_cache(nw4r::ut::List* list, ESTitleId titleId) { - SaveCacheEntry* curr = NULL; - while ((curr = (SaveCacheEntry*)nw4r::ut::List_GetNext(list, curr)) != NULL) { - if (curr->mTitleId == titleId) - return curr; + SaveCacheEntry* cur = NULL; + while ((cur = (SaveCacheEntry*)nw4r::ut::List_GetNext(list, cur)) != NULL) { + if (cur->titleId == titleId) { + return cur; + } } return NULL; } void NandSDWorker::delete_save_cache(nw4r::ut::List* list, ESTitleId titleId) { SaveCacheEntry* entry = find_save_cache(list, titleId); - if (entry == NULL) + if (entry == NULL) { return; + } nw4r::ut::List_Remove(list, entry); - MEMFreeToUnitHeap(pWork->pSaveCacheHeap, entry); + MEMFreeToUnitHeap(myWork->saveCacheHeap, entry); } void NandSDWorker::clear_save_cache(nw4r::ut::List* list) { - SaveCacheEntry* curr = NULL; - while ((curr = (SaveCacheEntry*)nw4r::ut::List_GetNext(list, curr)) != NULL) { - nw4r::ut::List_Remove(list, curr); - MEMFreeToUnitHeap(pWork->pSaveCacheHeap, curr); + SaveCacheEntry* cur = NULL; + while ((cur = (SaveCacheEntry*)nw4r::ut::List_GetNext(list, cur)) != NULL) { + nw4r::ut::List_Remove(list, cur); + MEMFreeToUnitHeap(myWork->saveCacheHeap, cur); } } @@ -4379,83 +4808,89 @@ namespace ipl { if (list->numObjects >= 48) { AppCacheEntry* lastEntry = (AppCacheEntry*)nw4r::ut::List_GetPrev(list, NULL); nw4r::ut::List_Remove(list, lastEntry); - MEMFreeToUnitHeap(pWork->pAppCacheHeap, lastEntry); + MEMFreeToUnitHeap(myWork->appCacheHeap, lastEntry); } - AppCacheEntry* entry = (AppCacheEntry*)MEMAllocFromUnitHeap(pWork->pAppCacheHeap); + AppCacheEntry* entry = (AppCacheEntry*)MEMAllocFromUnitHeap(myWork->appCacheHeap); + entry->titleId = titleId; if (thumb != NULL) { - memcpy(entry->mThumbnail, thumb, thumbSize); - memcpy(&entry->mMetaHdr, meta, sizeof(channel::SChanMgrMetaHeader)); - entry->mThumbnailSize = thumbSize; + memcpy(entry->thumbnail, thumb, thumbSize); + memcpy(&entry->metaHdr, meta, sizeof(channel::SChanMgrMetaHeader)); + entry->thumbSize = thumbSize; } else { - entry->mThumbnailSize = -1; + entry->thumbSize = -1; } - entry->mFileSize = size; + entry->fileSize = size; + nw4r::ut::List_Prepend(list, entry); } NandSDWorker::AppCacheEntry* NandSDWorker::find_app_cache(nw4r::ut::List* list, ESTitleId titleId) { - AppCacheEntry* curr = NULL; - if (list == &pWork->mAppsListSD) { - while ((curr = (AppCacheEntry*)nw4r::ut::List_GetNext(list, curr)) != NULL) { - if (ES_TITLE_CODE(curr->titleId) == titleId) - return curr; + AppCacheEntry* cur = NULL; + if (list == &myWork->sdAppList) { + while ((cur = (AppCacheEntry*)nw4r::ut::List_GetNext(list, cur)) != NULL) { + if (ES_TITLE_CODE(cur->titleId) == titleId) { + return cur; + } } } else { - while ((curr = (AppCacheEntry*)nw4r::ut::List_GetNext(list, curr)) != NULL) { - if (curr->titleId == titleId) - return curr; + while ((cur = (AppCacheEntry*)nw4r::ut::List_GetNext(list, cur)) != NULL) { + if (cur->titleId == titleId) { + return cur; + } } } return NULL; } void NandSDWorker::delete_app_cache(nw4r::ut::List* list, ESTitleId titleId) { AppCacheEntry* entry = find_app_cache(list, titleId); - if (entry == NULL) + if (entry == NULL) { return; + } nw4r::ut::List_Remove(list, entry); - MEMFreeToUnitHeap(pWork->pAppCacheHeap, entry); + MEMFreeToUnitHeap(myWork->appCacheHeap, entry); } void NandSDWorker::clear_app_cache(nw4r::ut::List* list) { - AppCacheEntry* curr; - while ((curr = (AppCacheEntry*)nw4r::ut::List_GetFirst(list)) != NULL) { - nw4r::ut::List_Remove(list, curr); - MEMFreeToUnitHeap(pWork->pAppCacheHeap, curr); + AppCacheEntry* cur; + while ((cur = (AppCacheEntry*)nw4r::ut::List_GetFirst(list)) != NULL) { + nw4r::ut::List_Remove(list, cur); + MEMFreeToUnitHeap(myWork->appCacheHeap, cur); } } - s32 NandSDWorker::get_sd_entry_list(const char* filename, ESTitleId32* titleIdsOut, u32 minSize) { - FADta fData; - char fmtStr[0x40]; - char path[0x40]; - FAFileStat fStat; + s32 NandSDWorker::get_sd_entry_list(const char* fileName, ESTitleId32* titleIdsOut, u32 minSize) { + FADta fileDta; + char fmtStr[NAND_MAX_PATH]; + char path[NAND_MAX_PATH]; + FAFileStat fileStat; s32 sdErr; u32 count = 0; - FAError dirIterRes = FAFsfirst("/private/wii/title/*", 0x10, &fData); - if (dirIterRes != FA_ERR_SUCCESS) { + FAError faErr = FAFsfirst("/private/wii/title/*", 0x10, &fileDta); + if (faErr != FA_ERR_SUCCESS) { OSReport("NandSDWorker: FAFsfirst /private/wii/title/* failed.\n"); return handle_sd_error_for_entry(FA_ERR_SYSTEM, NULL); } - strncpy(fmtStr, c_wii_sd_title_root, 0x40); - strncat(fmtStr, "%s/", 0x40); - strncat(fmtStr, filename, 0x40); - // FVar1 = FA_ERR_SUCCESS; - while (dirIterRes == FA_ERR_SUCCESS) { - if (unk_0x4 != false) - return WORKER_RESULT_UNK_N18; + strncpy(fmtStr, c_wii_sd_title_root, NAND_MAX_PATH); + strncat(fmtStr, "%s/", NAND_MAX_PATH); + strncat(fmtStr, fileName, NAND_MAX_PATH); - if ((fData.attribute & 0x10) != 0) { - u32 filenameLen = strlen(fData.fileName); + while (faErr == FA_ERR_SUCCESS) { + if (unk_0x04 != false) { + return RESULT_UNK_18; + } + + if ((fileDta.attribute & 0x10) != 0) { + u32 filenameLen = strlen(fileDta.fileName); if (filenameLen == 4 || filenameLen == 8) { - snprintf(path, 0x40, fmtStr, fData.fileName); - if (handle_sd_error_for_entry(FAFstat(path, &fStat), &sdErr) == WORKER_RESULT_OK) { - if (fStat.size > minSize && is_fa_file(fStat.stat)) { - OSReport("NandSDWorker: found sd data %s [size: %d]\n", path, fStat.size); + snprintf(path, NAND_MAX_PATH, fmtStr, fileDta.fileName); + if (handle_sd_error_for_entry(FAFstat(path, &fileStat), &sdErr) == RESULT_OK) { + if (fileStat.size > minSize && is_fa_file(fileStat.stat)) { + OSReport("NandSDWorker: found sd data %s [size: %d]\n", path, fileStat.size); if (filenameLen == 8) { - char* local_508 = NULL; - ESTitleId32 titleId = strtoul(fData.fileName, &local_508, 0x10); + char* endPtr = NULL; + ESTitleId32 titleId = strtoul(fileDta.fileName, &endPtr, 0x10); if (is_available_data_only_titleidlo(titleId)) { if (titleIdsOut != NULL) { titleIdsOut[count] = titleId; @@ -4467,23 +4902,24 @@ namespace ipl { } } else { if (titleIdsOut != NULL) { - titleIdsOut[count] = gamecode_to_titleid_lo(fData.fileName); + titleIdsOut[count] = gamecode_to_titleid_lo(fileDta.fileName); } count++; } - if (count >= 2400) { + + if (count >= (SD_MAX_APP_TOTAL * 10) /* maybe????? */) { OSReport("NandSDWorker: There is too many entry on this SD card.\n"); break; } } - } else if (sdErr != WORKER_RESULT_GENERIC_ERR) { + } else if (sdErr != RESULT_FATAL_SD_ERROR) { OSReport("NandSDWorker: FAFstat %s failed.\n", path); return sdErr; } } } - dirIterRes = FAFsnext(&fData); - if (dirIterRes != FA_ERR_SUCCESS && handle_sd_error_for_entry(FA_ERR_SYSTEM, &sdErr) != WORKER_RESULT_GENERIC_ERR) { + faErr = FAFsnext(&fileDta); + if (faErr != FA_ERR_SUCCESS && handle_sd_error_for_entry(FA_ERR_SYSTEM, &sdErr) != RESULT_FATAL_SD_ERROR) { OSReport("NandSDWorker: FAFsnext /private/wii/title/* failed.\n"); return sdErr; } @@ -4492,10 +4928,10 @@ namespace ipl { } int NandSDWorker::sd_file_exist(const char* path, u32 minSize) { - FAFileStat fStat; - if (FAFstat(path, &fStat) == FA_ERR_SUCCESS) { - if (fStat.size > minSize && is_fa_file(fStat.stat)) { - OSReport("NandSDWorker: found sd data %s [size: %d]\n", path, fStat.size); + FAFileStat fileStat; + if (FAFstat(path, &fileStat) == FA_ERR_SUCCESS) { + if (fileStat.size > minSize && is_fa_file(fileStat.stat)) { + OSReport("NandSDWorker: found sd data %s [size: %d]\n", path, fileStat.size); return TRUE; } else { return FALSE; @@ -4512,61 +4948,63 @@ namespace ipl { } int NandSDWorker::get_sd_save_list(ESTitleId32* titleIdsOut) { - pWork->mSdSaveNum = 0; + myWork->sdSaveNum = 0; s32 ret = get_sd_entry_list(c_sd_save_file_name, titleIdsOut, sizeof(SDSaveBanner)); - if (ret < WORKER_RESULT_OK) + if (ret < RESULT_OK) { return ret; + } - pWork->mSdSaveNum = ret; + myWork->sdSaveNum = ret; OSReport("NandSDWorker: sd save num = %d\n", ret); - return WORKER_RESULT_OK; + return RESULT_OK; } int NandSDWorker::get_sd_app_list(ESTitleId32* titleIdsOut) { - pWork->mSdAppNum = 0; + myWork->sdAppNum = 0; s32 ret = get_sd_entry_list(c_sd_app_file_name, titleIdsOut, sizeof(SDAppBanner)); - if (ret < WORKER_RESULT_OK) + if (ret < RESULT_OK) { return ret; + } - pWork->mSdAppNum = ret; + myWork->sdAppNum = ret; OSReport("NandSDWorker: sd app num = %d\n", ret); - return WORKER_RESULT_OK; + return RESULT_OK; } int NandSDWorker::recursion_nand_save(ESTitleId titleId, RecursiveProcess process, const char** ignoreList, u32 ignoreListLen) { - char bannerPath[0x40]; - char dataPath[0x41]; // Between 0x41 and 0x50, likely 0x41 because 0x40 + null byte + char bannerPath[NAND_MAX_PATH]; + char dataPath[NAND_MAX_PATH + 1]; get_nand_data_only_title_save_path(titleId, dataPath); if (!change_uid(titleId)) { - return WORKER_RESULT_GENERIC_ERR; + return RESULT_FATAL_SD_ERROR; } if (process == RECURSIVE_DELETE) { - strncpy(bannerPath, dataPath, 0x40); - strncat(bannerPath, "/", 0x40); - strncat(bannerPath, c_banner_file_name, 0x40); + strncpy(bannerPath, dataPath, NAND_MAX_PATH); + strncat(bannerPath, "/", NAND_MAX_PATH); + strncat(bannerPath, c_banner_file_name, NAND_MAX_PATH); - int delBannerRes = nand::wrapper::Delete(bannerPath); - if (check_nand_corrupt(delBannerRes, NULL)) { + s32 err = nand::wrapper::Delete(bannerPath); + if (check_nand_corrupt(err, NULL)) { change_uid(SYSMENU_TITLE_ID); - return WORKER_RESULT_NAND_CORRUPT; + return RESULT_NAND_CORRUPT; } - if (delBannerRes == NAND_RESULT_OK) { + if (err == NAND_RESULT_OK) { OSReport("NandSDWorker: delete [%s]\n", bannerPath); - } else if (delBannerRes == NAND_RESULT_NOEXISTS) { + } else if (err == NAND_RESULT_NOEXISTS) { OSReport("NandSDWorker: [%s] no exists\n", bannerPath); } else { - OSReport("NandSDWorker: NANDDelete %s failed [%d]\n", bannerPath, delBannerRes); + OSReport("NandSDWorker: NANDDelete %s failed [%d]\n", bannerPath, err); change_uid(SYSMENU_TITLE_ID); - return WORKER_RESULT_GENERIC_ERR; + return RESULT_FATAL_SD_ERROR; } } int ret = recursion_nand(dataPath, NULL, process, ignoreList, ignoreListLen); - if (process == RECURSIVE_DELETE && delete_empty_title(titleId, FALSE) != WORKER_RESULT_OK) { - return WORKER_RESULT_GENERIC_ERR; + if (process == RECURSIVE_DELETE && delete_empty_title(titleId, FALSE) != RESULT_OK) { + return RESULT_FATAL_SD_ERROR; } change_uid(SYSMENU_TITLE_ID); @@ -4575,40 +5013,26 @@ namespace ipl { typedef struct { s32 type; - char text[0x40]; + char text[NAND_MAX_PATH]; } IgnoreListBufElement; - inline void initIgnoreListBuf(IgnoreListBufElement* ignoreListBuf, u32 ignoreListLen, const char** ignoreList) { - for (int i = 0; i < ignoreListLen; i++) { - u32 currIgnoreLen = strlen(ignoreList[i]); - strncpy(ignoreListBuf[i].text, ignoreList[i], 0x40); - if (ignoreListBuf[i].text[currIgnoreLen - 1] == '/') { - ignoreListBuf[i].text[currIgnoreLen - 1] = '\0'; - ignoreListBuf[i].type = NAND_TYPE_DIR; - } else { - ignoreListBuf[i].type = NAND_TYPE_FILE; - } - } - } int NandSDWorker::recursion_nand(const char* mainPath, const char* pathMoveTarget, RecursiveProcess process, const char** ignoreList, u32 ignoreListLen) { u32 dirMemberCount = 0; - s32 ret = WORKER_RESULT_OK; + s32 ret = RESULT_OK; ut::Stack stack; IgnoreListBufElement* ignoreListBuf; char* dirListingBuf; u32 mainPathLen; - int i; - if (ignoreListLen != 0) { - ignoreListBuf = (IgnoreListBufElement*)MEMAllocFromExpHeapEx(pWork->pHeap19000, ignoreListLen * sizeof(IgnoreListBufElement), 0x20); - for (i = 0; i < ignoreListLen; i++) { - u32 currIgnoreLen = strlen(ignoreList[i]); - strncpy(ignoreListBuf[i].text, ignoreList[i], 0x40); - if (ignoreListBuf[i].text[currIgnoreLen - 1] == '/') { - ignoreListBuf[i].text[currIgnoreLen - 1] = '\0'; + ignoreListBuf = (IgnoreListBufElement*)MEMAllocFromExpHeapEx(myWork->mainHeap, ignoreListLen * sizeof(IgnoreListBufElement), 32); + for (int i = 0; i < ignoreListLen; i++) { + u32 curIgnoreLen = strlen(ignoreList[i]); + strncpy(ignoreListBuf[i].text, ignoreList[i], NAND_MAX_PATH); + if (ignoreListBuf[i].text[curIgnoreLen - 1] == '/') { + ignoreListBuf[i].text[curIgnoreLen - 1] = '\0'; ignoreListBuf[i].type = NAND_TYPE_DIR; } else { ignoreListBuf[i].type = NAND_TYPE_FILE; @@ -4616,183 +5040,187 @@ namespace ipl { } } - dirListingBuf = (char*)MEMAllocFromExpHeapEx(pWork->pHeap19000, sizeof("XXXXXXXX.app") * 32, 0x20); - stack.init(MEMAllocFromExpHeapEx(pWork->pHeap19000, ut::Stack::getRequiredBufSize(0x20, 0x40), 4), 0x40, 0x20); + dirListingBuf = (char*)MEMAllocFromExpHeapEx(myWork->mainHeap, sizeof("XXXXXXXX.app") * 32, 32); + stack.init(MEMAllocFromExpHeapEx(myWork->mainHeap, ut::Stack::getRequiredBufSize(0x20, NAND_MAX_PATH), 4), NAND_MAX_PATH, 32); mainPathLen = strlen(mainPath); stack.push(mainPath); - char currBasePath[0x40]; - char currFullPath[0x40]; + char curBasePath[NAND_MAX_PATH]; + char curFullPath[NAND_MAX_PATH]; - while (stack.pop(currBasePath)) { - int getDirMemberCountRes = nand::wrapper::PrivateReadDir(currBasePath, NULL, &dirMemberCount); - if (getDirMemberCountRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateReadDir[%s] failed %d\n", currBasePath, getDirMemberCountRes); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + while (stack.pop(curBasePath)) { + s32 nandErr = nand::wrapper::PrivateReadDir(curBasePath, NULL, &dirMemberCount); + if (nandErr != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateReadDir[%s] failed %d\n", curBasePath, nandErr); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - if (dirMemberCount == 0) + if (dirMemberCount == 0) { continue; + } - int listDirRes = nand::wrapper::PrivateReadDir(currBasePath, dirListingBuf, &dirMemberCount); - if (listDirRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateReadDir[%s] failed %d\n", currBasePath, listDirRes); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + nandErr = nand::wrapper::PrivateReadDir(curBasePath, dirListingBuf, &dirMemberCount); + if (nandErr != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateReadDir[%s] failed %d\n", curBasePath, nandErr); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } u32 dirListingOff = 0; - u8 currPathFileType = NAND_TYPE_NONE; - for (int memberI = 0; memberI < dirMemberCount; memberI++) { - strncpy(currFullPath, currBasePath, 0x40); - strncat(currFullPath, "/", 0x40); - strncat(currFullPath, dirListingBuf + dirListingOff, 0x40); + u8 curPathFileType = NAND_TYPE_NONE; + for (int i = 0; i < dirMemberCount; i++) { + strncpy(curFullPath, curBasePath, NAND_MAX_PATH); + strncat(curFullPath, "/", NAND_MAX_PATH); + strncat(curFullPath, dirListingBuf + dirListingOff, NAND_MAX_PATH); dirListingOff += strlen(dirListingBuf + dirListingOff) + 1; if (ignoreListLen != 0) { bool matchesIgnore = false; - for (u32 ignoreI = 0; ignoreI < ignoreListLen; ignoreI++) { - if (strcmp(currFullPath + (mainPathLen + 1), ignoreListBuf[ignoreI].text) != 0) + for (u32 j = 0; j < ignoreListLen; j++) { + if (strcmp(curFullPath + (mainPathLen + 1), ignoreListBuf[j].text) != 0) { continue; - - int getTypeRes = nand::wrapper::PrivateGetType(currFullPath, &currPathFileType); - if (getTypeRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateGetType[%s] failed %d\n", currFullPath, getTypeRes); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; } - if (currPathFileType == ignoreListBuf[ignoreI].type) { - OSReport("NandSDWorker: ignore [%s]\n", currFullPath); + + nandErr = nand::wrapper::PrivateGetType(curFullPath, &curPathFileType); + if (nandErr != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateGetType[%s] failed %d\n", curFullPath, nandErr); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; + } + if (curPathFileType == ignoreListBuf[j].type) { + OSReport("NandSDWorker: ignore [%s]\n", curFullPath); matchesIgnore = true; } } - if (matchesIgnore) + if (matchesIgnore) { continue; + } } switch (process) { case RECURSIVE_GET_SIZE: { - int getTypeRes; - getTypeRes = nand::wrapper::PrivateGetType(currFullPath, &currPathFileType); - if (getTypeRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateGetType[%s] failed %d\n", currFullPath, getTypeRes); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + nandErr = nand::wrapper::PrivateGetType(curFullPath, &curPathFileType); + if (nandErr != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateGetType[%s] failed %d\n", curFullPath, nandErr); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } - if (currPathFileType == NAND_TYPE_FILE) { - s32 fileSizeRes = nand_get_length(currFullPath); + if (curPathFileType == NAND_TYPE_FILE) { + s32 fileSizeRes = nand_get_length(curFullPath); if (fileSizeRes < 0) { ret = fileSizeRes; - goto CLEANUP; + goto clean_up; } ret += fileSizeRes; - } else if (currPathFileType == NAND_TYPE_DIR) { - if (!stack.push(currFullPath)) { - OSReport("NandSDWorker: too many files in %s\n", currBasePath); - ret = WORKER_RESULT_TOO_MANY_FILES; - goto CLEANUP; + } else if (curPathFileType == NAND_TYPE_DIR) { + if (!stack.push(curFullPath)) { + OSReport("NandSDWorker: too many files in %s\n", curBasePath); + ret = RESULT_TOO_MANY_FILES; + goto clean_up; } } break; } case RECURSIVE_DELETE: { - int deleteRes = nand::wrapper::PrivateDelete(currFullPath); - if (check_nand_corrupt(deleteRes, &ret)) - goto CLEANUP; - if (deleteRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateDelete[%s] failed %d\n", currFullPath, deleteRes); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + int deleteRes = nand::wrapper::PrivateDelete(curFullPath); + if (check_nand_corrupt(deleteRes, &ret)) { + goto clean_up; } - OSReport("NandSDWorker: delete [%s]\n", currFullPath); + if (deleteRes != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateDelete[%s] failed %d\n", curFullPath, deleteRes); + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; + } + OSReport("NandSDWorker: delete [%s]\n", curFullPath); break; } case RECURSIVE_MOVE: { - int moveRes = nand::wrapper::PrivateMove(currFullPath, pathMoveTarget); - if (moveRes != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateMove %s failed.[%d]\n", currFullPath, moveRes); + nandErr = nand::wrapper::PrivateMove(curFullPath, pathMoveTarget); + if (nandErr != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateMove %s failed.[%d]\n", curFullPath, nandErr); recursion_nand(pathMoveTarget, NULL, RECURSIVE_DELETE, ignoreList, ignoreListLen); - if (moveRes == NAND_RESULT_CORRUPT) { - ret = WORKER_RESULT_NAND_CORRUPT; + if (nandErr == NAND_RESULT_CORRUPT) { + ret = RESULT_NAND_CORRUPT; } else { - ret = WORKER_RESULT_GENERIC_ERR; + ret = RESULT_FATAL_SD_ERROR; } - goto CLEANUP; + goto clean_up; } - OSReport("NandSDWorker: move %s from %s to %s\n", currFullPath + (strlen(currBasePath) + 1), currBasePath, pathMoveTarget); + OSReport("NandSDWorker: move %s from %s to %s\n", curFullPath + (strlen(curBasePath) + 1), curBasePath, pathMoveTarget); break; } } } } - CLEANUP: - MEMFreeToExpHeap(pWork->pHeap19000, stack.getBuf()); - MEMFreeToExpHeap(pWork->pHeap19000, dirListingBuf); - if (ignoreListLen != 0) - MEMFreeToExpHeap(pWork->pHeap19000, ignoreListBuf); + clean_up: + MEMFreeToExpHeap(myWork->mainHeap, stack.getBuf()); + MEMFreeToExpHeap(myWork->mainHeap, dirListingBuf); + if (ignoreListLen != 0) { + MEMFreeToExpHeap(myWork->mainHeap, ignoreListBuf); + } return ret; } s32 NandSDWorker::nand_get_length(const char* path) { - s32 ret; - int errno; + int ret; + s32 err; u32 fileLen; - NANDFileInfo fInfo; + NANDFileInfo fileInfo; fileLen = 0; - errno = nand::wrapper::PrivateOpen(path, &fInfo, NAND_ACCESS_READ); - if (errno != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDPrivateOpen[%s] failed %d\n", path, errno); - return WORKER_RESULT_GENERIC_ERR; + err = nand::wrapper::PrivateOpen(path, &fileInfo, NAND_ACCESS_READ); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDPrivateOpen[%s] failed %d\n", path, err); + return RESULT_FATAL_SD_ERROR; } - errno = nand::wrapper::GetLength(&fInfo, &fileLen); - if (errno != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDGetLength[%s] failed %d\n", path, errno); - ret = WORKER_RESULT_GENERIC_ERR; + err = nand::wrapper::GetLength(&fileInfo, &fileLen); + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDGetLength[%s] failed %d\n", path, err); + ret = RESULT_FATAL_SD_ERROR; } else { OSReport("NandSDWorker: size of %s is [%d]\n", path, fileLen); ret = fileLen; } - errno = nand::wrapper::Close(&fInfo); - if (check_nand_corrupt(errno, NULL)) { - return WORKER_RESULT_NAND_CORRUPT; + err = nand::wrapper::Close(&fileInfo); + if (check_nand_corrupt(err, NULL)) { + return RESULT_NAND_CORRUPT; } - if (errno != NAND_RESULT_OK) { - OSReport("NandSDWorker: NANDClose[%s] failed %d\n", path, errno); - ret = WORKER_RESULT_GENERIC_ERR; + if (err != NAND_RESULT_OK) { + OSReport("NandSDWorker: NANDClose[%s] failed %d\n", path, err); + ret = RESULT_FATAL_SD_ERROR; } return ret; } bool NandSDWorker::change_uid(ESTitleId newUid) { - if (pWork->mUid != newUid) { - int setUidRes = ES_SetUid(newUid); - if (setUidRes != ES_ERR_OK) { - OSReport("ES_SetUid failed[%d]: 0x%016llx\n", setUidRes, newUid); + if (myWork->curUId != newUid) { + ESError esErr = ES_SetUid(newUid); + if (esErr != ES_ERR_OK) { + OSReport("ES_SetUid failed[%d]: 0x%016llx\n", esErr, newUid); return false; } ISFS_CloseLib(); ISFS_OpenLib(); - pWork->mUid = newUid; + myWork->curUId = newUid; } return true; } - bool NandSDWorker::check_nand_corrupt(s32 nandCode, s32* errcodeOut) { - if (nandCode == NAND_RESULT_CORRUPT) { + bool NandSDWorker::check_nand_corrupt(s32 nandErr, s32* result) { + if (nandErr == NAND_RESULT_CORRUPT) { OSReport("NandSDWorker: nand memory corrupt!\n"); - if (errcodeOut != NULL) { - *errcodeOut = WORKER_RESULT_NAND_CORRUPT; + if (result != NULL) { + *result = RESULT_NAND_CORRUPT; } return true; } else { @@ -4801,10 +5229,11 @@ namespace ipl { } int NandSDWorker::handle_sd_error(s32 err, s32* errOut) { - if (err == WORKER_RESULT_OK) - return WORKER_RESULT_OK; + if (err == RESULT_OK) { + return RESULT_OK; + } - int ret = WORKER_RESULT_GENERIC_ERR; + int ret = RESULT_FATAL_SD_ERROR; switch (FAErrnum()) { case FA_ERR_SYSTEM: case FA_ERR_EPERM: @@ -4821,69 +5250,76 @@ namespace ipl { case FA_ERR_EFBIG: case FA_ERR_ENOLCK: case FA_ERR_ENOSYS: - case FA_ERR_ENOTEMPTY: - ret = WORKER_RESULT_GENERIC_ERR; + case FA_ERR_ENOTEMPTY: { + // why not RESULT_FA_ERROR + ret = RESULT_FATAL_SD_ERROR; break; - - case FA_ERR_ENOSPC: - ret = WORKER_RESULT_NO_SPACE; + } + case FA_ERR_ENOSPC: { + ret = RESULT_OUT_OF_SPACE; break; - - case FA_ERR_EWRTPROTECT: - ret = WORKER_RESULT_WRITE_PROTECTED; + } + case FA_ERR_EWRTPROTECT: { + ret = RESULT_WRITE_PROTECTED; break; - + } case FA_ERR_EIO: - case FA_ERR_ENOEXEC: - ret = WORKER_RESULT_GENERIC_ERR; + case FA_ERR_ENOEXEC: { + ret = RESULT_FATAL_SD_ERROR; break; + } } OSReport("NandSDWorker: FA library error.[%d]\n", FAErrnum()); - if (errOut != NULL) + if (errOut != NULL) { *errOut = ret; + } + return ret; } + int NandSDWorker::handle_sd_error_for_entry(s32 err, s32* errOut) { - if (err == FA_ERR_SUCCESS) - return WORKER_RESULT_OK; + if (err == FA_ERR_SUCCESS) { + return RESULT_OK; + } FAError faErr = FAErrnum(); if (faErr == FA_ERR_ENOENT || faErr == FA_ERR_EINVAL) { - if (errOut != NULL) - *errOut = WORKER_RESULT_GENERIC_ERR; - return WORKER_RESULT_GENERIC_ERR; + if (errOut != NULL) { + *errOut = RESULT_FATAL_SD_ERROR; + } + return RESULT_FATAL_SD_ERROR; } else { return handle_sd_error(err, errOut); } } bool NandSDWorker::is_all_region(ESTitleId titleId) { - DO_NOT_INLINE; - u64 masked = titleId & ~0xFFFFFFFFFFFFFF00ULL; + u64 masked = titleId & 0xFF; char maskedChar = masked; return maskedChar == 'A'; } bool NandSDWorker::is_same_title(ESTitleId titleIdA, ESTitleId titleIdB) { - DO_NOT_INLINE; - ESTitleId maskedA = titleIdA & 0xFFFFFFFFFFFFFF00ULL; - ESTitleId maskedB = titleIdB & 0xFFFFFFFFFFFFFF00ULL; + ESTitleId maskedA = titleIdA & 0xFFFFFFFFFFFFFF00; + ESTitleId maskedB = titleIdB & 0xFFFFFFFFFFFFFF00; return maskedA == maskedB; } int NandSDWorker::item_exist_nand_save_folder(ESTitleId titleId, const char* folderName) { - char fullPath[0x40]; + char fullPath[NAND_MAX_PATH]; if (!change_uid(titleId)) { - return WORKER_RESULT_ES_ERROR; + return RESULT_ES_ERROR; } get_nand_data_only_title_save_path(titleId, fullPath); - strncat(fullPath, "/", 0x40); - strncat(fullPath, folderName, 0x40); - u32 numItemsInFolder; - int readDirRes = nand::wrapper::ReadDir(fullPath, NULL, &numItemsInFolder); + strncat(fullPath, "/", NAND_MAX_PATH); + strncat(fullPath, folderName, NAND_MAX_PATH); + + u32 numItemsInFolder; bool exists; - if (readDirRes == NAND_RESULT_OK) { + + s32 err = nand::wrapper::ReadDir(fullPath, NULL, &numItemsInFolder); + if (err == NAND_RESULT_OK) { OSReport("NandSDWorker: %d item in %s.\n", numItemsInFolder, fullPath); if (numItemsInFolder != 0) { exists = true; @@ -4891,7 +5327,7 @@ namespace ipl { exists = false; } } else { - OSReport("NandSDWorker: NANDReadDir %s failed.[%d]\n", fullPath, readDirRes); + OSReport("NandSDWorker: NANDReadDir %s failed.[%d]\n", fullPath, err); exists = false; } change_uid(SYSMENU_TITLE_ID); @@ -4904,8 +5340,9 @@ namespace ipl { memcpy(iv, &c_es_encrypt_iv, 0x10); res = ES_Encrypt(6, iv, (u8*)input, inputSize, (u8*)output); - if (res != ES_ERR_OK) + if (res != ES_ERR_OK) { OSReport("NandSDWorker: ES_Encrypt failed.[%d]\n", res); + } return res; } @@ -4916,77 +5353,84 @@ namespace ipl { memcpy(iv, &c_es_encrypt_iv, 0x10); res = ES_Decrypt(6, iv, (u8*)input, inputSize, (u8*)output); - if (res != ES_ERR_OK) + if (res != ES_ERR_OK) { OSReport("NandSDWorker: ES_Decrypt failed.[%d]\n", res); + } return res; } bool NandSDWorker::is_fa_file(u8 stat) { - DO_NOT_INLINE; - return (stat & 0b00010000) == 0 && (stat & 0b00000010) == 0; + return (stat & FA_FILE_STAT_DIR) == 0 && (stat & FA_FILE_UNK_1) == 0; } - int ipl::NandSDWorker::get_nand_save_perms(ESTitleId titleId) { + int NandSDWorker::get_nand_save_perms(ESTitleId titleId) { u32 numTitleFiles; WIISaveBannerFile* fileOut; int ret; - fileOut = (WIISaveBannerFile*)MEMAllocFromExpHeapEx(this->pWork->pHeap19000, 0xf0a0, 0x20); + fileOut = (WIISaveBannerFile*)MEMAllocFromExpHeapEx(this->myWork->mainHeap, 0xf0a0, 0x20); ret = get_nand_save_banner(titleId, fileOut, NULL); - if (ret != WORKER_RESULT_OK) - goto CLEANUP; + if (ret != RESULT_OK) { + goto clean_up; + } if (is_data_only_title(titleId)) { ret = 5; - goto CLEANUP; + goto clean_up; } - if ((fileOut->flags & 1) != 0) { + if ((fileOut->flags & WII_SAVE_BANNER_FLAG_NOCOPY) != 0) { ret = 1; - goto CLEANUP; + goto clean_up; } if (item_exist_nand_save_folder(titleId, c_nocopy_folder_name) != 0) { ret = get_num_nand_data_only_title_save_files(titleId, &numTitleFiles); - if (ret != WORKER_RESULT_OK) - goto CLEANUP; + if (ret != RESULT_OK) { + goto clean_up; + } - if (numTitleFiles == 2) + if (numTitleFiles == 2) { ret = 1; - else + } else { ret = 2; - goto CLEANUP; + } + goto clean_up; } if (item_exist_nand_save_folder(titleId, c_notransfer_folder_name) != 0) { ret = get_num_nand_data_only_title_save_files(titleId, &numTitleFiles); - if (ret != WORKER_RESULT_OK) - goto CLEANUP; + if (ret != RESULT_OK) { + goto clean_up; + } - if (numTitleFiles == 2) + if (numTitleFiles == 2) { ret = 3; - else + } else { ret = 4; - goto CLEANUP; + } + goto clean_up; } ret = 0; - CLEANUP: - if (fileOut != NULL) - MEMFreeToExpHeap(pWork->pHeap19000, fileOut); + clean_up: + if (fileOut != NULL) { + MEMFreeToExpHeap(myWork->mainHeap, fileOut); + } + return ret; } int NandSDWorker::get_num_nand_data_only_title_save_files(ESTitleId titleId, u32* numFiles) { if (!change_uid(titleId)) { - return WORKER_RESULT_ES_ERROR; + return RESULT_ES_ERROR; } - char savePath[0x40]; + char savePath[NAND_MAX_PATH]; get_nand_data_only_title_save_path(titleId, savePath); int readDirRes = nand::wrapper::ReadDir(savePath, NULL, numFiles); @@ -4998,94 +5442,102 @@ namespace ipl { } int NandSDWorker::get_sd_save_perms(ESTitleId32 titleId) { - SaveCacheEntry* cacheEntry = find_save_cache(&pWork->mSavesListSD, titleId); - if (cacheEntry == NULL || cacheEntry->mBanner.magic == 0) - return WORKER_RESULT_GENERIC_ERR; + SaveCacheEntry* cacheEntry = find_save_cache(&myWork->sdSaveList, titleId); + if (cacheEntry == NULL || cacheEntry->banner.signature == 0) { + return RESULT_FATAL_SD_ERROR; + } - return cacheEntry->mBanner.flags & scene::WiiBannerFileInfo::FLAG_LOCAL_SAVE; + return cacheEntry->banner.flags & WII_SAVE_BANNER_FLAG_NOCOPY; } void NandSDWorker::do_move_nand_app_to_sd() { do_copy_nand_app_to_sd(); - if (pWork->mAsyncResult < WORKER_RESULT_OK) + if (myWork->asyncResult < RESULT_OK) { return; + } - pWork->mAsyncResult = delete_nand_app_content(pWork->mTitleId); - if (pWork->mAsyncResult != WORKER_RESULT_OK) + myWork->asyncResult = delete_nand_app_content(myWork->curTitleId); + if (myWork->asyncResult != RESULT_OK) { return; + } - pWork->mNandAppNum--; + myWork->nandAppNum--; change_nand_app_count(-1); - delete_app_cache(&pWork->mAppsListNand, pWork->mTitleId); + delete_app_cache(&myWork->nandAppList, myWork->curTitleId); } void NandSDWorker::do_move_sd_app_to_nand() { do_copy_sd_app_to_nand(false); - if (pWork->mAsyncResult < WORKER_RESULT_OK) + if (myWork->asyncResult < RESULT_OK) { return; + } do_delete_sd_app(); } void NandSDWorker::do_move_nand_save_to_sd() { do_copy_nand_save_to_sd(); - if (pWork->mAsyncResult < WORKER_RESULT_OK) + if (myWork->asyncResult < RESULT_OK) return; - if (is_data_only_title(pWork->mTitleId)) { - int delTitleRes = utility::ESMisc::DeleteTitle(System::getMem2Sys(), pWork->mTitleId); - if (delTitleRes != 0) { - OSReport("NandSDWorker: ESMisc::DeleteTitle failed [%d]\n", delTitleRes); - pWork->mAsyncResult = WORKER_RESULT_GENERIC_ERR; + if (is_data_only_title(myWork->curTitleId)) { + ESError esErr = utility::ESMisc::DeleteTitle(System::getMem2Sys(), myWork->curTitleId); + if (esErr != ES_ERR_OK) { + OSReport("NandSDWorker: ESMisc::DeleteTitle failed [%d]\n", esErr); + myWork->asyncResult = RESULT_FATAL_SD_ERROR; } else { - pWork->mAsyncResult = WORKER_RESULT_OK; + myWork->asyncResult = RESULT_OK; } - pWork->mAsyncResult = delete_meta_file(pWork->mTitleId); + myWork->asyncResult = delete_meta_file(myWork->curTitleId); } else { - pWork->mAsyncResult = recursion_nand_save(pWork->mTitleId, RECURSIVE_DELETE, NULL, 0); - delete_download_task(pWork->mTitleId); + myWork->asyncResult = recursion_nand_save(myWork->curTitleId, RECURSIVE_DELETE, NULL, 0); + delete_download_task(myWork->curTitleId); } - if (pWork->mAsyncResult != WORKER_RESULT_OK) + if (myWork->asyncResult != RESULT_OK) { return; + } - pWork->mNandSaveNum--; - delete_save_cache(&pWork->mSavesListNand, pWork->mTitleId); + myWork->nandSaveNum--; + delete_save_cache(&myWork->nandSaveList, myWork->curTitleId); } void NandSDWorker::do_move_sd_save_to_nand() { do_copy_sd_save_to_nand(); - if (pWork->mAsyncResult != WORKER_RESULT_OK) + if (myWork->asyncResult != RESULT_OK) { return; + } do_delete_sd_save(); } bool NandSDWorker::both_app_exist(ESTitleId32 titleId) { bool exists = false; - SDAppBanner* banner = (SDAppBanner*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, 0x640); - if (get_sd_app_banner(titleId, banner) == WORKER_RESULT_OK && nand_app_exist_ex(banner->mTitleId) == EXISTENCE_COMPLETE) { + SDAppBanner* banner = (SDAppBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppBanner)); + if (get_sd_app_banner(titleId, banner) == RESULT_OK && nand_app_exist_ex(banner->titleId) == EXISTENCE_COMPLETE) { exists = true; } - if (banner != NULL) - MEMFreeToAllocator(&pWork->mBothHeapAllocator, banner); + if (banner != NULL) { + MEMFreeToAllocator(&myWork->unkAllocator, banner); + } return exists; } bool NandSDWorker::check_nand_save_exist_lo(ESTitleId32 titleId) { bool exists = false; - SDSaveBanner* banner = (SDSaveBanner*)MEMAllocFromAllocator(&this->pWork->mBothHeapAllocator, sizeof(SDSaveBanner)); - if (get_sd_save_banner(titleId, banner) == WORKER_RESULT_OK) { + SDSaveBanner* banner = (SDSaveBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDSaveBanner)); + if (get_sd_save_banner(titleId, banner) == RESULT_OK) { if (is_data_only_title(titleId)) { - exists = nand_app_exist(banner->mTitleId); + exists = nand_app_exist(banner->curTitleId); } else { - exists = check_nand_save_banner_exist(banner->mTitleId); + exists = check_nand_save_banner_exist(banner->curTitleId); } } - if (banner != NULL) - MEMFreeToAllocator(&pWork->mBothHeapAllocator, banner); + if (banner != NULL) { + MEMFreeToAllocator(&myWork->unkAllocator, banner); + } return exists; } @@ -5094,36 +5546,38 @@ namespace ipl { ESTmdView* tmdViewPtr; tmdViewPtr = NULL; - if (get_nand_app_tmdview(titleId, &tmdViewPtr) == WORKER_RESULT_OK) { + if (get_nand_app_tmdview(titleId, &tmdViewPtr) == RESULT_OK) { *titleVersion = tmdViewPtr->head.titleVersion; } else { *titleVersion = 0; } + if (tmdViewPtr != NULL) { - MEMFreeToExpHeap(pWork->pHeap19000, tmdViewPtr); + MEMFreeToExpHeap(myWork->mainHeap, tmdViewPtr); } - return WORKER_RESULT_OK; + + return RESULT_OK; } int NandSDWorker::get_sd_title_version(ESTitleId32 titleId, u16* titleVersion) { SDAppBanner* banner; int ret; - banner = (SDAppBanner*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, 0x640); + banner = (SDAppBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppBanner)); ret = get_sd_app_banner(titleId, banner); - if (ret != WORKER_RESULT_OK) { - MEMFreeToAllocator(&pWork->mBothHeapAllocator, banner); - return WORKER_RESULT_GENERIC_ERR; + if (ret != RESULT_OK) { + MEMFreeToAllocator(&myWork->unkAllocator, banner); + return RESULT_FATAL_SD_ERROR; } else { - char path[0x40]; + char path[NAND_MAX_PATH]; ESTitleId wadTitleId; get_sd_app_path(titleId, path); - int getTitleVersionRes = - WADGetTitleVersionEx(path, &wadTitleId, titleVersion, WAD_LOC_SD_CARD, (banner->mThumbnailSize + 0x3f & 0xffffffc0) + 0x640); - if (getTitleVersionRes != 0) { - OSReport("NandSDWorker: WADGetTitleVersionEx failed.[%d]\n", getTitleVersionRes); - ret = WORKER_RESULT_GENERIC_ERR; + s32 wadErr = + WADGetTitleVersionEx(path, &wadTitleId, titleVersion, WAD_LOCATION_SD_CARD, ROUNDUP(banner->thumbSize, 64) + sizeof(SDAppBanner)); + if (wadErr != WAD_ERROR_OK) { + OSReport("NandSDWorker: WADGetTitleVersionEx failed.[%d]\n", wadErr); + ret = RESULT_FATAL_SD_ERROR; } - MEMFreeToAllocator(&pWork->mBothHeapAllocator, banner); + MEMFreeToAllocator(&myWork->unkAllocator, banner); return ret; } } @@ -5133,49 +5587,54 @@ namespace ipl { ESTitleId fullTitleId; int ret; - sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&pWork->mBothHeapAllocator, 0x640); + sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppBanner)); u16 nandTitleVersion = 0; u16 sdTitleVersion = 0; ret = get_sd_app_banner(titleId, sdAppBanner); - if (ret != WORKER_RESULT_OK) - goto CLEANUP; + if (ret != RESULT_OK) { + goto clean_up; + } - fullTitleId = sdAppBanner->mTitleId; + fullTitleId = sdAppBanner->titleId; ret = get_sd_title_version(titleId, &sdTitleVersion); - if (ret != WORKER_RESULT_OK) - goto CLEANUP; + if (ret != RESULT_OK) { + goto clean_up; + } ret = get_nand_title_version(fullTitleId, &nandTitleVersion); - if (ret != WORKER_RESULT_OK) - goto CLEANUP; + if (ret != RESULT_OK) { + goto clean_up; + } nandTitleVersion = (nandTitleVersion >> 8) & 0xFFFF; sdTitleVersion = (sdTitleVersion >> 8) & 0xFFFF; if (nandTitleVersion > sdTitleVersion) { OSReport("NandSDWorker: SD app %08x is older version: %d (NAND: %d)\n", titleId, sdTitleVersion, nandTitleVersion); - ret = WORKER_RESULT_VERSION_ERR; - goto CLEANUP; + ret = RESULT_VERSION_ERR; + goto clean_up; } WADBackupHeader wadBakHdr; ESDeviceId deviceId; - ret = get_sd_wad_header(titleId, &wadBakHdr, sdAppBanner->mThumbnailSize + 0x3f & 0xffffffc0); - if (ret != WORKER_RESULT_OK) - goto CLEANUP; + ret = get_sd_wad_header(titleId, &wadBakHdr, ROUNDUP(sdAppBanner->thumbSize, 64)); + if (ret != RESULT_OK) { + goto clean_up; + } ret = ES_GetDeviceId(&deviceId); if (ret != ES_ERR_OK) { OSReport("NandSDWorker: ES_GetDeviceId failed: %d\n", ret); - ret = WORKER_RESULT_GENERIC_ERR; - goto CLEANUP; + ret = RESULT_FATAL_SD_ERROR; + goto clean_up; } if (wadBakHdr.deviceId != deviceId) { OSReport("NandSDWorker: device id is different: %d vs %d\n", wadBakHdr.deviceId, deviceId); - ret = WORKER_RESULT_NOT_TRANSFERRABLE; + ret = RESULT_NOT_TRANSFERRABLE; } - CLEANUP: - MEMFreeToAllocator(&pWork->mBothHeapAllocator, sdAppBanner); + + clean_up: + MEMFreeToAllocator(&myWork->unkAllocator, sdAppBanner); return ret; } } // namespace ipl diff --git a/src/system/iplSDVFWorker.cpp b/src/system/iplSDVFWorker.cpp index 0f0d19d7..dcc50248 100644 --- a/src/system/iplSDVFWorker.cpp +++ b/src/system/iplSDVFWorker.cpp @@ -12,7 +12,7 @@ namespace ipl { } void SDVFWorker::create(void* work, int priority) { - Work* workArg = reinterpret_cast(work); + Work* workArg = (Work*)work; myWork = workArg; /* @bug: Stack should be threadStack, not the thread itself! */ @@ -31,13 +31,13 @@ namespace ipl { myWork->driveTable.pPart = NULL; myWork->driveTable.pCache = &myWork->cacheSetting; - myWork->workState = STATE_IDLE; - myWork->asyncResult = RESULT_STILL_WORKING; + myWork->state = STATE_IDLE; + myWork->asyncResult = RESULT_WORKING; - s_sd_state = SD_STATE_UNAVAILABLE; + s_sd_state = SD_STATE_INITIAL; myWork->isWriteProtected = FALSE; - myWork->prevAsyncResult = RESULT_STILL_WORKING; + myWork->prevAsyncResult = RESULT_WORKING; myWork->priority = priority; OSResumeThread(&myWork->thread); @@ -52,7 +52,7 @@ namespace ipl { } int SDVFWorker::get_async_result() { - return is_working() ? RESULT_STILL_WORKING : myWork->asyncResult; + return is_working() ? RESULT_WORKING : myWork->asyncResult; } SDVFWorker::WorkSDState SDVFWorker::get_sd_state() { @@ -60,7 +60,7 @@ namespace ipl { } BOOL SDVFWorker::is_sd_write_protected() { - if (s_sd_state == SD_STATE_AVAILABLE) { + if (s_sd_state == SD_STATE_READY) { return myWork->isWriteProtected; } else { return FALSE; @@ -97,12 +97,12 @@ namespace ipl { CDBErr cdbErr; - bool started = false; + bool terminated = false; while (true) { switch (wait_work()) { case MESSAGE_TERMINATE: { - if (s_sd_state != SD_STATE_UNAVAILABLE) { + if (s_sd_state != SD_STATE_INITIAL) { faErr = FAUnmount(myWork->driveTable.drive, 1); OSReport("SDVFWorker: unmount sd [%d]\n", faErr); @@ -110,7 +110,7 @@ namespace ipl { OSReport("SDVFWorker: detach sd [%d]\n", faErr); } - started = true; + terminated = true; break; } case MESSAGE_MOUNT_SD: { @@ -119,7 +119,7 @@ namespace ipl { if (s_sd_state == SD_STATE_BROKEN || s_sd_state == SD_STATE_ERROR) { myWork->prevAsyncResult = myWork->asyncResult; } else { - myWork->prevAsyncResult = RESULT_STILL_WORKING; + myWork->prevAsyncResult = RESULT_WORKING; } break; } @@ -128,14 +128,14 @@ namespace ipl { break; } case MESSAGE_PREPARE_CDB_BACKUP: { - if (s_sd_state != SD_STATE_UNAVAILABLE) { - faErr = FAUnmount(myWork->driveTable.drive, 1); + if (s_sd_state != SD_STATE_INITIAL) { + faErr = FAUnmount(myWork->driveTable.drive, TRUE); OSReport("SDVFWorker: unmount sd [%d]\n", faErr); faErr = FADetach(myWork->driveTable.drive); OSReport("SDVFWorker: detach sd [%d]\n", faErr); - s_sd_state = SD_STATE_UNAVAILABLE; + s_sd_state = SD_STATE_INITIAL; } System::getCdbManager()->mountSD_safe(); @@ -174,7 +174,7 @@ namespace ipl { OSHalt("SDVFWorker: stack over!\n", 448); } - if (started) { + if (terminated) { break; } @@ -182,7 +182,7 @@ namespace ipl { } myWork = NULL; - s_sd_state = SD_STATE_UNAVAILABLE; + s_sd_state = SD_STATE_INITIAL; return this; } @@ -191,7 +191,7 @@ namespace ipl { FAError faErr; switch (s_sd_state) { - case SD_STATE_UNAVAILABLE: { + case SD_STATE_INITIAL: { s_sd_inserted = true; FAInit(FA_FLAG_FILENAME_CHECK); @@ -204,8 +204,8 @@ namespace ipl { int result = call_fa_mount(); if (result == RESULT_SUCCESS) { - s_sd_state = SD_STATE_AVAILABLE; - } else if (result == RESULT_SD_BROKEN) { + s_sd_state = SD_STATE_READY; + } else if (result == RESULT_BROKEN_MEDIA) { s_sd_state = SD_STATE_BROKEN; } else if (result == RESULT_SD_ERROR) { s_sd_state = SD_STATE_ERROR; @@ -216,13 +216,13 @@ namespace ipl { myWork->asyncResult = result; } else { OSReport("SDVFWorker: FAAttach failed.[%d]\n", FAErrnum()); - s_sd_state = SD_STATE_UNAVAILABLE; + s_sd_state = SD_STATE_INITIAL; myWork->asyncResult = RESULT_FA_ERROR; } break; } case SD_STATE_EJECTED: { - if (myWork->prevAsyncResult == RESULT_STILL_WORKING) { + if (myWork->prevAsyncResult == RESULT_WORKING) { myWork->asyncResult = RESULT_FATAL_SD_ERROR; } else { myWork->asyncResult = myWork->prevAsyncResult; @@ -232,8 +232,8 @@ namespace ipl { case SD_STATE_INSERTED: { int result = call_fa_mount(); if (result == RESULT_SUCCESS) { - s_sd_state = SD_STATE_AVAILABLE; - } else if (result == RESULT_SD_BROKEN) { + s_sd_state = SD_STATE_READY; + } else if (result == RESULT_BROKEN_MEDIA) { s_sd_state = SD_STATE_BROKEN; } else { s_sd_state = result == RESULT_SD_ERROR ? SD_STATE_ERROR : SD_STATE_EJECTED; @@ -241,7 +241,7 @@ namespace ipl { myWork->asyncResult = result; break; } - case SD_STATE_AVAILABLE: { + case SD_STATE_READY: { myWork->asyncResult = RESULT_SUCCESS; break; } @@ -255,7 +255,7 @@ namespace ipl { FAError faErr; int result; - if (s_sd_state != SD_STATE_UNAVAILABLE) { + if (s_sd_state != SD_STATE_INITIAL) { faErr = FAUnmount(myWork->driveTable.drive, TRUE); OSReport("SDVFWorker: force unmount sd before mounting[%d]\n", faErr); faErr = FADetach(myWork->driveTable.drive); @@ -287,7 +287,7 @@ namespace ipl { if (faErr == FA_ERR_ENOEXEC) { result = RESULT_FATAL_SD_ERROR; if (FA_INSERTED(myWork->driveTable)) { - result = RESULT_SD_BROKEN; + result = RESULT_BROKEN_MEDIA; } } else if (faErr == FA_ERR_EINVAL) { result = RESULT_FATAL_SD_ERROR; @@ -311,7 +311,7 @@ namespace ipl { void SDVFWorker::do_format_sd() { FAError faErr; - if (s_sd_state != SD_STATE_AVAILABLE && s_sd_state != SD_STATE_BROKEN) { + if (s_sd_state != SD_STATE_READY && s_sd_state != SD_STATE_BROKEN) { OSReport("SDVFWorker: cannot format sd because of illegal sd state.[%d]\n", s_sd_state); myWork->asyncResult = RESULT_FATAL_SD_ERROR; return; @@ -320,7 +320,7 @@ namespace ipl { faErr = FAFormat(myWork->driveTable.drive, 0); if (faErr != FA_ERR_SUCCESS && FAErrnum() == FA_ERR_ENOEXEC) { OSReport("SDVFWorker: SD card MBR is broken. cannot use this media.\n"); - myWork->asyncResult = RESULT_SD_BROKEN; + myWork->asyncResult = RESULT_BROKEN_MEDIA; return; } @@ -351,7 +351,7 @@ namespace ipl { SDVFWorker::WorkState SDVFWorker::get_state() { OSLockMutex(&myWork->mutex); - SDVFWorker::WorkState state = myWork->workState; + SDVFWorker::WorkState state = myWork->state; OSUnlockMutex(&myWork->mutex); return state; @@ -359,13 +359,13 @@ namespace ipl { void SDVFWorker::set_state(SDVFWorker::WorkState state) { OSLockMutex(&myWork->mutex); - myWork->workState = state; + myWork->state = state; OSUnlockMutex(&myWork->mutex); } void SDVFWorker::sd_insert_callback(s8 drive) { s_sd_inserted = true; - if (s_sd_state != SD_STATE_UNAVAILABLE) { + if (s_sd_state != SD_STATE_INITIAL) { OSReport("SDVFWorker: SD card inserted !! %c drive\n", drive); s_sd_state = SD_STATE_INSERTED; } @@ -374,7 +374,7 @@ namespace ipl { void SDVFWorker::sd_eject_callback(s8 drive) { s_sd_inserted = false; - if (s_sd_state != SD_STATE_UNAVAILABLE) { + if (s_sd_state != SD_STATE_INITIAL) { OSReport("SDVFWorker: SD card ejected !! %c drive\n", drive); s_sd_state = SD_STATE_EJECTED; }