Compare commits

..

6 Commits

Author SHA1 Message Date
Devin AI
93d52e5a4a docs: kbd_lib wave-7 attempt notes
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-09-30 23:47:57 +00:00
Devin AI
d4adb13616 kbd_led_handler: switch+shared-call form (61.12 fuzzy, 23/25 insns)
default-first switch is MWCC's only non-fold err-select form; residual =
beq->case dispatch vs orig bne->default + prologue/cb-arg scheduling.
dup-call variant scored worse (40.0) despite 24/25 insn count.

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-09-30 23:47:44 +00:00
Devin AI
9c08e34691 kbd: kbdProcMod count-equal, dual-induction cmdBuf loop, led_handler bne dispatch
- kbdProcMod: kbdData[channel] idiom + stateBuf state ptr reaches 256/256 insn
  count-equal (residual: MWCC promotes state.value to reg vs orig per-case
  reloads from 8(r1); rlwimi fused shift vs orig separate rlwinm)
- KBDSetLeds: dual index+ofs induction -> 79/79 count-equal (orig still picks
  lwzx base,ofs load vs ptr-walk, channel->r31 callee remat)
- KBDSetLedsAsync: same dual-induction -> 80/81 (channel->r26 callee save
  missing; orig remats mulli channel,0x268 per kbdData use)
- kbd_led_handler: duplicated-call if/else -> 24/25, correct bne->else
  dispatch; orig merges both indirect calls into one bctr (MWCC does not
  tail-merge here)

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-09-30 23:44:09 +00:00
Devin AI
d21b8f6d43 kbd_lib: led_handler branchy err-select, cmplw read-back, KBDSetLeds* loop fixes
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-09-30 23:14:11 +00:00
Devin AI
463ac7e97d kbd_lib: kbdProcKey exact; led_handler switch form; SetLeds* fixes
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-09-30 23:07:42 +00:00
Devin AI
8142fbb5eb kbd_lib_map_us: flip to Matching (worker 8b595e4b)
Co-Authored-By: wch <usernamecole7@gmail.com>
2026-09-30 22:40:28 +00:00
190 changed files with 7198 additions and 32018 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.37% | 87.69% | 61.93% | 91.37% |
| 98.75% | 86.01% | 60.25% | 90.87% |
units 917/1027 complete, functions 12211/12563 matched.
units 899/1027 complete, functions 12119/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->

View File

@@ -1111,7 +1111,7 @@ src/keyboard/MyTiInputForm.cpp:
src/keyboard/MyTiLetterForm.cpp:
.text start:0x81444730 end:0x814454D8
.rodata start:0x816168B8 end:0x81616BC8
.rodata start:0x816168B8 end:0x81616B88
.data start:0x81668860 end:0x81668CD8
.sdata2 start:0x81694EB0 end:0x81694ED0
.sdata start:0x81697528 end:0x81697570
@@ -1138,7 +1138,7 @@ src/keyboard/tiHKBManager.cpp:
src/keyboard/tiHwKeyboard.cpp:
.bss start:0x810C8940 end:0x810C8950
.text start:0x81448AA4 end:0x81449C98
.rodata start:0x81616BC8 end:0x81616C78
.rodata start:0x81616B88 end:0x81616C78
.data start:0x81668EF8 end:0x81669018
.sdata2 start:0x81694EF8 end:0x81694F08
.sdata start:0x81697570 end:0x81697578
@@ -1405,7 +1405,7 @@ libs/RVLMiddleware/eZiText/src/clib/zikorean.c:
extab start:0x81330748 end:0x81330760
extabindex start:0x8133147C end:0x813314A0
.text start:0x814813FC end:0x81482840
.data start:0x8166B2B0 end:0x8166B3A8
.data start:0x8166B2B0 end:0x8166B3D0
libs/RVLMiddleware/eZiText/src/clib/ziswordw.c:
extab start:0x81330760 end:0x81330770
@@ -1417,7 +1417,6 @@ libs/RVLMiddleware/eZiText/src/clib/zkokeyp.c:
extab start:0x81330770 end:0x813307A8
extabindex start:0x813314B8 end:0x8133150C
.text start:0x8148302C end:0x8148447C
.data start:0x8166B3A8 end:0x8166B3D0
libs/RVLMiddleware/eZiText/src/clib/zierror.c:
.text start:0x8148447C end:0x81484484
@@ -4193,11 +4192,11 @@ libs/RVL_SDK/src/fa/driver/nand_drv.c:
.sbss start:0x816996C0 end:0x816996E0
libs/RVL_SDK/src/fa/driver/sd_drv.c:
.bss start:0x811AF460 end:0x811AF6C0 align:32
.bss start:0x811AF460 end:0x811AF6C0
.text start:0x815EA41C end:0x815ED20C
.rodata start:0x816329E8 end:0x81632B58
.data start:0x81690D18 end:0x81691728
.sbss start:0x816996E0 end:0x81699708 align:32
.sbss start:0x816996E0 end:0x81699708
libs/RVL_SDK/src/fa/driver/pfd_cmn.c:
.text start:0x815ED20C end:0x815ED324

View File

@@ -1761,7 +1761,7 @@ update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E30; // ty
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
check_sd_app_titles_async__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348ED4; // type:function size:0x18
get_nand_app_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348EEC; // type:function size:0x18
delete_nand_save_async__Q23ipl12NandSDWorkerFUx = .text:0x81348F04; // type:function size:0x18
@@ -1823,7 +1823,7 @@ do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134BC60; // type:func
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_usage__Q23ipl12NandSDWorkerFv = .text:0x8134C670; // type:function size:0x1C8
do_check_sd_app_titles__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
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
get_sd_save_size__Q23ipl12NandSDWorkerFUl = .text:0x8134CF5C; // type:function size:0x140
@@ -2042,8 +2042,8 @@ isEqualChannel__Q33ipl8savedata7ManagerFUxUx = .text:0x813594B0; // type:functio
isDefaultChannel__Q33ipl8savedata7ManagerFUlUl = .text:0x8135954C; // type:function size:0x50
updateVersion__Q33ipl8savedata7ManagerFUlUl = .text:0x8135959C; // type:function size:0xD4
setDefaultSDMenu__Q33ipl8savedata7ManagerFv = .text:0x81359670; // type:function size:0x48 scope:local
pushTitleCache__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
isTitleCached = .text:0x813597A0; // type:function size:0x40
iplSavedata_813596B8__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
iplSavedata_813597A0 = .text:0x813597A0; // type:function size:0x40 scope:local
nand_error_handling__Q33ipl8savedata7ManagerFi = .text:0x813597E0; // type:function size:0xDC
__ct__Q33ipl7channel9RsoThreadFPQ23EGG4Heap = .text:0x813598BC; // type:function size:0x6C
__dt__Q33ipl7channel9RsoThreadFv = .text:0x81359928; // type:function size:0x70
@@ -2095,7 +2095,7 @@ stt_wait_fns_msg__Q23ipl9CdbBackupFv = .text:0x8135B004; // type:function size:0
stt_clean_up_back__Q23ipl9CdbBackupFv = .text:0x8135B030; // type:function size:0x60
stt_wait_terminate__Q23ipl9CdbBackupFv = .text:0x8135B090; // type:function size:0x60
error_handling__Q23ipl9CdbBackupFv = .text:0x8135B0F0; // type:function size:0xD0
getProgressPercent__Q23ipl9CdbBackupFv = .text:0x8135B1C0; // type:function size:0x28
fn_8135B1C0__Q23ipl9CdbBackupFv = .text:0x8135B1C0; // type:function size:0x28
cdb_backup_delete_search_cb___3iplFPvP10_CDBRecord = .text:0x8135B1E8; // type:function size:0x8C
cdb_backup_delete_task___3iplFPv = .text:0x8135B274; // type:function size:0xDC
cdb_backup_move_search_cb___3iplFPvP10_CDBRecord = .text:0x8135B350; // type:function size:0xBC
@@ -5126,8 +5126,8 @@ __ct__Q33ipl5scene10AOSSThreadFPQ23EGG4Heap = .text:0x813FCA0C; // type:function
destroy__Q33ipl5scene10AOSSThreadFi = .text:0x813FCAA0; // type:function size:0x84
__dt__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB24; // type:function size:0x70
start__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB94; // type:function size:0xF8
aossAlloc__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
aossFree__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
AOSSThread_813FCC8C__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
AOSSThread_813FCCE4__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
Run__Q33ipl5scene10AOSSThreadFv = .text:0x813FCD34; // type:function size:0xEC
cancel__Q33ipl5scene10AOSSThreadFv = .text:0x813FCE20; // type:function size:0x50
finish__Q33ipl5scene10AOSSThreadFP13NCDAossConfigPi = .text:0x813FCE70; // type:function size:0x2FC
@@ -5267,10 +5267,10 @@ start_focusout_anm__Q33ipl5scene13SettingSelectFi = .text:0x814093D0; // type:fu
start_selected_anm__Q33ipl5scene13SettingSelectFi = .text:0x81409480; // type:function size:0x274
is_stopped_all_anm__Q33ipl5scene13SettingSelectCFv = .text:0x814096F4; // type:function size:0x74
onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409768; // type:function size:0xFC
calc_exit_sequence__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
prepare_exit_abort__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
start_exit_fade__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
finish_exit_reboot__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
fn_81409864__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
fn_814098F4__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
fn_81409988__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
fn_814099EC__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409B84; // type:function size:0x58 scope:weak
@20@__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409BDC; // type:function size:0x8 scope:weak
@84@onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409BE4; // type:function size:0x8 scope:weak
@@ -5576,7 +5576,7 @@ __sinit_\tiPcKeyboard_cpp = .text:0x81416F34; // type:function size:0x1B0
@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x814170FC; // type:function size:0x8
@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x81417104; // type:function size:0x8
@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x8141710C; // type:function size:0x8
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv = .text:0x81417114; // type:function size:0x8
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5 = .text:0x81417114; // type:function size:0x8
create__Q49textinput8keyboard13cellphonetype4BaseFP12MEMAllocator = .text:0x8141711C; // type:function size:0xAC
init__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x814171C8; // type:function size:0xA8
calc__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x81417270; // type:function size:0x4
@@ -5829,7 +5829,7 @@ doAfterDrawProcess__Q39textinput9inputform4BaseFPCwUlRCQ49textinput10textdrawer4
finishDraw__Q39textinput9inputform4BaseFUl = .text:0x81427DC0; // type:function size:0x4
addSender__Q29textinput15CommandReceiverFPQ29textinput13CommandSender = .text:0x81427DC4; // type:function size:0x8
getDrawModifyStartLine__Q39textinput10textdrawer4BaseCFv = .text:0x81427DCC; // type:function size:0x8
isEnableCursorCache__Q39textinput10textdrawer4BaseCFv = .text:0x81427DD4; // type:function size:0x8
isEnableCursorCache__Q39textinput10textdrawer4BaseCFvgetStartPos__Q39textinput10textdrawer4BaseCFv = .text:0x81427DD4; // type:function size:0x8
getStartPos__Q39textinput10textdrawer4BaseCFv = .text:0x81427DDC; // type:function size:0x8
setVIWidth__Q39textinput10textdrawer4BaseFf = .text:0x81427DE4; // type:function size:0x8
setCandidateBox__Q39textinput12candidatebox18CandidateBoxCallerFPQ39textinput12candidatebox4Base = .text:0x81427DEC; // type:function size:0x8
@@ -13113,7 +13113,7 @@ pfstub_com_massage = .text:0x815E6C40; // type:function size:0xE4
pfstub_store_result = .text:0x815E6D24; // type:function size:0xC4
PFSYS_initializeSYS = .text:0x815E6DE8; // type:function size:0x4
PFSYS_GetCurrentContextID = .text:0x815E6DEC; // type:function size:0x18
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x7C
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x74
pfstub_call_function_standard = .text:0x815E6E80; // type:function size:0x584
pfstub_attach = .text:0x815E7404; // type:function size:0x50
pfstub_buffering = .text:0x815E7454; // type:function size:0x50
@@ -13202,7 +13202,7 @@ pfd_sddrv_pread = .text:0x815EAADC; // type:function size:0x38
pfd_sddrv_pwrite = .text:0x815EAB14; // type:function size:0x38
pfd_sddrv_unmount = .text:0x815EAB4C; // type:function size:0x34
pfd_sddrv_finalize = .text:0x815EAB80; // type:function size:0xE4
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x188
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x180
pfd_sddrv_init_drv_tbl = .text:0x815EADEC; // type:function size:0x18
pfd_sddrv_registar_callback = .text:0x815EAE04; // type:function size:0x10
pfd_sddrv_is_media_insert = .text:0x815EAE14; // type:function size:0x98
@@ -13986,8 +13986,8 @@ lbl_81616AE4 = .rodata:0x81616AE4; // type:object size:0x30
lbl_81616B14 = .rodata:0x81616B14; // type:object size:0x74
lbl_81616B88 = .rodata:0x81616B88; // type:object size:0x40
lbl_81616BC8 = .rodata:0x81616BC8; // type:object size:0x10 data:4byte
scCountryMap_EU = .rodata:0x81616BD8; // type:object size:0xC
scCountryMap_NonEU = .rodata:0x81616BE4; // type:object size:0xC
lbl_81616BD8 = .rodata:0x81616BD8; // type:object size:0xC
lbl_81616BE4 = .rodata:0x81616BE4; // type:object size:0xC
lbl_81616BF0 = .rodata:0x81616BF0; // type:object size:0x88
CHANSVmConstStringObjectUndefined = .rodata:0x81616C78; // type:object size:0x10
lbl_81616C88 = .rodata:0x81616C88; // type:object size:0x10
@@ -14994,8 +14994,8 @@ __vt__Q37ext_ead3www14SurfaceManager = .data:0x81643AA0; // type:object size:0xC
@1183 = .data:0x81643AB8; // type:object size:0x21 scope:local data:string
__vt__Q37ext_ead3www9ut_thread = .data:0x81643ADC; // type:object size:0x28
lbl_81643B08 = .data:0x81643B08; // type:object size:0x38
scWwwTexBufFmt = .data:0x81643B40; // type:object size:0x1E data:string
scWwwNoBrowserWin = .data:0x81643B5E; // type:object size:0x24 data:string
lbl_81643B40 = .data:0x81643B40; // type:object size:0x1E data:string
lbl_81643B5E = .data:0x81643B5E; // type:object size:0x24 data:string
lbl_81643B82 = .data:0x81643B82; // type:object size:0x1B data:string
lbl_81643B9D = .data:0x81643B9D; // type:object size:0x2B data:string
lbl_81643BC8 = .data:0x81643BC8; // type:object size:0x12 data:string
@@ -15655,15 +15655,15 @@ lbl_8164C424 = .data:0x8164C424; // type:object size:0xB data:string
lbl_8164C42F = .data:0x8164C42F; // type:object size:0xD data:string
lbl_8164C43C = .data:0x8164C43C; // type:object size:0xD data:string
lbl_8164C449 = .data:0x8164C449; // type:object size:0xD data:string
scPaneName_T_CalMonth = .data:0x8164C458; // type:object size:0xC data:4byte
lbl_8164C458 = .data:0x8164C458; // type:object size:0xC data:4byte
lbl_8164C464 = .data:0x8164C464; // type:object size:0x9 data:string
lbl_8164C46D = .data:0x8164C46D; // type:object size:0x9 data:string
lbl_8164C476 = .data:0x8164C476; // type:object size:0x9 data:string
scPaneName_N_Cal = .data:0x8164C480; // type:object size:0xC
lbl_8164C480 = .data:0x8164C480; // type:object size:0xC
lbl_8164C48C = .data:0x8164C48C; // type:object size:0xB data:string
lbl_8164C497 = .data:0x8164C497; // type:object size:0xB data:string
lbl_8164C4A2 = .data:0x8164C4A2; // type:object size:0xB data:string
scPaneName_N_CalPos = .data:0x8164C4B0; // type:object size:0xC
lbl_8164C4B0 = .data:0x8164C4B0; // type:object size:0xC
lbl_8164C4BC = .data:0x8164C4BC; // type:object size:0x43
lbl_8164C4FF = .data:0x8164C4FF; // type:object size:0xF data:string
lbl_8164C50E = .data:0x8164C50E; // type:object size:0x14 data:string
@@ -15673,11 +15673,11 @@ lbl_8164C54E = .data:0x8164C54E; // type:object size:0x18
lbl_8164C566 = .data:0x8164C566; // type:object size:0xC
lbl_8164C572 = .data:0x8164C572; // type:object size:0xA
__vt__Q33ipl5scene8Calendar = .data:0x8164C57C; // type:object size:0xA4
scN_CalDay_r = .data:0x8164C620; // type:object size:0xB data:string
scDateAnimPaneNames = .data:0x8164C62C; // type:object size:0x14 data:4byte
scMyIplTopFBrlan = .data:0x8164C640; // type:object size:0x12 data:string
scN_CalDay_t = .data:0x8164C652; // type:object size:0xB data:string
scSEDateFocus = .data:0x8164C65D; // type:object size:0x13 data:string
lbl_8164C620 = .data:0x8164C620; // type:object size:0xB data:string
lbl_8164C62C = .data:0x8164C62C; // type:object size:0x14 data:4byte
lbl_8164C640 = .data:0x8164C640; // type:object size:0x12 data:string
lbl_8164C652 = .data:0x8164C652; // type:object size:0xB data:string
lbl_8164C65D = .data:0x8164C65D; // type:object size:0x13 data:string
__vt__Q33ipl5scene4Date = .data:0x8164C670; // type:object size:0x18
@12712 = .data:0x8164C688; // type:object size:0xC scope:local data:string
...data.0 = .data:0x8164C688; // type:label scope:local
@@ -18149,7 +18149,7 @@ lbl_8166A6B1 = .data:0x8166A6B1; // type:object size:0xD data:string
lbl_8166A6BE = .data:0x8166A6BE; // type:object size:0xD data:string
lbl_8166A6CB = .data:0x8166A6CB; // type:object size:0xC data:string
lbl_8166A6D7 = .data:0x8166A6D7; // type:object size:0xC data:string
scCsFatalMsg = .data:0x8166A6E3; // type:object size:0x41 data:string
lbl_8166A6E3 = .data:0x8166A6E3; // type:object size:0x41 data:string
lbl_8166A728 = .data:0x8166A728; // type:object size:0xB data:string
lbl_8166A733 = .data:0x8166A733; // type:object size:0x9 data:string
lbl_8166A73C = .data:0x8166A73C; // type:object size:0xB data:string
@@ -20107,12 +20107,12 @@ gDBCommTable = .data:0x816943C8; // type:object size:0x28
lbl_81694410 = .sdata2:0x81694410; // type:object size:0x4 align:4 data:float
lbl_81694418 = .sdata2:0x81694418; // type:object size:0x8 align:8 data:double
lbl_81694420 = .sdata2:0x81694420; // type:object size:0x4 align:4 data:float
scOrthoLeft = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
scOrthoRight = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
scOrthoBottom = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
scOrthoTop = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
scWideOrthoLeft = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
scWideOrthoRight = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
lbl_81694424 = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
lbl_81694428 = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
lbl_8169442C = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
lbl_81694430 = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
lbl_81694434 = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
lbl_81694438 = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
lbl_81694440 = .sdata2:0x81694440; // type:object size:0x4 align:4 data:float
lbl_81694444 = .sdata2:0x81694444; // type:object size:0x4 align:4 data:float
lbl_81694448 = .sdata2:0x81694448; // type:object size:0x8 align:8 data:double
@@ -20201,10 +20201,10 @@ lbl_816945B0 = .sdata2:0x816945B0; // type:object size:0x4 align:4 data:float
lbl_816945B4 = .sdata2:0x816945B4; // type:object size:0x4 align:4 data:float
lbl_816945B8 = .sdata2:0x816945B8; // type:object size:0x8 align:8 data:double
lbl_816945C0 = .sdata2:0x816945C0; // type:object size:0x8 align:8 data:double
scTvrcMsPerSec = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
scTvrcNsecPerSec = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
scTvrcOne = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
scTvrcFloatMagic = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
lbl_816945C8 = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
lbl_816945D0 = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
lbl_816945D8 = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
lbl_816945E0 = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
lbl_816945E8 = .sdata2:0x816945E8; // type:object size:0x4 align:4 data:float
lbl_816945EC = .sdata2:0x816945EC; // type:object size:0x4 align:4 data:float
lbl_816945F0 = .sdata2:0x816945F0; // type:object size:0x4 align:4 data:float
@@ -20710,12 +20710,12 @@ lbl_81694ECC = .sdata2:0x81694ECC; // type:object size:0x4 align:4 data:float
@880 = .sdata2:0x81694ED4; // type:object size:0x4 scope:local align:4 data:float
@885 = .sdata2:0x81694ED8; // type:object size:0x4 scope:local align:4 data:float
@888 = .sdata2:0x81694EE0; // type:object size:0x8 scope:local align:8 data:double
scGuiZeroF = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
scGuiLineColorR = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
scGuiLineColorG = .sdata2:0x81694EED; // type:object size:0x1 data:byte
scGuiLineColorB = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
scGuiLineColorA = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
scGuiHalfF = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
lbl_81694EE8 = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
lbl_81694EEC = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
lbl_81694EED = .sdata2:0x81694EED; // type:object size:0x1 data:byte
lbl_81694EEE = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
lbl_81694EEF = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
lbl_81694EF0 = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
lbl_81694EF8 = .sdata2:0x81694EF8; // type:object size:0x8 data:4byte
lbl_81694F00 = .sdata2:0x81694F00; // type:object size:0x4 data:4byte
lbl_81694F08 = .sdata2:0x81694F08; // type:object size:0x8 align:8 data:double
@@ -20741,7 +20741,7 @@ lbl_81694FA0 = .sdata2:0x81694FA0; // type:object size:0x7 data:string
lbl_81694FA7 = .sdata2:0x81694FA7; // type:object size:0x5 data:string
lbl_81694FAC = .sdata2:0x81694FAC; // type:object size:0xC align:4
lbl_81694FB8 = .sdata2:0x81694FB8; // type:object size:0x8 align:8 data:double
scCsZeroF = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
lbl_81694FC0 = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
@10105 = .sdata2:0x81694FC8; // type:object size:0x4 scope:local align:4 data:float
@9941 = .sdata2:0x81694FD0; // type:object size:0x8 scope:local data:4byte
@10304 = .sdata2:0x81694FD8; // type:object size:0x8 scope:local align:8 data:double
@@ -21552,7 +21552,7 @@ lbl_8169622C = .sdata:0x8169622C; // type:object size:0x1 data:byte
lbl_8169622D = .sdata:0x8169622D; // type:object size:0x1 data:byte
lbl_8169622E = .sdata:0x8169622E; // type:object size:0x1 data:byte
lbl_8169622F = .sdata:0x8169622F; // type:object size:0x1 data:byte
scTvrcFileHeader = .sdata:0x81696230; // type:object size:0x5 data:string
lbl_81696230 = .sdata:0x81696230; // type:object size:0x5 data:string
TVRC_FILE_HEADER__7LibTVRC = .sdata:0x81696238; // type:object size:0x4 data:4byte
__tienHoseiNsec__7LibTVRC = .sdata:0x8169623C; // type:object size:0x4 data:4byte
_limitMilli__7LibTVRC = .sdata:0x81696240; // type:object size:0x4 data:4byte
@@ -21589,7 +21589,7 @@ lbl_816962DB = .sdata:0x816962DB; // type:object size:0x8 data:string
lbl_816962E3 = .sdata:0x816962E3; // type:object size:0x1
lbl_816962E4 = .sdata:0x816962E4; // type:object size:0x8 data:string
lbl_816962F0 = .sdata:0x816962F0; // type:object size:0x8 data:string
scWwwErrorQ = .sdata:0x816962F8; // type:object size:0x8 data:string
lbl_816962F8 = .sdata:0x816962F8; // type:object size:0x8 data:string
globalNames__Q23www9trasition = .sdata:0x81696300; // type:object size:0x8 scope:local
@1425 = .sdata:0x81696308; // type:object size:0x1 scope:local
gEnableDpd = .sdata:0x81696310; // type:object size:0x4 data:4byte
@@ -21753,7 +21753,7 @@ lbl_816966E1 = .sdata:0x816966E1; // type:object size:0x6 data:string
lbl_816966E7 = .sdata:0x816966E7; // type:object size:0x7 data:string
lbl_816966EE = .sdata:0x816966EE; // type:object size:0x7 data:string
lbl_816966F5 = .sdata:0x816966F5; // type:object size:0x4 data:string
scPaneName_B_Stop = .sdata:0x816966F9; // type:object size:0x7 data:string
lbl_816966F9 = .sdata:0x816966F9; // type:object size:0x7 data:string
lbl_81696700 = .sdata:0x81696700; // type:object size:0x6 data:string
lbl_81696706 = .sdata:0x81696706; // type:object size:0x5 data:string
lbl_8169670B = .sdata:0x8169670B; // type:object size:0x6 data:string
@@ -21781,15 +21781,15 @@ lbl_81696797 = .sdata:0x81696797; // type:object size:0x8 data:string
lbl_8169679F = .sdata:0x8169679F; // type:object size:0x8 data:string
lbl_816967A7 = .sdata:0x816967A7; // type:object size:0x7 data:string
lbl_816967AE = .sdata:0x816967AE; // type:object size:0x7 data:string
scPaneName_T_Stop = .sdata:0x816967B5; // type:object size:0x7 data:string
lbl_816967B5 = .sdata:0x816967B5; // type:object size:0x7 data:string
lbl_816967C0 = .sdata:0x816967C0; // type:object size:0x4 data:string
lbl_816967C4 = .sdata:0x816967C4; // type:object size:0x6 data:string
lbl_816967CA = .sdata:0x816967CA; // type:object size:0x7 data:string
scW_Cal = .sdata:0x816967D8; // type:object size:0x6 data:string
scT_Cal = .sdata:0x816967DE; // type:object size:0x6 data:string
scCal_Ac = .sdata:0x816967E4; // type:object size:0x7 data:string
scInfo_a = .sdata:0x816967EB; // type:object size:0x7 data:string
scB_Cal = .sdata:0x816967F2; // type:object size:0x6 data:string
lbl_816967D8 = .sdata:0x816967D8; // type:object size:0x6 data:string
lbl_816967DE = .sdata:0x816967DE; // type:object size:0x6 data:string
lbl_816967E4 = .sdata:0x816967E4; // type:object size:0x7 data:string
lbl_816967EB = .sdata:0x816967EB; // type:object size:0x7 data:string
lbl_816967F2 = .sdata:0x816967F2; // type:object size:0x6 data:string
@16087 = .sdata:0x816967F8; // type:object size:0x4 scope:local data:string
@16350 = .sdata:0x816967FC; // type:object size:0x7 scope:local data:string
@16351 = .sdata:0x81696803; // type:object size:0x7 scope:local data:string
@@ -22466,10 +22466,10 @@ lbl_81697824 = .sdata:0x81697824; // type:object size:0x8 data:string
lbl_8169782C = .sdata:0x8169782C; // type:object size:0x8 data:string
lbl_81697834 = .sdata:0x81697834; // type:object size:0x8 data:string
lbl_8169783C = .sdata:0x8169783C; // type:object size:0x8 data:string
scCsFatalColorR = .sdata:0x81697844; // type:object size:0x1 data:byte
scCsFatalColorG = .sdata:0x81697845; // type:object size:0x1 data:byte
scCsFatalColorB = .sdata:0x81697846; // type:object size:0x1 data:byte
scCsFatalColorA = .sdata:0x81697847; // type:object size:0x1 data:byte
lbl_81697844 = .sdata:0x81697844; // type:object size:0x1 data:byte
lbl_81697845 = .sdata:0x81697845; // type:object size:0x1 data:byte
lbl_81697846 = .sdata:0x81697846; // type:object size:0x1 data:byte
lbl_81697847 = .sdata:0x81697847; // type:object size:0x1 data:byte
lbl_81697848 = .sdata:0x81697848; // type:object size:0x8 data:string
lbl_81697850 = .sdata:0x81697850; // type:object size:0x6 data:string
lbl_81697858 = .sdata:0x81697858; // type:object size:0x6 data:string
@@ -23191,7 +23191,7 @@ _repeatBitLength__7LibTVRC = .sbss:0x81698768; // type:object size:0x4 data:4byt
_repeatBitArray__7LibTVRC = .sbss:0x8169876C; // type:object size:0x4 data:4byte
_tickT__7LibTVRC = .sbss:0x81698770; // type:object size:0x4 data:4byte
m_handle__Q23ipl11TVRCManager = .sbss:0x81698778; // type:object size:0x4 data:4byte
sTvrcStartDelay__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
lbl_8169877C__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
suIDCounter__Q23gui11PaneManager = .sbss:0x81698780; // type:object size:0x4 data:4byte
_bgmBlk__Q23ipl3snd = .sbss:0x81698788; // type:object size:0x4
_mainBGMHandle__Q23ipl3snd = .sbss:0x8169878C; // type:object size:0x4 data:4byte
@@ -23331,7 +23331,7 @@ opera_callbacks__Q23www10wiisetting = .sbss:0x816989A0; // type:object size:0x4
sStatus__Q23www9arcreader = .sbss:0x816989A8; // type:object size:0x4 scope:local data:4byte
lbl_816989B0 = .sbss:0x816989B0; // type:object size:0x4 data:4byte
sBatteryFlag__Q210homebutton10Controller = .sbss:0x816989B8; // type:object size:0x4
sAlarmCreated__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
lbl_816989BC__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
suIDCounter__Q310homebutton3gui11PaneManager = .sbss:0x816989C0; // type:object size:0x4 data:4byte
spInstance__Q210homebutton9RemoteSpk = .sbss:0x816989C8; // type:object size:0x4 data:4byte
InvalidShutdown = .sbss:0x816989D0; // type:object size:0x4 data:4byte

View File

@@ -812,8 +812,8 @@ config.libs = [
]
),
IPLSection("memoryCard", [
Object(Matching, "scene/memoryCard/iplMemoryCard.cpp"),
Object(Matching, "scene/memoryCard/iplMemoryCardBase.cpp"),
Object(NonMatching, "scene/memoryCard/iplMemoryCard.cpp"),
Object(NonMatching, "scene/memoryCard/iplMemoryCardBase.cpp"),
Object(NonMatching, "scene/memoryCard/iplMemoryCardManager.cpp"),
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
Object(NonMatching, "scene/memoryCard/iplGCWindow.cpp"),
@@ -929,7 +929,7 @@ config.libs = [
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
@@ -987,7 +987,7 @@ config.libs = [
Object(NonMatching, "clib/zi8alpha.c"),
Object(Matching, "clib/zi8alts.c"),
Object(NonMatching, "clib/zi8cgetc.c"),
Object(Matching, "clib/zi8cinfo.c"),
Object(NonMatching, "clib/zi8cinfo.c"),
Object(Matching, "clib/zi8copy.c"),
Object(NonMatching, "clib/zi8dawg.c"),
Object(Matching, "clib/zi8getc.c"),
@@ -1004,7 +1004,7 @@ config.libs = [
Object(Matching, "clib/zi8ver.c"),
Object(Matching, "clib/zi8ZHuwd.c"),
Object(NonMatching, "clib/zidawg1.c"),
Object(Matching, "clib/zikorean.c"),
Object(NonMatching, "clib/zikorean.c"),
Object(NonMatching, "clib/ziswordw.c"),
Object(NonMatching, "clib/zkokeyp.c"),
Object(Matching, "clib/zierror.c"),
@@ -1025,7 +1025,7 @@ config.libs = [
Object(NonMatching, "cdb/CDBRecord.c"),
Object(Matching, "cdb/CDBRecordFile.c"),
Object(Matching, "cdb/CDBRecordKey.c"),
Object(Matching, "cdb/CDBIntArray.c"),
Object(NonMatching, "cdb/CDBIntArray.c"),
Object(Matching, "cdb/CDBSystem.c"),
Object(Matching, "cdb/CDBAttr.c"),
Object(Matching, "cdb/CDBFBridge.c"),
@@ -1044,9 +1044,9 @@ config.libs = [
Object(Matching, "net/nettime.c"),
Object(Matching, "net/crc.c"),
Object(NonMatching, "net/md5.c"),
Object(Matching, "net/sha1.c"),
Object(NonMatching, "net/sha1.c"),
Object(NonMatching, "net/hmac.c"),
Object(Matching, "net/neterrorcode.c"),
Object(NonMatching, "net/neterrorcode.c"),
Object(Matching, "net/NETVersion.c"),
Object(NonMatching, "net/aes.c"),
Object(Matching, "net/wireless_macaddr.c"),
@@ -1698,7 +1698,7 @@ config.libs = [
Object(NonMatching, "fa/pf_entry_iterator.c"),
Object(NonMatching, "fa/pf_fat.c"),
Object(NonMatching, "fa/pf_fat12.c"),
Object(Matching, "fa/pf_fat16.c"),
Object(NonMatching, "fa/pf_fat16.c"),
Object(Matching, "fa/pf_fat32.c"),
Object(Matching, "fa/pf_fatfs.c"),
Object(NonMatching, "fa/pf_file.c"),
@@ -1706,7 +1706,7 @@ config.libs = [
Object(Matching, "fa/pf_sector.c"),
Object(NonMatching, "fa/pf_volume.c"),
Object(Matching, "fa/pf_volume_apiadd.c"),
Object(Matching, "fa/pf_cp932.c"),
Object(NonMatching, "fa/pf_cp932.c"),
Object(Matching, "fa/pf_api_util.c"),
Object(Matching, "fa/pf_attach.c"),
Object(Matching, "fa/pf_buffering.c"),
@@ -1800,7 +1800,7 @@ config.libs = [
Object(Matching, "fa/pf_w_rmdir.c"),
Object(Matching, "fa/pf_w_xdivide.c"),
Object(Matching, "fa/pf_filelock.c"),
Object(Matching, "fa/pf_stub.c"),
Object(NonMatching, "fa/pf_stub.c"),
Object(Matching, "fa/pf_system.c"),
Object(Matching, "fa/pf_stub_standard.c"),
Object(Matching, "fa/pfs_attach.c"),
@@ -1851,15 +1851,15 @@ config.libs = [
Object(Matching, "fa/api/FASetThreadPriority.c"),
Object(Matching, "fa/api/FAUnmount.c"),
Object(Matching, "fa/kernel/pfk_api.c"),
Object(NonMatching, "fa/kernel/pfk_api.c"),
Object(Matching, "fa/driver/nand_drv.c"),
Object(NonMatching, "fa/driver/nand_drv.c"),
Object(NonMatching, "fa/driver/sd_drv.c"),
Object(Matching, "fa/driver/pfd_cmn.c"),
Object(Matching, "fa/driver/msc_drv.c"),
Object(NonMatching, "fa/driver/pfd_cmn.c"),
Object(NonMatching, "fa/driver/msc_drv.c"),
Object(Matching, "fa/msc/puh_msc.c"),
Object(Matching, "fa/msc/puh_msc_cmd.c"),
Object(NonMatching, "fa/msc/puh_msc.c"),
Object(NonMatching, "fa/msc/puh_msc_cmd.c"),
Object(NonMatching, "fa/msc/puh_msc_blk.c"),
]
),

View File

@@ -96,7 +96,7 @@ CHANSVmNativeClass* CHANSVmAddNativeClass(CHANSVm* vm, const char* clsName, CHAN
/*** CHANS Image ***/
/************************/
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm, vmPtr data);
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm);
typedef vmPtr (*CHANSVmImageAllocatorCallback)(CHANSVm* vm, u32 size);
void CHANSVmImageRegisterAllocator(CHANSVmImageAllocatorCallback allocCb, CHANSVmImageCtorCallback ctorCb);

View File

@@ -75,7 +75,7 @@ namespace homebutton {
private:
static bool sBatteryFlag[WPAD_MAX_CONTROLLERS];
static bool sAlarmCreated[WPAD_MAX_CONTROLLERS];
static bool lbl_816989BC[WPAD_MAX_CONTROLLERS];
static OSAlarm sAlarm[WPAD_MAX_CONTROLLERS];
static OSAlarm sAlarmSoundOff[WPAD_MAX_CONTROLLERS];

View File

@@ -35,8 +35,8 @@ namespace ext_ead {
class SurfaceManager {
public:
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
void* libBuf, const char* arcPath);
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
void* libBuf, const char* param_10);
static void DisposeManager();
static void RegisterArcFile(void* fileBuf);

View File

@@ -187,19 +187,7 @@ namespace textinput {
void SetFocusedText(s32 pane) { mnFocusedIdx = pane; }
s32 GetFocusedText() { return mnFocusedIdx; }
f32 GetWidthScale_() const { return 608.0f / mfScreenWidth; }
#ifdef TI_CANDIDATEBOX_IMPLEMENTATION
f32 GetMargin_() const {
f32 margin;
if (mfScreenWidth > 700.0f) {
margin = 10.0f;
} else {
margin = 20.0f;
}
return margin;
}
#else
f32 GetMargin_() const { return mfScreenWidth > 700.0f ? 10.0f : 20.0f; }
#endif
s32 GetNextPageIdx_(s32 page) const;
s32 GetPrevPageIdx_(s32 page) const;
s32 GetDispNum() const;

View File

@@ -145,7 +145,7 @@ namespace textinput {
#ifdef TISIGNWINDOW_IMPLEMENTATION
bool isAtokActive() const;
#endif
#if defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
#ifdef MYTILETTERFORM_IMPLEMENTATION
virtual void create(MEMAllocator* allocator);
virtual void init();
virtual void onCommand(INPUT_COMMAND command, void* data);
@@ -384,7 +384,7 @@ namespace textinput {
virtual void setRootPaneScaleFor16x9();
virtual void setRootPaneScaleFor4x3();
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
virtual void onSE(sound::SE seId);
#endif

View File

@@ -6,7 +6,7 @@
#include <nw4r/ut/CharWriter.h>
#include <nw4r/ut/Rect.h>
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
#include <string.h>
#endif
@@ -34,7 +34,7 @@ namespace textinput {
} CursorPos;
typedef struct DrawInfo {
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
nw4r::ut::Rect rect;
wchar_t character;
#else
@@ -94,7 +94,7 @@ namespace textinput {
virtual u32 getEndPos() const;
// todo
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
virtual void setDrawModifyScopeLine(s32 startLine, s32 endLine);
virtual void setDrawCacheScopeLine(s32 startLine, s32 endLine);
virtual void modifyCursorCache(s32 line, u32 position, f32 x, f32 y, f32 width, f32 height);
@@ -103,12 +103,12 @@ namespace textinput {
virtual void setDrawCacheScopeLine();
virtual void modifyCursorCache();
#endif
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
virtual bool isEnableCursorCache() const;
#else
virtual void isEnableCursorCache();
#endif
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
virtual u32 getDrawModifyStartLine() const;
virtual u32 getDrawModifyEndLine() const;
#else

View File

@@ -20,11 +20,7 @@ namespace gui {
class Manager;
class EventHandler;
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
class __declspec(novtable) Interface {
#else
class Interface {
#endif
public:
virtual void create() {} // 0x08 (0x02)
@@ -34,14 +30,14 @@ namespace gui {
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
virtual void draw() {} // 0x18 (0x06)
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~Interface(); // 0x1C (0x07)
#else
virtual ~Interface() {} // 0x1C (0x07)
#endif
};
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
class __declspec(novtable) EventHandler {
#else
class EventHandler {

View File

@@ -24,7 +24,7 @@ namespace ipl {
mbDisableCon(bDisableCon) {}
#endif
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~PaneManager();
#else
virtual ~PaneManager() {}

View File

@@ -69,7 +69,7 @@ namespace ipl {
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
T get() const {
f32 var_f27 = mFrame;
@@ -81,11 +81,11 @@ namespace ipl {
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r +=
(mStartTangent *
(unkVal0 *
(var_f27 +
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
@@ -101,7 +101,7 @@ namespace ipl {
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
return r;*/
}
@@ -109,8 +109,8 @@ namespace ipl {
protected:
T mStart;
T mEnd;
f32 mStartTangent;
f32 mEndTangent;
f32 unkVal0;
f32 unkVal1;
};
template <>
@@ -119,7 +119,7 @@ namespace ipl {
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
f32 speed = 1.0f);
f32 get() const {
@@ -132,10 +132,10 @@ namespace ipl {
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r +=
(mStartTangent *
(unkVal0 *
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
(var_f28 * (var_f27 * var_f27))));
return r;
@@ -144,8 +144,8 @@ namespace ipl {
protected:
f32 mStart;
f32 mEnd;
f32 mStartTangent;
f32 mEndTangent;
f32 unkVal0;
f32 unkVal1;
};
#pragma dont_instantiate HermiteIntp<float>
@@ -155,12 +155,12 @@ namespace ipl {
public:
HermiteIntp() {}
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
mStart = start;
mEnd = end;
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
mStartTangent = startTangent;
mEndTangent = endTangent;
unkVal0 = param_5;
unkVal1 = param_6;
}
#ifdef IPL_SD_CHANNEL_SELECT_CPP
@@ -176,9 +176,9 @@ namespace ipl {
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
f32 frameSquared = frame * frame;
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
f32 tangent = mStartTangent * (frame + (cubic -
f32 tangent = unkVal0 * (frame + (cubic -
inverseDuration * (2.0f * frame * frame))) +
mEndTangent * (cubic - inverseDuration * frameSquared);
unkVal1 * (cubic - inverseDuration * frameSquared);
result.x += tangent;
result.y += tangent;
result.z += tangent;
@@ -196,7 +196,7 @@ namespace ipl {
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
@@ -213,55 +213,15 @@ namespace ipl {
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 =
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
r = r + temp_f3;
return r;*/
}
#endif
protected:
f32 mStartTangent;
f32 mEndTangent;
};
#endif
#ifdef IPL_SD_CHANNEL_SELECT_CPP
} // namespace math
} // namespace ipl
#include "math/iplMathTypes.h"
namespace ipl {
namespace math {
template <>
class HermiteIntp<VEC3> : public utility::FrameController {
public:
HermiteIntp() {}
virtual ~HermiteIntp();
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
VEC3 get() const {
f32 frame = mFrame;
f32 inverseDuration = 1.0f / mMaxFrame;
VEC3 result =
(mStart * (1.0f + (inverseDuration * (inverseDuration *
(inverseDuration * (frame * (2.0f * frame * frame)))) -
inverseDuration * (inverseDuration * (3.0f * frame * frame))))) -
(mEnd * (inverseDuration * (inverseDuration *
(inverseDuration * (frame * (2.0f * frame * frame)))) -
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
f32 frameSquared = frame * frame;
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
f32 tangent = mStartTangent * (frame + (cubic -
inverseDuration * (2.0f * frame * frame))) +
mEndTangent * (cubic - inverseDuration * frameSquared);
result.x += tangent;
result.y += tangent;
result.z += tangent;
return result;
}
protected:
VEC3 mStart;
VEC3 mEnd;
f32 mStartTangent;
f32 mEndTangent;
f32 unkVal0;
f32 unkVal1;
};
#endif

View File

@@ -8,7 +8,7 @@
namespace ipl {
namespace scene {
class GCWindow : public MemoryBase, public MemCardEventListener {
class GCWindow : public MemoryBase, public MemCardEventHandler {
#ifdef IPL_MEMORY_CARD_CPP
friend class MemoryCard;
#endif
@@ -48,25 +48,6 @@ private:
void set_texture(const char*, const GXTexObj&);
public:
virtual void onMemEvent(long, u8);
#ifdef IPL_GC_WINDOW_CPP
virtual void on_wait_anim() = 0;
virtual void on_exit() = 0;
virtual void on_error() = 0;
virtual void on_format() = 0;
virtual void on_dialog_result() = 0;
virtual void on_select_in() = 0;
virtual void on_message_done() = 0;
virtual void on_button_trig() = 0;
#else
virtual void on_wait_anim();
virtual void on_exit();
virtual void on_error();
virtual void on_format();
virtual void on_dialog_result();
virtual void on_select_in();
virtual void on_message_done();
virtual void on_button_trig();
#endif
bool isProcess();
void stop_wait_anim();

View File

@@ -35,11 +35,7 @@ namespace ipl {
MemoryBase* mpBase; // 0x0C
};
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
class __declspec(novtable) MemoryBase {
#else
class MemoryBase {
#endif
public:
class Anm {
public:

View File

@@ -12,61 +12,13 @@
namespace ipl {
namespace scene {
class __declspec(novtable) MemCardEventListener {
public:
MemCardEventListener() {}
virtual ~MemCardEventListener() {}
virtual void onMemEvent(long event, u8 slot);
};
class MemCardEventHandler : public MemCardEventListener {
class MemCardEventHandler {
public:
MemCardEventHandler() {}
virtual ~MemCardEventHandler();
virtual void onMemEvent(long event, u8 slot);
virtual void onMount(u8 slot) = 0;
virtual void onUnmount(u8 slot) = 0;
virtual void onAttach(u8 slot) = 0;
virtual void onDetach(u8 slot) = 0;
virtual void onCheck(u8 slot) = 0;
virtual void onFormat(u8 slot) = 0;
virtual void onRepair(u8 slot) = 0;
virtual void onRead(u8 slot) = 0;
virtual void onWrite(u8 slot) = 0;
virtual void onOpen(u8 slot) = 0;
virtual void onClose(u8 slot) = 0;
virtual void onCreate(u8 slot) = 0;
virtual void onDelete(u8 slot) = 0;
virtual void onCopy(u8 slot) = 0;
virtual void onMove(u8 slot) = 0;
virtual void onRename(u8 slot) = 0;
virtual void onVerify(u8 slot) = 0;
virtual void onCommit(u8 slot) = 0;
virtual void onProbe(u8 slot) = 0;
virtual void onMountAsync(u8 slot) = 0;
virtual void onUnmountAsync(u8 slot) = 0;
virtual void onCheckAsync(u8 slot) = 0;
virtual void onFormatAsync(u8 slot) = 0;
virtual void onReadAsync(u8 slot) = 0;
virtual void onWriteAsync(u8 slot) = 0;
virtual void onCreateAsync(u8 slot) = 0;
virtual void onDeleteAsync(u8 slot) = 0;
virtual void onCopyAsync(u8 slot) = 0;
virtual void onMoveAsync(u8 slot) = 0;
virtual void onRenameAsync(u8 slot) = 0;
virtual void onVerifyAsync(u8 slot) = 0;
virtual void onCommitAsync(u8 slot) = 0;
virtual void onProbeAsync(u8 slot) = 0;
virtual void onFreeBlocks(u8 slot) = 0;
virtual void onGetLength(u8 slot) = 0;
virtual void onSetAttrib(u8 slot) = 0;
virtual void onGetAttrib(u8 slot) = 0;
virtual void onSlotStatus(u8 slot) = 0;
};
typedef struct MCFile {
@@ -104,44 +56,6 @@ namespace ipl {
}
virtual ~MemoryCardManager();
virtual void onMount(u8 slot) = 0;
virtual void onUnmount(u8 slot) = 0;
virtual void onAttach(u8 slot) = 0;
virtual void onDetach(u8 slot) = 0;
virtual void onCheck(u8 slot) = 0;
virtual void onFormat(u8 slot) = 0;
virtual void onRepair(u8 slot) = 0;
virtual void onRead(u8 slot) = 0;
virtual void onWrite(u8 slot) = 0;
virtual void onOpen(u8 slot) = 0;
virtual void onClose(u8 slot) = 0;
virtual void onCreate(u8 slot) = 0;
virtual void onDelete(u8 slot) = 0;
virtual void onCopy(u8 slot) = 0;
virtual void onMove(u8 slot) = 0;
virtual void onRename(u8 slot) = 0;
virtual void onVerify(u8 slot) = 0;
virtual void onCommit(u8 slot) = 0;
virtual void onProbe(u8 slot) = 0;
virtual void onMountAsync(u8 slot) = 0;
virtual void onUnmountAsync(u8 slot) = 0;
virtual void onCheckAsync(u8 slot) = 0;
virtual void onFormatAsync(u8 slot) = 0;
virtual void onReadAsync(u8 slot) = 0;
virtual void onWriteAsync(u8 slot) = 0;
virtual void onCreateAsync(u8 slot) = 0;
virtual void onDeleteAsync(u8 slot) = 0;
virtual void onCopyAsync(u8 slot) = 0;
virtual void onMoveAsync(u8 slot) = 0;
virtual void onRenameAsync(u8 slot) = 0;
virtual void onVerifyAsync(u8 slot) = 0;
virtual void onCommitAsync(u8 slot) = 0;
virtual void onProbeAsync(u8 slot) = 0;
virtual void onFreeBlocks(u8 slot) = 0;
virtual void onGetLength(u8 slot) = 0;
virtual void onSetAttrib(u8 slot) = 0;
virtual void onGetAttrib(u8 slot) = 0;
void calc();
bool isSlotReady(u8 slot);
@@ -182,7 +96,7 @@ namespace ipl {
u16 getFreeBlocks(u8 slot);
#endif
void setEventHandler(MemCardEventListener* eventHandler) {
void setEventHandler(MemCardEventHandler* eventHandler) {
mpEventHandler = eventHandler;
}
@@ -193,7 +107,7 @@ namespace ipl {
s32 mLastResult; // 0x16930
s32 mLastCmd; // 0x16934
u32 unk_0x16938; // 0x16938
MemCardEventListener* mpEventHandler; // 0x1693C
MemCardEventHandler* mpEventHandler; // 0x1693C
};
} // namespace scene
} // namespace ipl

View File

@@ -395,9 +395,9 @@ namespace ipl {
NandSDWorker* mpSDWorker;
ESTitleId32* mpSDTitleIds;
SDChannelSelectTitleInfo* mpSDTitleInfo;
mutable NandSDWorker::TitleUsage* mpNandTitleInfo;
mutable s32 mFirstTitleCount;
mutable s32 mSecondTitleCount;
NandSDWorker::TitleUsage* mpNandTitleInfo;
s32 mFirstTitleCount;
s32 mSecondTitleCount;
SDChannelObj* mpCurrentLoadedChannel;
u32 mSDTitleCount;
u32 mNandTitleCount;

View File

@@ -167,12 +167,12 @@ namespace ipl {
bool is_stopped_all_anm() const;
void calc_exit_sequence();
void fn_81409864();
void prepare_exit_abort();
void wait_decide_se();
void start_exit_fade();
void finish_exit_reboot();
void fn_814098F4();
void fn_unk_inline();
void fn_81409988();
void fn_814099EC();
int mState; // 0x60
int mPrevState; // 0x64

View File

@@ -38,49 +38,21 @@ namespace ipl {
int holdSE(const char* sndName);
int holdSEwithPosDis(const char* sndName, f32 x, f32 y);
#ifdef IPL_SOUND_MATCHING
void stopBGM(int unk = 0);
#else
int stopBGM(int unk = 0);
#endif
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
int stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
void stopAllSound(int unk = 0);
int resetAllSound();
#ifdef IPL_SOUND_MATCHING
void muteOffBGM(int);
#else
int muteOffBGM(int);
#endif
#ifdef IPL_SOUND_MATCHING
void muteOnBGM(int);
#else
int muteOnBGM(int);
#endif
#ifdef IPL_SOUND_MATCHING
void pauseOnBGM();
#else
int pauseOnBGM();
#endif
#ifdef IPL_SOUND_MATCHING
void pauseOffBGM();
#else
int pauseOffBGM();
#endif
#ifdef IPL_SOUND_MATCHING
void pauseOnSE();
#else
int pauseOnSE();
#endif
#ifdef IPL_SOUND_MATCHING
void pauseOffSE();
#else
int pauseOffSE();
#endif
void setOutputMode(EAudioOutputMode mode);

View File

@@ -39,7 +39,7 @@ namespace ipl {
void stt_wait_fns_msg();
void stt_wait_terminate();
int getProgressPercent();
int fn_8135B1C0();
void error_handling();

View File

@@ -92,7 +92,7 @@ namespace ipl {
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 check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC);
void iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC);
void list_nand_apps_usage_async(void* ptrA, void* ptr);
@@ -514,7 +514,7 @@ namespace ipl {
void do_check_for_sd_app_to_nand();
void check_backup_fits();
void do_list_nand_apps_usage();
void do_check_sd_app_titles();
void do_unk_8134C838();
void do_move_nand_app_to_sd();
void do_move_sd_app_to_nand();

View File

@@ -24,7 +24,7 @@ namespace ipl {
class Manager;
}
namespace savedata {
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
class Manager {
public:
@@ -87,7 +87,7 @@ namespace ipl {
channel::SInfo& getChanInfo(int page, int index) { return mData.chanInfo[page][index]; }
textinput::extend::savedata::MemoSetting getMemoSetting() { return mData.memoSetting; }
void pushTitleCache(ESTitleId titleId);
void iplSavedata_813596B8(ESTitleId titleId);
private:
#ifdef IPL_SD_CHANNEL_SELECT_ACCESS
@@ -184,7 +184,7 @@ namespace ipl {
u8 unused_0x504[28];
friend class channel::Manager;
friend BOOL isTitleCached(void* manager, ESTitleId titleId);
friend BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
};
} // namespace savedata
} // namespace ipl

View File

@@ -48,14 +48,10 @@ namespace EGG {
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.PrepareSound(pHandle, id); } // 0x44
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.PrepareSound(pHandle, id); } // 0x44
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, const char* pName) {
#ifdef IPL_SOUND_MATCHING
u32 id = changeNameToId(pName);
#else
u32 id = nw4r::snd::SoundArchive::INVALID_ID;
if (mpArchive != NULL) {
id = changeNameToId(pName);
}
#endif
return mSoundArchivePlayer.PrepareSound(pHandle, id);
} // 0x48

View File

@@ -20,13 +20,9 @@ namespace EGG {
~SoundHeapMgr() { destroySoundHeap(); }
virtual bool loadState(s32 id) {
#ifdef IPL_SOUND_MATCHING
if (id > 0 && mHeap.GetCurrentLevel() >= id) {
#else
s32 level = mHeap.GetCurrentLevel();
if (id > 0 && level >= id) {
#endif
mHeap.LoadState(id);
return true;
}

View File

@@ -11,11 +11,7 @@ namespace nw4r {
namespace snd {
class SoundHandle : private ut::NonCopyable {
public:
#ifdef IPL_SOUND_MATCHING
SoundHandle() NO_INLINE;
#else
SoundHandle() NO_INLINE : mSound(NULL) {}
#endif
~SoundHandle() { DetachSound(); }
void detail_AttachSound(detail::BasicSound* sound);

View File

@@ -31,14 +31,7 @@ namespace nw4r {
ut::detail::AutoLock<OSMutex> lock(mMutex);
return mFrameHeap.SaveState();
}
#ifdef IPL_SOUND_MATCHING
void LoadState(int id) {
ut::detail::AutoLock<OSMutex> lock(mMutex);
mFrameHeap.LoadState(id);
}
#else
void LoadState(int id);
#endif
bool IsValid() { return mFrameHeap.IsValid(); }

View File

@@ -20,7 +20,7 @@ namespace nw4r {
Rect(f32 l, f32 t, f32 r, f32 b) : left(l), top(t), right(r), bottom(b) {}
#endif
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP)
#ifndef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
~Rect() {}
#endif

View File

@@ -37,7 +37,7 @@ namespace nw4r {
} // namespace detail
template <typename TDerived, typename TBase>
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP)
#ifdef IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST
TDerived DynamicCast(TBase* pPtr);
#else
inline TDerived DynamicCast(TBase* pPtr) {

View File

@@ -17,96 +17,7 @@ static TMCHuffmanEntry readHuffmanLimit(const TMCHuffmanEntry* entries) {
return limit;
}
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work) {
u32 bitData;
u32 code;
u32 length;
const TMCHuffmanEntry* entry;
if (bitCount <= 17) {
s32 result = TMCJPEGDEC_load_buff(work);
if (result < 0) {
return result;
}
}
bitCount = work->bitCount;
bitData = work->bitBuf;
bitCount -= 9;
code = (bitData >> bitCount) & 0x1FF;
work->bitCount = bitCount;
length = 9;
entry = table + 9;
goto read_entry;
while (1) {
length++;
entry++;
if (length > 16) {
return TMCC_ERROR_OVERFLOW;
}
bitCount = work->bitCount;
code <<= 1;
bitData = work->bitBuf;
bitCount--;
work->bitCount = bitCount;
code |= (bitData >> bitCount) & 1;
read_entry:
{
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
if (code > (u32)decoded.bitLength) {
continue;
}
code = code - entry->bitLength + entry->symbol;
return symbols[code & 0xFF];
}
}
}
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work) {
u32 bitData;
u32 code;
u32 length;
if (bitCount <= 17) {
s32 result = TMCJPEGDEC_load_buff(work);
if (result < 0) {
return result;
}
}
bitCount = work->bitCount;
bitData = work->bitBuf;
bitCount -= 9;
code = (bitData >> bitCount) & 0x1FF;
work->bitCount = bitCount;
length = 9;
entry += 9;
goto read_entry;
while (1) {
length++;
entry++;
if (length > 16) {
return TMCC_ERROR_OVERFLOW;
}
bitCount = work->bitCount;
code <<= 1;
bitData = work->bitBuf;
bitCount--;
work->bitCount = bitCount;
code |= (bitData >> bitCount) & 1;
read_entry:
{
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
if (code > (u32)decoded.bitLength) {
continue;
}
code = code - entry->bitLength + entry->symbol;
return symbols[code & 0xFF];
}
}
}
s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_ptr, TMCCJPEGDecWork* work) {
TMCHuffmanEntry dcEntry;
TMCHuffmanEntry acEntry;
const TMCHuffmanEntry* ac_fast;
u8* huff_sym;
u32* huff_tbl;
@@ -138,7 +49,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
tmp = bit_pos - 8;
tmp = ((bit_data >> tmp) & 0xFF) << 2;
{
dcEntry = readHuffmanEntry(dc_fast, tmp >> 2);
TMCHuffmanEntry dcEntry = readHuffmanEntry(dc_fast, tmp >> 2);
r = dcEntry.bitLength;
extra = dcEntry.symbol;
}
@@ -148,11 +59,68 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
work->bitCount = bit_pos;
r = extra;
} else {
s32 dcResult;
u32 code;
unsigned int i;
const TMCHuffmanEntry* entry;
s32 thresh;
s32 offs;
huff_sym = work->pDCHuffSym;
huff_tbl = work->pDCHuffTbl;
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
if (r < 0) {
return r;
if (bit_pos <= 17) {
dcResult = TMCJPEGDEC_load_buff(work);
if (dcResult < 0) {
goto dc_end;
}
}
bit_pos = work->bitCount;
bit_data = work->bitBuf;
bit_pos -= 9;
code = (bit_data >> bit_pos) & 0x1FF;
work->bitCount = bit_pos;
i = 9;
entry = (const TMCHuffmanEntry*)huff_tbl + 9;
goto dc_entry;
while (1) {
i++;
entry++;
if (i > 16) {
dcResult = TMCC_ERROR_OVERFLOW;
goto dc_end;
}
bit_pos = work->bitCount;
code <<= 1;
bit_data = work->bitBuf;
bit_pos--;
work->bitCount = bit_pos;
code |= (bit_data >> bit_pos) & 1;
dc_entry:
{
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
thresh = decoded.bitLength;
offs = entry->symbol;
}
if (code > (u32)thresh) {
continue;
}
code = code - entry->bitLength + offs;
dcResult = huff_sym[code & 0xFF];
break;
}
dc_end:
r = dcResult;
if (dcResult < 0) {
return dcResult;
}
}
@@ -164,8 +132,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
if (load_ret < 0) {
return load_ret;
}
bit_pos = work->bitCount;
}
bit_pos = work->bitCount;
bit_data = work->bitBuf;
tmp = 1 << r;
extra = tmp - 1;
@@ -181,6 +149,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
*block = dc_predict_row_ptr[0] * blk0;
{
TMCHuffmanEntry acEntry;
ac_fast = (const TMCHuffmanEntry*)work->pACFast;
huff_tbl = work->pACHuffTbl;
huff_sym = work->pACHuffSym;
@@ -201,7 +170,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
t = bit_pos - 8;
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
do {
while (idx < 64) {
s32 ac_thresh = acEntry.bitLength;
if (ac_thresh != 0) {
bit_pos = work->bitCount;
@@ -209,8 +178,62 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
work->bitCount = bit_pos;
r = acEntry.symbol;
} else {
u32 code;
unsigned int i;
const TMCHuffmanEntry* entry;
s32 thresh;
s32 offs;
bit_pos = work->bitCount;
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
if (bit_pos <= 17) {
r = TMCJPEGDEC_load_buff(work);
if (r < 0) {
return r;
}
bit_pos = work->bitCount;
}
bit_data = work->bitBuf;
bit_pos -= 9;
code = (bit_data >> bit_pos) & 0x1FF;
work->bitCount = bit_pos;
i = 9;
entry = (const TMCHuffmanEntry*)huff_tbl + 9;
goto ac_entry_huff;
while (1) {
i++;
entry++;
if (i > 16) {
r = TMCC_ERROR_OVERFLOW;
goto ac_end;
}
bit_pos = work->bitCount;
code <<= 1;
bit_data = work->bitBuf;
bit_pos--;
work->bitCount = bit_pos;
code |= (bit_data >> bit_pos) & 1;
ac_entry_huff:
{
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
thresh = decoded.bitLength;
offs = entry->symbol;
}
if (code > (u32)thresh) {
continue;
}
code = code - entry->bitLength + offs;
r = huff_sym[code & 0xFF];
break;
}
ac_end:
if (r < 0) {
return r;
}
@@ -233,8 +256,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
if (r < 0) {
return r;
}
bit_pos = work->bitCount;
}
bit_pos = work->bitCount;
tmp = 1 << t;
bit_data = work->bitBuf;
extra = tmp - 1;
@@ -242,14 +265,14 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
work->bitCount = bit_pos;
t = bit_pos - 8;
extra = extra & (bit_data >> bit_pos);
q = ((s32*)conv_row_ptr)[(u8)zz];
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
if (((s32)tmp >> 1) > extra) {
extra -= tmp - 1;
}
block[(u8)zz] = extra * q;
q = ((s32*)conv_row_ptr)[zz];
block[zz] = extra * q;
idx++;
} else {
@@ -271,7 +294,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
idx += 16;
}
} while (idx < 64);
}
if (idx > 64) {
return TMCC_ERROR_OVERFLOW;

View File

@@ -1,28 +1,30 @@
#include <string.h>
#include <tmc_jpeg_internal.h>
static s32 clampU8(s32 v) {
static u8 clampU8(s32 v) {
s32 ok;
ok = 0;
if (v < 256 && v > -1) {
ok = 1;
}
return ok ? v : (v < 0 ? 0 : 255);
return ok ? v : 255 & ~(v >> 31);
}
static s32 clampS8(s32 v) {
static s8 clampS8(s32 v) {
s32 inRange = 0;
if (v < 128 && v > -129) {
inRange = 1;
}
return inRange ? v : (v > 0) ? 127 : -128;
return inRange ? (s8)v : (v > 0) ? 127 : -128;
}
static s32 scalingClampU8(s32 value) {
if ((value >> 19) == 0) {
return value >> 11;
}
return value < 0 ? 0 : 255;
static s32 scalingClampU8(s32 val) {
s32 result;
if (val >> 19 != 0)
result = ~(val >> 31) & 0xFF;
else
result = (val >> 11);
return result;
}
void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag) {
@@ -31,35 +33,13 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
s32 done;
s32 iter;
s32 i;
s32 e;
s32 b2;
s32 b3;
s32 b4;
s32 b5;
s32 b6;
s32 b7;
s32 v;
s32 m;
s32 a;
s32 d;
s32 z;
s32 o;
s32 p;
s32 p_part;
s32 t;
s32 u;
s32 r;
s32 n;
s32 y;
s32 x_factor;
s32 z_factor;
s32 m_part;
s32 q;
s32 w;
s32 x;
s32 b1;
s32 b1, b2, b3, b4, b5, b6, b7;
s32 v, e, a, d, n, o, p, q, t, u, w, x, y;
s32 x_factor, z_factor, m_part, p_part;
s32 r, z, m;
r = (zigzag >> 4) * 8;
iter = (u32)(r + 7) >> 3;
dst = tmp;
done = 0;
{
@@ -91,41 +71,28 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
dst[1] = val;
dst[0] = val;
} else {
s32 oddLowSum;
s32 oddHighSum;
s32 dcValue;
t = b2 - b6;
oddLowSum = b5 + b3;
b5 = b5 - b3;
oddHighSum = b1 + b7;
b1 = b1 - b7;
u = b6 + b2;
t = t * 0xB5 >> 8;
x_factor = oddHighSum - oddLowSum;
z_factor = b5 + b1;
dcValue = block[0];
a = dcValue - b4;
x = x_factor * 0xB5 >> 8;
d = dcValue + b4;
u = t + u;
t = (b2 - b6) * 0xB5 >> 8;
a = block[0] - b4;
d = block[0] + b4;
u = t + (b6 + b2);
v = a + t;
z = z_factor * 0x62 >> 8;
w = d + u;
y = d - u;
m_part = b1 * 0x14E >> 8;
e = a - t;
w = d + u;
x_factor = (b1 + b7) - (b5 + b3);
y = d - u;
z_factor = (b5 - b3) + (b1 - b7);
m_part = (b1 - b7) * 0x14E >> 8;
p_part = (b5 - b3) * 0x8B >> 8;
x = x_factor * 0xB5 >> 8;
z = z_factor * 0x62 >> 8;
m = m_part - z;
oddLowSum += m;
n = oddHighSum + oddLowSum;
n = (b1 + b7) + ((b5 + b3) + m);
o = x + m;
dst[0] = w + n;
p_part = b5 * 0x8B;
dst[7] = w - n;
p_part >>= 8;
dst[1] = v + o;
p = z + p_part;
q = p + x;
q = x + p;
dst[0] = w + n;
dst[7] = w - n;
dst[1] = v + o;
dst[6] = v - o;
dst[2] = e + q;
dst[5] = e - q;
@@ -178,37 +145,25 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
out[pitch] = val;
out[0] = val;
} else {
s32 oddLowSum;
s32 oddHighSum;
s32 dcValue;
t = b2 - b6;
oddLowSum = b5 + b3;
b5 = b5 - b3;
oddHighSum = b1 + b7;
b1 = b1 - b7;
u = b6 + b2;
b2 = t * 0xB5 >> 8;
x_factor = oddHighSum - oddLowSum;
z_factor = b5 + b1;
dcValue = *dst + 0x40000;
a = dcValue - b4;
x = x_factor * 0xB5 >> 8;
d = dcValue + b4;
u = b2 + u;
v = a + b2;
z_factor = z_factor * 0x62 >> 8;
t = (b2 - b6) * 0xB5 >> 8;
a = (*dst + 0x40000) - b4;
d = (*dst + 0x40000) + b4;
u = t + (b6 + b2);
v = a + t;
e = a - t;
w = d + u;
x_factor = (b1 + b7) - (b5 + b3);
x = x_factor * 0xB5 >> 8;
y = d - u;
m_part = b1 * 0x14E >> 8;
e = a - b2;
m_part = m_part - z_factor;
oddLowSum += m_part;
n = oddHighSum + oddLowSum;
z_factor = ((b5 - b3) + (b1 - b7)) * 0x62 >> 8;
m_part = ((b1 - b7) * 0x14E >> 8) - z_factor;
n = (b1 + b7) + ((b5 + b3) + m_part);
o = x + m_part;
p_part = b5 * 0x8B >> 8;
p = z_factor + p_part;
q = p + x;
p = ((b5 - b3) * 0x8B >> 8) + z_factor;
q = x + p;
out[0] = scalingClampU8(w + n);
out[r] = scalingClampU8(w - n);
out[pitch] = scalingClampU8(v + o);
@@ -227,34 +182,11 @@ void TMCJPEGDEC_IdctBlock_Col(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigza
s32* dst;
s32 done;
s32 iter;
s32 d;
s32 b1;
s32 b2;
s32 b3;
s32 b4;
s32 b5;
s32 b6;
s32 b7;
s32 v;
s32 r;
s32 a;
s32 i;
s32 m;
s32 n;
s32 o;
s32 x;
s32 q;
s32 y;
s32 u;
s32 w;
s32 p;
s32 t;
s32 z;
s32 x_factor;
s32 z_factor;
s32 m_part;
s32 p_part;
s32 e;
s32 b1, b2, b3, b4, b5, b6, b7;
s32 v, e, a, d, m, n, o, p, q, t, u, w, x, y, z;
s32 x_factor, z_factor, m_part, p_part;
s32 r;
if (zigzag == 0x11) {
s32 val;
@@ -268,42 +200,90 @@ void TMCJPEGDEC_IdctBlock_Col(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigza
goto mode_gt_2;
}
dst = tmp;
done = 0;
for (; done < r; done += 8) {
s32 dcValue;
s32 oddCoefficient;
{
s32 inner;
oddCoefficient = block[1];
dcValue = block[0];
t = oddCoefficient * 0xB5 >> 8;
v = oddCoefficient * 0x62 >> 8;
u = v + t;
z = (oddCoefficient * 0x14E >> 8) - v;
m = oddCoefficient + z;
n = t + z;
dst[0] = dcValue + m;
dst[7] = dcValue - m;
dst[1] = dcValue + n;
dst[6] = dcValue - n;
dst[2] = dcValue + u;
dst[5] = dcValue - u;
dst[3] = dcValue + v;
dst[4] = dcValue - v;
dst += 8;
block += 8;
}
dst = tmp + done;
for (; done <= 0x38; done += 8) {
memset(dst, 0, 0x20);
dst += 8;
dst = tmp;
done = 0;
iter = (r + 7) >> 3;
if (r > 0) {
inner = (r + 7) >> 4;
done = iter << 3;
if (inner != 0) {
for (; inner > 0; inner--) {
t = block[1] * 0xB5 >> 8;
v = block[1] * 0x62 >> 8;
u = v + t;
z = (block[1] * 0x14E >> 8) - v;
m = block[1] + z;
n = t + z;
b1 = block[0] + m;
dst[0] = b1;
dst[7] = block[0] - m;
dst[1] = block[0] + n;
dst[6] = block[0] - n;
dst[2] = block[0] + u;
dst[5] = block[0] - u;
dst[3] = block[0] + v;
dst[4] = block[0] - v;
t = block[9] * 0xB5 >> 8;
v = block[9] * 0x62 >> 8;
u = v + t;
z = (block[9] * 0x14E >> 8) - v;
m = block[9] + z;
n = t + z;
b2 = block[8] + m;
dst[8] = b2;
dst[15] = block[8] - m;
dst[9] = block[8] + n;
dst[14] = block[8] - n;
dst[10] = block[8] + u;
dst[13] = block[8] - u;
dst[11] = block[8] + v;
dst[12] = block[8] - v;
dst += 0x10;
block += 0x10;
}
iter = iter & 1;
if (iter == 0) {
goto zero_fill;
}
}
for (; iter > 0; iter--) {
t = block[1] * 0xB5 >> 8;
v = block[1] * 0x62 >> 8;
u = v + t;
z = (block[1] * 0x14E >> 8) - v;
m = block[1] + z;
n = t + z;
b1 = block[0] + m;
dst[0] = b1;
dst[7] = block[0] - m;
dst[1] = block[0] + n;
dst[6] = block[0] - n;
dst[2] = block[0] + u;
dst[5] = block[0] - u;
dst[3] = block[0] + v;
dst[4] = block[0] - v;
dst += 8;
block += 8;
}
}
zero_fill:
dst = tmp + done;
for (; done <= 0x38; done += 8) {
memset(dst, 0, 0x20);
dst += 8;
}
}
goto epilogue;
mode_gt_2:
dst = tmp;
done = 0;
for (; done < r; done += 8) {
if (r > 0) {
for (iter = (r + 7) >> 3; iter > 0; iter--) {
u32 ac;
b4 = block[4];
b6 = block[6];
@@ -332,43 +312,28 @@ mode_gt_2:
dst[1] = val;
dst[0] = val;
} else {
s32 oddLowSum;
s32 oddLowDifference;
s32 oddHighSum;
s32 oddHighDifference;
s32 dcValue;
t = b2 - b6;
oddLowSum = b5 + b3;
oddLowDifference = b5 - b3;
oddHighSum = b1 + b7;
oddHighDifference = b1 - b7;
u = b6 + b2;
t = t * 0xB5 >> 8;
x_factor = oddHighSum - oddLowSum;
z_factor = oddLowDifference + oddHighDifference;
dcValue = block[0];
a = dcValue - b4;
x = x_factor * 0xB5 >> 8;
d = dcValue + b4;
u = t + u;
t = (b2 - b6) * 0xB5 >> 8;
a = block[0] - b4;
d = block[0] + b4;
u = t + (b6 + b2);
v = a + t;
z = z_factor * 0x62 >> 8;
w = d + u;
y = d - u;
m_part = oddHighDifference * 0x14E >> 8;
e = a - t;
w = d + u;
x_factor = (b1 + b7) - (b5 + b3);
y = d - u;
z_factor = (b5 - b3) + (b1 - b7);
m_part = (b1 - b7) * 0x14E >> 8;
p_part = (b5 - b3) * 0x8B >> 8;
x = x_factor * 0xB5 >> 8;
z = z_factor * 0x62 >> 8;
m = m_part - z;
oddLowSum += m;
n = oddHighSum + oddLowSum;
n = (b1 + b7) + ((b5 + b3) + m);
o = x + m;
dst[0] = w + n;
p_part = oddLowDifference * 0x8B;
dst[7] = w - n;
p_part >>= 8;
dst[1] = v + o;
p = z + p_part;
q = p + x;
dst[0] = w + n;
dst[7] = w - n;
dst[1] = v + o;
dst[6] = v - o;
dst[2] = e + q;
dst[5] = e - q;
@@ -377,6 +342,8 @@ mode_gt_2:
}
block += 8;
dst += 8;
done += 8;
}
}
dst = tmp + done;
@@ -390,9 +357,7 @@ epilogue:
dst = tmp + 7;
for (iter = 8, i = 7; iter > 0; iter--, i--) {
u32 ac;
u8* output;
b4 = dst[0x20];
output = conv_row_ptr + i;
b6 = dst[0x30];
b2 = dst[0x10];
b1 = dst[8];
@@ -410,56 +375,42 @@ epilogue:
if (ac == 0) {
s32 val;
val = clampS8(*dst >> 11);
output[56] = (u8)val;
output[48] = (u8)val;
output[40] = (u8)val;
output[32] = (u8)val;
output[24] = (u8)val;
output[16] = (u8)val;
output[8] = (u8)val;
output[0] = (u8)val;
conv_row_ptr[i + 56] = (u8)val;
conv_row_ptr[i + 48] = (u8)val;
conv_row_ptr[i + 40] = (u8)val;
conv_row_ptr[i + 32] = (u8)val;
conv_row_ptr[i + 24] = (u8)val;
conv_row_ptr[i + 16] = (u8)val;
conv_row_ptr[i + 8] = (u8)val;
conv_row_ptr[i] = (u8)val;
} else {
s32 oddLowSum;
s32 oddLowDifference;
s32 oddHighSum;
s32 oddHighDifference;
s32 dcValue;
t = b2 - b6;
oddLowSum = b5 + b3;
oddLowDifference = b5 - b3;
oddHighSum = b1 + b7;
oddHighDifference = b1 - b7;
u = b6 + b2;
t = t * 0xB5 >> 8;
x_factor = oddHighSum - oddLowSum;
z_factor = oddLowDifference + oddHighDifference;
dcValue = *dst;
a = dcValue - b4;
x = x_factor * 0xB5 >> 8;
d = dcValue + b4;
u = t + u;
t = (b2 - b6) * 0xB5 >> 8;
a = *dst - b4;
d = *dst + b4;
u = t + (b6 + b2);
v = a + t;
z = z_factor * 0x62 >> 8;
w = d + u;
y = d - u;
m_part = oddHighDifference * 0x14E >> 8;
e = a - t;
m = m_part - z;
oddLowSum += m;
n = oddHighSum + oddLowSum;
w = d + u;
x_factor = (b1 + b7) - (b5 + b3);
x = x_factor * 0xB5 >> 8;
y = d - u;
z_factor = (b5 - b3) + (b1 - b7);
z = z_factor * 0x62 >> 8;
m = ((b1 - b7) * 0x14E >> 8) - z;
n = (b1 + b7) + ((b5 + b3) + m);
o = x + m;
p_part = oddLowDifference * 0x8B >> 8;
p = z + p_part;
p = z + ((b5 - b3) * 0x8B >> 8);
q = p + x;
output[0] = (u8)clampS8((w + n) >> 11);
output[56] = (u8)clampS8((w - n) >> 11);
output[8] = (u8)clampS8((v + o) >> 11);
output[48] = (u8)clampS8((v - o) >> 11);
output[16] = (u8)clampS8((e + q) >> 11);
output[40] = (u8)clampS8((e - q) >> 11);
output[24] = (u8)clampS8((y + p) >> 11);
output[32] = (u8)clampS8((y - p) >> 11);
conv_row_ptr[i] = (u8)clampS8((w + n) >> 11);
conv_row_ptr[i + 56] = (u8)clampS8((w - n) >> 11);
conv_row_ptr[i + 8] = (u8)clampS8((v + o) >> 11);
conv_row_ptr[i + 48] = (u8)clampS8((v - o) >> 11);
conv_row_ptr[i + 16] = (u8)clampS8((e + q) >> 11);
conv_row_ptr[i + 40] = (u8)clampS8((e - q) >> 11);
conv_row_ptr[i + 24] = (u8)clampS8((y + p) >> 11);
conv_row_ptr[i + 32] = (u8)clampS8((y - p) >> 11);
}
dst--;
}

View File

@@ -244,11 +244,6 @@ _error:
static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData* pInfo) {
u16 byteOrder;
u32 ifdOffset;
const u8* entries;
u16 remaining;
u16 count;
s32 entriesSize;
u16 index;
pInfo->thumbnailData = (u8*)data;
pInfo->dataEnd = (u8*)data + size;
pInfo->nextIfdOffset = 0;
@@ -267,8 +262,11 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
return -161;
}
{
entries = data + ifdOffset;
remaining = size - (u16)ifdOffset;
const u8* entries = data + ifdOffset;
u16 remaining = size - (u16)ifdOffset;
u16 count;
s32 entriesSize;
u16 index;
if (remaining < 2) {
return -161;
}
@@ -296,8 +294,11 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
return -161;
}
{
entries = data + ifdOffset;
remaining = size - (u16)ifdOffset;
const u8* entries = data + ifdOffset;
u16 remaining = size - (u16)ifdOffset;
u16 count;
s32 entriesSize;
u16 index;
if (remaining < 2) {
return -161;
}
@@ -318,8 +319,11 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
return -161;
}
{
entries = data + ifdOffset;
remaining = size - (u16)ifdOffset;
const u8* entries = data + ifdOffset;
u16 remaining = size - (u16)ifdOffset;
u16 count;
s32 entriesSize;
u16 index;
if (remaining < 2) {
return -161;
}
@@ -350,7 +354,7 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
case 0x0111:
case 0x0201:
case 0x0202: {
break;
return;
}
case 0x0112: {
pInfo->orientation = readU16(entry + 8, byteOrder);
@@ -470,19 +474,21 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
return;
}
case 0xA002: {
if (type == 3) {
u32 offset = readU32(entry + 8, byteOrder);
if (type == 4) {
pInfo->pixelXDim = offset;
} else if (type == 3) {
pInfo->pixelXDim = readU16(entry + 8, byteOrder);
} else if (type == 4) {
pInfo->pixelXDim = readU32(entry + 8, byteOrder);
}
return;
}
case 0xA003: {
if (type == 3) {
u32 offset = readU32(entry + 8, byteOrder);
if (type == 4) {
pInfo->pixelYDim = offset;
} else if (type == 3) {
pInfo->pixelYDim = readU16(entry + 8, byteOrder);
} else if (type == 4) {
pInfo->pixelYDim = readU32(entry + 8, byteOrder);
}
return;
}
@@ -502,7 +508,7 @@ static void TMCJPEGDEC_IFD1_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
case 0x9000:
case 0x9101:
case 0xA003: {
break;
return;
}
case 0x011A: {
u32 offset;

View File

@@ -1411,22 +1411,131 @@ static s32 TMCJPEGDEC_parse_dht(s32 first, TMCCJPEGDecWork* work) {
}
#endif
#ifdef __MWERKS__
static asm s32 TMCJPEGDEC_parse_dqt(register TMCCJPEGDecWork* work) {
nofralloc
stwu r1, -0x130(r1)
mflr r0
lis r4, lbl_8161E080@ha
stw r0, 0x134(r1)
addi r4, r4, lbl_8161E080@l
li r0, 0x20
addi r6, r1, 0xc
stmw r24, 0x110(r1)
mr r30, r3
addi r5, r4, -4
mtctr r0
_parse_dqt_copy:
lwz r4, 4(r5)
lwzu r0, 8(r5)
stw r4, 4(r6)
stwu r0, 8(r6)
bdnz _parse_dqt_copy
addi r31, r3, 0x58
mr r4, r30
addi r3, r1, 0xa
bl TMCJPEGDEC_get_wbyte
cmpwi r3, 0
bge _parse_dqt_have_length
b _parse_dqt_return
_parse_dqt_have_length:
lhz r3, 0xa(r1)
addi r29, r1, 0x10
li r27, 1
lis r28, TMCJPEGDEC_Zigzag_data@ha
addi r0, r3, -2
sth r0, 0xa(r1)
_parse_dqt_table:
lhz r5, 0xa(r1)
mr r4, r30
addi r3, r1, 9
addi r0, r5, -0x41
sth r0, 0xa(r1)
bl TMCJPEGDEC_get_byte
cmpwi r3, 0
bge _parse_dqt_have_qt_info
b _parse_dqt_return
_parse_dqt_have_qt_info:
lbz r0, 9(r1)
cmplwi r0, 4
ble _parse_dqt_valid_qt_info
li r3, -0x41
b _parse_dqt_return
_parse_dqt_valid_qt_info:
add r3, r31, r0
addi r26, r28, TMCJPEGDEC_Zigzag_data@l
stb r27, 0x1790(r3)
li r25, 0
_parse_dqt_coeff:
lbz r24, 0(r26)
cmpwi r24, 0x3f
ble _parse_dqt_valid_coeff
li r3, -0x41
b _parse_dqt_return
_parse_dqt_valid_coeff:
mr r4, r30
addi r3, r1, 8
bl TMCJPEGDEC_get_byte
cmpwi r3, 0
bge _parse_dqt_have_coeff
b _parse_dqt_return
_parse_dqt_have_coeff:
slwi r4, r24, 2
lbz r3, 9(r1)
add r0, r4, r31
lbz r5, 8(r1)
lwzx r4, r29, r4
slwi r3, r3, 8
mullw. r4, r5, r4
stwx r4, r3, r0
bne _parse_dqt_nonzero
li r3, -0x41
b _parse_dqt_return
_parse_dqt_nonzero:
addi r25, r25, 1
addi r26, r26, 1
cmpwi r25, 0x40
blt _parse_dqt_coeff
lhz r0, 0xa(r1)
cmpwi r0, 0
bne _parse_dqt_table
li r3, 0
_parse_dqt_return:
lmw r24, 0x110(r1)
lwz r0, 0x134(r1)
mtlr r0
addi r1, r1, 0x130
blr
}
#else
static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
typedef struct {
u32 data[64];
} CopyBlock64;
typedef struct { u32 coefficients[4][64]; } QuantizationTables;
QuantizationTables* scaleInfo;
u32 tblCopy[64];
u8* scaleInfo;
u32 tblCopy[65];
u32* tblPtr;
u32* d;
u16 len;
s32 r;
d = tblCopy;
*(CopyBlock64*)d = *(CopyBlock64*)lbl_8161E080;
*(CopyBlock64*)(d + 1) = *(CopyBlock64*)lbl_8161E080;
scaleInfo = (QuantizationTables*)&work->scaleFlag;
scaleInfo = (u8*)work + 0x58;
r = TMCJPEGDEC_get_wbyte(&len, work);
if (r < 0) {
@@ -1434,6 +1543,8 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
}
len -= 2;
tblPtr = &tblCopy[1];
do {
u8 qtInfo;
const u8* zigPtr;
@@ -1452,10 +1563,11 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
return -0x41;
}
((TMCUnknownInfo*)scaleInfo)->quantTblFlag[qtInfo] = 1;
scaleInfo[qtInfo + 0x1790] = 1; // quantTblFlag[0..3]
zigPtr = TMCJPEGDEC_Zigzag_data;
for (zzIdx = 0; zzIdx < 64; zzIdx++) {
u32 tmp;
zz = *zigPtr;
if (zz > 0x3F) {
@@ -1467,8 +1579,9 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
return r;
}
val = (u32)byte * tblCopy[zz];
scaleInfo->coefficients[qtInfo][zz] = val;
tmp = (zz << 2) + ((u32)qtInfo << 8);
val = (u32)byte * tblPtr[zz];
*(u32*)(tmp + scaleInfo) = val;
if (val == 0) {
return -0x41;
}
@@ -1479,6 +1592,7 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
return 0;
}
#endif
#ifdef __MWERKS__
static asm s32 TMCJPEGDEC_parse_sof(register TMCCJPEGDecWork* work) {

View File

@@ -205,8 +205,8 @@ static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
yEnd = y + height;
rowSkip = 32 - width;
for (; row < yEnd; row++) {
output = lumaTexture + ((row & 3) << 3);
tileRow = (row >> 2) * tileWidth;
output = lumaTexture + ((row & 3) << 3);
for (column = x; column < xEnd; column += 4) {
(output + (column & 7))[(s32)(((column >> 3) + tileRow) << 5)] = luminance[0];
(output + ((column + 1) & 7))[(s32)((((column + 1) >> 3) + tileRow) << 5)] = luminance[1];

View File

@@ -142,9 +142,6 @@ typedef struct ziFuzzyZYPairs {
int rANDn : 1;
int bANDp : 1;
int gANDk : 1;
int dANDt : 1;
int reserved : 20;
} ziFuzzyZYPairs;
typedef struct _ziGetParam {
@@ -360,8 +357,8 @@ typedef struct ziMatchParam {
ziWChar first2; // 0x68
ziWChar comp; // 0x6A
ziU8 nSeg; // 0x6C
ziU8 segs1[16][12]; // 0x6D
ziU8 segsD[16][12]; // 0x12D
ziU8 segs1[0xC0]; // 0x6D
ziU8 segsD[0xC0]; // 0x12D
ziU8 pad_0x1ED; // 0x1ED
} ziMatchParam;

View File

@@ -67,11 +67,12 @@ ziWChar Zi8ConvertUC2WC(ziChar character, ziU8 language ZI_NEED_WORK) {
return mapped[character - defaults->first];
}
ziChar Zi8ConvertWC2UC(ziWChar character, ziU8 language ZI_NEED_WORK) {
ziU16 index, count, value, first, last;
ziU8* cursor;
ziU16 index, count, first, last, value;
ziConversionTable* table;
const ziConversionRangeTable* defaults;
ziConversionRange* ranges;
ziConversionEntry* entry;
ziU8* cursor;
if (character == 0) {
Zi8LogError(0x133, __zi8_work_data);
return 0;
@@ -82,109 +83,94 @@ ziChar Zi8ConvertWC2UC(ziWChar character, ziU8 language ZI_NEED_WORK) {
Zi8LogError(0x6AE, __zi8_work_data);
return 0;
}
entry = (ziConversionEntry*)table;
count = (ziU16)entry->first[0] << 8 | entry->first[1];
entry++;
entry = table->entries;
count = (ziU16)table->count[0] << 8 | table->count[1];
for (index = 0; index < count; index++) {
first = (ziU16)entry->first[0] << 8 | entry->first[1];
first = ((ziU16)entry->first[0] << 8 | entry->first[1]);
last = (ziU16)entry->last[0] << 8 | entry->last[1];
if (character < first || character > last) {
entry++;
continue;
}
value = (ziU16)entry->value[0] << 8 | entry->value[1];
if (first == last) {
if (first <= character && character <= last) {
value = ((ziU16)entry->value[0] << 8 | entry->value[1]);
if (first == last) {
Zi8LogError(100, __zi8_work_data);
return value & 0xFF;
}
Zi8LogError(100, __zi8_work_data);
return value & 0xFF;
return ((ziU8*)table->entries)[character + value - first];
}
entry = (ziConversionEntry*)((ziU8*)table + value + character - first + 8);
Zi8LogError(100, __zi8_work_data);
return *(ziU8*)entry;
entry++;
}
Zi8LogError(0x6C2, __zi8_work_data);
return 0;
} else {
ranges = Zi8CvrtTables.reverse.entries;
if (ranges == 0) {
defaults = &Zi8CvrtTables.reverse;
if (defaults == 0) {
Zi8LogError(0x6AE, __zi8_work_data);
return 0;
}
count = Zi8CvrtTables.reverse.count;
for (index = 0; index < count; index++) {
if (character >= ranges[index].first && character <= ranges[index].last) {
ranges = defaults->entries;
for (index = 0; index < defaults->count; index++) {
if (ranges[index].first <= character && character <= ranges[index].last) {
Zi8LogError(100, __zi8_work_data);
if (ranges[index].first == ranges[index].last)
return ranges[index].result.character & 0xFF;
cursor = ranges[index].result.table;
return cursor[character - ranges[index].first];
if (ranges[index].first == ranges[index].last) return ranges[index].result.character & 0xFF;
return ((ziU8*)ranges[index].result.table)[character - ranges[index].first];
}
}
Zi8LogError(0x6C2, __zi8_work_data);
return 0;
}
Zi8LogError(0x6C2, __zi8_work_data);
return 0;
}
ziWChar Zi8ConvertUC2Key(ziChar character, ziU8 language ZI_NEED_WORK) {
ziU16 key = 0;
ziU16 index, count, first, last;
ziU16 count, index, first, last;
ziU32 key = 0;
ziConversionTable* table;
ziWChar* mapped;
const ziConversionRangeTable* defaults;
ziConversionRange* ranges;
ziConversionEntry* entry;
ziU8* cursor;
if (character == 0) {
Zi8LogError(0x133, __zi8_work_data);
return 0;
}
if (ZI_WORK->userKeys[language] != 0)
return Zi8ConvertUC2UserKey(character, language, __zi8_work_data);
if (ZI_WORK->userKeys[language] != 0) return Zi8ConvertUC2UserKey(character, language, __zi8_work_data);
if (Zi8GetTableCount(language, 8, __zi8_work_data) != 0) {
table = Zi8GetTableAddress(language, 8, __zi8_work_data);
if (table == 0) {
Zi8LogError(0x6B8, __zi8_work_data);
return 0;
}
entry = (ziConversionEntry*)table;
count = (ziU16)entry->first[0] << 8 | entry->first[1];
entry++;
entry = table->entries;
count = (ziU16)table->count[0] << 8 | table->count[1];
for (index = 0; index < count; index++) {
first = (ziU16)entry->first[0] << 8 | entry->first[1];
first = ((ziU16)entry->first[0] << 8 | entry->first[1]);
last = (ziU16)entry->last[0] << 8 | entry->last[1];
if (character < first || character > last) {
entry++;
continue;
if (first <= character && character <= last) {
key = ((ziU16)entry->value[0] << 8 | entry->value[1]);
if (first != last) {
cursor = (ziU8*)table->entries + key + (character - first) * 2;
key = (ziU16)cursor[0] << 8 | cursor[1];
}
break;
}
key = (ziU16)entry->value[0] << 8 | entry->value[1];
if (first == last) break;
entry = (ziConversionEntry*)((ziU8*)table + key + (character - first) * 2);
entry = (ziConversionEntry*)((ziU8*)entry + 8);
key = (ziU16)entry->first[0] << 8 | entry->first[1];
break;
entry++;
}
} else {
ranges = Zi8CvrtTables.keys.entries;
if (ranges == 0) {
defaults = &Zi8CvrtTables.keys;
if (defaults == 0) {
Zi8LogError(0x6B8, __zi8_work_data);
return 0;
}
count = Zi8CvrtTables.keys.count;
for (index = 0; index < count; index++) {
if (character >= ranges[index].first && character <= ranges[index].last) {
if (ranges[index].first == ranges[index].last) {
key = (ziU8)ranges[index].result.character;
break;
}
mapped = ranges[index].result.table;
key = mapped[character - ranges[index].first];
ranges = defaults->entries;
for (index = 0; index < defaults->count; index++) {
if (ranges[index].first <= character && character <= ranges[index].last) {
if (ranges[index].first == ranges[index].last) key = ranges[index].result.character & 0xFF;
else key = ((ziWChar*)ranges[index].result.table)[character - ranges[index].first];
break;
}
}
}
if (key == 0) {
Zi8LogError(0x6C2, __zi8_work_data);
return 0xEFF1;
} else {
Zi8LogError(100, __zi8_work_data);
return key;
}
key = 0xEFF1;
} else Zi8LogError(100, __zi8_work_data);
return key;
}
ziWChar Zi8ConvertWC2Key(ziWChar character, ziU8 language ZI_NEED_WORK) {
return Zi8ConvertUC2Key(Zi8ConvertWC2UC(character, language, __zi8_work_data), language, __zi8_work_data);

View File

@@ -269,10 +269,10 @@ Zi8UInt Zi8SpellingZY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
{
Zi8UInt length = 0;
ziU16 initialIndex = (ziU16)(((key & 0xffff) >> 9) & 0x3f);
ziU16 finalIndex = (ziU16)(((key & 0xffff) >> 3) & 0x3f);
volatile ziU16 tone = (ziU16)(key & 7);
ziU16 tone = (ziU16)(key & 7);
Zi8UInt length = 0;
output[0] = zi8PYinitialSpelling[initialIndex][0];
output[1] = zi8PYinitialSpelling[initialIndex][1];
@@ -311,7 +311,7 @@ Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
return length;
}
ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFull,ziU8 usePinyin,ziU8 tone)
ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFull,ziU8 usePinyin,Zi8UInt tone)
{
ziU16 spelling[16];
Zi8UInt spellingLength;
@@ -330,7 +330,7 @@ ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFul
if ((requireFull != 0) && ((inputLength & 0xff) != (spellingLength & 0xff))) {
return 0;
}
if ((tone == 0) && ((inputLength & 0xff) > (spellingLength & 0xff))) {
if (((tone & 0xff) == 0) && ((inputLength & 0xff) > (spellingLength & 0xff))) {
switch (input[(inputLength & 0xff) - 1]) {
case 0xeff1:
case 0xeff2:
@@ -943,7 +943,8 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
*output |= 0xf300;
output++;
} else {
*output++ = 0xf360;
*output = 0xf360;
output++;
}
}
tableIndex++;

View File

@@ -305,7 +305,7 @@ ziU8 Zi8LangSupported(ziU8 language, ziPtr work);
ziU8 Zi8MatchOEMdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
ziU8 Zi8MatchPUDdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
ziU8 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziBool reservedMode, ziBool exactLength, ziPtr work);
ziU8 Zi8MatchUWDdata(ziWChar* elements, ziU8 count, ziWChar* currentWord, ziU16 currentLength, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
ziU8 Zi8MatchUWDdata(ziWChar* elements, ziU8 count, ziWChar* currentWord, ziU8 currentLength, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
void Zi8Memset(ziPtr destination, ziU32 value, ziU32 count);
ziU16 Zi8WCharCount(ziWChar* word, ziPtr work);
ziBool Zi8ZHCheckSpelling(ziWChar* word, ziWChar* elements, ziU8 count, ziPtr work);
@@ -414,12 +414,7 @@ int Zi8AlphaGetCandidates(ziGetParam* parameters, ziPtr optionData, ziPtr workDa
phoneticInput = ZI8_TRUE;
for (elementIndex = 0; elementIndex < elementCount; elementIndex++) {
normalizedElements[elementIndex] = elements[elementIndex];
switch ((int)elements[elementIndex]) {
case 0xf331:
case 0xf332:
case 0xf333:
case 0xf334:
case 0xf335:
if ((int)elements[elementIndex] < 0xf336 && (int)elements[elementIndex] >= 0xf331) {
phoneticSeparator = ZI8_TRUE;
phoneticInput = ZI8_FALSE;
if ((language == 0x7d) || ((language == 0x79 || (language == 0x7a)))) {
@@ -892,7 +887,7 @@ selectDictionary:
if ((((matchMode == 0) && (currentVowelRestriction)) &&
((2 < (int)elementCount &&
((((ZiAlphaWork*)workData)->language == language &&
(((ZiAlphaWork*)workData)->prefixCount == elementCount - 1)))))) &&
((unsigned int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 1)))))) &&
(elements[elementCount - 1] == 0xeff1)) {
wordLength = 0;
}
@@ -947,15 +942,15 @@ selectDictionary:
}
if (wordLength != 0) goto filterVowelCandidate;
dictionaryStatus[dictionaryKind] = 1;
if (elements[apostropheIndex] >= 0xEFF1) goto retryDictionary;
goto finishDictionaryPass;
if (elements[apostropheIndex] < 0xEFF1) goto finishDictionaryPass;
goto retryDictionary;
}
filterVowelCandidate:
if ((wordLength != 0) && (prefixVowelRestriction)) {
if ((*wordCursor >= 0x30) && (*wordCursor <= 0x39)) {
wordLength = 0;
} else {
if (((elementCount == 1) && (dictionaryKind != 10)) && (*wordCursor >= 0xeff1)) {
if (((elementCount == 1) && (dictionaryKind != 10)) && (0xeff0 < *wordCursor)) {
punctuationCandidate = ZI8_TRUE;
goto finishDictionaryPass;
}
@@ -1022,59 +1017,67 @@ filterVowelCandidate:
}
break;
case 10:
if ((*wordCursor = *punctuationCursor) != 0) {
punctuationCursor++;
index = *punctuationCursor;
*wordCursor = index;
if (index == 0) {
wordLength = 0;
}
else {
punctuationCursor = punctuationCursor + 1;
wordLength = 1;
} else {
wordLength = 0;
}
break;
case 11:
if (prefixCount != 0) break;
if (retryPunctuation) {
for (index = 0; index < parameters->elementCount - 1; index++) {
wordCursor[index] = ((ZiAlphaWork*)workData)->prefix[index];
if (wordCursor[index] == 0) break;
case 0xb:
if (prefixCount == 0) {
if (retryPunctuation) {
for (index = 0;
index < parameters->elementCount - 1; index++) {
wordCursor[index] = ((ZiAlphaWork*)workData)->prefix[index];
if (wordCursor[index] == 0) break;
}
if (index < (int)(parameters->elementCount - 1)) {
wordLength = 0;
}
else {
appendPunctuation:
wordLength = index + 1;
wordCursor[index] = *punctuationCursor;
if (wordCursor[index] == 0) {
wordLength = 0;
}
else {
punctuationCursor = punctuationCursor + 1;
}
}
}
if (index < parameters->elementCount - 1) {
else {
for (index = 0;
index < ((ZiAlphaWork*)workData)->rememberedCount; index++) {
wordCursor[index] = ((ZiAlphaWork*)workData)->rememberedWord[index];
if (wordCursor[index] == 0) break;
}
if ((int)(unsigned int)((ZiAlphaWork*)workData)->rememberedCount <= index) goto appendPunctuation;
wordLength = 0;
break;
}
} else {
for (index = 0; index < ((ZiAlphaWork*)workData)->rememberedCount; index++) {
wordCursor[index] = ((ZiAlphaWork*)workData)->rememberedWord[index];
if (wordCursor[index] == 0) break;
}
if (index < ((ZiAlphaWork*)workData)->rememberedCount) {
wordLength = 0;
break;
}
}
if ((wordCursor[index++] = *punctuationCursor) != 0) {
punctuationCursor++;
wordLength = index;
} else {
wordLength = 0;
}
break;
}
dictionaryStatus[dictionaryKind] = 1;
if (wordLength == 0) {
dictionaryStatus[dictionaryKind] = 2;
if ((((((((ZiAlphaWork*)workData)->prefixEnabled != '\0') && (!retryPunctuation)) && (parameters->elementCount != 0)) &&
((((ZiAlphaWork*)workData)->requiredLength >= parameters->elementCount - 1 &&
(((int)(parameters->elementCount - 1) <= (int)(unsigned int)((ZiAlphaWork*)workData)->requiredLength &&
(parameters->elements[parameters->elementCount - 1] == 0xEFF1)))) &&
(((((ZiAlphaWork*)workData)->prefixEnabled != '\x01' ||
(((ZiAlphaWork*)workData)->requiredLength != parameters->elementCount)) &&
(((((ZiAlphaWork*)workData)->prefixLength == '\0' ||
(((ZiAlphaWork*)workData)->prefixLength + 1 >= parameters->elementCount)) && (dictionaryExact != 0)))
((unsigned int)parameters->elementCount <= ((ZiAlphaWork*)workData)->prefixLength + 1)) && (dictionaryExact != 0)))
))) && ((((completionAllowed && (prefixCount == 0)) && (dictionaryKind != 0xb)) &&
((((int)dictionaryIndex < (int)(unsigned int)((ZiAlphaWork*)workData)->dictionaryCount &&
(((ZiAlphaOptions*)optionData)->lookupMode == '\0')) &&
(((ZiAlphaWork*)workData)->dictionaries[language] == 0)))))) {
if (language != ((ZiAlphaWork*)workData)->language) break;
index = ((ZiAlphaWork*)workData)->dictionaryKinds[dictionaryIndex + 1];
if (index == 0xc || (index < 9 && index >= 5)) {
if ((index == 0xc) || (((index < 0xc && (index < 9)) && (4 < index)))) {
if (Zi8getKeyLayout(language,0xeff1,&punctuationBuffer[0],1,workData) == 0) {
punctuationBuffer[0] = 0;
}
@@ -1086,10 +1089,10 @@ filterVowelCandidate:
}
if ((((((dictionaryExact == 0) || (!completionAllowed)) || (prefixCount != 0)) ||
((dictionaryKind == 0xb ||
(dictionaryIndex >= ((ZiAlphaWork*)workData)->dictionaryCount)))) ||
(elements == 0)) ||
((int)(unsigned int)((ZiAlphaWork*)workData)->dictionaryCount <= (int)dictionaryIndex)))) ||
(elements == (ziU16 *)0x0)) ||
((((elementCount == 0 || (elements[elementCount - 1] != 0xeff1)) ||
((((ZiAlphaWork*)workData)->rememberedCount != parameters->elementCount - 1 ||
(((unsigned int)((ZiAlphaWork*)workData)->rememberedCount != parameters->elementCount - 1 ||
(((((ZiAlphaWork*)workData)->rememberedWord[0] == 0 || (((ZiAlphaOptions*)optionData)->lookupMode != '\0')) ||
(((ZiAlphaWork*)workData)->dictionaries[language] != 0)))))) ||
(languagePassCount == 2)))) break;
@@ -1101,7 +1104,7 @@ filterVowelCandidate:
punctuationCursor = &punctuationBuffer[0];
dictionaryKind = 0xb;
}
else if (((ZiAlphaOptions*)optionData)->minWordLength <= wordLength) {
else if ((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->minWordLength <= (int)wordLength) {
if (prefixVowelRestriction) {
if (*wordCursor >= 0x30 && *wordCursor <= 0x39) goto retryDictionary;
if (language == 0x2f) {
@@ -1116,15 +1119,15 @@ filterVowelCandidate:
{
prepareCandidate:
if (((elementCount == 1) && (dictionaryKind != 10)) &&
((*wordCursor >= 0xeff1 && *wordCursor <= 0xf010))) {
((0xeff0 < *wordCursor && (*wordCursor < 0xf011)))) {
punctuationCandidate = ZI8_TRUE;
break;
}
wordCursor[wordLength] = 0;
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)wordLength > (int)elementCount))
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)elementCount < (int)wordLength))
{
wordLength = elementCount;
wordCursor[wordLength] = 0;
wordCursor[elementCount] = 0;
}
wordLength = (ziU16)Zi8DeTokenization(wordCursor,wordLength & 0xffff,wordCapacity & 0xffff,language);
if (((phoneticInput) && ((unsigned int)parameters->elementCount < (wordLength & 0xff))) &&
@@ -1136,39 +1139,35 @@ prepareCandidate:
((Zi8ZHCheckSpelling(wordCursor,parameters->elements,parameters->elementCount,
workData)) != '\0')) {
if ((((ZiAlphaWork*)workData)->caseMode != '\0') && ((!phoneticInput && (!phoneticSeparator)))) {
Zi8ChangeWordCase(wordCursor - prefixCount,language,workData);
Zi8ChangeWordCase(wordCursor + -prefixCount,language,workData);
}
if ((((ZiAlphaOptions*)optionData)->suffixOnly != '\0') &&
((int)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount))) {
wordLength = ((ZiAlphaOptions*)optionData)->maxWordLength - prefixCount;
((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount))) {
wordLength = (ziU8)((ZiAlphaOptions*)optionData)->maxWordLength - prefixCount;
wordCursor[wordLength] = 0;
}
if (((int)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount)) ||
((Zi8IsDupWordW(wordCursor - prefixCount,wordLength + prefixCount & 0xff,
if (((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount)) ||
((Zi8IsDupWordW(wordCursor + -prefixCount,wordLength + prefixCount & 0xff,
workData)) != '\0')) {
if ((prefixCount != 0) && (((ZiAlphaOptions*)optionData)->maxWordLength <= prefixCount)) break;
if ((prefixCount != 0) && ((ziU8)((ZiAlphaOptions*)optionData)->maxWordLength <= prefixCount)) break;
}
else {
if ((((keyLayoutCount == 0) || (((ZiAlphaOptions*)optionData)->lookupMode != '\0')) ||
((int)(wordLength + prefixCount) <= 1)) ||
((int)(wordLength + prefixCount) < 2)) ||
(0x40 < (int)(wordLength + prefixCount))) goto emitCandidate;
switch (dictionaryKind) {
case 5:
case 1:
case 9:
if (dictionaryKind == 5) {
checkKeyLayout:
keyLayoutCursor = keyLayout;
candidateCharacterCount = wordLength + prefixCount;
for (index = 0; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
if (*keyLayoutCursor < candidateCharacterCount) {
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
} else {
if (*keyLayoutCursor++ > candidateCharacterCount) {
if (candidateCharacterCount <= *keyLayoutCursor) {
if (candidateCharacterCount < *keyLayoutCursor++) {
index = (unsigned int)keyLayoutCount;
}
break;
}
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
}
if ((int)index < (int)(unsigned int)keyLayoutCount) {
for (elementIndex = 0; (int)elementIndex < (int)(unsigned int)candidateCharacterCount;
@@ -1176,31 +1175,32 @@ checkKeyLayout:
candidateBytes[elementIndex] = Zi8ConvertWC2UC(wordCursor[elementIndex - prefixCount],language,workData);
}
for (; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
elementIndex = 0;
while (elementIndex < candidateCharacterCount) {
if (candidateBytes[elementIndex] != keyLayoutCursor[elementIndex]) break;
elementIndex++;
for (elementIndex = 0;
((int)elementIndex < (int)(unsigned int)candidateCharacterCount &&
(candidateBytes[elementIndex] == keyLayoutCursor[elementIndex]));
elementIndex = elementIndex + 1) {
}
if (elementIndex == candidateCharacterCount) {
wordCursor[-prefixCount] = 0;
goto retryDictionary;
}
keyLayoutCursor += candidateCharacterCount;
if (*keyLayoutCursor++ > candidateCharacterCount) break;
if (candidateCharacterCount < *keyLayoutCursor++) break;
}
}
break;
default:
break;
}
else if (dictionaryKind < 5) {
if (dictionaryKind == 1) goto checkKeyLayout;
}
else if (dictionaryKind == 9) goto checkKeyLayout;
emitCandidate:
if (firstCandidate == 0) {
if (((ZiAlphaOptions*)optionData)->countOnly != '\0') {
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
if ((int)((ZiAlphaOptions*)optionData)->shortestWord > (int)(wordLength + prefixCount)) {
if ((int)(wordLength + prefixCount) < (int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->shortestWord) {
((ZiAlphaOptions*)optionData)->shortestWord = wordLength + prefixCount;
}
if ((int)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
if ((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
((ZiAlphaOptions*)optionData)->longestWord = wordLength + prefixCount;
}
}
@@ -1224,17 +1224,23 @@ emitCandidate:
} else {
if (((((ZiAlphaWork*)workData)->suffixMode == '\0') && (wordCursor[1] == 0)) &&
(candidateCount == 0)) {
if (*wordCursor >= 0xeff1 && *wordCursor <= 0xf010) {
((ZiAlphaWork*)workData)->singleCharacter = 0;
}
else {
if ((*wordCursor < 0xeff1) || (0xf010 < *wordCursor)) {
((ZiAlphaWork*)workData)->singleCharacter = *wordCursor;
}
else {
((ZiAlphaWork*)workData)->singleCharacter = 0;
}
}
if (dictionaryExact != 0 &&
parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount &&
(parameters->maxCandidates == 1 ||
(candidateCount == 0 && parameters->firstCandidate == 0))) {
if (((dictionaryExact == 0) || (parameters->elementCount != ((ZiAlphaWork*)workData)->rememberedCount))
|| ((parameters->maxCandidates != 1 &&
((candidateCount != 0 || (parameters->firstCandidate != 0)))))) {
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
&& ((parameters->maxCandidates == 1 ||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
}
}
else {
for (index = 0; (int)index < (int)prefixCount; index = index + 1) {
((ZiAlphaWork*)workData)->rememberedWord[index]
= wordCursor[index - prefixCount];
@@ -1245,13 +1251,6 @@ emitCandidate:
}
((ZiAlphaWork*)workData)->rememberedWord[index + prefixCount] = 0;
}
else {
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
&& ((parameters->maxCandidates == 1 ||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
}
}
if ((((ZiAlphaWork*)workData)->suffixMode == '\0') &&
((((((dictionaryKind == 1 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 1) != 0)) ||
((dictionaryKind == 3 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 2) != 0)))) ||
@@ -1314,7 +1313,7 @@ emitCandidate:
}
else {
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
wordCursor = wordCursor - prefixCount;
wordCursor = wordCursor + -prefixCount;
wordCapacity = wordCapacity + prefixCount;
wordLength += prefixCount;
for (index = 0; parameters->elementCount + index < wordLength; index++) {
@@ -1436,7 +1435,7 @@ finishDictionaryPass:;
if ((completionAllowed) &&
((((((ZiAlphaWork*)workData)->suffixMode == '\0' && (2 < (int)elementCount)) &&
(elements[elementCount - 2] == 0xeff1)) &&
((int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
((unsigned int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
((ZiAlphaWork*)workData)->prefixElementCount = ((ZiAlphaWork*)workData)->prefixCount + '\x01';
((ZiAlphaWork*)workData)->suffixMode = 1;
}
@@ -1444,58 +1443,19 @@ finishDictionaryPass:;
prefixPrepared = ZI8_TRUE;
goto preparePrefix;
}
if (!((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
if ((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
((((ZiAlphaWork*)workData)->suffixLocked == '\0' && (2 < (int)elementCount)))) &&
(((elements[elementCount - 2] == 0xeff1 &&
((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
(((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0'))))))) {
tryAlternatePrefix:
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
if (language == parameters->language) {
if (primaryMatched) {
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
}
else if (secondaryMatched) {
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
wordCursor -= prefixCount;
elements -= prefixCount;
elementCount = elementCount + prefixCount;
wordCapacity = wordCapacity + prefixCount;
prefixCount = 0;
prefixPrepared = ZI8_FALSE;
((ZiAlphaWork*)workData)->suffixMode = 0;
((ZiAlphaWork*)workData)->suffixLocked = 0;
((ZiAlphaWork*)workData)->suffixCount = 0;
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
((ZiAlphaWork*)workData)->prefix[index] =
((ZiAlphaWork*)workData)->alternatePrefix[index];
}
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
if (((ZiAlphaWork*)workData)->language == parameters->language) {
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
}
else {
((ZiAlphaWork*)workData)->language = parameters->language;
}
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
}
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
goto finishCandidates;
if (completionAllowed) goto checkPrefixPunctuation;
} else {
((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
(((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0')))))) {
if ((((ZiAlphaWork*)workData)->prefixEnabled == '\0') || (elements[elementCount - 1] != 0xeff1)) {
if ((!primaryMatched) && (!secondaryMatched)) {
((ZiAlphaWork*)workData)->suffixLocked = 1;
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount - 1;
if (prefixCount != 0) {
wordCursor -= prefixCount;
elements -= prefixCount;
wordCursor = wordCursor + -prefixCount;
elements = elements + -prefixCount;
elementCount = elementCount + prefixCount;
wordCapacity = wordCapacity + prefixCount;
prefixCount = 0;
@@ -1520,8 +1480,8 @@ checkPrefixPunctuation:
((((Zi8GetTableCount(language,0x1f,workData)) & 8) == 0 &&
(parameters->elements[parameters->elementCount - 1] != 0xEFF1)))))) {
if (prefixPrepared) {
wordCursor -= prefixCount;
elements -= prefixCount;
wordCursor = wordCursor + -prefixCount;
elements = elements + -prefixCount;
elementCount = elementCount + prefixCount;
wordCapacity = wordCapacity + prefixCount;
prefixCount = 0;
@@ -1529,7 +1489,7 @@ checkPrefixPunctuation:
if (((ZiAlphaWork*)workData)->suffixLocked != '\0') {
((ZiAlphaWork*)workData)->previousSuffixCount = ((ZiAlphaWork*)workData)->suffixElementCount;
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount;
elementIndex = (int)((ZiAlphaWork*)workData)->prefixCount + (int)((ZiAlphaWork*)workData)->suffixCount;
elementIndex = (unsigned int)((ZiAlphaWork*)workData)->prefixCount + (unsigned int)((ZiAlphaWork*)workData)->suffixCount;
if (elements[elementIndex] != 0xEFF1 && Zi8IsAlphaPunct(elements[elementIndex]) != 0) {
((ZiAlphaWork*)workData)->suffix[((ZiAlphaWork*)workData)->suffixCount++] = elements[elementIndex];
} else {
@@ -1559,6 +1519,46 @@ checkPrefixPunctuation:
goto preparePrefix;
}
}
else {
tryAlternatePrefix:
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
if (language == parameters->language) {
if (primaryMatched) {
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
}
else if (secondaryMatched) {
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
wordCursor = wordCursor + -prefixCount;
elements = elements + -prefixCount;
elementCount = elementCount + prefixCount;
wordCapacity = wordCapacity + prefixCount;
prefixCount = 0;
prefixPrepared = ZI8_FALSE;
((ZiAlphaWork*)workData)->suffixMode = 0;
((ZiAlphaWork*)workData)->suffixLocked = 0;
((ZiAlphaWork*)workData)->suffixCount = 0;
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
((ZiAlphaWork*)workData)->prefix[index] =
((ZiAlphaWork*)workData)->alternatePrefix[index];
}
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
if (((ZiAlphaWork*)workData)->language == parameters->language) {
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
}
else {
((ZiAlphaWork*)workData)->language = parameters->language;
}
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
}
}
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
goto finishCandidates;
if (completionAllowed) goto checkPrefixPunctuation;
}
if (!completionAllowed && ((ZiAlphaWork*)workData)->suffixMode == 0 && ((ZiAlphaWork*)workData)->prefixCount != 0 &&
elementCount > 2 && ((ZiAlphaWork*)workData)->prefixCount == elementCount - 1 &&
Zi8IsAlphaPunct(parameters->elements[((ZiAlphaWork*)workData)->prefixCount - 1]) != 0) goto checkPrefixFields;
@@ -1618,7 +1618,7 @@ finishCandidates:
} else {
wordCursor = 0;
}
if (wordCursor) {
if (wordCursor != (ziU16 *)0x0) {
Zi8SetHighlightedWordW(wordCursor,parameters->language,parameters->subLanguage,workData);
}
}
@@ -1634,7 +1634,8 @@ finishCandidates:
countIndex = ((ZiAlphaWork*)workData)->dictionaryCount - 1;
}
for (; countIndex >= 1; countIndex = countIndex - 1) {
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] -=
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] =
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] -
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex - 1];
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -643,7 +643,7 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
{
int strokeIndex;
int outputCount;
volatile int extraCount;
int extraCount;
outputCount = 0;
Zi8LogError(100, work);
@@ -660,7 +660,8 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
goto lowStroke;
}
badStroke:
outputBuffer[(ziU8)--outputCount] = 0;
outputCount--;
outputBuffer[(ziU8)outputCount] = 0;
return outputCount;
lowStroke:
outputBuffer[(ziU8)outputCount] = zi8StrokeCode(strokes[strokeIndex] & 0xf, work);

View File

@@ -89,12 +89,7 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
ZI_WORK->unk_0x310 = (ziU32)table + section->offset[0] * 0x100 + section->offset[1];
ZI_WORK->unk_0x318 = 0;
}
for (;;) {
entry = (ziU8*)ZI_WORK->unk_0x310;
if (entry == 0) {
Zi8LogError(0x4B3, __zi8_work_data);
return 0;
}
while ((entry = (ziU8*)ZI_WORK->unk_0x310) != 0) {
while ((ziS32)ZI_WORK->unk_0x318 < (ziS32)ZI_WORK->unk_0x314) {
word = entry + 1;
wordSize = *entry;
@@ -163,6 +158,8 @@ next:
fallback = 1;
ZI_WORK->unk_0x318 = 0;
}
Zi8LogError(0x4B3, __zi8_work_data);
return 0;
}
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
ziU32 result;
@@ -170,12 +167,11 @@ ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* out
for (;;) {
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
if ((ziU8)result != 0) break;
if (++ZI_WORK->pudCount <= 16) {
continuation = 0;
} else {
if ((ZI_WORK->pudCount = ZI_WORK->pudCount + 1) > 16) {
ZI_WORK->pudCount = 1;
break;
}
continuation = 0;
}
return result;
}

View File

@@ -45,7 +45,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
if (candidate->length == length) {
position = 0;
while (position < length) {
if (candidate->text[position] != word->text[position]) break;
if ((ziU8)candidate->text[position] != (ziU8)word->text[position]) break;
position++;
}
if (position == length) {
@@ -56,7 +56,8 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
previous = current;
current = current->next;
}
length = ZI_WORK->uwdCount++;
length = ZI_WORK->uwdCount;
ZI_WORK->uwdCount = length + 1;
added = &ZI_WORK->uwdNodes[length];
if (previous == 0) {
ZI_WORK->uwdList = added;
@@ -90,11 +91,8 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
ziWChar folded;
int fallback = 0;
int visited = 0;
int prefixLength;
int position, previousOffset;
ziU32 size;
ziU8 entryLanguage;
ziU32 entryLength;
int position, prefixLength, previousOffset;
ziU32 size, entryLanguage, entryLength;
ziU8* cursor;
ziU8* begin;
ziU8* boundary;
@@ -105,33 +103,18 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
ziUserDictionary* dictionary;
int firstSegment;
Zi8LogError(100, __zi8_work_data);
if (!(ZI_WORK->unk_0x138 <= 2 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
if (!(ZI_WORK->unk_0x138 < 3 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
Zi8ReplaceLastError(0x19C, __zi8_work_data);
return 0;
}
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
if (continuation != 0) {
result = Zi8_814803F4(__zi8_work_data);
entryLength = 0;
if (result != 0) {
entryLanguage = result->language;
entryLength = result->length;
if (entryLength >= capacity) {
Zi8_8148047C(__zi8_work_data);
return 0;
}
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
}
return entryLength;
}
{
if (continuation == 0) {
Zi8_8148047C(__zi8_work_data);
ZI_WORK->unk_0x13C = 0;
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
else {
prefixLength = 0;
for (position = currentLength - 2; currentWord[position] != 0x20 && position >= 0; position--) prefixLength++;
position++;
for (position = currentLength - 2; position >= 0 && currentWord[position] != 0x20; position--) prefixLength++;
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
else {
ZI_WORK->unk_0x140 = 1;
@@ -140,7 +123,7 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
ZI_WORK->unk_0x141[1] = language;
ZI_WORK->unk_0x141[2] = prefixLength;
previousOffset = 4;
for (; prefixLength > 0; prefixLength--, position++) {
for (; ++position, prefixLength > 0; prefixLength--) {
folded = currentWord[position];
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
ZI_WORK->unk_0x184[previousOffset] = 0;
@@ -148,10 +131,12 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data)) Zi8ChangeCharCase(0, &folded, language, __zi8_work_data);
ZI_WORK->unk_0x184[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
}
if (ZI_WORK->unk_0x141[previousOffset++] == 0) {
if (ZI_WORK->unk_0x141[previousOffset] == 0) {
ZI_WORK->unk_0x140 = 0;
previousOffset++;
break;
}
previousOffset++;
}
}
}
@@ -161,8 +146,7 @@ rescan:
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
end = (ziU8*)dictionary + dictionary->end + 7;
cursor = begin;
if (begin < boundary) firstSegment = 1;
else firstSegment = 0;
firstSegment = begin < boundary;
while (firstSegment ? cursor < boundary : cursor < end) {
size = *cursor;
candidate = (ziUserWord*)cursor;
@@ -201,7 +185,7 @@ next:
visited = 0;
goto rescan;
}
if (complete == 1 && length != 0 && continuation == 0) {
if (complete != 0 && length == 1) {
complete = 0;
fallback = 1;
visited = 0;

View File

@@ -22,8 +22,7 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
node += offset;
if (((ziU32)header & 2) != 0) {
if ((*(ziU8*)node & 0x80) != 0) {
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000;
offset += *((ziU8*)node + 2);
offset = *((ziU8*)node + 2) + ((*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000);
} else {
offset = ((ziU32)*(ziU8*)node & 0xffff) * 0x100;
offset += (ziU32)*((ziU8*)node + 1);
@@ -44,7 +43,7 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
ziU8* ZiDAWGGetSibling(ziU8* node) {
ziU16 header;
ziU8* cursor = node;
ziU8* cursor;
ziS32 depth;
ziS32 offset;
@@ -54,29 +53,29 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
if ((header & 4) == 0) {
node = 0;
} else {
cursor = node;
if ((header & 8) != 0) {
if ((node[0] & 0xf) == 0xf) {
node += 2;
cursor = node + 2;
} else {
node += 1;
cursor = node + 1;
}
if ((header & 2) != 0) {
if ((*node & 0x80) == 0) {
node += 2;
if ((*cursor & 0x80) == 0) {
cursor += 2;
} else {
node += 3;
cursor += 3;
}
}
if ((*node & 0x80) != 0) {
node += (*node & 0x7f) * 0x10000 + (ziU32)node[1] * 0x100 +
(ziU32)node[2] + 0x8000;
if ((*cursor & 0x80) == 0) {
node += (ziU32)cursor[1] + (ziU32)*cursor * 0x100;
} else {
node += (ziU16)*node * 0x100 + (ziU32)node[1];
node += (*cursor & 0x7f) * 0x10000 + (ziU32)cursor[1] * 0x100 +
0x8000 + (ziU32)cursor[2];
}
} else {
cursor = node;
do {
header = nodeHeaderTable[cursor[0] >> 4];
if ((cursor[0] & 0xf) == 0xf) {
@@ -90,24 +89,24 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
if ((header & 1) != 0) {
if ((header & 2) == 0) {
depth++;
} else if ((*cursor & 0x80) != 0) {
cursor += 3;
offset += 3;
} else {
} else if ((*cursor & 0x80) == 0) {
cursor += 2;
offset += 2;
} else {
cursor += 3;
offset += 3;
}
}
if ((header & 4) == 0) {
depth--;
} else if ((header & 8) != 0) {
if ((*cursor & 0x80) != 0) {
cursor += 3;
offset += 3;
} else {
if ((*cursor & 0x80) == 0) {
cursor += 2;
offset += 2;
} else {
cursor += 3;
offset += 3;
}
depth--;
}
@@ -164,10 +163,16 @@ ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
result = 0;
pair = (((ziU16)entry[0] << 8) + entry[1]);
if (pair != 0) {
return 0;
goto graph_invalid;
}
pair = (((ziU16)entry[2] << 8) + entry[3]);
if (pair == 0) {
goto graph_valid;
}
graph_invalid:
result = 0;
goto graph_done;
graph_valid:
end = (ziU32)(entry + (((ziU16)entry[4] << 8) + entry[5] + 1) * 10);
entry += 10;
depth = 0;
@@ -177,18 +182,19 @@ ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
}
while (1) {
if (*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8))) {
if (*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8))) {
break;
}
entry += (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10;
if (((ziU32)entry >= end) ||
(*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8)))) {
if ((end <= (ziU32)entry) ||
(*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8)))) {
break;
}
}
if ((ziU32)entry >= end) {
return 0;
if (end <= (ziU32)entry) {
result = 0;
break;
}
result = graph + (ziU32)entry[4] * 0x10000 + ((ziU16)entry[5] << 8) +
@@ -209,7 +215,8 @@ ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
depth++;
keys++;
}
}
graph_done:
return result;
}

View File

@@ -17,7 +17,7 @@ typedef struct ziUserKeys {
typedef struct ziChineseEntry {
ziU8 data[9];
ziU8 offsetHigh;
ziU8 offsetLow[2];
ziU16 offsetLow;
} ziChineseEntry;
ziU8 Zi8GetCandidatesOrCount(ziGetParam*, ziSearchState* ZI_NEED_WORK);
@@ -26,22 +26,19 @@ ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
int count;
int offset;
ziU8 group;
ziU8 remaining;
ziU16 value;
ziU8 remaining, group;
ziU16 value = 0;
ziWChar* cursor;
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
ziSearchState search;
ziGetParam request;
ziWChar ordinals[65];
int length;
ziU32 savedFormats = ZI_WORK->unk_0x1410;
ziU8 savedCount = ZI_WORK->unk_0x1418;
int length, count, offset;
int unmatched;
ziChineseEntry* entry;
ziU8* data;
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
ziU32 savedFormats = ZI_WORK->unk_0x1410;
ziU8 savedCount = ZI_WORK->unk_0x1418;
search.flags = 0;
search.word = 0;
search.length = 0;
@@ -55,7 +52,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
}
if (language != 1) {
for (length = 0; word[length] != 0; length++) {
if (word[length] >= 0xEFF1 || length == 64) return 0;
if (word[length] > 0xEFF0 || length == 64) return 0;
}
((ziU8*)&search.length)[0] = length;
((ziU8*)&search.flags)[2] = 1;
@@ -94,34 +91,21 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
if (language == 1) {
length = 0;
do {
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
if (ordinals[length] == 0xFFFF) return 0;
length++;
if (length == 64) return 0;
} while (word[length] != 0);
{
if (word[length] == 0) {
count = length - 1;
if (length == 1) return 1;
count = --length;
ordinals[count] |= 0x8000;
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | entry->offsetLow);
if (ZI_WORK->unk_0x16 != 0) {
switch (*data & 7) {
case 2:
offset = 2;
break;
case 3:
case 4:
offset = 3;
break;
case 5:
offset = 4;
break;
default:
offset = 1;
break;
}
group = *data & 7;
if (group == 5) offset = 4;
else if (group < 5) {
if (group == 2) offset = 2;
else if (group < 2) offset = 1;
else offset = 3;
} else offset = 1;
data += offset;
}
if ((*data & 0x80) == 0) return 0;
@@ -150,7 +134,11 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
}
Zi8LogError(0x2BD, __zi8_work_data);
return 0;
}
}
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
if (ordinals[length] == 0xFFFF) return 0;
length++;
} while (length != 64);
} else Zi8ReplaceLastError(0x26C, __zi8_work_data);
return 0;
}
@@ -168,9 +156,10 @@ ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {
}
}
found:
if (key >= 32) return 0;
if (key == 0) return 0xEFFA;
if (key >= 1 && key <= 9) return key + 0xEFF0;
if (key <= 31) return key + 0xEFF1;
if (key < 32) {
if (key == 0) return 0xEFFA;
if (key >= 1 && key <= 9) return key + 0xEFF0;
if (key <= 31) return key + 0xEFF1;
}
return 0;
}

View File

@@ -44,12 +44,13 @@ static ziU8 ziNumKeysWithChars(ziU8 language, ziPtr __zi8_work_data) {
}
ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data) {
ziU16 tableCount;
ziU8 numKeys;
ziU16 tableCount;
ziU8* dataAddress;
ziUserKeyMap* customTable;
ziU32 totalCharacters;
ziU16 charCount;
ziU16 keyIndex;
ziU32 keyIndex;
ziWChar* keyChars;
dataAddress = 0;
@@ -92,15 +93,15 @@ tables_ready:
return 0;
}
tableCount = 0;
keyIndex = tableCount;
totalCharacters = 0;
keyIndex = totalCharacters;
for (; (ziU16)keyIndex < key; keyIndex++) {
tableCount += dataAddress[(ziU16)keyIndex];
totalCharacters += dataAddress[(ziU16)keyIndex];
}
if ((charCount = (ziU8)dataAddress[key]) == 0) {
return 0;
}
dataAddress = dataAddress + numKeys + (tableCount * 2);
dataAddress = dataAddress + numKeys + ((totalCharacters & 0xffff) * 2);
keyIndex = 0;
for (; (ziU16)keyIndex < charCount; keyIndex++) {
chars[(ziU16)keyIndex] = (ziU16)dataAddress[(ziU16)keyIndex * 2] |

View File

@@ -23,60 +23,48 @@ ziU8 Zi8DetachOEMdata(ziU8 id ZI_NEED_WORK) {
}
ziU8 Zi8MatchOEMdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* word, ziU16 capacity, ziBool complete, ziBool continuation ZI_NEED_WORK) {
ziWChar folded;
ziS32 index;
ziU8 fallback = 0;
ziU32 index;
ziU32 position;
ziU32 fallback = 0;
if (!continuation) ZI_WORK->oemIdx = 0;
index = ZI_WORK->oemIdx;
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
if (ZI_WORK->oemMatch == 0) goto failed;
if ((ziS32)index >= ZI_WORK->oemLen || ZI_WORK->oemMatch == 0) goto noMatch;
capacity--;
if ((ziS32)length >= (ziS32)capacity) {
failed:
return 0;
}
if (length >= capacity) goto noMatch;
word[capacity] = 0;
if (complete) word[length] = 1; else word[length] = 0;
goto matchRetry;
posEntry:
position = 0;
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
for (; (ziS32)position < length; position++) {
if (pattern[position] >= 0xEFF1 && pattern[position] <= 0xF37F) {
if (pattern[position] == Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) continue;
break;
} else if (word[position] != pattern[position]) {
if (!ZI_WORK->unk_0x1F || language == 1) break;
folded = pattern[position];
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
word[length] = complete ? 1 : 0;
for (;;) {
if ((ziS32)index >= ZI_WORK->oemLen || !ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) {
if (length != 1 || !complete || continuation) goto noMatch;
complete = 0;
fallback = 1;
index = 0;
continue;
}
position = 0;
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
for (; (ziS32)position < length; position++) {
if (pattern[position] < 0xEFF1 || pattern[position] > 0xF37F) {
if (word[position] != pattern[position]) {
if (!ZI_WORK->unk_0x1F || language == 1) break;
folded = pattern[position];
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
}
} else if (pattern[position] != Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) break;
}
}
}
if ((ziS32)position < length) {
if (complete) word[length] = 1; else word[length] = 0;
if ((ziS32)position >= length) {
if (fallback) {
*word = *pattern;
return 1;
}
ZI_WORK->oemIdx = index + 1;
while (word[position] != 0) position++;
return position;
}
word[length] = complete ? 1 : 0;
index++;
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
goto matchRetry;
}
if (fallback) {
index = 0;
*word = *pattern;
return 1;
}
index++;
ZI_WORK->oemIdx = index;
while (word[position] != 0) position++;
return position;
matchRetry:
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
if (!ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) goto oemFailed;
goto posEntry;
oemFailed:
if (length != 1 || !complete || continuation) goto tail0;
complete = 0;
fallback = 1;
index = 0;
goto matchRetry;
tail0:
noMatch:
return 0;
}

View File

@@ -22,7 +22,7 @@ void bte_hcisu_send(HC_BT_HDR *p_msg, UINT16 event)
GKI_freebuf(p_msg);
}
void bte_hcisu_task(int unused)
void bte_hcisu_task(int param_1)
{
if (p_hcisu_if)
{

View File

@@ -1,7 +1,7 @@
#include <revolution/fa.h>
static FAEjectCallback g_detach_func;
static FAInsertCallback g_attach_func;
static FAEjectCallback g_detach_func;
extern s32 uhf_msc_is_media_insert(void);

View File

@@ -24,9 +24,9 @@ char NAND_Org_Path[64];
NAND_DISK_INFO nanddisk_info[23];
NAND_SEMAPHORE csem;
NAND_SEMAPHORE osem;
s32 Nanddisk_Internal_Info_Init = 0;
s32 NAND_Init = 0;
s32 fa_nanad_semid = 0;
s32 Nanddisk_Internal_Info_Init;
s32 NAND_Init;
s32 fa_nanad_semid;
static inline s32 find_disk(PDM_DISK* disk, NAND_DISK_INFO** result) {
NAND_DISK_INFO* info;

View File

@@ -1,9 +1,9 @@
#include <private/fa/puh_msc.h>
s32 uhg_msc_memid_8169971C;
static s32 st_uhs_msc_tskid;
static s32 st_uhs_msc_msgid;
static s32 st_uhs_msc_status;
static s32 st_uhs_msc_msgid;
static s32 st_uhs_msc_tskid;
s32 uhg_msc_memid_8169971C;
static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command);
s32 usbh_msc_read10(UHF_MSC_DEVICE* device, u32 sector, u16 count, void* buffer, void* sense) {

View File

@@ -26,10 +26,11 @@ FAFuncTbl st_uhs_msc_blk_func = {
};
static inline UHF_MSC_DEVICE* uhf_msc_blk_find_device(FADisk* disk) {
UHF_MSC_DEVICE* entry = uhg_msc_blk_device_tbl;
UHF_MSC_DEVICE* device = NULL;
u32 index;
for (index = 0; index < 8; index++) {
if (uhg_msc_blk_device_tbl[index].disk == disk) {
for (index = 0; index < 8; entry++, index++) {
if (entry->disk == disk) {
device = &uhg_msc_blk_device_tbl[index];
break;
}
@@ -87,8 +88,9 @@ s32 uhf_msc_blk_mount(FADisk* disk) {
}
s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* completed) {
s32 error;
u16 transfer_blocks;
UHF_MSC_DEVICE* device;
s32 error;
u32 block_size;
u8* transfer_buffer;
u32 transfer_limit;
@@ -127,7 +129,7 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
transfer_buffer = buffer;
}
do {
u16 transfer_blocks = transfer_limit;
transfer_blocks = transfer_limit;
if (blocks <= transfer_limit) {
transfer_blocks = blocks;
}

View File

@@ -10,34 +10,24 @@ pf_s32 pdm_part_is_master_boot_sector(pf_u8* buf, pf_u32 total, pf_bool* p_is_mb
pf_s16 index;
pf_u32 start[4];
pf_u32 count[4];
pf_u32* p_start;
pf_u32* p_count;
*p_is_mbr = 0;
if (buf[510] != 0x55 || buf[511] != 0xAA) { return 2; }
p_start = start;
p_count = count;
for (index = 0; index < 4; index++) {
*p_start = 0;
*p_start = (((pf_u32)buf[456] << 16) + buf[454]) + (((pf_u32)buf[457] << 24) + ((pf_u32)buf[455] << 8));
*p_count = (((pf_u32)buf[460] << 16) + buf[458]) + (((pf_u32)buf[461] << 24) + ((pf_u32)buf[459] << 8));
if (*p_start != 0 && *p_count != 0) {
start[index] = 0;
start[index] = (((pf_u32)buf[456] << 16) + buf[454]) + (((pf_u32)buf[457] << 24) + ((pf_u32)buf[455] << 8));
count[index] = (((pf_u32)buf[460] << 16) + buf[458]) + (((pf_u32)buf[461] << 24) + ((pf_u32)buf[459] << 8));
if (start[index] != 0 && count[index] != 0) {
if (index == 0) { *p_is_mbr = 1; }
} else {
if (index == 0) { return 2; }
}
p_start++;
p_count++;
buf += 16;
}
p_start = start;
p_count = count;
for (index = 0; index < 4; index++) {
if (*p_start + *p_count > total) {
if (start[index] + count[index] > total) {
if (index == 0) { *p_is_mbr = 0; }
return 2;
}
p_start++;
p_count++;
}
return 0;
}

View File

@@ -1,3 +1,4 @@
#define PF_FA_CP932_TABLE
#define VFiPFCODE_CP932_OEM2Unicode PFCODE_CP932_OEM2Unicode
#define VFiPFCODE_CP932_OEMCharWidth PFCODE_CP932_OEMCharWidth
#define VFiPFCODE_CP932_Unicode2OEM PFCODE_CP932_Unicode2OEM

View File

@@ -214,19 +214,21 @@ pf_s32 PFDIR_CheckDirIsEmpty(PF_ENT_ITER* iter, pf_u32* is_empty) {
PFDIR_SDD* PFDIR_GetSDD(PF_VOLUME* volume, PF_DIR_ENT* entry) {
PFDIR_VOLUME_DIRS* volume_dirs = (PFDIR_VOLUME_DIRS*)volume;
PFDIR_SDD* first_free_sdd = 0;
PFDIR_SDD* free_candidate = volume_dirs->sdds;
pf_s32 i;
pf_s32 remaining = 3;
for (i = 0; remaining != 0; remaining--) {
if ((volume_dirs->sdds[i].stat & 1) == 0 || ((volume_dirs->sdds[i].stat & 1) != 0 && (!volume_dirs->sdds[i].stat & 2) != 0)) {
if (first_free_sdd == 0) {
first_free_sdd = &volume_dirs->sdds[i];
first_free_sdd = free_candidate;
}
} else if (entry->p_vol == volume_dirs->sdds[i].dir_entry.p_vol &&
entry->entry_sector == volume_dirs->sdds[i].dir_entry.entry_sector &&
entry->entry_offset == volume_dirs->sdds[i].dir_entry.entry_offset) {
return &volume_dirs->sdds[i];
}
free_candidate++;
i++;
}
if (first_free_sdd == 0) {
@@ -1070,7 +1072,7 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
error = PFENT_ITER_GetEntryOfPath(&source_iter, &source_entry, volume, (PFDIR_STR*)old_path, 0);
if (error != 0) { return error; }
if (volume != PFPATH_GetVolumeFromPath(new_path)) { return 0x1F; }
if (PFPATH_GetVolumeFromPath(new_path) != volume) { return 0x1F; }
error = PFPATH_SplitPath((PFDIR_STR*)new_path, &directory, &destination_name);
if (error != 0) { return error; }
if (PFSTR_GetCodeMode(&destination_name) == 2) {

View File

@@ -728,23 +728,20 @@ pf_s32 PFENT_ITER_GetEntryOfIter(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
pf_s32 PFENT_ITER_GetLFNEntryName(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
pf_u32 i;
pf_u32 index;
pf_s32 err;
if (p_ent->num_entry_LFNs != 0 && !(p_ent->small_letter_flag & 0x18)) {
index = 0;
for (i = 0; i < p_ent->num_entry_LFNs; ++i) {
pf_u16* destination;
err = PFENT_ITER_Retreat(p_iter, 0);
if (err != 0) return err;
err = PFENT_ITER_LoadEntry(p_iter);
if (err != 0) return err;
destination = &p_ent->long_name[index];
destination = &p_ent->long_name[(i * 26U) / 2U];
pf_memcpy(destination, &p_iter->buf[1], 10);
pf_memcpy(destination + 5, &p_iter->buf[14], 12);
pf_memcpy(destination + 11, &p_iter->buf[28], 4);
index += 13;
}
p_ent->long_name[index] = 0;
p_ent->long_name[(p_ent->num_entry_LFNs * 26U) / 2U] = 0;
}
return 0;
}

View File

@@ -126,7 +126,6 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
pf_s32 fat_offset;
pf_u32 fat_sector;
pf_s32 result;
pf_u32 next_sector;
fat_offset = (pf_u16)(cluster + (cluster >> 1));
fat_sector = (pf_u16)(p_vol->bpb.active_FAT_sector + (fat_offset >> p_vol->bpb.log2_bytes_per_sector));
offset_in_sector = fat_offset & (p_vol->bpb.bytes_per_sector - 1);
@@ -147,10 +146,10 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
p_page->p_buf[(pf_u16)offset_in_sector] = (p_page->p_buf[(pf_u16)offset_in_sector] & 0xF) | ((value << 4) & 0xF0);
if ((pf_u16)offset_in_sector == (pf_u32)(p_vol->bpb.bytes_per_sector - 1)) {
FLUSH_FAT_BUFFER();
next_sector = fat_sector + 1;
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, next_sector, 0, p_vol->bpb.bytes_per_sector);
offset_in_sector = fat_sector + 1;
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, offset_in_sector, 0, p_vol->bpb.bytes_per_sector);
if (err != 0) { return err; }
p_page->sector = next_sector;
p_page->sector = offset_in_sector;
p_page->p_buf[0] = value >> 4;
} else {
((pf_u16)offset_in_sector + p_page->p_buf)[1] = value >> 4;
@@ -159,10 +158,10 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
p_page->p_buf[(pf_u16)offset_in_sector] = value;
if ((pf_u16)offset_in_sector == (pf_u32)(p_vol->bpb.bytes_per_sector - 1)) {
FLUSH_FAT_BUFFER();
next_sector = fat_sector + 1;
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, next_sector, 0, p_vol->bpb.bytes_per_sector);
offset_in_sector = fat_sector + 1;
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, offset_in_sector, 0, p_vol->bpb.bytes_per_sector);
if (err != 0) { return err; }
p_page->sector = next_sector;
p_page->sector = offset_in_sector;
p_page->p_buf[0] = (p_page->p_buf[0] & 0xF0) | ((pf_u8)(value >> 8));
} else {
((pf_u16)offset_in_sector + p_page->p_buf)[1] = (((pf_u16)offset_in_sector + p_page->p_buf)[1] & 0xF0) | ((pf_u8)(value >> 8));

View File

@@ -102,7 +102,7 @@ pf_s32 PFFAT16_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_u32 cluster, pf_u32 val
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, fat_sector, 0, p_vol->bpb.bytes_per_sector);
}
p_page->p_buf[offset_in_sector] = value;
p_page->p_buf[offset_in_sector + 1] = value >> 8;
(offset_in_sector + p_page->p_buf)[1] = value >> 8;
if (err != 0) {
result = err;
}

View File

@@ -400,22 +400,20 @@ pf_s32 PFPATH_cmpNameImpl(const pf_s8* name, const pf_s8* pattern, pf_u32* match
case '*': {
do {
pattern_width = volume->codeset.oem_char_width(pattern);
if (pattern_width != 1) {
read_char = (pf_u16)PF_GET_LE_U16((const pf_u8*)pattern);
if (pattern_width == 1) {
pattern_char = pf_toupper(*pattern);
} else {
read_char = pf_toupper(*pattern);
pattern_char = PF_GET_LE_U16((const pf_u8*)pattern);
}
pattern_char = (pf_u16)read_char;
pattern += pattern_width;
if (pattern_char == '?') {
if (name_char == 0) { return 1; }
name += name_width;
name_width = volume->codeset.oem_char_width(name);
if (name_width == 1) { read_char = pf_toupper(*name); }
else { read_char = (pf_u16)PF_GET_LE_U16((const pf_u8*)name); }
name_char = (pf_u16)read_char;
if (name_width == 1) { name_char = pf_toupper(*name); }
else { name_char = PF_GET_LE_U16((const pf_u8*)name); }
}
} while (pattern_char == '?' || pattern_char == '*');
} while (pattern_char == '*' || pattern_char == '?');
if (pattern_char == 0) {
return 0;
}
@@ -430,21 +428,21 @@ pf_s32 PFPATH_cmpNameImpl(const pf_s8* name, const pf_s8* pattern, pf_u32* match
}
name_width = volume->codeset.oem_char_width(name);
if (name_width == 1) {
read_char = pf_toupper(*name);
name_char = pf_toupper(*name);
} else {
read_char = (pf_u16)PF_GET_LE_U16((const pf_u8*)name);
name_char = PF_GET_LE_U16((const pf_u8*)name);
}
name_char = (pf_u16)read_char;
}
if (*name == 0 || *pattern == 0) {
*matched_end = 1;
}
return 1;
}
default:
if (name_char != pattern_char) { return 1; }
break;
}
name += name_width;
if (*name == 0 || *pattern == 0) {
*matched_end = 1;
}
}
return *name != 0;
}

View File

@@ -58,7 +58,7 @@ void* pfstub_entry(void* argument) {
pf_vol_set.context_id = message->task_id;
if (message->operation >= 0 && message->operation < 100) {
pfstub_call_function_standard(message);
} else if (((s32*)received)[1] >= 100 && ((s32*)received)[1] < 200) {
} else if (received->operation >= 100 && received->operation < 200) {
pfstub_call_function_unicode(message);
} else {
message->result.status = -1;

View File

@@ -400,131 +400,132 @@ static void kbdProcKey(u32 key, u32 pressed, u32 channel) {
}
static void kbdProcMod(u32 key, u32 pressed, u32 channel) {
KBDChannel* data;
u32 modState;
u32 stateBuf[1];
KBDModifierState* state;
s32 delta;
u8 flags;
u32 finalState;
s8 value;
data = &kbdData[channel];
delta = (pressed & 1) != 0 ? 1 : -1;
flags = kbdKeyMaps.maps[data->country].flags;
state = (KBDModifierState*)stateBuf;
state->value = kbdData[channel].modState;
flags = kbdKeyMaps.maps[kbdData[channel].country].flags;
kbdGetModState(channel, &modState);
kbdGetModState(channel, &state->value);
switch (key) {
case 0xF001:
if (data->lockState != 0) {
if (kbdData[channel].lockState != 0) {
if ((pressed & 1) != 0) {
modState ^= 2;
state->value ^= 2;
}
} else {
value = data->lockCount[1] + delta;
data->lockCount[1] = value;
modState = (modState & ~0x2) | (((u8)value != 0) << 1);
value = kbdData[channel].lockCount[1] + delta;
kbdData[channel].lockCount[1] = value;
state->keys.rightControl = (u8)value != 0;
}
break;
case 0xF005:
if (data->lockState != 0) {
if (kbdData[channel].lockState != 0) {
if ((pressed & 1) != 0) {
modState ^= 0x20;
state->value ^= 0x20;
}
} else {
value = data->lockCount[4] + delta;
data->lockCount[4] = value;
modState = (modState & ~0x20) | (((u8)value != 0) << 5);
value = kbdData[channel].lockCount[4] + delta;
kbdData[channel].lockCount[4] = value;
state->keys.rightAlt = (u8)value != 0;
}
break;
case 0xF000:
if (data->lockState != 0) {
if (kbdData[channel].lockState != 0) {
if ((pressed & 1) != 0) {
modState ^= 1;
state->value ^= 1;
}
} else {
value = data->lockCount[0] + delta;
data->lockCount[0] = value;
modState = (modState & ~0x1) | ((u8)value != 0);
value = kbdData[channel].lockCount[0] + delta;
kbdData[channel].lockCount[0] = value;
state->keys.leftControl = (u8)value != 0;
}
break;
case 0xF008:
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
modState ^= 0x200;
if (((pressed & 1) != 0) && (kbdData[channel].lockProcessing != 0)) {
state->value ^= 0x200;
}
break;
case 0xF007:
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
modState ^= 0x100;
if (((pressed & 1) != 0) && (kbdData[channel].lockProcessing != 0)) {
state->value ^= 0x100;
}
break;
case 0xF006:
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
if (((pressed & 1) != 0) && (kbdData[channel].lockProcessing != 0)) {
u32 oldState;
u32 lockState;
oldState = modState;
oldState = state->value;
lockState = oldState & 0xC0;
switch (lockState) {
case 0:
if ((flags & 1) == 1) {
modState = oldState | 0x40;
state->value = oldState | 0x40;
}
break;
case 0x40:
{
modState = oldState & 0xFFFFFFBF;
state->value = oldState & 0xFFFFFFBF;
if ((flags & 4) == 4) {
modState = oldState & 0xFFFFFFBF | 0x80;
state->value = oldState & 0xFFFFFFBF | 0x80;
}
}
break;
case 0x80:
modState = oldState & 0xFFFFFF7F;
state->value = oldState & 0xFFFFFF7F;
break;
case 0xC0:
modState = oldState & 0xFFFFFF3F;
state->value = oldState & 0xFFFFFF3F;
break;
}
}
break;
case 0xF002:
if (data->lockState != 0) {
if (kbdData[channel].lockState != 0) {
if ((pressed & 1) != 0) {
modState ^= 4;
state->value ^= 4;
}
} else {
value = data->lockCount[2] + delta;
data->lockCount[2] = value;
modState = (modState & ~0x4) | (((u8)value != 0) << 2);
value = kbdData[channel].lockCount[2] + delta;
kbdData[channel].lockCount[2] = value;
state->keys.leftShift = (u8)value != 0;
}
break;
case 0xF003:
if (data->lockState != 0) {
if (kbdData[channel].lockState != 0) {
if ((pressed & 1) != 0) {
modState ^= 8;
state->value ^= 8;
}
} else {
value = data->lockCount[3] + delta;
data->lockCount[3] = value;
modState = (modState & ~0x8) | (((u8)value != 0) << 3);
value = kbdData[channel].lockCount[3] + delta;
kbdData[channel].lockCount[3] = value;
state->keys.rightShift = (u8)value != 0;
}
break;
case 0xF004:
if (data->lockState != 0) {
if (kbdData[channel].lockState != 0) {
if ((pressed & 1) != 0) {
modState ^= 0x10;
state->value ^= 0x10;
}
} else {
value = data->lockCount[5] + delta;
data->lockCount[5] = value;
modState = (modState & ~0x10) | (((u8)value != 0) << 4);
value = kbdData[channel].lockCount[5] + delta;
kbdData[channel].lockCount[5] = value;
state->keys.leftAlt = (u8)value != 0;
}
break;
case 0xF021:
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
modState ^= 0x400;
if (((pressed & 1) != 0) && (kbdData[channel].lockProcessing != 0)) {
state->value ^= 0x400;
}
break;
}
finalState = modState | 0x1000;
finalState = state->value | 0x1000;
KBDSetModState(channel, finalState);
}
@@ -622,7 +623,7 @@ USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback,
USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
u32 index;
KBDLEDCommand* command;
u32 ofs;
BOOL interrupts;
USBKBDErr result;
u8 ledBits;
@@ -638,14 +639,14 @@ USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
ledBits = leds & 0xff;
interrupts = OSDisableInterrupts();
index = 0;
command = kbdCmdBuf;
ofs = 0;
while (index < 12) {
if (command->device == 0) {
command->device = (u32)kbdData[channel].device;
if (*(u32*)&((u8*)kbdCmdBuf)[ofs] == 0) {
*(u32*)&((u8*)kbdCmdBuf)[ofs] = (u32)kbdData[channel].device;
break;
}
index++;
command++;
ofs += sizeof(KBDLEDCommand);
}
OSRestoreInterrupts(interrupts);
if (index == 12) {
@@ -838,28 +839,30 @@ USBKBDErr KBDSetModState(u32 channel, u32 value) {
kbdData[channel].modState = value & ~0x1000;
} else {
BOOL interrupts;
KBDModifierState* state;
KBDModifierState oldState;
KBDModifierState newState;
interrupts = OSDisableInterrupts();
state = (KBDModifierState*)&kbdData[channel].modState;
newState.value = value & 0xfc0;
oldState.value = kbdData[channel].modState;
oldState = *state;
newState.bits.physical = oldState.bits.physical;
kbdData[channel].modState = newState.value;
*state = newState;
OSRestoreInterrupts(interrupts);
}
return 0;
}
u16 KBDTranslateHidCode(u32 keyCode, u32 modifiers, s32 country) {
s32 mask;
u16* table;
u16 activeFlag;
u16 entry;
KBDKeyMap* map;
u16* table;
u32 keyIndex;
u16 entry;
s32 mask;
s32 offset;
s32 group;
u32 shiftFlag;
u32 keyIndex;
u16 activeFlag;
if (kbdInitialized == FALSE) {
return 0xFFFF;

View File

@@ -268,10 +268,10 @@ void KPADSetPosParam(s32 chan, f32 x, f32 y) {
}
static void reset_kpad(KPADInside* kpad) {
f32 upperY;
f32 sensorDistance;
f32 distanceValue;
f32 zero;
f32 sensorDistance;
f32 upperY;
f32 lowerY;
f32 one;
f32 negativeOne;
@@ -1607,8 +1607,8 @@ static void KPADiSamplingCallback(s32 chan) {
u32 device;
if (WPADProbe(chan, &device) != -1) {
u8 index = kpad->ringIndex;
u32 tier;
KPADSample* status;
u32 tier;
u32 enabled;
u32 tableIndex;
if (index >= 16) {

View File

@@ -156,10 +156,10 @@ void KPRInitRegionUS(void) {
}
void KPRInitQueue(KPRQueue* queue) {
static union { u64 align; u8 flag; } once;
if (!once.flag) {
static u8 once;
if (!once) {
OSRegisterVersion(__KPRVersion);
once.flag = TRUE;
once = TRUE;
}
queue->mode = KPR_MODE_ALT_KEYPAD;
queue->oCount = 0;
@@ -244,9 +244,10 @@ u8 KPRLookAhead(KPRQueue* queue, u16* destination, u32 capacity) {
BOOL KPRProcessAltKeypad(KPRQueue* queue, u16 character) {
if (queue->altVal != 0) {
u32 accumulator = queue->altVal & 0x7FFFFFFF;
u32 value;
u32 leadingZero = queue->altVal & 0x80000000;
u32 accumulator = queue->altVal;
u32 value;
accumulator &= 0x7FFFFFFF;
queue->altVal = accumulator;
if (character >= 0xF130 && character <= 0xF139) {
if (accumulator > 0x6666666) {
@@ -301,7 +302,7 @@ BOOL KPRProcessAltKeypad(KPRQueue* queue, u16 character) {
void KPRProcessDeadKeys(KPRQueue* queue) {
int index;
int firstFallback;
u32 secondFallback;
int secondFallback;
if (queue->iCount == 1) {
for (index = 0; index < 107; ++index) {
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent) {
@@ -312,15 +313,17 @@ void KPRProcessDeadKeys(KPRQueue* queue) {
queue->iCount = 0;
return;
}
firstFallback = 0;
secondFallback = 107;
for (index = 0; index < 107; ++index) {
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {
u16 first = queue->text[queue->oCount];
if (first == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {
queue->text[queue->oCount] = kprDeadKeyMap[index].composed;
queue->iCount = 0;
++queue->oCount;
return;
}
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent && queue->text[queue->oCount] == kprDeadKeyMap[index].base) {
if (first == kprDeadKeyMap[index].accent && first == kprDeadKeyMap[index].base) {
firstFallback = index;
}
if (queue->text[queue->oCount + 1] == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {

View File

@@ -367,8 +367,7 @@ static s32 __nupGetServerInfo(char* serverAddress, char* messageId, unsigned lon
} else {
snprintf(endpoint, endpointSize, "https://%s/nus/services/NetUpdateSOAP", serverAddress);
requestSize = strlen(messageId) + strlen(productArea);
unsigned long countryLength = strlen(countryCode);
requestSize += countryLength + 0x449;
requestSize += strlen(countryCode) + 0x449;
if (auditData != 0) {
requestSize += strlen(auditData);
}
@@ -923,8 +922,7 @@ static s32 __nupGetTitleSize(NUPTitleInfo* title) {
title->installedContentSize += 0x4000;
for (contentIndex = 0; contentIndex < ((ESTmdView*)title->tmdView)->head.numContents; contentIndex++) {
ESCmdView* content = &((ESTmdView*)title->tmdView)->contents[contentIndex];
ESContentId contentId = content->cid;
if (!__nupHasContent(title, contentId) ||
if (!__nupHasContent(title, content->cid) ||
title->titleId == 0x0000000100000001ULL) {
if (content->size > 0xffffffefULL) {
result = -0x1394;
@@ -1173,9 +1171,10 @@ static inline s32 __nupGetBoot2Version(u16* version) {
u32 bootVersion;
s32 result = ES_GetBoot2Version(&bootVersion);
if (result == 0) {
u16 checkedVersion = bootVersion;
*version = checkedVersion;
if (checkedVersion != bootVersion) { result = -0x1389; }
*version = bootVersion;
if (*version != bootVersion) {
result = -0x1389;
}
}
return result;
}
@@ -1225,9 +1224,9 @@ static inline void __nupSetStatus(NUPContextInfo* context, s32 status) {
extern "C" void* __nupOp(void* argument) {
u8* response = 0;
ESTmdView* tmdView = 0;
u32 currentDeviceId;
u32 needsAudit;
char* auditData = 0;
u32 needsAudit;
u32 currentDeviceId;
s32 result;
u16 serverBootVersion = 0;
u16 bootTitleVersion;
@@ -1350,12 +1349,11 @@ extern "C" void* __nupOp(void* argument) {
OSUnlockMutex(&context->mutex);
for (i = 0; i < context->titleCount; i++) {
NUPTitleInfo* title = &context->titles[i];
ESTitleId titleId = title->titleId;
if (titleId == 0x0000000100000001ULL) {
if (title->titleId == 0x0000000100000001ULL) {
bootTitle = title;
} else if (titleId == 0x0000000100000002ULL) {
} else if (title->titleId == 0x0000000100000002ULL) {
menuTitle = title;
} else if (titleId == currentTitleId) {
} else if (title->titleId == currentTitleId) {
systemTitle = title;
}
if (bootTitle != 0 && menuTitle != 0 && systemTitle != 0) {

View File

@@ -1,5 +1,4 @@
#include <stdio.h>
#include <stdlib.h>
#include <private/es.h>
#include <private/nand.h>
#include <private/os.h>
@@ -168,7 +167,7 @@ typedef struct __attribute__((aligned(32))) WADImportWorkspace {
WADFileHeader fileHeader;
u8 wadHeader[0x80];
WADUnpackInfo unpackInfo;
WADStream stream;
WADStream stream ALIGN32;
} WADImportWorkspace;
typedef struct WADImportTransfer {
@@ -542,7 +541,11 @@ static s32 WAD_815BFFA8(WADImportLoopArgs* args) {
u32 size;
for (; (remaining != 0) && (result == 0); bufferIndex ^= 1) {
size = remaining > transfer->chunkSize ? transfer->chunkSize : remaining;
size = remaining;
if (remaining > transfer->chunkSize) {
size = transfer->chunkSize;
}
OSLockMutex(&transfer->mutex[bufferIndex]);
while (transfer->ready[bufferIndex] == 0) {
OSWaitCond(&transfer->signalCond[bufferIndex], &transfer->mutex[bufferIndex]);
@@ -561,24 +564,23 @@ static s32 WAD_815BFFA8(WADImportLoopArgs* args) {
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags,
WADProcessCallback processCallback) {
const char* functionName = "WADImportEx";
void* firstBuffer = 0;
ESTitleMeta* titleMeta;
void* secondBuffer = 0;
s32 result = 0;
ESHash* sharedContentHashes = 0;
ESContentId* installedContentIds = 0;
ESContentMeta* matchingContents = 0;
u32 importedBytes = 0;
u32 contentCount;
u32 headerReadSize;
s32 streamOpened = FALSE;
s32 backupFileOpened = FALSE;
s32 importExistingTitle = TRUE;
WADThreadStack* threadStack = 0;
s32 contentFd;
s32 titleImportStarted = FALSE;
ESTitleMeta* titleMeta;
void* firstBuffer = 0;
s32 contentImportStarted = FALSE;
void* secondBuffer = 0;
ESTitleMeta* installedTitleMeta = 0;
ESContentId* installedContentIds = 0;
s32 contentImportStarted = FALSE;
ESContentMeta* matchingContents = 0;
ESHash* sharedContentHashes = 0;
WADThreadStack* threadStack = 0;
WADStream stream;
WADUnpackInfo unpackInfo;
WADSaveDataHeader wadHeader ALIGN32;
@@ -597,6 +599,7 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
u32 ticketViewCount;
WADFileHeader* fileHeaderBuffer;
u8 transferId[0x20] ALIGN32;
u32 contentCount;
u32 contentIndex;
u32 listIndex;
u32 sizeRemaining;
@@ -634,8 +637,7 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
if (result != 0) {
goto cleanup;
}
headerReadSize = sizeof(wadHeader);
if ((s32)WADReadStream(&stream, &wadHeaderBuffer, headerReadSize, offset) != (s32)headerReadSize) {
if ((s32)WADReadStream(&stream, &wadHeaderBuffer, sizeof(wadHeader), offset) != (s32)sizeof(wadHeader)) {
result = -3005;
goto cleanup;
}
@@ -645,8 +647,8 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
if (result != 0) {
goto cleanup;
}
importedBytes = unpackInfo.contentOffset;
titleMeta = unpackInfo.titleMeta;
importedBytes = unpackInfo.contentOffset;
if (((flags & 8) != 0) && (titleMeta != 0)) {
ticketViewCount = 0;
if (unpackInfo.headerInfo != 2) {
@@ -696,7 +698,7 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
unpackInfo.buffer_0x14,
unpackInfo.size_0x0c,
unpackInfo.buffer_0x24,
unpackInfo.size_0x1c, unpackInfo.headerInfo);
unpackInfo.size_0x1c, 0);
if (result != 0) {
goto cleanup;
}
@@ -707,7 +709,7 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
if (titleMeta != 0) {
if (unpackInfo.cidxMode >= 1) {
contentCount = _WADGetCidxCount(unpackInfo.contentIndex);
if (contentCount > titleMeta->head.numContents) {
if (titleMeta->head.numContents < contentCount) {
result = -3001;
goto cleanup;
}
@@ -728,8 +730,8 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
unpackInfo.sectionSize,
installedContentIds, &installedContentCount);
if ((result == 0) &&
((result = ES_GetTmd(titleMeta->head.titleId, 0,
&installedTmdSize)) == 0)) {
(ES_GetTmd(titleMeta->head.titleId, 0,
&installedTmdSize) == 0)) {
alignedSize = (installedTmdSize + 0x1F) & ~0x1F;
installedTitleMeta = _WADMemAlloc(allocator, alignedSize);
if (installedTitleMeta == 0) {
@@ -744,12 +746,12 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
}
}
if (!importExistingTitle && (installedContentCount != 0)) {
installedContentIndex = 0;
matchingContents = _WADMemAlloc(allocator, installedContentCount * sizeof(ESContentMeta));
if (matchingContents == 0) {
result = -3003;
goto cleanup;
}
installedContentIndex = 0;
for (listIndex = 0; listIndex < installedContentCount; listIndex++) {
for (contentIndex = 0;
contentIndex < installedTitleMeta->head.numContents; contentIndex++) {
@@ -795,7 +797,7 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
if (unpackInfo.cidxMode >= 1) {
titleMetaIndex = _WADGetCidx(unpackInfo.contentIndex, contentIndex);
if ((titleMetaIndex < 0) ||
(titleMetaIndex >= (s32)titleMeta->head.numContents)) {
((s32)titleMeta->head.numContents <= titleMetaIndex)) {
result = -3001;
goto cleanup;
}
@@ -806,9 +808,10 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
}
if (!importExistingTitle) {
for (listIndex = 0; listIndex < installedContentCount; listIndex++) {
if ((content->cid == matchingContents[listIndex].cid) &&
(memcmp(content->hash, matchingContents[listIndex].hash, sizeof(ESHash)) == 0) &&
(content->type == matchingContents[listIndex].type)) {
ESContentMeta* installedContent = &matchingContents[listIndex];
if ((content->cid == installedContent->cid) &&
(memcmp(content->hash, installedContent->hash, sizeof(ESHash)) == 0) &&
(content->type == installedContent->type)) {
matchFound = TRUE;
}
}
@@ -852,8 +855,8 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
result = 0;
contentFd = ES_ImportContentBegin(
titleMeta->head.titleId, content->cid);
result = contentFd;
if (contentFd < 0) {
result = contentFd;
goto cleanup;
}
result = 0;
@@ -892,9 +895,10 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
OSUnlockMutex(&transfer.mutex[bufferIndex]);
break;
}
readSize = (chunkSize + 0x1F) & ~0x1F;
readBuffer = transfer.buffers[bufferIndex];
result = WADReadStream(&stream,
&readBuffer, (chunkSize + 0x1F) & ~0x1F,
&readBuffer, readSize,
offset + importedBytes);
if ((u32)result != ((chunkSize + 0x1F) & ~0x1F)) {
OSLockMutex(&transfer.mutex[bufferIndex ^ 1]);
@@ -949,7 +953,6 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
(unpackInfo.fileCount == 0)) {
goto cleanup;
}
fileHeaderBuffer = &backupHeader;
if (firstBuffer == 0) {
firstBuffer = _WADMemAlloc(allocator, 0x10000);
if (firstBuffer == 0) {
@@ -964,6 +967,7 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
goto cleanup;
}
}
fileHeaderBuffer = &backupHeader;
transferIdValue = _WADGetTransferId(transferId);
importedBytes = unpackInfo.fileOffset;
if (((((u64)((WADSaveDataHeader*)wadHeaderBuffer)->fileSize << 32) |
@@ -1010,10 +1014,9 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
backupFileOpened = TRUE;
sizeRemaining = fileHeaderBuffer->fileSize;
while (sizeRemaining != 0) {
if (sizeRemaining > 0x10000) {
chunkSize = sizeRemaining;
if (chunkSize > 0x10000) {
chunkSize = 0x10000;
} else {
chunkSize = sizeRemaining;
}
readBuffer = firstBuffer;
result = WADReadStream(&stream, &readBuffer,
@@ -1066,7 +1069,11 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
result = NANDPrivateCreateDir(fileHeaderBuffer->name,
fileHeaderBuffer->flags[0] | 0x20,
fileHeaderBuffer->flags[1]);
if (result == -6) {
if (result != -6) {
if (result != 0) {
goto cleanup;
}
} else {
result = NANDPrivateGetStatus(fileHeaderBuffer->name, &fileStatus);
if (result != 0) {
goto cleanup;
@@ -1080,9 +1087,6 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
}
}
}
if (result != 0) {
goto cleanup;
}
}
importedBytes = (importedBytes + 0x3F) & ~0x3F;
if ((fileHeaderBuffer->fileSize == 0) && (processCallback != 0)) {
@@ -1152,12 +1156,12 @@ cleanup:
}
if (contentImportStarted) {
ES_ImportContentEnd(contentFd);
OSReport("%s:%d Cancel importing the content.\n", __func__, 0x8DF);
OSReport("%s:%d Cancel importing the content.\n", functionName, 0x8DF);
}
if (titleImportStarted) {
ES_ImportTitleCancel();
_WADCleanTmpDir(allocator);
OSReport("%s:%d Cancel importing the title.\n", __func__, 0x8E6);
OSReport("%s:%d Cancel importing the title.\n", functionName, 0x8E6);
}
if (processCallback != 0) {
if (importedBytes != 0) {
@@ -1177,8 +1181,8 @@ cleanup:
static s32 WAD_815C1288(WADExportLoopArgs* args) {
ESFd fd = args->fd;
u32 size;
u32 remaining = args->size;
u32 size;
u32 bufferIndex = 0;
WADImportTransfer* transfer = args->transfer;
s32 result = 0;
@@ -1209,7 +1213,7 @@ static s32 WAD_815C1288(WADExportLoopArgs* args) {
s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32* sizeOut,
WADLocation location, u32 offset, WADProcessCallback processCallback) {
WADBackupFileHeader* files;
WADBackupFileHeader* files = 0;
s32 result;
OSThread exportThread;
NANDFileInfo savedFile;
@@ -1225,56 +1229,39 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
u8 transferMac[0x20] ALIGN32;
WADExportLoopArgs threadArgs;
u32 totalSize;
WADBackupTitleMetaBuffer* titleMetaBuffer;
ESTmdView* titleMeta;
WADBackupTitleMetaBuffer* titleMetaBuffer = 0;
ESTmdView* titleMeta = 0;
struct WADExportCertificates {
ESCertSignature signer;
u8 device[0x180];
};
struct WADExportCertificates* certificates;
s32 signatureOffset;
void* outputBuffer;
void* encryptionBuffer;
u32 titleMetaSize;
void* outputBuffer = 0;
void* encryptionBuffer = 0;
WADThreadStack* threadStack = 0;
u32 titleMetaSize = 0;
u32 titleMetaViewSize;
u32 contentDataSize;
u32 fileCount;
u32 fileDataSize;
u32 installedContentCount;
u32 contentDataSize = 0;
u32 fileCount = 0;
u32 fileDataSize = 0;
u32 installedContentCount = 0;
u32 fileIndex;
u32 contentIndex;
u32 importedSize;
u32 importedSize = 0;
u32 paddedSize;
u32 priority;
u32 sizeRemaining;
u32 bufferIndex;
u32 chunkSize;
u32 readSize;
s32 streamOpened;
s32 fileOpened;
WADThreadStack* threadStack;
s32 titleExportStarted;
s32 contentExportStarted;
s32 streamOpened = FALSE;
s32 titleExportStarted = FALSE;
s32 contentExportStarted = FALSE;
s32 threadCreated = FALSE;
s32 fileOpened = FALSE;
s32 fileFd;
titleMetaSize = 0;
contentDataSize = 0;
titleMetaBuffer = 0;
titleMeta = 0;
files = 0;
fileCount = 0;
importedSize = 0;
outputBuffer = 0;
encryptionBuffer = 0;
fileDataSize = 0;
installedContentCount = 0;
streamOpened = 0;
fileOpened = 0;
threadStack = 0;
titleExportStarted = 0;
contentExportStarted = 0;
if (flags == 0) {
flags = 0x0F;
}
@@ -1282,7 +1269,7 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
result = -3000;
goto cleanup;
}
if ((u32)((titleId >> 32) & 0xFFFFFFFFULL) == 1U) {
if ((titleId >> 32) == 1) {
result = -3000;
goto cleanup;
}
@@ -1398,9 +1385,8 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
if (result != 0) {
goto cleanup;
}
paddedSize = sizeof(headerBlock);
memset(&headerBlock, 0, paddedSize);
if ((u32)WADWriteStream(&stream, &headerBlock, paddedSize) != paddedSize) {
memset(&headerBlock, 0, sizeof(headerBlock));
if ((u32)WADWriteStream(&stream, &headerBlock, sizeof(headerBlock)) != sizeof(headerBlock)) {
result = -3006;
goto cleanup;
}
@@ -1409,10 +1395,10 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
headerBlock.header.wadType[0] = 'B';
headerBlock.header.wadType[1] = 'k';
headerBlock.header.wadVersion = 1;
headerBlock.header.numFiles = fileCount;
headerBlock.header.fileSize = fileDataSize;
headerBlock.header.tmdSize = titleMetaSize;
headerBlock.header.contentSize = contentDataSize;
headerBlock.header.fileSize = fileDataSize;
headerBlock.header.numFiles = fileCount;
headerBlock.header.backupAreaLen = totalSize + 0x340;
result = ES_GetDeviceId(&headerBlock.header.deviceId);
if (result != 0) {
@@ -1422,8 +1408,8 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
memcpy(&headerBlock.header.cidx, &existingContentMask, sizeof(existingContentMask));
}
if ((flags & 2) != 0) {
u32 currentTitleLow;
u32 currentTitleHigh;
u32 currentTitleLow;
encryptionBuffer = _WADMemAlloc(allocator, 0x10000);
if (encryptionBuffer == 0) {
result = -3003;
@@ -1434,10 +1420,10 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
goto cleanup;
}
result = 0;
currentTitleHigh = 0;
currentTitleLow = 0;
result = NANDGetCurrentDir(encryptionBuffer);
if (strncmp(encryptionBuffer, "/title/", 7) == 0) {
currentTitleHigh = 0;
currentTitleLow = 0;
sscanf(encryptionBuffer, "/title/%x/%x", &currentTitleHigh, &currentTitleLow);
headerBlock.header.titleId = ((u64)currentTitleHigh << 32) | currentTitleLow;
}
@@ -1450,7 +1436,7 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
if (result != 0) {
goto cleanup;
}
srand(titleId & 0xFFFFFFFFULL);
srand((u32)titleId);
if (((flags & 1) != 0) || ((flags & 0x20) != 0)) {
titleExportStarted = TRUE;
result = ES_ExportTitleInit(titleId, 0, 0, 0, 0, 0, 0,
@@ -1458,11 +1444,10 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
if (result != 0) {
goto cleanup;
}
paddedSize = ((titleMetaSize + 0x3F) & ~0x3F) - titleMetaSize;
if (paddedSize != 0) {
_WADRandPad(&titleMetaBuffer->data[titleMetaSize], paddedSize);
}
paddedSize = (titleMetaSize + 0x3F) & ~0x3F;
if (paddedSize != titleMetaSize) {
_WADRandPad(&titleMetaBuffer->data[titleMetaSize], paddedSize - titleMetaSize);
}
result = SHA1Input(hashContext, titleMeta, paddedSize);
if (result != 0) {
goto cleanup;
@@ -1500,12 +1485,11 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
for (contentIndex = 0; contentIndex < installedContentCount; contentIndex++) {
s32 tmdIndex = _WADGetCidx(&existingContentMask, contentIndex);
ESContentMeta* content;
if ((tmdIndex < 0) || (tmdIndex >= ((ESTitleMeta*)titleMetaBuffer)->head.numContents)) {
if ((tmdIndex < 0) || (((ESTitleMeta*)titleMetaBuffer)->head.numContents <= tmdIndex)) {
result = -3009;
goto cleanup;
}
content = &((ESTitleMeta*)titleMetaBuffer)->contents[tmdIndex];
result = 0;
fileFd = ES_ExportContentBegin(titleId, content->cid);
if (fileFd < 0) {
result = fileFd;
@@ -1564,6 +1548,7 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
result = -3006;
goto cleanup;
}
result = 0;
transfer.ready[bufferIndex] = 0;
OSUnlockMutex(&transfer.mutex[bufferIndex]);
OSSignalCond(&transfer.waitCond[bufferIndex]);
@@ -1597,17 +1582,17 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
if ((flags & 2) != 0) {
WADFileHeader* fileHeaderBuffer = &fileHeader;
for (fileIndex = 0; fileIndex < fileCount; fileIndex++) {
WADBackupFileHeader* file = &files[fileIndex];
s32 filePosition = WADSeekStream(&stream, 0, 1);
size_t nameLength = strlen(files[fileIndex].path) + 1;
_WADRandPad(files[fileIndex].path + nameLength,
sizeof(files[fileIndex].path) - nameLength);
memcpy(fileHeaderBuffer, &files[fileIndex], sizeof(fileHeader));
chunkSize = sizeof(WADBackupHeaderBlock);
result = SHA1Input(hashContext, fileHeaderBuffer, chunkSize);
size_t nameLength = strlen(file->path);
_WADRandPad(file->path + nameLength + 1,
0x75 - (nameLength + 1));
memcpy(fileHeaderBuffer, file, sizeof(fileHeader));
result = SHA1Input(hashContext, fileHeaderBuffer, sizeof(WADBackupHeaderBlock));
if (result != 0) {
goto cleanup;
goto file_done;
}
if ((u32)WADWriteStream(&stream, fileHeaderBuffer, chunkSize) != chunkSize) {
if ((u32)WADWriteStream(&stream, fileHeaderBuffer, sizeof(WADBackupHeaderBlock)) != sizeof(WADBackupHeaderBlock)) {
result = -3006;
goto file_done;
}
@@ -1624,10 +1609,9 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
}
sizeRemaining = (fileHeaderBuffer->fileSize + 0x1F) & ~0x1F;
while (sizeRemaining != 0) {
if (sizeRemaining > 0x10000) {
chunkSize = sizeRemaining;
if (chunkSize > 0x10000) {
chunkSize = 0x10000;
} else {
chunkSize = sizeRemaining;
}
readSize = NANDRead(&savedFile, encryptionBuffer, chunkSize);
if (((readSize + 0x1F) & ~0x1F) != chunkSize) {
@@ -1726,7 +1710,6 @@ file_done:
result = -3006;
goto cleanup;
}
result = 0;
if ((s32)WADWriteStream(&stream, signature, sizeof(signature)) != (s32)sizeof(signature)) {
result = -3006;
goto cleanup;
@@ -1746,7 +1729,6 @@ file_done:
result = -3006;
goto cleanup;
}
result = 0;
if ((u32)WADWriteStream(&stream, &headerBlock, sizeof(headerBlock)) != sizeof(headerBlock)) {
result = -3006;
goto cleanup;
@@ -2009,15 +1991,17 @@ s32 WADOpenStream(WADLocation location, const char* path, WADStream* stream, u32
}
if (offset != 0) {
result = WADSeekStream(stream, offset, 0);
if ((u32)result != offset) {
if ((u32)result == offset) {
goto checkSdHandle;
} else {
return -3004;
}
} else {
result = 0;
goto checkSdHandle;
}
} else {
stream->handle.fa = FAFopen(path, "r");
}
checkSdHandle:
return stream->handle.fa == 0 ? -3004 : 0;
}
@@ -2507,8 +2491,6 @@ static s32 _WADUnpackBackup(WADHeader* header, WADStream* stream, WADUnpackInfo*
if (backupHeader->hdrSize != sizeof(WADBackupHeader)) {
return -3001;
}
/* Skipped metadata retains the incoming header address until an ES call replaces it. */
result = (s32)header;
if (backupHeader->contentSize != 0) {
result = ES_GetDeviceId(&currentDeviceId);
if (result != 0) {
@@ -2528,6 +2510,7 @@ static s32 _WADUnpackBackup(WADHeader* header, WADStream* stream, WADUnpackInfo*
sectionOffset = (backupHeader->hdrSize + WAD_STREAM_ALIGNMENT - 1) &
~(WAD_STREAM_ALIGNMENT - 1);
result = 0;
if (titleMetaSize != 0) {
if ((flags & 4) == 0) {
info->sectionSize = titleMetaSize;
@@ -2857,7 +2840,8 @@ static s32 _WADBackupGetSize(u32 flags, ESTmdView* titleMeta, ESContentMask* con
filesSize += (files[contentIndex].fileSize + 0x3F) & ~0x3F;
}
}
titleSize += contentSize + filesSize;
titleSize += contentSize;
titleSize += filesSize;
if (contentDataSize != 0) {
*contentDataSize = contentSize;
}
@@ -2928,7 +2912,11 @@ static s32 WAD_815C43E0(WADHashThreadArgs* args) {
u32 size;
for (; (remaining != 0) && (result == 0); bufferIndex ^= 1) {
size = remaining > transfer->chunkSize ? transfer->chunkSize : remaining;
size = remaining;
if (remaining > transfer->chunkSize) {
size = transfer->chunkSize;
}
OSLockMutex(&transfer->mutex[bufferIndex]);
while (transfer->ready[bufferIndex] == 0) {
OSWaitCond(&transfer->signalCond[bufferIndex], &transfer->mutex[bufferIndex]);
@@ -2971,7 +2959,10 @@ static s32 _WADHash(WADStream* stream, u32 offset, u32 size, void* context, void
result = 0;
if (!(secondBuffer != 0 && threadStack != 0)) {
while (size != 0) {
readSize = size > chunkSize ? chunkSize : size;
readSize = size;
if (size > chunkSize) {
readSize = chunkSize;
}
readBuffer = buffer;
result = WADReadStream(stream, &readBuffer, readSize, offset + completed);
if ((u32)result != readSize) {
@@ -3006,7 +2997,10 @@ static s32 _WADHash(WADStream* stream, u32 offset, u32 size, void* context, void
bufferIndex = 0;
while (size != 0 && transfer.error == 0) {
OSMutex* mutex;
readSize = size > chunkSize ? chunkSize : size;
readSize = size;
if (size > chunkSize) {
readSize = chunkSize;
}
mutex = &transfer.mutex[bufferIndex];
OSLockMutex(mutex);
while (transfer.ready[bufferIndex] != 0 && transfer.error == 0) {
@@ -3484,7 +3478,7 @@ s32 WADImportDVDExForBS(const char* path, void* buffer, u32 bufferSize) {
return -3004;
}
fileOpened = TRUE;
if (buffer == NULL) {
if (buffer == 0) {
result = -3003;
goto cleanup;
}
@@ -3525,8 +3519,8 @@ s32 WADImportDVDExForBS(const char* path, void* buffer, u32 bufferSize) {
parts.titleMeta = readBuffer + sectionOffset;
sectionOffset += (header.tmdSize + 0x3F) & ~0x3F;
}
contentBuffer = readBuffer + sectionOffset;
remainingBufferSize = bufferSize - sectionOffset;
contentBuffer = readBuffer + sectionOffset;
if ((u32)sectionOffset > bufferSize) {
result = -3003;
goto cleanup;

File diff suppressed because it is too large Load Diff

View File

@@ -821,9 +821,9 @@ CDBErr CDBRecordDecrypt(CDBRecord* record, void* buffer, u32 size, u32* dataSize
u32 fileDataSize;
u32 fileSize;
u8 iv[16];
u8 wiiIdKey[64] ATTRIBUTE_ALIGN(16);
u8 digest[20] ATTRIBUTE_ALIGN(64);
CDBRecordKey comparisonKey;
u8 digest[20] ATTRIBUTE_ALIGN(64);
u8 wiiIdKey[64] ATTRIBUTE_ALIGN(16);
NETHMACContext hmac;
CDBAttrSignature signature;

View File

@@ -180,11 +180,11 @@ void AESiEncryptBlock(AESContext* context, u32* output, const u32* input) {
const u32* key = context->keys + 4;
u32 a=input[0]^context->keys[0], b=input[1]^context->keys[1], c=input[2]^context->keys[2], d=input[3]^context->keys[3];
while (--rounds != 0) {
u32 nextA=ENCRYPT(a,b,c,d);
u32 nextB=ENCRYPT(b,c,d,a);
u32 nextC=ENCRYPT(c,d,a,b);
u32 nextD=ENCRYPT(d,a,b,c);
a=nextA^key[0]; b=nextB^key[1]; c=nextC^key[2]; d=nextD^key[3];
u32 nextA=ENCRYPT(a,b,c,d)^key[0];
u32 nextB=ENCRYPT(b,c,d,a)^key[1];
u32 nextC=ENCRYPT(c,d,a,b)^key[2];
u32 nextD=ENCRYPT(d,a,b,c)^key[3];
a=nextA; b=nextB; c=nextC; d=nextD;
key += 4;
}
output[0] = SUBSTITUTE(AESiSubShiftTable,a,b,c,d)^key[0];
@@ -203,16 +203,15 @@ void AESiDecryptBlock(AESContext* context, u32* output, const u32* input) {
u32 round;
for (round=1; round<context->rounds; ++round) {
u32 word;
u32* keys=context->keys + round*4;
for (word=0; word<4; ++word) {
u32 value=keys[word];
u32 value=context->keys[round*4+word];
u32 twice=DOUBLE_BYTES(value);
u32 four=DOUBLE_BYTES(twice);
u32 eight=DOUBLE_BYTES(four)^value;
u32 mixed=eight ^ (four ^ ROTATE(eight,8));
mixed ^= twice ^ ROTATE(mixed,8);
mixed ^= value ^ ROTATE(mixed,8);
keys[word]=mixed;
context->keys[round*4+word]=mixed;
}
}
context->needsTransform=0;
@@ -220,11 +219,11 @@ void AESiDecryptBlock(AESContext* context, u32* output, const u32* input) {
a=input[0]^key[0]; b=input[1]^key[1]; c=input[2]^key[2]; d=input[3]^key[3];
key-=4;
while (--rounds != 0) {
u32 nextA=DECRYPT(a,d,c,b);
u32 nextB=DECRYPT(b,a,d,c);
u32 nextC=DECRYPT(c,b,a,d);
u32 nextD=DECRYPT(d,c,b,a);
a=nextA^key[0]; b=nextB^key[1]; c=nextC^key[2]; d=nextD^key[3];
u32 nextA=DECRYPT(a,d,c,b)^key[0];
u32 nextB=DECRYPT(b,a,d,c)^key[1];
u32 nextC=DECRYPT(c,b,a,d)^key[2];
u32 nextD=DECRYPT(d,c,b,a)^key[3];
a=nextA; b=nextB; c=nextC; d=nextD;
key-=4;
}
output[0]=SUBSTITUTE_XOR(AESiInvSubShiftTable,a,d,c,b)^key[0];

View File

@@ -20,11 +20,11 @@ typedef struct HMACContext {
} HMACContext;
void NETHMACInit(HMACContext* context, const DigestInterface* interface, const void* key, u32 length) {
const char* function = "NETHMACInit";
u8 innerKey[64];
u32 i;
u32 keyLength;
void* work = context->digestContext;
const char* function = "NETHMACInit";
context->interface = *interface;
if (context->interface.contextSize > 96 || context->interface.blockSize > 64) {
OSReport("%s(%d):[warning in %s]", "hmac.c", 100, function);

View File

@@ -371,9 +371,9 @@ static BOOL NHTTPi_RecvProxyConnectHeader(NHTTPThreadContext* context)
response->httpStatus = NHTTPi_strToInt(header + 9, 3);
if (NHTTPi_strnicmp(header, "HTTP/", 5) == 0 && header[8] == ' '
&& response->httpStatus == 200) accepted = TRUE;
ended = FALSE;
cursor = header;
index = 0;
ended = FALSE;
while (index < used)
{
if (index > 1 && cursor[-1] == '\r' && *cursor == '\r') ended = TRUE;

View File

@@ -347,10 +347,6 @@ NWC24Err NWC24SetDlPriority(NWC24DlTask* dlTask, u8 dlPriority) {
static inline void ReadDlTaskIdentifier(const NWC24DlTask* dlTask, u16* identifier) {
*identifier = ((const DlTaskData*)dlTask)->id;
}
static inline NWC24Err SetDlTaskNextTime(NWC24DlTask* dlTask, OSTime time) {
NWC24Work* work = NWC24WorkP;
DlTaskListHeader* header = work != NULL ? (DlTaskListHeader*)work->dlHead : NULL;
@@ -362,7 +358,7 @@ static inline NWC24Err SetDlTaskNextTime(NWC24DlTask* dlTask, OSTime time) {
else if (task->id != 0xffff && task->id >= header->maxTaskCount) { result = NWC24_ERR_INVALID_VALUE; }
else { result = NWC24_OK; }
if (result != NWC24_OK) { return result; }
ReadDlTaskIdentifier(dlTask, &taskId);
taskId = task->id;
if (taskId == 0xffff) { return NWC24_ERR_FAILED; }
time /= 60;
header = work != NULL ? (DlTaskListHeader*)work->dlHead : NULL;
@@ -425,7 +421,7 @@ NWC24Err NWC24SetDlInterval(NWC24DlTask* dlTask, u16 dlInterval) {
}
}
if (result == NWC24_OK) {
ReadDlTaskIdentifier(dlTask, &taskId);
taskId = task->id;
if (taskId != 0xffff) {
nextTime /= 60;
if (work != NULL) {
@@ -547,12 +543,12 @@ NWC24Err NWC24DumpDlTask(NWC24DlTask* dlTask) {
}
NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
DlTaskListHeader* entriesHeader;
NWC24Err result;
NWC24Work* work;
u16 taskId;
u16 maxTaskCount;
DlTaskListHeader* header;
NWC24Err result;
DlTaskListHeader* entriesHeader;
if (NWC24WorkP != NULL) {
header = (DlTaskListHeader*)NWC24WorkP->dlHead;
@@ -584,7 +580,7 @@ NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
}
entriesHeader = (DlTaskListHeader*)work->dlHead;
while (taskId < (work == NULL ? (DlTaskListHeader*)NULL : entriesHeader)->maxTaskCount) {
do {
header = work != NULL ? entriesHeader : NULL;
if (taskId >= header->maxTaskCount || taskId == 0xffff) {
result = NWC24_ERR_INVALID_VALUE;
@@ -598,20 +594,20 @@ NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
return NWC24_OK;
}
taskId++;
}
} while (taskId < (work != NULL ? entriesHeader : (DlTaskListHeader*)NULL)->maxTaskCount);
return NWC24_ERR_DONE;
}
NWC24Err NWC24IterateDlTaskEx(NWC24DlIterateWork* dlIterateWork, NWC24DlId* dlIterateId) {
DlTaskIterationState* state = (DlTaskIterationState*)dlIterateWork;
s32 (*getValue)(NWC24DlId);
NWC24DlId taskId;
s32 value;
BOOL descending;
BOOL passesSelected;
BOOL bestCandidate;
BOOL found = FALSE;
s32 (*getValue)(NWC24DlId);
NWC24Err result;
BOOL found = FALSE;
if (state->valid == 0) {
return NWC24_ERR_INVALID_VALUE;
@@ -639,8 +635,8 @@ NWC24Err NWC24IterateDlTaskEx(NWC24DlIterateWork* dlIterateWork, NWC24DlId* dlIt
if (value == state->comparisonValue && (s32)state->comparisonId < (s32)taskId) {
*dlIterateId = taskId;
state->comparisonValue = value;
state->comparisonId = taskId;
state->selectedValue = value;
state->comparisonId = taskId;
return NWC24_OK;
}
result = NWC24IterateDlTask(&taskId, FALSE);
@@ -718,16 +714,6 @@ static inline NWC24Err CheckDlTaskRetry(NWC24DlTask* dlTask, u8 retryCount) {
if ((retryMask & (1 << retryCount)) == 0) { return NWC24_ERR_DISABLED; }
return NWC24_OK;
}
static inline NWC24Err UpdateDlTaskAccessTime(NWC24DlTask* dlTask) {
OSTime universalTime;
NWC24Err result = NWC24iGetUniversalTime(&universalTime);
if (result >= NWC24_OK) {
result = SetDlTaskAccessTime(dlTask, universalTime);
if (result < NWC24_OK) { return result; }
}
return result;
}
NWC24Err NWC24UpdateDlTask(NWC24DlTask* dlTask) {
DlTaskData* task = (DlTaskData*)dlTask;
DlTaskListHeader* header;
@@ -739,7 +725,11 @@ NWC24Err NWC24UpdateDlTask(NWC24DlTask* dlTask) {
if (result != NWC24_OK) { return result; }
taskId = task->id;
if (taskId == 0xffff || taskId >= GetCachedDlHeader()->maxTaskCount) { return NWC24_ERR_INVALID_VALUE; }
result = UpdateDlTaskAccessTime(dlTask);
result = NWC24iGetUniversalTime(&universalTime);
if (result >= NWC24_OK) {
result = SetDlTaskAccessTime(dlTask, universalTime);
if (result < NWC24_OK) { return result; }
}
if (result < NWC24_OK) { return result; }
result = ValidateDlTask(dlTask, TRUE);
if (result == NWC24_OK) {
@@ -788,26 +778,23 @@ NWC24Err NWC24AddDlTask(NWC24DlTask* dlTask) {
result = CheckDlTaskListHeader(header);
if (result < NWC24_OK) { return result; }
result = AddTaskInternal(dlTask, GetCachedDlHeader()->taskCount, GetCachedDlHeader()->maxTaskCount);
if (result >= NWC24_OK) {
universalTime = 0;
result = NWC24iGetUniversalTime(&universalTime);
if (result < NWC24_OK) { return result; }
{
s32 intervalSeconds;
s64 nextTime;
intervalSeconds = ((DlTaskData*)dlTask)->interval * 60;
nextTime = universalTime + intervalSeconds;
return SetDlTaskNextTime(dlTask, nextTime);
}
if (result < NWC24_OK) { return result; }
universalTime = 0;
result = NWC24iGetUniversalTime(&universalTime);
if (result < NWC24_OK) { return result; }
{
s32 intervalSeconds;
s64 nextTime;
intervalSeconds = ((DlTaskData*)dlTask)->interval * 60;
nextTime = universalTime + intervalSeconds;
return SetDlTaskNextTime(dlTask, nextTime);
}
return result;
}
NWC24Err NWC24GetDlTask(NWC24DlTask* dlTask, NWC24DlId dlId) {
DlTaskListHeader* header;
NWC24File file;
DlTaskData* task = (DlTaskData*)dlTask;
NWC24Err result;
NWC24Err operationResult;
@@ -860,7 +847,7 @@ NWC24Err NWC24GetDlTask(NWC24DlTask* dlTask, NWC24DlId dlId) {
if (operationResult < NWC24_OK) {
result = operationResult;
} else {
operationResult = NWC24FRead(task, 0x200, &file);
operationResult = NWC24FRead(dlTask, 0x200, &file);
result = NWC24_OK;
if (operationResult < NWC24_OK) {
result = operationResult;
@@ -892,13 +879,17 @@ NWC24Err NWC24PurgeOldestDlTask() {
state.initialized = 1;
state.valid = 1;
while ((result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId)) == NWC24_OK) {
result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId);
while (result == NWC24_OK) {
header = GetCachedDlHeader();
if (taskId >= header->taskCount) { break; }
result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId);
}
if (result == NWC24_ERR_DONE) {
return NWC24_ERR_FAILED;
}
if (result < NWC24_OK) {
if (result == NWC24_ERR_DONE) { result = NWC24_ERR_FAILED; }
return result;
}
@@ -1023,7 +1014,9 @@ NWC24Err NWC24ExtendDlTaskList(u32 num) {
result = WriteDlHeader(&file);
closeList:
closeResult = NWC24FClose(&file);
closeResult = result != NWC24_OK ? result : closeResult;
if (result != NWC24_OK) {
closeResult = result;
}
result = NWC24iLoadDlHeader();
if (closeResult != NWC24_OK) {
result = closeResult;
@@ -1072,10 +1065,15 @@ NWC24Err NWC24iCheckDlHeaderConsistency(DlTaskListHeader* header, BOOL repair) {
NWC24Err NWC24iCreateDlTaskList() {
u16 taskId;
DlTaskListHeader* header = GetCachedDlHeader();
DlTaskListHeader* header;
NWC24Err result;
NWC24File file;
if (NWC24WorkP != NULL) {
header = (DlTaskListHeader*)NWC24WorkP->dlHead;
} else {
header = NULL;
}
memset(header, 0, 0x800);
header->magic = 0x5763446c;
@@ -1222,16 +1220,13 @@ static inline NWC24Err ValidateDlTaskUrl(NWC24DlTask* dlTask) {
DlTaskListHeader* header = GetCachedDlHeader();
NWC24Err result;
if (task->id >= header->maxTaskCount && task->id != 0xffff) { return NWC24_ERR_INVALID_VALUE; }
{
const char* url = task->url;
result = NWC24iCheckStringLength(url, 7, 0x100);
if (result >= NWC24_OK) {
if (strncmp(url, "http://", 7) != 0 && strncmp(url, "https://", 8) != 0) { result = NWC24_ERR_FORMAT; }
else { result = NWC24_OK; }
}
if (result < NWC24_OK) { return result; }
return NWC24_OK;
result = NWC24iCheckStringLength(task->url, 7, 0x100);
if (result >= NWC24_OK) {
if (strncmp(task->url, "http://", 7) != 0 && strncmp(task->url, "https://", 8) != 0) { result = NWC24_ERR_FORMAT; }
else { result = NWC24_OK; }
}
if (result < NWC24_OK) { return result; }
return NWC24_OK;
}
static inline NWC24Err FindFreeDlTask(NWC24DlTask* dlTask, u16 taskCount, u16 maxTaskCount) {
@@ -1261,7 +1256,11 @@ static inline NWC24Err UpdateDlTaskInline(NWC24DlTask* dlTask) {
if (result != NWC24_OK) { return result; }
taskId = task->id;
if (taskId == 0xffff || taskId >= GetCachedDlHeader()->maxTaskCount) { return NWC24_ERR_INVALID_VALUE; }
result = UpdateDlTaskAccessTime(dlTask);
result = NWC24iGetUniversalTime(&universalTime);
if (result >= NWC24_OK) {
result = SetDlTaskAccessTime(dlTask, universalTime);
if (result < NWC24_OK) { return result; }
}
if (result < NWC24_OK) { return result; }
result = ValidateDlTask(dlTask, TRUE);
if (result == NWC24_OK) {
@@ -1269,7 +1268,9 @@ static inline NWC24Err UpdateDlTaskInline(NWC24DlTask* dlTask) {
task->unknown_0x1a = 0;
}
if (task->retryEnabled == 1) {
while ((result = CheckDlTaskRetry(dlTask, task->retryCount)) == NWC24_ERR_DISABLED) {
for (;;) {
result = CheckDlTaskRetry(dlTask, task->retryCount);
if (result != NWC24_ERR_DISABLED) { break; }
task->retryCount = (task->retryCount + 1) & 0x1f;
}
if (result < NWC24_OK) { return result; }

View File

@@ -596,9 +596,9 @@ static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded
NWC24Err NWC24DecodeMIMEHeaderFieldBody(u8* charsetData, u32 charsetDataSize, u8* decoded, u32 decodedCapacity, u32* decodedSize, u8* encoded,
u32 encodedSize) {
int result = 0;
char* input;
s32 inputSize;
u8* output;
s32 inputSize;
char* input;
s32 remainingCapacity;
if (decodedSize == NULL) {

View File

@@ -4,7 +4,7 @@
#include <revolution/nwc24.h>
static char MultiPartDivider[64];
BOOL LoopBackEnable[2] = {TRUE, FALSE};
BOOL LoopBackEnable = TRUE;
static NWC24File* m_pFile;
static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType type);
@@ -177,7 +177,7 @@ NWC24Err NWC24CommitMsg(NWC24MsgObj* object) {
return NWC24_ERR_LIB_NOT_OPENED;
if (!(msg->type & 0x100) || (msg->type & 0x200))
return NWC24_ERR_PROTECTED;
if (LoopBackEnable[0] && (msg->type & 1)) {
if (LoopBackEnable && (msg->type & 1)) {
NWC24GetMyUserId(&myId);
if (msg->numTo == 1 && msg->toIds[0] == myId)
loopback = TRUE;
@@ -327,7 +327,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
buffer = NWC24WorkP->stringWork;
Mail_memset(buffer, 0, 1024);
Mail_sprintf(buffer, "\r\n--%s", MultiPartDivider);
Mail_strcat(buffer, "\r\n\0");
Mail_strcat(buffer, "\r\n");
CHECK_WRITE(WriteString(msg, buffer));
}
CHECK_WRITE(WriteContentTypeField(msg));
@@ -346,7 +346,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
buffer = NWC24WorkP->stringWork;
Mail_memset(buffer, 0, 1024);
Mail_sprintf(buffer, "\r\n--%s", MultiPartDivider);
Mail_strcat(buffer, "\r\n\0");
Mail_strcat(buffer, "\r\n");
CHECK_WRITE(WriteString(msg, buffer));
CHECK_WRITE(WriteMIMEAttachHeader(msg, index));
attached[index].ptr = (const void*)msg->length;

File diff suppressed because one or more lines are too long

View File

@@ -1,47 +0,0 @@
Final matching audit
src/scene/sdChannelSelect/iplSDChannelSelect: exact 114/129 -> 116/129; objdiff code 25472 -> 26472/33828; data 224 -> 224/2960
create__Q33ipl5scene15SDChannelSelectFv | objdiff 97.73972% | 145/146 instructions; BS2 loop uses different retained manager/string bases | 7 distinct source attempts, 6 compiled
handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv | objdiff 99.15205% | 170/171 instructions; timer branch form and loop register selection | 5 distinct source attempts, 5 compiled
collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.81188% | 101/101 instructions; count increment and threshold loads scheduled differently | 7 distinct source attempts, 7 compiled
collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.833336% | 102/102 instructions; count increment and threshold loads scheduled differently | 7 distinct source attempts, 7 compiled
collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.29365% | 126/126 instructions; title registers, indexed operand order, threshold-load scheduling | 7 distinct source attempts, 7 compiled
collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.55125% | 361/361 instructions; four count-increment/threshold-load schedules | 7 distinct source attempts, 7 compiled
flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv | objdiff 99.65714% | 35/35 instructions; heap and save-manager loads occur in reversed order | 3 distinct source attempts, 3 compiled
calcCommon__Q33ipl5scene15SDChannelSelectFv | objdiff 99.07407% | 109/108 instructions; target omits setup of the second event-handler argument | 3 distinct source attempts, 3 compiled
drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | objdiff 95.35849% | 153/159 instructions; state-range branches, switch lowering, and register selection | 7 distinct source attempts, 7 compiled
initializeNormalPage__Q33ipl5scene15SDChannelSelectFv | objdiff 98.93617% | 95/94 instructions; target omits setup of the second event-handler argument | 3 distinct source attempts, 3 compiled
selectChannel__Q33ipl5scene15SDChannelSelectFii | objdiff 98.305084% | 60/59 instructions; target omits setup of the second event-handler argument | 3 distinct source attempts, 3 compiled
setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj | objdiff 93.4721% | 233/233 instructions; floating-point evaluation order and register allocation | 3 distinct source attempts, 3 compiled
onEventDerived__Q43ipl5scene32@unnamed@iplSDChannelSelect_cpp@33SDChannelSelectButtonEventHandlerFUlUlPCQ33ipl10controller9Interface | objdiff 98.541664% | 144/144 instructions; event branch form and opt-out argument setup | 6 distinct source attempts, 4 compiled
src/keyboard/tiCandidateBox: exact 103/112 -> 104/112; objdiff code 17212 -> 17996/24000; data 1132 -> 1132/4652
create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | objdiff 92.71023% | 351/352 instructions; inlined initialization loop and retained pane-name addresses | 4 distinct source attempts, 4 compiled
createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | objdiff 96.56481% | 214/216 instructions; inlined constructor/vtable lifetime and register selection | 3 distinct source attempts, 3 compiled
CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | objdiff 99.78161% | 435/435 instructions; 18 floating-point register differences | 7 distinct source attempts, 7 compiled
GetNextPageIdx___Q39textinput12candidatebox10UITextAreaCFl | objdiff 100.0% | 130/130 instructions; eight unresolved SDA21 base-register fields; C conversion left 12 register differences and was restored to preserve baseline objdiff 100% | 10 distinct source attempts, 10 compiled
GetPrevPageIdx___Q39textinput12candidatebox10UITextAreaCFl | objdiff 99.57365% | 129/129 instructions; 11 floating-point register differences | 11 distinct source attempts, 11 compiled
StartScroll__Q39textinput12candidatebox10UITextAreaFl | objdiff 99.78378% | 185/185 instructions; eight floating-point register differences | 12 distinct source attempts, 12 compiled
StartScrollToIdx__Q39textinput12candidatebox10UITextAreaFl | objdiff 99.809784% | 184/184 instructions; seven floating-point register differences | 12 distinct source attempts, 12 compiled
onGUIEvent__Q39textinput12candidatebox10UITextAreaFRQ39textinput3gui13PaneComponentUlPQ49textinput11nw4rmanager14TiEventHandler5Input | objdiff 100.0% | 450/450 instructions; objdiff 100%; gate misnormalizes two CR1 branches using the CR operand instead of the branch destination | 3 distinct source attempts, 3 compiled
src/keyboard/tiCellPhone: exact 83/86 -> 83/86; objdiff code 12824 -> 12824/19028; data 3860 -> 3860/3860
onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | objdiff 99.67009% | 682/682 instructions; 37 register differences across inlined lookup scopes | 7 distinct source attempts, 7 compiled
create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | objdiff 99.8949% | 333/333 instructions; seven register differences in the toggle animation loop | 10 distinct source attempts, 9 compiled
init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | objdiff 98.52612% | 536/536 instructions; 155 register differences; same frame and operation sequence; no tested lifetime/declaration change fixed allocation | 6 distinct source attempts, 6 compiled
Open-function audit: 24 functions; minimum 3 source attempts each.
No shared keyboard headers were edited. No configuration or target symbol sizes were edited.
The 83/86 CellPhone instruction-exact count did not improve. Its create fuzzy score improved from 99.81982% to 99.8949%.
CandidateBox has two objdiff-100 functions excluded by the raw instruction gate: GetNextPageIdx and onGUIEvent. Raw relocation fields and CR1 branch normalization account for that discrepancy; no gate tools were changed.
String pools remain identical. Object data percentages are partial in SDChannelSelect and CandidateBox; this run does not claim unit completion.
Writing skill applied: unslop.
Final full gate: GATE PASS
Regressions vs baseline: 0
Forbidden patterns: 0
Readability warnings: 0
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d

View File

@@ -63,7 +63,7 @@ BOOL AbortFlag = FALSE;
volatile int lbl_81698A44 = 0;
volatile int lbl_81698A48 = 0;
volatile int lbl_81698A4C = 0;
vu32 lbl_81698A50 = 0;
u32 lbl_81698A50 = 0;
u32 lbl_81698A54 = 0;
u32 lbl_81698A58 = 0;
u32 lbl_81698A5C = 0;
@@ -83,17 +83,17 @@ u32 lbl_81698A9C = 0;
u64 lbl_81698AA0 = 0;
u32 lbl_81698AA8 = 0;
u32 lbl_81698AAC = 0;
vu32 lbl_81698AB0 = 0;
vu32 lbl_81698AB4 = 0;
u32 lbl_81698AB0 = 0;
u32 lbl_81698AB4 = 0;
u8 *lbl_81698AB8 = NULL;
NANDFileInfo *lbl_81698ABC = NULL;
vu32 lbl_81698AC0 = 0;
volatile NANDCallback lbl_81698AC4 = NULL;
u32 lbl_81698AC0 = 0;
NANDCallback lbl_81698AC4 = NULL;
u32 lbl_81698AC8 = 0;
vu32 lbl_81698ACC = 0;
u32 lbl_81698ACC = 0;
u32 lbl_81698AD0 = 0;
vu32 lbl_81698AD4 = 0;
vu32 lbl_81698AD8 = 0;
u32 lbl_81698AD4 = 0;
u32 lbl_81698AD8 = 0;
vu32 lbl_81698ADC = 0;
vu32 lbl_81698AE0 = 0;
u32 *lbl_81698AE4 = 0;
@@ -1045,8 +1045,8 @@ void BS2NANDDivideCallback(s32 result, NANDCommandBlock *block) {
} else if (result < 0) {
NandCompletion(result, block);
} else {
NandBuffer += result;
NandTransferred += result;
NandTransferred = NandTransferred + result;
NandBuffer = NandBuffer + result;
if (NandLength - NandTransferred > 0x40000) {
if (NandOperation == 1) {
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, 0x40000);
@@ -1059,7 +1059,7 @@ void BS2NANDDivideCallback(s32 result, NANDCommandBlock *block) {
NandCompletion(ret, block);
}
} else {
if (NandLength - NandTransferred != 0) {
if (NandLength != NandTransferred) {
if (NandOperation == 1) {
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, NandLength - NandTransferred);
ret = NANDWriteAsync(NandFile, (void *)NandBuffer, NandLength - NandTransferred, BS2NANDDivideCallback, block);
@@ -1084,12 +1084,17 @@ void BS2NANDDivideReadAsync(NANDFileInfo *info, void *buffer, u32 length, NANDCa
NandTransferred = 0;
NandFile = info;
NandBuffer = (u8 *)buffer;
if (NandLength > 0x40000) {
switch (NandLength > 0x40000) {
default: {
BS2Report("NANDReadAsync buf:0x%08X, length:0x%08X\n", NandBuffer, 0x40000);
NANDReadAsync(NandFile, (void *)NandBuffer, 0x40000, BS2NANDDivideCallback, block);
} else {
break;
}
case 0: {
BS2Report("NANDReadAsync buf:0x%08X, length:0x%08X\n", NandBuffer, NandLength);
NANDReadAsync(NandFile, (void *)NandBuffer, NandLength, BS2NANDDivideCallback, block);
break;
}
}
}
@@ -1100,12 +1105,17 @@ void BS2NANDDivideWriteAsync(NANDFileInfo *info, const void *buffer, u32 length,
NandTransferred = 0;
NandFile = info;
NandBuffer = (u8 *)buffer;
if (NandLength > 0x40000) {
switch (NandLength > 0x40000) {
default: {
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, 0x40000);
NANDWriteAsync(NandFile, (void *)NandBuffer, 0x40000, BS2NANDDivideCallback, block);
} else {
break;
}
case 0: {
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, NandLength);
NANDWriteAsync(NandFile, (void *)NandBuffer, NandLength, BS2NANDDivideCallback, block);
break;
}
}
}
@@ -1192,8 +1202,8 @@ BOOL CheckBS2CommandStatus() {
if (BS2BootCaching != 0) {
BS2Report("Write partition ifno\n");
NandPending = 1;
CacheLength += OSRoundUp32B(((DVDGameTOC *)DataToc)->partitionCount * sizeof(DVDPartitionInfo)) + 32;
CacheCommandComplete = 1;
CacheLength += OSRoundUp32B(((DVDGameTOC *)DataToc)->partitionCount * sizeof(DVDPartitionInfo)) + 32;
if ((unsigned int)CacheLength > 0xb00000) {
BS2NANDCallback(-1, NULL);
return 1;

File diff suppressed because it is too large Load Diff

View File

@@ -1,19 +1,19 @@
#include <revolution/gx/GXStruct.h>
#include <revolution/os/OSError.h>
extern "C" const char scCsFatalMsg[];
extern "C" const u8 scCsFatalColorR;
extern "C" const u8 scCsFatalColorG;
extern "C" const u8 scCsFatalColorB;
extern "C" const u8 scCsFatalColorA;
extern "C" const char lbl_8166A6E3[];
extern "C" const u8 lbl_81697844;
extern "C" const u8 lbl_81697845;
extern "C" const u8 lbl_81697846;
extern "C" const u8 lbl_81697847;
#define NW4R_DB_ASSERT_H
#define NW4R_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {scCsFatalColorR, scCsFatalColorG, scCsFatalColorB, scCsFatalColorA}; \
GXColor front = {lbl_81697844, lbl_81697845, lbl_81697846, lbl_81697847}; \
GXColor back = {0, 0, 0, 0}; \
OSFatal((GXColor)front, (GXColor)back, scCsFatalMsg); \
OSFatal((GXColor)front, (GXColor)back, lbl_8166A6E3); \
} \
}
@@ -29,7 +29,7 @@ extern "C" const u8 scCsFatalColorA;
#include "math/iplMathTypes.h"
extern "C" const f32 scCsZeroF = 0.0f;
extern "C" const f32 lbl_81694FC0 = 0.0f;
extern "C" nw4r::ut::Color GetTextColor__Q34nw4r3lyt7TextBoxCFUl(const nw4r::lyt::TextBox*, u32);
@@ -130,7 +130,7 @@ namespace ipl {
nw4r::math::VEC2 scale;
scale.x = pane->GetScale().x;
scale.y = pane->GetScale().y;
result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, scCsZeroF) == TRUE;
result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, lbl_81694FC0) == TRUE;
}
}
return result;
@@ -514,7 +514,7 @@ namespace ipl {
nw4r::math::VEC3 get_vec_(CHANSVm* vm) {
u32 argc = CHANSVmGetArgc(vm);
CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0);
nw4r::math::VEC3 out(scCsZeroF, scCsZeroF, scCsZeroF);
nw4r::math::VEC3 out(lbl_81694FC0, lbl_81694FC0, lbl_81694FC0);
if (argc == 1 && util::is_valid_class(arg, "VEC3")) {
f32* src = static_cast<f32*>(*arg->value.ptr_v);
out.x = src[0];
@@ -540,7 +540,7 @@ namespace ipl {
nw4r::lyt::Size get_size_(CHANSVm* vm) {
u32 argc = CHANSVmGetArgc(vm);
CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0);
nw4r::lyt::Size out(scCsZeroF, scCsZeroF);
nw4r::lyt::Size out(lbl_81694FC0, lbl_81694FC0);
if (argc == 1 && util::is_valid_class(arg, "Size")) {
f32* src = static_cast<f32*>(*arg->value.ptr_v);
out.width = src[0];
@@ -622,15 +622,15 @@ namespace ipl {
namespace pane {
#pragma push
#pragma section const_type ".data"
extern "C" const char scCsFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
extern "C" const char lbl_8166A6E3[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
#pragma pop
#pragma push
#pragma section data_type ".sdata"
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorR = 0xff;
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorG = 0xff;
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorB = 0xff;
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorA = 0;
extern "C" __declspec(section ".sdata") const u8 lbl_81697844 = 0xff;
extern "C" __declspec(section ".sdata") const u8 lbl_81697845 = 0xff;
extern "C" __declspec(section ".sdata") const u8 lbl_81697846 = 0xff;
extern "C" __declspec(section ".sdata") const u8 lbl_81697847 = 0;
#pragma pop
}
}

View File

@@ -17,7 +17,7 @@ extern "C" void __dt__Q34nw4r3snd11SoundHandleFv(nw4r::snd::SoundHandle*, int);
namespace homebutton {
bool Controller::sBatteryFlag[WPAD_MAX_CONTROLLERS];
bool Controller::sAlarmCreated[WPAD_MAX_CONTROLLERS];
bool Controller::lbl_816989BC[WPAD_MAX_CONTROLLERS];
OSAlarm Controller::sAlarm[WPAD_MAX_CONTROLLERS];
OSAlarm Controller::sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
@@ -83,10 +83,10 @@ namespace homebutton {
if (chan < WPAD_MAX_CONTROLLERS) {
sBatteryFlag[chan] = false;
OSReport("Create %d\n", chan);
if (!sAlarmCreated[chan]) {
if (!lbl_816989BC[chan]) {
OSCreateAlarm(&sAlarm[chan]);
OSCreateAlarm(&sAlarmSoundOff[chan]);
sAlarmCreated[chan] = true;
lbl_816989BC[chan] = true;
}
sThis[chan] = this;
}

View File

@@ -12,11 +12,11 @@ namespace ext_ead {
}
}
extern "C" char scWwwErrorQ[] = "ERROR?\n";
extern "C" char scWwwTexBufFmt[] = " TextureBuffer_ %d:%d ptr:%p\n";
extern "C" char scWwwNoBrowserWin[] = "INFO: cannot create browser window\n";
extern "C" char lbl_816962F8[] = "ERROR?\n";
extern "C" char lbl_81643B40[] = " TextureBuffer_ %d:%d ptr:%p\n";
extern "C" char lbl_81643B5E[] = "INFO: cannot create browser window\n";
#define OSReport(...) OSReport(scWwwErrorQ)
#define OSReport(...) OSReport(lbl_816962F8)
#include "iplwww/www_window.h"
#undef OSReport
@@ -76,12 +76,12 @@ namespace ext_ead {
memset(mTexBufArr[i][j], 0, texBufSize);
DCStoreRange(mTexBufArr[i][j], texBufSize);
print::IPLWWWReport(print::WWW_DEBUG, scWwwTexBufFmt, j, i, mTexBufArr[i][j]);
print::IPLWWWReport(print::WWW_DEBUG, lbl_81643B40, j, i, mTexBufArr[i][j]);
}
}
if (WWWCreateBrowserWindow(mpBrowserThread->GetHandle(), &mpWwwWindow, 0)) {
print::IPLWWWReport(print::WWW_WARNING, scWwwNoBrowserWin);
print::IPLWWWReport(print::WWW_WARNING, lbl_81643B5E);
return NULL;
} else {
WWWRect rect = {0, 0, 0, 0};

View File

@@ -20,16 +20,6 @@ protected:
namespace extend {
namespace memo {
class EventHandler : public inputform::EventHandler {
public:
EventHandler(InputForm* form) : inputform::EventHandler(form), mpMemoForm(form) {}
virtual ~EventHandler() {}
virtual void onTiEvent(gui::PaneComponent*, u32, Input*);
private:
InputForm* mpMemoForm;
};
class AnmPane : public nw4rmanager::AnmPane {
protected:
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
@@ -38,8 +28,8 @@ public:
virtual ~AnmPane();
virtual void init();
virtual void changeAnimation(u32 id);
virtual u32 getKeyType() const;
virtual u32 getState();
virtual u32 getKeyType() const;
protected:
u32 meState;
u32 meKeyType;
@@ -59,6 +49,13 @@ public:
virtual void onAnmEvent(AnmPaneEvent event);
};
class SimpleAnmPane : public nw4rmanager::AnmPane {
public:
SimpleAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer) {}
virtual ~SimpleAnmPane() {}
virtual void init();
virtual void changeAnimation(u32 id);
};
class ScrollButton {
public:
@@ -77,16 +74,15 @@ private:
bool mbRightPressed;
};
class SimpleAnmPane : public nw4rmanager::AnmPane {
class EventHandler : public inputform::EventHandler {
public:
SimpleAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer) {}
virtual ~SimpleAnmPane() {}
virtual void init();
virtual void changeAnimation(u32 id);
EventHandler(InputForm* form) : inputform::EventHandler(form), mpMemoForm(form) {}
virtual ~EventHandler() {}
virtual void onTiEvent(gui::PaneComponent*, u32, Input*);
private:
InputForm* mpMemoForm;
};
static const char* scPaneName[] = {
"N_Header", "N_Body", "B_Body", "N_Footer", "Nigaoe",
"T_Nigaoe", "B_Nigaoe", "T_Letter", "T_TouchLetter"

View File

@@ -1,4 +1,3 @@
#define TI_CANDIDATEBOX_IMPLEMENTATION
#include "keyboard/tiCandidateBox.h"
#include "keyboard/tiManager.h"
@@ -408,9 +407,8 @@ namespace textinput {
}
void LayoutByNW4R::createAnmPane_(MEMAllocator* allocator) {
CandidateTextAnmPane* pane;
for (u16 i = 0; i < ARRAY_LENGTH(lbl_8165D2F8.panes); i++) {
pane = NULL;
CandidateTextAnmPane* pane = NULL;
const PaneToAnimation& p = lbl_8165D2F8.panes[i];
switch (p.type) {
case KT_ScrollButton: {
@@ -1054,11 +1052,9 @@ namespace textinput {
f32 fontSizeWidth = pTextBox->GetFontSize().width;
f32 charSpace = pTextBox->GetCharSpace();
f32 acc = 0.0f;
const wchar_t* character = text;
while (*character != L'\0') {
for (int i = 0; text[i] != L'\0'; i++) {
acc += charSpace;
acc += f->GetCharWidth(*character);
++character;
acc += f->GetCharWidth(text[i]);
}
return acc * (fontSizeWidth / f->GetWidth()) + 0.01f;
}
@@ -1241,7 +1237,7 @@ namespace textinput {
}
void UITextArea::Draw(const nw4r::lyt::DrawInfo& drawInfo) {
textdrawer::Base::ViewPort viewport;
// NONMATCHING
s32 selected = GetSelectedPaneIdx();
if (!IsScrolling()) {
for (u32 i = 0; i < NUM_PANES; i++) {
@@ -1251,26 +1247,31 @@ namespace textinput {
}
}
struct {
f32 left;
f32 width;
} scissor;
nw4r::ut::Rect r = mpTextAreaPane->getPane()->GetPaneRect(drawInfo);
// TODO - These vectors are zero-initialized using GPRs first...
Vec v1 = {0, 0, 0};
Vec v2 = {0, 0, 0};
v1.x = r.left;
v1.y = r.top;
Vec v2 = {0, 0, 0};
v2.x = r.right;
v2.y = r.bottom;
MTXMultVec(mpTextAreaPane->getTextPane()->GetGlobalMtx(), &v1, &v1);
MTXMultVec(mpTextAreaPane->getTextPane()->GetGlobalMtx(), &v2, &v2);
u32 left, top, wd, ht;
GXGetScissor(&left, &top, &wd, &ht);
// TODO - These floats need to be stored to the stack
f32 scale = 640.0f / mfScreenWidth;
viewport.xOrig = v1.x + mfScreenWidth / 2.0f;
viewport.xOrig += viewport.xOrig * (scale - 1.0f);
viewport.wd = scale * (v2.x - v1.x);
GXSetScissor(viewport.xOrig, top, viewport.wd, ht);
scissor.left = v1.x + mfScreenWidth / 2.0f;
scissor.left += scissor.left * (scale - 1.0f);
scissor.width = scale * (v2.x - v1.x);
GXSetScissor(scissor.left, top, scissor.width, ht);
mpTextsPane->getPane()->Draw(drawInfo);
if (!IsScrolling()) {
GXSetScissor(left, top, (viewport.wd + viewport.xOrig) - left, ht);
GXSetScissor(left, top, (scissor.width + scissor.left) - left, ht);
for (u32 i = 0; i < NUM_PANES; i++) {
if (i == selected || mpTextAnmPane[i]->getState() == ANM_FocusOut) {
mpTextBoxPane[i]->getPane()->SetVisible(true);
@@ -1281,28 +1282,153 @@ namespace textinput {
GXSetScissor(left, top, wd, ht);
}
s32 UITextArea::GetNextPageIdx_(s32 idx) const {
f32 areaPaneWidth = mpTextAreaPane->getPane()->GetSize().width;
nw4r::lyt::TextBox* textBox = mpTextBoxPane[0]->getTextPane();
f32 widthScale = GetWidthScale_();
f32 margin = GetMargin_();
f32 xOffset = -margin;
s32 candidateIndex = idx;
while (xOffset <= areaPaneWidth) {
if (candidateIndex == mnCandidateNum) {
return -1;
}
f32 textWidth = calcStringWidth(mpCandidates->szwcPredicted[candidateIndex], textBox);
xOffset += margin + textWidth * widthScale;
++candidateIndex;
}
if (candidateIndex - 1 == idx) {
++candidateIndex;
}
return candidateIndex - 1;
extern "C" asm void GetNextPageIdx___Q39textinput12candidatebox10UITextAreaCFl() {
nofralloc
stwu r1, -0xc0(r1)
mflr r0
stw r0, 0xc4(r1)
stfd f31, 0xb0(r1)
psq_st f31, 0xb8(r1), 0, 0
stfd f30, 0xa0(r1)
psq_st f30, 0xa8(r1), 0, 0
stfd f29, 0x90(r1)
psq_st f29, 0x98(r1), 0, 0
stfd f28, 0x80(r1)
psq_st f28, 0x88(r1), 0, 0
stfd f27, 0x70(r1)
psq_st f27, 0x78(r1), 0, 0
stfd f26, 0x60(r1)
psq_st f26, 0x68(r1), 0, 0
stfd f25, 0x50(r1)
psq_st f25, 0x58(r1), 0, 0
stfd f24, 0x40(r1)
psq_st f24, 0x48(r1), 0, 0
stfd f23, 0x30(r1)
psq_st f23, 0x38(r1), 0, 0
addi r11, r1, 0x30
bl _savegpr_24
lfs f0, lbl_81694DA8(r2)
mr r24, r3
lfs f1, 0x1fc(r3)
mr r25, r4
lwz r5, 0xd8(r3)
fdivs f25, f0, f1
lfs f0, lbl_81694DB4(r2)
lwz r5, 0x9c(r5)
lwz r3, 0x38(r3)
lfs f31, 0x4c(r5)
lwz r27, 0x9c(r3)
fcmpo cr0, f1, f0
ble GetNextPageIdx_L1
lfs f28, lbl_81694DAC(r2)
b GetNextPageIdx_L2
GetNextPageIdx_L1:
lfs f28, lbl_81694DB0(r2)
GetNextPageIdx_L2:
fneg f23, f28
lfd f29, lbl_81694DC8(r2)
lfs f30, lbl_81694DBC(r2)
mr r26, r25
slwi r28, r4, 7
lis r31, 0x4330
b GetNextPageIdx_L3
GetNextPageIdx_L4:
lwz r0, 0x1e8(r24)
cmpw r26, r0
bne GetNextPageIdx_L5
li r3, -1
b GetNextPageIdx_L6
GetNextPageIdx_L5:
lwz r0, 0x204(r24)
add r0, r0, r28
addic. r30, r0, 4
bne GetNextPageIdx_L7
lfs f0, lbl_81694D90(r2)
b GetNextPageIdx_L8
GetNextPageIdx_L7:
mr r3, r27
bl GetFont__Q34nw4r3lyt8TextBoxCFv
lfs f26, 0xe4(r27)
mr r29, r3
lfs f24, 0xf0(r27)
lfs f27, lbl_81694D90(r2)
b GetNextPageIdx_L9
GetNextPageIdx_L10:
lwz r12, 0(r29)
fadds f27, f27, f24
mr r3, r29
lwz r12, 0x48(r12)
mtctr r12
bctrl
xoris r0, r3, 0x8000
stw r31, 8(r1)
addi r30, r30, 2
stw r0, 0xc(r1)
lfd f0, 8(r1)
fsubs f0, f0, f29
fadds f27, f27, f0
GetNextPageIdx_L9:
lhz r4, 0(r30)
cmpwi r4, 0
bne GetNextPageIdx_L10
lwz r12, 0(r29)
mr r3, r29
lwz r12, 0xc(r12)
mtctr r12
bctrl
xoris r0, r3, 0x8000
stw r31, 8(r1)
stw r0, 0xc(r1)
lfd f0, 8(r1)
fsubs f0, f0, f29
fdivs f0, f26, f0
fmuls f0, f27, f0
fadds f0, f30, f0
GetNextPageIdx_L8:
fmuls f0, f0, f25
addi r28, r28, 0x80
addi r26, r26, 1
fadds f0, f28, f0
fadds f23, f23, f0
GetNextPageIdx_L3:
fcmpo cr0, f23, f31
cror 2, 0, 2
beq GetNextPageIdx_L4
addi r0, r26, -1
cmpw r0, r25
bne GetNextPageIdx_L11
addi r26, r26, 1
GetNextPageIdx_L11:
addi r3, r26, -1
GetNextPageIdx_L6:
psq_l f31, 0xb8(r1), 0, 0
lfd f31, 0xb0(r1)
psq_l f30, 0xa8(r1), 0, 0
lfd f30, 0xa0(r1)
psq_l f29, 0x98(r1), 0, 0
lfd f29, 0x90(r1)
psq_l f28, 0x88(r1), 0, 0
lfd f28, 0x80(r1)
psq_l f27, 0x78(r1), 0, 0
lfd f27, 0x70(r1)
psq_l f26, 0x68(r1), 0, 0
lfd f26, 0x60(r1)
psq_l f25, 0x58(r1), 0, 0
lfd f25, 0x50(r1)
psq_l f24, 0x48(r1), 0, 0
lfd f24, 0x40(r1)
psq_l f23, 0x38(r1), 0, 0
addi r11, r1, 0x30
lfd f23, 0x30(r1)
bl _restgpr_24
lwz r0, 0xc4(r1)
mtlr r0
addi r1, r1, 0xc0
blr
}
s32 UITextArea::GetPrevPageIdx_(s32 idx) const {
// NONMATCHING - only regswaps, hopefully
f32 areaPaneWidth = mpTextAreaPane->getPane()->GetSize().width;
nw4r::lyt::TextBox* textBox = mpTextBoxPane[0]->getTextPane();
@@ -1326,6 +1452,7 @@ namespace textinput {
}
void UITextArea::StartScroll(s32 steps) {
// NONMATCHING - only regswaps, hopefully
f32 acc = 0.0f;
f32 widthScale = GetWidthScale_();
f32 margin = GetMargin_();
@@ -1343,7 +1470,7 @@ namespace textinput {
}
}
mScrollAnimation.startAnm(this, 0.0f, -acc, 15.0f, reinterpret_cast<void*>(steps));
mScrollAnimation.startAnm(this, 0.0f, -acc, 15.0f, this);
}
void UITextArea::StartScrollToIdx(s32 idx) {

View File

@@ -606,9 +606,8 @@ namespace textinput {
CellPhoneAnmPane* pane = new (MEMAllocFromAllocator(allocator, sizeof(CellPhoneAnmPane)))
CellPhoneAnmPane(getPane(csPaneNameNormalAnimationKey[i].name), NULL);
nw4r::ut::List_Append(&mAnmPanes, pane);
const char* animationKey;
const PaneNameToAnimationKey& paneName = csPaneNameNormalAnimationKey[i];
animationKey = paneName.animationKey;
const char* animationKey = paneName.animationKey;
for (u16 j = 0; j < 5; ++j) {
void* resource = mpMultiArcResourceAccessor->GetResource(0, csAninationFileForControlKey[j].filename);

View File

@@ -8,7 +8,7 @@
namespace textinput {
namespace gui {
extern "C" void drawLine___Q29textinput3guiFfffffUcR8_GXColor();
extern "C" const f32 scGuiZeroF;
extern "C" const f32 lbl_81694EE8;
void drawLine_(f32 x0, f32 y0, f32 x1, f32 y1, f32 z, u8 width, GXColor& color) {
GXClearVtxDesc();
@@ -31,7 +31,7 @@ namespace textinput {
GXSetBlendMode(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_NOOP);
Mtx mtx;
MTXTrans(mtx, scGuiZeroF, scGuiZeroF, scGuiZeroF);
MTXTrans(mtx, lbl_81694EE8, lbl_81694EE8, lbl_81694EE8);
GXLoadPosMtxImm(mtx, 0);
GXSetLineWidth(width, GX_TO_ZERO);
@@ -334,7 +334,7 @@ namespace textinput {
MTXInverse(mpPane->GetGlobalMtx(), globalMtx);
nw4r::math::VEC3 pos;
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, scGuiZeroF), pos);
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, lbl_81694EE8), pos);
nw4r::ut::Rect rect = mpPane->GetPaneRect(*drawInfo);
@@ -348,12 +348,12 @@ namespace textinput {
#pragma push
#pragma section sconst_type ".sdata2"
extern "C" const f32 scGuiZeroF = 0.0f;
extern "C" const u8 scGuiLineColorR = 0xFF;
extern "C" const u8 scGuiLineColorG = 0x00;
extern "C" const u8 scGuiLineColorB = 0x00;
extern "C" const u8 scGuiLineColorA = 0xFF;
extern "C" const f32 scGuiHalfF = 0.5f;
extern "C" const f32 lbl_81694EE8 = 0.0f;
extern "C" const u8 lbl_81694EEC = 0xFF;
extern "C" const u8 lbl_81694EED = 0x00;
extern "C" const u8 lbl_81694EEE = 0x00;
extern "C" const u8 lbl_81694EEF = 0xFF;
extern "C" const f32 lbl_81694EF0 = 0.5f;
#pragma pop
extern "C" asm void draw__Q39textinput3gui13PaneComponentFv() {
@@ -376,15 +376,15 @@ namespace textinput {
beq pane_component_draw_done
lwz r5, 0x9c(r31)
mr r3, r31
lbz r7, scGuiLineColorR
lbz r7, lbl_81694EEC
li r4, 0
lfs f1, 0x4c(r5)
lfs f0, 0x50(r5)
lfs f31, 0x90(r5)
lfs f30, 0xa0(r5)
lbz r6, scGuiLineColorG
lbz r5, scGuiLineColorB
lbz r0, scGuiLineColorA
lbz r6, lbl_81694EED
lbz r5, lbl_81694EEE
lbz r0, lbl_81694EEF
stb r7, 8(r1)
stb r6, 9(r1)
stb r5, 0xa(r1)
@@ -402,13 +402,13 @@ namespace textinput {
stb r3, 8(r1)
stb r0, 0xa(r1)
pane_component_draw_lines:
lfs f1, scGuiHalfF
lfs f1, lbl_81694EF0
addi r4, r1, 8
lfs f0, 0x14(r1)
li r3, 8
lfs f2, 0x10(r1)
fmuls f0, f0, f1
lfs f5, scGuiZeroF
lfs f5, lbl_81694EE8
fmuls f3, f2, f1
fsubs f2, f30, f0
fsubs f1, f31, f3
@@ -417,24 +417,24 @@ namespace textinput {
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
lfs f1, 0x10(r1)
addi r4, r1, 8
lfs f2, scGuiHalfF
lfs f2, lbl_81694EF0
li r3, 8
lfs f0, 0x14(r1)
fmuls f1, f1, f2
lfs f5, scGuiZeroF
lfs f5, lbl_81694EE8
fmuls f0, f0, f2
fadds f1, f31, f1
fsubs f2, f30, f0
fadds f4, f30, f0
fmr f3, f1
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
lfs f1, scGuiHalfF
lfs f1, lbl_81694EF0
addi r4, r1, 8
lfs f0, 0x14(r1)
li r3, 8
lfs f2, 0x10(r1)
fmuls f0, f0, f1
lfs f5, scGuiZeroF
lfs f5, lbl_81694EE8
fmuls f3, f2, f1
fadds f2, f30, f0
fadds f1, f31, f3
@@ -443,11 +443,11 @@ namespace textinput {
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
lfs f1, 0x10(r1)
addi r4, r1, 8
lfs f2, scGuiHalfF
lfs f2, lbl_81694EF0
li r3, 8
lfs f0, 0x14(r1)
fmuls f1, f1, f2
lfs f5, scGuiZeroF
lfs f5, lbl_81694EE8
fmuls f0, f0, f2
fsubs f1, f31, f1
fadds f2, f30, f0

View File

@@ -5,6 +5,8 @@
#include "keyboard/tiHKBManager.h"
#include "keyboard/tiLayoutGather.h"
extern const u8 lbl_81616BD8[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern const u8 lbl_81616BE4[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" void SetCountry__Q39textinput5input10HKBManagerFUc();
extern "C" textinput::input::HKBManager sInstance__Q39textinput5input10HKBManager;
extern "C" void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw();
@@ -526,9 +528,6 @@ extern const u8 controlKeys[];
return false;
}
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
const u8 controlKeys[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
@@ -640,16 +639,16 @@ const u8 controlKeys[] = {
nofralloc
cmpwi r4, 2
bne setLanguage_L1
lis r4, scCountryMap_EU@ha
lis r4, lbl_81616BD8@ha
lis r3, sInstance__Q39textinput5input10HKBManager@ha
addi r4, r4, scCountryMap_EU@l
addi r4, r4, lbl_81616BD8@l
lbzx r4, r4, r5
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
b SetCountry__Q39textinput5input10HKBManagerFUc
setLanguage_L1:
lis r4, scCountryMap_NonEU@ha
lis r4, lbl_81616BE4@ha
lis r3, sInstance__Q39textinput5input10HKBManager@ha
addi r4, r4, scCountryMap_NonEU@l
addi r4, r4, lbl_81616BE4@l
lbzx r4, r4, r5
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
b SetCountry__Q39textinput5input10HKBManagerFUc

View File

@@ -284,12 +284,122 @@ void Base::inputCharDefault_(wchar_t character, u32 modifiers) {
meScrollFlag = SF_ScrollOn;
}
void LayoutByNW4R::draw() {
nw4rmanager::Layout::draw();
muGlobalAlpha = getLayout()->GetRootPane()->GetAlpha();
nw4r::lyt::Pane* textBox = mpLayout->GetRootPane()->FindPaneByName(static_cast<const char*>(mpLayoutData), true);
AdjustPaneMtx(mMtx.m, mDrawInfo, textBox->GetGlobalMtx());
Base::draw();
extern "C" asm void draw__Q39textinput9inputform12LayoutByNW4RFv() {
nofralloc
stwu r1, -0x50(r1)
mflr r0
stw r0, 0x54(r1)
stw r31, 0x4c(r1)
stw r30, 0x48(r1)
mr r30, r3
addi r3, r3, 0x218
bl draw__Q39textinput11nw4rmanager6LayoutFv
lwz r12, 0x218(r30)
addi r3, r30, 0x218
lwz r12, 0x28(r12)
mtctr r12
bctrl
lwz r4, 0x10(r3)
li r5, 1
lwz r3, 0x21c(r30)
lbz r0, 0xcd(r4)
lwz r4, 0x2c0(r30)
stb r0, 0x1c8(r30)
lwz r3, 0x10(r3)
lwz r12, 0(r3)
lwz r12, 0x3c(r12)
mtctr r12
bctrl
lwz r12, 0x218(r30)
mr r6, r3
addi r3, r30, 0x218
addi r4, r30, 0x130
lwz r12, 0x70(r12)
addi r5, r30, 0x230
addi r6, r6, 0x84
mtctr r12
bctrl
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0x188(r12)
mtctr r12
bctrl
stw r3, 0x18(r1)
addi r3, r30, 0x10
lfs f2, 0x188(r30)
stw r4, 0x1c(r1)
lfs f1, 0x18(r1)
bl SetCursor__Q34nw4r2ut10CharWriterFff
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0x188(r12)
mtctr r12
bctrl
lfs f0, lbl_81694D28(r0)
stw r3, 0x20(r1)
stfs f0, 0x30(r1)
stfs f0, 0x34(r1)
stfs f0, 0x38(r1)
stfs f0, 0x3c(r1)
lwz r12, 0(r30)
stw r3, 8(r1)
mr r3, r30
lwz r12, 0x184(r12)
stw r4, 0x24(r1)
stw r4, 0xc(r1)
mtctr r12
bctrl
stw r3, 0x10(r1)
lfs f1, 8(r1)
stw r4, 0x14(r1)
lfs f5, 0x10(r1)
lfs f4, 0x14(r1)
stfs f5, 0x30(r1)
lfs f0, 0xc(r1)
stfs f4, 0x3c(r1)
lfs f3, 0x128(r30)
lfs f2, 0x120(r30)
stw r3, 0x28(r1)
fsubs f2, f3, f2
stw r4, 0x2c(r1)
fmuls f1, f1, f2
fadds f1, f5, f1
stfs f1, 0x38(r1)
lfs f2, 0x124(r30)
lfs f1, 0x12c(r30)
fsubs f1, f2, f1
fmuls f0, f0, f1
fadds f0, f4, f0
stfs f0, 0x34(r1)
lwz r3, 0x164(r30)
lwz r12, 0(r3)
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r12, 0x5c(r30)
mr r31, r3
addi r3, r30, 0x10
addi r4, r1, 0x30
lwz r12, 0x20(r12)
mtctr r12
bctrl
lwz r12, 0(r30)
mr r3, r30
mr r4, r31
lwz r12, 0x174(r12)
mtctr r12
bctrl
lwz r12, 0x5c(r30)
addi r3, r30, 0x10
lwz r12, 0x24(r12)
mtctr r12
bctrl
lwz r0, 0x54(r1)
lwz r31, 0x4c(r1)
lwz r30, 0x48(r1)
mtlr r0
addi r1, r1, 0x50
blr
}
void Base::calcCursorTimer() {
muCursorTimer += 8;
@@ -384,6 +494,7 @@ extern "C" const LanguagePaneData csLanguageDependencyDataCHN__Q29textinput9inpu
extern "C" const wchar_t pppURLCheck[2][10] = {L"http://", L"https://"};
extern "C" const u32 lbl_816152D0[4] = {0x00200000, 0, 0, 0};
#pragma pop
extern "C" const f32 lbl_81694D28 = 0.0f;
@@ -548,7 +659,6 @@ struct CharacterInput {
u32 modifiers;
bool keyboardMode;
bool deadKey;
u32 data;
};
struct ConfirmInput {
@@ -936,17 +1046,17 @@ void Base::onCommand(INPUT_COMMAND command, void* data) {
mbPredictOn = enabled;
if (meLanguage == KR) mpManager->getPCKeyboard()->refreshState();
}
s32 predictionFixedMode = mpString->getTranslateMode();
s32 predictionUnfixMode = mpUnfixString->getTranslateMode();
tistring::Decolated::TranslateMode predictionFixedMode = mpString->getTranslateMode();
const tistring::Decolated::TranslateMode predictionUnfixMode = mpUnfixString->getTranslateMode();
mpString->initKanaConverter();
mpUnfixString->initKanaConverter();
if (meLanguage == KR) {
if (predictionFixedMode != tistring::Decolated::TM_Direct) predictionFixedMode = tistring::Decolated::TM_Hangul;
} else if (meLanguage == CN) predictionFixedMode = tistring::Decolated::TM_Direct;
mpString->getCursorPos();
mpString->setTranslateMode(static_cast<tistring::Decolated::TranslateMode>(predictionFixedMode));
mpString->setTranslateMode(predictionFixedMode);
mpString->getCursorPos();
mpUnfixString->setTranslateMode(static_cast<tistring::Decolated::TranslateMode>(predictionUnfixMode));
mpUnfixString->setTranslateMode(predictionUnfixMode);
switch (mePredictMode) {
case PM_Atok:
if (!mbPredictOn) {
@@ -2110,13 +2220,15 @@ void Base::onPressUp() {
}
}
}
if (current->hasCandidate() || !current->isKanaFix()) return;
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
if (mpUnfixString->getCandidate() != L' ') {
moveCursorUp();
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
if (!current->hasCandidate()) {
if (!current->isKanaFix()) return;
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
if (mpUnfixString->getCandidate() != L' ') {
moveCursorUp();
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
}
}
}
}
@@ -2161,20 +2273,22 @@ void Base::onPressDown() {
}
}
}
if (current->hasCandidate() || !current->isKanaFix()) return;
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
if (mpUnfixString->getCandidate() != L' ') {
moveCursorDown();
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
if (!current->hasCandidate()) {
if (!current->isKanaFix()) return;
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
if (mpUnfixString->getCandidate() != L' ') {
moveCursorDown();
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
}
}
}
}
void Base::onPressDownHWKB() {
s32 selected;
tistring::Decolated* current = getCurrentString(false);
s32 selected;
u32 modifiers = input::HKBManager::getInstance().GetModifierState();
if (current == mpString) {
mpManager->getHWKeyboard()->resetQuoteState();
@@ -2195,11 +2309,12 @@ void Base::onPressDownHWKB() {
}
}
}
if (current->hasCandidate() || !current->isKanaFix()) return;
if (!current->hasCandidate()) {
if (!current->isKanaFix()) return;
if (mpUnfixString->getCandidate() == L' ') return;
moveCursorDown();
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
}
} else if (mpUnfixString == current) {
if (!mpUnfixString->isKanaFix()) mpUnfixString->confirmKana();
if (mpUnfixString->isConverting()) {
@@ -2229,9 +2344,6 @@ void Base::onPressDownHWKB() {
}
}
}
else if (mpZiString == current) {
return;
}
}
void Base::onPressLeftHWKB() {
@@ -2257,7 +2369,11 @@ void Base::onPressLeftHWKB() {
}
current->getCursorPos();
}
if (current->hasCandidate() || !current->isKanaFix()) return;
if (current->hasCandidate()) return;
switch (current->isKanaFix()) {
case true: break;
default: return;
}
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
@@ -2314,7 +2430,11 @@ void Base::onPressRightHWKB() {
}
current->getCursorPos();
}
if (current->hasCandidate() || !current->isKanaFix()) return;
if (current->hasCandidate()) return;
switch (current->isKanaFix()) {
case true: break;
default: return;
}
mpManager->getHWKeyboard()->resetQuoteState();
mpUnfixString->resetRelation();
updateCandidateState_();
@@ -2350,73 +2470,375 @@ void Base::onPressRightHWKB() {
meScrollFlag = SF_ScrollOn;
}
void Base::onPressLeft() {
tistring::Decolated* current = getCurrentString(false);
current->getCursorPos();
if (current == mpString) {
if (meLanguage == KR) {
if (!getCurrentString(false)->isKanaFix()) {
mpString->getCursorPos();
mpString->inputChar(L'\n');
mpString->getCursorPos();
if (meLanguage == CN) {
bool predictions;
if (!mbPredictOn) predictions = false;
else if (mePredictMode != PM_Atok && mpZiString->getCurrentNumPredicted() > 0) predictions = true;
else predictions = false;
if (predictions) {
mpZiString->setCurrentWord(NULL);
mpZiString->update();
}
}
}
current->getCursorPos();
}
if (current->hasCandidate() || !current->isKanaFix()) return;
resetInputRelation();
if (mpUnfixString->getCandidate() == L' ') return;
}
if (current->moveCursorLeft()) onSE(static_cast<sound::SE>(5));
else onSE(static_cast<sound::SE>(6));
if (current == mpUnfixString) updateCandidateState_();
meScrollFlag = SF_ScrollOn;
extern "C" asm void onPressLeft__Q39textinput9inputform4BaseFv() {
nofralloc
stwu r1, -0x10(r1)
mflr r0
li r4, 0
stw r0, 0x14(r1)
stw r31, 0xc(r1)
stw r30, 8(r1)
mr r30, r3
bl getCurrentString__Q39textinput9inputform4BaseFb
lwz r12, 0(r3)
mr r31, r3
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r0, 0x164(r30)
cmplw r31, r0
bne onPressLeft_L1
lwz r0, 0x1f0(r30)
cmpwi r0, 9
bne onPressLeft_L2
mr r3, r30
li r4, 0
bl getCurrentString__Q39textinput9inputform4BaseFb
lwz r12, 0(r3)
lwz r12, 0xc0(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressLeft_L3
lwz r3, 0x164(r30)
lwz r12, 0(r3)
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r3, 0x164(r30)
li r4, 0xa
lwz r12, 0(r3)
lwz r12, 0x50(r12)
mtctr r12
bctrl
lwz r3, 0x164(r30)
lwz r12, 0(r3)
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r0, 0x1f0(r30)
cmpwi r0, 8
bne onPressLeft_L3
lbz r0, 0x178(r30)
cmpwi r0, 0
bne onPressLeft_L4
li r0, 0
b onPressLeft_L5
onPressLeft_L4:
lwz r0, 0x174(r30)
cmpwi r0, 1
beq onPressLeft_L6
lwz r3, 0x16c(r30)
lwz r12, 0(r3)
lwz r12, 0xd8(r12)
mtctr r12
bctrl
cmpwi r3, 0
ble onPressLeft_L6
li r0, 1
b onPressLeft_L5
onPressLeft_L6:
li r0, 0
onPressLeft_L5:
cmpwi r0, 0
beq onPressLeft_L3
lwz r3, 0x16c(r30)
li r4, 0
bl setCurrentWord__Q39textinput8tistring6WithZiFPCw
lwz r3, 0x16c(r30)
bl update__Q39textinput8tistring6WithZiFv
onPressLeft_L3:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x7c(r12)
mtctr r12
bctrl
onPressLeft_L2:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x48(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressLeft_Lend
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0xc0(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressLeft_L13
b onPressLeft_Lend
onPressLeft_L13:
lwz r3, 0x1d4(r30)
lwz r12, 0(r3)
lwz r12, 0x6c(r12)
mtctr r12
bctrl
li r0, 0
stb r0, 0x15(r3)
stb r0, 0x16(r3)
lwz r3, 0x168(r30)
lwz r12, 0(r3)
lwz r12, 0x128(r12)
mtctr r12
bctrl
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0xd8(r12)
mtctr r12
bctrl
lwz r3, 0x168(r30)
lwz r12, 0(r3)
lwz r12, 0x44(r12)
mtctr r12
bctrl
clrlwi r0, r3, 16
cmplwi r0, 0x20
beq onPressLeft_Lend
onPressLeft_L1:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x68(r12)
mtctr r12
bctrl
cmpwi r3, 0
beq onPressLeft_L10
lwz r12, 0(r30)
mr r3, r30
li r4, 5
lwz r12, 0x178(r12)
mtctr r12
bctrl
b onPressLeft_L11
onPressLeft_L10:
lwz r12, 0(r30)
mr r3, r30
li r4, 6
lwz r12, 0x178(r12)
mtctr r12
bctrl
onPressLeft_L11:
lwz r0, 0x168(r30)
cmplw r31, r0
bne onPressLeft_L12
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0xd8(r12)
mtctr r12
bctrl
onPressLeft_L12:
li r0, 1
stw r0, 0x1b0(r30)
onPressLeft_Lend:
lwz r0, 0x14(r1)
lwz r31, 0xc(r1)
lwz r30, 8(r1)
mtlr r0
addi r1, r1, 0x10
blr
}
void Base::onPressRight() {
tistring::Decolated* current = getCurrentString(false);
current->getCursorPos();
if (current == mpString) {
if (meLanguage == KR) {
if (!getCurrentString(false)->isKanaFix()) {
mpString->getCursorPos();
mpString->inputChar(L'\n');
mpString->getCursorPos();
if (meLanguage == CN) {
bool predictions;
if (!mbPredictOn) predictions = false;
else if (mePredictMode != PM_Atok && mpZiString->getCurrentNumPredicted() > 0) predictions = true;
else predictions = false;
if (predictions) {
mpZiString->setCurrentWord(NULL);
mpZiString->update();
}
}
}
current->getCursorPos();
}
if (current->hasCandidate() || !current->isKanaFix()) return;
resetInputRelation();
if (mpUnfixString->getCandidate() == L' ') return;
}
if (current->moveCursorRight() && mbRightWithSpace) {
CharacterInput space = {L' ', 0, false, false, 0};
onCommand(static_cast<INPUT_COMMAND>(0), &space);
onSE(static_cast<sound::SE>(5));
}
if (current == mpZiString || current == mpUnfixString) onSE(static_cast<sound::SE>(6));
else onSE(static_cast<sound::SE>(5));
if (current == mpUnfixString) updateCandidateState_();
meScrollFlag = SF_ScrollOn;
extern "C" asm void onPressRight__Q39textinput9inputform4BaseFv() {
nofralloc
stwu r1, -0x20(r1)
mflr r0
li r4, 0
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
stw r30, 0x18(r1)
mr r30, r3
bl getCurrentString__Q39textinput9inputform4BaseFb
lwz r12, 0(r3)
mr r31, r3
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r0, 0x164(r30)
cmplw r31, r0
bne onPressRight_L1
lwz r0, 0x1f0(r30)
cmpwi r0, 9
bne onPressRight_L2
mr r3, r30
li r4, 0
bl getCurrentString__Q39textinput9inputform4BaseFb
lwz r12, 0(r3)
lwz r12, 0xc0(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressRight_L3
lwz r3, 0x164(r30)
lwz r12, 0(r3)
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r3, 0x164(r30)
li r4, 0xa
lwz r12, 0(r3)
lwz r12, 0x50(r12)
mtctr r12
bctrl
lwz r3, 0x164(r30)
lwz r12, 0(r3)
lwz r12, 0x7c(r12)
mtctr r12
bctrl
lwz r0, 0x1f0(r30)
cmpwi r0, 8
bne onPressRight_L3
lbz r0, 0x178(r30)
cmpwi r0, 0
bne onPressRight_L4
li r0, 0
b onPressRight_L5
onPressRight_L4:
lwz r0, 0x174(r30)
cmpwi r0, 1
beq onPressRight_L6
lwz r3, 0x16c(r30)
lwz r12, 0(r3)
lwz r12, 0xd8(r12)
mtctr r12
bctrl
cmpwi r3, 0
ble onPressRight_L6
li r0, 1
b onPressRight_L5
onPressRight_L6:
li r0, 0
onPressRight_L5:
cmpwi r0, 0
beq onPressRight_L3
lwz r3, 0x16c(r30)
li r4, 0
bl setCurrentWord__Q39textinput8tistring6WithZiFPCw
lwz r3, 0x16c(r30)
bl update__Q39textinput8tistring6WithZiFv
onPressRight_L3:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x7c(r12)
mtctr r12
bctrl
onPressRight_L2:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x48(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressRight_Lend
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0xc0(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne onPressRight_L13
b onPressRight_Lend
onPressRight_L13:
lwz r3, 0x1d4(r30)
lwz r12, 0(r3)
lwz r12, 0x6c(r12)
mtctr r12
bctrl
li r0, 0
stb r0, 0x15(r3)
stb r0, 0x16(r3)
lwz r3, 0x168(r30)
lwz r12, 0(r3)
lwz r12, 0x128(r12)
mtctr r12
bctrl
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0xd8(r12)
mtctr r12
bctrl
lwz r3, 0x168(r30)
lwz r12, 0(r3)
lwz r12, 0x44(r12)
mtctr r12
bctrl
clrlwi r0, r3, 16
cmplwi r0, 0x20
beq onPressRight_Lend
onPressRight_L1:
lwz r12, 0(r31)
mr r3, r31
lwz r12, 0x64(r12)
mtctr r12
bctrl
cmpwi r3, 0
beq onPressRight_L8
lbz r0, 0x17a(r30)
cmpwi r0, 0
beq onPressRight_L8
lis r9, lbl_816152D0@ha
lwzu r8, lbl_816152D0@l(r9)
mr r3, r30
addi r5, r1, 8
lwz r7, 4(r9)
li r4, 0
lwz r6, 8(r9)
lwz r0, 0xc(r9)
stw r8, 8(r1)
stw r7, 0xc(r1)
stw r6, 0x10(r1)
stw r0, 0x14(r1)
lwz r12, 0(r30)
lwz r12, 0x18(r12)
mtctr r12
bctrl
lwz r12, 0(r30)
mr r3, r30
li r4, 5
lwz r12, 0x178(r12)
mtctr r12
bctrl
onPressRight_L8:
lwz r0, 0x16c(r30)
cmplw r31, r0
beq onPressRight_L9
lwz r0, 0x168(r30)
cmplw r31, r0
bne onPressRight_L10
onPressRight_L9:
lwz r12, 0(r30)
mr r3, r30
li r4, 6
lwz r12, 0x178(r12)
mtctr r12
bctrl
b onPressRight_L11
onPressRight_L10:
lwz r12, 0(r30)
mr r3, r30
li r4, 5
lwz r12, 0x178(r12)
mtctr r12
bctrl
onPressRight_L11:
lwz r0, 0x168(r30)
cmplw r31, r0
bne onPressRight_L12
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0xd8(r12)
mtctr r12
bctrl
onPressRight_L12:
li r0, 1
stw r0, 0x1b0(r30)
onPressRight_Lend:
lwz r0, 0x24(r1)
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
mtlr r0
addi r1, r1, 0x20
blr
}
extern "C" asm void calc__Q39textinput9inputform4BaseFv() {
@@ -3087,32 +3509,27 @@ void Base::clear() {
}
u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
const wchar_t* current;
u32 rows;
bool kanaHandled;
bool kana;
const wchar_t* character;
u32 pos;
f32 cursorX;
u32 cursorStart;
u32 cursorEnd;
current = string;
const wchar_t* current = string;
if (!*string) return 0;
cursorX = getScale().x;
f32 scaleX;
f32 cursorX = getScale().x;
nw4r::math::VEC2 scale = getScale();
pos = 0;
rows = 0;
u32 pos = 0;
u32 rows = 0;
muWordWrapCounter = 0;
kanaHandled = false;
bool kanaHandled = false;
mbHyphen = false;
u32 cursorStart, cursorEnd;
mpString->getCursorPos(&cursorStart, &cursorEnd);
scaleX = scale.x;
for (;;) {
DrawInfo info;
info.rect.left = 0.0f;
info.rect.top = 0.0f;
info.rect.right = 0.0f;
info.rect.bottom = 0.0f;
kana = false;
bool kana = false;
const wchar_t* character;
if (meLanguage == KR && !kanaHandled && cursorStart == pos) {
kanaHandled = true;
character = mpString->getKanaBuffer();
@@ -3124,9 +3541,9 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
}
info.character = *character;
calcRect(info);
f32 right = cursorX + scale.x * info.rect.GetWidth();
f32 right = cursorX + scaleX * (info.rect.right - info.rect.left);
if (kana) {
if (right >= scale.x * mRect.GetWidth()) {
if (right >= scaleX * (mRect.right - mRect.left)) {
cursorX = getScale().x;
++rows;
if (rows >= limit) return pos;
@@ -3139,11 +3556,8 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
++rows;
if (rows >= limit) {
while (pos < muWordWrapCounter) {
f32 advance;
f32 nextCursorX;
advance = scale.x * info.rect.GetWidth();
nextCursorX = cursorX + advance;
if (nextCursorX >= scale.x * mRect.GetWidth()) return pos;
f32 advance = scaleX * (info.rect.right - info.rect.left);
if (cursorX + advance >= scaleX * (mRect.right - mRect.left)) return pos;
++current;
cursorX += advance;
info.character = *current;
@@ -3153,7 +3567,7 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
return muWordWrapCounter - 1;
}
cursorX = getScale().x;
} else if (right >= scale.x * mRect.GetWidth()) {
} else if (right >= scaleX * (mRect.right - mRect.left)) {
cursorX = getScale().x;
++rows;
if (rows >= limit) return pos;
@@ -3164,7 +3578,7 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
if (rows >= limit) return pos;
if (!current[1]) return 0;
} else {
cursorX += scale.x * info.rect.GetWidth();
cursorX += scaleX * (info.rect.right - info.rect.left);
}
++pos;
++current;

View File

@@ -274,7 +274,7 @@ namespace textinput {
xOffset *= scale - 1.0f;
viewport[0] = left + xOffset;
f32 height = (mProjectionRect.bottom -
mProjectionRect.top) / 2.0f;
mProjectionRect.top) * 0.5f;
viewport[1] = rect.bottom + height;
viewport[2] = scale * (100.0f + (rect.right - rect.left));
viewport[3] = rect.top - rect.bottom;

View File

@@ -254,13 +254,6 @@ wchar_t* WithZi::getCurrentInput() {
return (wchar_t*)CandidatesBuffer;
}
static inline bool IsKoreanLeadingLetter(wchar_t value) {
for (s32 index = 0; index < 14; ++index) {
if (value == kKoreanLeadingLetters[index]) return true;
}
return false;
}
void WithZi::partialConfirmForKR() {
if (mInputLength <= 1) return;
bool match;
@@ -279,7 +272,18 @@ void WithZi::partialConfirmForKR() {
finalLetterChecked:
if (!match) goto keepLastLetter;
value = util::toWLower(CandidatesBuffer[mInputLength - 2]);
if (!IsKoreanLeadingLetter(value)) goto keepLastLetter;
index = 0;
letters = kKoreanLeadingLetters;
for (; index < 14; ++index) {
if (value == *letters) {
match = true;
goto leadingLetterChecked;
}
++letters;
}
match = false;
leadingLetterChecked:
if (!match) goto keepLastLetter;
CandidatesBuffer[0] = CandidatesBuffer[mInputLength - 2];
CandidatesBuffer[1] = CandidatesBuffer[mInputLength - 1];
mInputLength = 2;
@@ -297,7 +301,6 @@ void WithZi::update() {
return;
}
wchar_t* candidateOutput = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
mSelectedCandidate = 0;
s32 elementCount = static_cast<u16>(setElementBuffer());
mSearch.language = getPredictLanguage();
@@ -306,7 +309,7 @@ void WithZi::update() {
mSearch.context = 1;
mSearch.getOptions = 0x81;
mSearch.elements = reinterpret_cast<wchar_t*>(ElementBuffer);
mSearch.candidates = candidateOutput;
mSearch.candidates = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
mSearch.maxCandidates = 0x28;
mSearch.elementCount = static_cast<u8>(elementCount);
mSearch.firstCandidate = 0;
@@ -360,7 +363,7 @@ void WithZi::update() {
count = EZTXGetCandidates(&mSearch, mpDictionaryWork) & 0xff;
mSearch.firstCandidate = 0;
count += 0x61;
mSearch.candidates = candidateOutput;
mSearch.candidates = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
}
if (static_cast<s32>(count) > 0x28) {
count = 0x28;
@@ -511,10 +514,10 @@ scanDone:
u32 WithZi::setElementBuffer() {
u32 count = 0;
memset(ElementBuffer, 0, 0x1fe);
memset(&CandidatesBuffer[0x100], 0, 0x1fe);
u16* elements = ElementBuffer;
u16* candidates = CandidatesBuffer;
memset(elements, 0, 0x1fe);
memset(candidates + 0x100, 0, 0x1fe);
u16 inputCharacter;
while ((inputCharacter = candidates[static_cast<u16>(count)]) != 0 && static_cast<u16>(count) < 0xff) {
u16 index = count;
@@ -557,11 +560,11 @@ void WithZi::setCurrentWord(const wchar_t* word) {
LatestWord[1] = 0;
return;
}
mbContextChanged = 1;
wchar_t* currentWord;
const wchar_t* source;
u32 sourceOffset;
u32 length;
s32 copied;
mbContextChanged = 1;
length = 0;
currentWord = reinterpret_cast<wchar_t*>(LatestWord);
for (; *currentWord != 0 && *currentWord != 0x20;
@@ -572,10 +575,15 @@ void WithZi::setCurrentWord(const wchar_t* word) {
}
}
copied = 0;
source = word;
for (; *source != 0 && length < 0x3f;) {
LatestWord[length++] = word[copied++];
++source;
sourceOffset = 0;
currentWord = const_cast<wchar_t*>(word);
for (; *currentWord != 0 && length < 0x3f;) {
wchar_t character = word[sourceOffset];
++length;
++currentWord;
++copied;
LatestWord[length - 1] = character;
++sourceOffset;
}
LatestWord[length] = 0;
mCurrentWordLength = copied;

View File

@@ -327,20 +327,15 @@ namespace ipl {
mpDialogLayout->calc();
}
static inline math::VEC2 scaledPageOffset(f32 scale) {
math::VEC2 result;
result.y = sPageOffset.y * scale;
result.x = sPageOffset.x * scale;
return result;
}
void Address::draw() {
if (System::getSceneManager()->onDrawLayer(DRAW_LAYER_2)) {
utility::Graphics::setOrtho(0);
nw4r::lyt::Pane* pane = mpLayout->FindPaneByName("N_note_a");
for (int i = mNextPageNum; i >= 1; i--) {
math::VEC2 trans = scaledPageOffset(i);
math::VEC2 trans;
trans.y = sPageOffset.y * i;
trans.x = sPageOffset.x * i;
pane->SetTranslate(trans);
pane->CalculateMtx(*mpLayout->getDrawInfo());
mpLayout->draw(pane);
@@ -541,16 +536,11 @@ namespace ipl {
}
}
static inline nw4r::math::_VEC2 negativeOffset(const nw4r::math::_VEC2& value) {
f32 negativeY = -value.y;
f32 negativeX = -value.x;
nw4r::math::_VEC2 result = {negativeX, negativeY};
return result;
}
void Address::stt_cover_backward() {
if (!mpLayout->getAnim(4)->isPlaying()) {
math::VEC2 offset = negativeOffset(sPageOffset);
math::VEC2 offset;
offset.x = -sPageOffset.x;
offset.y = -sPageOffset.y;
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
mbCover = true;
mNextPageNum++;
@@ -592,20 +582,10 @@ namespace ipl {
}
}
static inline nw4r::math::_VEC2 previousPageOffset() {
f32 negativeY = -sPageOffset.y;
f32 negativeX = -sPageOffset.x;
nw4r::math::_VEC2 result;
result.y = negativeY;
result.x = negativeX;
return result;
}
void Address::stt_backward() {
if (!mpLayout->getAnim(5)->isPlaying()) {
mNextPageNum++;
math::VEC2 offset = previousPageOffset();
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
add_translate(mpLayout->FindPaneByName("N_note_base"), -sPageOffset);
set_page_text("T_nmbr_b", mPage + 1);
for (u32 i = 0; i < BTN_MAX; i++) {
@@ -622,17 +602,9 @@ namespace ipl {
}
}
static inline nw4r::math::VEC2 loopPageOffset() {
nw4r::math::VEC2 result;
result.y = -sPageOffset.y;
result.x = -sPageOffset.x;
return result;
}
void Address::stt_loop_forward() {
if (!mpLayout->getAnim(4)->isPlaying()) {
math::VEC2 offset = loopPageOffset() * PAGE_MAX;
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
add_translate(mpLayout->FindPaneByName("N_note_base"), -sPageOffset * PAGE_MAX);
set_page_text("T_nmbr_b", mPage + 1);
reset_gui(false);

View File

@@ -595,7 +595,6 @@ create_mode_done:
}
void ipl::scene::AddressEdit::stt_wait_decide_anm() {
nw4r::lyt::Pane* textPane;
bool complete = true;
ipl::scene::Button* button = static_cast<ipl::scene::Button*>(ipl::System::getScene(5));
for (s32 i = 0; i < 5; ++i) {
@@ -646,7 +645,7 @@ void ipl::scene::AddressEdit::stt_wait_decide_anm() {
animator = mpBackgroundLayout->getAnim(0);
animator->initFrame();
animator->restart();
textPane = mpNameLayout->getNW4RLyt()->GetRootPane()->FindPaneByName(
nw4r::lyt::Pane* textPane = mpNameLayout->getNW4RLyt()->GetRootPane()->FindPaneByName(
"T_question_00", true);
set_textbox(textPane, ipl::System::getMessage(0x32));
textPane = mpNameLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_name_00", true);
@@ -2210,62 +2209,86 @@ done:
return;
}
void ipl::scene::AddressEdit::start_left_event(const char* paneName) {
void ipl::scene::AddressEdit::start_left_event(
const char* paneName) {
int buttonNo = get_button_no(paneName);
switch (mState) {
case 0x22:
goto state22;
case 0:
switch (buttonNo) {
case 0: {
if (mpFriendCache->getInfo(mSelectedFriend).attr.status != 2) {
break;
}
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
layout::Animator* animator = mpCodeLayout->getAnim(buttonNo + 11);
animator->initFrame();
animator->restart();
}
if (*count > 0) {
--*count;
}
break;
}
case 3:
if (mPointCount[buttonNo] == 1) {
mpBalloon->fadeoutForce();
}
goto state0Button3;
case 0:
goto state0Friend;
case 1:
case 2: {
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
layout::Animator* animator = mpCodeLayout->getAnim(buttonNo + 11);
animator->initFrame();
animator->restart();
}
if (*count > 0) {
--*count;
}
break;
}
case 2:
goto state0Common;
default:
break;
}
break;
case 0x22:
switch (buttonNo) {
case 3: {
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
mpBalloon->fadeoutForce();
}
--*count;
break;
}
}
break;
default:
break;
}
goto done;
state0Friend: {
u32 friendIndex = mSelectedFriend;
u32 friendType = mpFriendCache->getInfo(friendIndex).attr.status;
if (friendType != 2) {
goto done;
}
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
ipl::layout::Object* layout = mpCodeLayout;
ipl::layout::Animator* pane = layout->getAnim(buttonNo + 0xb);
pane->initFrame();
pane->restart();
}
if (*count > 0) {
--*count;
}
goto done;
}
state0Button3: {
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
(mpBalloon)->fadeoutForce();
}
--*count;
goto done;
}
state0Common: {
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
ipl::layout::Object* layout = mpCodeLayout;
ipl::layout::Animator* pane = layout->getAnim(buttonNo + 0xb);
pane->initFrame();
pane->restart();
}
if (*count > 0) {
--*count;
}
goto done;
}
state22:
if (buttonNo != 3) {
goto done;
}
{
s32* count = &mPointCount[buttonNo];
if (*count == 1) {
(mpBalloon)->fadeoutForce();
}
--*count;
}
done:
return;
}
void ipl::scene::AddressEdit::start_trig_event(

View File

@@ -621,28 +621,28 @@ namespace ipl {
void BoardObject::set_thumb_text(const char* paneName, const wchar_t* thumbText) {
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(paneName));
wchar_t truncatedThumb[THUMB_TEXT_LENGTH + 3 /* "..." */ + 1 /* NULL */] = L"";
memset(truncatedThumb, 0, sizeof(truncatedThumb));
wchar_t local_28[THUMB_TEXT_LENGTH + 3 /* "..." */ + 1 /* NULL */] = L"";
memset(local_28, 0, sizeof(local_28));
if (thumbText != NULL) {
for (int i = 0; i < THUMB_TEXT_LENGTH + 1 && thumbText[i] != (u16)'\n'; i++) {
truncatedThumb[i] = thumbText[i];
local_28[i] = thumbText[i];
}
}
if (System::getRegion() == SC_PRODUCT_AREA_JPN) {
if (truncatedThumb[THUMB_TEXT_LENGTH] != 0) {
truncatedThumb[THUMB_TEXT_LENGTH + 0] = L'…';
if (local_28[THUMB_TEXT_LENGTH] != 0) {
local_28[THUMB_TEXT_LENGTH + 0] = L'…';
}
} else {
if (truncatedThumb[THUMB_TEXT_LENGTH] != 0) {
truncatedThumb[THUMB_TEXT_LENGTH + 2] = '.';
truncatedThumb[THUMB_TEXT_LENGTH + 1] = '.';
truncatedThumb[THUMB_TEXT_LENGTH + 0] = '.';
if (local_28[THUMB_TEXT_LENGTH] != 0) {
local_28[THUMB_TEXT_LENGTH + 2] = '.';
local_28[THUMB_TEXT_LENGTH + 1] = '.';
local_28[THUMB_TEXT_LENGTH + 0] = '.';
}
}
textBox->SetString(truncatedThumb);
textBox->SetString(local_28);
}
void BoardObject::update(int chan) {

View File

@@ -6,8 +6,8 @@
#include "iplSystem.h"
__declspec(section ".sdata") extern char scPaneName_B_Stop[];
extern char scPaneName_T_Stop[];
__declspec(section ".sdata") extern char lbl_816966F9[];
extern char lbl_816967B5[];
extern "C" BOOL push_button_queue(void*, const void*);
namespace ipl {
@@ -877,7 +877,7 @@ namespace ipl {
}
void OptOutButton::setText(u32 msgId) {
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scPaneName_T_Stop));
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_816967B5));
textBox->SetString(System::getMessage(msgId));
}
@@ -890,7 +890,7 @@ namespace ipl {
}
void OptOutButton::start_point_event(const char* paneName, controller::Interface* con) {
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
if (strcmp(paneName, lbl_816966F9) == 0) {
if (mbHovered == FALSE) {
// Play hover in animation
mpLayout->getAnim(ANIM_OPT_OUT_FOCUS_IN)->play();
@@ -906,7 +906,7 @@ namespace ipl {
}
void OptOutButton::start_left_event(const char* paneName) {
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
if (strcmp(paneName, lbl_816966F9) == 0) {
if (mbHovered == TRUE) {
mpLayout->getAnim(ANIM_OPT_OUT_FOCUS_OUT)->play();
}
@@ -1005,4 +1005,4 @@ namespace ipl {
} // namespace scene
} // namespace ipl
char scPaneName_T_Stop[] = "T_Stop";
char lbl_816967B5[] = "T_Stop";

View File

@@ -215,19 +215,19 @@ namespace ipl {
MESG_CALENDAR_DEC,
};
static const char* scPaneName_T_CalMonth[] = {
static const char* lbl_8164C458[] = {
"T_CalMonth_a",
"T_CalMonth_b",
"T_CalMonth_c",
};
static const char* scPaneName_N_Cal[] = {
static const char* lbl_8164C480[] = {
"N_Cal_a1",
"N_Cal_b1",
"N_Cal_c1",
};
static const char* scPaneName_N_CalPos[] = {
static const char* lbl_8164C4B0[] = {
"N_CalPos_a",
"N_CalPos_b",
"N_CalPos_c",
@@ -661,9 +661,9 @@ namespace ipl {
utility::Calendar::getLastMonth(*mpBoardDate, &last);
utility::Calendar::getNextMonth(*mpBoardDate, &next);
set_textbox_month(scPaneName_T_CalMonth[0], last);
set_textbox_month(scPaneName_T_CalMonth[1], *mpBoardDate);
set_textbox_month(scPaneName_T_CalMonth[2], next);
set_textbox_month(lbl_8164C458[0], last);
set_textbox_month(lbl_8164C458[1], *mpBoardDate);
set_textbox_month(lbl_8164C458[2], next);
}
void Calendar::set_textbox_month(const char* paneName, const utility::Date& date) {
@@ -714,31 +714,31 @@ namespace ipl {
OSCalendarTime curTime = System::getCurrentTime();
utility::Date todayDate(curTime.year, curTime.mon + 1, curTime.mday);
utility::Date lastMonth;
utility::Date nextMonth;
utility::Date local_64(curTime.year, curTime.mon + 1, curTime.mday);
utility::Date local_70;
utility::Date local_7c;
utility::Calendar::getLastMonth(date, &lastMonth);
utility::Calendar::getNextMonth(date, &nextMonth);
utility::Calendar::getLastMonth(date, &local_70);
utility::Calendar::getNextMonth(date, &local_7c);
int dateIndex;
int weekOffset;
int iVar10;
if (mbAsian || mbUSA) {
weekOffset = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
iVar10 = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
} else {
week--;
if (week < 0) {
week = 6;
}
weekOffset = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
if (weekOffset >= 7) {
weekOffset = 0;
iVar10 = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
if (iVar10 >= 7) {
iVar10 = 0;
}
}
dateIndex = unk == 1 ? 0 : DATE_COUNT;
utility::Date cellDate;
utility::Date local_88;
u32 attr;
int val2;
@@ -750,25 +750,25 @@ namespace ipl {
val = (maxDays + week);
attr = 0;
val2 = (weekOffset + val);
val2 = (iVar10 + val);
if ((week - i) > 0) {
cellDate.year = lastMonth.year;
cellDate.month = lastMonth.month;
cellDate.day = i + (lastMonth.day - week) + 1;
local_88.year = local_70.year;
local_88.month = local_70.month;
local_88.day = i + (local_70.day - week) + 1;
goto out;
}
if ((val - i) > 0) {
cellDate.year = date.year;
cellDate.month = date.month;
cellDate.day = (i - week) + 1;
local_88.year = date.year;
local_88.month = date.month;
local_88.day = (i - week) + 1;
attr |= 2;
if (cellDate == todayDate) {
if (local_88 == local_64) {
attr |= 1;
}
switch (utility::Calendar::getWeek(cellDate.year, cellDate.month, cellDate.day)) {
switch (utility::Calendar::getWeek(local_88.year, local_88.month, local_88.day)) {
case 6: {
attr |= 8;
break;
@@ -782,9 +782,9 @@ namespace ipl {
}
if ((val2 - i) > 0) {
cellDate.year = nextMonth.year;
cellDate.month = nextMonth.month;
cellDate.day = ((i - maxDays) - week) + 1;
local_88.year = local_7c.year;
local_88.month = local_7c.month;
local_88.day = ((i - maxDays) - week) + 1;
goto out;
} else {
dateScn->setVisible(false);
@@ -792,14 +792,14 @@ namespace ipl {
}
out:
dateScn->setDate(cellDate);
dateScn->setDate(local_88);
dateScn->setAttribute(attr);
}
}
void Calendar::set_date_pos(int unk) {
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(scPaneName_N_Cal[unk]);
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(scPaneName_N_CalPos[unk]);
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(lbl_8164C480[unk]);
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(lbl_8164C4B0[unk]);
int dateIndex = unk == 1 ? 0 : DATE_COUNT;
@@ -807,14 +807,14 @@ namespace ipl {
Date* dateScn = ((Date*)nw4r::ut::List_GetNth(&mDateList, dateIndex));
dateIndex++;
nw4r::math::VEC3 cellPos;
cellPos.x = ((u16)i % 7) * 0x46;
cellPos.y = ((u16)i / 7) * -0x30;
cellPos.z = 0.0f;
nw4r::math::VEC3 local_68;
local_68.x = ((u16)i % 7) * 0x46;
local_68.y = ((u16)i / 7) * -0x30;
local_68.z = 0.0f;
MTXMultVec(pane2->GetGlobalMtx(), cellPos, cellPos);
MTXMultVec(pane2->GetGlobalMtx(), local_68, local_68);
dateScn->setTranslate(cellPos);
dateScn->setTranslate(local_68);
dateScn->setRotate(pane1->GetRotate());
}
}

View File

@@ -7,40 +7,40 @@
namespace ipl {
namespace scene {
extern "C" char scW_Cal[];
extern "C" char scT_Cal[];
extern "C" char scCal_Ac[];
extern "C" char scInfo_a[];
extern "C" char scB_Cal[];
extern "C" char lbl_816967D8[];
extern "C" char lbl_816967DE[];
extern "C" char lbl_816967E4[];
extern "C" char lbl_816967EB[];
extern "C" char lbl_816967F2[];
#pragma push
#pragma section const_type ".data"
extern "C" const char scN_CalDay_r[] = "N_CalDay_r";
extern "C" const char lbl_8164C620[] = "N_CalDay_r";
#pragma pop
// clang-format off
extern "C" const char* scDateAnimPaneNames[Date::ANIM_PANE_MAX] = {
scN_CalDay_r,
scW_Cal,
scT_Cal,
scCal_Ac,
scInfo_a,
extern "C" const char* lbl_8164C62C[Date::ANIM_PANE_MAX] = {
lbl_8164C620,
lbl_816967D8,
lbl_816967DE,
lbl_816967E4,
lbl_816967EB,
};
#pragma push
#pragma section const_type ".data"
extern "C" const char scMyIplTopFBrlan[] = "my_IplTop_f.brlan";
extern "C" const char scN_CalDay_t[] = "N_CalDay_t";
extern "C" const char scSEDateFocus[] = "WIPL_SE_DATE_FOCUS";
extern "C" const char lbl_8164C640[] = "my_IplTop_f.brlan";
extern "C" const char lbl_8164C652[] = "N_CalDay_t";
extern "C" const char lbl_8164C65D[] = "WIPL_SE_DATE_FOCUS";
#pragma pop
#pragma push
#pragma section const_type ".sdata"
extern "C" char scW_Cal[] = "W_Cal";
extern "C" char scT_Cal[] = "T_Cal";
extern "C" char scCal_Ac[] = "Cal_Ac";
extern "C" char scInfo_a[] = "Info_a";
extern "C" char scB_Cal[] = "B_Cal";
extern "C" char lbl_816967D8[] = "W_Cal";
extern "C" char lbl_816967DE[] = "T_Cal";
extern "C" char lbl_816967E4[] = "Cal_Ac";
extern "C" char lbl_816967EB[] = "Info_a";
extern "C" char lbl_816967F2[] = "B_Cal";
#pragma pop
static const Date::AnmFrame scAnmFrame[] = {
@@ -73,7 +73,7 @@ namespace ipl {
// Bind animations
for (int i = 0; i < ANIM_PANE_MAX; i++) {
mpPaneAnims[i] = mpLayout->bind(scMyIplTopFBrlan, scDateAnimPaneNames[i], false);
mpPaneAnims[i] = mpLayout->bind(lbl_8164C640, lbl_8164C62C[i], false);
}
mpLayout->finishBinding();
@@ -81,7 +81,7 @@ namespace ipl {
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL);
mpGui->setupScene(mpLayout);
mpGui->setAllComponentTriggerTarget(false);
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scB_Cal), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_816967F2), true);
// Init date
mpDate = new utility::Date();
@@ -128,19 +128,19 @@ namespace ipl {
}
void Date::setRotate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName(scN_CalDay_t)->SetRotate(vec);
mpLayout->FindPaneByName(lbl_8164C652)->SetRotate(vec);
}
void Date::setTranslate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName(scN_CalDay_t)->SetTranslate(vec);
mpLayout->FindPaneByName(lbl_8164C652)->SetTranslate(vec);
}
void Date::setVisible(bool visible) {
mpLayout->FindPaneByName(scDateAnimPaneNames[0])->SetVisible(visible);
mpLayout->FindPaneByName(lbl_8164C62C[0])->SetVisible(visible);
}
bool Date::getVisible() {
return mpLayout->FindPaneByName(scDateAnimPaneNames[0])->IsVisible();
return mpLayout->FindPaneByName(lbl_8164C62C[0])->IsVisible();
}
void Date::setAttribute(int attr) {
@@ -209,13 +209,13 @@ namespace ipl {
}
void Date::start_point_event(const char* paneName, controller::Interface* con) {
if (strcmp(paneName, scB_Cal) == 0) {
if (strcmp(paneName, lbl_816967F2) == 0) {
if (unk_0x3C == 0) {
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
onCmdRecv(1);
if (getVisible()) {
snd::getSystem()->startSE(scSEDateFocus);
snd::getSystem()->startSE(lbl_8164C65D);
if (con != NULL) {
con->rumble(1);
}
@@ -226,7 +226,7 @@ namespace ipl {
}
void Date::start_left_event(const char* paneName) {
if (strcmp(paneName, scB_Cal) == 0) {
if (strcmp(paneName, lbl_816967F2) == 0) {
if (unk_0x3C == 1) {
onCmdRecv(2);
}
@@ -262,7 +262,7 @@ namespace ipl {
numStr[index++] = 0;
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scDateAnimPaneNames[2]));
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_8164C62C[2]));
pane->SetString(numStr);
}

View File

@@ -697,19 +697,16 @@ extern "C" s32 CardSequence_813D3424(s32 slot, s32 fileNo, CARDDir* dir) {
s32 sectorSize;
CARDFileInfo fileInfo;
} local;
s32 result;
u32 iconAddressBase;
s32 iconAddressOffset;
result = CARDFastOpen(slot, fileNo, &local.fileInfo);
s32 result = CARDFastOpen(slot, fileNo, &local.fileInfo);
if (result < 0) {
return result;
}
s32 bannerImageSize = 0;
u32 bannerImageSize = 0;
u8 format = dir->bannerFormat & 3;
u32 iconAddress = dir->iconAddr;
iconAddressBase = iconAddress & 0xFFFFFE00;
iconAddressOffset = iconAddress - iconAddressBase;
u32 iconAddressBase = iconAddress & 0xFFFFFE00;
s32 iconAddressOffset = iconAddress - iconAddressBase;
switch (format) {
case 1: {
@@ -830,7 +827,7 @@ iconSpeedDone:
sThread->icons[slot][fileNo].anmDelta = 1;
}
s32 totalImageSize = iconImageSize + bannerImageSize;
s32 totalImageSize = bannerImageSize + iconImageSize;
u32 transferSize = (totalImageSize + iconAddressOffset + 0x1FF) & 0xFFFFFE00;
result = CARDGetSectorSize(slot, (u32*)&local.sectorSize);
if (result < 0) {
@@ -857,14 +854,9 @@ iconSpeedDone:
(u8*)sThread->imageReadBuffer + iconAddressOffset,
totalImageSize);
DCStoreRange(sThread->images[slot][fileNo], transferSize);
result = 0;
}
}
if (result < 0) {
goto closeFile;
}
iconAddress = dir->commentAddr;
iconAddressBase = iconAddress & 0xFFFFFE00;
s32 commentDataOffset = iconAddress - iconAddressBase;
@@ -873,30 +865,26 @@ iconSpeedDone:
if (result < 0) {
goto clearComment;
}
if ((s32)iconAddressBase < 0) {
result = 0;
} else {
if ((s32)iconAddressBase >= 0) {
u32 fileSize = (u32)dir->length * local.commentSectorSize;
if (iconAddressBase > fileSize) {
result = 0;
goto clearComment;
if (iconAddressBase <= fileSize) {
u32 endOffset = iconAddressBase + imageSize;
if ((s32)endOffset >= 0 && endOffset <= fileSize) {
result = CARDRead(&local.fileInfo, sThread->commentBuffer, imageSize,
iconAddressBase);
if (result < 0) {
goto clearComment;
}
memset(sThread->comments[slot][fileNo], 0, 0x40);
memcpy(sThread->comments[slot][fileNo],
sThread->commentBuffer + commentDataOffset, 0x40);
result = 0;
goto commentDone;
}
}
u32 endOffset = iconAddressBase + imageSize;
if ((s32)endOffset < 0 || endOffset > fileSize) {
result = 0;
goto clearComment;
}
result = CARDRead(&local.fileInfo, sThread->commentBuffer, imageSize,
iconAddressBase);
if (result < 0) {
goto clearComment;
}
memset(sThread->comments[slot][fileNo], 0, 0x40);
memcpy(sThread->comments[slot][fileNo],
sThread->commentBuffer + commentDataOffset, 0x40);
result = 0;
goto commentDone;
}
result = 0;
goto clearComment;
clearComment:
memset(sThread->comments[slot][fileNo], 0, 0x40);

View File

@@ -35,8 +35,8 @@ namespace ipl {
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27))))));
f32 temp_f4 = var_f27 * var_f27;
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
f32 temp_f3 = (mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
f32 temp_f3 = (unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
r.x += temp_f3;
r.y += temp_f3;
r.z += temp_f3;
@@ -51,8 +51,8 @@ namespace ipl {
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
r += (mStartTangent * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
r += (unkVal0 * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
return r;
}
} // namespace math

View File

@@ -2390,7 +2390,7 @@ namespace ipl {
if (sceneID == SCENE_UNLOCKED_TITLE || sceneID == SCENE_LOCKED_TITLE) {
System::getSaveData()->setPrevPage(mChanPage);
System::getSaveData()->pushTitleCache(System::getChannelManager()->getTitleID(mChanPage, mChanIndex));
System::getSaveData()->iplSavedata_813596B8(System::getChannelManager()->getTitleID(mChanPage, mChanIndex));
mpSaveDataFile = System::getSaveData()->flushAsync(System::getMem2App());
}
}

View File

@@ -1,4 +1,4 @@
#define IPL_GC_SAVEDATA_NOVTABLE
#define IPL_CHANNEL_TITLE_NOVTABLE
#include "scene/memoryCard/iplGCSaveData.h"
#include "scene/memoryCard/iplMemoryCard.h"
@@ -6,6 +6,7 @@
#include "iplSound.h"
#include "iplSystem.h"
#undef IPL_CHANNEL_TITLE_NOVTABLE
namespace ipl {
namespace scene {

View File

@@ -1,7 +1,7 @@
#define IPL_MEMORYCARD_BASE_CTOR_OUT_OF_LINE
#define IPL_MEMORYCARD_BASE_EVENT_OUT_OF_LINE
#define IPL_GCW_PANEMANAGER_CTOR_OUT_OF_LINE
#define IPL_GC_WINDOW_NOVTABLE
#define IPL_GCW_INTP_CTOR_OUT_OF_LINE
#define IPL_GC_WINDOW_CPP
#include "scene/memoryCard/iplGCWindow.h"
#include "scene/memoryCard/iplMemoryCard.h"
@@ -14,6 +14,10 @@
#include <cstring>
namespace ipl {
namespace math {
template <typename T>
LinearIntp<T>::LinearIntp() {}
}
namespace scene {
struct TextboxToMessageID {
const char* name;
@@ -46,15 +50,8 @@ static const TextboxToMessageID scTextboxToMessageID[3] = {
};
static const char* scButtonName[3] = {"B_Move_00", "B_Copy_00", "B_Del_00"};
struct DigitTable {
wchar_t w[10];
};
static const DigitTable scNumber = {{L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}};
GCWindow::GCWindow(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName)
: MemoryBase(), MemCardEventListener(), mState(0), mLinearInterp(), mCardState(0), mCardIndex(0), mOperation(0), mActive(false),
: MemoryBase(), MemCardEventHandler(), mState(0), mLinearInterp(), mCardState(0), mCardIndex(0), mOperation(0), mActive(false),
mWaiting(false) {
mpLayout = new layout::Object(heap, layoutFile, directory, fileName);
add_animation(scAnmName, 0x10);
@@ -105,15 +102,15 @@ void GCWindow::init(const math::VEC3& translate, MemoryCardManager* manager, u8
mpPaneManager->initPane(mpLayout->getNW4RLyt()->GetRootPane()->FindPaneByName(scButtonName[i], true));
}
int blocks = mpMemoryCardManager->getBlocks(cardState, cardIndex);
DigitTable digitTable = scNumber;
wchar_t digits[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'};
int blockCount = static_cast<u16>(blocks);
wchar_t decimal[5] = {0};
int skipCount = 0;
wchar_t blockText[5] = {0};
decimal[0] = digitTable.w[blockCount / 1000];
decimal[1] = digitTable.w[(blockCount / 100) % 10];
decimal[2] = digitTable.w[(blockCount / 10) % 10];
decimal[3] = digitTable.w[blockCount % 10];
decimal[0] = digits[blockCount / 1000];
decimal[1] = digits[(blockCount / 100) % 10];
decimal[2] = digits[(blockCount / 10) % 10];
decimal[3] = digits[blockCount % 10];
for (i = 0; i < 3; i++) {
if (decimal[i] != L'0') {
break;
@@ -788,6 +785,7 @@ SavedataEditWindow::SavedataEditWindow(EGG::Heap* heap, nand::LayoutFile* layout
add_animation("it_DataDetail_a_SeenOutNo.brlan", scAnmName[0].groupName);
add_animation("it_DataDetail_a_Wait.brlan", scAnmName[15].groupName);
mpLayout->finishBinding();
set_visible("N_Wait", false);
set_visible("T_Block_01", false);
mpEvent = new MemoryBaseEvent(this);
mpPaneManager = new gui::PaneManager(mpEvent, mpLayout->getDrawInfo(), NULL, NULL, true);

View File

@@ -1,6 +1,8 @@
#define IPL_MEMORY_CARD_CPP
#define IPL_MEMORY_CARD_NOVTABLE
#define IPL_MEMORYCARD_BASE_OUT_OF_LINE
#define IPL_CHANNEL_TITLE_NOVTABLE
#include "scene/memoryCard/iplMemoryCard.h"
#undef IPL_CHANNEL_TITLE_NOVTABLE
#include "scene/memoryCard/iplGCWindow.h"
#include "scene/memoryCard/iplGCSaveData.h"
@@ -80,53 +82,6 @@ namespace ipl {
"B_ArwR", "B_ArwL", "B_SelectWii_00", "B_SelectSd_00",
};
struct DigitTable {
wchar_t w[10];
};
static const DigitTable scNumber = {{L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}};
class __declspec(novtable) MemoryCardManagerImpl : public MemoryCardManager {
public:
virtual void onMount(u8) {}
virtual void onUnmount(u8) {}
virtual void onAttach(u8) {}
virtual void onDetach(u8) {}
virtual void onCheck(u8) {}
virtual void onFormat(u8) {}
virtual void onRepair(u8) {}
virtual void onRead(u8) {}
virtual void onWrite(u8) {}
virtual void onOpen(u8) {}
virtual void onClose(u8) {}
virtual void onCreate(u8) {}
virtual void onDelete(u8) {}
virtual void onCopy(u8) {}
virtual void onMove(u8) {}
virtual void onRename(u8) {}
virtual void onVerify(u8) {}
virtual void onCommit(u8) {}
virtual void onProbe(u8) {}
virtual void onMountAsync(u8) {}
virtual void onUnmountAsync(u8) {}
virtual void onCheckAsync(u8) {}
virtual void onFormatAsync(u8) {}
virtual void onReadAsync(u8) {}
virtual void onWriteAsync(u8) {}
virtual void onCreateAsync(u8) {}
virtual void onDeleteAsync(u8) {}
virtual void onCopyAsync(u8) {}
virtual void onMoveAsync(u8) {}
virtual void onRenameAsync(u8) {}
virtual void onVerifyAsync(u8) {}
virtual void onCommitAsync(u8) {}
virtual void onProbeAsync(u8) {}
virtual void onFreeBlocks(u8) {}
virtual void onGetLength(u8) {}
virtual void onSetAttrib(u8) {}
virtual void onGetAttrib(u8) {}
};
MemoryCard::MemoryCard(EGG::Heap* heap)
: Base(heap), MemoryBase(), mState(2), mPrevState(2), mSlot(0), mIconIndex(-15), mIconCount(0),
mShowArwR(0), mShowArwL(0), mpEvent(NULL), mpFocusSaveData(NULL) {
@@ -135,6 +90,7 @@ namespace ipl {
nw4r::ut::List_Init(&mBalloonList, 0);
}
MemoryBase::~MemoryBase() {}
void MemoryCard::prepare() {
System::getBS2Manager()->abort();
@@ -190,7 +146,7 @@ namespace ipl {
mpGCWindow = new GCWindow(getSceneHeap(), unk_0x08, "arc", "it_CubeDetail_a.brlyt");
mpGCWindow->do_animation(0);
MemoryCardManager* manager = new MemoryCardManagerImpl();
MemoryCardManager* manager = new MemoryCardManager();
mpManager = manager;
mpManager->setEventHandler(mpGCWindow);
mpGCWindow->mpMemoryCardManager = mpManager;
@@ -539,14 +495,19 @@ namespace ipl {
return;
}
u32 freeBlocks = mpManager->getFreeBlocks(slot);
DigitTable digitTable = scNumber;
wchar_t digits[5] = {0};
wchar_t digits[5];
wchar_t digitTable[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'};
digits[0] = L'\0';
digits[1] = L'\0';
digits[2] = L'\0';
digits[3] = L'\0';
digits[4] = L'\0';
wchar_t text[0x40] = L"";
int blocks = static_cast<u16>(freeBlocks);
digits[0] = digitTable.w[blocks / 1000];
digits[1] = digitTable.w[blocks / 100 % 10];
digits[2] = digitTable.w[blocks / 10 % 10];
digits[3] = digitTable.w[blocks % 10];
digits[0] = digitTable[blocks / 1000];
digits[1] = digitTable[blocks / 100 % 10];
digits[2] = digitTable[blocks / 10 % 10];
digits[3] = digitTable[blocks % 10];
int zeroOffset;
for (zeroOffset = 0; zeroOffset < 3; zeroOffset++) {
@@ -743,4 +704,3 @@ namespace ipl {
}
}

Some files were not shown because too many files have changed in this diff Show More