Compare commits
1 Commits
agent/data
...
agent/w092
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3f3a4c44d3 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.69% | 61.93% | 91.37% |
|
||||
| 95.27% | 82.59% | 58.19% | 89.46% |
|
||||
|
||||
units 917/1027 complete, functions 12211/12563 matched.
|
||||
units 777/1027 complete, functions 11961/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 -->
|
||||
|
||||
@@ -11,23 +11,12 @@ splits: 'config/43U/splits.txt'
|
||||
ldscript_template: 'config/ldscript_ipl2.lcf'
|
||||
|
||||
force_active:
|
||||
- fprintf
|
||||
- leap_days
|
||||
- __msl_time2tm
|
||||
- __tm2time
|
||||
- clock
|
||||
- mktime
|
||||
- localtime
|
||||
- emit
|
||||
- __MSL_ISO8601NewYear
|
||||
- __MSL_ISO8601Week
|
||||
- strftime
|
||||
- labs
|
||||
- atol
|
||||
- itoa
|
||||
- strpbrk
|
||||
- strspn
|
||||
- strcspn
|
||||
- atol
|
||||
- padding__Q23ipl5scene
|
||||
- lbl_81695063
|
||||
- lbl_81695067
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -22538,7 +22538,7 @@ lbl_816979C8 = .sdata:0x816979C8; // type:object size:0x5 data:string
|
||||
lbl_816979D0 = .sdata:0x816979D0; // type:object size:0x5 data:string
|
||||
lbl_816979D8 = .sdata:0x816979D8; // type:object size:0x4 data:string
|
||||
lbl_816979E0 = .sdata:0x816979E0; // type:object size:0x8 data:string
|
||||
CDBFSPathSeparator = .sdata:0x816979E8; // type:object size:0x1 data:byte
|
||||
lbl_816979E8 = .sdata:0x816979E8; // type:object size:0x1 data:byte
|
||||
@1433 = .sdata:0x816979F0; // type:object size:0x4 scope:local data:string
|
||||
@1435 = .sdata:0x816979F4; // type:object size:0x1 scope:local
|
||||
@1440 = .sdata:0x816979F8; // type:object size:0x6 scope:local 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
|
||||
|
||||
284
configure.py
284
configure.py
@@ -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"),
|
||||
@@ -878,8 +878,8 @@ config.libs = [
|
||||
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSSLink.c"),
|
||||
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
Object(NonMatching, "scene/setting/AOSS.c"),
|
||||
Object(NonMatching, "scene/setting/ATERM.c"),
|
||||
]
|
||||
),
|
||||
IPLSection("settingSelect", [
|
||||
@@ -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"),
|
||||
@@ -1389,8 +1389,8 @@ config.libs = [
|
||||
),
|
||||
RVLSDKLib("vi", [
|
||||
Object(NonMatching, "vi/vi.c"),
|
||||
Object(Matching, "vi/i2c.c"),
|
||||
Object(Matching, "vi/vi3in1.c"),
|
||||
Object(NonMatching, "vi/i2c.c"),
|
||||
Object(NonMatching, "vi/vi3in1.c"),
|
||||
]
|
||||
),
|
||||
RVLSDKLib("mtx", [
|
||||
@@ -1687,9 +1687,9 @@ config.libs = [
|
||||
Object(Matching, "fa/pf_service.c"),
|
||||
Object(Matching, "fa/pf_str.c"),
|
||||
Object(Matching, "fa/pf_driver.c"),
|
||||
Object(Matching, "fa/pdm_api.c"),
|
||||
Object(Matching, "fa/pdm_bpb.c"),
|
||||
Object(Matching, "fa/pdm_disk.c"),
|
||||
Object(NonMatching, "fa/pdm_api.c"),
|
||||
Object(NonMatching, "fa/pdm_bpb.c"),
|
||||
Object(NonMatching, "fa/pdm_disk.c"),
|
||||
Object(NonMatching, "fa/pdm_partition.c"),
|
||||
Object(NonMatching, "fa/pf_cache.c"),
|
||||
Object(NonMatching, "fa/pf_cluster.c"),
|
||||
@@ -1698,168 +1698,168 @@ 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(Matching, "fa/pf_fat32.c"),
|
||||
Object(NonMatching, "fa/pf_fat16.c"),
|
||||
Object(NonMatching, "fa/pf_fat32.c"),
|
||||
Object(Matching, "fa/pf_fatfs.c"),
|
||||
Object(NonMatching, "fa/pf_file.c"),
|
||||
Object(NonMatching, "fa/pf_path.c"),
|
||||
Object(Matching, "fa/pf_sector.c"),
|
||||
Object(NonMatching, "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_volume_apiadd.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"),
|
||||
Object(Matching, "fa/pf_cdelete.c"),
|
||||
Object(Matching, "fa/pf_chdir.c"),
|
||||
Object(Matching, "fa/pf_chdmod.c"),
|
||||
Object(Matching, "fa/pf_chmod.c"),
|
||||
Object(Matching, "fa/pf_cinsert.c"),
|
||||
Object(NonMatching, "fa/pf_buffering.c"),
|
||||
Object(NonMatching, "fa/pf_cdelete.c"),
|
||||
Object(NonMatching, "fa/pf_chdir.c"),
|
||||
Object(NonMatching, "fa/pf_chdmod.c"),
|
||||
Object(NonMatching, "fa/pf_chmod.c"),
|
||||
Object(NonMatching, "fa/pf_cinsert.c"),
|
||||
Object(Matching, "fa/pf_closedir.c"),
|
||||
Object(Matching, "fa/pf_combine.c"),
|
||||
Object(Matching, "fa/pf_create.c"),
|
||||
Object(Matching, "fa/pf_createdir.c"),
|
||||
Object(Matching, "fa/pf_cut.c"),
|
||||
Object(Matching, "fa/pf_derrnum.c"),
|
||||
Object(NonMatching, "fa/pf_combine.c"),
|
||||
Object(NonMatching, "fa/pf_create.c"),
|
||||
Object(NonMatching, "fa/pf_createdir.c"),
|
||||
Object(NonMatching, "fa/pf_cut.c"),
|
||||
Object(NonMatching, "fa/pf_derrnum.c"),
|
||||
Object(Matching, "fa/pf_detach.c"),
|
||||
Object(Matching, "fa/pf_divide.c"),
|
||||
Object(NonMatching, "fa/pf_divide.c"),
|
||||
Object(Matching, "fa/pf_errnum.c"),
|
||||
Object(Matching, "fa/pf_fadjust.c"),
|
||||
Object(Matching, "fa/pf_fappend.c"),
|
||||
Object(Matching, "fa/pf_fchdir.c"),
|
||||
Object(NonMatching, "fa/pf_fadjust.c"),
|
||||
Object(NonMatching, "fa/pf_fappend.c"),
|
||||
Object(NonMatching, "fa/pf_fchdir.c"),
|
||||
Object(Matching, "fa/pf_fclose.c"),
|
||||
Object(Matching, "fa/pf_fconcat.c"),
|
||||
Object(NonMatching, "fa/pf_fconcat.c"),
|
||||
Object(Matching, "fa/pf_feof.c"),
|
||||
Object(Matching, "fa/pf_ferror.c"),
|
||||
Object(Matching, "fa/pf_finfo.c"),
|
||||
Object(NonMatching, "fa/pf_finfo.c"),
|
||||
Object(Matching, "fa/pf_flock.c"),
|
||||
Object(Matching, "fa/pf_fopen.c"),
|
||||
Object(Matching, "fa/pf_format.c"),
|
||||
Object(NonMatching, "fa/pf_format.c"),
|
||||
Object(Matching, "fa/pf_fread.c"),
|
||||
Object(Matching, "fa/pf_fseek.c"),
|
||||
Object(Matching, "fa/pf_fsetclstlink.c"),
|
||||
Object(Matching, "fa/pf_fsexec.c"),
|
||||
Object(NonMatching, "fa/pf_fsetclstlink.c"),
|
||||
Object(NonMatching, "fa/pf_fsexec.c"),
|
||||
Object(Matching, "fa/pf_fsfirst.c"),
|
||||
Object(Matching, "fa/pf_fsnext.c"),
|
||||
Object(Matching, "fa/pf_fstat.c"),
|
||||
Object(Matching, "fa/pf_fsync.c"),
|
||||
Object(Matching, "fa/pf_fwrite.c"),
|
||||
Object(Matching, "fa/pf_getdev.c"),
|
||||
Object(Matching, "fa/pf_getvol.c"),
|
||||
Object(Matching, "fa/pf_getvolcfg.c"),
|
||||
Object(Matching, "fa/pf_init_prfile2.c"),
|
||||
Object(Matching, "fa/pf_insert.c"),
|
||||
Object(Matching, "fa/pf_iswriteprotected.c"),
|
||||
Object(NonMatching, "fa/pf_getdev.c"),
|
||||
Object(NonMatching, "fa/pf_getvol.c"),
|
||||
Object(NonMatching, "fa/pf_getvolcfg.c"),
|
||||
Object(NonMatching, "fa/pf_init_prfile2.c"),
|
||||
Object(NonMatching, "fa/pf_insert.c"),
|
||||
Object(NonMatching, "fa/pf_iswriteprotected.c"),
|
||||
Object(Matching, "fa/pf_mkdir.c"),
|
||||
Object(Matching, "fa/pf_mount.c"),
|
||||
Object(Matching, "fa/pf_move.c"),
|
||||
Object(NonMatching, "fa/pf_move.c"),
|
||||
Object(Matching, "fa/pf_opendir.c"),
|
||||
Object(Matching, "fa/pf_readdir.c"),
|
||||
Object(Matching, "fa/pf_regctx.c"),
|
||||
Object(NonMatching, "fa/pf_regctx.c"),
|
||||
Object(Matching, "fa/pf_remove.c"),
|
||||
Object(Matching, "fa/pf_rename.c"),
|
||||
Object(Matching, "fa/pf_rewinddir.c"),
|
||||
Object(Matching, "fa/pf_rmdir.c"),
|
||||
Object(Matching, "fa/pf_rmvvol.c"),
|
||||
Object(NonMatching, "fa/pf_rmvvol.c"),
|
||||
Object(Matching, "fa/pf_seekdir.c"),
|
||||
Object(Matching, "fa/pf_setclstlink.c"),
|
||||
Object(Matching, "fa/pf_setcode.c"),
|
||||
Object(Matching, "fa/pf_setencode.c"),
|
||||
Object(Matching, "fa/pf_settailbuf.c"),
|
||||
Object(Matching, "fa/pf_setupfsi.c"),
|
||||
Object(Matching, "fa/pf_setvol.c"),
|
||||
Object(Matching, "fa/pf_setvolcfg.c"),
|
||||
Object(Matching, "fa/pf_sync.c"),
|
||||
Object(NonMatching, "fa/pf_setclstlink.c"),
|
||||
Object(NonMatching, "fa/pf_setcode.c"),
|
||||
Object(NonMatching, "fa/pf_setencode.c"),
|
||||
Object(NonMatching, "fa/pf_settailbuf.c"),
|
||||
Object(NonMatching, "fa/pf_setupfsi.c"),
|
||||
Object(NonMatching, "fa/pf_setvol.c"),
|
||||
Object(NonMatching, "fa/pf_setvolcfg.c"),
|
||||
Object(NonMatching, "fa/pf_sync.c"),
|
||||
Object(Matching, "fa/pf_telldir.c"),
|
||||
Object(Matching, "fa/pf_unmount.c"),
|
||||
Object(Matching, "fa/pf_unregctx.c"),
|
||||
Object(Matching, "fa/pf_xdivide.c"),
|
||||
Object(NonMatching, "fa/pf_unregctx.c"),
|
||||
Object(NonMatching, "fa/pf_xdivide.c"),
|
||||
Object(Matching, "fa/pf_w_api_util.c"),
|
||||
Object(Matching, "fa/pf_w_cdelete.c"),
|
||||
Object(Matching, "fa/pf_w_chdir.c"),
|
||||
Object(Matching, "fa/pf_w_chdmod.c"),
|
||||
Object(Matching, "fa/pf_w_chmod.c"),
|
||||
Object(Matching, "fa/pf_w_cinsert.c"),
|
||||
Object(Matching, "fa/pf_w_combine.c"),
|
||||
Object(Matching, "fa/pf_w_create.c"),
|
||||
Object(Matching, "fa/pf_w_createdir.c"),
|
||||
Object(Matching, "fa/pf_w_cut.c"),
|
||||
Object(Matching, "fa/pf_w_divide.c"),
|
||||
Object(Matching, "fa/pf_w_fconcat.c"),
|
||||
Object(Matching, "fa/pf_w_fopen.c"),
|
||||
Object(Matching, "fa/pf_w_fsexec.c"),
|
||||
Object(Matching, "fa/pf_w_fsfirst.c"),
|
||||
Object(Matching, "fa/pf_w_fsnext.c"),
|
||||
Object(Matching, "fa/pf_w_fstat.c"),
|
||||
Object(Matching, "fa/pf_w_insert.c"),
|
||||
Object(Matching, "fa/pf_w_mkdir.c"),
|
||||
Object(Matching, "fa/pf_w_move.c"),
|
||||
Object(Matching, "fa/pf_w_opendir.c"),
|
||||
Object(Matching, "fa/pf_w_remove.c"),
|
||||
Object(Matching, "fa/pf_w_rename.c"),
|
||||
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(Matching, "fa/pf_system.c"),
|
||||
Object(Matching, "fa/pf_stub_standard.c"),
|
||||
Object(Matching, "fa/pfs_attach.c"),
|
||||
Object(Matching, "fa/pfs_buffering.c"),
|
||||
Object(Matching, "fa/pfs_create.c"),
|
||||
Object(Matching, "fa/pfs_createdir.c"),
|
||||
Object(Matching, "fa/pfs_detach.c"),
|
||||
Object(Matching, "fa/pfs_errnum.c"),
|
||||
Object(Matching, "fa/pfs_fclose.c"),
|
||||
Object(Matching, "fa/pfs_finfot.c"),
|
||||
Object(Matching, "fa/pfs_fopen.c"),
|
||||
Object(Matching, "fa/pfs_format.c"),
|
||||
Object(Matching, "fa/pfs_fread.c"),
|
||||
Object(Matching, "fa/pfs_fseek.c"),
|
||||
Object(Matching, "fa/pfs_fsfirst.c"),
|
||||
Object(Matching, "fa/pfs_fsnext.c"),
|
||||
Object(Matching, "fa/pfs_fstat.c"),
|
||||
Object(Matching, "fa/pfs_fwrite.c"),
|
||||
Object(Matching, "fa/pfs_getdev.c"),
|
||||
Object(Matching, "fa/pfs_init_prfile2.c"),
|
||||
Object(Matching, "fa/pfs_mount.c"),
|
||||
Object(Matching, "fa/pfs_remove.c"),
|
||||
Object(Matching, "fa/pfs_unmount.c"),
|
||||
Object(Matching, "fa/pf_stub_unicode.c"),
|
||||
Object(NonMatching, "fa/pf_w_cdelete.c"),
|
||||
Object(NonMatching, "fa/pf_w_chdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_chdmod.c"),
|
||||
Object(NonMatching, "fa/pf_w_chmod.c"),
|
||||
Object(NonMatching, "fa/pf_w_cinsert.c"),
|
||||
Object(NonMatching, "fa/pf_w_combine.c"),
|
||||
Object(NonMatching, "fa/pf_w_create.c"),
|
||||
Object(NonMatching, "fa/pf_w_createdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_cut.c"),
|
||||
Object(NonMatching, "fa/pf_w_divide.c"),
|
||||
Object(NonMatching, "fa/pf_w_fconcat.c"),
|
||||
Object(NonMatching, "fa/pf_w_fopen.c"),
|
||||
Object(NonMatching, "fa/pf_w_fsexec.c"),
|
||||
Object(NonMatching, "fa/pf_w_fsfirst.c"),
|
||||
Object(NonMatching, "fa/pf_w_fsnext.c"),
|
||||
Object(NonMatching, "fa/pf_w_fstat.c"),
|
||||
Object(NonMatching, "fa/pf_w_insert.c"),
|
||||
Object(NonMatching, "fa/pf_w_mkdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_move.c"),
|
||||
Object(NonMatching, "fa/pf_w_opendir.c"),
|
||||
Object(NonMatching, "fa/pf_w_remove.c"),
|
||||
Object(NonMatching, "fa/pf_w_rename.c"),
|
||||
Object(NonMatching, "fa/pf_w_rmdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_xdivide.c"),
|
||||
Object(NonMatching, "fa/pf_filelock.c"),
|
||||
Object(NonMatching, "fa/pf_stub.c"),
|
||||
Object(NonMatching, "fa/pf_system.c"),
|
||||
Object(NonMatching, "fa/pf_stub_standard.c"),
|
||||
Object(NonMatching, "fa/pfs_attach.c"),
|
||||
Object(NonMatching, "fa/pfs_buffering.c"),
|
||||
Object(NonMatching, "fa/pfs_create.c"),
|
||||
Object(NonMatching, "fa/pfs_createdir.c"),
|
||||
Object(NonMatching, "fa/pfs_detach.c"),
|
||||
Object(NonMatching, "fa/pfs_errnum.c"),
|
||||
Object(NonMatching, "fa/pfs_fclose.c"),
|
||||
Object(NonMatching, "fa/pfs_finfot.c"),
|
||||
Object(NonMatching, "fa/pfs_fopen.c"),
|
||||
Object(NonMatching, "fa/pfs_format.c"),
|
||||
Object(NonMatching, "fa/pfs_fread.c"),
|
||||
Object(NonMatching, "fa/pfs_fseek.c"),
|
||||
Object(NonMatching, "fa/pfs_fsfirst.c"),
|
||||
Object(NonMatching, "fa/pfs_fsnext.c"),
|
||||
Object(NonMatching, "fa/pfs_fstat.c"),
|
||||
Object(NonMatching, "fa/pfs_fwrite.c"),
|
||||
Object(NonMatching, "fa/pfs_getdev.c"),
|
||||
Object(NonMatching, "fa/pfs_init_prfile2.c"),
|
||||
Object(NonMatching, "fa/pfs_mount.c"),
|
||||
Object(NonMatching, "fa/pfs_remove.c"),
|
||||
Object(NonMatching, "fa/pfs_unmount.c"),
|
||||
Object(NonMatching, "fa/pf_stub_unicode.c"),
|
||||
|
||||
Object(NonMatching, "fa/api/FAAttach.c"),
|
||||
Object(Matching, "fa/api/FABuffering.c"),
|
||||
Object(Matching, "fa/api/FACreate.c"),
|
||||
Object(Matching, "fa/api/FACreatedir.c"),
|
||||
Object(Matching, "fa/api/FADetach.c"),
|
||||
Object(Matching, "fa/api/FAErrnum.c"),
|
||||
Object(NonMatching, "fa/api/FABuffering.c"),
|
||||
Object(NonMatching, "fa/api/FACreate.c"),
|
||||
Object(NonMatching, "fa/api/FACreatedir.c"),
|
||||
Object(NonMatching, "fa/api/FADetach.c"),
|
||||
Object(NonMatching, "fa/api/FAErrnum.c"),
|
||||
Object(Matching, "fa/api/FAFclose.c"),
|
||||
Object(Matching, "fa/api/FAFinfo.c"),
|
||||
Object(Matching, "fa/api/FAFopen.c"),
|
||||
Object(Matching, "fa/api/FAFormat.c"),
|
||||
Object(NonMatching, "fa/api/FAFopen.c"),
|
||||
Object(NonMatching, "fa/api/FAFormat.c"),
|
||||
Object(Matching, "fa/api/FAFread.c"),
|
||||
Object(Matching, "fa/api/FAFseek.c"),
|
||||
Object(Matching, "fa/api/FAFsfirst.c"),
|
||||
Object(Matching, "fa/api/FAFsnext.c"),
|
||||
Object(Matching, "fa/api/FAFstat.c"),
|
||||
Object(NonMatching, "fa/api/FAFseek.c"),
|
||||
Object(NonMatching, "fa/api/FAFsfirst.c"),
|
||||
Object(NonMatching, "fa/api/FAFsnext.c"),
|
||||
Object(NonMatching, "fa/api/FAFstat.c"),
|
||||
Object(Matching, "fa/api/FAFwrite.c"),
|
||||
Object(Matching, "fa/api/FAGetdev.c"),
|
||||
Object(Matching, "fa/api/FAInit.c"),
|
||||
Object(NonMatching, "fa/api/FAGetdev.c"),
|
||||
Object(NonMatching, "fa/api/FAInit.c"),
|
||||
Object(Matching, "fa/api/FAInitDiskManager.c"),
|
||||
Object(Matching, "fa/api/FAMount.c"),
|
||||
Object(Matching, "fa/api/FARegistCB.c"),
|
||||
Object(Matching, "fa/api/FARemove.c"),
|
||||
Object(Matching, "fa/api/FASetThreadPriority.c"),
|
||||
Object(Matching, "fa/api/FAUnmount.c"),
|
||||
Object(NonMatching, "fa/api/FAMount.c"),
|
||||
Object(NonMatching, "fa/api/FARegistCB.c"),
|
||||
Object(NonMatching, "fa/api/FARemove.c"),
|
||||
Object(NonMatching, "fa/api/FASetThreadPriority.c"),
|
||||
Object(NonMatching, "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"),
|
||||
]
|
||||
),
|
||||
@@ -1870,7 +1870,7 @@ config.libs = [
|
||||
RVLSDKLib("nup", [
|
||||
Object(NonMatching, "nup/nup.cpp"),
|
||||
Object(NonMatching, "nup/nup_nhttp.cpp"),
|
||||
Object(Matching, "nup/nup_mem.cpp"),
|
||||
Object(NonMatching, "nup/nup_mem.cpp"),
|
||||
]
|
||||
),
|
||||
RVLSDKLib("scutil", [
|
||||
@@ -1887,7 +1887,7 @@ config.libs = [
|
||||
RVLSDKLib("kbd", [
|
||||
Object(NonMatching, "kbd/kbd_lib.c"),
|
||||
Object(NonMatching, "kbd/kbd_lib_map_jp.c"),
|
||||
Object(Matching, "kbd/kbd_lib_map_us.c"),
|
||||
Object(NonMatching, "kbd/kbd_lib_map_us.c"),
|
||||
Object(NonMatching, "kbd/kbd_lib_map_eu.c"),
|
||||
]
|
||||
),
|
||||
@@ -1944,30 +1944,30 @@ config.libs = [
|
||||
Object(Matching, "MSL_Common/alloc.c"),
|
||||
Object(Matching, "MSL_Common/errno.c"),
|
||||
Object(Matching, "MSL_Common/ansi_files.c"),
|
||||
Object(Matching, "MSL_Common_Embedded/ansi_fp.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(NonMatching, "MSL_Common_Embedded/ansi_fp.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/ctype.c"),
|
||||
Object(Matching, "MSL_Common/locale.c"),
|
||||
Object(NonMatching, "MSL_Common/locale.c"),
|
||||
Object(Matching, "MSL_Common/arith.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/bsearch.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/buffer_io.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/direct_io.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/file_io.c"),
|
||||
Object(NonMatching, "MSL_Common/file_io.c"),
|
||||
Object(Matching, "MSL_Common/FILE_POS.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/mbstring.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/mem.c"),
|
||||
Object(Matching, "MSL_Common/mem_funcs.c"),
|
||||
Object(Matching, "MSL_Common/math_api.c"),
|
||||
Object(Matching, "MSL_Common/misc_io.c"),
|
||||
Object(Matching, "MSL_Common/printf.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(NonMatching, "MSL_Common/printf.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/qsort.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/rand.c"),
|
||||
Object(Matching, "MSL_Common/scanf.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(NonMatching, "MSL_Common/scanf.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/signal.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/string.c"),
|
||||
Object(Matching, "MSL_Common/float.c"),
|
||||
Object(Matching, "MSL_Common/strtold.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(NonMatching, "MSL_Common/strtold.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/strtoul.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/time.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(NonMatching, "MSL_Common/time.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/wctype.c"),
|
||||
Object(Matching, "MSL_Common/wmem.c"),
|
||||
Object(NonMatching, "MSL_Common/wprintf.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
|
||||
@@ -14,12 +14,7 @@ enum {
|
||||
typedef struct BS2UpdateHeader {
|
||||
char timestamp[16]; // 0x00
|
||||
u32 wadCount; // 0x10
|
||||
#ifdef BS2_UPDATE_SOURCE
|
||||
u32 extraCount;
|
||||
u32 reserved[2];
|
||||
#else
|
||||
u32 reserved[3]; // 0x14
|
||||
#endif
|
||||
} BS2UpdateHeader;
|
||||
|
||||
typedef struct BS2UpdateEntry {
|
||||
@@ -34,12 +29,7 @@ typedef struct BS2UpdateEntry {
|
||||
u64 titleId; // 0x50
|
||||
u16 titleVersion; // 0x58
|
||||
|
||||
#ifdef BS2_UPDATE_SOURCE
|
||||
u16 reservedTitle;
|
||||
u32 inodes;
|
||||
#else
|
||||
u8 padding[6]; // 0x5A
|
||||
#endif
|
||||
|
||||
// Update Data
|
||||
char dataName[0x40]; // 0x60
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -183,10 +183,125 @@ namespace textinput {
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifndef TI_CELLPHONE_MATCH_LAYOUT
|
||||
#include "tiCellPhoneLayout.h"
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
public:
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mpEventHandler(NULL) {}
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void setCommandReceiver(CommandReceiver* receiver);
|
||||
virtual void updateFromReceiver(u32 command, void* data);
|
||||
virtual void onKey(u32 event, void* data);
|
||||
virtual void setLanguage(Language language);
|
||||
virtual void update();
|
||||
virtual void onActive();
|
||||
virtual void calc();
|
||||
virtual void draw();
|
||||
virtual void changeInputMode(InputMode mode);
|
||||
virtual void setInputMode(InputMode mode);
|
||||
virtual void setUpperCaseJP(bool upper);
|
||||
virtual void setLangKeyActive(bool active);
|
||||
virtual void goSignInputMode();
|
||||
virtual void changePredictLanguage();
|
||||
virtual void setAbcMode(bool abc);
|
||||
virtual void doNumericMode(bool);
|
||||
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R* dialog);
|
||||
virtual void setSignWindow(signwindow::LayoutByNW4R* window);
|
||||
#else
|
||||
class LayoutByNW4R;
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) && defined(TI_CELLPHONE_SAMPLE_CLASS)
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_VK_cellPhone_a.brlyt", observer), mpSignWindow(NULL) {}
|
||||
#endif
|
||||
virtual void doNumericMode(bool);
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R*);
|
||||
virtual void setSignWindow(signwindow::LayoutByNW4R*);
|
||||
#else
|
||||
virtual void setPredictLanguageDialog(void*);
|
||||
virtual void setSignWindow(void*);
|
||||
#endif
|
||||
#endif
|
||||
virtual void doNumericWithDotMode(bool);
|
||||
virtual void setLineFeedButton(bool);
|
||||
virtual void setPredictLanguageButton(bool);
|
||||
virtual void setSignWindowButton(bool);
|
||||
#endif
|
||||
virtual bool onClose();
|
||||
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
bool hasLineFeedButton() const { return mbLineFeedButton; }
|
||||
private:
|
||||
bool mbLineFeedButton;
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
GXTexObj mSpaceTexture;
|
||||
GXTexObj mSpaceTextureCN;
|
||||
GXTexObj mSpaceTextureKR;
|
||||
nw4rmanager::TiEventHandler* mpEventHandler;
|
||||
predictlang::LayoutByNW4R* mpPredictDialog;
|
||||
signwindow::LayoutByNW4R* mpSignWindow;
|
||||
#endif
|
||||
public:
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) override;
|
||||
virtual bool updateInput(input::HKBManager& hkbManager) override;
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void draw() override;
|
||||
virtual void calc() override;
|
||||
virtual void update() override;
|
||||
virtual void onKey(u32 key, void* data) override;
|
||||
virtual void onActive() override;
|
||||
virtual void updateFromReceiver(u32 command, void* data) override;
|
||||
virtual void changeInputMode(InputMode mode) override;
|
||||
virtual void changePredictLanguage() override;
|
||||
virtual void setAbcMode(bool enabled) override;
|
||||
virtual void goSignInputMode() override;
|
||||
virtual void setInputMode(InputMode mode) override;
|
||||
virtual void setLanguage(Language language) override;
|
||||
virtual void setCommandReceiver(CommandReceiver* receiver) override;
|
||||
|
||||
virtual CellPhoneAnmPane* getAnmPane(InputMode mode);
|
||||
virtual void throwReleaseForAll();
|
||||
virtual void changeAnimationAllToNormal();
|
||||
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode);
|
||||
virtual void changeKeyTop(const PaneNameToCharCode* keys);
|
||||
virtual void changeSpaceKeyTop(const PaneNameToCharCode* keys);
|
||||
void setUpperCaseJP(bool enabled);
|
||||
void setLangKeyActive(bool enabled);
|
||||
void resetHoldingButton();
|
||||
|
||||
private:
|
||||
bool mbLineFeedButton;
|
||||
GXTexObj mTextures[3];
|
||||
EventHandler* mpEventHandler;
|
||||
predictlang::LayoutByNW4R* mpPredictLanguageDialog;
|
||||
signwindow::LayoutByNW4R* mpSignWindow;
|
||||
#elif defined(TIMANAGER_IMPLEMENTATION)
|
||||
virtual nw4rmanager::AnmPane* getAnmPane(InputMode mode);
|
||||
virtual void throwReleaseForAll();
|
||||
virtual void changeAnimationAllToNormal();
|
||||
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode);
|
||||
virtual void changeKeyTop(const struct PaneNameToCharCode* table);
|
||||
virtual void changeSpaceKeyTop(const struct PaneNameToCharCode* table);
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef TI_CELLPHONE_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, observer) {}
|
||||
virtual ~Sample() {}
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
@@ -207,29 +322,10 @@ namespace textinput {
|
||||
KT_ControlButton,
|
||||
};
|
||||
|
||||
#ifdef TI_CELLPHONE_MATCH_LAYOUT
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
virtual ~EventHandler();
|
||||
virtual void onTiEvent(gui::PaneComponent* pane, u32 event, Input* input) override;
|
||||
|
||||
private:
|
||||
LayoutByNW4R* mpLayoutByNW4R;
|
||||
};
|
||||
#endif
|
||||
|
||||
class CellPhoneAnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
CellPhoneAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
#ifdef TI_CELLPHONE_MATCH_LAYOUT
|
||||
: nw4rmanager::AnmPane(pane, observer), meState(ANM_Normal), meKeyType(KT_NormalButton) {
|
||||
init();
|
||||
changeAnimation(meState);
|
||||
}
|
||||
#else
|
||||
: nw4rmanager::AnmPane(pane, observer), meState(ANM_Normal), meKeyType(KT_NormalButton) {}
|
||||
#endif
|
||||
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent event) override;
|
||||
@@ -252,7 +348,6 @@ namespace textinput {
|
||||
virtual ~CellPhoneControlAnmPane();
|
||||
};
|
||||
|
||||
#ifndef TI_CELLPHONE_MATCH_LAYOUT
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
@@ -262,12 +357,7 @@ namespace textinput {
|
||||
private:
|
||||
LayoutByNW4R* mpLayoutByNW4R;
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef TI_CELLPHONE_MATCH_LAYOUT
|
||||
#include "tiCellPhoneLayout.h"
|
||||
#endif
|
||||
|
||||
} // namespace cellphonetype
|
||||
|
||||
@@ -1,126 +0,0 @@
|
||||
#ifndef TEXTINPUT_CELL_PHONE_LAYOUT_H
|
||||
#define TEXTINPUT_CELL_PHONE_LAYOUT_H
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
public:
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mpEventHandler(NULL) {}
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void setCommandReceiver(CommandReceiver* receiver);
|
||||
virtual void updateFromReceiver(u32 command, void* data);
|
||||
virtual void onKey(u32 event, void* data);
|
||||
virtual void setLanguage(Language language);
|
||||
virtual void update();
|
||||
virtual void onActive();
|
||||
virtual void calc();
|
||||
virtual void draw();
|
||||
virtual void changeInputMode(InputMode mode);
|
||||
virtual void setInputMode(InputMode mode);
|
||||
virtual void setUpperCaseJP(bool upper);
|
||||
virtual void setLangKeyActive(bool active);
|
||||
virtual void goSignInputMode();
|
||||
virtual void changePredictLanguage();
|
||||
virtual void setAbcMode(bool abc);
|
||||
virtual void doNumericMode(bool);
|
||||
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R* dialog);
|
||||
virtual void setSignWindow(signwindow::LayoutByNW4R* window);
|
||||
#else
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) && defined(TI_CELLPHONE_SAMPLE_CLASS)
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_VK_cellPhone_a.brlyt", observer), mpSignWindow(NULL) {}
|
||||
#endif
|
||||
virtual void doNumericMode(bool);
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R*);
|
||||
virtual void setSignWindow(signwindow::LayoutByNW4R*);
|
||||
#else
|
||||
virtual void setPredictLanguageDialog(void*);
|
||||
virtual void setSignWindow(void*);
|
||||
#endif
|
||||
#endif
|
||||
virtual void doNumericWithDotMode(bool);
|
||||
virtual void setLineFeedButton(bool);
|
||||
virtual void setPredictLanguageButton(bool);
|
||||
virtual void setSignWindowButton(bool);
|
||||
#endif
|
||||
virtual bool onClose();
|
||||
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
bool hasLineFeedButton() const { return mbLineFeedButton; }
|
||||
private:
|
||||
bool mbLineFeedButton;
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
GXTexObj mSpaceTexture;
|
||||
GXTexObj mSpaceTextureCN;
|
||||
GXTexObj mSpaceTextureKR;
|
||||
nw4rmanager::TiEventHandler* mpEventHandler;
|
||||
predictlang::LayoutByNW4R* mpPredictDialog;
|
||||
signwindow::LayoutByNW4R* mpSignWindow;
|
||||
#endif
|
||||
public:
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) override;
|
||||
virtual bool updateInput(input::HKBManager& hkbManager) override;
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void draw() override;
|
||||
virtual void calc() override;
|
||||
virtual void update() override;
|
||||
virtual void onKey(u32 key, void* data) override;
|
||||
virtual void onActive() override;
|
||||
virtual void updateFromReceiver(u32 command, void* data) override;
|
||||
virtual void changeInputMode(InputMode mode) override;
|
||||
virtual void changePredictLanguage() override;
|
||||
virtual void setAbcMode(bool enabled) override;
|
||||
virtual void goSignInputMode() override;
|
||||
virtual void setInputMode(InputMode mode) override;
|
||||
virtual void setLanguage(Language language) override;
|
||||
virtual void setCommandReceiver(CommandReceiver* receiver) override;
|
||||
|
||||
virtual CellPhoneAnmPane* getAnmPane(InputMode mode);
|
||||
virtual void throwReleaseForAll();
|
||||
virtual void changeAnimationAllToNormal();
|
||||
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode);
|
||||
virtual void changeKeyTop(const PaneNameToCharCode* keys);
|
||||
virtual void changeSpaceKeyTop(const PaneNameToCharCode* keys);
|
||||
void setUpperCaseJP(bool enabled);
|
||||
void setLangKeyActive(bool enabled);
|
||||
void resetHoldingButton();
|
||||
|
||||
private:
|
||||
bool mbLineFeedButton;
|
||||
GXTexObj mTextures[3];
|
||||
EventHandler* mpEventHandler;
|
||||
predictlang::LayoutByNW4R* mpPredictLanguageDialog;
|
||||
signwindow::LayoutByNW4R* mpSignWindow;
|
||||
#elif defined(TIMANAGER_IMPLEMENTATION)
|
||||
virtual nw4rmanager::AnmPane* getAnmPane(InputMode mode);
|
||||
virtual void throwReleaseForAll();
|
||||
virtual void changeAnimationAllToNormal();
|
||||
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode);
|
||||
virtual void changeKeyTop(const struct PaneNameToCharCode* table);
|
||||
virtual void changeSpaceKeyTop(const struct PaneNameToCharCode* table);
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef TI_CELLPHONE_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, observer) {}
|
||||
virtual ~Sample() {}
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
@@ -93,13 +93,8 @@ namespace textinput {
|
||||
extern const KeySet csKeySetCNPinyin;
|
||||
extern const KeySet csKeySetHangul;
|
||||
|
||||
#ifdef TI_CELLPHONE_MATCH_LAYOUT
|
||||
extern const wchar_t* csSpaceZero;
|
||||
extern const wchar_t* csSpace;
|
||||
#else
|
||||
extern const wchar_t csSpaceZero[3];
|
||||
extern const wchar_t csSpace[3];
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -151,26 +151,6 @@ namespace textinput {
|
||||
u32 GetModifierState() const;
|
||||
void SetModifierState(u32, u32);
|
||||
|
||||
#if defined(TI_CELLPHONE_HKB_KEYSET)
|
||||
class KeySet {
|
||||
public:
|
||||
u8 GetKey() const;
|
||||
u32 GetWChar() const;
|
||||
bool IsValid() const;
|
||||
KeySet GetNext() const;
|
||||
KeySet(const KeySet& other)
|
||||
: mpManager(other.mpManager), mKind(other.mKind), mIndex(other.mIndex),
|
||||
mDevice(other.mDevice), mCharacter(other.mCharacter) {}
|
||||
private:
|
||||
const HKBManager* mpManager;
|
||||
u8 mKind;
|
||||
s8 mIndex;
|
||||
u8 mDevice;
|
||||
u16 mCharacter;
|
||||
};
|
||||
KeySet GetTriggeredKeySet() const;
|
||||
KeySet GetRepeatedKeySet() const;
|
||||
#else
|
||||
#if defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
class KeySet {
|
||||
public:
|
||||
@@ -222,7 +202,6 @@ namespace textinput {
|
||||
KeySet GetRepeatedKeySet() const;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
private:
|
||||
u8 unk_0x00[0xFC];
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -15,12 +15,9 @@ namespace textinput {
|
||||
#if !(defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) && !defined(TIMANAGER_IMPLEMENTATION) && !defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual void create(MEMAllocator* alloc) override;
|
||||
virtual void init() override;
|
||||
|
||||
#ifndef TI_CELLPHONE_MATCH_LAYOUT
|
||||
virtual void setCommandReceiver(CommandReceiver* receiver) override;
|
||||
virtual void sendCommand(u32 command, void*) override;
|
||||
#endif
|
||||
#endif
|
||||
#if !defined(TIMANAGER_IMPLEMENTATION) && !defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual void updateFromReceiver(u32, void*) override;
|
||||
#endif
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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() {}
|
||||
|
||||
@@ -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,36 +155,14 @@ 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
|
||||
T get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
T 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;
|
||||
}
|
||||
#else
|
||||
T get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
@@ -196,7 +174,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 +191,14 @@ 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
|
||||
|
||||
|
||||
@@ -134,15 +134,7 @@ namespace ipl {
|
||||
VEC3& operator/=(f32 val) { return operator*=(1.f / val); }
|
||||
VEC3 operator+(const VEC3& rhs) const { return VEC3(x + rhs.x, y + rhs.y, z + rhs.z); }
|
||||
VEC3 operator+(f32 v) const { return VEC3(x + v, y + v, z + v); }
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
nw4r::math::VEC3 operator-(const VEC3& rhs) const {
|
||||
nw4r::math::VEC3 difference;
|
||||
nw4r::math::VEC3Sub(&difference, this, &rhs);
|
||||
return difference;
|
||||
}
|
||||
#else
|
||||
VEC3 operator-(const VEC3& rhs) const { return VEC3(x - rhs.x, y - rhs.y, z - rhs.z); }
|
||||
#endif
|
||||
VEC3 operator*(f32 val) const { return VEC3(x * val, y * val, z * val); }
|
||||
VEC3 operator*(f64 val) const {
|
||||
nw4r::math::VEC3 vecOut;
|
||||
|
||||
@@ -86,7 +86,6 @@ namespace ipl {
|
||||
|
||||
const utility::BScroller& getBInst() { return mBScroller; }
|
||||
#ifdef IPL_SDMEMORY_SCROLLER_BINST_RESET
|
||||
void initScroll() { mScroller.init(); }
|
||||
void resetBInst() { mBScroller.reset(); }
|
||||
#endif
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -312,33 +312,6 @@ namespace ipl {
|
||||
void setLayoutFrame(int state);
|
||||
BOOL tellStartingZoomAnm();
|
||||
void initPageAnimations(const math::VEC3& position, int direction);
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
void removeNandTitleInfo(ESTitleId titleId) {
|
||||
u32 titleCount = mNandTitleCount;
|
||||
u32 index = 0;
|
||||
for (; index < titleCount; ++index) {
|
||||
if (mpNandTitleInfo[index].curTitleId == titleId) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (index < mNandTitleCount) {
|
||||
for (; index < mNandTitleCount - 1; ++index) {
|
||||
NandSDWorker::TitleUsage& nextTitle = mpNandTitleInfo[index + 1];
|
||||
NandSDWorker::TitleUsage& currentTitle = mpNandTitleInfo[index];
|
||||
currentTitle.curTitleId = nextTitle.curTitleId;
|
||||
currentTitle.size = nextTitle.size;
|
||||
currentTitle.inode = nextTitle.inode;
|
||||
}
|
||||
--mNandTitleCount;
|
||||
}
|
||||
}
|
||||
nw4r::math::VEC3 getPageTransitionPosition(int index) const {
|
||||
nw4r::math::VEC3 position(0.0f, 0.0f, 0.0f);
|
||||
nw4r::lyt::Pane* pane = getCenterChannelPane(index);
|
||||
PSMTXMultVec(pane->GetGlobalMtx(), position, position);
|
||||
return position;
|
||||
}
|
||||
#endif
|
||||
static BOOL isChannelReady(const SDChannelObj* channel);
|
||||
nw4r::ut::List mChannelObjects;
|
||||
nand::LayoutFile* mpLayoutFile;
|
||||
@@ -395,9 +368,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;
|
||||
|
||||
@@ -29,9 +29,6 @@ namespace ipl {
|
||||
class Setting;
|
||||
class APScanThread;
|
||||
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
class APEvent;
|
||||
#else
|
||||
class APEvent : public ::gui::EventHandler {
|
||||
public:
|
||||
APEvent(Setting* setting) : ::gui::EventHandler(), mpSetting(setting) {}
|
||||
@@ -41,17 +38,16 @@ namespace ipl {
|
||||
private:
|
||||
Setting* mpSetting;
|
||||
};
|
||||
#endif
|
||||
|
||||
struct SettingAnimation {
|
||||
u8 unknown[0x14];
|
||||
int state;
|
||||
};
|
||||
|
||||
struct SettingAPScanList {
|
||||
u8 unknown[0x14];
|
||||
union {
|
||||
struct {
|
||||
u16 count;
|
||||
u8 entries[0x7fe];
|
||||
};
|
||||
u8 recordBuffer[0x800];
|
||||
};
|
||||
u16 count;
|
||||
u8 entries[0x7fe];
|
||||
union {
|
||||
WDBssDesc_* currentDescriptor;
|
||||
u16* currentDescriptorWords;
|
||||
@@ -90,7 +86,7 @@ namespace ipl {
|
||||
void initHTMLText();
|
||||
void initMessage();
|
||||
void initKeyboard(const char* text);
|
||||
bool checkInputString(const wchar_t* text) NO_INLINE;
|
||||
bool checkInputString(const wchar_t* text);
|
||||
int checkIPString(const wchar_t* text);
|
||||
void setDefaultBackString();
|
||||
void calcKeyboard();
|
||||
@@ -162,6 +158,7 @@ namespace ipl {
|
||||
virtual void destroy();
|
||||
virtual void prepare();
|
||||
virtual void create();
|
||||
virtual void calc();
|
||||
virtual void draw();
|
||||
virtual FaderSceneCommand calcFadein();
|
||||
virtual FaderSceneCommand calcNormal();
|
||||
@@ -211,8 +208,8 @@ namespace ipl {
|
||||
layout::Object* mpChangeLayout;
|
||||
layout::Object* mpMainLayout;
|
||||
layout::Object* mpWaitLayout;
|
||||
utility::FrameController* mpFirstAnimation;
|
||||
utility::FrameController* mpSecondAnimation;
|
||||
SettingAnimation* mpFirstAnimation;
|
||||
SettingAnimation* mpSecondAnimation;
|
||||
APEvent* mpEventHandler;
|
||||
gui::PaneManager* mpPaneManager;
|
||||
void* mpUSBAPThread;
|
||||
@@ -265,17 +262,6 @@ namespace ipl {
|
||||
#endif
|
||||
|
||||
};
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
class APEvent : public ::gui::EventHandler {
|
||||
public:
|
||||
APEvent(Setting* setting) : ::gui::EventHandler(), mpSetting(setting) {}
|
||||
|
||||
virtual void onEvent(u32 componentID, u32 event, void* data);
|
||||
|
||||
private:
|
||||
Setting* mpSetting;
|
||||
};
|
||||
#endif
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace ipl {
|
||||
void stt_wait_fns_msg();
|
||||
void stt_wait_terminate();
|
||||
|
||||
int getProgressPercent();
|
||||
int fn_8135B1C0();
|
||||
|
||||
void error_handling();
|
||||
|
||||
|
||||
@@ -37,41 +37,23 @@ namespace ipl {
|
||||
LETTER,
|
||||
PHOTO_LETTER,
|
||||
NUMERIC,
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
NORMAL_WITHOUT_LINEFEED = 2,
|
||||
NORMAL_WITHOUT_LINEFEED_WITH_SIGN = 4,
|
||||
NORMAL_BIGTEXT_WITHOUT_LINEFEED = 6,
|
||||
#else
|
||||
NORMAL_WITHOUT_LINEFEED,
|
||||
NORMAL_WITHOUT_LINEFEED_WITH_SIGN,
|
||||
NORMAL_BIGTEXT_WITHOUT_LINEFEED,
|
||||
#endif
|
||||
ONLY_QWERTY_WITHOUT_LINEFEED_AND_SIGN,
|
||||
ONLY_QWERTY_BIGTEXT_WITHOUT_LINEFEED_AND_SIGN,
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
NUMERIC_WITH_DOT = 16,
|
||||
NUMERIC_BIGTEXT_WITH_DOT = 10,
|
||||
#else
|
||||
NUMERIC_WITH_DOT,
|
||||
NUMERIC_BIGTEXT_WITH_DOT,
|
||||
#endif
|
||||
NORMAL_BIGTEXT_WITHOUT_LINEFEED_WITH_SIGN,
|
||||
NUMERIC_WITH_SEPERATOR,
|
||||
PREDICT_WITHOUT_LINEFEED,
|
||||
} KeyboardType;
|
||||
|
||||
typedef struct KeyboardSetting {
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
u32 rowLimit;
|
||||
const wchar_t* wcString;
|
||||
u32 stringLimit;
|
||||
KeyboardType type;
|
||||
#else
|
||||
KeyboardType type; // 0x00
|
||||
const wchar_t* wcString; // 0x04
|
||||
u32 stringLimit; // 0x08
|
||||
u32 rowLimit; // 0x0C
|
||||
#endif
|
||||
#ifdef IPL_ADDRESS_EDIT_CPP
|
||||
KeyboardSetting(KeyboardType keyboardType, const wchar_t* value, u32 limit, u32 rows);
|
||||
#endif
|
||||
|
||||
@@ -6,9 +6,6 @@
|
||||
#include "system/iplMessage.h"
|
||||
|
||||
namespace ipl {
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
namespace scene { class Setting; }
|
||||
#endif
|
||||
namespace message {
|
||||
class Manager {
|
||||
public:
|
||||
@@ -19,9 +16,6 @@ namespace ipl {
|
||||
void setResource(u8* msgData) const { mpMessage->setResource(msgData); }
|
||||
|
||||
private:
|
||||
#ifdef IPL_SETTING_IMPLEMENTATION
|
||||
friend class scene::Setting;
|
||||
#endif
|
||||
void initMessage();
|
||||
|
||||
Message* mpMessage; // 0x00
|
||||
|
||||
@@ -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:
|
||||
@@ -65,19 +65,6 @@ namespace ipl {
|
||||
void setDidntGotoSDMenu(BOOL value) { mData.didntGotoSDMenu = value; }
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SDMEMORY_TITLE_CACHE_ACCESS
|
||||
const ESTitleId* getTitleCache() const { return &mData.titleCache[0][0]; }
|
||||
ESTitleId getTitleCacheEntry(int index) const { return (&mData.titleCache[0][0])[index]; }
|
||||
#endif
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
ESTitleId getCachedTitle(int index) const {
|
||||
if (index < 0 || index >= MAX_CHANNEL_TOTAL) {
|
||||
return 0;
|
||||
}
|
||||
return (&mData.titleCache[0][0])[index];
|
||||
}
|
||||
#endif
|
||||
|
||||
bool hasPhotoMP3Dummy() { return mbPhotoMP3; }
|
||||
bool hasPhoto2Title() { return mbPhoto2; }
|
||||
bool hasPhoto2DummyCheck() { return mbPhoto2Check; }
|
||||
@@ -87,7 +74,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 +171,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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -528,7 +528,6 @@ static char* double2hex(long double num, char* buff, print_format format) {
|
||||
unsigned snum;
|
||||
long exp;
|
||||
print_format exp_format;
|
||||
print_format* exp_fmt_ptr = &exp_format;
|
||||
int hex_precision;
|
||||
int mantissa_bit;
|
||||
decform form;
|
||||
@@ -603,7 +602,7 @@ static char* double2hex(long double num, char* buff, print_format format) {
|
||||
|
||||
exp = snum - 0x3FF;
|
||||
|
||||
p = long2str(exp, buff, *exp_fmt_ptr);
|
||||
p = long2str(exp, buff, exp_format);
|
||||
if (format.conversion_char == 'a')
|
||||
*--p = 'p';
|
||||
else
|
||||
@@ -625,7 +624,7 @@ static char* double2hex(long double num, char* buff, print_format format) {
|
||||
working_byte = (*(q + mantissa_byte)) >> (7 - (mantissa_bit & 7));
|
||||
|
||||
if ((mantissa_bit & ~7) != ((mantissa_bit - 4) & ~7)) {
|
||||
working_byte |= (((*(q + (mantissa_byte - 1))) << 8) >> (7 - ((mantissa_bit) & 7)));
|
||||
working_byte |= (unsigned char)(((*(q + (mantissa_byte - 1))) << 8) >> (7 - ((mantissa_bit) & 7)));
|
||||
}
|
||||
|
||||
if (!TARGET_FLOAT_IMPLICIT_J_BIT) {
|
||||
@@ -636,14 +635,14 @@ static char* double2hex(long double num, char* buff, print_format format) {
|
||||
}
|
||||
|
||||
if ((working_byte &= 0xF) < 10) {
|
||||
working_byte += '0';
|
||||
working_byte = (unsigned char)(working_byte + '0');
|
||||
}
|
||||
else
|
||||
if (format.conversion_char == 'a') {
|
||||
working_byte += 'a' - 10;
|
||||
working_byte = (unsigned char)(working_byte + 'a' - 10);
|
||||
}
|
||||
else {
|
||||
working_byte += 'A' - 10;
|
||||
working_byte = (unsigned char)(working_byte + 'A' - 10);
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -968,7 +967,6 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
const char* format_ptr;
|
||||
const char* curr_format;
|
||||
print_format format;
|
||||
print_format* fmt_ptr = &format;
|
||||
signed long long_num;
|
||||
signed long long long_long_num;
|
||||
long double long_double_num;
|
||||
@@ -1035,11 +1033,11 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
|| format.argument_options == intmax_argument
|
||||
)
|
||||
{
|
||||
if (!(buff_ptr = longlong2str(long_long_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = longlong2str(long_long_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
} else {
|
||||
if (!(buff_ptr = long2str(long_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = long2str(long_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
}
|
||||
@@ -1081,11 +1079,11 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
|| format.argument_options == intmax_argument
|
||||
)
|
||||
{
|
||||
if (!(buff_ptr = longlong2str(long_long_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = longlong2str(long_long_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
} else {
|
||||
if (!(buff_ptr = long2str(long_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = long2str(long_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
}
|
||||
@@ -1105,7 +1103,7 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
long_double_num = va_arg(arg, double);
|
||||
}
|
||||
|
||||
if (!(buff_ptr = float2str(long_double_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = float2str(long_double_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
|
||||
@@ -1120,7 +1118,7 @@ int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProc
|
||||
long_double_num = va_arg(arg, double);
|
||||
}
|
||||
|
||||
if (!(buff_ptr = double2hex(long_double_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = double2hex(long_double_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
|
||||
|
||||
@@ -248,8 +248,6 @@ static char* find_name(const char* names, int index) {
|
||||
return extracted_name;
|
||||
}
|
||||
|
||||
#pragma exceptions off
|
||||
|
||||
char* asctime(const struct tm* timeptr) {
|
||||
static char asctime_result[26];
|
||||
char* result = asctime_result;
|
||||
@@ -285,8 +283,6 @@ char* ctime(const time_t* timer) {
|
||||
return result;
|
||||
}
|
||||
|
||||
#pragma exceptions on
|
||||
|
||||
static time_t time(time_t* timer) {
|
||||
time_t result = __get_time();
|
||||
|
||||
@@ -316,8 +312,6 @@ static struct tm* gmtime(const time_t* timer) {
|
||||
return &gmtime_tm;
|
||||
}
|
||||
|
||||
#pragma exceptions on
|
||||
|
||||
struct tm* localtime(const time_t* timer) {
|
||||
static struct tm localtime_tm;
|
||||
|
||||
|
||||
@@ -521,7 +521,6 @@ static wchar_t* double2hex(long double num, wchar_t* buff, print_format format)
|
||||
unsigned snum;
|
||||
long exp;
|
||||
print_format exp_format;
|
||||
print_format* exp_fmt_ptr = &exp_format;
|
||||
int hex_precision;
|
||||
int mantissa_bit;
|
||||
decform form;
|
||||
@@ -596,7 +595,7 @@ static wchar_t* double2hex(long double num, wchar_t* buff, print_format format)
|
||||
|
||||
exp = snum - 0x3FF;
|
||||
|
||||
p = long2str(exp, buff, *exp_fmt_ptr);
|
||||
p = long2str(exp, buff, exp_format);
|
||||
if (format.conversion_char == 'a')
|
||||
*--p = 'p';
|
||||
else
|
||||
@@ -618,7 +617,7 @@ static wchar_t* double2hex(long double num, wchar_t* buff, print_format format)
|
||||
working_byte = (*(q + mantissa_byte)) >> (7 - (mantissa_bit & 7));
|
||||
|
||||
if ((mantissa_bit & ~7) != ((mantissa_bit - 4) & ~7)) {
|
||||
working_byte |= (((*(q + (mantissa_byte - 1))) << 8) >> (7 - ((mantissa_bit) & 7)));
|
||||
working_byte |= (unsigned char)(((*(q + (mantissa_byte - 1))) << 8) >> (7 - ((mantissa_bit) & 7)));
|
||||
}
|
||||
|
||||
if (!TARGET_FLOAT_IMPLICIT_J_BIT) {
|
||||
@@ -629,14 +628,14 @@ static wchar_t* double2hex(long double num, wchar_t* buff, print_format format)
|
||||
}
|
||||
|
||||
if ((working_byte &= 0xF) < 10) {
|
||||
working_byte += '0';
|
||||
working_byte = (unsigned char)(working_byte + '0');
|
||||
}
|
||||
else
|
||||
if (format.conversion_char == 'a') {
|
||||
working_byte += 'a' - 10;
|
||||
working_byte = (unsigned char)(working_byte + 'a' - 10);
|
||||
}
|
||||
else {
|
||||
working_byte += 'A' - 10;
|
||||
working_byte = (unsigned char)(working_byte + 'A' - 10);
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -971,7 +970,6 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
const wchar_t* format_ptr;
|
||||
const wchar_t* curr_format;
|
||||
print_format format;
|
||||
print_format* fmt_ptr = &format;
|
||||
signed long long_num;
|
||||
signed long long long_long_num;
|
||||
long double long_double_num;
|
||||
@@ -1029,11 +1027,11 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
if (format.argument_options == long_long_argument ||
|
||||
format.argument_options == intmax_argument)
|
||||
{
|
||||
if (!(buff_ptr = longlong2str(long_long_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = longlong2str(long_long_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
} else {
|
||||
if (!(buff_ptr = long2str(long_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = long2str(long_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
}
|
||||
@@ -1071,11 +1069,11 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
|| format.argument_options == intmax_argument
|
||||
)
|
||||
{
|
||||
if (!(buff_ptr = longlong2str(long_long_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = longlong2str(long_long_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
} else {
|
||||
if (!(buff_ptr = long2str(long_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = long2str(long_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
}
|
||||
@@ -1095,7 +1093,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
long_double_num = va_arg(args, double);
|
||||
}
|
||||
|
||||
if (!(buff_ptr = float2str(long_double_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = float2str(long_double_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
|
||||
@@ -1110,7 +1108,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
long_double_num = va_arg(args, double);
|
||||
}
|
||||
|
||||
if (!(buff_ptr = double2hex(long_double_num, buff + 512, *fmt_ptr))) {
|
||||
if (!(buff_ptr = double2hex(long_double_num, buff + 512, format))) {
|
||||
goto conversion_error;
|
||||
}
|
||||
|
||||
@@ -1126,8 +1124,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
}
|
||||
|
||||
if (format.alternate_form) {
|
||||
wchar_t first = *wcs_ptr++;
|
||||
num_chars = (unsigned char)first;
|
||||
num_chars = (unsigned char)*wcs_ptr++;
|
||||
|
||||
if (format.precision_specified && num_chars > format.precision) {
|
||||
num_chars = format.precision;
|
||||
@@ -1153,7 +1150,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
}
|
||||
|
||||
if (format.alternate_form) {
|
||||
num_chars = (unsigned char)*(const wchar_t*)wcs_ptr;
|
||||
num_chars = (unsigned char)*wcs_ptr++;
|
||||
|
||||
if (format.precision_specified && num_chars > format.precision) {
|
||||
num_chars = format.precision;
|
||||
@@ -1225,7 +1222,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
num_chars = 1;
|
||||
break;
|
||||
|
||||
case 0xFFFF:
|
||||
case 0xFF:
|
||||
default:
|
||||
conversion_error:
|
||||
num_chars = wcslen(curr_format);
|
||||
|
||||
@@ -93,11 +93,7 @@ namespace nw4r {
|
||||
#else
|
||||
void SetTranslate(const math::VEC3& translate) { mTranslate = translate; }
|
||||
#endif
|
||||
#ifdef IPL_SDMEMORY_SET_TRANSLATE_OUT_OF_LINE
|
||||
void SetTranslate(const math::VEC2& translate);
|
||||
#else
|
||||
void SetTranslate(const math::VEC2& translate) { SetTranslate(math::VEC3(translate.x, translate.y, 0.0f)); }
|
||||
#endif
|
||||
|
||||
const math::VEC3& GetRotate() const { return mRotate; }
|
||||
void SetRotate(const math::VEC3& rotate) { mRotate = rotate; }
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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(); }
|
||||
|
||||
|
||||
@@ -14,13 +14,9 @@ namespace nw4r {
|
||||
#else
|
||||
Rect() : left(), top(), right(), bottom() {}
|
||||
#endif
|
||||
#ifdef IPL_SETTING_RECT_OUT_OF_LINE
|
||||
Rect(f32 l, f32 t, f32 r, f32 b);
|
||||
#else
|
||||
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
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -17,95 +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;
|
||||
@@ -138,7 +50,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,9 +60,64 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
work->bitCount = bit_pos;
|
||||
r = extra;
|
||||
} else {
|
||||
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 (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 dc_entry;
|
||||
|
||||
while (1) {
|
||||
i++;
|
||||
entry++;
|
||||
if (i > 16) {
|
||||
r = 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 = decoded.symbol;
|
||||
}
|
||||
|
||||
if (code > (u32)thresh) {
|
||||
continue;
|
||||
}
|
||||
|
||||
code = code - entry->bitLength + offs;
|
||||
r = huff_sym[code & 0xFF];
|
||||
break;
|
||||
}
|
||||
|
||||
dc_end:
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -164,15 +131,15 @@ 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;
|
||||
bit_pos -= r;
|
||||
work->bitCount = bit_pos;
|
||||
extra = extra & (bit_data >> bit_pos);
|
||||
if (((s32)tmp >> 1) > extra) {
|
||||
if (extra < (s32)tmp >> 1) {
|
||||
extra -= tmp - 1;
|
||||
}
|
||||
dc_predict_row_ptr[0] += extra;
|
||||
@@ -180,104 +147,156 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
|
||||
*block = dc_predict_row_ptr[0] * blk0;
|
||||
|
||||
{
|
||||
ac_fast = (const TMCHuffmanEntry*)work->pACFast;
|
||||
huff_tbl = work->pACHuffTbl;
|
||||
huff_sym = work->pACHuffSym;
|
||||
ac_fast = (const TMCHuffmanEntry*)work->pACFast;
|
||||
huff_tbl = work->pACHuffTbl;
|
||||
huff_sym = work->pACHuffSym;
|
||||
|
||||
memset(block + 1, 0, 0xFC);
|
||||
memset(block + 1, 0, 0xFC);
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
idx = 1;
|
||||
if (bit_pos <= 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0)
|
||||
bit_pos = work->bitCount;
|
||||
idx = 1;
|
||||
if (bit_pos <= 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
zztbl = TMCJPEGDEC_Zigzag_data;
|
||||
bit_data = work->bitBuf;
|
||||
t = bit_pos - 8;
|
||||
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
|
||||
|
||||
while (idx < 64) {
|
||||
s32 ac_thresh = acEntry.bitLength;
|
||||
if (ac_thresh != 0) {
|
||||
bit_pos = work->bitCount;
|
||||
bit_pos -= ac_thresh;
|
||||
work->bitCount = bit_pos;
|
||||
r = acEntry.symbol;
|
||||
} else {
|
||||
u32 code;
|
||||
unsigned int i;
|
||||
const TMCHuffmanEntry* entry;
|
||||
s32 thresh;
|
||||
s32 offs;
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
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 = decoded.symbol;
|
||||
}
|
||||
|
||||
if (code > (u32)thresh) {
|
||||
continue;
|
||||
}
|
||||
|
||||
code = code - entry->bitLength + offs;
|
||||
r = huff_sym[code & 0xFF];
|
||||
break;
|
||||
}
|
||||
|
||||
ac_end:
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
zztbl = TMCJPEGDEC_Zigzag_data;
|
||||
bit_data = work->bitBuf;
|
||||
t = bit_pos - 8;
|
||||
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
|
||||
t = r & 0x0F;
|
||||
if (t != 0) {
|
||||
r >>= 4;
|
||||
idx += r;
|
||||
|
||||
do {
|
||||
s32 ac_thresh = acEntry.bitLength;
|
||||
if (ac_thresh != 0) {
|
||||
if (idx >= 64) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
}
|
||||
|
||||
zz = zztbl[idx];
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
if (bit_pos <= t + 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
bit_pos -= ac_thresh;
|
||||
work->bitCount = bit_pos;
|
||||
r = acEntry.symbol;
|
||||
} else {
|
||||
bit_pos = work->bitCount;
|
||||
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
}
|
||||
tmp = 1 << t;
|
||||
bit_data = work->bitBuf;
|
||||
extra = tmp - 1;
|
||||
bit_pos -= t;
|
||||
work->bitCount = bit_pos;
|
||||
t = bit_pos - 8;
|
||||
extra = extra & (bit_data >> bit_pos);
|
||||
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
|
||||
|
||||
if (extra < (s32)tmp >> 1) {
|
||||
extra -= tmp - 1;
|
||||
}
|
||||
|
||||
q = ((s32*)conv_row_ptr)[zz];
|
||||
block[zz] = extra * q;
|
||||
|
||||
idx++;
|
||||
} else {
|
||||
if (r == 0) {
|
||||
break;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
if (bit_pos <= 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos = work->bitCount;
|
||||
t = bit_pos - 8;
|
||||
tmp = ((bit_data >> t) & 0xFF) << 2;
|
||||
acEntry = readHuffmanEntry(ac_fast, tmp >> 2);
|
||||
|
||||
t = r & 0x0F;
|
||||
if (t != 0) {
|
||||
r >>= 4;
|
||||
idx += r;
|
||||
|
||||
if (idx >= 64) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
}
|
||||
|
||||
zz = zztbl[idx];
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
if (bit_pos <= t + 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
tmp = 1 << t;
|
||||
bit_data = work->bitBuf;
|
||||
extra = tmp - 1;
|
||||
bit_pos -= t;
|
||||
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;
|
||||
|
||||
idx++;
|
||||
} else {
|
||||
if (r == 0) {
|
||||
break;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
if (bit_pos <= 8) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos = work->bitCount;
|
||||
t = bit_pos - 8;
|
||||
tmp = ((bit_data >> t) & 0xFF) << 2;
|
||||
acEntry = readHuffmanEntry(ac_fast, tmp >> 2);
|
||||
|
||||
idx += 16;
|
||||
}
|
||||
} while (idx < 64);
|
||||
|
||||
if (idx > 64) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
idx += 16;
|
||||
}
|
||||
|
||||
idx--;
|
||||
return TMCJPEGDEC_Zigzag_loop[idx];
|
||||
}
|
||||
|
||||
if (idx > 64) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
}
|
||||
|
||||
idx--;
|
||||
return TMCJPEGDEC_Zigzag_loop[idx];
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
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;
|
||||
p = z_factor + ((b5 - b3) * 0x8B >> 8);
|
||||
q = p + x;
|
||||
|
||||
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 < 0x39; 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,10 +342,12 @@ mode_gt_2:
|
||||
}
|
||||
block += 8;
|
||||
dst += 8;
|
||||
done += 8;
|
||||
}
|
||||
}
|
||||
|
||||
dst = tmp + done;
|
||||
for (; done <= 0x38; done += 8) {
|
||||
for (; done < 0x39; done += 8) {
|
||||
memset(dst, 0, 0x20);
|
||||
dst += 8;
|
||||
}
|
||||
@@ -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--;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -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;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -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);
|
||||
|
||||
@@ -12,140 +12,153 @@ ziU8 ZiDAWGgetEOWattribute(ziU8* graph);
|
||||
ziU8* ZiDAWGGetChild(ziU8* graph);
|
||||
ziU8* ZiDAWGGetSibling(ziU8* graph);
|
||||
|
||||
ziU32 Zi8MatchROMdata0(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
ziU32 Zi8MatchROMdata0(ziWChar* elements, ziU32 count, ziU8 language,
|
||||
ziWChar* output, ziU16 capacity, ziU8 mode, ziU8 status,
|
||||
ziU8 graphTable, ziU8 keyTable, ziU8 acceptPrefix,
|
||||
ziU8* prefixLength, zi8DawgCtx* context, ziU8* search,
|
||||
ziPtr __zi8_work_data) {
|
||||
ziU8 result = 0;
|
||||
ziU8* graphData;
|
||||
ziU8* keyData;
|
||||
ziS32 keyCount;
|
||||
ziS32 convertedKey;
|
||||
ziU16 searching;
|
||||
ziBool searching;
|
||||
ziS32 tableSize;
|
||||
ziU8* graph;
|
||||
ziU16 key;
|
||||
ziU16 keys[3];
|
||||
ziU16 index;
|
||||
ziU8 endOfWord;
|
||||
zi8DawgRec* current;
|
||||
ziU16 index;
|
||||
ziU16 depth;
|
||||
zi8DawgRec* records = context->recs;
|
||||
ziU8 result = 0;
|
||||
ziU32 keyCount;
|
||||
ziU8* table;
|
||||
ziU16 keys[3];
|
||||
|
||||
if (language != context->lang || graphTable != context->key) records[0].key = 0;
|
||||
if (count == 1 && mode != 0 && graphTable == 0xe) goto finish_graph;
|
||||
if (status != 0) {
|
||||
if (records[context->cnt - 1].node == (ziU8*)context->unk_0x338) goto finish_graph;
|
||||
for (index = 0; index < count; index++) {
|
||||
if (records[index].key != elements[index] &&
|
||||
(ziU16)records[index].attr != elements[index]) goto finish_graph;
|
||||
}
|
||||
if (mode == 1) acceptPrefix = 0;
|
||||
} else {
|
||||
if (ZI_WORK->unk_0x141E != 0 && graphTable == 0xc &&
|
||||
Zi8GetTableSize(language, ZI_WORK->unk_0x141E, ZI_WORK) != 0) {
|
||||
graphData = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->unk_0x141E, ZI_WORK);
|
||||
keyTable = ZI_WORK->unk_0x141E + 1;
|
||||
} else {
|
||||
if (Zi8GetTableSize(language, graphTable, ZI_WORK) == 0) {
|
||||
Zi8LogError(0x961, ZI_WORK);
|
||||
goto finish_graph;
|
||||
}
|
||||
graphData = (ziU8*)Zi8GetTableAddress(language, graphTable, ZI_WORK);
|
||||
}
|
||||
context->table = graphData;
|
||||
context->cap = (((ziU16)context->table[2] << 8) + context->table[3]) / 3;
|
||||
context->p08 = context->table + 4;
|
||||
context->p0C = context->table + context->cap * 2 + 4;
|
||||
context->lang = language;
|
||||
context->key = graphTable;
|
||||
index = 0;
|
||||
while (index < count && records[index].key == elements[index]) index++;
|
||||
if (index >= 2) {
|
||||
records[0].node = records[index - 1].back;
|
||||
} else {
|
||||
key = Zi8GetTableSize(language, keyTable, ZI_WORK);
|
||||
if (key != 0 && ZI_WORK->userKeys[language] == 0) {
|
||||
index = 0;
|
||||
goto check_keys;
|
||||
next_key:
|
||||
{
|
||||
keys[index] = Zi8ConvertWC2Key(elements[index], language, ZI_WORK);
|
||||
if (keys[index] == 0) keys[index] = elements[index];
|
||||
index++;
|
||||
}
|
||||
check_keys:
|
||||
if (count < 2) keyCount = count;
|
||||
else keyCount = 2;
|
||||
if (index < keyCount) goto next_key;
|
||||
keys[index] = 0;
|
||||
keyData = (ziU8*)Zi8GetTableAddress(language, keyTable, ZI_WORK);
|
||||
context->p14 = keyData + 2;
|
||||
keyData += context->cap * 2 + 2;
|
||||
records[0].node = ZiDAWGGetGraphInfo(context, keyData, (ziS16*)keys);
|
||||
} else {
|
||||
records[0].node = ZiDAWGGetGraph(context);
|
||||
context->unk_0x338 = 0;
|
||||
context->p14 = 0;
|
||||
}
|
||||
records[0].key = 0;
|
||||
if (records[0].node == (ziU8*)0) goto finish_graph;
|
||||
}
|
||||
context->cnt = 1;
|
||||
search[1] = count;
|
||||
search[0] = 0;
|
||||
if (mode == 1) {
|
||||
search[0] = 1;
|
||||
acceptPrefix = 0;
|
||||
} else if (mode == 0 && acceptPrefix == 0) search[1]++;
|
||||
if (language != context->lang || graphTable != context->key) {
|
||||
records[0].key = 0;
|
||||
}
|
||||
searching = 1;
|
||||
current = &records[context->cnt - 1];
|
||||
while (searching && context->cnt != 0 && current->node != (ziU8*)context->unk_0x338) {
|
||||
if (capacity < context->cnt) goto finish_graph;
|
||||
current->attr = ZiDAWGgetCHARattribute(context, current->node, ZI_WORK);
|
||||
if (context->cnt <= count) {
|
||||
if (context->p14 == 0) {
|
||||
convertedKey = Zi8ConvertWC2Key((ziU16)current->attr, language, ZI_WORK);
|
||||
if ((ziU8)count != 1 || mode == 0 || graphTable != 0xe) {
|
||||
if (status != 0) {
|
||||
if (records[context->cnt - 1].node == (ziU8*)context->unk_0x338) goto finish_graph;
|
||||
for (index = 0; (ziU16)index < (ziU8)count; index++) {
|
||||
if (records[(ziU16)index].key != elements[(ziU16)index] &&
|
||||
(records[(ziU16)index].attr & 0xffff) != elements[(ziU16)index]) goto finish_graph;
|
||||
}
|
||||
if (mode == 1) acceptPrefix = 0;
|
||||
} else {
|
||||
if (ZI_WORK->unk_0x141E == 0 || graphTable != 0xc ||
|
||||
(tableSize = Zi8GetTableSize(language, ZI_WORK->unk_0x141E, ZI_WORK)) == 0) {
|
||||
tableSize = Zi8GetTableSize(language, graphTable, ZI_WORK);
|
||||
if (tableSize == 0) {
|
||||
Zi8LogError(0x961, ZI_WORK);
|
||||
goto finish_graph;
|
||||
}
|
||||
table = (ziU8*)Zi8GetTableAddress(language, graphTable, ZI_WORK);
|
||||
} else {
|
||||
convertedKey = ((ziU16)context->p14[(current->attr >> 24) * 2] << 8) +
|
||||
(context->p14 + (current->attr >> 24) * 2)[1];
|
||||
table = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->unk_0x141E, ZI_WORK);
|
||||
keyTable = ZI_WORK->unk_0x141E + 1;
|
||||
}
|
||||
key = convertedKey;
|
||||
if (key != elements[context->cnt - 1] &&
|
||||
(ziU16)current->attr != elements[context->cnt - 1]) goto next_sibling;
|
||||
if (current->key != elements[context->cnt - 1]) {
|
||||
current->key = elements[context->cnt - 1];
|
||||
current->back = records[0].node;
|
||||
records[context->cnt].key = 0;
|
||||
context->table = table;
|
||||
context->cap = (((ziU16)context->table[2] << 8) + (ziU16)context->table[3]) / 3;
|
||||
context->p08 = context->table + 4;
|
||||
context->p0C = context->table + context->cap * 2 + 4;
|
||||
context->lang = language;
|
||||
context->key = graphTable;
|
||||
index = 0;
|
||||
while ((ziU16)index < (ziU8)count && records[(ziU16)index].key == elements[(ziU16)index]) {
|
||||
index++;
|
||||
}
|
||||
if (prefixLength != 0 && *prefixLength < context->cnt &&
|
||||
ZiDAWGgetEOWattribute(current->node) != 0) {
|
||||
*prefixLength = context->cnt;
|
||||
for (index = 0; index < context->cnt; index++) output[index] = (ziU16)records[index].attr;
|
||||
if ((ziU16)index < 2) {
|
||||
key = Zi8GetTableSize(language, keyTable, ZI_WORK);
|
||||
if (key == 0 || ZI_WORK->userKeys[language] != 0) {
|
||||
graph = ZiDAWGGetGraph(context);
|
||||
records[0].node = graph;
|
||||
context->unk_0x338 = 0;
|
||||
context->p14 = 0;
|
||||
} else {
|
||||
index = 0;
|
||||
while (1) {
|
||||
if ((ziU8)count < 2) keyCount = (ziU8)count;
|
||||
else keyCount = 2;
|
||||
if (keyCount <= (ziU16)index) break;
|
||||
key = Zi8ConvertWC2Key(elements[(ziU16)index], language, ZI_WORK);
|
||||
keys[(ziU16)index] = key;
|
||||
if (keys[(ziU16)index] == 0) keys[(ziU16)index] = elements[(ziU16)index];
|
||||
index++;
|
||||
}
|
||||
keys[(ziU16)index] = 0;
|
||||
table = (ziU8*)Zi8GetTableAddress(language, keyTable, ZI_WORK);
|
||||
context->p14 = table + 2;
|
||||
records[0].node = ZiDAWGGetGraphInfo(context, table + context->cap * 2 + 2, (ziS16*)keys);
|
||||
}
|
||||
records[0].key = 0;
|
||||
if (records[0].node == 0) goto finish_graph;
|
||||
} else {
|
||||
records[0].node = records[(ziU16)index - 1].back;
|
||||
}
|
||||
context->cnt = 1;
|
||||
search[1] = count;
|
||||
search[0] = 0;
|
||||
if (mode == 1) {
|
||||
search[0] = 1;
|
||||
acceptPrefix = 0;
|
||||
} else if (mode == 0 && acceptPrefix == 0) {
|
||||
search[1]++;
|
||||
}
|
||||
if (context->cnt < count) goto descend;
|
||||
}
|
||||
if (context->cnt < search[1]) goto descend;
|
||||
if (search[0] != 0 && context->cnt > search[1]) goto next_sibling;
|
||||
if (acceptPrefix != 0 || ZiDAWGgetEOWattribute(current->node) != 0) {
|
||||
for (index = 0; index < context->cnt; index++) output[index] = (ziU16)records[index].attr;
|
||||
result = context->cnt;
|
||||
searching = 0;
|
||||
if (acceptPrefix != 0) goto next_sibling;
|
||||
}
|
||||
if (search[0] != 0 && context->cnt >= search[1]) goto next_sibling;
|
||||
descend:
|
||||
records[context->cnt].node = ZiDAWGGetChild(records[context->cnt - 1].node);
|
||||
if (records[context->cnt].node == (ziU8*)0) goto next_sibling;
|
||||
context->cnt++;
|
||||
if (ZI_WORK->unk_0x141F < context->cnt) ZI_WORK->unk_0x141F = context->cnt;
|
||||
goto update_current;
|
||||
searching = 1;
|
||||
depth = context->cnt;
|
||||
while ((current = &records[depth - 1], searching) && context->cnt != 0 &&
|
||||
current->node != (ziU8*)context->unk_0x338 && context->cnt <= capacity) {
|
||||
current->attr = ZiDAWGgetCHARattribute(context, current->node, ZI_WORK);
|
||||
if ((ziU8)count < context->cnt) {
|
||||
check_word:
|
||||
if (context->cnt < search[1]) goto descend;
|
||||
if (search[0] == 0 || context->cnt <= search[1]) {
|
||||
if (acceptPrefix != 0 || (endOfWord = ZiDAWGgetEOWattribute(current->node)) != 0) {
|
||||
for (depth = 0; depth < context->cnt; depth++) {
|
||||
output[depth] = records[depth].attr;
|
||||
}
|
||||
result = context->cnt;
|
||||
searching = 0;
|
||||
if (acceptPrefix != 0) goto next_sibling;
|
||||
}
|
||||
if (search[0] == 0 || context->cnt < search[1]) goto descend;
|
||||
}
|
||||
next_sibling:
|
||||
while (context->cnt != 0) {
|
||||
records[context->cnt - 1].node = ZiDAWGGetSibling(records[context->cnt - 1].node);
|
||||
if (records[context->cnt - 1].node != (ziU8*)0) break;
|
||||
context->cnt--;
|
||||
while (context->cnt != 0) {
|
||||
graph = ZiDAWGGetSibling(records[context->cnt - 1].node);
|
||||
records[context->cnt - 1].node = graph;
|
||||
if (records[context->cnt - 1].node != 0) break;
|
||||
context->cnt--;
|
||||
}
|
||||
} else {
|
||||
if (context->p14 == 0) {
|
||||
key = Zi8ConvertWC2Key(current->attr & 0xffff, language, ZI_WORK);
|
||||
} else {
|
||||
key = (ziU16)context->p14[(current->attr >> 24) * 2] * 0x100 +
|
||||
(ziU16)context->p14[(current->attr >> 24) * 2 + 1];
|
||||
}
|
||||
if (key != elements[context->cnt - 1] &&
|
||||
(current->attr & 0xffff) != elements[context->cnt - 1]) goto next_sibling;
|
||||
if (current->key != elements[context->cnt - 1]) {
|
||||
current->key = elements[context->cnt - 1];
|
||||
current->back = records[0].node;
|
||||
depth = context->cnt;
|
||||
records[depth].key = 0;
|
||||
}
|
||||
if (prefixLength != 0 && *prefixLength < context->cnt &&
|
||||
(endOfWord = ZiDAWGgetEOWattribute(current->node)) != 0) {
|
||||
*prefixLength = context->cnt;
|
||||
for (depth = 0; depth < context->cnt; depth++) output[depth] = records[depth].attr;
|
||||
}
|
||||
if ((ziU8)count <= context->cnt) goto check_word;
|
||||
descend:
|
||||
graph = ZiDAWGGetChild(records[context->cnt - 1].node);
|
||||
records[context->cnt].node = graph;
|
||||
if (records[context->cnt].node == 0) goto next_sibling;
|
||||
context->cnt++;
|
||||
if (ZI_WORK->unk_0x141F < context->cnt) ZI_WORK->unk_0x141F = context->cnt;
|
||||
}
|
||||
depth = context->cnt;
|
||||
}
|
||||
update_current:
|
||||
current = &records[context->cnt - 1];
|
||||
}
|
||||
finish_graph:
|
||||
return result;
|
||||
@@ -177,13 +190,13 @@ ziU8* NextDawgGroup(ziU8* group, ziU8 language, ziPtr __zi8_work_data)
|
||||
return 0;
|
||||
}
|
||||
|
||||
unsigned int Zi8MatchROMdata1(ziWChar *elements, ziU8 count, ziU8 language, ziWChar *output, ziU16 capacity, ziU8 mode, ziU8 status, ziU32 groupIndex, char *group, ziU8 acceptPrefix, ziPtr __zi8_work_data)
|
||||
unsigned int Zi8MatchROMdata1(ziWChar *elements, ziU8 count, ziU8 language, ziWChar *output, ziU16 capacity, ziU8 mode, unsigned int status, ziU32 groupIndex, char *group, ziU8 acceptPrefix, ziPtr __zi8_work_data)
|
||||
{
|
||||
unsigned int result;
|
||||
ziU32 tableAddress;
|
||||
|
||||
result = 0;
|
||||
if (status == 0) {
|
||||
if ((status & 0xff) == 0) {
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)group;
|
||||
if (ZI_WORK->unk_0x1764 == 0) {
|
||||
if (Zi8GetTableSize(language & 0xff,0xb,ZI_WORK) != 0) {
|
||||
@@ -221,139 +234,163 @@ unsigned int Zi8MatchROMdata1(ziWChar *elements, ziU8 count, ziU8 language, ziWC
|
||||
return result;
|
||||
}
|
||||
|
||||
unsigned int Zi8MatchROMdata2(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
ziWChar* output, ziU16 capacity, ziU8 mode,
|
||||
ziU8 status, ziU8 reservedMode, ziU8* group,
|
||||
ziU8 acceptPrefix, ziPtr __zi8_work_data) {
|
||||
unsigned int result = 0;
|
||||
ziU8 index;
|
||||
unsigned int Zi8MatchROMdata2(ziWChar *elements, unsigned int count, unsigned int language, ziWChar *output, unsigned int capacity, unsigned int mode, unsigned int status, ziU8 reservedMode, ziU8 *group, ziU8 acceptPrefix, ziPtr __zi8_work_data)
|
||||
{
|
||||
ziU16 character;
|
||||
unsigned int result;
|
||||
ziU8 prefixCount;
|
||||
unsigned int index;
|
||||
unsigned int remaining;
|
||||
|
||||
if (reservedMode != 0) return 0;
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x1768 = 0;
|
||||
ZI_WORK->unk_0x17EA = 0;
|
||||
if (group != 0 && *group == 0xc && language == 10 && ZI_WORK->unk_0x141C != 0) {
|
||||
ZI_WORK->unk_0x141E = 0x10;
|
||||
} else {
|
||||
ZI_WORK->unk_0x141E = 0;
|
||||
}
|
||||
result = 0;
|
||||
if (reservedMode != 0) return 0;
|
||||
if ((status & 0xff) == 0) {
|
||||
ZI_WORK->unk_0x1768 = 0;
|
||||
ZI_WORK->unk_0x17EA = 0;
|
||||
if ((((group == 0) || (*group != '\f')) || ((language & 0xff) != 10)) ||
|
||||
(ZI_WORK->unk_0x141C == '\0')) {
|
||||
ZI_WORK->unk_0x141E = 0;
|
||||
}
|
||||
else {
|
||||
ZI_WORK->unk_0x141E = 0x10;
|
||||
}
|
||||
}
|
||||
search_segment:
|
||||
ZI_WORK->unk_0x141F = 1;
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA,
|
||||
count - ZI_WORK->unk_0x17EA, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
mode, status, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) {
|
||||
for (index = (ziU8)(ZI_WORK->unk_0x17EA + result); index != 0; index--) {
|
||||
output[index - 1] = ZI_WORK->unk_0x17F4[index - 1];
|
||||
result = Zi8MatchROMdata1(elements + (unsigned int)ZI_WORK->unk_0x17EA,
|
||||
count - ZI_WORK->unk_0x17EA & 0xff,language & 0xff,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA],
|
||||
capacity & 0xffff,mode & 0xff,status & 0xff,
|
||||
ZI_WORK->unk_0x1768,(char *)group,acceptPrefix,ZI_WORK);
|
||||
if ((result & 0xff) == 0) {
|
||||
if ((((status & 0xff) != 0) || ((count & 0xff) == 1)) ||
|
||||
(((mode & 0xff) == 1 &&
|
||||
((ZI_WORK->unk_0x1768 == 0 &&
|
||||
(prefixCount = Zi8MatchROMdata1(elements + (unsigned int)ZI_WORK->unk_0x17EA,
|
||||
count - ZI_WORK->unk_0x17EA & 0xff,language & 0xff,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA],
|
||||
capacity & 0xffff,0,status & 0xff,
|
||||
ZI_WORK->unk_0x1768,(char *)group,acceptPrefix,ZI_WORK),
|
||||
prefixCount != '\0')))))) goto finish_segments;
|
||||
index = Zi8GetTableCount(language & 0xff,0x1f,ZI_WORK);
|
||||
if ((index & 4) == 0) {
|
||||
for (index = 0; (index & 0xff) < (count & 0xff); index = index + 1) {
|
||||
if (elements[index & 0xff] == 0xeff1) goto finish_segments;
|
||||
}
|
||||
result = (ziU8)(result + ZI_WORK->unk_0x17EA);
|
||||
} else {
|
||||
if (status != 0 || count == 1) goto finish_segments;
|
||||
if (mode == 1 && ZI_WORK->unk_0x1768 == 0 &&
|
||||
(ziU8)Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA,
|
||||
count - ZI_WORK->unk_0x17EA, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
0, status, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK) != 0) goto finish_segments;
|
||||
if ((Zi8GetTableCount(language, 0x1f, ZI_WORK) & 4) == 0) {
|
||||
for (index = 0; index < count; index++) {
|
||||
if (elements[index] == 0xeff1) goto finish_segments;
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x141F > capacity) goto finish_segments;
|
||||
for (index = ZI_WORK->unk_0x141F; index != 0; index--) {
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA, index, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
1, 0, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) {
|
||||
ZI_WORK->unk_0x17EA += (ziU8)result;
|
||||
if (ZI_WORK->unk_0x17EA == count) return 0;
|
||||
ZI_WORK->unk_0x1768++;
|
||||
status = 0;
|
||||
ZI_WORK->unk_0x141E = 0;
|
||||
if (ZI_WORK->dawgCtx.key == 0 && language == 10) {
|
||||
for (index = 0; index < ZI_WORK->unk_0x17EA; index++) {
|
||||
switch (ZI_WORK->unk_0x17F4[index]) {
|
||||
case 0x61:
|
||||
case 0x6f:
|
||||
case 0x75:
|
||||
ZI_WORK->unk_0x141E = 0x10;
|
||||
goto search_segment;
|
||||
}
|
||||
}
|
||||
}
|
||||
goto search_segment;
|
||||
}
|
||||
}
|
||||
if ((capacity & 0xffff) < (unsigned int)ZI_WORK->unk_0x141F) goto finish_segments;
|
||||
prefixCount = ZI_WORK->unk_0x141F;
|
||||
for (; prefixCount != 0; prefixCount--) {
|
||||
result = Zi8MatchROMdata1(elements + (unsigned int)ZI_WORK->unk_0x17EA,prefixCount,
|
||||
language & 0xff,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA],
|
||||
capacity & 0xffff,1,0,ZI_WORK->unk_0x1768,(char *)group,
|
||||
acceptPrefix,ZI_WORK);
|
||||
if ((result & 0xff) != 0) break;
|
||||
}
|
||||
if (prefixCount == 0) goto finish_segments;
|
||||
ZI_WORK->unk_0x17EA = ZI_WORK->unk_0x17EA + ((ziU16)result & 0xff);
|
||||
if ((unsigned int)ZI_WORK->unk_0x17EA == (count & 0xff)) {
|
||||
result = 0;
|
||||
goto finish_segments;
|
||||
}
|
||||
ZI_WORK->unk_0x1768 = ZI_WORK->unk_0x1768 + 1;
|
||||
status = 0;
|
||||
ZI_WORK->unk_0x141E = 0;
|
||||
if ((ZI_WORK->dawgCtx.key == 0) && ((language & 0xff) == 10)) {
|
||||
for (result = 0; (result & 0xff) < (unsigned int)ZI_WORK->unk_0x17EA; result = result + 1) {
|
||||
character = ZI_WORK->unk_0x17F4[result & 0xff];
|
||||
if (character == 0x61 || character == 0x6f || character == 0x75) {
|
||||
ZI_WORK->unk_0x141E = 0x10;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
goto search_segment;
|
||||
}
|
||||
for (remaining = ZI_WORK->unk_0x17EA + result & 0xff; (remaining & 0xff) != 0;
|
||||
remaining = remaining - 1) {
|
||||
output[(remaining & 0xff) - 1] = ZI_WORK->unk_0x17F4[(remaining & 0xff) - 1];
|
||||
}
|
||||
result = result + ZI_WORK->unk_0x17EA & 0xff;
|
||||
finish_segments:
|
||||
return result;
|
||||
return result;
|
||||
}
|
||||
|
||||
ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
ziWChar* output, ziU16 capacity, ziU8 mode, ziU8 status,
|
||||
ziU8 reservedMode, ziU8 acceptPrefix, ziPtr __zi8_work_data) {
|
||||
ziU32 result = 0;
|
||||
ziS32 tableSize = 0;
|
||||
ziU8 Zi8MatchROMdata(ziWChar *elements, ziU8 count, ziU8 language, ziWChar *output, ziU16 capacity, ziU8 mode, ziU8 status, ziU8 reservedMode, ziU8 acceptPrefix, ziPtr __zi8_work_data)
|
||||
{
|
||||
ziU8* group;
|
||||
int tableSize;
|
||||
ziU8 found;
|
||||
unsigned int elementCount;
|
||||
unsigned int result;
|
||||
|
||||
if (capacity < count) {
|
||||
Zi8LogError(0x321, ZI_WORK);
|
||||
} else if (status == 2) {
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
} else {
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x17EC = 0;
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
} else if (ZI_WORK->unk_0x17EC != 0) {
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
goto finish_match;
|
||||
}
|
||||
tableSize = Zi8GetTableSize(language, 0x1c, ZI_WORK);
|
||||
if (tableSize == 0) {
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK);
|
||||
} else {
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) break;
|
||||
status = 0;
|
||||
if (count <= 1 && language == 0x36) break;
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
}
|
||||
}
|
||||
if ((ziU8)result == 0 && status == 0 && mode == 1 && count == 1 && capacity >= 1) {
|
||||
mode = 0;
|
||||
ZI_WORK->unk_0x17EC = 1;
|
||||
if (tableSize != 0) {
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
acceptPrefix, ZI_WORK) != 0) {
|
||||
*output = *elements;
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
}
|
||||
} else {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK) != 0) {
|
||||
*output = *elements;
|
||||
result = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
elementCount = (unsigned int)count;
|
||||
result = 0;
|
||||
if ((capacity & 0xffff) < (elementCount & 0xff)) {
|
||||
Zi8LogError(0x321,ZI_WORK);
|
||||
}
|
||||
else if ((status & 0xff) == 2) {
|
||||
Zi8LogError(100,ZI_WORK);
|
||||
}
|
||||
else {
|
||||
if ((status & 0xff) == 0) {
|
||||
ZI_WORK->unk_0x17EC = 0;
|
||||
group = NextDawgGroup(0,language & 0xff,ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = group;
|
||||
}
|
||||
else if (ZI_WORK->unk_0x17EC != '\0') {
|
||||
Zi8LogError(100,ZI_WORK);
|
||||
goto finish_match;
|
||||
}
|
||||
tableSize = Zi8GetTableSize(language & 0xff,0x1c,ZI_WORK);
|
||||
if (tableSize == 0) {
|
||||
result = Zi8MatchROMdata2(elements,elementCount & 0xff,language & 0xff,output,capacity & 0xffff,
|
||||
mode & 0xff,status & 0xff,reservedMode & 0xff,0,acceptPrefix,ZI_WORK);
|
||||
}
|
||||
else {
|
||||
while (((ZI_WORK->unk_0x17F0 != 0 &&
|
||||
(result = Zi8MatchROMdata2(elements,elementCount & 0xff,language & 0xff,output,capacity & 0xffff,
|
||||
mode & 0xff,status & 0xff,reservedMode & 0xff,
|
||||
(ziU8 *)ZI_WORK->unk_0x17F0,acceptPrefix,ZI_WORK),
|
||||
(result & 0xff) == 0)) &&
|
||||
((status = 0, 1 < (elementCount & 0xff) || ((language & 0xff) != 0x36))))) {
|
||||
group = NextDawgGroup(ZI_WORK->unk_0x17F0,language & 0xff,ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = group;
|
||||
}
|
||||
}
|
||||
if (((((result & 0xff) == 0) && ((status & 0xff) == 0)) && ((mode & 0xff) == 1)) &&
|
||||
(((elementCount & 0xff) == 1 && ((capacity & 0xffff) != 0)))) {
|
||||
ZI_WORK->unk_0x17EC = 1;
|
||||
if (tableSize == 0) {
|
||||
found = Zi8MatchROMdata2(elements,elementCount & 0xff,language & 0xff,output,capacity & 0xffff,0,
|
||||
status & 0xff,reservedMode & 0xff,0,acceptPrefix,ZI_WORK);
|
||||
if (found != '\0') {
|
||||
*output = *elements;
|
||||
result = 1;
|
||||
}
|
||||
}
|
||||
else {
|
||||
group = NextDawgGroup(0,language & 0xff,ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = group;
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
found = Zi8MatchROMdata2(elements,elementCount & 0xff,language & 0xff,output,capacity & 0xffff,0,
|
||||
status & 0xff,reservedMode & 0xff,(ziU8 *)ZI_WORK->unk_0x17F0,
|
||||
acceptPrefix,ZI_WORK);
|
||||
if (found != '\0') {
|
||||
*output = *elements;
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
group = NextDawgGroup(ZI_WORK->unk_0x17F0,language & 0xff,ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = group;
|
||||
}
|
||||
}
|
||||
}
|
||||
Zi8LogError(100,ZI_WORK);
|
||||
}
|
||||
finish_match:
|
||||
return result;
|
||||
return (ziU8)result;
|
||||
}
|
||||
|
||||
void Zi8SyllablesROMdata(ziWChar *elements, ziU8 count, ziU8 language, ziWChar *output, ziU16 capacity, ziU8 status, ziU8* prefixLength, ziU8 reverseOrder, ziPtr __zi8_work_data)
|
||||
|
||||
@@ -114,167 +114,173 @@ static ziU16 Zi8GetEngineSignature(ziU8* destination, ziPtr work) {
|
||||
|
||||
static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WORK) {
|
||||
ziU16 secondLength;
|
||||
struct { ziU16 length; ziU8* second; ziU8* first; } signatures;
|
||||
ziU8 dictionary[32];
|
||||
ziU16 firstLength;
|
||||
ziU8* second;
|
||||
ziU8* first;
|
||||
ziU8 engine[32];
|
||||
ziU8 dictionary[32];
|
||||
ziU16 length;
|
||||
ziU8* current;
|
||||
ziU16 candidateCount;
|
||||
ziWChar* output = parameters->candidates;
|
||||
|
||||
signatures.first = 0;
|
||||
signatures.second = 0;
|
||||
signatures.length = 0;
|
||||
second = 0;
|
||||
firstLength = 0;
|
||||
secondLength = 0;
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
parameters->letters = 0;
|
||||
length = Zi8GetDataSignature(dictionary, 0x20, parameters->language, ZI_WORK);
|
||||
if (length != 0 && parameters->elementCount <= length) {
|
||||
signatures.first = dictionary;
|
||||
signatures.second = engine;
|
||||
signatures.length = length;
|
||||
if (length == 0 || length < parameters->elementCount) {
|
||||
first = engine;
|
||||
} else {
|
||||
signatures.first = engine;
|
||||
first = dictionary;
|
||||
second = engine;
|
||||
firstLength = length;
|
||||
}
|
||||
length = Zi8GetEngineSignature(engine, ZI_WORK);
|
||||
if (length < parameters->elementCount) {
|
||||
if (signatures.length != 0) {
|
||||
signatures.second = 0;
|
||||
length = 1;
|
||||
} else {
|
||||
if (firstLength == 0) {
|
||||
Zi8ReplaceLastError(500, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
} else if (signatures.length != 0) {
|
||||
secondLength = length;
|
||||
length = 2;
|
||||
second = 0;
|
||||
candidateCount = 1;
|
||||
} else if (firstLength == 0) {
|
||||
candidateCount = 1;
|
||||
firstLength = length;
|
||||
} else {
|
||||
signatures.length = length;
|
||||
length = 1;
|
||||
candidateCount = 2;
|
||||
secondLength = length;
|
||||
}
|
||||
if (parameters->firstCandidate >= length) {
|
||||
Zi8ReplaceLastError(501, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
length = length - parameters->firstCandidate;
|
||||
if (countOnly != 0) {
|
||||
parameters->letters = length;
|
||||
if (parameters->firstCandidate < candidateCount) {
|
||||
candidateCount -= parameters->firstCandidate;
|
||||
if (!countOnly) {
|
||||
if (parameters->maxCandidates < candidateCount) {
|
||||
candidateCount = parameters->maxCandidates;
|
||||
}
|
||||
parameters->letters = candidateCount;
|
||||
if (!(parameters->getOptions & 0x80)) {
|
||||
ZI_WORK->unk_0x538 = parameters->language;
|
||||
parameters->candidates[0] = 0xfff0;
|
||||
output = (ziWChar*)&ZI_WORK->unk_0x338;
|
||||
}
|
||||
if (parameters->firstCandidate != 0) {
|
||||
first = second;
|
||||
firstLength = secondLength;
|
||||
}
|
||||
if (ZI_WORK->unk_0x0A < firstLength) {
|
||||
firstLength = ZI_WORK->unk_0x0A;
|
||||
}
|
||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||
(parameters->getOptions & 0x7e) == 2) &&
|
||||
parameters->elementCount < firstLength) {
|
||||
firstLength = parameters->elementCount;
|
||||
}
|
||||
while (firstLength-- != 0) {
|
||||
*output++ = *first++;
|
||||
}
|
||||
*output++ = 0;
|
||||
if (parameters->letters == 2) {
|
||||
if (ZI_WORK->unk_0x0A < secondLength) {
|
||||
secondLength = ZI_WORK->unk_0x0A;
|
||||
}
|
||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||
(parameters->getOptions & 0x7e) == 2) &&
|
||||
parameters->elementCount < secondLength) {
|
||||
secondLength = parameters->elementCount;
|
||||
}
|
||||
while (secondLength-- != 0) {
|
||||
*output++ = *second++;
|
||||
}
|
||||
*output++ = 0;
|
||||
}
|
||||
*output = 0;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
return 1;
|
||||
}
|
||||
parameters->letters = candidateCount;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
return 1;
|
||||
}
|
||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||
parameters->letters = length;
|
||||
if ((parameters->getOptions & 0x80) == 0) {
|
||||
ZI_WORK->unk_0x538 = parameters->language;
|
||||
parameters->candidates[0] = 0xfff0;
|
||||
output = (ziWChar*)&ZI_WORK->unk_0x338;
|
||||
}
|
||||
if (parameters->firstCandidate != 0) {
|
||||
current = signatures.second;
|
||||
length = secondLength;
|
||||
} else {
|
||||
current = signatures.first;
|
||||
length = signatures.length;
|
||||
}
|
||||
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
|
||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
||||
length = parameters->elementCount;
|
||||
}
|
||||
while (length-- != 0) *output++ = (ziU8)*current++;
|
||||
*output++ = 0;
|
||||
if (parameters->letters == 2) {
|
||||
current = signatures.second;
|
||||
length = secondLength;
|
||||
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
|
||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
||||
length = parameters->elementCount;
|
||||
}
|
||||
while (length-- != 0) *output++ = (ziU8)*current++;
|
||||
*output++ = 0;
|
||||
}
|
||||
*output++ = 0;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
return 1;
|
||||
Zi8ReplaceLastError(501, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ziBool Zi8ZhSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WORK) {
|
||||
ziWChar* output = parameters->candidates;
|
||||
ziU8* current = 0;
|
||||
ziU16 copied;
|
||||
ziU8 dictionary[32];
|
||||
ziU8 engine[32];
|
||||
ziU8 dictionary[32];
|
||||
ziU16 dataLength;
|
||||
ziU16 engineLength;
|
||||
ziU16 length;
|
||||
|
||||
ziU32 engineLength;
|
||||
ziU32 candidateCount;
|
||||
ziU8 available;
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
parameters->letters = 0;
|
||||
dataLength = Zi8GetDataSignature(dictionary, 0x20, parameters->language, ZI_WORK);
|
||||
engineLength = Zi8GetEngineSignature(engine, ZI_WORK);
|
||||
if ((parameters->context & 0x10) != 0) {
|
||||
length = 0;
|
||||
if (dataLength != 0) length++;
|
||||
if (engineLength != 0) length++;
|
||||
if (!(parameters->context & 0x10)) {
|
||||
candidateCount = dataLength + engineLength;
|
||||
} else {
|
||||
length = dataLength + engineLength;
|
||||
candidateCount = dataLength != 0;
|
||||
if (engineLength != 0) candidateCount++;
|
||||
}
|
||||
if (parameters->firstCandidate >= length) {
|
||||
Zi8ReplaceLastError(502, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
length = length - parameters->firstCandidate;
|
||||
if (countOnly != 0) {
|
||||
parameters->letters = length;
|
||||
if (parameters->firstCandidate < candidateCount) {
|
||||
available = candidateCount - parameters->firstCandidate;
|
||||
if (!countOnly) {
|
||||
if (parameters->maxCandidates < (ziU16)(candidateCount - parameters->firstCandidate)) {
|
||||
available = parameters->maxCandidates;
|
||||
}
|
||||
parameters->letters = available;
|
||||
if (!(parameters->context & 0x10)) {
|
||||
copied = 0;
|
||||
if (dataLength != 0) {
|
||||
if (parameters->firstCandidate < dataLength) {
|
||||
candidateCount = dataLength - parameters->firstCandidate;
|
||||
current = dictionary + parameters->firstCandidate;
|
||||
} else {
|
||||
candidateCount = 0;
|
||||
}
|
||||
if (parameters->letters < candidateCount) candidateCount = parameters->letters;
|
||||
copied = candidateCount;
|
||||
while (candidateCount-- != 0) *output++ = *current++;
|
||||
}
|
||||
current = engine;
|
||||
if (dataLength <= parameters->firstCandidate) {
|
||||
dataLength += engineLength - parameters->firstCandidate;
|
||||
current += engineLength - dataLength;
|
||||
engineLength = dataLength;
|
||||
}
|
||||
if ((int)(parameters->letters - copied) < (int)engineLength) {
|
||||
engineLength = parameters->letters - copied;
|
||||
}
|
||||
while (engineLength-- != 0) *output++ = *current++;
|
||||
} else {
|
||||
if (parameters->firstCandidate == 0 && dataLength != 0) {
|
||||
current = dictionary;
|
||||
} else {
|
||||
if (parameters->firstCandidate != 0 && dataLength == 0) {
|
||||
Zi8ReplaceLastError(500, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
current = engine;
|
||||
dataLength = engineLength;
|
||||
}
|
||||
while (dataLength-- != 0) *output++ = *current++;
|
||||
*output = 0x20;
|
||||
if (parameters->letters == 2) {
|
||||
current = engine;
|
||||
while (++output, engineLength-- != 0) *output = *current++;
|
||||
*output = 0x20;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
parameters->letters = available;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
return 1;
|
||||
}
|
||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||
parameters->letters = length;
|
||||
if ((parameters->context & 0x10) != 0) {
|
||||
if (parameters->firstCandidate != 0 || dataLength == 0) {
|
||||
if (parameters->firstCandidate != 0 && dataLength == 0) {
|
||||
Zi8ReplaceLastError(500, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
current = engine;
|
||||
length = engineLength;
|
||||
} else {
|
||||
current = dictionary;
|
||||
length = dataLength;
|
||||
}
|
||||
while (length-- != 0) *output++ = (ziU8)*current++;
|
||||
*output++ = 0x20;
|
||||
if (parameters->letters == 2) {
|
||||
current = engine;
|
||||
length = engineLength;
|
||||
while (length-- != 0) *output++ = (ziU8)*current++;
|
||||
*output++ = 0x20;
|
||||
}
|
||||
} else {
|
||||
copied = 0;
|
||||
if (dataLength != 0) {
|
||||
if (parameters->firstCandidate >= dataLength) {
|
||||
length = 0;
|
||||
} else {
|
||||
length = dataLength - parameters->firstCandidate;
|
||||
current = dictionary + parameters->firstCandidate;
|
||||
}
|
||||
if (parameters->letters < length) length = parameters->letters;
|
||||
copied = length;
|
||||
while (length-- != 0) *output++ = (ziU8)*current++;
|
||||
}
|
||||
current = engine;
|
||||
if (parameters->firstCandidate >= dataLength) {
|
||||
length = dataLength + (engineLength - parameters->firstCandidate);
|
||||
current += engineLength - length;
|
||||
} else {
|
||||
length = engineLength;
|
||||
}
|
||||
if (parameters->letters - copied < length) length = parameters->letters - copied;
|
||||
while (length-- != 0) *output++ = (ziU8)*current++;
|
||||
}
|
||||
return 1;
|
||||
Zi8ReplaceLastError(502, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU8 _Zi8GetCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
||||
@@ -292,37 +298,33 @@ ziU8 _Zi8CheckCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
||||
ziU8 Zi8LangSupported(ziU8 language, ziPtr work);
|
||||
ziBool Zi8IsCharacter(ziWChar character, ziPtr work);
|
||||
ziU8 Zi8GetCharInfo(ziWChar character, ziWChar* output, ziU8 capacity, ziU8 type, ziPtr work);
|
||||
ziU32 Zi8GetKOcandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU32 Zi8GetKoreanCandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU32 Zi8Punctuation(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU32 Zi8GetChineseCandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU32 Zi8Get1KeyPressCandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU32 Zi8Get1KeyPressSpelling(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU32 Zi8GetSyllablesCandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU32 Zi8AlphaGetCandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU8 Zi8GetKOcandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU8 Zi8GetKoreanCandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU8 Zi8Punctuation(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU8 Zi8GetChineseCandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU8 Zi8Get1KeyPressCandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU8 Zi8Get1KeyPressSpelling(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU8 Zi8GetSyllablesCandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
ziU8 Zi8AlphaGetCandidates(ziGetParam* parameters, ziPtr options, ziPtr work);
|
||||
|
||||
ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* options ZI_NEED_WORK) {
|
||||
|
||||
ziU16 characterInfo[16];
|
||||
struct {
|
||||
ziU8 savedGetMode;
|
||||
ziU8 savedElementCount;
|
||||
ziU8 convertedElementCount;
|
||||
ziBool restoreCandidates;
|
||||
ziU8 savedOptions;
|
||||
ziU16 savedCharacter;
|
||||
ziU16 lastInfoCharacter;
|
||||
ziWChar* savedElements;
|
||||
ziWChar* savedCandidates;
|
||||
} saved;
|
||||
ziU8 outputIndex;
|
||||
ziU16 error;
|
||||
ziU8 savedElementCount;
|
||||
ziU16 savedCharacter;
|
||||
ziWChar* savedElements;
|
||||
ziBool restoreCandidates;
|
||||
ziU8 elementCount;
|
||||
int error;
|
||||
unsigned int candidateCount;
|
||||
ziU8 savedOptions;
|
||||
ziWChar* savedCandidates;
|
||||
ziU16 characterInfo[16];
|
||||
ziU16 lastInfoCharacter;
|
||||
|
||||
error = 0;
|
||||
saved.savedOptions = 0;
|
||||
saved.savedCandidates = 0;
|
||||
saved.restoreCandidates = 0;
|
||||
savedOptions = 0;
|
||||
savedCandidates = 0;
|
||||
restoreCandidates = 0;
|
||||
if (options->lookupMode == '\0') {
|
||||
if (((ZI_WORK->unk_0x00 == '\t') && (parameters->elementCount != 0)) &&
|
||||
(((parameters->elements[parameters->elementCount - 1] == 0xEFF8 &&
|
||||
@@ -334,11 +336,13 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
parameters->letters = 0;
|
||||
}
|
||||
Zi8LogError(100,ZI_WORK);
|
||||
return candidateCount;
|
||||
goto finishCandidates;
|
||||
}
|
||||
if ((parameters->elementCount == 1) && (parameters->firstCandidate == 0)) {
|
||||
switch (parameters->language) {
|
||||
case 1:
|
||||
elementCount = parameters->language;
|
||||
if (elementCount == 0x11) goto latinSequence;
|
||||
if (elementCount < 0x11) {
|
||||
if (elementCount == 1) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
@@ -347,22 +351,22 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
case '\x02':
|
||||
case '\x04':
|
||||
case '\x06':
|
||||
if (parameters->elements[0] == 0xEF04) {
|
||||
++ZI_WORK->unk_0x00;
|
||||
}
|
||||
else {
|
||||
ZI_WORK->unk_0x00 = '\0';
|
||||
}
|
||||
break;
|
||||
case '\x01':
|
||||
case '\x03':
|
||||
case '\x05':
|
||||
case '\a':
|
||||
if (parameters->elements[0] == 0xEF01) {
|
||||
++ZI_WORK->unk_0x00;
|
||||
ZI_WORK->unk_0x00 = ZI_WORK->unk_0x00 + '\x01';
|
||||
}
|
||||
else {
|
||||
ZI_WORK->unk_0x00 = '\0';
|
||||
}
|
||||
break;
|
||||
case '\x02':
|
||||
case '\x04':
|
||||
case '\x06':
|
||||
if (parameters->elements[0] == 0xEF04) {
|
||||
ZI_WORK->unk_0x00 = ZI_WORK->unk_0x00 + '\x01';
|
||||
}
|
||||
else {
|
||||
ZI_WORK->unk_0x00 = '\0';
|
||||
@@ -378,7 +382,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
parameters->letters = 0;
|
||||
}
|
||||
Zi8LogError(100,ZI_WORK);
|
||||
return candidateCount;
|
||||
goto finishCandidates;
|
||||
}
|
||||
default:
|
||||
ZI_WORK->unk_0x00 = '\0';
|
||||
@@ -387,19 +391,12 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 0x10:
|
||||
case 0x12:
|
||||
case 0x77:
|
||||
case 0x78:
|
||||
case 0x79:
|
||||
case 0x7A:
|
||||
case 0x7B:
|
||||
case 0x7C:
|
||||
case 0x7D:
|
||||
break;
|
||||
case 0x11:
|
||||
default:
|
||||
}
|
||||
else if ((elementCount == 0) || (elementCount < 0x10)) goto latinSequence;
|
||||
}
|
||||
else if (elementCount < 0x77) {
|
||||
if (0x12 < elementCount) {
|
||||
latinSequence:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
@@ -474,7 +471,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
parameters->letters = 0;
|
||||
}
|
||||
Zi8LogError(100,ZI_WORK);
|
||||
return candidateCount;
|
||||
goto finishCandidates;
|
||||
}
|
||||
default:
|
||||
ZI_WORK->unk_0x00 = '\0';
|
||||
@@ -483,21 +480,23 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if (0x7d < elementCount) goto latinSequence;
|
||||
}
|
||||
else if (1 < parameters->elementCount) {
|
||||
ZI_WORK->unk_0x00 = '\0';
|
||||
}
|
||||
}
|
||||
ZI_WORK->unk_0x18 = parameters->subLanguage;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||
elementCount = Zi8GetFormatVersion(1,ZI_WORK);
|
||||
ZI_WORK->unk_0x16 = elementCount & 2;
|
||||
options->maxCount = ZI_WORK->unk_0x10;
|
||||
options->maxWordLength = ZI_WORK->unk_0x0A;
|
||||
ZI_WORK->unk_0x0A = -1;
|
||||
if ((ziU8)Zi8LangSupported(parameters->language,ZI_WORK) == 0) {
|
||||
Zi8LogError(0x163,ZI_WORK);
|
||||
return 0;
|
||||
candidateCount = 0;
|
||||
}
|
||||
else {
|
||||
if (parameters->language == 0x10) {
|
||||
@@ -505,7 +504,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
candidateCount = 0;
|
||||
}
|
||||
else if (parameters->language == 0x12) {
|
||||
if ((parameters->elementCount == 0) || (parameters->elements[0] >= 0xeff1)) {
|
||||
if ((parameters->elementCount == 0) || (0xeff0 < parameters->elements[0])) {
|
||||
candidateCount = Zi8GetKOcandidates(parameters,options,ZI_WORK);
|
||||
}
|
||||
else {
|
||||
@@ -519,27 +518,29 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
else if ((parameters->language == 1) &&
|
||||
((((parameters->getOptions & 0xbf) == 4 && (parameters->elementCount != 0)) &&
|
||||
((ziU8)Zi8IsCharacter(parameters->elements[0],ZI_WORK) != 0)))) {
|
||||
saved.convertedElementCount = Zi8GetCharInfo(parameters->elements[0],characterInfo,0x10,1,ZI_WORK);
|
||||
if (saved.convertedElementCount == 0) {
|
||||
parameters->letters = parameters->count = parameters->unk_0x20 = 0;
|
||||
elementCount = Zi8GetCharInfo(parameters->elements[0],characterInfo,0x10,1,ZI_WORK);
|
||||
if (elementCount == 0) {
|
||||
parameters->unk_0x20 = 0;
|
||||
parameters->count = 0;
|
||||
parameters->letters = 0;
|
||||
candidateCount = 0;
|
||||
error = 900;
|
||||
}
|
||||
else {
|
||||
saved.lastInfoCharacter = characterInfo[saved.convertedElementCount - 1];
|
||||
if ((saved.lastInfoCharacter >= 0xf331) && (saved.lastInfoCharacter <= 0xf335)) {
|
||||
characterInfo[saved.convertedElementCount - 1] = 0xf360;
|
||||
lastInfoCharacter = characterInfo[elementCount - 1];
|
||||
if ((0xf330 < lastInfoCharacter) && (lastInfoCharacter < 0xf336)) {
|
||||
characterInfo[elementCount - 1] = 0xf360;
|
||||
}
|
||||
saved.savedElements = parameters->elements;
|
||||
savedElements = parameters->elements;
|
||||
parameters->elements = characterInfo;
|
||||
saved.savedElementCount = parameters->elementCount;
|
||||
parameters->elementCount = saved.convertedElementCount;
|
||||
saved.savedGetMode = parameters->getMode;
|
||||
savedElementCount = parameters->elementCount;
|
||||
parameters->elementCount = elementCount;
|
||||
elementCount = parameters->getMode;
|
||||
parameters->getMode = 1;
|
||||
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
|
||||
parameters->elements = saved.savedElements;
|
||||
parameters->elementCount = saved.savedElementCount;
|
||||
parameters->getMode = saved.savedGetMode;
|
||||
parameters->elements = savedElements;
|
||||
parameters->elementCount = savedElementCount;
|
||||
parameters->getMode = elementCount;
|
||||
parameters->count = 1;
|
||||
}
|
||||
}
|
||||
@@ -548,22 +549,27 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
candidateCount = 0;
|
||||
}
|
||||
else if ((parameters->language == 1) && ((parameters->getMode == 3 || (parameters->getMode == 4)))) {
|
||||
if ((parameters->getOptions & 0x80) != 0) {
|
||||
if ((parameters->getOptions & 0x80) == 0) {
|
||||
if (parameters->elementCount == 0) {
|
||||
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
|
||||
}
|
||||
else {
|
||||
candidateCount = Zi8Get1KeyPressCandidates(parameters,options,ZI_WORK);
|
||||
}
|
||||
}
|
||||
else {
|
||||
candidateCount = Zi8Get1KeyPressSpelling(parameters,options,ZI_WORK);
|
||||
} else if (parameters->elementCount == 0) {
|
||||
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
|
||||
} else {
|
||||
candidateCount = Zi8Get1KeyPressCandidates(parameters,options,ZI_WORK);
|
||||
}
|
||||
}
|
||||
else if ((parameters->language == 1) &&
|
||||
((((parameters->getMode == 7 || (parameters->getMode == 8)) || (parameters->getMode == 10)) || (parameters->getMode == 9)))) {
|
||||
if (ZI_WORK->unk_0x16 != '\0') {
|
||||
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
|
||||
} else {
|
||||
if (ZI_WORK->unk_0x16 == '\0') {
|
||||
error = 0x708;
|
||||
candidateCount = 0;
|
||||
}
|
||||
else {
|
||||
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
|
||||
}
|
||||
}
|
||||
else if ((parameters->language == 1) && ((parameters->getMode == 0xb || (parameters->getMode == 0xe)))) {
|
||||
error = 0x2ee;
|
||||
@@ -575,45 +581,52 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
&& (((parameters->elements[parameters->elementCount - 1] == 0xF37A ||
|
||||
(parameters->elements[parameters->elementCount - 1] == 0xF363)) ||
|
||||
(parameters->elements[parameters->elementCount - 1] == 0xF373)))) {
|
||||
saved.savedCharacter = parameters->elements[parameters->elementCount];
|
||||
parameters->elements[parameters->elementCount++] = 0xf368;
|
||||
savedCharacter = parameters->elements[parameters->elementCount];
|
||||
elementCount = parameters->elementCount;
|
||||
parameters->elements[elementCount] = 0xf368;
|
||||
parameters->elementCount = elementCount + 1;
|
||||
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
|
||||
parameters->elements[--parameters->elementCount] = saved.savedCharacter;
|
||||
elementCount = parameters->elementCount;
|
||||
parameters->elementCount = elementCount - 1;
|
||||
parameters->elements[(ziU8)(elementCount - 1)] = savedCharacter;
|
||||
}
|
||||
}
|
||||
else {
|
||||
ZI_WORK->unk_0x538 = parameters->language;
|
||||
if ((parameters->getOptions & 0x80) == 0) {
|
||||
saved.restoreCandidates = 1;
|
||||
saved.savedOptions = parameters->getOptions;
|
||||
saved.savedCandidates = parameters->candidates;
|
||||
parameters->getOptions |= 0x81;
|
||||
restoreCandidates = (parameters->getOptions & 0x80) == 0;
|
||||
if (restoreCandidates) {
|
||||
savedOptions = parameters->getOptions;
|
||||
savedCandidates = parameters->candidates;
|
||||
parameters->getOptions = parameters->getOptions | 0x81;
|
||||
parameters->candidates = (ziWChar*)&ZI_WORK->unk_0x338;
|
||||
options->capacity = 0x100;
|
||||
}
|
||||
if (parameters->getMode == 2) {
|
||||
if ((Zi8GetTableCount(parameters->language,0x1f,ZI_WORK) & 0x200) != 0) {
|
||||
candidateCount = Zi8GetSyllablesCandidates(parameters,options,ZI_WORK);
|
||||
} else {
|
||||
candidateCount = Zi8GetTableCount(parameters->language,0x1f,ZI_WORK);
|
||||
if ((candidateCount & 0x200) == 0) {
|
||||
error = 0x44c;
|
||||
candidateCount = 0;
|
||||
}
|
||||
else {
|
||||
candidateCount = Zi8GetSyllablesCandidates(parameters,options,ZI_WORK);
|
||||
}
|
||||
}
|
||||
else {
|
||||
candidateCount = Zi8AlphaGetCandidates(parameters,options,ZI_WORK);
|
||||
}
|
||||
}
|
||||
if (saved.restoreCandidates) {
|
||||
parameters->getOptions = saved.savedOptions;
|
||||
parameters->candidates = saved.savedCandidates;
|
||||
for (outputIndex = 0; outputIndex < parameters->letters; outputIndex++) {
|
||||
parameters->candidates[outputIndex] = 0xFFF0 + outputIndex;
|
||||
if (restoreCandidates) {
|
||||
parameters->getOptions = savedOptions;
|
||||
parameters->candidates = savedCandidates;
|
||||
for (elementCount = 0; elementCount < parameters->letters; elementCount = elementCount + 1) {
|
||||
parameters->candidates[elementCount] = elementCount - 0x10;
|
||||
}
|
||||
}
|
||||
if (error != 0) {
|
||||
Zi8LogError(error,ZI_WORK);
|
||||
}
|
||||
}
|
||||
finishCandidates:
|
||||
return candidateCount;
|
||||
}
|
||||
|
||||
@@ -652,8 +665,9 @@ ziBool Zi8IsDupWChar(ziWChar character ZI_NEED_WORK) {
|
||||
}
|
||||
|
||||
ziBool Zi8IsDupWordW(ziWChar* word, ziU8 length ZI_NEED_WORK) {
|
||||
unsigned int slot;
|
||||
ziU8 slot;
|
||||
ziBool duplicate = 0;
|
||||
unsigned int position;
|
||||
int index;
|
||||
int character;
|
||||
if (word == 0 || length == 0) {
|
||||
@@ -667,19 +681,21 @@ ziBool Zi8IsDupWordW(ziWChar* word, ziU8 length ZI_NEED_WORK) {
|
||||
for (index = 0; index < ZI_WORK->unk_0x539; index++) {
|
||||
slot = ZI_WORK->unk_0x53A[index];
|
||||
for (character = 0; character < length; character++) {
|
||||
if (word[character] != ((ziWChar (*)[21])ZI_WORK->unk_0x57A)[slot][character]) break;
|
||||
if (word[character] != ZI_WORK->unk_0x57A[slot * 21 + character]) break;
|
||||
}
|
||||
if (character >= length && ((ziWChar (*)[21])ZI_WORK->unk_0x57A)[slot][character] == 0) {
|
||||
if (character >= length && ZI_WORK->unk_0x57A[slot * 21 + character] == 0) {
|
||||
duplicate = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!duplicate) {
|
||||
if (ZI_WORK->unk_0x539 < 64) {
|
||||
slot = ZI_WORK->unk_0x53A[ZI_WORK->unk_0x539] = ZI_WORK->unk_0x539;
|
||||
position = ZI_WORK->unk_0x539;
|
||||
ZI_WORK->unk_0x53A[ZI_WORK->unk_0x539] = ZI_WORK->unk_0x539;
|
||||
ZI_WORK->unk_0x539++;
|
||||
} else {
|
||||
slot = ZI_WORK->unk_0x53A[0];
|
||||
position = slot;
|
||||
for (index = 1; index < ZI_WORK->unk_0x539; index++) {
|
||||
ZI_WORK->unk_0x53A[index - 1] = ZI_WORK->unk_0x53A[index];
|
||||
}
|
||||
@@ -687,15 +703,16 @@ ziBool Zi8IsDupWordW(ziWChar* word, ziU8 length ZI_NEED_WORK) {
|
||||
}
|
||||
} else {
|
||||
slot = ZI_WORK->unk_0x53A[index];
|
||||
position = slot;
|
||||
for (; index < ZI_WORK->unk_0x539 - 1; index++) {
|
||||
ZI_WORK->unk_0x53A[index] = ZI_WORK->unk_0x53A[index + 1];
|
||||
}
|
||||
ZI_WORK->unk_0x53A[index] = slot;
|
||||
}
|
||||
for (character = 0; character < length; character++) {
|
||||
((ziWChar (*)[21])ZI_WORK->unk_0x57A)[slot][character] = word[character];
|
||||
for (index = 0; index < length; index++) {
|
||||
ZI_WORK->unk_0x57A[position * 21 + index] = word[index];
|
||||
}
|
||||
((ziWChar (*)[21])ZI_WORK->unk_0x57A)[slot][character] = 0;
|
||||
ZI_WORK->unk_0x57A[position * 21 + index] = 0;
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
return duplicate;
|
||||
}
|
||||
|
||||
@@ -289,151 +289,139 @@ ziBool Zi8SecMatchComp(ziPtr nodeAddress, ziMatchParam* matchAddress, ziPtr dict
|
||||
extern ziU16 Zi8MatchAltSound(ziPtr soundTable, ziU16 soundCode, ziPtr pCodeTable, ziU16 index, ziU16 mask, ziU16 value, ziU8 flag ZI_NEED_WORK);
|
||||
ziU16 Zi8GetPCode(ziU8* table, ziU8* node);
|
||||
|
||||
ziBool Zi8MatchPhonetic(ziPtr pCodeTable, ziU8* dictionary, ziPtr soundTable, ziU16 soundCode, ziU32 tableAddress, ziU8* node, ziU16* masks, ziU16* values, ziU16* count, ziU8** resultNode, ziU8** stringOffset, ziU8 partialMode, ziU8 strictMode, ziU8 numParts, ziU16 partMask, ziU16 partValue, ziU8 flag, ziU8 altMode, ziU16 initialCode, ziU16* resultCode, ziU8 lastMode ZI_NEED_WORK) {
|
||||
struct {
|
||||
ziBool hasString;
|
||||
ziU8 partIndex;
|
||||
ziU8 partCount;
|
||||
ziU8 nextCode;
|
||||
ziU8 matchedParts;
|
||||
ziU16 dictionaryIndex;
|
||||
ziU16 soundIndex;
|
||||
ziU16 remaining;
|
||||
ziU16 code;
|
||||
} traversal;
|
||||
ziBool Zi8MatchPhonetic(ziPtr pCodeTable, ziPtr dictionary, ziPtr soundTable, ziU16 soundCode, ziU32 tableAddress, ziU8* node, ziU16* masks, ziU16* values, ziU16* count, ziU8** resultNode, ziU8** stringOffset, ziS8 partialMode, ziU8 strictMode, ziU8 numParts, ziU16 partMask, ziU16 partValue, ziU8 flag, ziU8 altMode, ziU16 initialCode, ziU16* resultCode, ziU8 lastMode ZI_NEED_WORK) {
|
||||
ziBool hasString;
|
||||
ziU32 matchedParts;
|
||||
ziU32 altModeActive;
|
||||
ziU8 partCode;
|
||||
ziU8 partCount;
|
||||
ziU8 partIndex;
|
||||
ziU16 soundIndex;
|
||||
ziU16 remaining;
|
||||
ziU16 code;
|
||||
ziU16 dictionaryIndex;
|
||||
ziU8 nextCode;
|
||||
ziU8* sound;
|
||||
typedef struct {
|
||||
ziU8 header;
|
||||
ziU8 content[11];
|
||||
} DictionaryNode;
|
||||
ziU8* nextPart;
|
||||
|
||||
if (*stringOffset != 0) {
|
||||
traversal.hasString = 1;
|
||||
hasString = 1;
|
||||
} else {
|
||||
traversal.hasString = 0;
|
||||
hasString = 0;
|
||||
}
|
||||
if (*count != 0) {
|
||||
traversal.remaining = *count;
|
||||
if (*count == 0) {
|
||||
remaining = 1;
|
||||
} else {
|
||||
traversal.remaining = 1;
|
||||
remaining = *count;
|
||||
}
|
||||
traversal.matchedParts = 0;
|
||||
matchedParts = 0;
|
||||
altModeActive = altMode;
|
||||
if ((lastMode != 0) && (numParts > 1)) {
|
||||
altMode = 1;
|
||||
altModeActive = 1;
|
||||
}
|
||||
while (traversal.remaining-- != 0) {
|
||||
if ((node[0] & flag) != 0) goto decode_node;
|
||||
next_node:
|
||||
node += 0xC;
|
||||
continue;
|
||||
decode_node:
|
||||
traversal.code = Zi8GetPCode((ziU8*)pCodeTable, node);
|
||||
if ((*values != (traversal.code & *masks)) && (altMode == 0) && ((node[0] & 0x80) != 0)) {
|
||||
if (*count != 0) {
|
||||
traversal.soundIndex = (initialCode - traversal.remaining) - 1;
|
||||
} else {
|
||||
traversal.soundIndex = initialCode;
|
||||
while (remaining-- != 0) {
|
||||
if ((node[0] & flag) != 0) {
|
||||
code = Zi8GetPCode((ziU8*)pCodeTable, node);
|
||||
if ((*values != (code & *masks)) && (altModeActive == 0) && ((node[0] & 0x80) != 0)) {
|
||||
if (*count != 0) {
|
||||
soundIndex = (initialCode - remaining) - 1;
|
||||
} else {
|
||||
soundIndex = initialCode;
|
||||
}
|
||||
code = Zi8MatchAltSound(soundTable, soundCode, pCodeTable, soundIndex, *masks, *values, flag, ZI_WORK);
|
||||
}
|
||||
traversal.code = Zi8MatchAltSound(soundTable, soundCode, pCodeTable, traversal.soundIndex, *masks, *values, flag, ZI_WORK);
|
||||
}
|
||||
goto check_code;
|
||||
match_code:
|
||||
if (partValue == (traversal.code & partMask)) goto next_node;
|
||||
traversal.matchedParts = 1;
|
||||
if (*count != 0) {
|
||||
traversal.soundIndex = (initialCode - traversal.remaining) - 1;
|
||||
} else {
|
||||
traversal.soundIndex = initialCode;
|
||||
}
|
||||
sound = (ziU8*)(tableAddress + ((node[9] & 0xF) * 0x10000 + (node[0xB] + node[0xA] * 0x100)));
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
switch (sound[0] & 7) {
|
||||
case 2:
|
||||
sound += 2;
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
sound += 3;
|
||||
break;
|
||||
case 5:
|
||||
sound += 4;
|
||||
break;
|
||||
default:
|
||||
sound++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ((sound[0] & 0x80) != 0) {
|
||||
sound += ((sound[0] & 0x7F) >> 4) + 1;
|
||||
} else if (numParts > 1) {
|
||||
goto next_node;
|
||||
}
|
||||
if (((ziU8)traversal.matchedParts == numParts) || (numParts == 0)) {
|
||||
*resultNode = node;
|
||||
*resultCode = ((ziU16)node[6] << 8) + node[7];
|
||||
*count = traversal.remaining;
|
||||
return 1;
|
||||
}
|
||||
next_group:
|
||||
{
|
||||
traversal.nextCode = *sound++;
|
||||
traversal.partCount = traversal.nextCode & 0xF;
|
||||
if ((traversal.nextCode & flag) == 0) {
|
||||
for (; traversal.partCount != 0; traversal.partCount--) {
|
||||
for (sound++; (*sound & 0x80) == 0; sound += 2) {
|
||||
if ((*values == (code & *masks)) && (partValue != (code & partMask))) {
|
||||
matchedParts = 1;
|
||||
sound = (ziU8*)((tableAddress + ((node[9] & 0xF) * 0x10000)) + node[0xB] + node[0xA] * 0x100);
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
switch (sound[0] & 7) {
|
||||
case 2:
|
||||
sound += 2;
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
sound += 3;
|
||||
break;
|
||||
case 5:
|
||||
sound += 4;
|
||||
break;
|
||||
default:
|
||||
sound++;
|
||||
break;
|
||||
}
|
||||
sound++;
|
||||
}
|
||||
}
|
||||
for (; traversal.partCount != 0; traversal.partCount--) {
|
||||
traversal.partIndex = 1;
|
||||
if (traversal.hasString && (sound > *stringOffset)) {
|
||||
traversal.hasString = 0;
|
||||
if ((sound[0] & 0x80) != 0) {
|
||||
sound += ((sound[0] & 0x7F) >> 4) + 1;
|
||||
} else if (numParts > 1) {
|
||||
goto next_node;
|
||||
}
|
||||
if (!traversal.hasString) {
|
||||
*stringOffset = sound;
|
||||
if (((ziU8)matchedParts == numParts) || (numParts == 0)) {
|
||||
*resultNode = node;
|
||||
*resultCode = ((ziU16)node[6] << 8) + node[7];
|
||||
*count = remaining;
|
||||
return 1;
|
||||
}
|
||||
do {
|
||||
traversal.dictionaryIndex = sound[0] | ((ziU16)sound[1] << 8);
|
||||
sound += 2;
|
||||
if (traversal.hasString) {
|
||||
goto phonetic_skip;
|
||||
}
|
||||
traversal.code = Zi8GetPCode((ziU8*)pCodeTable, dictionary + (traversal.dictionaryIndex & 0x7FFF) * sizeof(DictionaryNode));
|
||||
if (((traversal.code & masks[traversal.partIndex]) != values[traversal.partIndex]) && (altMode == 0) && (dictionary[(traversal.dictionaryIndex & 0x7FFF) * sizeof(DictionaryNode)] & 0x80) != 0) {
|
||||
traversal.code = Zi8MatchAltSound(soundTable, soundCode, pCodeTable, traversal.dictionaryIndex & 0x7FFF, masks[traversal.partIndex], values[traversal.partIndex], flag, ZI_WORK);
|
||||
}
|
||||
if ((traversal.code & masks[traversal.partIndex]) == values[traversal.partIndex]) {
|
||||
goto phonetic_matched;
|
||||
nextCode = *sound++;
|
||||
partCount = nextCode & 0xF;
|
||||
if ((nextCode & flag) == 0) {
|
||||
for (; partCount != 0; partCount--) {
|
||||
for (sound++; (*sound & 0x80) == 0; sound += 2) {
|
||||
}
|
||||
sound++;
|
||||
}
|
||||
}
|
||||
for (; partCount != 0; partCount--) {
|
||||
partIndex = 1;
|
||||
if (hasString && (*stringOffset < sound)) {
|
||||
hasString = 0;
|
||||
}
|
||||
nextPart = sound;
|
||||
if (!hasString) {
|
||||
*stringOffset = sound;
|
||||
}
|
||||
do {
|
||||
partCode = nextPart[1];
|
||||
dictionaryIndex = ((ziU16)partCode << 8) | nextPart[0];
|
||||
sound = nextPart + 2;
|
||||
if (hasString) {
|
||||
goto phonetic_skip;
|
||||
}
|
||||
code = Zi8GetPCode((ziU8*)pCodeTable, (ziU8*)dictionary + (dictionaryIndex & 0x7FFF) * 0xC);
|
||||
if (((code & masks[partIndex]) != values[partIndex]) && (altModeActive == 0) && (((ziU8*)dictionary)[(dictionaryIndex & 0x7FFF) * 0xC] & 0x80) != 0) {
|
||||
code = Zi8MatchAltSound(soundTable, soundCode, pCodeTable, dictionaryIndex & 0x7FFF, masks[partIndex], values[partIndex], flag, ZI_WORK);
|
||||
}
|
||||
if ((code & masks[partIndex]) != values[partIndex]) {
|
||||
goto phonetic_skip;
|
||||
}
|
||||
partIndex++;
|
||||
if (partIndex == numParts) {
|
||||
if ((partialMode != 0) && ((strictMode == 0 && (partCode & 0x80) != 0) || (strictMode != 0 && (partCode & 0x80) == 0))) {
|
||||
goto phonetic_skip;
|
||||
}
|
||||
*resultNode = node;
|
||||
code = ((ziU16)node[6] << 8) + node[7];
|
||||
*resultCode = code;
|
||||
*count = remaining;
|
||||
return 1;
|
||||
}
|
||||
nextPart = sound;
|
||||
} while ((partCode & 0x80) == 0);
|
||||
continue;
|
||||
phonetic_skip:
|
||||
if ((traversal.dictionaryIndex & 0x8000) == 0) {
|
||||
sound++;
|
||||
while ((*sound & 0x80) == 0) {
|
||||
sound += 2;
|
||||
if ((partCode & 0x80) == 0) {
|
||||
nextPart += 3;
|
||||
while ((*nextPart & 0x80) == 0) {
|
||||
nextPart += 2;
|
||||
}
|
||||
sound = nextPart + 1;
|
||||
}
|
||||
sound++;
|
||||
}
|
||||
break;
|
||||
phonetic_matched:
|
||||
if (++traversal.partIndex == numParts) {
|
||||
if (partialMode != 0) {
|
||||
if (strictMode == 0 && (traversal.dictionaryIndex & 0x8000) != 0) goto phonetic_skip;
|
||||
if (strictMode != 0 && (traversal.dictionaryIndex & 0x8000) == 0) goto phonetic_skip;
|
||||
}
|
||||
*resultNode = node;
|
||||
*resultCode = ((ziU16)node[6] << 8) + node[7];
|
||||
*count = traversal.remaining;
|
||||
return 1;
|
||||
}
|
||||
} while ((traversal.dictionaryIndex & 0x8000) == 0);
|
||||
} while ((nextCode & 0x80) == 0);
|
||||
}
|
||||
}
|
||||
if ((traversal.nextCode & 0x80) != 0) goto next_node;
|
||||
goto next_group;
|
||||
check_code:
|
||||
if (*values == (traversal.code & *masks)) goto match_code;
|
||||
goto next_node;
|
||||
next_node:
|
||||
node += 0xC;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -441,45 +429,46 @@ check_code:
|
||||
ziBool Zi8GetPyFinal(ziU8* pinyin, ziU8* initial, ziU8* final);
|
||||
|
||||
ziU8 Zi8GetPyPhonetic(ziWChar* text, ziU8 count, ziU16* initial, ziU16* final, ziU8* resultCount, ziU16* bestInitial, ziU16* bestFinal ZI_NEED_WORK) {
|
||||
ziU8 pyInitial;
|
||||
ziU8 firstInitial;
|
||||
ziU8 pyFinal;
|
||||
ziU8 pyInitial;
|
||||
ziU8 convertedCount;
|
||||
ziU8 result;
|
||||
ziBool partial;
|
||||
ziBool alternateInitial;
|
||||
ziU8 result;
|
||||
ziU8 outputIndex;
|
||||
ziU8 index;
|
||||
ziU8 partCount;
|
||||
ziU16 value;
|
||||
ziU8 index;
|
||||
ziWChar converted[256];
|
||||
ziU8 pinyin[12];
|
||||
ziWChar* current;
|
||||
ziU8 pinyin[12];
|
||||
|
||||
current = converted;
|
||||
alternateInitial = 0;
|
||||
result = 0;
|
||||
*resultCount = 0;
|
||||
if (count == 0) {
|
||||
Zi8LogError(0x135, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
index = 0;
|
||||
convertedCount = index;
|
||||
for (; index < count; index++) {
|
||||
convertedCount = 0;
|
||||
for (index = 0; index < count; index++) {
|
||||
if (((text[index] >= 0xF341) && (text[index] <= 0xF35A)) || ((text[index] >= 0x41) && (text[index] <= 0x5A))) {
|
||||
if ((convertedCount != 0) && (current[convertedCount - 1] != 0xF360) && (current[convertedCount - 1] != 0x27)) {
|
||||
current[convertedCount++] = 0x27;
|
||||
current[convertedCount] = 0x27;
|
||||
convertedCount++;
|
||||
}
|
||||
current[convertedCount++] = (text[index] & 0xFF) + 0x20;
|
||||
current[convertedCount] = (text[index] & 0xFF) + 0x20;
|
||||
} else {
|
||||
current[convertedCount++] = text[index];
|
||||
current[convertedCount] = text[index];
|
||||
}
|
||||
convertedCount++;
|
||||
}
|
||||
|
||||
count = convertedCount;
|
||||
outputIndex = 0;
|
||||
*bestInitial = 0;
|
||||
*bestFinal = 0;
|
||||
while (count != 0) {
|
||||
while ((outputIndex < 0x10) && (count != 0)) {
|
||||
initial[outputIndex] = 0;
|
||||
final[outputIndex] = 0;
|
||||
value = *current;
|
||||
@@ -493,44 +482,41 @@ check_pinyin_extension:
|
||||
if (value < 0xF361) {
|
||||
goto invalid_pinyin;
|
||||
}
|
||||
if (value <= 0xF37A) goto pinyin_extension;
|
||||
if (value <= 0xF37A) {
|
||||
value += 0xC9F;
|
||||
goto pinyin_initial;
|
||||
}
|
||||
invalid_pinyin:
|
||||
*bestInitial = *bestFinal = initial[0] = final[0] = 0xFFFF;
|
||||
initial[0] = 0xFFFF;
|
||||
final[0] = 0xFFFF;
|
||||
*bestInitial = 0xFFFF;
|
||||
*bestFinal = 0xFFFF;
|
||||
return 1;
|
||||
pinyin_extension:
|
||||
value -= 0xF361;
|
||||
goto pinyin_initial;
|
||||
pinyin_ascii:
|
||||
value -= 0x61;
|
||||
pinyin_initial:
|
||||
convertedCount = Zi8PinyinInitials[value];
|
||||
if (convertedCount != 0) {
|
||||
firstInitial = Zi8PinyinInitials[value];
|
||||
if (firstInitial != 0) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = (ziU16)(convertedCount & 0x7f) << 9;
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
final[outputIndex] = (ziU16)firstInitial << 9;
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
count--;
|
||||
if (count == 0) {
|
||||
break;
|
||||
}
|
||||
current += 1;
|
||||
if ((convertedCount & 0x80) != 0) {
|
||||
if (alternateInitial) {
|
||||
initial[outputIndex] &= 0xfdff;
|
||||
final[outputIndex] &= 0xfdff;
|
||||
}
|
||||
value = *current;
|
||||
if (value != 0x68 && value != 0xF368) goto scan_final;
|
||||
if (((firstInitial & 0x80) != 0) && ((current[0] == 0x68) || (current[0] == 0xF368))) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
final[outputIndex] += 0x200;
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
count--;
|
||||
if (count == 0) {
|
||||
break;
|
||||
@@ -540,80 +526,80 @@ pinyin_initial:
|
||||
} else if ((*current == 0xF369) || (*current == 0x69)) {
|
||||
goto invalid_pinyin;
|
||||
}
|
||||
scan_final:
|
||||
partial = 0;
|
||||
for (index = 0; index < 4; index++) {
|
||||
pinyin[index] = 0;
|
||||
}
|
||||
index = 0;
|
||||
while (index < 4) {
|
||||
value = *current;
|
||||
if ((value == 0x27) || (value == 0xF360) || (value == 0x20)) {
|
||||
if (index != 0) {
|
||||
partial = 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
if ((value >= 0xF331) && (value < 0xF336)) {
|
||||
if (index != 0) {
|
||||
partial = 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
if ((value < 0x61) || (value > 0x7A)) {
|
||||
if (value < 0xF361) {
|
||||
do {
|
||||
while (1) {
|
||||
if (index > 3) {
|
||||
goto finish_final;
|
||||
}
|
||||
value -= 0xF361;
|
||||
if (value > 0x19) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
value = *current;
|
||||
if ((value == 0x27) || (value == 0xF360) || (value == 0x20)) {
|
||||
if (index != 0) {
|
||||
partial = 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
} else {
|
||||
value -= 0x61;
|
||||
}
|
||||
pinyin[index] = (ziU8)value + 1;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) goto try_final_extension;
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
current++;
|
||||
index++;
|
||||
count--;
|
||||
if (count == 0) {
|
||||
goto finish_final;
|
||||
}
|
||||
continue;
|
||||
try_final_extension:
|
||||
|
||||
if (index < 3) {
|
||||
pinyin[index + 1] = 0xFF;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
if ((value > 0xF330) && (value < 0xF336)) {
|
||||
if (index != 0) {
|
||||
partial = 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
if ((value < 0x61) || (value > 0x7A)) {
|
||||
if (value < 0xF361) {
|
||||
goto finish_final;
|
||||
}
|
||||
value += 0xC9F;
|
||||
if (value > 0x19) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
pinyin[index + 1] = 0;
|
||||
current++;
|
||||
index++;
|
||||
count--;
|
||||
if (count == 0) break;
|
||||
} else {
|
||||
pinyin[index + 1] = 0;
|
||||
pinyin[index] = 0;
|
||||
partial = 1;
|
||||
value -= 0x61;
|
||||
}
|
||||
pinyin[index] = (ziU8)value + 1;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
current++;
|
||||
index++;
|
||||
count--;
|
||||
if (count == 0) {
|
||||
goto finish_final;
|
||||
}
|
||||
}
|
||||
if (index > 2) {
|
||||
pinyin[index] = 0;
|
||||
partial = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
pinyin[index + 1] = 0xFF;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) {
|
||||
pinyin[index + 1] = 0;
|
||||
pinyin[index] = 0;
|
||||
partial = 1;
|
||||
break;
|
||||
}
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
pinyin[index + 1] = 0;
|
||||
current++;
|
||||
index++;
|
||||
count--;
|
||||
} while (count != 0);
|
||||
|
||||
finish_final:
|
||||
if ((index > 3) && (count != 0) && (((value = *current) == 0x27) || (value == 0xF360) || (value == 0x20))) {
|
||||
if ((index > 3) && (count != 0) && ((*current == 0x27) || (*current == 0xF360) || (*current == 0x20))) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
@@ -623,38 +609,35 @@ finish_final:
|
||||
if (index > 3) {
|
||||
partial = 1;
|
||||
}
|
||||
if (partial && alternateInitial == 0) {
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (convertedCount == 0) {
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = 0x200;
|
||||
}
|
||||
initial[outputIndex] |= (ziU16)pyInitial << 3;
|
||||
final[outputIndex] |= (ziU16)pyFinal << 3;
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
} else {
|
||||
if ((index != 0) && (count != 0)) {
|
||||
goto invalid_pinyin;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (!partial) {
|
||||
pinyin[index] = 0xFF;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (convertedCount == 0) {
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) {
|
||||
pinyin[index] = 0;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (firstInitial == 0) {
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = 0x200;
|
||||
}
|
||||
initial[outputIndex] |= (ziU16)pyInitial << 3;
|
||||
final[outputIndex] |= (ziU16)pyFinal << 3;
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
}
|
||||
} else {
|
||||
if (firstInitial == 0) {
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = 0x200;
|
||||
}
|
||||
initial[outputIndex] |= (ziU16)pyInitial << 3;
|
||||
final[outputIndex] |= (ziU16)pyFinal << 3;
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
if ((outputIndex == 0) && (count == 0)) {
|
||||
pinyin[index] = 0;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (convertedCount == 0) {
|
||||
if (firstInitial == 0) {
|
||||
*bestInitial = 0x7E00;
|
||||
*bestFinal = 0x200;
|
||||
}
|
||||
@@ -662,42 +645,45 @@ finish_final:
|
||||
*bestFinal |= (ziU16)pyFinal << 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (firstInitial == 0) {
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = 0x200;
|
||||
}
|
||||
initial[outputIndex] |= (ziU16)pyInitial << 3;
|
||||
final[outputIndex] |= (ziU16)pyFinal << 3;
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
} else {
|
||||
pinyin[index] = 0;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (convertedCount == 0) {
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = 0x200;
|
||||
}
|
||||
initial[outputIndex] |= (ziU16)pyInitial << 3;
|
||||
final[outputIndex] |= (ziU16)pyFinal << 3;
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
if ((index != 0) && (count != 0)) {
|
||||
goto invalid_pinyin;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
convertedCount = count;
|
||||
if (count != 0) {
|
||||
value = *current;
|
||||
if ((value == 0x27) || (value == 0xF360) || (value == 0x20)) {
|
||||
current++;
|
||||
count--;
|
||||
convertedCount = count - 1;
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
} else if ((value >= 0xF331) && ((value -= 0xF331) <= 4)) {
|
||||
value++;
|
||||
} else if ((value > 0xF330) && ((ziU16)(value + 0xCCF) < 5)) {
|
||||
initial[outputIndex] |= 7;
|
||||
final[outputIndex] |= value;
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
count--;
|
||||
final[outputIndex] |= value + 0xCD0;
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
convertedCount = count - 1;
|
||||
current++;
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
if ((count != 0) && (((value = *current) == 0x27) || (value == 0xF360) || (value == 0x20))) {
|
||||
count--;
|
||||
if ((convertedCount != 0) && ((*current == 0x27) || (*current == 0xF360) || (*current == 0x20))) {
|
||||
convertedCount = count - 2;
|
||||
current++;
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
@@ -705,10 +691,10 @@ finish_final:
|
||||
}
|
||||
}
|
||||
}
|
||||
count = convertedCount;
|
||||
outputIndex++;
|
||||
if (outputIndex > 0xf) break;
|
||||
}
|
||||
if ((result > 1) && (text[*resultCount - 1] >= 0xF341) && (text[*resultCount - 1] <= 0xF35A)) {
|
||||
if ((*resultCount > 1) && (text[*resultCount - 1] > 0xF340) && (text[*resultCount - 1] < 0xF35B)) {
|
||||
*resultCount = *resultCount - 1;
|
||||
}
|
||||
return result;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -25,12 +25,13 @@ ziU8 Zi8_814813FC(ziWChar character, ziU8* result, ziU16* index, ziPtr workData)
|
||||
|
||||
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
|
||||
|
||||
ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
ziPtr workData) {
|
||||
ziU8 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
ziPtr workData) {
|
||||
struct {
|
||||
ziU8 characterIndex;
|
||||
ziU8 matched;
|
||||
ziU8 elementIndex;
|
||||
ziU8 reserved;
|
||||
ziU16 index;
|
||||
ziU16 currentCandidate;
|
||||
ziU16 inputIndex;
|
||||
@@ -44,7 +45,7 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
ziU8* table1;
|
||||
} state;
|
||||
ziU16 buffer[100];
|
||||
ziU8 result;
|
||||
unsigned int result;
|
||||
ziU16 currentCharacter;
|
||||
ziU8* selectedTable;
|
||||
|
||||
@@ -52,7 +53,9 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
result = 0;
|
||||
state.characterIndex = 0xFF;
|
||||
state.currentCandidate = params->firstCandidate;
|
||||
params->letters = params->count = params->unk_0x20 = 0;
|
||||
params->unk_0x20 = 0;
|
||||
params->count = 0;
|
||||
params->letters = 0;
|
||||
if ((argument != 0) && (*argument != 0)) {
|
||||
Zi8LogError(0x7D0, workData);
|
||||
return 0;
|
||||
@@ -72,39 +75,40 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
state.tableCount31 = Zi8GetTableCount(ZI8_LANG_KO, 0x31, workData);
|
||||
|
||||
for (state.elementIndex = 0; state.elementIndex < params->elementCount;
|
||||
state.elementIndex++) {
|
||||
state.elementIndex++) {
|
||||
currentCharacter = params->elements[state.elementIndex];
|
||||
|
||||
if ((currentCharacter >= 0x61) && (currentCharacter <= 0x7A)) {
|
||||
buffer[state.elementIndex] = state.table1[(currentCharacter - 0x61) * 2];
|
||||
} else if ((currentCharacter >= 0x41) && (currentCharacter <= 0x5A)) {
|
||||
buffer[state.elementIndex] = (state.table1 + (currentCharacter - 0x41) * 2)[1];
|
||||
buffer[state.elementIndex] = state.table1[(currentCharacter - 0x41) * 2 + 1];
|
||||
} else {
|
||||
state.matched = 0;
|
||||
for (; state.table2[state.matched * 3] != 0; state.matched++) {
|
||||
if (currentCharacter == state.table2[state.matched * 3]) break;
|
||||
}
|
||||
if (state.table2[state.matched * 3] != 0) {
|
||||
buffer[state.elementIndex] =
|
||||
((ziU16)(state.table2 + state.matched * 3)[1] << 8) |
|
||||
(state.table2 + state.matched * 3)[2];
|
||||
} else {
|
||||
if (state.table2[(state.matched * 3)] == 0) {
|
||||
Zi8LogError(0x161, workData);
|
||||
return 0;
|
||||
}
|
||||
buffer[state.elementIndex] =
|
||||
(state.table2[(state.matched * 3) + 1] << 8) |
|
||||
state.table2[(state.matched * 3) + 2];
|
||||
}
|
||||
}
|
||||
|
||||
result = 0;
|
||||
for (currentCharacter = 0; currentCharacter < state.elementIndex; currentCharacter++) {
|
||||
if (Zi8_814813FC(buffer[currentCharacter], &state.characterIndex,
|
||||
&state.inputIndex, workData) != 0) {
|
||||
state.matched = Zi8_81481E6C(&state.nextIndex,
|
||||
buffer + currentCharacter + 1,
|
||||
state.characterIndex,
|
||||
(state.elementIndex - currentCharacter) - 1,
|
||||
workData);
|
||||
if ((((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 1)) {
|
||||
state.inputIndex = 0;
|
||||
if (Zi8_814813FC(buffer[currentCharacter], (ziU8*)&state.characterIndex,
|
||||
(ziU16*)&state.inputIndex, workData) == 0) {
|
||||
state.matched = 0;
|
||||
} else {
|
||||
state.matched = Zi8_81481E6C((ziU16*)&state.nextIndex,
|
||||
&buffer[currentCharacter + 1],
|
||||
state.characterIndex,
|
||||
(state.elementIndex - currentCharacter) - 1,
|
||||
workData);
|
||||
if ((((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 1) && (state.characterIndex < 0x1F)) {
|
||||
switch (state.characterIndex) {
|
||||
case 1:
|
||||
selectedTable = (ziU8*)Zi8GetTableAddress(ZI8_LANG_KO, 0x1E, workData);
|
||||
@@ -167,33 +171,38 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
state.matched = 0;
|
||||
}
|
||||
if (state.matched != 0) {
|
||||
if (state.tableCount6 == 0) {
|
||||
state.nextIndex += state.inputIndex * state.tableCount3;
|
||||
}
|
||||
if (state.currentCandidate != 0) {
|
||||
state.currentCandidate--;
|
||||
} else {
|
||||
params->candidates[(ziU8)result] =
|
||||
((ziU16)selectedTable[state.nextIndex * 2] << 8) | (selectedTable + state.nextIndex * 2)[1];
|
||||
if ((state.tableCount6 != 0) && (((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 0)) {
|
||||
params->candidates[(ziU8)result] += state.inputIndex * state.tableCount3;
|
||||
if (state.matched == 0) {
|
||||
if (state.currentCandidate == 0) {
|
||||
for (state.index = 0; state.index < state.tableCount31; state.index++) {
|
||||
if (((ziU16)state.table31[(state.index * 3)] == buffer[currentCharacter]) &&
|
||||
((ziU16)state.table31[(state.index * 3) + 1] == buffer[currentCharacter + 1])) {
|
||||
if (currentCharacter == 0) {
|
||||
params->count = 1;
|
||||
}
|
||||
params->candidates[result] =
|
||||
state.tableCount0 + state.table31[(state.index * 3) + 2];
|
||||
result++;
|
||||
currentCharacter++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
result++;
|
||||
}
|
||||
if (currentCharacter == 0) {
|
||||
params->count = state.matched + 1;
|
||||
}
|
||||
currentCharacter += state.matched;
|
||||
} else {
|
||||
if (state.currentCandidate != 0) {
|
||||
if (state.index == state.tableCount31) {
|
||||
params->candidates[result] = buffer[currentCharacter];
|
||||
if (buffer[currentCharacter] < 0xFF) {
|
||||
if (currentCharacter == 0) {
|
||||
params->count = 1;
|
||||
}
|
||||
params->candidates[result] += state.tableCount0;
|
||||
result++;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
state.index = 0;
|
||||
for (; state.index < state.tableCount31; state.index++) {
|
||||
if (state.table31[state.index * 3] == buffer[currentCharacter] &&
|
||||
(state.table31 + state.index * 3)[1] == buffer[currentCharacter + 1]) break;
|
||||
while ((state.index < state.tableCount31) &&
|
||||
(((ziU16)state.table31[(state.index * 3)] != buffer[currentCharacter]) ||
|
||||
((ziU16)state.table31[(state.index * 3) + 1] != buffer[currentCharacter + 1]))) {
|
||||
state.index++;
|
||||
}
|
||||
if (state.index == state.tableCount31) {
|
||||
state.currentCandidate--;
|
||||
@@ -201,30 +210,25 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
if (currentCharacter == 0) {
|
||||
params->count = 1;
|
||||
}
|
||||
} else {
|
||||
for (state.index = 0; state.index < state.tableCount31; state.index++) {
|
||||
if ((state.table31[(state.index * 3)] == buffer[currentCharacter]) &&
|
||||
((state.table31 + state.index * 3)[1] == buffer[currentCharacter + 1])) {
|
||||
if (currentCharacter == 0) {
|
||||
params->count = 1;
|
||||
}
|
||||
params->candidates[(ziU8)result] =
|
||||
state.tableCount0 + (state.table31 + state.index * 3)[2];
|
||||
result++;
|
||||
currentCharacter++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (state.index == state.tableCount31) {
|
||||
if ((params->candidates[(ziU8)result] = buffer[currentCharacter]) < 0xFF) {
|
||||
if (currentCharacter == 0) {
|
||||
params->count = 1;
|
||||
}
|
||||
params->candidates[(ziU8)result] += state.tableCount0;
|
||||
result++;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (state.tableCount6 == 0) {
|
||||
state.nextIndex += state.inputIndex * state.tableCount3;
|
||||
}
|
||||
if (state.currentCandidate == 0) {
|
||||
params->candidates[result] =
|
||||
(selectedTable[state.nextIndex * 2] << 8) | selectedTable[state.nextIndex * 2 + 1];
|
||||
if ((state.tableCount6 != 0) && (((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 0)) {
|
||||
params->candidates[result] += state.inputIndex * state.tableCount3;
|
||||
}
|
||||
result++;
|
||||
} else {
|
||||
state.currentCandidate--;
|
||||
}
|
||||
if (currentCharacter == 0) {
|
||||
params->count = state.matched + 1;
|
||||
}
|
||||
currentCharacter += state.matched;
|
||||
}
|
||||
if (result >= params->maxCandidates) {
|
||||
break;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -3,14 +3,6 @@
|
||||
extern ziU16 Zi8GetTableCount(ziU8 lang, ziU8 tableIdx ZI_NEED_WORK);
|
||||
extern ziU32 Zi8GetTableAddress(ziU8 lang, ziU8 tableIdx ZI_NEED_WORK);
|
||||
|
||||
typedef struct {
|
||||
ziU8 keyBytes[5];
|
||||
ziU8 childHigh;
|
||||
ziU8 childLow;
|
||||
ziU8 characterHigh;
|
||||
ziU8 characterLow;
|
||||
} ZiKoreanKeyEntry;
|
||||
|
||||
ziU32 Zi8_8148302C(ziU16 key, ziU8* table ZI_NEED_WORK) {
|
||||
ziU32 value;
|
||||
ziU16 count;
|
||||
@@ -20,7 +12,7 @@ ziU32 Zi8_8148302C(ziU16 key, ziU8* table ZI_NEED_WORK) {
|
||||
for (i = 0; (ziU16)i < count; i++) {
|
||||
value = (ziU16)(((ziU16)table[((i & 0xFFFF) << 3) + (i & 0xFFFF) + 7] << 8) |
|
||||
table[((i & 0xFFFF) << 3) + (i & 0xFFFF) + 8]);
|
||||
if (value == key) {
|
||||
if (key == value) {
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
return i;
|
||||
}
|
||||
@@ -99,7 +91,7 @@ ziU32 Zi8_81483308(ziGetParam* param, ziU16 key, ziU8* count ZI_NEED_WORK) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU32 Zi8_814833F0(const ziGetParam* param, ziU16 key ZI_NEED_WORK) {
|
||||
ziBool Zi8_814833F0(const ziGetParam* param, ziU16 key ZI_NEED_WORK) {
|
||||
ziU8 i;
|
||||
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
@@ -119,28 +111,23 @@ ziU32 Zi8_814833F0(const ziGetParam* param, ziU16 key ZI_NEED_WORK) {
|
||||
|
||||
ziU32 Zi8_814834AC(ziGetParam* param, ziU16* remaining, ziU8* count,
|
||||
ziU8* inserted ZI_NEED_WORK) {
|
||||
struct {
|
||||
ziBool matches;
|
||||
ziU8 candidateIndex;
|
||||
ziU16 tableCount;
|
||||
ziS32 compactIndex;
|
||||
ZiKoreanKeyEntry* entry;
|
||||
ziU8* tableB;
|
||||
ziU8* tableA;
|
||||
union {
|
||||
ziU32 firstWord;
|
||||
ziU8 bytes[5];
|
||||
} keys;
|
||||
} filter;
|
||||
ziBool matches;
|
||||
ziS32 entry;
|
||||
ziS32 tableA;
|
||||
ziS32 tableB;
|
||||
ziU16 tableCount;
|
||||
ziU8 matched;
|
||||
ziU32 j;
|
||||
ziS32 i;
|
||||
ziS32 candidate;
|
||||
ziU8 matched;
|
||||
ziU8 candidateIndex;
|
||||
union {
|
||||
ziU32 words[13];
|
||||
ziU8 bytes[52];
|
||||
} local;
|
||||
|
||||
j = 0;
|
||||
filter.candidateIndex = 0;
|
||||
matched = 0;
|
||||
filter.keys.bytes[4] = filter.keys.firstWord = 0;
|
||||
local.words[0] = 0;
|
||||
local.bytes[4] = 0;
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
if (param->elementCount == 0) {
|
||||
if (*remaining >= *count) {
|
||||
@@ -154,354 +141,394 @@ ziU32 Zi8_814834AC(ziGetParam* param, ziU16* remaining, ziU8* count,
|
||||
Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK);
|
||||
}
|
||||
for (i = 0; i < ((ziS32)*count - (ziS32)*remaining); i++) {
|
||||
param->candidates[i] = param->candidates[*remaining + i];
|
||||
param->candidates[i] = param->candidates[(ziU32)*remaining + i];
|
||||
}
|
||||
*count -= *remaining;
|
||||
*count = *count - (ziU8)*remaining;
|
||||
*remaining = 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
if (param->elementCount > 9) {
|
||||
*count = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
filter.tableA = (ziU8*)Zi8GetTableAddress(param->language, 9, ZI_WORK);
|
||||
filter.tableB = (ziU8*)Zi8GetTableAddress(param->language, 10, ZI_WORK);
|
||||
if (filter.tableA == 0) {
|
||||
} else if (param->elementCount <= 9) {
|
||||
tableA = Zi8GetTableAddress(param->language, 9, ZI_WORK);
|
||||
tableB = Zi8GetTableAddress(param->language, 10, ZI_WORK);
|
||||
if (tableA == 0) {
|
||||
Zi8ReplaceLastError(0x76C, ZI_WORK);
|
||||
return 0;
|
||||
} else if (filter.tableB == 0) {
|
||||
} else if (tableB == 0) {
|
||||
Zi8ReplaceLastError(0x776, ZI_WORK);
|
||||
return 0;
|
||||
} else {
|
||||
filter.tableCount = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
Zi8_81483118(param, filter.keys.bytes);
|
||||
tableCount = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
Zi8_81483118(param, local.bytes);
|
||||
i = 0;
|
||||
while (i < filter.tableCount && matched < *count) {
|
||||
filter.matches = ZI8_TRUE;
|
||||
filter.entry = (ZiKoreanKeyEntry*)&filter.tableA[(i << 3) + i];
|
||||
while (i < tableCount && matched < *count) {
|
||||
matches = ZI8_TRUE;
|
||||
entry = (i << 3) + tableA + i;
|
||||
j = 0;
|
||||
if (param->elementCount > 1) {
|
||||
for (j = 0; (int)(j & 0xFF) < (int)param->elementCount / 2; j++) {
|
||||
if (filter.keys.bytes[j & 0xFF] != filter.entry->keyBytes[j & 0xFF]) {
|
||||
filter.matches = ZI8_FALSE;
|
||||
for (j = 0; (j & 0xFF) < (ziU32)(param->elementCount >> 1); j++) {
|
||||
if (local.bytes[j & 0xFF] != *((ziU8*)entry + (j & 0xFF))) {
|
||||
matches = ZI8_FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (filter.matches && (param->elementCount % 2) != 0 &&
|
||||
((filter.keys.bytes[j & 0xFF] & 0xF0) != (filter.entry->keyBytes[j & 0xFF] & 0xF0))) {
|
||||
filter.matches = ZI8_FALSE;
|
||||
if (matches && (param->elementCount & 1) != 0 &&
|
||||
((local.bytes[j & 0xFF] & 0xF0) != (*((ziU8*)entry + (j & 0xFF)) & 0xF0))) {
|
||||
matches = ZI8_FALSE;
|
||||
}
|
||||
if (filter.matches) {
|
||||
for (filter.candidateIndex = 0; filter.candidateIndex < *count; filter.candidateIndex++) {
|
||||
if (param->candidates[filter.candidateIndex] ==
|
||||
(((ziU16)((ZiKoreanKeyEntry*)filter.tableA)[i].characterHigh << 8) | (ziU16)((ZiKoreanKeyEntry*)filter.tableA)[i].characterLow)) {
|
||||
if (matches) {
|
||||
for (candidateIndex = 0; candidateIndex < *count; candidateIndex++) {
|
||||
if (param->candidates[candidateIndex] ==
|
||||
(ziU16)((*((ziU8*)entry + 7) << 8) | *((ziU8*)entry + 8))) {
|
||||
matched++;
|
||||
param->candidates[filter.candidateIndex] &= 0x7FFF;
|
||||
param->candidates[candidateIndex] =
|
||||
param->candidates[candidateIndex] & 0x7FFF;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
if (matched >= *remaining) {
|
||||
if ((ziU16)matched >= *remaining) {
|
||||
matched = *count;
|
||||
*count = 0;
|
||||
for (candidate = 0; candidate < matched; candidate++) {
|
||||
if ((param->candidates[candidate] & 0x8000) == 0) {
|
||||
param->candidates[candidate] |= 0x8000;
|
||||
if (*remaining != 0) {
|
||||
--*remaining;
|
||||
Zi8_81483308(param, param->candidates[candidate], inserted, ZI_WORK);
|
||||
} else {
|
||||
if (*count != candidate) {
|
||||
param->candidates[*count] = param->candidates[candidate];
|
||||
for (i = 0; i < matched; i++) {
|
||||
if ((param->candidates[i] & 0x8000) == 0) {
|
||||
param->candidates[i] = param->candidates[i] | 0x8000;
|
||||
if (*remaining == 0) {
|
||||
if (*count != i) {
|
||||
param->candidates[*count] = param->candidates[i];
|
||||
}
|
||||
++*count;
|
||||
*count = *count + 1;
|
||||
} else {
|
||||
*remaining = *remaining - 1;
|
||||
Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK);
|
||||
}
|
||||
}
|
||||
}
|
||||
*remaining = 0;
|
||||
} else {
|
||||
for (filter.compactIndex = 0; filter.compactIndex < *count; filter.compactIndex++) {
|
||||
if ((param->candidates[filter.compactIndex] & 0x8000) == 0) {
|
||||
param->candidates[filter.compactIndex] |= 0x8000;
|
||||
Zi8_81483308(param, param->candidates[filter.compactIndex], inserted, ZI_WORK);
|
||||
for (i = 0; i < *count; i++) {
|
||||
if ((param->candidates[i] & 0x8000) == 0) {
|
||||
param->candidates[i] = param->candidates[i] | 0x8000;
|
||||
Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK);
|
||||
}
|
||||
}
|
||||
*remaining = *remaining - matched;
|
||||
*remaining = *remaining - (ziU16)matched;
|
||||
*count = 0;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
*count = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
ziU8 countOnly;
|
||||
ziU8 maxWordLength;
|
||||
ziU8 lookupMode;
|
||||
ziU8 suffixOnly;
|
||||
ziU8 controls[8];
|
||||
ziU32 maxCount;
|
||||
ziU16 capacity;
|
||||
ziU8 minWordLength;
|
||||
ziU8 flags;
|
||||
ziU16 candidateCapacity;
|
||||
ziU8 checkOnly;
|
||||
ziU8 reserved;
|
||||
} ZiKoreanCandidateOptions;
|
||||
ziU32 Zi8GetKOcandidates(ziGetParam* param, ziU8* options ZI_NEED_WORK) {
|
||||
ziBool bVar1;
|
||||
ziU8 bVar2;
|
||||
ziS32 iVar4;
|
||||
ziU32 uVar6;
|
||||
ziU8* pbVar7;
|
||||
union {
|
||||
ziU32 words[10];
|
||||
ziU8 bytes[40];
|
||||
} local_28;
|
||||
ziU8 local_57;
|
||||
ziU8 local_56;
|
||||
ziU8 local_55;
|
||||
ziU8 local_54;
|
||||
ziU8 local_53;
|
||||
ziS8 local_52;
|
||||
ziU16 local_50;
|
||||
ziU16 local_4E;
|
||||
ziU16 local_4C;
|
||||
ziU16 local_4A;
|
||||
ziU16 local_48;
|
||||
ziS32 local_44;
|
||||
ziS32 local_2C;
|
||||
ziS32 local_30;
|
||||
ziU32 local_34;
|
||||
ziU32 local_38;
|
||||
ziU32 local_3C;
|
||||
ziU32 local_40;
|
||||
|
||||
ziU32 Zi8GetKOcandidates(ziGetParam* param, ZiKoreanCandidateOptions* options ZI_NEED_WORK) {
|
||||
struct {
|
||||
ziBool matches;
|
||||
ziU8 inserted;
|
||||
ziU8 matchPass;
|
||||
ziU8 keyByte;
|
||||
ziU8 candidateCount;
|
||||
ziU8 wordIndex;
|
||||
ziU8 remainingLetters;
|
||||
ziU16 remainingCandidates;
|
||||
ziU16 previousIndex;
|
||||
ziU16 character;
|
||||
ziU16 tableCount;
|
||||
ziU16 keyIndex;
|
||||
ZiKoreanKeyEntry* entry;
|
||||
ziS32 candidateIndex;
|
||||
ziS32 prefixCount;
|
||||
ziU32 wordOffset;
|
||||
ziS32 resultCount;
|
||||
ziS32 tableIndex;
|
||||
ziU8* wordTable;
|
||||
union {
|
||||
ziU32 firstWord;
|
||||
ziU8 bytes[5];
|
||||
} packedKeys;
|
||||
} search;
|
||||
ziU8* keyTable;
|
||||
ziU8* wordNode;
|
||||
|
||||
search.previousIndex = 0xFFFF;
|
||||
search.resultCount = 0;
|
||||
search.packedKeys.firstWord = 0;
|
||||
search.packedKeys.bytes[4] = 0;
|
||||
search.remainingLetters = 0;
|
||||
search.wordIndex = 0;
|
||||
search.candidateCount = 0;
|
||||
search.keyByte = 0;
|
||||
search.remainingCandidates = param->firstCandidate;
|
||||
search.prefixCount = 0;
|
||||
search.candidateIndex = 0;
|
||||
search.inserted = 0;
|
||||
local_4E = 0xFFFF;
|
||||
local_34 = 0;
|
||||
local_28.words[0] = 0;
|
||||
local_28.bytes[4] = 0;
|
||||
local_52 = 0;
|
||||
local_53 = 0;
|
||||
local_54 = 0;
|
||||
local_55 = 0;
|
||||
local_50 = param->firstCandidate;
|
||||
local_3C = 0;
|
||||
local_40 = 0;
|
||||
local_57 = 0;
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
Zi8_81483264(param, ZI_WORK);
|
||||
keyTable = (ziU8*)Zi8GetTableAddress(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
search.wordTable = (ziU8*)Zi8GetTableAddress(ZI8_LANG_KO, 10, ZI_WORK);
|
||||
if (keyTable == 0) {
|
||||
iVar4 = Zi8GetTableAddress(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
local_2C = Zi8GetTableAddress(ZI8_LANG_KO, 10, ZI_WORK);
|
||||
if (iVar4 == 0) {
|
||||
Zi8ReplaceLastError(0x76C, ZI_WORK);
|
||||
return 0;
|
||||
uVar6 = 0;
|
||||
} else {
|
||||
if (search.wordTable == 0) {
|
||||
if (local_2C == 0) {
|
||||
Zi8ReplaceLastError(0x776, ZI_WORK);
|
||||
return 0;
|
||||
uVar6 = 0;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
if (options->countOnly == 0) {
|
||||
if (*options == 0) {
|
||||
param->letters = 0;
|
||||
param->unk_0x20 = 0;
|
||||
param->count = 0;
|
||||
param->candidates[0] = 0;
|
||||
}
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
if (param->wordCharCount != 0) {
|
||||
if (((search.keyIndex = Zi8_8148302C(param->currentWord[0], keyTable, ZI_WORK)) != 0xFFFF) &&
|
||||
((((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->keyBytes[4] & 8) != 0)) {
|
||||
search.wordOffset = ((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->childLow |
|
||||
((((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->keyBytes[4] & 3) << 16 |
|
||||
((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->childHigh << 8);
|
||||
search.remainingLetters = param->wordCharCount - 1;
|
||||
search.wordIndex = 1;
|
||||
wordNode = search.wordTable + search.wordOffset;
|
||||
match_word:
|
||||
while (search.remainingLetters != 0) {
|
||||
search.keyIndex = Zi8_8148302C(param->currentWord[search.wordIndex], (ziU8*)keyTable, ZI_WORK);
|
||||
if (search.keyIndex == (((ziU16)*wordNode & 0x1F) << 8 | (ziU16)wordNode[1])) {
|
||||
--search.remainingLetters;
|
||||
++search.wordIndex;
|
||||
if ((*wordNode & 0x40) != 0) {
|
||||
search.remainingLetters = param->wordCharCount - 1;
|
||||
search.wordIndex = 1;
|
||||
break;
|
||||
local_48 = Zi8_8148302C(param->currentWord[0], (ziU8*)iVar4, ZI_WORK);
|
||||
if ((local_48 != 0xFFFF) &&
|
||||
((((ziU8*)iVar4)[((ziU32)local_48 * 9) + 4] & 8) != 0)) {
|
||||
local_38 = (ziU32)((ziU8*)iVar4)[((ziU32)local_48 * 9) + 6] |
|
||||
((ziU32)((ziU8*)iVar4)[((ziU32)local_48 * 9) + 4] & 3) << 16 |
|
||||
(ziU32)((ziU8*)iVar4)[((ziU32)local_48 * 9) + 5] << 8;
|
||||
local_52 = param->wordCharCount - 1;
|
||||
local_53 = 1;
|
||||
pbVar7 = (ziU8*)(local_2C + local_38);
|
||||
LAB_00010D44:
|
||||
if (local_52 != 0) {
|
||||
local_48 = Zi8_8148302C(param->currentWord[local_53], (ziU8*)iVar4, ZI_WORK);
|
||||
if (local_48 == (ziU16)((*pbVar7 & 0x1F) << 8 | pbVar7[1])) {
|
||||
local_52 = local_52 - 1;
|
||||
local_53 = local_53 + 1;
|
||||
if ((*pbVar7 & 0x40) == 0) {
|
||||
pbVar7 = pbVar7 + 2;
|
||||
goto LAB_00010D44;
|
||||
}
|
||||
wordNode += 2;
|
||||
local_52 = param->wordCharCount - 1;
|
||||
local_53 = 1;
|
||||
} else {
|
||||
search.wordIndex = 1;
|
||||
search.remainingLetters = param->wordCharCount - 1;
|
||||
break;
|
||||
local_53 = 1;
|
||||
local_52 = param->wordCharCount - 1;
|
||||
}
|
||||
}
|
||||
if (search.remainingLetters == 0) {
|
||||
search.keyIndex = ((ziU16)*wordNode & 0x1F) << 8 | (ziU16)wordNode[1];
|
||||
search.character = (ziU16)((ziU16)((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->characterHigh << 8 |
|
||||
((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->characterLow);
|
||||
if (local_52 == 0) {
|
||||
local_48 = (*pbVar7 & 0x1F) << 8 | pbVar7[1];
|
||||
local_4C = (ziU16)(((ziU8*)((ziU32)local_48 * 9 + (ziU32)local_48 + (ziU32)iVar4))[7] << 8 |
|
||||
((ziU8*)((ziU32)local_48 * 9 + (ziU32)local_48 + (ziU32)iVar4))[8]);
|
||||
if (param->wordCharCount == 1) {
|
||||
if (search.keyIndex == search.previousIndex) {
|
||||
for (; (*wordNode & 0x40) == 0; wordNode = wordNode + 2) {
|
||||
if (local_48 == local_4E) {
|
||||
for (; (*pbVar7 & 0x40) == 0; pbVar7 = pbVar7 + 2) {
|
||||
}
|
||||
wordNode += 2;
|
||||
search.remainingLetters = param->wordCharCount - 1;
|
||||
search.wordIndex = 1;
|
||||
goto next_word;
|
||||
local_52 = param->wordCharCount;
|
||||
goto LAB_00011114;
|
||||
}
|
||||
search.previousIndex = search.keyIndex;
|
||||
local_4E = local_48;
|
||||
if (param->elementCount == 0) {
|
||||
if (search.remainingCandidates != 0) {
|
||||
--search.remainingCandidates;
|
||||
} else {
|
||||
if (options->countOnly != 0) {
|
||||
if (++search.prefixCount < (ziS32)options->maxCount) {
|
||||
goto skip_word;
|
||||
if (local_50 == 0) {
|
||||
if (*options != 0) {
|
||||
local_3C = local_3C + 1;
|
||||
if ((ziS32)local_3C < *(ziS32*)(options + 0xC)) {
|
||||
goto LAB_000110E8;
|
||||
}
|
||||
return options->maxCount;
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
param->candidates[search.candidateCount++] = search.character;
|
||||
++param->unk_0x20;
|
||||
if (++param->letters >= param->maxCandidates) {
|
||||
return param->letters;
|
||||
param->candidates[local_54] = local_4C;
|
||||
local_54 = local_54 + 1;
|
||||
param->count = param->count + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (param->maxCandidates <= bVar2) {
|
||||
uVar6 = param->letters;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
} else {
|
||||
local_50 = local_50 + -1;
|
||||
}
|
||||
} else {
|
||||
param->candidates[search.candidateCount++] = search.character;
|
||||
++param->unk_0x20;
|
||||
if (++param->letters >= param->maxCandidates) {
|
||||
Zi8_814834AC(param, &search.remainingCandidates, &search.candidateCount, &search.inserted, ZI_WORK);
|
||||
param->unk_0x20 = search.candidateCount;
|
||||
param->letters = search.candidateCount;
|
||||
if (search.candidateCount < param->maxCandidates) goto skip_word;
|
||||
if (options->countOnly != 0) {
|
||||
if ((search.prefixCount += search.candidateCount) >= (ziS32)options->maxCount) return options->maxCount;
|
||||
param->unk_0x20 = 0;
|
||||
param->candidates[local_54] = local_4C;
|
||||
local_54 = local_54 + 1;
|
||||
param->count = param->count + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (param->maxCandidates <= bVar2) {
|
||||
Zi8_814834AC(param, &local_50, &local_54, &local_57, ZI_WORK);
|
||||
param->count = local_54;
|
||||
param->letters = local_54;
|
||||
if (param->maxCandidates <= local_54) {
|
||||
if (*options == 0) {
|
||||
uVar6 = local_54;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
local_3C = local_3C + local_54;
|
||||
if (*(ziS32*)(options + 0xC) <= (ziS32)local_3C) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
param->count = 0;
|
||||
param->letters = 0;
|
||||
search.candidateCount = 0;
|
||||
} else {
|
||||
return search.candidateCount;
|
||||
local_54 = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (search.candidateIndex = 0; search.candidateIndex < search.candidateCount; search.candidateIndex++) {
|
||||
if (search.character == param->candidates[search.candidateIndex]) break;
|
||||
for (local_40 = 0;
|
||||
(local_40 < local_54 &&
|
||||
(local_4C != param->candidates[local_40]));
|
||||
local_40 = local_40 + 1) {
|
||||
}
|
||||
if ((search.candidateIndex == search.candidateCount) &&
|
||||
(Zi8_814833F0(param, search.character, ZI_WORK) == 0)) {
|
||||
param->candidates[search.candidateCount++] = search.character;
|
||||
++param->unk_0x20;
|
||||
if (++param->letters < param->maxCandidates) {
|
||||
goto skip_word;
|
||||
if ((local_40 == local_54) &&
|
||||
(Zi8_814833F0(param, local_4C, ZI_WORK) == 0)) {
|
||||
param->candidates[local_54] = local_4C;
|
||||
local_54 = local_54 + 1;
|
||||
param->count = param->count + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (bVar2 < param->maxCandidates) {
|
||||
goto LAB_000110E8;
|
||||
}
|
||||
Zi8_814834AC(param, &search.remainingCandidates, &search.candidateCount, &search.inserted, ZI_WORK);
|
||||
param->unk_0x20 = search.candidateCount;
|
||||
param->letters = search.candidateCount;
|
||||
if (search.candidateCount < param->maxCandidates) goto skip_word;
|
||||
if (options->countOnly != 0) {
|
||||
if ((search.prefixCount += search.candidateCount) >= (ziS32)options->maxCount) return options->maxCount;
|
||||
param->unk_0x20 = 0;
|
||||
Zi8_814834AC(param, &local_50, &local_54, &local_57, ZI_WORK);
|
||||
param->count = local_54;
|
||||
param->letters = local_54;
|
||||
if (param->maxCandidates <= local_54) {
|
||||
if (*options == 0) {
|
||||
uVar6 = local_54;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
local_3C = local_3C + local_54;
|
||||
if (*(ziS32*)(options + 0xC) <= (ziS32)local_3C) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
param->count = 0;
|
||||
param->letters = 0;
|
||||
search.candidateCount = 0;
|
||||
} else {
|
||||
return search.candidateCount;
|
||||
local_54 = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
skip_word:
|
||||
for (; (*wordNode & 0x40) == 0; wordNode = wordNode + 2) {
|
||||
LAB_000110E8:
|
||||
for (; (*pbVar7 & 0x40) == 0; pbVar7 = pbVar7 + 2) {
|
||||
}
|
||||
wordNode += 2;
|
||||
search.remainingLetters = param->wordCharCount - 1;
|
||||
search.wordIndex = 1;
|
||||
next_word:
|
||||
if ((*wordNode & 0x80) != 0) {
|
||||
goto search_table;
|
||||
local_52 = param->wordCharCount;
|
||||
LAB_00011114:
|
||||
local_52 = local_52 + -1;
|
||||
local_53 = 1;
|
||||
pbVar7 = pbVar7 + 2;
|
||||
if ((*pbVar7 & 0x80) != 0) {
|
||||
goto LAB_00011124;
|
||||
}
|
||||
goto match_word;
|
||||
goto LAB_00010D44;
|
||||
}
|
||||
}
|
||||
search_table:
|
||||
search.resultCount = search.prefixCount;
|
||||
if (search.candidateCount != 0) {
|
||||
Zi8_814834AC(param, &search.remainingCandidates, &search.candidateCount, &search.inserted, ZI_WORK);
|
||||
if (options->countOnly != 0) {
|
||||
if ((search.prefixCount += search.candidateCount) >= (ziS32)options->maxCount) return options->maxCount;
|
||||
search.resultCount = search.prefixCount;
|
||||
LAB_00011124:
|
||||
local_34 = local_3C;
|
||||
if (local_54 != 0) {
|
||||
Zi8_814834AC(param, &local_50, &local_54, &local_57, ZI_WORK);
|
||||
uVar6 = local_34;
|
||||
if ((*options != 0) &&
|
||||
(local_3C = local_3C + local_54, uVar6 = local_3C,
|
||||
*(ziS32*)(options + 0xC) <= (ziS32)local_3C)) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
param->unk_0x20 = search.candidateCount;
|
||||
param->letters = search.candidateCount;
|
||||
local_34 = uVar6;
|
||||
param->count = local_54;
|
||||
param->letters = local_54;
|
||||
}
|
||||
if (param->elementCount > 9) {
|
||||
param->letters = 0;
|
||||
return 0;
|
||||
}
|
||||
{
|
||||
if (param->elementCount != 0 && options->countOnly == 0) {
|
||||
search.matchPass = 0;
|
||||
if (param->elementCount < 10) {
|
||||
if ((param->elementCount == 0) || (*options != 0)) {
|
||||
local_56 = 1;
|
||||
} else {
|
||||
search.matchPass = 1;
|
||||
local_56 = 0;
|
||||
}
|
||||
search.tableCount = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
Zi8_81483118(param, search.packedKeys.bytes);
|
||||
local_4A = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
Zi8_81483118(param, local_28.bytes);
|
||||
do {
|
||||
for (search.tableIndex = 0; search.tableIndex < search.tableCount; search.tableIndex = search.tableIndex + 1) {
|
||||
search.matches = ZI8_TRUE;
|
||||
search.entry = (ZiKoreanKeyEntry*)(((search.tableIndex << 3) + search.tableIndex) + keyTable);
|
||||
search.keyByte = 0;
|
||||
for (local_30 = 0; local_30 < (ziS32)(ziU32)local_4A; local_30 = local_30 + 1) {
|
||||
bVar1 = ZI8_TRUE;
|
||||
local_44 = iVar4 + local_30 * 9;
|
||||
local_55 = 0;
|
||||
if (1 < param->elementCount) {
|
||||
for (search.keyByte = 0;
|
||||
(ziS32)search.keyByte < (int)param->elementCount / 2;
|
||||
search.keyByte++) {
|
||||
if (search.packedKeys.bytes[search.keyByte] != search.entry->keyBytes[search.keyByte]) {
|
||||
search.matches = ZI8_FALSE;
|
||||
for (local_55 = 0;
|
||||
(ziU32)local_55 < (ziU32)((ziS32)(ziU32)param->elementCount >> 1);
|
||||
local_55 = local_55 + 1) {
|
||||
if (local_28.bytes[local_55] != *(ziU8*)(local_44 + local_55)) {
|
||||
bVar1 = ZI8_FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((search.matches && ((param->elementCount % 2) != 0)) &&
|
||||
((search.packedKeys.bytes[search.keyByte] & 0xF0) !=
|
||||
(search.entry->keyBytes[search.keyByte] & 0xF0))) {
|
||||
search.matches = ZI8_FALSE;
|
||||
if ((bVar1 && ((param->elementCount & 1) != 0)) &&
|
||||
((local_28.bytes[local_55] & 0xF0) !=
|
||||
(*(ziU8*)(local_44 + local_55) & 0xF0))) {
|
||||
bVar1 = ZI8_FALSE;
|
||||
}
|
||||
if (search.matches) {
|
||||
if (param->elementCount % 2 != 0) {
|
||||
if ((search.entry->keyBytes[search.keyByte] & 0xF) != 0) {
|
||||
if (search.matchPass == 0) goto next_entry;
|
||||
} else if (search.matchPass != 0 && options->countOnly == 0) {
|
||||
goto next_entry;
|
||||
if (bVar1) {
|
||||
bVar2 = local_56;
|
||||
if ((param->elementCount & 1) == 0) {
|
||||
if ((*(ziU8*)(local_44 + local_55) & 0xF0) == 0) {
|
||||
if (local_56 == 0) {
|
||||
goto LAB_000113B0;
|
||||
}
|
||||
bVar2 = *options;
|
||||
}
|
||||
if (bVar2 == 0) {
|
||||
goto LAB_00011478;
|
||||
}
|
||||
} else {
|
||||
if ((search.entry->keyBytes[search.keyByte] & 0xF0) != 0) {
|
||||
if (search.matchPass == 0) goto next_entry;
|
||||
} else if (search.matchPass != 0 && options->countOnly == 0) {
|
||||
goto next_entry;
|
||||
if ((*(ziU8*)(local_44 + local_55) & 0xF) != 0) {
|
||||
goto LAB_000113AC;
|
||||
}
|
||||
if (local_56 != 0) {
|
||||
bVar2 = *options;
|
||||
goto LAB_000113AC;
|
||||
}
|
||||
}
|
||||
if (search.remainingCandidates != 0) {
|
||||
--search.remainingCandidates;
|
||||
} else if (options->countOnly != 0) {
|
||||
if (++search.resultCount >= (ziS32)options->maxCount) return options->maxCount;
|
||||
LAB_000113AC:
|
||||
if (bVar2 == 0) {
|
||||
goto LAB_00011478;
|
||||
}
|
||||
LAB_000113B0:
|
||||
if (local_50 == 0) {
|
||||
if (*options == 0) {
|
||||
param->candidates[local_54] =
|
||||
(ziU16)((*(ziU8*)(local_30 * 9 + iVar4 + 7) << 8) |
|
||||
*(ziU8*)(local_30 * 9 + iVar4 + 8));
|
||||
local_54 = local_54 + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (param->maxCandidates <= bVar2) {
|
||||
uVar6 = param->letters;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
} else {
|
||||
local_34 = local_34 + 1;
|
||||
if (*(ziS32*)(options + 0xC) <= (ziS32)local_34) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
param->candidates[search.candidateCount++] =
|
||||
(ziU16)((ziU16)((ZiKoreanKeyEntry*)(((search.tableIndex << 3) + search.tableIndex) + keyTable))->characterHigh << 8 |
|
||||
((ZiKoreanKeyEntry*)(((search.tableIndex << 3) + search.tableIndex) + keyTable))->characterLow);
|
||||
if (++param->letters >= param->maxCandidates) return param->letters;
|
||||
local_50 = local_50 + -1;
|
||||
}
|
||||
}
|
||||
next_entry:
|
||||
LAB_00011478:
|
||||
;
|
||||
}
|
||||
} while (++search.matchPass < 2);
|
||||
local_56 = local_56 + 1;
|
||||
} while (local_56 < 2);
|
||||
uVar6 = local_34;
|
||||
if (*options == 0) {
|
||||
uVar6 = param->letters;
|
||||
}
|
||||
} else {
|
||||
param->letters = 0;
|
||||
uVar6 = 0;
|
||||
}
|
||||
if (options->countOnly != 0) return search.resultCount;
|
||||
return param->letters;
|
||||
}
|
||||
return 0;
|
||||
LAB_000114C4:
|
||||
return uVar6;
|
||||
}
|
||||
|
||||
@@ -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] |
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -3,70 +3,75 @@
|
||||
void Zi8Memset(ziPtr, ziU32, ziU32);
|
||||
void Zi8Memcpy(ziPtr, ziPtr, ziU32);
|
||||
ziBool Zi8IsComponent(ziWChar ZI_NEED_WORK);
|
||||
ziU32 Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziU16 Zi8GetTableCount(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziU8 Zi8GetPyPhonetic(ziWChar*, ziU8, ziWChar*, ziWChar*, ziU8*, ziWChar*, ziWChar* ZI_NEED_WORK);
|
||||
ziU8 Zi8GetBpmfPhonetic(ziWChar*, ziU8, ziWChar*, ziWChar*, ziWChar*, ziWChar* ZI_NEED_WORK);
|
||||
|
||||
ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode ZI_NEED_WORK) {
|
||||
ziU16 element;
|
||||
ziU16 phoneticCount;
|
||||
ziU16 phoneticInitial;
|
||||
ziU16 phoneticMask;
|
||||
ziU16 phoneticCode;
|
||||
ziU16 phoneticLength;
|
||||
ziWChar initial;
|
||||
ziWChar final;
|
||||
ziWChar bestInitial;
|
||||
ziWChar bestFinal;
|
||||
ziWChar previousInitial;
|
||||
ziWChar previousFinal;
|
||||
ziU8 elementCount;
|
||||
ziU8 elementIndex;
|
||||
ziU8 stroke;
|
||||
ziU8 contextMask;
|
||||
ziU8 mode;
|
||||
ziU8 savedNibbles;
|
||||
struct {
|
||||
ziWChar* phoneticInput;
|
||||
ziU8* phoneticTable;
|
||||
ziU8 strokePrefix[4];
|
||||
ziU8 maskPrefix[4];
|
||||
ziU8* componentIndex;
|
||||
ziU8* component;
|
||||
ziU8 strokes[12];
|
||||
ziU8 masks[12];
|
||||
} buffers;
|
||||
ziU8 nibbles;
|
||||
ziU8 index;
|
||||
ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode ZI_NEED_WORK)
|
||||
|
||||
{
|
||||
ziU32 lastByte;
|
||||
ziU8 nextElement;
|
||||
ziS8 valid;
|
||||
int componentTable;
|
||||
ziU32 result;
|
||||
ziU32 nibbles;
|
||||
ziU32 copyIndex;
|
||||
ziU8 mode;
|
||||
ziU8 stroke;
|
||||
ziU8 elementIndex;
|
||||
ziU8 elementCount;
|
||||
ziWChar previousFinal;
|
||||
ziWChar previousInitial;
|
||||
ziWChar bestFinal;
|
||||
ziWChar bestInitial;
|
||||
ziWChar final;
|
||||
ziWChar initial;
|
||||
ziU16 phoneticLength;
|
||||
ziU16 phoneticCode;
|
||||
ziU16 phoneticMask;
|
||||
ziU16 phoneticInitial;
|
||||
ziU16 phoneticCount;
|
||||
ziU16 element;
|
||||
ziWChar* phoneticInput;
|
||||
ziU8* phoneticTable;
|
||||
ziU8 strokePrefix [4];
|
||||
ziU8 maskPrefix [4];
|
||||
ziU8 *componentIndex;
|
||||
ziU8 *component;
|
||||
ziU8 strokes [12];
|
||||
ziU8 masks [12];
|
||||
|
||||
stroke = 0;
|
||||
contextMask = 0x20;
|
||||
Zi8Memset(match,0,0x1ee);
|
||||
nibbles = 0;
|
||||
elementIndex = 0;
|
||||
elementCount = request->elementCount;
|
||||
while (elementCount != 0) {
|
||||
if (request->elements[elementCount - 1] != 0xEF09) break;
|
||||
elementCount--;
|
||||
elementCount = elementCount - 1;
|
||||
}
|
||||
match->count = elementCount;
|
||||
for (index = 0; index < elementCount; index++) {
|
||||
if (request->elements[index] != 0xEF00) {
|
||||
for (nextElement = 0; nextElement < elementCount; nextElement = nextElement + 1) {
|
||||
if (request->elements[nextElement] != 0xEF00) {
|
||||
match->count = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
nextElement = elementIndex;
|
||||
if (elementCount != 0) {
|
||||
match->comp = element = request->elements[0];
|
||||
if (Zi8IsComponent(element,__zi8_work_data) != 0) {
|
||||
elementIndex++;
|
||||
buffers.component = (ziU8*)Zi8GetTableAddress(1,2,__zi8_work_data);
|
||||
buffers.componentIndex = (ziU8*)Zi8GetTableAddress(1,6,__zi8_work_data);
|
||||
buffers.componentIndex += (element - 0xef10) * 2;
|
||||
match->field22 = (((ziU16)buffers.componentIndex[1] & 0x3f) << 8) + *buffers.componentIndex;
|
||||
buffers.component += (ziU32)match->field22 * 8;
|
||||
switch(*buffers.component & 0xf) {
|
||||
element = request->elements[0];
|
||||
match->comp = element;
|
||||
valid = Zi8IsComponent(element,__zi8_work_data);
|
||||
if (valid != '\0') {
|
||||
elementIndex = 1;
|
||||
component = (ziU8*)Zi8GetTableAddress(1,2,__zi8_work_data);
|
||||
componentTable = (ziU32)Zi8GetTableAddress(1,6,__zi8_work_data);
|
||||
componentIndex = (ziU8 *)(componentTable + (element - 0xef10) * 2);
|
||||
match->field22 = (componentIndex[1] & 0x3f) * 0x100 + (ziU16)*componentIndex;
|
||||
component += (ziU32)match->field22 * 8;
|
||||
switch(*component & 0xf) {
|
||||
case 0:
|
||||
case 9:
|
||||
case 10:
|
||||
@@ -97,149 +102,197 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
case 8:
|
||||
match->comp = 0xEF00 + 2;
|
||||
}
|
||||
for (index = 0; index < (buffers.component[5] >> 1) + 1; index++) {
|
||||
if (index < 4) {
|
||||
match->arrD[index] = buffers.component[index];
|
||||
match->arr1[index] = 0xff;
|
||||
for (copyIndex = 0; (copyIndex & 0xff) < ((int)(ziU32)component[5] >> 1) + 1U; copyIndex = copyIndex + 1) {
|
||||
if ((copyIndex & 0xff) < 4) {
|
||||
match->arrD[copyIndex & 0xFF] = component[copyIndex & 0xff];
|
||||
match->arr1[copyIndex & 0xFF] = 0xff;
|
||||
}
|
||||
}
|
||||
if ((index != 0) && ((buffers.component[5] & 1) == 0)) {
|
||||
index--;
|
||||
match->arrD[index] &= 0xf0;
|
||||
match->arr1[index] &= 0xf0;
|
||||
if (((copyIndex & 0xff) != 0) && ((component[5] & 1) == 0)) {
|
||||
lastByte = copyIndex - 1 & 0xff;
|
||||
match->arrD[lastByte] = match->arrD[lastByte] & 0xf0;
|
||||
copyIndex = copyIndex - 1 & 0xff;
|
||||
match->arr1[copyIndex] = match->arr1[copyIndex] & 0xf0;
|
||||
}
|
||||
nibbles = (ziU8)(buffers.component[5] + 1);
|
||||
nibbles = (ziU8)(component[5] + 1);
|
||||
nextElement = 1;
|
||||
if (8 < nibbles) {
|
||||
nibbles++;
|
||||
nibbles = (ziU8)(component[5] + 2);
|
||||
nextElement = elementIndex;
|
||||
}
|
||||
}
|
||||
}
|
||||
match->arr1[0] &= 0xf;
|
||||
match->arrD[0] &= 0xf;
|
||||
elementIndex = nextElement;
|
||||
match->arr1[0] = match->arr1[0] & 0xf;
|
||||
match->arrD[0] = match->arrD[0] & 0xf;
|
||||
if (skipMode == '\0') {
|
||||
mode = 0;
|
||||
if ((request->subLanguage & 0x80) != 0 || (request->subLanguage & 0x40) != 0) {
|
||||
if (((request->subLanguage & 0x80) == 0) && ((request->subLanguage & 0x40) == 0)) {
|
||||
if ((request->subLanguage & 8) == 0) {
|
||||
if (((request->subLanguage & 0x20) != 0) || ((request->subLanguage & 0x10) != 0)) {
|
||||
mode = 2;
|
||||
}
|
||||
}
|
||||
else {
|
||||
mode = 4;
|
||||
}
|
||||
}
|
||||
else {
|
||||
mode = 1;
|
||||
} else if ((request->subLanguage & 8) != 0) {
|
||||
mode = 4;
|
||||
} else if ((request->subLanguage & 0x20) != 0 || (request->subLanguage & 0x10) != 0) {
|
||||
mode = 2;
|
||||
}
|
||||
if (mode == 0) {
|
||||
mode = request->subLanguage;
|
||||
}
|
||||
switch (mode) {
|
||||
case 1:
|
||||
case 2:
|
||||
case 4:
|
||||
match->arr1[0] |= (ziU8)(mode << 4);
|
||||
match->arrD[0] |= (ziU8)(mode << 4);
|
||||
break;
|
||||
if (mode != 3) {
|
||||
if (mode < 3) {
|
||||
if (mode != 0) {
|
||||
setMode:
|
||||
match->arr1[0] = match->arr1[0] | mode << 4;
|
||||
match->arrD[0] = match->arrD[0] | mode << 4;
|
||||
}
|
||||
}
|
||||
else if (mode < 5) goto setMode;
|
||||
}
|
||||
}
|
||||
if (nibbles == 0) {
|
||||
nibbles = 1;
|
||||
}
|
||||
if (((request->getMode == '\0') || (request->getMode == '\x10')) ||
|
||||
(request->getMode == '\x05')) {
|
||||
Zi8Memcpy(buffers.masks,match->arr1,0xc);
|
||||
Zi8Memcpy(buffers.strokes,match->arrD,0xc);
|
||||
(request->getMode == '\x05')) {
|
||||
Zi8Memcpy(masks,match->arr1,0xc);
|
||||
Zi8Memcpy(strokes,match->arrD,0xc);
|
||||
do {
|
||||
while (elementIndex < elementCount) {
|
||||
element = request->elements[elementIndex++];
|
||||
switch (element) {
|
||||
case 0xef02: stroke = 0; break;
|
||||
case 0xef04: stroke = 1; break;
|
||||
case 0xef01: stroke = 2; break;
|
||||
case 0xef07: stroke = 3; break;
|
||||
case 0xef06: stroke = 4; break;
|
||||
case 0xef03: stroke = 5; break;
|
||||
case 0xef05: stroke = 6; break;
|
||||
case 0xef08: stroke = 7; break;
|
||||
case 0xef0b: stroke = 8; break;
|
||||
case 0xef0a: stroke = 4; break;
|
||||
case 0xf360: stroke = 0xff; break;
|
||||
default: stroke = 0; break;
|
||||
nextElement = elementIndex + 1;
|
||||
element = request->elements[elementIndex];
|
||||
if (element == 0xef07) {
|
||||
stroke = 3;
|
||||
}
|
||||
else if (element < 0xef07) {
|
||||
if (element == 0xef03) {
|
||||
stroke = 5;
|
||||
}
|
||||
else if (element < 0xef03) {
|
||||
if (element == 0xef01) {
|
||||
stroke = 2;
|
||||
}
|
||||
else {
|
||||
if (element < 0xef01) goto wildcard;
|
||||
stroke = 0;
|
||||
}
|
||||
}
|
||||
else if (element == 0xef05) {
|
||||
stroke = 6;
|
||||
}
|
||||
else if (element < 0xef05) {
|
||||
stroke = 1;
|
||||
}
|
||||
else {
|
||||
stroke = 4;
|
||||
}
|
||||
}
|
||||
else if (element == 0xef0b) {
|
||||
stroke = 8;
|
||||
}
|
||||
else if (element < 0xef0b) {
|
||||
if (element == 0xef09) {
|
||||
wildcard:
|
||||
stroke = 0;
|
||||
}
|
||||
else if (element < 0xef09) {
|
||||
stroke = 7;
|
||||
}
|
||||
else {
|
||||
stroke = 4;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (element != 0xf360) goto wildcard;
|
||||
stroke = 0xff;
|
||||
}
|
||||
elementIndex = nextElement;
|
||||
if (stroke == 0xff) break;
|
||||
if (0x17 < nibbles) {
|
||||
match->length = 0x18;
|
||||
return 0;
|
||||
result = 0;
|
||||
goto done;
|
||||
}
|
||||
if (nibbles == 8) {
|
||||
nibbles++;
|
||||
nibbles = 9;
|
||||
}
|
||||
if ((nibbles & 1) != 0) {
|
||||
buffers.strokes[nibbles >> 1] |= stroke;
|
||||
if ((nibbles & 1) == 0) {
|
||||
strokes[(int)(ziU32)nibbles >> 1] = strokes[(int)(ziU32)nibbles >> 1] | stroke << 4;
|
||||
if (element == 0xef0b) {
|
||||
buffers.masks[nibbles >> 1] |= 8;
|
||||
masks[(int)(ziU32)nibbles >> 1] = masks[(int)(ziU32)nibbles >> 1] | 0x80;
|
||||
}
|
||||
else if (element == 0xef0a) {
|
||||
buffers.masks[nibbles >> 1] |= 4;
|
||||
masks[(int)(ziU32)nibbles >> 1] = masks[(int)(ziU32)nibbles >> 1] | 0x40;
|
||||
}
|
||||
else if (element != 0xef00) {
|
||||
buffers.masks[nibbles >> 1] |= 7;
|
||||
}
|
||||
} else {
|
||||
buffers.strokes[nibbles >> 1] |= stroke << 4;
|
||||
if (element == 0xef0b) {
|
||||
buffers.masks[nibbles >> 1] |= 0x80;
|
||||
}
|
||||
else if (element == 0xef0a) {
|
||||
buffers.masks[nibbles >> 1] |= 0x40;
|
||||
}
|
||||
else if (element != 0xef00) {
|
||||
buffers.masks[nibbles >> 1] |= 0x70;
|
||||
masks[(int)(ziU32)nibbles >> 1] = masks[(int)(ziU32)nibbles >> 1] | 0x70;
|
||||
}
|
||||
}
|
||||
nibbles++;
|
||||
else {
|
||||
strokes[(int)(ziU32)nibbles >> 1] = strokes[(int)(ziU32)nibbles >> 1] | stroke;
|
||||
if (element == 0xef0b) {
|
||||
masks[(int)(ziU32)nibbles >> 1] = masks[(int)(ziU32)nibbles >> 1] | 8;
|
||||
}
|
||||
else if (element == 0xef0a) {
|
||||
masks[(int)(ziU32)nibbles >> 1] = masks[(int)(ziU32)nibbles >> 1] | 4;
|
||||
}
|
||||
else if (element != 0xef00) {
|
||||
masks[(int)(ziU32)nibbles >> 1] = masks[(int)(ziU32)nibbles >> 1] | 7;
|
||||
}
|
||||
}
|
||||
nibbles = nibbles + 1;
|
||||
}
|
||||
savedNibbles = nibbles;
|
||||
for (index = 0; index < 4; index++) {
|
||||
buffers.maskPrefix[index] = buffers.masks[index];
|
||||
buffers.strokePrefix[index] = buffers.strokes[index];
|
||||
for (nextElement = 0; nextElement < 4; nextElement = nextElement + 1) {
|
||||
maskPrefix[nextElement] = masks[nextElement];
|
||||
strokePrefix[nextElement] = strokes[nextElement];
|
||||
}
|
||||
if ((1 < nibbles) && (nibbles < 8)) {
|
||||
index = nibbles >> 1;
|
||||
if ((nibbles & 1) != 0) {
|
||||
buffers.maskPrefix[index] = buffers.maskPrefix[index] | 0xf;
|
||||
buffers.strokePrefix[index] = buffers.strokePrefix[index] | 0xf;
|
||||
} else {
|
||||
buffers.maskPrefix[index] = buffers.maskPrefix[index] | 0xf0;
|
||||
buffers.strokePrefix[index] = buffers.strokePrefix[index] | 0xf0;
|
||||
componentTable = (int)(ziU32)nibbles >> 1;
|
||||
if ((nibbles & 1) == 0) {
|
||||
maskPrefix[componentTable] = maskPrefix[componentTable] | 0xf0;
|
||||
strokePrefix[componentTable] = strokePrefix[componentTable] | 0xf0;
|
||||
}
|
||||
else {
|
||||
maskPrefix[componentTable] = maskPrefix[componentTable] | 0xf;
|
||||
strokePrefix[componentTable] = strokePrefix[componentTable] | 0xf;
|
||||
}
|
||||
}
|
||||
if (match->nSeg == 0) {
|
||||
Zi8Memcpy(match->arr1,buffers.masks,0xc);
|
||||
Zi8Memcpy(match->arrD,buffers.strokes,0xc);
|
||||
Zi8Memcpy(match->arr19,buffers.maskPrefix,4);
|
||||
Zi8Memcpy(match->arr1D,buffers.strokePrefix,4);
|
||||
match->length = savedNibbles;
|
||||
Zi8Memcpy(match->arr1,masks,0xc);
|
||||
Zi8Memcpy(match->arrD,strokes,0xc);
|
||||
Zi8Memcpy(match->arr19,maskPrefix,4);
|
||||
Zi8Memcpy(match->arr1D,strokePrefix,4);
|
||||
match->length = nibbles;
|
||||
}
|
||||
Zi8Memcpy((ziU8 (*)[12])match->segs1 + match->nSeg,buffers.masks,0xc);
|
||||
Zi8Memcpy((ziU8 (*)[12])match->segsD + match->nSeg,buffers.strokes,0xc);
|
||||
match->nSeg++;
|
||||
if (stroke != 0xff || elementIndex >= elementCount || match->nSeg >= 0x10) goto complete;
|
||||
Zi8Memset(buffers.masks,0,0xc);
|
||||
Zi8Memset(buffers.strokes,0,0xc);
|
||||
buffers.masks[0] = match->arr1[0] & 0xf0;
|
||||
buffers.strokes[0] = match->arrD[0] & 0xf0;
|
||||
Zi8Memcpy(match->segs1 + match->nSeg * 12,masks,0xc);
|
||||
Zi8Memcpy(match->segsD + match->nSeg * 12,strokes,0xc);
|
||||
match->nSeg = match->nSeg + 1;
|
||||
if (((stroke != 0xff) || (elementCount <= elementIndex)) || (0xf < match->nSeg)) goto complete;
|
||||
Zi8Memset(masks,0,0xc);
|
||||
Zi8Memset(strokes,0,0xc);
|
||||
masks[0] = match->arr1[0] & 0xf0;
|
||||
strokes[0] = match->arrD[0] & 0xf0;
|
||||
nibbles = 1;
|
||||
} while (1);
|
||||
}
|
||||
match->length = nibbles;
|
||||
if (elementCount != 0) {
|
||||
if ((request->getMode == '\x01') || (request->getMode == '\f')) {
|
||||
buffers.phoneticTable = (ziU8*)Zi8GetTableAddress(1,3,__zi8_work_data);
|
||||
phoneticTable = (ziU8*)Zi8GetTableAddress(1,3,__zi8_work_data);
|
||||
phoneticCount = Zi8GetTableCount(1,3,__zi8_work_data);
|
||||
}
|
||||
else {
|
||||
buffers.phoneticTable = (ziU8*)Zi8GetTableAddress(1,4,__zi8_work_data);
|
||||
phoneticTable = (ziU8*)Zi8GetTableAddress(1,4,__zi8_work_data);
|
||||
phoneticCount = Zi8GetTableCount(1,4,__zi8_work_data);
|
||||
}
|
||||
if ((request->getMode == '\x01') || (request->getMode == '\f')) {
|
||||
match->nCand = Zi8GetPyPhonetic(request->elements,elementCount,match->phon,match->phon2,
|
||||
&request->count,&match->first,&match->first2,__zi8_work_data);
|
||||
nibbles = Zi8GetPyPhonetic(request->elements,elementCount,match->phon,match->phon2,
|
||||
&request->count,&match->first,&match->first2,__zi8_work_data);
|
||||
match->nCand = nibbles;
|
||||
}
|
||||
else {
|
||||
initial = 0;
|
||||
@@ -248,29 +301,18 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
bestFinal = 0;
|
||||
previousInitial = 0;
|
||||
previousFinal = 0;
|
||||
buffers.phoneticInput = request->elements;
|
||||
phoneticInput = request->elements;
|
||||
match->nCand = 0;
|
||||
request->count = request->elementCount;
|
||||
phoneticLength = 1;
|
||||
for (index = 0; index < elementCount; index++) {
|
||||
stroke = Zi8GetBpmfPhonetic(buffers.phoneticInput,phoneticLength,&initial,&final,&bestInitial,&bestFinal,
|
||||
__zi8_work_data);
|
||||
if (stroke != 0) {
|
||||
previousInitial = bestInitial;
|
||||
previousFinal = bestFinal;
|
||||
savePhonetic:
|
||||
match->phon[match->nCand] = initial;
|
||||
match->phon2[match->nCand] = final;
|
||||
if (match->nCand == 0) {
|
||||
match->first = bestInitial;
|
||||
match->first2 = bestFinal;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if ((index == 0) ||
|
||||
((((1 < phoneticLength && (buffers.phoneticInput[phoneticLength - 2] == 0xF360)) &&
|
||||
(buffers.phoneticInput[phoneticLength - 1] == 0xF360)) ||
|
||||
(++match->nCand == 0x10)))) {
|
||||
for (nibbles = 0; nibbles < elementCount; nibbles = nibbles + 1) {
|
||||
valid = Zi8GetBpmfPhonetic(phoneticInput,phoneticLength & 0xff,&initial,&final,&bestInitial,&bestFinal,
|
||||
__zi8_work_data);
|
||||
if (valid == '\0') {
|
||||
if ((nibbles == 0) ||
|
||||
((((1 < phoneticLength && (phoneticInput[phoneticLength - 2] == 0xF360)) &&
|
||||
(phoneticInput[phoneticLength - 1] == 0xF360)) ||
|
||||
(nextElement = match->nCand, match->nCand = nextElement + 1, (ziU8)(nextElement + 1) == 0x10)))) {
|
||||
initial = 0xffff;
|
||||
final = 0xffff;
|
||||
bestInitial = 0xffff;
|
||||
@@ -278,8 +320,8 @@ savePhonetic:
|
||||
match->nCand = 0;
|
||||
break;
|
||||
}
|
||||
if (buffers.phoneticInput[phoneticLength - 1] == 0xF360) {
|
||||
match->nCand--;
|
||||
if (phoneticInput[phoneticLength - 1] == 0xF360) {
|
||||
match->nCand = match->nCand - 1;
|
||||
bestInitial = previousInitial;
|
||||
bestFinal = previousFinal;
|
||||
final = bestFinal;
|
||||
@@ -287,13 +329,24 @@ savePhonetic:
|
||||
goto savePhonetic;
|
||||
}
|
||||
if (match->nCand == 1) {
|
||||
request->count = phoneticLength - 1;
|
||||
request->count = (ziS8)phoneticLength + -1;
|
||||
}
|
||||
buffers.phoneticInput = buffers.phoneticInput + phoneticLength - 1;
|
||||
phoneticInput = phoneticInput + phoneticLength - 1;
|
||||
phoneticLength = 0;
|
||||
index--;
|
||||
nibbles = nibbles - 1;
|
||||
}
|
||||
phoneticLength++;
|
||||
else {
|
||||
savePhonetic:
|
||||
match->phon[match->nCand] = initial;
|
||||
match->phon2[match->nCand] = final;
|
||||
previousFinal = bestFinal;
|
||||
previousInitial = bestInitial;
|
||||
if (match->nCand == 0) {
|
||||
match->first = bestInitial;
|
||||
match->first2 = bestFinal;
|
||||
}
|
||||
}
|
||||
phoneticLength = phoneticLength + 1;
|
||||
}
|
||||
if (elementCount != 0) {
|
||||
match->phon[match->nCand] = initial;
|
||||
@@ -302,28 +355,32 @@ savePhonetic:
|
||||
match->first = bestInitial;
|
||||
match->first2 = bestFinal;
|
||||
}
|
||||
match->nCand++;
|
||||
match->nCand = match->nCand + 1;
|
||||
}
|
||||
}
|
||||
if (((request->context & contextMask) != 0) &&
|
||||
((1 < match->nCand || (request->count != elementCount)))) {
|
||||
if (((request->context & 0x20) != 0) &&
|
||||
((1 < match->nCand || (request->count != elementCount)))) {
|
||||
match->phon[0] = 0xFFFF;
|
||||
match->phon2[0] = 0xFFFF;
|
||||
match->nCand = 0;
|
||||
}
|
||||
if (((request->getOptions & 0x20) == 0) &&
|
||||
((match->phon[0] != 0xFFFF || (match->phon2[0] != 0xFFFF)))) {
|
||||
if (match->nCand > 1) {
|
||||
phoneticInitial = match->phon[match->nCand - 1] & 0xfff8;
|
||||
phoneticMask = match->phon2[match->nCand - 1] & 0xfff8;
|
||||
((match->phon[0] != 0xFFFF || (match->phon2[0] != 0xFFFF)))) {
|
||||
if (match->nCand < 2) {
|
||||
phoneticInitial = match->phon[0];
|
||||
phoneticMask = match->phon2[0];
|
||||
}
|
||||
else {
|
||||
phoneticInitial = match->phon[0] & 0xfff8;
|
||||
phoneticMask = match->phon2[0] & 0xfff8;
|
||||
phoneticInitial = match->phon[match->nCand - 1];
|
||||
phoneticMask = match->phon2[match->nCand - 1];
|
||||
}
|
||||
for (phoneticLength = 0; phoneticLength < phoneticCount; phoneticLength++) {
|
||||
phoneticCode = buffers.phoneticTable[phoneticLength * 2] | ((ziU16)buffers.phoneticTable[phoneticLength * 2 + 1] << 8);
|
||||
if (phoneticMask == (phoneticCode & phoneticInitial)) break;
|
||||
phoneticInitial = phoneticInitial & 0xfff8;
|
||||
phoneticMask = phoneticMask & 0xfff8;
|
||||
phoneticLength = 0;
|
||||
while ((phoneticLength < phoneticCount &&
|
||||
(phoneticCode = (phoneticTable[phoneticLength * 2 + 1] << 8) | phoneticTable[phoneticLength * 2],
|
||||
phoneticMask != (phoneticCode & phoneticInitial)))) {
|
||||
phoneticLength = phoneticLength + 1;
|
||||
}
|
||||
if (phoneticLength == phoneticCount) {
|
||||
match->phon[0] = 0xFFFF;
|
||||
@@ -331,6 +388,10 @@ savePhonetic:
|
||||
}
|
||||
}
|
||||
}
|
||||
result = 1;
|
||||
done:
|
||||
return result;
|
||||
complete:
|
||||
return 1;
|
||||
result = 1;
|
||||
goto done;
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include <revolution/fa.h>
|
||||
#include <revolution/os.h>
|
||||
|
||||
char* __FAVersion[2] = {"<< RVL_SDK - FA \trelease build: Apr 20 2010 11:20:14 (0x4199_60831) >>", NULL};
|
||||
s32 FAInInitializing;
|
||||
char* __FAVersion = "<< RVL_SDK - FA \trelease build: Apr 20 2010 11:20:14 (0x4199_60831) >>";
|
||||
s32 FAFileSysInitialized;
|
||||
s32 FAInInitializing;
|
||||
extern s32 FADiskInitialized;
|
||||
extern s32 pdm_init_diskmanager(s32 config, void* parameter);
|
||||
extern s32 pfstub_init_prfile2(s32 config, void* parameter);
|
||||
@@ -31,6 +31,6 @@ FAError FAInit(int flag) {
|
||||
}
|
||||
}
|
||||
FAInInitializing = 0;
|
||||
OSRegisterVersion(__FAVersion[0]);
|
||||
OSRegisterVersion(__FAVersion);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
@@ -169,14 +169,13 @@ static s32 fa_nanddrv_ParseCreateNANDFile(NAND_DISK_INFO* info) {
|
||||
if (error == 0 || error == -6 || error == -1) {
|
||||
error = NANDChangeDir(name);
|
||||
if (error != 0) { return error; }
|
||||
} else {
|
||||
return error;
|
||||
path++;
|
||||
pf_memset(name, 0, 16);
|
||||
next = name;
|
||||
length = 0;
|
||||
break;
|
||||
}
|
||||
path++;
|
||||
pf_memset(name, 0, 16);
|
||||
next = name;
|
||||
length = 0;
|
||||
break;
|
||||
return error;
|
||||
case 0:
|
||||
if (length > 12) { return -20; }
|
||||
error = NANDCreate(name, 0x30, 0);
|
||||
@@ -404,8 +403,8 @@ s32 fa_nanddrv_init_drv_tbl(PDM_DISK_TBL* table, u32 extension) {
|
||||
return 0;
|
||||
}
|
||||
s32 fa_nanddrv_NotifyNANDFile(const char* path, u32 size) {
|
||||
NAND_DISK_INFO* info;
|
||||
u16 index;
|
||||
|
||||
if (pf_strlen(path) >= 76) { return -20; }
|
||||
if (Nanddisk_Internal_Info_Init == 0) {
|
||||
pf_memset(nanddisk_info, 0, sizeof(nanddisk_info));
|
||||
@@ -417,9 +416,10 @@ s32 fa_nanddrv_NotifyNANDFile(const char* path, u32 size) {
|
||||
if (fa_nanad_semid == 0) { return -21; }
|
||||
}
|
||||
for (index = 0; index < 23; index++) {
|
||||
if (pf_strcmp(nanddisk_info[index].path, path) == 0) { return 0; }
|
||||
info = &nanddisk_info[index];
|
||||
if (pf_strcmp(info->path, path) == 0) { return 0; }
|
||||
if (nanddisk_info[index].disk == 0) {
|
||||
pf_strcpy(nanddisk_info[index].path, path);
|
||||
pf_strcpy(info->path, path);
|
||||
nanddisk_info[index].file_size = size;
|
||||
break;
|
||||
}
|
||||
@@ -481,15 +481,15 @@ static s32 fa_nanddrv_physical_read(u32 count, u8* buf, u32 block, u32 bps, u32*
|
||||
return error;
|
||||
}
|
||||
static s32 fa_nanddrv_physical_write(u32 count, const u8* buf, u32 block, u32 bps, u32* success, PDM_DISK* disk) {
|
||||
u32 file_size;
|
||||
u32 wanted;
|
||||
u32 remaining;
|
||||
u32 wanted;
|
||||
u32 file_size;
|
||||
NAND_DISK_INFO* info = 0;
|
||||
u16 index;
|
||||
u32 offset;
|
||||
u32 position;
|
||||
s32 error;
|
||||
u8 work[512] __attribute__((aligned(32)));
|
||||
NAND_DISK_INFO* info = 0;
|
||||
for (index = 0; index < 23; index++) {
|
||||
if (nanddisk_info[index].disk == disk) { info = &nanddisk_info[index]; break; }
|
||||
}
|
||||
|
||||
@@ -6,11 +6,11 @@ extern pf_s32 pdm_part_is_attached_partition(PDM_PARTITION* partition);
|
||||
|
||||
pf_u8 pfd_get_media_drv_char(PDM_DISK* disk, pf_s8* drives, pf_u32 capacity) {
|
||||
pf_u32 partition_index;
|
||||
PDM_PARTITION* partition;
|
||||
PF_VOLUME* volume;
|
||||
pf_u8 count;
|
||||
pf_s8* next_drive;
|
||||
PDM_PARTITION* partition;
|
||||
pf_u16 volume_index;
|
||||
PF_VOLUME* volume;
|
||||
pf_u32 volume_index;
|
||||
if (drives == NULL || capacity == 0) {
|
||||
return 0;
|
||||
}
|
||||
@@ -20,7 +20,8 @@ pf_u8 pfd_get_media_drv_char(PDM_DISK* disk, pf_s8* drives, pf_u32 capacity) {
|
||||
for (partition_index = 0; partition_index < 26; partition_index++, partition++) {
|
||||
if (pdm_part_is_attached_partition(partition) && partition->p_disk == disk) {
|
||||
volume = pf_vol_set.volumes;
|
||||
for (volume_index = 0; volume_index < 26; volume_index++, volume++) {
|
||||
for (volume_index = 0; volume_index < 26; volume++) {
|
||||
volume_index++;
|
||||
if (volume->p_part == partition) {
|
||||
count++;
|
||||
*next_drive++ = volume->drv_char;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#include <stddef.h>
|
||||
#include <revolution/fa/types.h>
|
||||
#include <revolution/os.h>
|
||||
#include <revolution/sdi.h>
|
||||
@@ -33,8 +32,8 @@ PFD_SDDRV_INFO g_pfd_sddrv_info;
|
||||
PFD_SDDEV_STORAGE g_pfd_sddev;
|
||||
u8 g_pfd_sddrv_buf[0x200];
|
||||
|
||||
static FAInsertCallback g_attach_func = 0;
|
||||
static FAEjectCallback g_detach_func = 0;
|
||||
static FAInsertCallback g_attach_func;
|
||||
static FAEjectCallback g_detach_func;
|
||||
u32 g_event;
|
||||
|
||||
extern u8 pfd_get_media_drv_char(FADisk*, s8*, u32);
|
||||
@@ -136,17 +135,17 @@ typedef union PFD_SDDRV_U16_BYTES {
|
||||
u8 bytes[2];
|
||||
} PFD_SDDRV_U16_BYTES;
|
||||
|
||||
#define pfd_sddrv_store_le16(buffer, field, offset, value) \
|
||||
#define pfd_sddrv_store_le16(field, value) \
|
||||
do { \
|
||||
if (((u32)(field) & 1) != 0) { \
|
||||
(field)[0] = (u8)(value); \
|
||||
(field)[1] = (u8)((value) >> 8); \
|
||||
} else { \
|
||||
((u16*)(buffer))[(offset) / 2 + (offset) % 2] = (((value) & 0xff) << 8) | (((value) & 0xff00) >> 8); \
|
||||
*(u16*)(field) = (((value) & 0xff) << 8) | (((value) & 0xff00) >> 8); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define pfd_sddrv_store_le32(buffer, field, offset, value) \
|
||||
#define pfd_sddrv_store_le32(field, value) \
|
||||
do { \
|
||||
if (((u32)(field) & 3) != 0) { \
|
||||
(field)[0] = (u8)(value); \
|
||||
@@ -154,7 +153,7 @@ typedef union PFD_SDDRV_U16_BYTES {
|
||||
(field)[2] = (u8)((value) >> 16); \
|
||||
(field)[3] = (u8)((value) >> 24); \
|
||||
} else { \
|
||||
((u32*)(buffer))[(offset) / 4 + (offset) % 4] = (((value) & 0xff) << 24 | ((value) & 0xff00) << 8) | \
|
||||
*(u32*)(field) = (((value) & 0xff) << 24 | ((value) & 0xff00) << 8) | \
|
||||
(((value) & 0xff000000) >> 24 | ((value) & 0xff0000) >> 8); \
|
||||
} \
|
||||
} while (0)
|
||||
@@ -243,39 +242,23 @@ static inline void clear_mount_flag(void) {
|
||||
g_pfd_sddrv_info.flags &= ~2;
|
||||
}
|
||||
|
||||
static inline u32 pfd_sddrv_flags(const PFD_SDDRV_INFO* info) {
|
||||
return info->flags;
|
||||
}
|
||||
|
||||
static inline SDDev* pfd_sddrv_device(const PFD_SDDRV_INFO* info) {
|
||||
return info->device;
|
||||
}
|
||||
|
||||
static inline FADisk* pfd_sddrv_disk(const PFD_SDDRV_INFO* info) {
|
||||
return info->disk;
|
||||
}
|
||||
|
||||
static inline s8 pfd_sddrv_drive(const PFD_SDDRV_INFO* info) {
|
||||
return info->drive;
|
||||
}
|
||||
|
||||
s32 pfd_st_inter_callback(s32 status, void* data) {
|
||||
s32 result;
|
||||
|
||||
if ((status & 1) != 1) {
|
||||
return 0;
|
||||
}
|
||||
if (pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
|
||||
if (g_pfd_sddrv_info.device != 0) {
|
||||
g_event = 2;
|
||||
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_removal_callback, &g_event);
|
||||
if (result != 0) {
|
||||
OSReport("ERR:Failed to regist intr handler. pfd_st_inter_callback()\n");
|
||||
}
|
||||
}
|
||||
if (pfd_sddrv_disk(&g_pfd_sddrv_info) != 0) {
|
||||
if (g_pfd_sddrv_info.disk != 0) {
|
||||
update_media_drive();
|
||||
pdm_disk_notify_media_insert(g_pfd_sddrv_info.disk);
|
||||
if (pfd_sddrv_drive(&g_pfd_sddrv_info) != 0 && g_attach_func != 0) {
|
||||
if (g_pfd_sddrv_info.drive != 0 && g_attach_func != 0) {
|
||||
g_attach_func(g_pfd_sddrv_info.drive);
|
||||
}
|
||||
}
|
||||
@@ -291,17 +274,17 @@ s32 pfd_st_removal_callback(s32 status, void* data) {
|
||||
return 0;
|
||||
}
|
||||
g_pfd_sddrv_info.media_inserted = 0;
|
||||
if (pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
|
||||
if (g_pfd_sddrv_info.device != 0) {
|
||||
g_event = 1;
|
||||
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_inter_callback, &g_event);
|
||||
if (result != 0) {
|
||||
OSReport("ERR:Failed to regist intr handler. pfd_st_removal_callback()\n");
|
||||
}
|
||||
}
|
||||
if (pfd_sddrv_disk(&g_pfd_sddrv_info) != 0) {
|
||||
if (g_pfd_sddrv_info.disk != 0) {
|
||||
update_media_drive();
|
||||
pdm_disk_notify_media_eject(g_pfd_sddrv_info.disk);
|
||||
if (pfd_sddrv_drive(&g_pfd_sddrv_info) != 0 && g_detach_func != 0) {
|
||||
if (g_pfd_sddrv_info.drive != 0 && g_detach_func != 0) {
|
||||
g_detach_func(g_pfd_sddrv_info.drive);
|
||||
}
|
||||
}
|
||||
@@ -316,7 +299,7 @@ s32 pfd_sddrv_init(FADisk* disk) {
|
||||
if (disk == 0) {
|
||||
return -30;
|
||||
}
|
||||
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 1) != 0) {
|
||||
if ((g_pfd_sddrv_info.flags & 1) != 0) {
|
||||
OSReport("INFO SD Card driver is already initialize. pfd_sddrv_init()\n");
|
||||
if (disk == g_pfd_sddrv_info.disk) {
|
||||
return 0;
|
||||
@@ -473,7 +456,7 @@ s32 pfd_sddrv_unmount(FADisk* disk) {
|
||||
if (disk == 0) {
|
||||
return -30;
|
||||
}
|
||||
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 2) != 0) {
|
||||
if ((g_pfd_sddrv_info.flags & 2) != 0) {
|
||||
clear_mount_flag();
|
||||
}
|
||||
return 0;
|
||||
@@ -485,7 +468,7 @@ s32 pfd_sddrv_finalize(FADisk* disk) {
|
||||
if (disk == 0) {
|
||||
return -30;
|
||||
}
|
||||
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 2) != 0) {
|
||||
if ((g_pfd_sddrv_info.flags & 2) == 2) {
|
||||
clear_mount_flag();
|
||||
}
|
||||
if ((g_pfd_sddrv_info.flags & 1) != 0) {
|
||||
@@ -501,6 +484,7 @@ s32 pfd_sddrv_finalize(FADisk* disk) {
|
||||
}
|
||||
g_pfd_sddrv_info.flags = g_pfd_sddrv_info.flags & 0xfffffffe;
|
||||
g_pfd_sddrv_info.media_inserted = 0;
|
||||
g_pfd_sddrv_info.media_ejected = 0;
|
||||
g_pfd_sddrv_info.disk = 0;
|
||||
g_pfd_sddrv_info.drive = 0;
|
||||
return 0;
|
||||
@@ -591,7 +575,7 @@ s32 pfd_sddrv_is_media_insert(void) {
|
||||
|
||||
static s32 pfd_sddrv_physical_read(u32 blocks, u8* buffer, u32 sector, u32 bytes_per_sector, u32* blocks_read) {
|
||||
s32 result;
|
||||
s32 current_sector;
|
||||
u32 current_sector;
|
||||
u32 completed;
|
||||
u8* current_buffer;
|
||||
if ((g_pfd_sddrv_info.flags & 2) == 0) {
|
||||
@@ -656,7 +640,7 @@ static s32 pfd_sddrv_physical_read(u32 blocks, u8* buffer, u32 sector, u32 bytes
|
||||
|
||||
s32 pfd_sddrv_physical_write(u32 blocks, u8* buffer, u32 sector, u32 bytes_per_sector, u32* blocks_written) {
|
||||
s32 result;
|
||||
s32 current_sector;
|
||||
u32 current_sector;
|
||||
u32 completed;
|
||||
u8* current_buffer;
|
||||
if ((g_pfd_sddrv_info.flags & 2) == 0) {
|
||||
@@ -746,10 +730,15 @@ s32 pfd_sddrv_get_total_sectors(u32* sectors, u16* bytes_per_sector) {
|
||||
c_size = (((csd[2] & 3) << 10 | csd[1] >> 22) + 1);
|
||||
cluster_blocks = c_size * read_block_size;
|
||||
multiplier = (csd[2] >> 8) & 0xf;
|
||||
minimum_multiplier = multiplier >= 9 ? multiplier : 9;
|
||||
max_multiplier = minimum_multiplier <= 11 ? minimum_multiplier : 11;
|
||||
multiplier_factor = 1;
|
||||
multiplier_factor <<= (u16)(max_multiplier - 9);
|
||||
minimum_multiplier = 9;
|
||||
if (multiplier >= 9) {
|
||||
minimum_multiplier = multiplier;
|
||||
}
|
||||
max_multiplier = 11;
|
||||
if (minimum_multiplier <= 11) {
|
||||
max_multiplier = minimum_multiplier;
|
||||
}
|
||||
multiplier_factor = 1 << (u16)(max_multiplier - 9);
|
||||
*sectors = cluster_blocks * multiplier_factor;
|
||||
} else {
|
||||
*sectors = ((csd[1] >> 8 & 0x3fffff) + 1) * 0x400;
|
||||
@@ -758,27 +747,19 @@ s32 pfd_sddrv_get_total_sectors(u32* sectors, u16* bytes_per_sector) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline u32 pfd_sddrv_encode_serial(s32 year, s32 month, s32 day, s32 hour, s32 minute, s32 second) {
|
||||
u32 date;
|
||||
u32 time;
|
||||
date = (day & 0x1f) | ((month & 0xf) << 5) | (((year - 1900) & 0x7f) << 9);
|
||||
time = (second & 0x1f) | ((minute & 0x3f) << 5) | ((hour & 0x1f) << 11);
|
||||
return (date << 16) + time;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
u32 current_start;
|
||||
u32 reserved_sectors;
|
||||
u32 total_sectors;
|
||||
u32 fat_sectors;
|
||||
u32 fat_entry_bits;
|
||||
u32 fat_sectors;
|
||||
u32 next_fat_sectors;
|
||||
u32 total_sectors;
|
||||
u8 sectors_per_cluster;
|
||||
u32 reserved_sectors;
|
||||
u32 fixed_sectors;
|
||||
u32 start_sector;
|
||||
u32 next_fat_sectors;
|
||||
u32 current_start;
|
||||
u32 clusters;
|
||||
u32 candidate_fat_sectors;
|
||||
u32 reserve_count;
|
||||
@@ -790,10 +771,9 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
return -30;
|
||||
}
|
||||
pf_memset(&settings, 0, sizeof(settings));
|
||||
requested_sectors = format_data->total_sectors;
|
||||
size_entry = sddrv_size_depend_tbl;
|
||||
for (entry_index = 0; entry_index < 14; size_entry++, entry_index++) {
|
||||
if (size_entry->min_sectors < requested_sectors && size_entry->max_sectors >= requested_sectors) {
|
||||
if (size_entry->min_sectors < format_data->total_sectors && size_entry->max_sectors >= format_data->total_sectors) {
|
||||
settings.reserved_sectors = sddrv_size_depend_tbl[entry_index].reserved_sectors;
|
||||
settings.fat_copies = sddrv_size_depend_tbl[entry_index].fat_copies;
|
||||
settings.root_entries = sddrv_size_depend_tbl[entry_index].root_entries;
|
||||
@@ -806,9 +786,10 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
|
||||
return result;
|
||||
}
|
||||
format_data->sectors_per_cluster = settings.sectors_per_cluster;
|
||||
sectors_per_cluster = settings.sectors_per_cluster;
|
||||
format_data->sectors_per_cluster = sectors_per_cluster;
|
||||
total_sectors = format_data->total_sectors;
|
||||
clusters = total_sectors / format_data->sectors_per_cluster;
|
||||
clusters = total_sectors / sectors_per_cluster;
|
||||
if (clusters < 0x1005) {
|
||||
fat_entry_bits = 12;
|
||||
} else if (clusters < 0xfff5) {
|
||||
@@ -816,7 +797,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
} else {
|
||||
return -31;
|
||||
}
|
||||
if (total_sectors % format_data->sectors_per_cluster != 0) {
|
||||
if (total_sectors % sectors_per_cluster != 0) {
|
||||
clusters++;
|
||||
}
|
||||
candidate_fat_sectors = clusters * fat_entry_bits;
|
||||
@@ -843,7 +824,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
start_sector += reserved_sectors;
|
||||
}
|
||||
moved_start = 0;
|
||||
clusters = (total_sectors - start_sector - fixed_sectors) / format_data->sectors_per_cluster + 1;
|
||||
clusters = (total_sectors - start_sector - fixed_sectors) / sectors_per_cluster + 1;
|
||||
if (clusters >= 0xfe5 && clusters < 0x1005) {
|
||||
current_start += reserved_sectors;
|
||||
start_sector = current_start - fixed_sectors;
|
||||
@@ -868,7 +849,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
format_data->sectors_per_fat = fat_sectors;
|
||||
format_data->partition_start_sector = start_sector;
|
||||
format_data->partition_sector_count = format_data->total_sectors - start_sector;
|
||||
clusters = (format_data->partition_sector_count - (format_data->sectors_per_fat * 2 + 0x21)) / format_data->sectors_per_cluster + 1;
|
||||
clusters = (format_data->partition_sector_count - (fat_sectors * 2 + 0x21)) / format_data->sectors_per_cluster + 1;
|
||||
if (clusters < 0xff5) {
|
||||
format_data->fat_type = 0;
|
||||
} else if (clusters >= 0xff5) {
|
||||
@@ -877,18 +858,21 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
return -31;
|
||||
}
|
||||
OSTicksToCalendarTime(OSGetTime(), ¤t_time);
|
||||
format_data->volume_serial_number = pfd_sddrv_encode_serial(current_time.year, current_time.mon, current_time.mday,
|
||||
current_time.hour, current_time.min, current_time.sec);
|
||||
format_data->volume_serial_number = ((((current_time.year - 1900) & 0x7f) << 9) |
|
||||
((current_time.mon & 0xf) << 5) |
|
||||
(current_time.mday & 0x1f)) * 0x10000 +
|
||||
(((current_time.hour & 0x1f) << 11) |
|
||||
((current_time.min & 0x3f) << 5) |
|
||||
(current_time.sec & 0x1f));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
s32 pfd_sddrv_store_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
PFD_SDDRV_BPB* boot_sector;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
u16 sectors_16;
|
||||
s32 result;
|
||||
u32 sectors_32;
|
||||
@@ -897,10 +881,9 @@ s32 pfd_sddrv_store_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
|
||||
return -30;
|
||||
}
|
||||
pf_memset(&settings, 0, 0x10);
|
||||
requested_sectors = format_data->total_sectors;
|
||||
size_entry = sddrv_size_depend_tbl;
|
||||
for (entry_index = 0; entry_index < 14; size_entry++, entry_index++) {
|
||||
if (size_entry->min_sectors < requested_sectors && size_entry->max_sectors >= requested_sectors) {
|
||||
if (size_entry->min_sectors < format_data->total_sectors && size_entry->max_sectors >= format_data->total_sectors) {
|
||||
settings.reserved_sectors = sddrv_size_depend_tbl[entry_index].reserved_sectors;
|
||||
settings.fat_copies = sddrv_size_depend_tbl[entry_index].fat_copies;
|
||||
settings.root_entries = sddrv_size_depend_tbl[entry_index].root_entries;
|
||||
@@ -934,50 +917,49 @@ s32 pfd_sddrv_store_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
|
||||
boot_sector->jump[0] = 0xeb;
|
||||
boot_sector->jump[1] = 0;
|
||||
boot_sector->jump[2] = 0x90;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->bytes_per_sector, offsetof(PFD_SDDRV_BPB, bytes_per_sector), 0x200);
|
||||
pfd_sddrv_store_le16(boot_sector->bytes_per_sector, 0x200);
|
||||
boot_sector->sectors_per_cluster = format_data->sectors_per_cluster;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->reserved_sector_count, offsetof(PFD_SDDRV_BPB, reserved_sector_count), 1);
|
||||
pfd_sddrv_store_le16(boot_sector->reserved_sector_count, 1);
|
||||
boot_sector->fat_count = 2;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->root_entry_count, offsetof(PFD_SDDRV_BPB, root_entry_count), 0x200);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->total_sectors_16, offsetof(PFD_SDDRV_BPB, total_sectors_16), (u16)sectors_16);
|
||||
pfd_sddrv_store_le16(boot_sector->root_entry_count, 0x200);
|
||||
pfd_sddrv_store_le16(boot_sector->total_sectors_16, (u16)sectors_16);
|
||||
boot_sector->media_descriptor = 0xf8;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_fat_16, offsetof(PFD_SDDRV_BPB, sectors_per_fat_16), (u16)format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_track, offsetof(PFD_SDDRV_BPB, sectors_per_track), (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->heads, offsetof(PFD_SDDRV_BPB, heads), (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->hidden_sectors, offsetof(PFD_SDDRV_BPB, hidden_sectors), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->total_sectors_32, offsetof(PFD_SDDRV_BPB, total_sectors_32), sectors_32);
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_fat_16, (u16)format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_track, (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(boot_sector->heads, (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(boot_sector->hidden_sectors, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(boot_sector->total_sectors_32, sectors_32);
|
||||
boot_sector->drive_number = 0x80;
|
||||
boot_sector->extended_signature = 0x29;
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->volume_serial_number, offsetof(PFD_SDDRV_BPB, volume_serial_number), format_data->volume_serial_number);
|
||||
pfd_sddrv_store_le32(boot_sector->volume_serial_number, format_data->volume_serial_number);
|
||||
boot_sector->signature[0] = 0x55;
|
||||
boot_sector->signature[1] = 0xaa;
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
PFD_SDDRV_MBR* master_boot_record;
|
||||
PFD_SDDRV_PARTITION_ENTRY* partition;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
s32 result;
|
||||
u8 partition_type;
|
||||
u8 start_head;
|
||||
u16 start_sector;
|
||||
u16 start_cylinder;
|
||||
u8 end_head;
|
||||
u16 end_sector;
|
||||
u8 partition_type;
|
||||
u32 sectors_per_cylinder;
|
||||
u16 start_cylinder;
|
||||
u16 end_cylinder;
|
||||
u16 start_sector;
|
||||
u16 end_sector;
|
||||
|
||||
if (format_data == 0) {
|
||||
return -30;
|
||||
}
|
||||
pf_memset(&settings, 0, 0x10);
|
||||
requested_sectors = format_data->total_sectors;
|
||||
size_entry = sddrv_size_depend_tbl;
|
||||
for (entry_index = 0; entry_index < 14; size_entry++, entry_index++) {
|
||||
if (size_entry->min_sectors < requested_sectors && size_entry->max_sectors >= requested_sectors) {
|
||||
if (size_entry->min_sectors < format_data->total_sectors && size_entry->max_sectors >= format_data->total_sectors) {
|
||||
settings.reserved_sectors = sddrv_size_depend_tbl[entry_index].reserved_sectors;
|
||||
settings.fat_copies = sddrv_size_depend_tbl[entry_index].fat_copies;
|
||||
settings.root_entries = sddrv_size_depend_tbl[entry_index].root_entries;
|
||||
@@ -990,12 +972,13 @@ s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
|
||||
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
|
||||
return result;
|
||||
}
|
||||
start_cylinder = format_data->partition_start_sector / (settings.fat_copies * settings.root_entries);
|
||||
start_head = (format_data->partition_start_sector % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
sectors_per_cylinder = settings.fat_copies * settings.root_entries;
|
||||
start_cylinder = format_data->partition_start_sector / sectors_per_cylinder;
|
||||
end_cylinder = (format_data->total_sectors - 1) / sectors_per_cylinder;
|
||||
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
|
||||
end_cylinder = (format_data->total_sectors - 1) / (settings.fat_copies * settings.root_entries);
|
||||
end_head = ((format_data->total_sectors - 1) % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
end_sector = (format_data->total_sectors - 1) % settings.root_entries + 1;
|
||||
start_head = (format_data->partition_start_sector % sectors_per_cylinder) / settings.root_entries;
|
||||
end_head = ((format_data->total_sectors - 1) % sectors_per_cylinder) / settings.root_entries;
|
||||
if (format_data->partition_sector_count == 0) {
|
||||
return -30;
|
||||
}
|
||||
@@ -1011,14 +994,14 @@ s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
|
||||
partition = &master_boot_record->partitions[0];
|
||||
partition->boot_indicator = 0;
|
||||
partition->start_head = start_head;
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->start_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, start_sector_cylinder),
|
||||
pfd_sddrv_store_le16(partition->start_sector_cylinder,
|
||||
((start_cylinder & 0xff) << 8) + ((start_sector & 0x3f) | ((start_cylinder & 0x300) >> 2)));
|
||||
partition->partition_type = partition_type;
|
||||
partition->end_head = end_head;
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->end_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, end_sector_cylinder),
|
||||
pfd_sddrv_store_le16(partition->end_sector_cylinder,
|
||||
((end_cylinder & 0xff) << 8) + ((end_sector & 0x3f) | ((end_cylinder & 0x300) >> 2)));
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->first_sector, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, first_sector), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->sector_count, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, sector_count), format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le32(partition->first_sector, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(partition->sector_count, format_data->partition_sector_count);
|
||||
master_boot_record->signature[0] = 0x55;
|
||||
master_boot_record->signature[1] = 0xaa;
|
||||
return 0;
|
||||
@@ -1073,13 +1056,11 @@ s32 pfd_sddrv_build_mbr_bpb(u32 total_sectors) {
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
u8 sectors_per_cluster;
|
||||
u32 fat_sector_count;
|
||||
u32 available_sectors;
|
||||
u32 fat_sector_count;
|
||||
u32 fat_sectors;
|
||||
u32 cluster_count;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
u32 reserved_sectors = 0;
|
||||
@@ -1088,21 +1069,23 @@ s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
u32 attempts;
|
||||
s32 result;
|
||||
u32 next_data_region;
|
||||
u32 date;
|
||||
u32 time;
|
||||
u32 total_sectors;
|
||||
u8 sectors_per_cluster;
|
||||
OSCalendarTime current_time;
|
||||
|
||||
if (format_data == 0) {
|
||||
return -30;
|
||||
}
|
||||
pf_memset(&settings, 0, 0x10);
|
||||
requested_sectors = format_data->total_sectors;
|
||||
total_sectors = format_data->total_sectors;
|
||||
size_entry = sddrv_size_depend_tbl;
|
||||
for (entry_index = 0; entry_index < 14; size_entry++, entry_index++) {
|
||||
if (size_entry->min_sectors >= requested_sectors) {
|
||||
if (size_entry->min_sectors >= total_sectors) {
|
||||
continue;
|
||||
}
|
||||
if (size_entry->max_sectors < requested_sectors) {
|
||||
if (size_entry->max_sectors < total_sectors) {
|
||||
continue;
|
||||
}
|
||||
settings.reserved_sectors = sddrv_size_depend_tbl[entry_index].reserved_sectors;
|
||||
@@ -1164,39 +1147,42 @@ s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
format_data->sectors_per_fat = fat_sectors;
|
||||
format_data->reserved_sectors = reserved_sectors;
|
||||
format_data->partition_start_sector = 0x2000;
|
||||
format_data->partition_sector_count = format_data->total_sectors - 0x2000;
|
||||
format_data->partition_sector_count = total_sectors - 0x2000;
|
||||
OSTicksToCalendarTime(OSGetTime(), ¤t_time);
|
||||
format_data->volume_serial_number = pfd_sddrv_encode_serial(current_time.year, current_time.mon, current_time.mday,
|
||||
current_time.hour, current_time.min, current_time.sec);
|
||||
time = ((current_time.hour & 0x1f) << 11) |
|
||||
((current_time.min & 0x3f) << 5) |
|
||||
(current_time.sec & 0x1f);
|
||||
date = (((current_time.year - 1900) & 0x7f) << 9) |
|
||||
((current_time.mon & 0xf) << 5) |
|
||||
(current_time.mday & 0x1f);
|
||||
format_data->volume_serial_number = time + date * 0x10000;
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_store_fat32_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_MBR* master_boot_record;
|
||||
PFD_SDDRV_PARTITION_ENTRY* partition;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
s32 result;
|
||||
u32 cylinder_size;
|
||||
u8 partition_type;
|
||||
u16 start_cylinder;
|
||||
u8 start_head;
|
||||
u16 start_sector;
|
||||
u16 start_cylinder;
|
||||
u16 end_cylinder;
|
||||
u8 end_head;
|
||||
u16 end_sector;
|
||||
u16 end_cylinder;
|
||||
u32 partition_end;
|
||||
u8 partition_type;
|
||||
|
||||
if (format_data == 0 || sector_buffer == 0) {
|
||||
if (format_data == 0) {
|
||||
return -30;
|
||||
}
|
||||
pf_memset(&settings, 0, 0x10);
|
||||
requested_sectors = format_data->total_sectors;
|
||||
size_entry = sddrv_size_depend_tbl;
|
||||
for (entry_index = 0; entry_index < 14; size_entry++, entry_index++) {
|
||||
if (size_entry->min_sectors < requested_sectors && size_entry->max_sectors >= requested_sectors) {
|
||||
if (size_entry->min_sectors < format_data->total_sectors && size_entry->max_sectors >= format_data->total_sectors) {
|
||||
settings.reserved_sectors = sddrv_size_depend_tbl[entry_index].reserved_sectors;
|
||||
settings.fat_copies = sddrv_size_depend_tbl[entry_index].fat_copies;
|
||||
settings.root_entries = sddrv_size_depend_tbl[entry_index].root_entries;
|
||||
@@ -1209,42 +1195,42 @@ s32 pfd_sddrv_store_fat32_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector
|
||||
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
|
||||
return result;
|
||||
}
|
||||
if (format_data->partition_start_sector > 0xfb0400) {
|
||||
cylinder_size = settings.fat_copies * settings.root_entries;
|
||||
partition_end = format_data->total_sectors - 1;
|
||||
partition_type = 0x0b;
|
||||
if (format_data->partition_start_sector <= 0xfb0400) {
|
||||
start_cylinder = format_data->partition_start_sector / cylinder_size;
|
||||
start_head = (format_data->partition_start_sector % cylinder_size) / settings.root_entries;
|
||||
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
|
||||
} else {
|
||||
start_cylinder = 0x3ff;
|
||||
start_head = 0xfe;
|
||||
start_sector = 0x3f;
|
||||
start_cylinder = 0x3ff;
|
||||
} else {
|
||||
start_cylinder = format_data->partition_start_sector / (settings.fat_copies * settings.root_entries);
|
||||
start_head = (format_data->partition_start_sector % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
|
||||
}
|
||||
if (format_data->total_sectors > 0xfb0400) {
|
||||
if (partition_end <= 0xfb0400) {
|
||||
end_cylinder = partition_end / cylinder_size;
|
||||
end_head = (partition_end % cylinder_size) / settings.root_entries;
|
||||
end_sector = partition_end % settings.root_entries + 1;
|
||||
} else {
|
||||
end_cylinder = 0x3ff;
|
||||
end_head = 0xfe;
|
||||
end_sector = 0x3f;
|
||||
end_cylinder = 0x3ff;
|
||||
partition_type = 0x0c;
|
||||
} else {
|
||||
partition_end = format_data->total_sectors - 1;
|
||||
partition_type = 0x0b;
|
||||
end_cylinder = partition_end / (settings.fat_copies * settings.root_entries);
|
||||
end_head = (partition_end % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
end_sector = partition_end % settings.root_entries + 1;
|
||||
}
|
||||
pf_memset(sector_buffer, 0, 0x200);
|
||||
master_boot_record = (PFD_SDDRV_MBR*)sector_buffer;
|
||||
partition = &master_boot_record->partitions[0];
|
||||
partition->boot_indicator = 0;
|
||||
partition->start_head = (u8)start_head;
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->start_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, start_sector_cylinder),
|
||||
pfd_sddrv_store_le16(partition->start_sector_cylinder,
|
||||
((start_cylinder & 0xff) << 8) + ((start_sector & 0x3f) | ((start_cylinder & 0x300) >> 2)));
|
||||
partition->partition_type = partition_type;
|
||||
partition->end_head = (u8)end_head;
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->end_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, end_sector_cylinder),
|
||||
pfd_sddrv_store_le16(partition->end_sector_cylinder,
|
||||
((end_cylinder & 0xff) << 8) + ((end_sector & 0x3f) | ((end_cylinder & 0x300) >> 2)));
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->first_sector, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, first_sector), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->sector_count, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, sector_count), format_data->partition_sector_count);
|
||||
master_boot_record->signature[0] = 0x55;
|
||||
master_boot_record->signature[1] = 0xaa;
|
||||
pfd_sddrv_store_le32(partition->first_sector, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(partition->sector_count, format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le16(master_boot_record->signature, 0xaa55);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1298,20 +1284,18 @@ s32 pfd_sddrv_store_fat32_fsi_buf(u8* sector_buffer) NO_INLINE {
|
||||
|
||||
s32 pfd_sddrv_store_fat32_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_FAT32_BPB* boot_sector;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
s32 result;
|
||||
|
||||
if (format_data == 0 || sector_buffer == 0) {
|
||||
if (format_data == 0) {
|
||||
return -30;
|
||||
}
|
||||
pf_memset(&settings, 0, 0x10);
|
||||
requested_sectors = format_data->total_sectors;
|
||||
size_entry = sddrv_size_depend_tbl;
|
||||
for (entry_index = 0; entry_index < 14; size_entry++, entry_index++) {
|
||||
if (size_entry->min_sectors < requested_sectors && size_entry->max_sectors >= requested_sectors) {
|
||||
if (size_entry->min_sectors < format_data->total_sectors && size_entry->max_sectors >= format_data->total_sectors) {
|
||||
settings.reserved_sectors = sddrv_size_depend_tbl[entry_index].reserved_sectors;
|
||||
settings.fat_copies = sddrv_size_depend_tbl[entry_index].fat_copies;
|
||||
settings.root_entries = sddrv_size_depend_tbl[entry_index].root_entries;
|
||||
@@ -1332,29 +1316,33 @@ s32 pfd_sddrv_store_fat32_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector
|
||||
boot_sector->jump[0] = 0xeb;
|
||||
boot_sector->jump[1] = 0;
|
||||
boot_sector->jump[2] = 0x90;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->bytes_per_sector, offsetof(PFD_SDDRV_FAT32_BPB, bytes_per_sector), 0x200);
|
||||
pfd_sddrv_store_le16(boot_sector->bytes_per_sector, 0x200);
|
||||
boot_sector->sectors_per_cluster = format_data->sectors_per_cluster;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->reserved_sector_count, offsetof(PFD_SDDRV_FAT32_BPB, reserved_sector_count), format_data->reserved_sectors);
|
||||
pfd_sddrv_store_le16(boot_sector->reserved_sector_count, format_data->reserved_sectors);
|
||||
boot_sector->fat_count = 2;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->root_entry_count, offsetof(PFD_SDDRV_FAT32_BPB, root_entry_count), 0);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->total_sectors_16, offsetof(PFD_SDDRV_FAT32_BPB, total_sectors_16), 0);
|
||||
pfd_sddrv_store_le16(boot_sector->root_entry_count, 0);
|
||||
pfd_sddrv_store_le16(boot_sector->total_sectors_16, 0);
|
||||
boot_sector->media_descriptor = 0xf8;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_fat_16, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_fat_16), 0);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_track, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_track), (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->heads, offsetof(PFD_SDDRV_FAT32_BPB, heads), (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->hidden_sectors, offsetof(PFD_SDDRV_FAT32_BPB, hidden_sectors), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->total_sectors_32, offsetof(PFD_SDDRV_FAT32_BPB, total_sectors_32), format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->sectors_per_fat_32, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_fat_32), format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->ext_flags, offsetof(PFD_SDDRV_FAT32_BPB, ext_flags), 0);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->filesystem_version, offsetof(PFD_SDDRV_FAT32_BPB, filesystem_version), 0);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->root_cluster, offsetof(PFD_SDDRV_FAT32_BPB, root_cluster), 2);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->fsinfo_sector, offsetof(PFD_SDDRV_FAT32_BPB, fsinfo_sector), 1);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->backup_boot_sector, offsetof(PFD_SDDRV_FAT32_BPB, backup_boot_sector), 6);
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_fat_16, 0);
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_track, (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(boot_sector->heads, (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(boot_sector->hidden_sectors, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(boot_sector->total_sectors_32, format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le32(boot_sector->sectors_per_fat_32, format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(boot_sector->ext_flags, 0);
|
||||
pfd_sddrv_store_le16(boot_sector->filesystem_version, 0);
|
||||
pfd_sddrv_store_le32(boot_sector->root_cluster, 2);
|
||||
pfd_sddrv_store_le16(boot_sector->fsinfo_sector, 1);
|
||||
pfd_sddrv_store_le16(boot_sector->backup_boot_sector, 6);
|
||||
boot_sector->drive_number = 0x80;
|
||||
boot_sector->extended_signature = 0x29;
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->volume_serial_number, offsetof(PFD_SDDRV_FAT32_BPB, volume_serial_number), format_data->volume_serial_number);
|
||||
boot_sector->signature[0] = 0x55;
|
||||
boot_sector->signature[1] = 0xaa;
|
||||
pfd_sddrv_store_le32(boot_sector->volume_serial_number, format_data->volume_serial_number);
|
||||
if (((u32)boot_sector->signature & 1) != 0) {
|
||||
boot_sector->signature[0] = 0x55;
|
||||
boot_sector->signature[1] = 0xaa;
|
||||
} else {
|
||||
*(u16*)boot_sector->signature = 0x55aa;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <private/fa/pdm.h>
|
||||
#include <revolution/types.h>
|
||||
#define MBR_WORD(buf, offset) (((pf_u32)(buf)[(offset) + 3] << 24) + ((pf_u32)(buf)[(offset) + 2] << 16) + ((pf_u32)(buf)[(offset) + 1] << 8) + (buf)[offset])
|
||||
#define MBR_WORD(buf, offset) (((pf_u32)(buf)[(offset) + 2] << 16) + (buf)[offset] + (((pf_u32)(buf)[(offset) + 3] << 24) + ((pf_u32)(buf)[(offset) + 1] << 8)))
|
||||
static inline pf_u16 read_boot_u16(pf_u8* buf, pf_u32 offset) {
|
||||
if ((pf_u32)&buf[offset] & 1) { return (buf[offset + 1] << 8) | buf[offset]; }
|
||||
return PF_SWAP_16(*(pf_u16*)&buf[(offset + 1) & ~1]);
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -347,7 +347,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
|
||||
if (err != 0) {
|
||||
return err;
|
||||
}
|
||||
if (PFSTR_StrNumChar(p_path, 1) == 1 && (PFSTR_StrNCmp(p_path, (pf_s8*)"\0\0\0", 2, 0, 1) == 0)) {
|
||||
if (PFSTR_StrNumChar(p_path, 1) == 1 && (PFSTR_StrNCmp(p_path, (pf_s8*)"\0", 2, 0, 1) == 0)) {
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
@@ -366,7 +366,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
|
||||
if (err != 0) {
|
||||
return err;
|
||||
}
|
||||
if (no_look_last_token != 0 && (PFSTR_StrNCmp(&token, (pf_s8*)"\0\0\0", 2, 0, 1) == 0)) {
|
||||
if (no_look_last_token != 0 && (PFSTR_StrNCmp(&token, (pf_s8*)"\0", 2, 0, 1) == 0)) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -424,7 +424,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
|
||||
}
|
||||
if ((p_ent->attr & 0x10) == 0 || p_ent->short_name[0] != '.') {
|
||||
p_ent->path_len = (PFSTR_StrNumChar(&token, 1) + 1) + p_ent->path_len;
|
||||
if ((PFSTR_StrNCmp(&token, (pf_s8*)"\0\0\0", 2, 0, 1) != 0)) {
|
||||
if ((PFSTR_StrNCmp(&token, (pf_s8*)"\0", 2, 0, 1) != 0)) {
|
||||
p_ent->path_len -= PFSTR_StrNumChar(&token, 2);
|
||||
}
|
||||
}
|
||||
@@ -689,7 +689,7 @@ pf_s32 PFENT_ITER_FindEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_STR*
|
||||
if (PFSTR_StrNCmp(p_pattern, (pf_s8*)"\\", 1, 0, 1) == 0 || PFSTR_StrNCmp(p_pattern, (pf_s8*)"/", 1, 0, 1) == 0) {
|
||||
err = PFENT_GetRootDir(p_iter->p_vol, p_ent);
|
||||
if (err != 0) return err;
|
||||
if (PFSTR_StrNumChar(p_pattern, 1) == 1 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"\0\0\0", 2, 0, 1) == 0) return 0;
|
||||
if (PFSTR_StrNumChar(p_pattern, 1) == 1 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"\0", 2, 0, 1) == 0) return 0;
|
||||
} else {
|
||||
err = PFVOL_GetCurrentDir(p_iter->p_vol, p_ent);
|
||||
if (err != 0) return err;
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -1852,15 +1852,13 @@ s32 PFFAT_RefreshFSINFO(PF_VOLUME* volume)
|
||||
s32 alreadyAllocated;
|
||||
u32 completedBytes;
|
||||
s32 error;
|
||||
s32 error2;
|
||||
|
||||
error = 0;
|
||||
if ((volume->fsi_flag & 4) != 0) {
|
||||
error2 = PFCACHE_AllocateDataPage(volume, -1, &page,
|
||||
&alreadyAllocated);
|
||||
if (error2 != 0) {
|
||||
return error2;
|
||||
} else {
|
||||
error = PFCACHE_AllocateDataPage(volume, -1, &page,
|
||||
&alreadyAllocated);
|
||||
if (error != 0) { goto finished; }
|
||||
{
|
||||
error = PFSEC_ReadData(
|
||||
volume, page->p_buf, volume->bpb.fs_info_sector, 0,
|
||||
volume->bpb.bytes_per_sector, &completedBytes, 0);
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -1016,7 +1014,7 @@ void PFPATH_SetSearchPattern(pf_s8* p_buf_local, pf_u16* p_buf_unicode, PF_STR*
|
||||
|
||||
pf_u32 PFPATH_CheckExtShortNameSignature(PF_STR* p_str) {
|
||||
pf_u32 result = 0;
|
||||
pf_s8 sig[2] = "\x01\x02";
|
||||
pf_s8 sig[2] = {1, 2};
|
||||
|
||||
if (PFSTR_StrNCmp(p_str, sig, 1, 0, 2) == 0) {
|
||||
result = 1;
|
||||
@@ -1029,7 +1027,7 @@ pf_u32 PFPATH_CheckExtShortName(PF_STR* p_str, pf_u32 target, pf_bool wildcard)
|
||||
pf_s16 i;
|
||||
pf_s16 num;
|
||||
pf_bool is_wildcard = PF_FALSE;
|
||||
pf_s8 sig[2] = "\x01\x02";
|
||||
pf_s8 sig[2] = {1, 2};
|
||||
pf_s8* p_c;
|
||||
pf_u16* p_wc;
|
||||
|
||||
@@ -1037,7 +1035,7 @@ pf_u32 PFPATH_CheckExtShortName(PF_STR* p_str, pf_u32 target, pf_bool wildcard)
|
||||
(PFSTR_StrNCmp(p_str, (pf_s8*)"?", target, 0, 1) == 0 &&
|
||||
(PFSTR_StrNCmp(p_str, (pf_s8*)"?", target, 1, 1) == 0 || PFSTR_StrNCmp(p_str, (pf_s8*)"*", target, 0, 1) == 0)) ||
|
||||
PFSTR_StrNCmp(p_str, (pf_s8*)"*", target, 0, 1) == 0) {
|
||||
for (i = 2; i < 8 && PF_IS_PATH_SEPERATOR(p_str, target, i) == PF_FALSE && PFSTR_StrNCmp(p_str, (pf_s8*)"\x20\0\0", target, i, 1) != 0 &&
|
||||
for (i = 2; i < 8 && PF_IS_PATH_SEPERATOR(p_str, target, i) == PF_FALSE && PFSTR_StrNCmp(p_str, (pf_s8*)" ", target, i, 1) != 0 &&
|
||||
PF_IS_PATH_NOT_NULL(p_str, target, i);
|
||||
i++) {
|
||||
if (PFSTR_GetCodeMode(p_str) == 1) {
|
||||
@@ -1061,7 +1059,7 @@ pf_u32 PFPATH_CheckExtShortName(PF_STR* p_str, pf_u32 target, pf_bool wildcard)
|
||||
}
|
||||
}
|
||||
if (i == 8 || is_wildcard == PF_TRUE) {
|
||||
if (PFSTR_StrNCmp(p_str, (pf_s8*)"\x20\0\0", target, i, 1) == 0 || PF_IS_PATH_SEPERATOR(p_str, target, i) == 0 ||
|
||||
if (PFSTR_StrNCmp(p_str, (pf_s8*)" ", target, i, 1) == 0 || PF_IS_PATH_SEPERATOR(p_str, target, i) == 0 ||
|
||||
PF_IS_PATH_NULL(p_str, target, i)) {
|
||||
result = i;
|
||||
}
|
||||
@@ -1075,7 +1073,7 @@ pf_u32 PFPATH_GetExtShortNameIndex(PF_STR* p_str, pf_u32* p_index) {
|
||||
pf_s16 i;
|
||||
pf_s16 num;
|
||||
pf_u32 index;
|
||||
pf_s8 sig[2] = "\x01\x02";
|
||||
pf_s8 sig[2] = {1, 2};
|
||||
pf_s8* p_c;
|
||||
pf_u16* p_wc;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -224,9 +224,6 @@ typedef struct PFVOL_SET {
|
||||
|
||||
PFVOL_SET pf_vol_set;
|
||||
|
||||
static s8 default_volume_label[12] = "NO NAME ";
|
||||
static const u8 deleted_entry_mark[8] = {0xE5};
|
||||
|
||||
extern s32 PFDRV_mount(PFVOL_VOLUME* volume);
|
||||
extern s32 PFDRV_unmount(PFVOL_VOLUME* volume, u32 mode);
|
||||
extern s32 PFDRV_format(PFVOL_VOLUME* volume, const u8* format_options);
|
||||
@@ -373,7 +370,12 @@ static inline s32 finalize_volume(PFVOL_VOLUME* volume) {
|
||||
return 0;
|
||||
}
|
||||
static inline s32 copy_codeset(const PFVOL_CHARCODE* code_set) {
|
||||
pf_vol_set.codeset = *code_set;
|
||||
pf_vol_set.codeset.oem2unicode = code_set->oem2unicode;
|
||||
pf_vol_set.codeset.unicode2oem = code_set->unicode2oem;
|
||||
pf_vol_set.codeset.oem_char_width = code_set->oem_char_width;
|
||||
pf_vol_set.codeset.is_oem_mb_char = code_set->is_oem_mb_char;
|
||||
pf_vol_set.codeset.unicode_char_width = code_set->unicode_char_width;
|
||||
pf_vol_set.codeset.is_unicode_mb_char = code_set->is_unicode_mb_char;
|
||||
return 0;
|
||||
}
|
||||
s32 PFVOL_DoMountVolume(PFVOL_VOLUME* volume) {
|
||||
@@ -498,9 +500,7 @@ s32 PFVOL_p_setvol(PFVOL_VOLUME* volume, const s8* label) {
|
||||
s32 error;
|
||||
|
||||
error = PFENT_GetRootDir(volume, &root_entry);
|
||||
if (error != 0) {
|
||||
return error;
|
||||
} else {
|
||||
if (error == 0) {
|
||||
PFFAT_InitFFD(&ffd, &hint, volume, &root_entry.start_cluster);
|
||||
PFSTR_InitStr(&path, "*", 1);
|
||||
PFSTR_SetLocalStr(&path, 0);
|
||||
@@ -514,7 +514,7 @@ s32 PFVOL_p_setvol(PFVOL_VOLUME* volume, const s8* label) {
|
||||
entry.start_cluster = 0;
|
||||
}
|
||||
} else {
|
||||
PFSTR_InitStr(&path, "\0\0\0", 1);
|
||||
PFSTR_InitStr(&path, "", 1);
|
||||
PFSTR_SetLocalStr(&path, 0);
|
||||
error = PFENT_allocateEntry(&entry, 1, &ffd, previous_cluster, &path);
|
||||
if (error != 0) {
|
||||
@@ -584,7 +584,7 @@ s32 PFVOL_p_rmvvol(PFVOL_VOLUME* volume) {
|
||||
u32 logical_position;
|
||||
u32 entry_position;
|
||||
u32 processed;
|
||||
u8 deleted = deleted_entry_mark[0];
|
||||
u8 deleted = (u8)"\xE5"[0];
|
||||
s32 error;
|
||||
|
||||
error = PFENT_GetRootDir(volume, &root_entry);
|
||||
@@ -913,7 +913,7 @@ s32 PFVOL_getvol(s8 drive, PFVOL_VOLUME_INFO* volume_info) {
|
||||
} else {
|
||||
volume = &pf_vol_set.volumes[volume_index];
|
||||
}
|
||||
if (pf_memcmp(volume->label, default_volume_label, 11) == 0) {
|
||||
if (pf_memcmp(volume->label, "NO NAME ", 11) == 0) {
|
||||
pf_vol_set.last_error = 3;
|
||||
volume->last_error = 3;
|
||||
return 3;
|
||||
@@ -945,7 +945,7 @@ s32 PFVOL_rmvvol(s8 drive) {
|
||||
} else {
|
||||
volume = &pf_vol_set.volumes[volume_index];
|
||||
}
|
||||
if (pf_memcmp(volume->label, default_volume_label, 11) == 0) {
|
||||
if (pf_memcmp(volume->label, "NO NAME ", 11) == 0) {
|
||||
pf_vol_set.last_error = 3;
|
||||
volume->last_error = 3;
|
||||
return 3;
|
||||
@@ -956,7 +956,7 @@ s32 PFVOL_rmvvol(s8 drive) {
|
||||
volume->last_error = error;
|
||||
return error;
|
||||
}
|
||||
error = PFDRV_StoreVolumeLabelToBPB(volume, default_volume_label);
|
||||
error = PFDRV_StoreVolumeLabelToBPB(volume, (const s8*)"NO NAME ");
|
||||
if (error != 0) {
|
||||
pf_vol_set.last_error = error;
|
||||
volume->last_error = error;
|
||||
@@ -1536,4 +1536,3 @@ s32 PFVOL_setencode(u32 mode) {
|
||||
pf_vol_set.setting = pf_vol_set.setting & ~3 | mode;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -69,17 +69,17 @@ typedef struct {
|
||||
} KBDChannel;
|
||||
|
||||
typedef struct {
|
||||
USBKBDCmdLEDCallback callbackAddress;
|
||||
u32 callbackAddress;
|
||||
void* callbackArg;
|
||||
} KBDLEDCallbackData;
|
||||
|
||||
const char* __KBDVersion =
|
||||
"<< RVL_SDK - KBD \trelease build: Apr 20 2010 11:21:43 (0x4199_60831) >>";
|
||||
|
||||
static void (*kbdKeyCallback)(KBDKeyEventData* event);
|
||||
static USBKBDDetachCallback kbdDevDetachCallback;
|
||||
static USBKBDAttachCallback kbdDevAttachCallback;
|
||||
static BOOL kbdInitialized;
|
||||
static USBKBDAttachCallback kbdDevAttachCallback;
|
||||
static USBKBDDetachCallback kbdDevDetachCallback;
|
||||
static void (*kbdKeyCallback)(KBDKeyEventData* event);
|
||||
|
||||
KBDKeyMapTable kbdKeyMaps = {0};
|
||||
typedef struct {
|
||||
@@ -346,6 +346,7 @@ static void kbdProcKey(u32 key, u32 pressed, u32 channel) {
|
||||
|
||||
event.channel = channel;
|
||||
event.state = pressed;
|
||||
event.modifiers = 0;
|
||||
kbdGetModState(channel, &event.modifiers);
|
||||
map = &kbdKeyMaps.maps[data->country];
|
||||
keyCount = map->keypadCount;
|
||||
@@ -401,86 +402,86 @@ static void kbdProcKey(u32 key, u32 pressed, u32 channel) {
|
||||
|
||||
static void kbdProcMod(u32 key, u32 pressed, u32 channel) {
|
||||
KBDChannel* data;
|
||||
u32 modState;
|
||||
s32 delta;
|
||||
u8 flags;
|
||||
|
||||
KBDModifierState state;
|
||||
u32 finalState;
|
||||
s8 value;
|
||||
data = &kbdData[channel];
|
||||
delta = (pressed & 1) != 0 ? 1 : -1;
|
||||
flags = kbdKeyMaps.maps[data->country].flags;
|
||||
state.value = data->modState;
|
||||
|
||||
kbdGetModState(channel, &modState);
|
||||
kbdGetModState(channel, &state.value);
|
||||
switch (key) {
|
||||
case 0xF001:
|
||||
if (data->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);
|
||||
state.keys.rightControl = (u8)value != 0;
|
||||
}
|
||||
break;
|
||||
case 0xF005:
|
||||
if (data->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);
|
||||
state.keys.rightAlt = (u8)value != 0;
|
||||
}
|
||||
break;
|
||||
case 0xF000:
|
||||
if (data->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);
|
||||
state.keys.leftControl = (u8)value != 0;
|
||||
}
|
||||
break;
|
||||
case 0xF008:
|
||||
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
|
||||
modState ^= 0x200;
|
||||
state.value ^= 0x200;
|
||||
}
|
||||
break;
|
||||
case 0xF007:
|
||||
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
|
||||
modState ^= 0x100;
|
||||
state.value ^= 0x100;
|
||||
}
|
||||
break;
|
||||
case 0xF006:
|
||||
if (((pressed & 1) != 0) && (data->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;
|
||||
}
|
||||
}
|
||||
@@ -488,43 +489,43 @@ static void kbdProcMod(u32 key, u32 pressed, u32 channel) {
|
||||
case 0xF002:
|
||||
if (data->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);
|
||||
state.keys.leftShift = (u8)value != 0;
|
||||
}
|
||||
break;
|
||||
case 0xF003:
|
||||
if (data->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);
|
||||
state.keys.rightShift = (u8)value != 0;
|
||||
}
|
||||
break;
|
||||
case 0xF004:
|
||||
if (data->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);
|
||||
state.keys.leftAlt = (u8)value != 0;
|
||||
}
|
||||
break;
|
||||
case 0xF021:
|
||||
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
|
||||
modState ^= 0x400;
|
||||
state.value ^= 0x400;
|
||||
}
|
||||
break;
|
||||
}
|
||||
finalState = modState | 0x1000;
|
||||
finalState = state.value | 0x1000;
|
||||
KBDSetModState(channel, finalState);
|
||||
}
|
||||
|
||||
@@ -563,26 +564,28 @@ static inline u32 kbdChannelFlags(u32 channel) {
|
||||
|
||||
static void kbd_led_handler(BOOL success, void* callbackArg) {
|
||||
u32 index;
|
||||
u32 err;
|
||||
u32 result;
|
||||
u32 callbackAddress;
|
||||
index = (u32)callbackArg;
|
||||
callbackAddress = kbdLCBuf[index].callbackAddress;
|
||||
|
||||
kbdCmdBuf[index].device = 0;
|
||||
if (kbdLCBuf[index].callbackAddress == (USBKBDCmdLEDCallback)(u32)kbdCmdBuf[index].device) {
|
||||
if (callbackAddress == 0) {
|
||||
return;
|
||||
}
|
||||
switch (success) {
|
||||
default:
|
||||
err = 7;
|
||||
break;
|
||||
case TRUE:
|
||||
err = 0;
|
||||
result = 0;
|
||||
break;
|
||||
default:
|
||||
result = 7;
|
||||
break;
|
||||
}
|
||||
kbdLCBuf[index].callbackAddress(err, kbdLCBuf[index].callbackArg);
|
||||
((USBKBDCmdLEDCallback)kbdLCBuf[index].callbackAddress)(result, kbdLCBuf[index].callbackArg);
|
||||
}
|
||||
|
||||
USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback, void* callbackArg) {
|
||||
s32 index;
|
||||
u32 ofs;
|
||||
u32 index;
|
||||
u8 ledBits;
|
||||
BOOL interrupts;
|
||||
USBKBDErr result;
|
||||
@@ -592,14 +595,14 @@ USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback,
|
||||
if (channel >= 4) {
|
||||
return 4;
|
||||
}
|
||||
if ((s32)kbdChannelFlags(channel) == 1 || (s32)kbdChannelFlags(channel) == 4) {
|
||||
if ((s32)kbdData[(u8)channel].flags == 1 || (s32)kbdData[(u8)channel].flags == 4) {
|
||||
return 5;
|
||||
}
|
||||
ledBits = leds;
|
||||
interrupts = OSDisableInterrupts();
|
||||
for (index = 0, ofs = 0; index < 12; index++, ofs += sizeof(KBDLEDCommand)) {
|
||||
if (*(u32*)&((u8*)kbdCmdBuf)[ofs] == 0) {
|
||||
*(u32*)&((u8*)kbdCmdBuf)[ofs] = (u32)kbdData[channel].device;
|
||||
for (index = 0; index < 12; index++) {
|
||||
if (kbdCmdBuf[index].device == 0) {
|
||||
kbdCmdBuf[index].device = (u32)kbdData[channel].device;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -607,25 +610,23 @@ USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback,
|
||||
if (index == 12) {
|
||||
return 7;
|
||||
}
|
||||
kbdLCBuf[index].callbackAddress = callback;
|
||||
kbdLCBuf[index].callbackAddress = (u32)callback;
|
||||
kbdLCBuf[index].callbackArg = callbackArg;
|
||||
result = USBKBDSetLEDAsync((u32)kbdData[channel].device, ledBits,
|
||||
(USBKBDCmdLEDAsync*)&kbdCmdBuf[index],
|
||||
kbd_led_handler, (void*)index);
|
||||
switch (result) {
|
||||
default:
|
||||
return 7;
|
||||
case 0:
|
||||
return 0;
|
||||
default:
|
||||
return 7;
|
||||
}
|
||||
}
|
||||
|
||||
USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
|
||||
u32 index;
|
||||
KBDLEDCommand* command;
|
||||
BOOL interrupts;
|
||||
USBKBDErr result;
|
||||
u8 ledBits;
|
||||
if (!kbdInitialized) {
|
||||
return 2;
|
||||
}
|
||||
@@ -635,23 +636,21 @@ USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
|
||||
if ((s32)kbdChannelFlags(channel) == 1 || (s32)kbdChannelFlags(channel) == 4) {
|
||||
return 5;
|
||||
}
|
||||
ledBits = leds & 0xff;
|
||||
leds &= 0xff;
|
||||
interrupts = OSDisableInterrupts();
|
||||
index = 0;
|
||||
command = kbdCmdBuf;
|
||||
while (index < 12) {
|
||||
if (command->device == 0) {
|
||||
command->device = (u32)kbdData[channel].device;
|
||||
if ((kbdCmdBuf + index)->device == 0) {
|
||||
kbdCmdBuf[index].device = (u32)kbdData[channel].device;
|
||||
break;
|
||||
}
|
||||
index++;
|
||||
command++;
|
||||
}
|
||||
OSRestoreInterrupts(interrupts);
|
||||
if (index == 12) {
|
||||
return 7;
|
||||
}
|
||||
result = USBKBDSetLED((u32)kbdData[channel].device, ledBits,
|
||||
result = USBKBDSetLED((u32)kbdData[channel].device, leds,
|
||||
(USBKBDCmdLED*)&kbdCmdBuf[index]);
|
||||
kbdCmdBuf[index].device = 0;
|
||||
switch (result) {
|
||||
@@ -838,28 +837,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;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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) {
|
||||
|
||||
@@ -169,13 +169,13 @@ static inline char* __nupFindTag(char* response, const char* endTag, const char*
|
||||
char** value, size_t* length) {
|
||||
char* start;
|
||||
char* end;
|
||||
if (response == 0 || (start = strstr(response, startTag)) == 0 ||
|
||||
(end = strstr(start, endTag)) == 0) {
|
||||
return 0;
|
||||
if (response != 0 && (start = strstr(response, startTag)) != 0 &&
|
||||
(end = strstr(start, endTag)) != 0) {
|
||||
*value = start + strlen(startTag);
|
||||
*length = end - *value;
|
||||
return end + strlen(endTag);
|
||||
}
|
||||
*value = start + strlen(startTag);
|
||||
*length = end - *value;
|
||||
return end + strlen(endTag);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* messageId,
|
||||
@@ -192,7 +192,11 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* versionStartTag = "<Version>";
|
||||
afterEnd = __nupFindTag(response, versionEndTag, versionStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength != strlen("1.0") || strncmp(start, "1.0", valueLength) != 0) {
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (valueLength != strlen("1.0") || strncmp(start, "1.0", valueLength) != 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -203,7 +207,11 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* deviceIdStartTag = "<DeviceId>";
|
||||
afterEnd = __nupFindTag(response, deviceIdEndTag, deviceIdStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || strtoull(start, 0, 10) != deviceId) {
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (strtoull(start, 0, 10) != deviceId) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -214,7 +222,11 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* messageIdStartTag = "<MessageId>";
|
||||
afterEnd = __nupFindTag(response, messageIdEndTag, messageIdStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength != strlen(messageId) || strncmp(start, messageId, valueLength) != 0) {
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (valueLength != strlen(messageId) || strncmp(start, messageId, valueLength) != 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -225,7 +237,11 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* errorCodeStartTag = "<ErrorCode>";
|
||||
afterEnd = __nupFindTag(response, errorCodeEndTag, errorCodeStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength != strlen("0") || strncmp(start, "0", valueLength) != 0) {
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (valueLength != strlen("0") || strncmp(start, "0", valueLength) != 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -236,15 +252,15 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* uploadAuditStartTag = "<UploadAuditData>";
|
||||
afterEnd = __nupFindTag(response, uploadAuditEndTag, uploadAuditStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength != strlen("0") || (*start != '0' && *start != '1')) {
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (*start == '0') {
|
||||
context->uploadAuditData = 0;
|
||||
} else {
|
||||
context->uploadAuditData = 1;
|
||||
if (valueLength != strlen("0") || (*start != '0' && *start != '1')) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
context->uploadAuditData = *start == '1';
|
||||
}
|
||||
|
||||
{
|
||||
@@ -252,7 +268,11 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* contentPrefixStartTag = "<ContentPrefixURL>";
|
||||
afterEnd = __nupFindTag(response, contentPrefixEndTag, contentPrefixStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength == 0) {
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (valueLength == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -270,7 +290,11 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* uncachedPrefixStartTag = "<UncachedContentPrefixURL>";
|
||||
afterEnd = __nupFindTag(response, uncachedPrefixEndTag, uncachedPrefixStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength == 0) {
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (valueLength == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -286,14 +310,19 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
titleCount = 0;
|
||||
cursor = response;
|
||||
{
|
||||
const char* versionEndTag = "</Version>";
|
||||
const char* versionStartTag = "<Version>";
|
||||
const char* titleIdEndTag = "</TitleId>";
|
||||
const char* titleIdStartTag = "<TitleId>";
|
||||
while ((cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag,
|
||||
&start, &valueLength)) != 0 &&
|
||||
(cursor = __nupFindTag(cursor, versionEndTag, versionStartTag,
|
||||
&start, &valueLength)) != 0) {
|
||||
const char* versionEndTag = "</Version>";
|
||||
const char* versionStartTag = "<Version>";
|
||||
for (;;) {
|
||||
cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag, &start, &valueLength);
|
||||
if (cursor == 0) {
|
||||
break;
|
||||
}
|
||||
cursor = __nupFindTag(cursor, versionEndTag, versionStartTag, &start, &valueLength);
|
||||
if (cursor == 0) {
|
||||
break;
|
||||
}
|
||||
titleCount++;
|
||||
}
|
||||
}
|
||||
@@ -306,36 +335,38 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
memset(context->titles, 0, titleCount * sizeof(NUPTitleInfo));
|
||||
cursor = response;
|
||||
{
|
||||
const char* versionEndTag = "</Version>";
|
||||
const char* versionStartTag = "<Version>";
|
||||
const char* titleIdEndTag = "</TitleId>";
|
||||
const char* titleIdStartTag = "<TitleId>";
|
||||
char* titleStart;
|
||||
char* versionStart;
|
||||
size_t titleLength;
|
||||
size_t versionLength;
|
||||
char* parsedEnd;
|
||||
while ((cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag,
|
||||
&titleStart, &titleLength)) != 0 &&
|
||||
(cursor = __nupFindTag(cursor, versionEndTag, versionStartTag,
|
||||
&versionStart, &versionLength)) != 0) {
|
||||
const char* versionEndTag = "</Version>";
|
||||
const char* versionStartTag = "<Version>";
|
||||
for (;;) {
|
||||
char* titleStart;
|
||||
char* versionStart;
|
||||
size_t titleLength;
|
||||
size_t versionLength;
|
||||
char* parsedEnd;
|
||||
cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag,
|
||||
&titleStart, &titleLength);
|
||||
if (cursor == 0) {
|
||||
break;
|
||||
}
|
||||
cursor = __nupFindTag(cursor, versionEndTag, versionStartTag,
|
||||
&versionStart, &versionLength);
|
||||
if (cursor == 0) {
|
||||
break;
|
||||
}
|
||||
unsigned long long titleId = strtoull(titleStart, &parsedEnd, 16);
|
||||
if (parsedEnd != titleStart + titleLength) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
unsigned long version = strtoul(versionStart, &parsedEnd, 10);
|
||||
if (parsedEnd != versionStart + versionLength) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
u16 checkedVersion = version;
|
||||
if (version != checkedVersion) {
|
||||
if (parsedEnd != versionStart + versionLength || (u16)version != version) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
context->titles[context->titleCount].titleId = titleId;
|
||||
context->titles[context->titleCount].serverVersion = checkedVersion;
|
||||
context->titles[context->titleCount].serverVersion = version;
|
||||
context->titleCount++;
|
||||
}
|
||||
}
|
||||
@@ -347,15 +378,15 @@ done:
|
||||
static s32 __nupGetServerInfo(char* serverAddress, char* messageId, unsigned long long deviceId,
|
||||
char* productArea, char* countryCode, unsigned long systemVersion,
|
||||
char* auditData, unsigned short bootVersion, unsigned short systemMenuVersion,
|
||||
unsigned long long currentTitleId, unsigned short currentTitleVersion,
|
||||
unsigned long long systemMenuTitleId, unsigned short currentTitleVersion,
|
||||
char** response) {
|
||||
s32 result;
|
||||
char* request = 0;
|
||||
u8* responseData = 0;
|
||||
unsigned long responseSize = 0;
|
||||
char headers[0x56] =
|
||||
"User-Agent: wii libnup/1.0\r\n"
|
||||
"SOAPAction: \"urn:nus.wsapi.broadon.com/GetSystemUpdate\"\r\n";
|
||||
char* request = 0;
|
||||
char* endpoint = 0;
|
||||
unsigned long requestSize;
|
||||
unsigned long endpointSize;
|
||||
@@ -366,9 +397,7 @@ static s32 __nupGetServerInfo(char* serverAddress, char* messageId, unsigned lon
|
||||
result = -5000;
|
||||
} 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(messageId) + strlen(productArea) + strlen(countryCode) + 0x449;
|
||||
if (auditData != 0) {
|
||||
requestSize += strlen(auditData);
|
||||
}
|
||||
@@ -407,8 +436,8 @@ static s32 __nupGetServerInfo(char* serverAddress, char* messageId, unsigned lon
|
||||
" </soapenv:Envelope>\n",
|
||||
messageId, deviceId, productArea, countryCode,
|
||||
(unsigned long long)0x0000000100000001ULL, bootVersion,
|
||||
(unsigned long long)0x0000000100000002ULL, systemMenuVersion,
|
||||
currentTitleId, currentTitleVersion,
|
||||
systemMenuTitleId, systemMenuVersion,
|
||||
(unsigned long long)0x0000000100000002ULL, currentTitleVersion,
|
||||
systemVersion, auditData != 0 ? auditData : "");
|
||||
result = __nupHttpPostFull(endpoint, headers, request, &responseData, &responseSize, 0, 0, 0);
|
||||
if (result == 0) {
|
||||
@@ -479,11 +508,8 @@ static u32 __nupSetAuditState(u8 state) {
|
||||
}
|
||||
#pragma dont_inline reset
|
||||
|
||||
static inline unsigned long __nupBase64EncodedSize(unsigned long length) {
|
||||
return ((length + 2) / 3) * 4;
|
||||
}
|
||||
|
||||
static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
const char* alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
u8* end = input + length;
|
||||
u32 value = 0;
|
||||
u32 count = 0;
|
||||
@@ -491,31 +517,23 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
|
||||
while (input != end) {
|
||||
count++;
|
||||
value <<= 8;
|
||||
value |= *input++;
|
||||
value = value << 8 | *input++;
|
||||
if (count < 3) {
|
||||
continue;
|
||||
}
|
||||
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[0] = encodedFirst;
|
||||
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
|
||||
output[1] = encodedSecond;
|
||||
u8 encodedFourth = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value & 0x3f];
|
||||
output[2] = encodedThird;
|
||||
output[3] = encodedFourth;
|
||||
output[0] = alphabet[value >> 18 & 0x3f];
|
||||
output[1] = alphabet[value >> 12 & 0x3f];
|
||||
output[2] = alphabet[value >> 6 & 0x3f];
|
||||
output[3] = alphabet[value & 0x3f];
|
||||
count = 0;
|
||||
output += 4;
|
||||
}
|
||||
|
||||
if (count == 2) {
|
||||
value <<= 8;
|
||||
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[0] = encodedFirst;
|
||||
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
|
||||
output[1] = encodedSecond;
|
||||
output[2] = encodedThird;
|
||||
output[0] = alphabet[value >> 18 & 0x3f];
|
||||
output[1] = alphabet[value >> 12 & 0x3f];
|
||||
output[2] = alphabet[value >> 6 & 0x3f];
|
||||
output[3] = fillByte;
|
||||
return;
|
||||
}
|
||||
@@ -523,10 +541,8 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
return;
|
||||
}
|
||||
value <<= 16;
|
||||
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[0] = encodedFirst;
|
||||
output[1] = encodedSecond;
|
||||
output[0] = alphabet[value >> 18 & 0x3f];
|
||||
output[1] = alphabet[value >> 12 & 0x3f];
|
||||
output[2] = fillByte;
|
||||
output[3] = fillByte;
|
||||
}
|
||||
@@ -536,16 +552,16 @@ static s32 __nupGetAuditData(NUPContextInfo* context, char** auditData) {
|
||||
u32 auditFormat = 0;
|
||||
ESTicketView* ticketViews = 0;
|
||||
u32 viewCount;
|
||||
u32 selected = 0;
|
||||
u32 selectedIndex = 0;
|
||||
void* auditRecord = 0;
|
||||
void* signatureCertificate = 0;
|
||||
void* deviceCertificate = 0;
|
||||
NUPSignedAuditData* signedData = 0;
|
||||
void* encodedData = 0;
|
||||
u32 i;
|
||||
u32 selectedIndex;
|
||||
u32 selected = 0;
|
||||
ESSignature signature ALIGN32;
|
||||
char deviceInfo[0x21];
|
||||
u32 i;
|
||||
|
||||
for (i = 0; selected == 0 && i < context->ownedTitleCount; i++) {
|
||||
ESTitleId ownedTitleId = context->ownedTitleIds[i];
|
||||
@@ -572,13 +588,11 @@ static s32 __nupGetAuditData(NUPContextInfo* context, char** auditData) {
|
||||
if (selected != 0) {
|
||||
memset(deviceInfo, 0, sizeof(deviceInfo));
|
||||
char* productCode = SCGetProductCode();
|
||||
unsigned long productCodeSize;
|
||||
unsigned long productCodeSize = 0;
|
||||
if (productCode != 0) {
|
||||
memcpy(deviceInfo, productCode, 5);
|
||||
deviceInfo[4] = '\0';
|
||||
productCodeSize = strlen(deviceInfo);
|
||||
} else {
|
||||
productCodeSize = 0;
|
||||
}
|
||||
if (SCGetProductSNString(deviceInfo + productCodeSize, sizeof(deviceInfo) - productCodeSize) == 0) {
|
||||
memset(deviceInfo + productCodeSize, 0, sizeof(deviceInfo) - productCodeSize);
|
||||
@@ -609,22 +623,16 @@ static s32 __nupGetAuditData(NUPContextInfo* context, char** auditData) {
|
||||
result = -5000;
|
||||
} else {
|
||||
memcpy(&signedData->format, &auditFormat, sizeof(auditFormat));
|
||||
u8* auditCursor = (u8*)&signedData->auditRecord;
|
||||
memcpy(auditCursor, auditRecord, sizeof(NUPAuditRecord));
|
||||
auditCursor += sizeof(NUPAuditRecord);
|
||||
memcpy(auditCursor, signature, sizeof(signature));
|
||||
auditCursor += sizeof(signature);
|
||||
memcpy(auditCursor, signatureCertificate, 0x180);
|
||||
memcpy(auditCursor + sizeof(signedData->signatureCertificate),
|
||||
deviceCertificate, sizeof(signedData->deviceCertificate));
|
||||
unsigned long auditSize = sizeof(NUPSignedAuditData);
|
||||
unsigned long encodedSize = __nupBase64EncodedSize(auditSize);
|
||||
encodedData = nup::__nupMalloc(encodedSize + 1);
|
||||
memcpy(&signedData->auditRecord, auditRecord, sizeof(NUPAuditRecord));
|
||||
memcpy(signedData->signature, signature, sizeof(signature));
|
||||
memcpy(signedData->signatureCertificate, signatureCertificate, 0x180);
|
||||
memcpy(signedData->deviceCertificate, deviceCertificate, 0x180);
|
||||
encodedData = nup::__nupMalloc(0x5a1);
|
||||
if (encodedData == 0) {
|
||||
result = -5000;
|
||||
} else {
|
||||
__nupBase64Encode((u8*)encodedData, (u8*)signedData, auditSize);
|
||||
((u8*)encodedData)[encodedSize] = 0;
|
||||
__nupBase64Encode((u8*)encodedData, (u8*)signedData, sizeof(NUPSignedAuditData));
|
||||
((u8*)encodedData)[0x5a0] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -681,59 +689,23 @@ static s32 __nupGetTmdView(ESTitleId titleId, ESTmdView** tmdView) {
|
||||
}
|
||||
#pragma dont_inline reset
|
||||
|
||||
template <class Title>
|
||||
static inline BOOL __nupHasContent(const Title* title, ESContentId contentId) {
|
||||
if (title->contentCount == 0 || title->contentIds == 0) {
|
||||
return FALSE;
|
||||
}
|
||||
ESContentId* installedContent;
|
||||
u32 index;
|
||||
for (index = 0; index < title->contentCount; index++) {
|
||||
if (contentId == *(installedContent = &title->contentIds[index])) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return index < title->contentCount;
|
||||
}
|
||||
|
||||
static inline BOOL __nupHasInstalledContent(const ESTitleVersion* title, ESContentId contentId,
|
||||
u32 contentCount) {
|
||||
if (contentCount == 0 || title->contentIds == 0) {
|
||||
return FALSE;
|
||||
}
|
||||
ESContentId* installedContent;
|
||||
u32 index;
|
||||
for (index = 0; index < contentCount; index++) {
|
||||
if (contentId == *(installedContent = &title->contentIds[index])) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return index < contentCount;
|
||||
}
|
||||
|
||||
static inline s32 __nupSetBootTitleVersion(ESTitleVersion* title) {
|
||||
u32 bootVersion;
|
||||
s32 result = ES_GetBoot2Version(&bootVersion);
|
||||
if (result == 0) {
|
||||
u16 installedVersion = bootVersion;
|
||||
if (installedVersion != bootVersion) {
|
||||
result = -0x1389;
|
||||
} else {
|
||||
title->installedVersion = installedVersion;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static s32 __nupGetBootVersion(NUPContextInfo* context, ESTitleVersion* title) {
|
||||
s32 result;
|
||||
ESTmdView* tmdView = 0;
|
||||
|
||||
if (title->titleId == 0x0000000100000001ULL) {
|
||||
u32 bootVersion;
|
||||
title->hasTicket = 1;
|
||||
title->hasTmd = 1;
|
||||
title->hasContent = 1;
|
||||
result = __nupSetBootTitleVersion(title);
|
||||
result = ES_GetBoot2Version(&bootVersion);
|
||||
if (result == 0) {
|
||||
if ((bootVersion & 0xffff) == bootVersion) {
|
||||
title->installedVersion = bootVersion;
|
||||
} else {
|
||||
result = -0x1389;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
u32 i;
|
||||
for (i = 0; i < context->ownedTitleCount; i++) {
|
||||
@@ -751,48 +723,49 @@ static s32 __nupGetBootVersion(NUPContextInfo* context, ESTitleVersion* title) {
|
||||
title->installedVersion = tmdView->head.titleVersion;
|
||||
} else if (result == -0x6a) {
|
||||
result = 0;
|
||||
} else if (result < 0) {
|
||||
}
|
||||
|
||||
if (result < 0) {
|
||||
goto done;
|
||||
}
|
||||
if (tmdView != 0) {
|
||||
result = ES_ListTitleContentsOnCard(title->titleId, 0, &title->contentCount);
|
||||
if (result == 0) {
|
||||
if (result == -0x6a) {
|
||||
result = 0;
|
||||
} else if (result == 0) {
|
||||
if (title->contentCount != 0) {
|
||||
title->contentIds = (ESContentId*)nup::__nupMalloc(title->contentCount * sizeof(ESContentId));
|
||||
if (title->contentIds == 0) {
|
||||
result = -5000;
|
||||
title->contentCount = 0;
|
||||
goto done;
|
||||
}
|
||||
result = ES_ListTitleContentsOnCard(title->titleId, title->contentIds, &title->contentCount);
|
||||
if (result != 0) {
|
||||
nup::__nupFree(title->contentIds);
|
||||
title->contentIds = 0;
|
||||
title->contentCount = 0;
|
||||
goto done;
|
||||
} else {
|
||||
result = ES_ListTitleContentsOnCard(title->titleId, title->contentIds, &title->contentCount);
|
||||
if (result != 0) {
|
||||
nup::__nupFree(title->contentIds);
|
||||
title->contentIds = 0;
|
||||
title->contentCount = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
u32 installedContentCount = title->contentCount;
|
||||
if (installedContentCount < tmdView->head.numContents) {
|
||||
goto done;
|
||||
}
|
||||
s32 contentIndex;
|
||||
for (contentIndex = 0; contentIndex < tmdView->head.numContents; contentIndex++) {
|
||||
if (!__nupHasInstalledContent(title, tmdView->contents[contentIndex].cid,
|
||||
installedContentCount)) {
|
||||
break;
|
||||
if (result == 0 && title->contentCount >= tmdView->head.numContents) {
|
||||
s32 contentIndex;
|
||||
for (contentIndex = 0; contentIndex < tmdView->head.numContents; contentIndex++) {
|
||||
u32 installedIndex;
|
||||
for (installedIndex = 0; installedIndex < title->contentCount; installedIndex++) {
|
||||
if (title->contentIds[installedIndex] == tmdView->contents[contentIndex].cid) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (installedIndex == title->contentCount) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (contentIndex >= tmdView->head.numContents) {
|
||||
title->hasContent = 1;
|
||||
}
|
||||
}
|
||||
if (contentIndex < tmdView->head.numContents) {
|
||||
goto done;
|
||||
}
|
||||
title->hasContent = 1;
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
if (result == -0x6a) {
|
||||
result = 0;
|
||||
}
|
||||
}
|
||||
|
||||
done:
|
||||
@@ -906,8 +879,8 @@ static s32 __nupGetTmd(NUPTitleInfo* title, char* contentPrefixUrl) {
|
||||
}
|
||||
|
||||
static s32 __nupGetTitleSize(NUPTitleInfo* title) {
|
||||
s32 result = 0;
|
||||
s32 contentIndex;
|
||||
s32 result = 0;
|
||||
title->progressStep += 2;
|
||||
if (title->hasTicket == 0) {
|
||||
title->progressStep += 1;
|
||||
@@ -923,15 +896,23 @@ 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) ||
|
||||
u32 ownedIndex;
|
||||
ownedIndex = 0;
|
||||
if (title->contentCount != 0 && title->contentIds != 0) {
|
||||
for (; ownedIndex < title->contentCount; ownedIndex++) {
|
||||
if (title->contentIds[ownedIndex] == content->cid) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (title->contentIds == 0 || ownedIndex == title->contentCount ||
|
||||
title->titleId == 0x0000000100000001ULL) {
|
||||
if (content->size > 0xffffffefULL) {
|
||||
if (content->size >= 0xfffffff0ULL) {
|
||||
result = -0x1394;
|
||||
break;
|
||||
}
|
||||
title->updateContentSize += (content->size + 0xf) & 0xfffffffffffffff0ULL;
|
||||
title->installedContentSize += (((ESTmdView*)title->tmdView)->contents[contentIndex].size + 0x3fff) & 0xffffffffffffc000ULL;
|
||||
title->installedContentSize += (content->size + 0x3fff) & 0xffffffffffffc000ULL;
|
||||
title->progressStep++;
|
||||
}
|
||||
}
|
||||
@@ -940,16 +921,15 @@ static s32 __nupGetTitleSize(NUPTitleInfo* title) {
|
||||
|
||||
static s32 __nupGetContentFull(NUPContextInfo* context, NUPTitleInfo* title, char* contentPrefixUrl,
|
||||
unsigned long contentId) {
|
||||
ESTmdView* tmdView;
|
||||
ESTmdView* tmdView = (ESTmdView*)title->tmdView;
|
||||
s32 contentIndex;
|
||||
s32 result;
|
||||
char* url = 0;
|
||||
u8* response = 0;
|
||||
unsigned long responseSize = 0;
|
||||
tmdView = (ESTmdView*)title->tmdView;
|
||||
char* url = 0;
|
||||
|
||||
for (contentIndex = 0; contentIndex < tmdView->head.numContents; contentIndex++) {
|
||||
if (contentId == ((ESTmdView*)title->tmdView)->contents[contentIndex].cid) {
|
||||
if (tmdView->contents[contentIndex].cid == contentId) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -957,10 +937,8 @@ static s32 __nupGetContentFull(NUPContextInfo* context, NUPTitleInfo* title, cha
|
||||
result = -0x1389;
|
||||
} else {
|
||||
u64 contentSize = tmdView->contents[contentIndex].size;
|
||||
unsigned long urlSize;
|
||||
unsigned long alignedSize;
|
||||
alignedSize = (u32)((contentSize + 0xf) & ~0xfULL);
|
||||
urlSize = strlen(contentPrefixUrl) + 0x28;
|
||||
unsigned long alignedSize = (u32)((contentSize + 0xf) & ~0xfULL);
|
||||
unsigned long urlSize = strlen(contentPrefixUrl) + 0x28;
|
||||
url = (char*)nup::__nupMalloc(urlSize);
|
||||
if (url == 0) {
|
||||
result = -5000;
|
||||
@@ -983,12 +961,26 @@ static s32 __nupGetContentFull(NUPContextInfo* context, NUPTitleInfo* title, cha
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline BOOL __nupHasContent(const NUPTitleInfo* title, ESContentId contentId) {
|
||||
if (title->contentCount == 0 || title->contentIds == 0) {
|
||||
return FALSE;
|
||||
}
|
||||
ESContentId* installedContent = title->contentIds;
|
||||
u32 index;
|
||||
for (index = 0; index < title->contentCount; index++) {
|
||||
if (contentId == *installedContent) {
|
||||
break;
|
||||
}
|
||||
installedContent++;
|
||||
}
|
||||
return index < title->contentCount;
|
||||
}
|
||||
|
||||
static s32 __nupGetContentIncr(NUPContextInfo* context, NUPTitleInfo* title, char* contentPrefixUrl) {
|
||||
u32 contentIndex;
|
||||
s32 result = 0;
|
||||
char* url;
|
||||
unsigned long urlSize = strlen(contentPrefixUrl) + 0x28;
|
||||
url = (char*)nup::__nupMalloc(urlSize);
|
||||
s32 contentIndex;
|
||||
char* url = (char*)nup::__nupMalloc(urlSize);
|
||||
|
||||
if (url == 0) {
|
||||
result = -5000;
|
||||
@@ -997,14 +989,14 @@ static s32 __nupGetContentIncr(NUPContextInfo* context, NUPTitleInfo* title, cha
|
||||
ESContentId contentId = ((ESTmdView*)title->tmdView)->contents[contentIndex].cid;
|
||||
if (!__nupHasContent(title, contentId)) {
|
||||
snprintf(url, urlSize, "%s/%016llx/%08x", contentPrefixUrl, title->titleId, contentId);
|
||||
unsigned long contentSize = (u32)((((ESTmdView*)title->tmdView)->contents[contentIndex].size + 0xf) & 0xfffffffffffffff0ULL);
|
||||
unsigned long contentSize = ((ESTmdView*)title->tmdView)->contents[contentIndex].size;
|
||||
ESFd fd = ES_ImportContentBegin(title->titleId, contentId);
|
||||
result = fd;
|
||||
if (result < 0) {
|
||||
ES_ImportContentEnd(fd);
|
||||
break;
|
||||
}
|
||||
result = __nupHttpGetIncr(url, contentSize,
|
||||
result = __nupHttpGetIncr(url, (contentSize + 0xf) & 0xfffffff0,
|
||||
__nupUpdateStatusIncr, context, __nupHttpBufferFlushES, (void*)fd);
|
||||
if (result != 0) {
|
||||
ES_ImportContentEnd(fd);
|
||||
@@ -1093,16 +1085,6 @@ static void __nupCleanup(NUPContextInfo* context) {
|
||||
context->productArea = 0;
|
||||
}
|
||||
|
||||
static inline s32 __nupCheckTitleSpace(const NUPTitleInfo* title) {
|
||||
ISFSStats stats;
|
||||
s32 result = ISFS_GetStats(&stats);
|
||||
if (result == 0 && (title->installedContentSize >> 14) <= stats.freeBlocks &&
|
||||
title->progressStep <= stats.freeInodes) {
|
||||
result = 1;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static s32 __nupUpdateTitle(NUPContextInfo* context, NUPTitleInfo* title, char* contentPrefixUrl,
|
||||
char* uncachedContentPrefixUrl) {
|
||||
s32 result;
|
||||
@@ -1124,12 +1106,13 @@ static s32 __nupUpdateTitle(NUPContextInfo* context, NUPTitleInfo* title, char*
|
||||
title->ticketCertificateSize, (ESTitleMeta*)title->tmd,
|
||||
title->tmdSize, title->tmdCertificate, title->tmdCertificateSize,
|
||||
0, 0, title->content, title->contentSize);
|
||||
if (result != 0) {
|
||||
goto done;
|
||||
}
|
||||
goto cleanup;
|
||||
} else {
|
||||
result = __nupCheckTitleSpace(title);
|
||||
ISFSStats stats;
|
||||
result = ISFS_GetStats(&stats);
|
||||
if (result == 0 && stats.freeBlocks >= (title->installedContentSize >> 14) &&
|
||||
title->progressStep <= stats.freeInodes) {
|
||||
result = 1;
|
||||
}
|
||||
if (result == 0) {
|
||||
result = -0x1392;
|
||||
goto done;
|
||||
@@ -1158,97 +1141,47 @@ static s32 __nupUpdateTitle(NUPContextInfo* context, NUPTitleInfo* title, char*
|
||||
goto done;
|
||||
}
|
||||
result = ES_ImportTitleDone();
|
||||
if (result != 0) {
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
cleanup:
|
||||
__nupCleanupTitleInfo(title);
|
||||
title->updateRequired = 0;
|
||||
if (result == 0) {
|
||||
__nupCleanupTitleInfo(title);
|
||||
title->updateRequired = 0;
|
||||
}
|
||||
done:
|
||||
return result;
|
||||
}
|
||||
|
||||
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; }
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline s32 __nupGetOwnedTitles(NUPContextInfo* context) {
|
||||
s32 result = ES_ListOwnedTitles(0, &context->ownedTitleCount);
|
||||
if (result == 0) {
|
||||
context->ownedTitleIds = (ESTitleId*)nup::__nupMalloc(context->ownedTitleCount * sizeof(ESTitleId));
|
||||
if (context->ownedTitleIds != 0) {
|
||||
result = ES_ListOwnedTitles(context->ownedTitleIds, &context->ownedTitleCount);
|
||||
} else {
|
||||
result = -5000;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline s32 __nupCheckTitleVersion(NUPContextInfo* context, NUPTitleInfo* title) {
|
||||
s32 result = __nupGetBootVersion(context, (ESTitleVersion*)title);
|
||||
if (result == 0) {
|
||||
if (title->hasTicket && title->hasTmd && title->hasContent &&
|
||||
title->installedVersion >= title->serverVersion) {
|
||||
title->updateRequired = 0;
|
||||
} else {
|
||||
title->updateRequired = 1;
|
||||
}
|
||||
}
|
||||
if (result >= 0) {
|
||||
result = title->updateRequired;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline void __nupSetStatus(NUPContextInfo* context, s32 status) {
|
||||
OSLockMutex(&context->mutex);
|
||||
context->progress.result = status;
|
||||
if (status < 0) {
|
||||
context->progress.message = __nupStatusMessage[5];
|
||||
} else if (status >= 4) {
|
||||
context->progress.message = __nupStatusMessage[4];
|
||||
} else {
|
||||
context->progress.message = __nupStatusMessage[status];
|
||||
}
|
||||
OSUnlockMutex(&context->mutex);
|
||||
}
|
||||
|
||||
extern "C" void* __nupOp(void* argument) {
|
||||
NUPContextInfo* context = (NUPContextInfo*)argument;
|
||||
u8* response = 0;
|
||||
ESTmdView* tmdView = 0;
|
||||
u32 currentDeviceId;
|
||||
u32 needsAudit;
|
||||
char* auditData = 0;
|
||||
s32 result;
|
||||
u16 serverBootVersion = 0;
|
||||
u16 bootTitleVersion;
|
||||
u16 systemMenuVersion;
|
||||
ESTitleId currentTitleId;
|
||||
NUPTitleInfo* bootTitle = 0;
|
||||
NUPTitleInfo* menuTitle = 0;
|
||||
NUPTitleInfo* systemTitle = 0;
|
||||
NUPContextInfo* context = (NUPContextInfo*)argument;
|
||||
u32 deviceId;
|
||||
u32 bootVersion;
|
||||
u16 serverBootVersion = 0;
|
||||
u16 bootTitleVersion;
|
||||
u16 systemMenuVersion;
|
||||
ESTitleId systemMenuTitleId;
|
||||
char messageId[0x15];
|
||||
NANDStatus auditStatus;
|
||||
s32 result;
|
||||
u32 i;
|
||||
BOOL needsAudit;
|
||||
|
||||
snprintf(messageId, sizeof(messageId), "%llu", OSGetTime());
|
||||
result = ES_GetDeviceId(&deviceId);
|
||||
if (result != 0) {
|
||||
goto done;
|
||||
}
|
||||
currentDeviceId = deviceId;
|
||||
result = __nupGetBoot2Version(&serverBootVersion);
|
||||
result = ES_GetBoot2Version(&bootVersion);
|
||||
if (result == 0) {
|
||||
serverBootVersion = bootVersion;
|
||||
if (serverBootVersion != bootVersion) {
|
||||
result = -0x1389;
|
||||
}
|
||||
}
|
||||
if (result < 0) {
|
||||
goto done;
|
||||
}
|
||||
@@ -1257,17 +1190,25 @@ extern "C" void* __nupOp(void* argument) {
|
||||
goto done;
|
||||
}
|
||||
bootTitleVersion = tmdView->head.titleVersion;
|
||||
currentTitleId = tmdView->head.sysVersion;
|
||||
systemMenuTitleId = tmdView->head.sysVersion;
|
||||
nup::__nupFree(tmdView);
|
||||
tmdView = 0;
|
||||
result = __nupGetTmdView(currentTitleId, &tmdView);
|
||||
result = __nupGetTmdView(systemMenuTitleId, &tmdView);
|
||||
if (result < 0) {
|
||||
goto done;
|
||||
}
|
||||
systemMenuVersion = tmdView->head.titleVersion;
|
||||
nup::__nupFree(tmdView);
|
||||
tmdView = 0;
|
||||
result = __nupGetOwnedTitles(context);
|
||||
result = ES_ListOwnedTitles(0, &context->ownedTitleCount);
|
||||
if (result == 0) {
|
||||
context->ownedTitleIds = (ESTitleId*)nup::__nupMalloc(context->ownedTitleCount * sizeof(ESTitleId));
|
||||
if (context->ownedTitleIds != 0) {
|
||||
result = ES_ListOwnedTitles(context->ownedTitleIds, &context->ownedTitleCount);
|
||||
} else {
|
||||
result = -5000;
|
||||
}
|
||||
}
|
||||
if (result != 0) {
|
||||
goto done;
|
||||
}
|
||||
@@ -1286,10 +1227,10 @@ extern "C" void* __nupOp(void* argument) {
|
||||
context->progress.message = __nupStatusMessage[2];
|
||||
OSUnlockMutex(&context->mutex);
|
||||
result = __nupGetServerInfo((char*)context->serverAddress, messageId,
|
||||
0x0000000100000000ULL | currentDeviceId,
|
||||
0x0000000100000000ULL | deviceId,
|
||||
(char*)context->productArea, (char*)context->countryCode,
|
||||
context->systemVersion, auditData, serverBootVersion, bootTitleVersion,
|
||||
currentTitleId, systemMenuVersion, (char**)&response);
|
||||
systemMenuTitleId, systemMenuVersion, (char**)&response);
|
||||
if (result != 0) {
|
||||
goto done;
|
||||
}
|
||||
@@ -1298,7 +1239,7 @@ extern "C" void* __nupOp(void* argument) {
|
||||
}
|
||||
auditData = 0;
|
||||
result = __nupParseServerInfo(context, (char*)response, messageId,
|
||||
0x0000000100000000ULL | currentDeviceId);
|
||||
0x0000000100000000ULL | deviceId);
|
||||
if (result != 0) {
|
||||
goto done;
|
||||
}
|
||||
@@ -1310,7 +1251,18 @@ extern "C" void* __nupOp(void* argument) {
|
||||
}
|
||||
for (i = 0; i < context->titleCount; i++) {
|
||||
NUPTitleInfo* title = &context->titles[i];
|
||||
result = __nupCheckTitleVersion(context, title);
|
||||
result = __nupGetBootVersion(context, (ESTitleVersion*)title);
|
||||
if (result == 0) {
|
||||
if (title->hasTicket && title->hasTmd && title->hasContent &&
|
||||
title->installedVersion >= title->serverVersion) {
|
||||
title->updateRequired = 0;
|
||||
} else {
|
||||
title->updateRequired = 1;
|
||||
}
|
||||
}
|
||||
if (result >= 0) {
|
||||
result = title->updateRequired;
|
||||
}
|
||||
if (result < 0) {
|
||||
goto done;
|
||||
}
|
||||
@@ -1350,12 +1302,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 == systemMenuTitleId) {
|
||||
systemTitle = title;
|
||||
}
|
||||
if (bootTitle != 0 && menuTitle != 0 && systemTitle != 0) {
|
||||
@@ -1414,11 +1365,17 @@ done:
|
||||
}
|
||||
__nupCleanup(context);
|
||||
if (result >= 0) {
|
||||
__nupSetStatus(context, 0);
|
||||
OSLockMutex(&context->mutex);
|
||||
context->progress.result = 0;
|
||||
context->progress.message = __nupStatusMessage[0];
|
||||
OSUnlockMutex(&context->mutex);
|
||||
} else {
|
||||
__nupSetStatus(context, result);
|
||||
OSLockMutex(&context->mutex);
|
||||
context->progress.result = result;
|
||||
context->progress.message = __nupStatusMessage[5];
|
||||
OSUnlockMutex(&context->mutex);
|
||||
}
|
||||
return (void*)result;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void* NUP_Init(MEMAllocator* allocator) {
|
||||
|
||||
@@ -41,7 +41,8 @@ int __nupRegisterAllocator(MEMAllocator* allocator) {
|
||||
} else {
|
||||
if (((MEMHeapHandle)allocator->heap)->magic != 0x45585048) {
|
||||
result = -5011;
|
||||
} else {
|
||||
}
|
||||
if (((MEMHeapHandle)allocator->heap)->magic == 0x45585048) {
|
||||
__mem = allocator;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#include <private/os/OSTime.h>
|
||||
#include <private/bus.h>
|
||||
|
||||
static volatile int __i2c_ident_flag = 1;
|
||||
static int __i2c_ident_flag = 1;
|
||||
static u32 __i2c_ident_first;
|
||||
|
||||
#define I2C_OUT 0xCD8000C0
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
extern void SIRefreshSamplingRate(void);
|
||||
extern void VISetRGBModeImm(void);
|
||||
extern void __VISetRevolutionModeSimple(void);
|
||||
extern volatile u32 Vdac_Flag_Changed_816991E0;
|
||||
extern u32 Vdac_Flag_Changed_816991E0;
|
||||
extern void __VISetYUVSEL(u32 enable);
|
||||
extern void __VISetFilter4EURGB60(u32 enable);
|
||||
extern void __VISetCGMS(void);
|
||||
@@ -28,87 +28,66 @@ extern u64 __shl2i(u64 value, s32 shift);
|
||||
const char* __VIVersion =
|
||||
"<< RVL_SDK - VI \trelease build: Apr 20 2010 11:20:54 (0x4199_60831) >>";
|
||||
|
||||
|
||||
static u16 shdwRegs[59];
|
||||
static u16 regs[59];
|
||||
static VIHorVer HorVer;
|
||||
static u32 __VIDimmingFlag_DEV_IDLE[10];
|
||||
static u32 IsInitialized;
|
||||
static u32 vsync_timing_err_cnt;
|
||||
static u32 vsync_timing_test_flag;
|
||||
|
||||
static VITiming timing[11] = {
|
||||
{ 6, 240, 24, 25, 3, 2, 12, 13, 12, 13, 520, 519, 520, 519, 525, 429, 64, 71, 105, 162, 373, 122, 412 },
|
||||
{ 6, 240, 24, 24, 4, 4, 12, 12, 12, 12, 520, 520, 520, 520, 526, 429, 64, 71, 105, 162, 373, 122, 412 },
|
||||
{ 5, 287, 35, 36, 1, 0, 13, 12, 11, 10, 619, 618, 617, 620, 625, 432, 64, 75, 106, 172, 380, 133, 420 },
|
||||
{ 5, 287, 33, 33, 2, 2, 13, 11, 13, 11, 619, 621, 619, 621, 624, 432, 64, 75, 106, 172, 380, 133, 420 },
|
||||
{ 6, 240, 24, 25, 3, 2, 16, 15, 14, 13, 518, 517, 516, 519, 525, 429, 64, 78, 112, 162, 373, 122, 412 },
|
||||
{ 6, 240, 24, 24, 4, 4, 16, 14, 16, 14, 518, 520, 518, 520, 526, 429, 64, 78, 112, 162, 373, 122, 412 },
|
||||
{ 12, 480, 48, 48, 6, 6, 24, 24, 24, 24, 1038, 1038, 1038, 1038, 1050, 429, 64, 71, 105, 162, 373, 122, 412 },
|
||||
{ 12, 480, 44, 44, 10, 10, 24, 24, 24, 24, 1038, 1038, 1038, 1038, 1050, 429, 64, 71, 105, 168, 379, 122, 412 },
|
||||
{ 6, 241, 24, 25, 1, 0, 12, 13, 12, 13, 520, 519, 520, 519, 525, 429, 64, 71, 105, 159, 370, 122, 412 },
|
||||
{ 12, 480, 48, 48, 6, 6, 24, 24, 24, 24, 1038, 1038, 1038, 1038, 1050, 429, 64, 71, 105, 180, 391, 122, 412 },
|
||||
{ 10, 576, 62, 62, 6, 6, 20, 20, 20, 20, 1240, 1240, 1240, 1240, 1250, 432, 64, 75, 106, 172, 380, 122, 412 },
|
||||
{ 6, 240, 24, 25, 3, 2, 12, 13, 12, 13, 520, 519, 520, 519, 525, 429, 64, 71, 105, 162, 373, 122, 412 },
|
||||
{ 6, 240, 24, 24, 4, 4, 12, 12, 12, 12, 520, 520, 520, 520, 526, 429, 64, 71, 105, 162, 373, 122, 412 },
|
||||
{ 5, 287, 35, 36, 1, 0, 13, 12, 11, 10, 619, 618, 617, 620, 625, 432, 64, 75, 106, 172, 380, 133, 420 },
|
||||
{ 5, 287, 33, 33, 2, 2, 13, 11, 13, 11, 619, 621, 619, 621, 624, 432, 64, 75, 106, 172, 380, 133, 420 },
|
||||
{ 6, 240, 24, 25, 3, 2, 16, 15, 14, 13, 518, 517, 516, 519, 525, 429, 64, 78, 112, 162, 373, 122, 412 },
|
||||
{ 6, 240, 24, 24, 4, 4, 16, 14, 16, 14, 518, 520, 518, 520, 526, 429, 64, 78, 112, 162, 373, 122, 412 },
|
||||
{ 12, 480, 48, 48, 6, 6, 24, 24, 24, 24, 1038, 1038, 1038, 1038, 1050, 429, 64, 71, 105, 162, 373, 122, 412 },
|
||||
{ 12, 480, 44, 44, 10, 10, 24, 24, 24, 24, 1038, 1038, 1038, 1038, 1050, 429, 64, 71, 105, 168, 379, 122, 412 },
|
||||
{ 6, 241, 24, 25, 1, 0, 12, 13, 12, 13, 520, 519, 520, 519, 525, 429, 64, 71, 105, 159, 370, 122, 412 },
|
||||
{ 12, 480, 48, 48, 6, 6, 24, 24, 24, 24, 1038, 1038, 1038, 1038, 1050, 429, 64, 71, 105, 180, 391, 122, 412 },
|
||||
{ 10, 576, 62, 62, 6, 6, 20, 20, 20, 20, 1240, 1240, 1240, 1240, 1250, 432, 64, 75, 106, 172, 380, 122, 412 },
|
||||
};
|
||||
|
||||
static u16 taps[25] = {
|
||||
0x01F0, 0x01DC, 0x01AE, 0x0174, 0x0129,
|
||||
0x00DB, 0x008E, 0x0046, 0x000C, 0x00E2,
|
||||
0x00CB, 0x00C0, 0x00C4, 0x00CF, 0x00DE,
|
||||
0x00EC, 0x00FC, 0x0008, 0x000F, 0x0013,
|
||||
0x0013, 0x000F, 0x000C, 0x0008, 0x0001,
|
||||
0x01F0, 0x01DC, 0x01AE, 0x0174, 0x0129, 0x00DB, 0x008E, 0x0046, 0x000C,
|
||||
0x00E2, 0x00CB, 0x00C0, 0x00C4, 0x00CF, 0x00DE, 0x00EC, 0x00FC, 0x0008,
|
||||
0x000F, 0x0013, 0x0013, 0x000F, 0x000C, 0x0008, 0x0001,
|
||||
};
|
||||
|
||||
GXRenderModeObj GXPal528Prog = {
|
||||
6, 640, 528, 528, 40, 23, 640, 528, 0, 0, 0,
|
||||
{{6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}},
|
||||
{0, 0, 21, 22, 21, 0, 0},
|
||||
};
|
||||
|
||||
GXRenderModeObj GXPal528ProgSoft = {
|
||||
6, 640, 528, 528, 40, 23, 640, 528, 0, 0, 0,
|
||||
{{6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}},
|
||||
{8, 8, 10, 12, 10, 8, 8},
|
||||
};
|
||||
|
||||
GXRenderModeObj GXPal524ProgAa = {
|
||||
6, 640, 264, 524, 40, 23, 640, 524, 0, 0, 1,
|
||||
{{3, 2}, {9, 6}, {3, 10}, {3, 2}, {9, 6}, {3, 10}, {9, 2}, {3, 6}, {9, 10}, {9, 2}, {3, 6}, {9, 10}},
|
||||
{4, 8, 12, 16, 12, 8, 4},
|
||||
};
|
||||
|
||||
static BOOL IsInitialized = FALSE;
|
||||
static volatile s32 vsync_timing_err_cnt = 0;
|
||||
static volatile BOOL vsync_timing_test_flag = 0;
|
||||
static volatile BOOL __VIDimming_All_Clear = 0;
|
||||
static volatile u32 THD_TIME_TO_DIMMING = 0;
|
||||
static volatile u32 NEW_TIME_TO_DIMMING = 0;
|
||||
static volatile u32 THD_TIME_TO_DVD_STOP = 0;
|
||||
static volatile u32 _gIdleCount_dimming = 0;
|
||||
static volatile u32 _gIdleCount_dvd = 0;
|
||||
static volatile s32 __VIDimmingState = 0;
|
||||
static void (*PositionCallback)(s16, s16) = NULL;
|
||||
static s16 displayOffsetH = 0;
|
||||
static s16 displayOffsetV = 0;
|
||||
static volatile u32 changeMode = 0;
|
||||
static volatile u64 changed = 0;
|
||||
static volatile u32 shdwChangeMode = 0;
|
||||
static volatile u64 shdwChanged = 0;
|
||||
static u32 FBSet = FALSE;
|
||||
static VITiming* timingExtra = NULL;
|
||||
static volatile u32 retraceCount;
|
||||
static volatile u32 flushFlag;
|
||||
static volatile u32 flushFlag3in1;
|
||||
static volatile BOOL __VIDimmingFlag_Enable;
|
||||
static volatile BOOL __VIDVDStopFlag_Enable;
|
||||
static volatile s32 g_current_time_to_dim;
|
||||
static volatile BOOL __VIDimmingFlag_RF_IDLE;
|
||||
static volatile BOOL __VIDimmingFlag_SI_IDLE;
|
||||
static OSThreadQueue retraceQueue;
|
||||
static void (*PreCB)(u32);
|
||||
static void (*PostCB)(u32);
|
||||
static VIRetraceCallback PreCB;
|
||||
static VIRetraceCallback PostCB;
|
||||
static void (*PositionCallback)(s16, s16);
|
||||
static VITiming* timingExtra;
|
||||
static void* CurrBufAddr;
|
||||
static u32 encoderType;
|
||||
static VITiming* CurrTiming;
|
||||
static u32 CurrTvMode;
|
||||
static u32 retraceCount;
|
||||
static OSThreadQueue retraceQueue;
|
||||
static u64 changed;
|
||||
static u64 shdwChanged;
|
||||
static u32 changeMode;
|
||||
static u32 shdwChangeMode;
|
||||
static u32 FBSet;
|
||||
static u32 flushFlag;
|
||||
static u32 flushFlag3in1;
|
||||
static u32 NextBufAddr;
|
||||
static u32 CurrBufAddr;
|
||||
static u16 regs[59];
|
||||
static volatile BOOL __VIDimmingFlag_DEV_IDLE[10];
|
||||
static VIHorVer HorVer;
|
||||
static volatile u16 shdwRegs[59];
|
||||
static s16 displayOffsetH;
|
||||
static s16 displayOffsetV;
|
||||
static u32 CurrTvMode;
|
||||
static VITiming* CurrTiming;
|
||||
static u32 __VIDimming_All_Clear;
|
||||
static u32 __VIDimmingState;
|
||||
static u32 _gIdleCount_dimming;
|
||||
static u32 _gIdleCount_dvd;
|
||||
static u32 __VIDimmingFlag_SI_IDLE;
|
||||
static u32 __VIDimmingFlag_RF_IDLE;
|
||||
static BOOL __VIDVDStopFlag_Enable;
|
||||
static BOOL __VIDimmingFlag_Enable;
|
||||
static s32 g_current_time_to_dim;
|
||||
static u32 THD_TIME_TO_DIMMING;
|
||||
static u32 NEW_TIME_TO_DIMMING;
|
||||
static u32 THD_TIME_TO_DVD_STOP;
|
||||
|
||||
#define MARK_CHANGED(index) (changed |= (1LL << (63 - (index))))
|
||||
#pragma dont_inline on
|
||||
@@ -116,7 +95,6 @@ static VITiming* getTiming(VITVMode mode);
|
||||
static void AdjustPosition(u16 acv);
|
||||
static s32 cntlzd(u64 bits);
|
||||
static u32 getCurrentHalfLine(void);
|
||||
static u32 getCurrentFieldEvenOdd(void);
|
||||
void __VIDisplayPositionToXY(u32 horizontalCount, u32 verticalCount,
|
||||
s16* pixelX, s16* pixelY);
|
||||
#pragma dont_inline reset
|
||||
@@ -124,63 +102,78 @@ void __VIDisplayPositionToXY(u32 horizontalCount, u32 verticalCount,
|
||||
static BOOL OnShutdown(BOOL final, u32 event)
|
||||
{
|
||||
static BOOL first = TRUE;
|
||||
static u32 count;
|
||||
BOOL result;
|
||||
static u32 previousRetraceCount;
|
||||
BOOL enabled;
|
||||
s32 registerIndex;
|
||||
|
||||
if (final == FALSE) {
|
||||
switch (event) {
|
||||
case 3:
|
||||
case 1:
|
||||
case 2: {
|
||||
if (first) {
|
||||
VISetRGBModeImm();
|
||||
VIFlush();
|
||||
count = retraceCount;
|
||||
first = FALSE;
|
||||
result = FALSE;
|
||||
} else {
|
||||
if (count == retraceCount) {
|
||||
result = FALSE;
|
||||
} else {
|
||||
result = TRUE;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 4:
|
||||
case 0:
|
||||
case 6:
|
||||
case 5: {
|
||||
result = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
result = TRUE;
|
||||
if (final) {
|
||||
goto returnTrue;
|
||||
}
|
||||
if ((s32)event < 4) {
|
||||
if (event == 0) {
|
||||
goto returnTrue;
|
||||
}
|
||||
if ((s32)event >= 0) {
|
||||
goto beginShutdown;
|
||||
}
|
||||
return final;
|
||||
}
|
||||
if ((s32)event >= 7) {
|
||||
return final;
|
||||
}
|
||||
goto returnTrue;
|
||||
beginShutdown:
|
||||
if (first) {
|
||||
VISetRGBModeImm();
|
||||
enabled = OSDisableInterrupts();
|
||||
shdwChangeMode |= changeMode;
|
||||
changeMode = 0;
|
||||
shdwChanged |= changed;
|
||||
while (changed != 0) {
|
||||
registerIndex = cntlzd(changed);
|
||||
shdwRegs[registerIndex] = regs[registerIndex];
|
||||
changed &= ~__shl2i((u64)1, 63 - registerIndex);
|
||||
}
|
||||
flushFlag = 1;
|
||||
flushFlag3in1 = 1;
|
||||
NextBufAddr = HorVer.bufAddr;
|
||||
OSRestoreInterrupts(enabled);
|
||||
previousRetraceCount = retraceCount;
|
||||
first = FALSE;
|
||||
return FALSE;
|
||||
}
|
||||
if (previousRetraceCount == retraceCount) {
|
||||
return FALSE;
|
||||
}
|
||||
goto returnTrue;
|
||||
|
||||
return result;
|
||||
returnTrue:
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static OSShutdownFunctionInfo shutdownFunction = { OnShutdown, 0x7F, 0, 0 };
|
||||
|
||||
static BOOL VISetRegs(void)
|
||||
{
|
||||
u32 halfLine;
|
||||
s32 registerIndex;
|
||||
|
||||
if (shdwChangeMode != 1 || getCurrentFieldEvenOdd() != 0) {
|
||||
while (shdwChanged != 0) {
|
||||
registerIndex = cntlzd(shdwChanged);
|
||||
__VIRegs[registerIndex] = shdwRegs[registerIndex];
|
||||
shdwChanged &= ~((u64)1 << (63 - registerIndex));
|
||||
if (shdwChangeMode == 1) {
|
||||
halfLine = getCurrentHalfLine();
|
||||
if (halfLine >= CurrTiming->nhlines) {
|
||||
return FALSE;
|
||||
}
|
||||
shdwChangeMode = 0;
|
||||
CurrTiming = HorVer.timing;
|
||||
CurrTvMode = HorVer.tv;
|
||||
CurrBufAddr = NextBufAddr;
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
while (shdwChanged != 0) {
|
||||
registerIndex = cntlzd(shdwChanged);
|
||||
__VIRegs[registerIndex] = shdwRegs[registerIndex];
|
||||
shdwChanged &= ~((u64)1 << (63 - registerIndex));
|
||||
}
|
||||
shdwChangeMode = 0;
|
||||
CurrTiming = HorVer.timing;
|
||||
CurrTvMode = HorVer.tv;
|
||||
CurrBufAddr = (void*)NextBufAddr;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void __VIRetraceHandler(__OSInterrupt interrupt, OSContext* context)
|
||||
@@ -188,12 +181,12 @@ static void __VIRetraceHandler(__OSInterrupt interrupt, OSContext* context)
|
||||
OSContext exceptionContext;
|
||||
u16 registerValue;
|
||||
u32 interruptFlags;
|
||||
static u32 old_dtvStatus = 999;
|
||||
static u32 old_tvtype = 999;
|
||||
static BOOL __VIDimmingFlag_Enable_old = TRUE;
|
||||
static BOOL __VIDVDStopFlag_Enable_old = TRUE;
|
||||
static u32 DimmingON_Pending;
|
||||
static u32 DimmingOFF_Pending;
|
||||
static u32 oldDtvStatus = 999;
|
||||
static u32 oldTvType = 999;
|
||||
static BOOL oldDimmingEnable = TRUE;
|
||||
static BOOL oldDvdStopEnable = TRUE;
|
||||
static u32 dimmingOnPending;
|
||||
static u32 dimmingOffPending;
|
||||
u32 currentDtvStatus;
|
||||
u32 currentTvType;
|
||||
u32 changeBit;
|
||||
@@ -257,9 +250,10 @@ position_interrupt:
|
||||
PreCB(retraceCount);
|
||||
}
|
||||
if (vsync_timing_test_flag != 0) {
|
||||
u32 vertical;
|
||||
u32 horizontal;
|
||||
u32 previousVertical;
|
||||
u32 horizontal;
|
||||
u32 vertical;
|
||||
u32 currentLine;
|
||||
|
||||
vertical = __VIRegs[22] & 0x7FF;
|
||||
do {
|
||||
@@ -267,30 +261,50 @@ position_interrupt:
|
||||
horizontal = __VIRegs[23] & 0x7FF;
|
||||
vertical = __VIRegs[22] & 0x7FF;
|
||||
} while (previousVertical != vertical);
|
||||
if (vertical != 1 && vertical != (CurrTiming->nhlines / 2) + 1) {
|
||||
currentLine = (CurrTiming->nhlines / 2) + 1;
|
||||
if (vertical != 1 && vertical != currentLine) {
|
||||
vsync_timing_err_cnt++;
|
||||
}
|
||||
}
|
||||
if (flushFlag != 0) {
|
||||
if (VISetRegs()) {
|
||||
flushFlag = 0;
|
||||
SIRefreshSamplingRate();
|
||||
}
|
||||
if (flushFlag != 0 && VISetRegs()) {
|
||||
flushFlag = 0;
|
||||
SIRefreshSamplingRate();
|
||||
}
|
||||
currentDtvStatus = VIGetDTVStatus();
|
||||
if (currentDtvStatus != old_dtvStatus) {
|
||||
{
|
||||
BOOL enabled;
|
||||
|
||||
enabled = OSDisableInterrupts();
|
||||
currentDtvStatus = __VIRegs[55] & 3;
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
currentDtvStatus &= 1;
|
||||
if (currentDtvStatus != oldDtvStatus) {
|
||||
__VISetYUVSEL(currentDtvStatus);
|
||||
}
|
||||
old_dtvStatus = currentDtvStatus;
|
||||
currentTvType = VIGetTvFormat();
|
||||
if (currentTvType != old_tvtype) {
|
||||
if (currentTvType == 5) {
|
||||
__VISetFilter4EURGB60(TRUE);
|
||||
} else {
|
||||
__VISetFilter4EURGB60(FALSE);
|
||||
}
|
||||
switch (currentTvType) {
|
||||
oldDtvStatus = currentDtvStatus;
|
||||
{
|
||||
BOOL enabled;
|
||||
|
||||
enabled = OSDisableInterrupts();
|
||||
currentTvType = CurrTvMode;
|
||||
switch (CurrTvMode) {
|
||||
case 0:
|
||||
case 3:
|
||||
case 6:
|
||||
case 7:
|
||||
case 8:
|
||||
currentTvType = 0;
|
||||
break;
|
||||
case 1:
|
||||
case 4:
|
||||
currentTvType = 1;
|
||||
break;
|
||||
}
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
if (currentTvType != oldTvType) {
|
||||
__VISetFilter4EURGB60(currentTvType == 5);
|
||||
if (currentTvType == 1) {
|
||||
switch (g_current_time_to_dim) {
|
||||
case 1:
|
||||
NEW_TIME_TO_DIMMING = 30000;
|
||||
@@ -303,8 +317,7 @@ position_interrupt:
|
||||
break;
|
||||
}
|
||||
THD_TIME_TO_DVD_STOP = 90000;
|
||||
break;
|
||||
default:
|
||||
} else {
|
||||
switch (g_current_time_to_dim) {
|
||||
case 1:
|
||||
NEW_TIME_TO_DIMMING = 36000;
|
||||
@@ -317,12 +330,11 @@ position_interrupt:
|
||||
break;
|
||||
}
|
||||
THD_TIME_TO_DVD_STOP = 108000;
|
||||
break;
|
||||
}
|
||||
_gIdleCount_dimming = 0;
|
||||
_gIdleCount_dvd = 0;
|
||||
}
|
||||
old_tvtype = currentTvType;
|
||||
oldTvType = currentTvType;
|
||||
if (flushFlag3in1 != 0) {
|
||||
while (Vdac_Flag_Changed_816991E0 != 0) {
|
||||
changeBit = 1U << (31 - __cntlzw(Vdac_Flag_Changed_816991E0));
|
||||
@@ -370,7 +382,7 @@ position_interrupt:
|
||||
}
|
||||
for (deviceIndex = 0; deviceIndex < 10; deviceIndex++) {
|
||||
if (__VIDimmingFlag_DEV_IDLE[deviceIndex] == 0) {
|
||||
__VIDimmingFlag_DEV_IDLE[0] = 0;
|
||||
__VIDimmingFlag_DEV_IDLE[deviceIndex] = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -385,7 +397,7 @@ position_interrupt:
|
||||
}
|
||||
} else {
|
||||
if (_gIdleCount_dimming >= THD_TIME_TO_DIMMING) {
|
||||
DimmingOFF_Pending = 1;
|
||||
dimmingOffPending = 1;
|
||||
}
|
||||
if (_gIdleCount_dvd >= THD_TIME_TO_DVD_STOP) {
|
||||
__DVDRestartMotor();
|
||||
@@ -394,28 +406,28 @@ position_interrupt:
|
||||
_gIdleCount_dvd = 0;
|
||||
THD_TIME_TO_DIMMING = NEW_TIME_TO_DIMMING;
|
||||
}
|
||||
if (__VIDimmingFlag_Enable_old != __VIDimmingFlag_Enable) {
|
||||
if (oldDimmingEnable != __VIDimmingFlag_Enable) {
|
||||
if (__VIDimmingFlag_Enable == FALSE &&
|
||||
_gIdleCount_dimming >= THD_TIME_TO_DIMMING) {
|
||||
DimmingOFF_Pending = 1;
|
||||
dimmingOffPending = 1;
|
||||
}
|
||||
_gIdleCount_dimming = 0;
|
||||
THD_TIME_TO_DIMMING = NEW_TIME_TO_DIMMING;
|
||||
}
|
||||
if (_gIdleCount_dimming == THD_TIME_TO_DIMMING) {
|
||||
DimmingON_Pending = 1;
|
||||
dimmingOnPending = 1;
|
||||
}
|
||||
if (DimmingOFF_Pending != 0 &&
|
||||
if (dimmingOffPending != 0 &&
|
||||
__OSSetVIForceDimming(FALSE, 2, 2) == TRUE) {
|
||||
DimmingOFF_Pending = 0;
|
||||
dimmingOffPending = 0;
|
||||
__VIDimmingState = 0;
|
||||
}
|
||||
if (DimmingON_Pending != 0 &&
|
||||
if (dimmingOnPending != 0 &&
|
||||
__OSSetVIForceDimming(TRUE, 2, 2) == TRUE) {
|
||||
DimmingON_Pending = 0;
|
||||
dimmingOnPending = 0;
|
||||
__VIDimmingState = 1;
|
||||
}
|
||||
if (__VIDVDStopFlag_Enable_old != __VIDVDStopFlag_Enable) {
|
||||
if (oldDvdStopEnable != __VIDVDStopFlag_Enable) {
|
||||
if (__VIDVDStopFlag_Enable == FALSE &&
|
||||
_gIdleCount_dvd >= THD_TIME_TO_DVD_STOP) {
|
||||
__DVDRestartMotor();
|
||||
@@ -430,8 +442,8 @@ position_interrupt:
|
||||
for (deviceIndex = 0; deviceIndex < 10; deviceIndex++) {
|
||||
__VIDimmingFlag_DEV_IDLE[deviceIndex] = 1;
|
||||
}
|
||||
__VIDimmingFlag_Enable_old = __VIDimmingFlag_Enable;
|
||||
__VIDVDStopFlag_Enable_old = __VIDVDStopFlag_Enable;
|
||||
oldDimmingEnable = __VIDimmingFlag_Enable;
|
||||
oldDvdStopEnable = __VIDVDStopFlag_Enable;
|
||||
if (NEW_TIME_TO_DIMMING > _gIdleCount_dimming && __VIDimmingState == 0) {
|
||||
THD_TIME_TO_DIMMING = NEW_TIME_TO_DIMMING;
|
||||
}
|
||||
@@ -486,6 +498,7 @@ static VITiming* getTiming(VITVMode mode)
|
||||
case 22:
|
||||
return &timing[6];
|
||||
case 3:
|
||||
case 11:
|
||||
return &timing[7];
|
||||
case 16:
|
||||
return &timing[2];
|
||||
@@ -512,9 +525,8 @@ void __VIInit(VITVMode mode)
|
||||
{
|
||||
VITiming* currentTiming;
|
||||
u32 nonInter;
|
||||
u32 tv;
|
||||
u32 tvForReg;
|
||||
volatile u32 a;
|
||||
s32 tv;
|
||||
u32 i;
|
||||
u16 hct;
|
||||
u16 vct;
|
||||
|
||||
@@ -523,7 +535,7 @@ void __VIInit(VITVMode mode)
|
||||
*(u32*)OSPhysicalToCached(0xCC) = tv;
|
||||
currentTiming = getTiming(mode);
|
||||
__VIRegs[1] = 2;
|
||||
for (a = 0; a < 1000; a++) {
|
||||
for (i = 0; i < 1000; i++) {
|
||||
}
|
||||
__VIRegs[1] = 0;
|
||||
__VIRegs[3] = currentTiming->hlw;
|
||||
@@ -554,35 +566,32 @@ void __VIInit(VITVMode mode)
|
||||
case VI_PAL:
|
||||
case VI_MPAL:
|
||||
case VI_DEBUG:
|
||||
tvForReg = tv;
|
||||
break;
|
||||
default:
|
||||
tvForReg = VI_NTSC;
|
||||
tv = 0;
|
||||
break;
|
||||
}
|
||||
if (nonInter == VI_INTERLACE || nonInter == VI_NON_INTERLACE) {
|
||||
__VIRegs[1] = ((nonInter & 1) << 2) | 1 | (tvForReg << 8);
|
||||
if (nonInter <= 1) {
|
||||
__VIRegs[1] = (nonInter << 2) | 1 | (tv << 8);
|
||||
__VIRegs[54] = 0;
|
||||
return;
|
||||
} else {
|
||||
__VIRegs[1] = (tv << 8) | 5;
|
||||
__VIRegs[54] = 1;
|
||||
}
|
||||
__VIRegs[1] = (tvForReg << 8) | 5;
|
||||
__VIRegs[54] = 1;
|
||||
}
|
||||
|
||||
static void ImportAdjustingValues(void)
|
||||
{
|
||||
displayOffsetH = SCGetDisplayOffsetH();
|
||||
displayOffsetV = 0;
|
||||
}
|
||||
static void __VIRetraceHandler(s16 interrupt, OSContext* context);
|
||||
|
||||
void VIInit(void)
|
||||
{
|
||||
u16* acv;
|
||||
BOOL enabled;
|
||||
u16 displayConfig;
|
||||
u32 __VIDVDStopFlag_Enable_old;
|
||||
s32 format;
|
||||
u32 value;
|
||||
u32 tv;
|
||||
u32 bootromTv;
|
||||
u32 scanMode;
|
||||
u32 field;
|
||||
|
||||
if (IsInitialized != 0) {
|
||||
return;
|
||||
@@ -614,30 +623,41 @@ void VIInit(void)
|
||||
__VIRegs[51] = taps[21] | (taps[22] << 8);
|
||||
__VIRegs[50] = taps[23] | (taps[24] << 8);
|
||||
__VIRegs[56] = 0x280;
|
||||
ImportAdjustingValues();
|
||||
displayOffsetH = SCGetDisplayOffsetH();
|
||||
displayOffsetV = 0;
|
||||
bootromTv = *(u32*)0x800000CC;
|
||||
displayConfig = __VIRegs[1];
|
||||
HorVer.nonInter = VIGetScanMode();
|
||||
HorVer.tv = ((u32)displayConfig & 0x300) >> 8;
|
||||
if (bootromTv == 5 || (bootromTv == 1 && HorVer.tv == 0)) {
|
||||
enabled = OSDisableInterrupts();
|
||||
if ((u32)(__VIRegs[54] & 1) == 1U) {
|
||||
scanMode = 2;
|
||||
} else {
|
||||
field = (__VIRegs[1] >> 2) & 1;
|
||||
scanMode = ((0U - field) | field) >> 31;
|
||||
}
|
||||
OSRestoreInterrupts(enabled);
|
||||
HorVer.nonInter = scanMode;
|
||||
tv = (displayConfig >> 8) & 3;
|
||||
HorVer.tv = tv;
|
||||
if (bootromTv == 5 || (bootromTv == 1 && tv == 0)) {
|
||||
HorVer.tv = 5;
|
||||
}
|
||||
tv = (HorVer.tv == 3) ? 0 : HorVer.tv;
|
||||
HorVer.timing = getTiming((tv << 2) + HorVer.nonInter);
|
||||
regs[1] = displayConfig;
|
||||
CurrTiming = HorVer.timing;
|
||||
CurrTiming = getTiming(VI_TVMODE(HorVer.tv == 3 ? 0 : HorVer.tv,
|
||||
HorVer.nonInter));
|
||||
CurrTvMode = HorVer.tv;
|
||||
HorVer.timing = CurrTiming;
|
||||
HorVer.DispSizeX = 0x280;
|
||||
HorVer.DispSizeY = CurrTiming->acv * 2;
|
||||
acv = &CurrTiming->acv;
|
||||
HorVer.DispSizeY = *acv * 2;
|
||||
HorVer.DispPosX = (0x2D0 - HorVer.DispSizeX) / 2;
|
||||
HorVer.DispPosY = 0;
|
||||
AdjustPosition(CurrTiming->acv);
|
||||
HorVer.FBSizeX = 0x280;
|
||||
HorVer.FBSizeY = CurrTiming->acv * 2;
|
||||
HorVer.FBSizeY = (*acv & 0x7FFF) << 1;
|
||||
HorVer.PanPosX = 0;
|
||||
HorVer.PanPosY = 0;
|
||||
HorVer.PanSizeX = 0x280;
|
||||
HorVer.PanSizeY = CurrTiming->acv * 2;
|
||||
HorVer.PanSizeY = (*acv & 0x7FFF) << 1;
|
||||
HorVer.FBMode = VI_XFBMODE_SF;
|
||||
HorVer.wordPerLine = 0x28;
|
||||
HorVer.std = 0x28;
|
||||
@@ -655,26 +675,41 @@ void VIInit(void)
|
||||
__OSSetInterruptHandler(0x18, __VIRetraceHandler);
|
||||
__OSUnmaskInterrupts(0x80);
|
||||
OSRegisterShutdownFunction(&shutdownFunction);
|
||||
switch (VIGetTvFormat()) {
|
||||
case 1:
|
||||
THD_TIME_TO_DIMMING = 15000;
|
||||
NEW_TIME_TO_DIMMING = 15000;
|
||||
THD_TIME_TO_DVD_STOP = 90000;
|
||||
enabled = OSDisableInterrupts();
|
||||
value = CurrTvMode;
|
||||
switch (CurrTvMode) {
|
||||
case 0:
|
||||
case 3:
|
||||
case 6:
|
||||
case 7:
|
||||
case 8:
|
||||
value = 0;
|
||||
break;
|
||||
default:
|
||||
case 1:
|
||||
case 4:
|
||||
value = 1;
|
||||
break;
|
||||
}
|
||||
OSRestoreInterrupts(enabled);
|
||||
if (value == 1) {
|
||||
THD_TIME_TO_DIMMING = 30000;
|
||||
NEW_TIME_TO_DIMMING = 30000;
|
||||
THD_TIME_TO_DVD_STOP = 90000;
|
||||
} else {
|
||||
THD_TIME_TO_DIMMING = 18000;
|
||||
NEW_TIME_TO_DIMMING = 18000;
|
||||
THD_TIME_TO_DVD_STOP = 108000;
|
||||
break;
|
||||
}
|
||||
_gIdleCount_dimming = 0;
|
||||
_gIdleCount_dvd = 0;
|
||||
g_current_time_to_dim = 0;
|
||||
__VIDimming_All_Clear = 1;
|
||||
__VIDimmingState = 0;
|
||||
VIEnableDimming(TRUE);
|
||||
__VIDVDStopFlag_Enable_old = __VIDVDStopFlag_Enable;
|
||||
__VIDVDStopFlag_Enable = FALSE;
|
||||
__VIDimmingFlag_Enable = TRUE;
|
||||
if (SCGetScreenSaverMode() == 0) {
|
||||
__VIDimmingFlag_Enable = FALSE;
|
||||
}
|
||||
__VIDVDStopFlag_Enable = 0;
|
||||
__VISetRevolutionModeSimple();
|
||||
}
|
||||
|
||||
@@ -774,11 +809,12 @@ static void setHorizontalRegs(VITiming* currentTiming, u16 displayPosX,
|
||||
regs[2] = currentTiming->hce | (currentTiming->hcs << 8);
|
||||
MARK_CHANGED(2);
|
||||
if (HorVer.tv == 8) {
|
||||
hbe = currentTiming->hbe640 + 172;
|
||||
hbe = currentTiming->hbe640 + 0xAC;
|
||||
hbs = currentTiming->hbs640;
|
||||
} else {
|
||||
hbe = currentTiming->hbe640 - 40 + displayPosX;
|
||||
hbs = currentTiming->hbs640 + 40 + displayPosX - (720 - displaySizeX);
|
||||
hbs = currentTiming->hbs640 + 40 + displayPosX -
|
||||
(720 - displaySizeX);
|
||||
}
|
||||
hbeLow = hbe & 0x1FF;
|
||||
hbeHigh = hbe >> 9;
|
||||
@@ -791,17 +827,17 @@ static void setHorizontalRegs(VITiming* currentTiming, u16 displayPosX,
|
||||
#pragma dont_inline reset
|
||||
|
||||
#pragma dont_inline on
|
||||
static void setVerticalRegs(u16 displayPosY, u16 displaySizeY, u8 equ,
|
||||
static void setVerticalRegs(s32 displayPosY, s32 displaySizeY, u8 equ,
|
||||
u16 acv, u16 prbOdd, u16 prbEven, u16 psbOdd,
|
||||
u16 psbEven, BOOL black)
|
||||
u16 psbEven, int black)
|
||||
{
|
||||
u16 actualPrbOdd;
|
||||
u16 actualPrbEven;
|
||||
u16 actualPsbOdd;
|
||||
u16 actualPsbEven;
|
||||
u16 actualAcv;
|
||||
u16 c;
|
||||
u16 d;
|
||||
s32 d;
|
||||
s32 c;
|
||||
|
||||
if (HorVer.nonInter == 2 || HorVer.nonInter == 3) {
|
||||
c = 1;
|
||||
@@ -823,16 +859,16 @@ static void setVerticalRegs(u16 displayPosY, u16 displaySizeY, u8 equ,
|
||||
}
|
||||
actualAcv = displaySizeY / c;
|
||||
if (black) {
|
||||
actualPrbOdd += 2 * actualAcv - 2;
|
||||
actualPrbOdd += actualAcv * 2 - 2;
|
||||
actualPsbOdd += 2;
|
||||
actualPrbEven += 2 * actualAcv - 2;
|
||||
actualPrbEven += actualAcv * 2 - 2;
|
||||
actualPsbEven += 2;
|
||||
actualAcv = 0;
|
||||
}
|
||||
regs[0] = equ | (actualAcv << 4);
|
||||
MARK_CHANGED(0);
|
||||
regs[7] = (u16)(u32)actualPrbOdd;
|
||||
regs[7] = actualPrbOdd;
|
||||
MARK_CHANGED(7);
|
||||
regs[0] = equ | (actualAcv << 4);
|
||||
regs[6] = (u16)(u32)actualPsbOdd;
|
||||
MARK_CHANGED(6);
|
||||
regs[9] = (u16)(u32)actualPrbEven;
|
||||
@@ -959,33 +995,16 @@ static s32 cntlzd(u64 bits)
|
||||
return __cntlzw(low) + 32;
|
||||
}
|
||||
|
||||
static void PrintDebugPalCaution(void)
|
||||
{
|
||||
static u32 message;
|
||||
|
||||
if (message == 0) {
|
||||
message = 1;
|
||||
OSReport("***************************************\n");
|
||||
OSReport(" ! ! ! C A U T I O N ! ! ! \n");
|
||||
OSReport("This TV format \"DEBUG_PAL\" is only for \n");
|
||||
OSReport("temporary solution until PAL DAC board \n");
|
||||
OSReport("is available. Please do NOT use this \n");
|
||||
OSReport("mode in real games!!! \n");
|
||||
OSReport("***************************************\n");
|
||||
}
|
||||
}
|
||||
|
||||
void VIConfigure(const GXRenderModeObj* renderMode)
|
||||
{
|
||||
VITiming* currentTiming;
|
||||
u32 register1;
|
||||
u32 register54;
|
||||
u16 originalRegister1;
|
||||
u32 originalRegister54;
|
||||
BOOL enabled;
|
||||
u32 nonInter;
|
||||
u32 tvInBootrom;
|
||||
u32 tvInGame;
|
||||
static u32 warnedDebugPal;
|
||||
|
||||
enabled = OSDisableInterrupts();
|
||||
nonInter = renderMode->viTVmode & 3;
|
||||
@@ -995,8 +1014,15 @@ void VIConfigure(const GXRenderModeObj* renderMode)
|
||||
}
|
||||
tvInBootrom = *(u32*)OSPhysicalToCached(0xCC);
|
||||
tvInGame = (u32)renderMode->viTVmode >> 2;
|
||||
if (tvInGame == VI_DEBUG_PAL) {
|
||||
PrintDebugPalCaution();
|
||||
if (tvInGame == VI_DEBUG_PAL && warnedDebugPal == 0) {
|
||||
warnedDebugPal = 1;
|
||||
OSReport("***************************************\n");
|
||||
OSReport(" ! ! ! C A U T I O N ! ! ! \n");
|
||||
OSReport("This TV format \"DEBUG_PAL\" is only for \n");
|
||||
OSReport("temporary solution until PAL DAC board \n");
|
||||
OSReport("is available. Please do NOT use this \n");
|
||||
OSReport("mode in real games!!! \n");
|
||||
OSReport("***************************************\n");
|
||||
}
|
||||
if (((tvInBootrom != 1 && tvInBootrom != 5) &&
|
||||
(tvInGame == 1 || tvInGame == 5)) ||
|
||||
@@ -1012,7 +1038,7 @@ void VIConfigure(const GXRenderModeObj* renderMode)
|
||||
HorVer.tv = tvInGame;
|
||||
}
|
||||
HorVer.DispPosX = renderMode->viXOrigin;
|
||||
HorVer.DispPosY = (HorVer.nonInter == 1) ? (u16)(renderMode->viYOrigin * 2)
|
||||
HorVer.DispPosY = HorVer.nonInter == 1 ? renderMode->viYOrigin * 2
|
||||
: renderMode->viYOrigin;
|
||||
HorVer.DispSizeX = renderMode->viWidth;
|
||||
HorVer.FBSizeX = renderMode->fbWidth;
|
||||
@@ -1022,40 +1048,42 @@ void VIConfigure(const GXRenderModeObj* renderMode)
|
||||
HorVer.PanSizeY = HorVer.FBSizeY;
|
||||
HorVer.PanPosX = 0;
|
||||
HorVer.PanPosY = 0;
|
||||
HorVer.DispSizeY = (HorVer.nonInter == 2)
|
||||
? HorVer.PanSizeY
|
||||
: (HorVer.nonInter == 3)
|
||||
? HorVer.PanSizeY
|
||||
: (HorVer.FBMode == VI_XFBMODE_SF)
|
||||
? (u16)(HorVer.PanSizeY * 2)
|
||||
: HorVer.PanSizeY;
|
||||
if (HorVer.nonInter == 2 || HorVer.nonInter == 3) {
|
||||
HorVer.DispSizeY = HorVer.PanSizeY;
|
||||
} else if (HorVer.FBMode == VI_XFBMODE_SF) {
|
||||
HorVer.DispSizeY = HorVer.PanSizeY * 2;
|
||||
} else {
|
||||
HorVer.DispSizeY = HorVer.PanSizeY;
|
||||
}
|
||||
HorVer.threeD = HorVer.nonInter == 3 ? 1 : 0;
|
||||
currentTiming = getTiming(VI_TVMODE(HorVer.tv, HorVer.nonInter));
|
||||
HorVer.timing = currentTiming;
|
||||
AdjustPosition(currentTiming->acv);
|
||||
setInterruptRegs(currentTiming);
|
||||
originalRegister1 = regs[1];
|
||||
originalRegister54 = regs[54];
|
||||
if (HorVer.nonInter == 2 || HorVer.nonInter == 3) {
|
||||
register1 = ((u32)originalRegister1 & ~4) | (1 << 2);
|
||||
if (HorVer.tv == 8) {
|
||||
register54 = (u32)originalRegister54 & ~1;
|
||||
} else {
|
||||
register54 = ((u32)originalRegister54 & ~1) | 1;
|
||||
}
|
||||
} else {
|
||||
register1 = ((u32)originalRegister1 & ~4) | ((HorVer.nonInter & 1) << 2);
|
||||
register54 = (u32)originalRegister54 & ~1;
|
||||
if (encoderType == 0) {
|
||||
HorVer.tv = 3;
|
||||
}
|
||||
register1 = (register1 & ~8) | (HorVer.threeD << 3);
|
||||
if (HorVer.tv == VI_PAL || HorVer.tv == VI_MPAL || HorVer.tv == 3) {
|
||||
register1 = (register1 & ~0x300) | (HorVer.tv << 8);
|
||||
setInterruptRegs(currentTiming);
|
||||
register1 = regs[1];
|
||||
if (HorVer.nonInter == VI_MPAL || HorVer.nonInter == VI_DEBUG) {
|
||||
register1 = (register1 & ~(1 << 2)) | (1 << 2);
|
||||
} else {
|
||||
register1 = register1 & ~0x300;
|
||||
register1 = (register1 & ~(1 << 2)) | ((HorVer.nonInter & 1) << 2);
|
||||
}
|
||||
register1 = (register1 & ~(1 << 3)) | (HorVer.threeD << 3);
|
||||
if (HorVer.tv == VI_DEBUG_PAL || HorVer.tv == VI_EURGB60) {
|
||||
register1 &= ~(3 << 8);
|
||||
} else {
|
||||
register1 = (register1 & ~(3 << 8)) | (HorVer.tv << 8);
|
||||
}
|
||||
regs[1] = register1;
|
||||
regs[54] = (u16)register54;
|
||||
MARK_CHANGED(1);
|
||||
register54 = regs[54];
|
||||
if (HorVer.nonInter == 2 || HorVer.nonInter == 3) {
|
||||
register54 |= 1;
|
||||
} else {
|
||||
register54 &= ~1;
|
||||
}
|
||||
regs[54] = register54;
|
||||
MARK_CHANGED(54);
|
||||
setScalingRegs(HorVer.PanSizeX, HorVer.DispSizeX, HorVer.threeD);
|
||||
setHorizontalRegs(currentTiming, HorVer.AdjustedDispPosX, HorVer.DispSizeX);
|
||||
@@ -1085,10 +1113,11 @@ void VIConfigurePan(u16 xOrigin, u16 yOrigin, u16 width, u16 height)
|
||||
HorVer.PanPosY = yOrigin;
|
||||
HorVer.PanSizeX = width;
|
||||
HorVer.PanSizeY = height;
|
||||
HorVer.DispSizeY = (HorVer.nonInter == 2) ? HorVer.PanSizeY :
|
||||
(HorVer.nonInter == 3) ? HorVer.PanSizeY :
|
||||
(HorVer.FBMode == VI_XFBMODE_SF) ? (u16)(HorVer.PanSizeY * 2) :
|
||||
HorVer.PanSizeY;
|
||||
if (HorVer.nonInter != 2 && HorVer.nonInter != 3 &&
|
||||
HorVer.FBMode == VI_XFBMODE_SF) {
|
||||
height *= 2;
|
||||
}
|
||||
HorVer.DispSizeY = height;
|
||||
currentTiming = HorVer.timing;
|
||||
AdjustPosition(currentTiming->acv);
|
||||
setScalingRegs(HorVer.PanSizeX, HorVer.DispSizeX, HorVer.threeD);
|
||||
@@ -1119,7 +1148,7 @@ void VIFlush(void)
|
||||
while (changed != 0) {
|
||||
registerIndex = cntlzd(changed);
|
||||
shdwRegs[registerIndex] = regs[registerIndex];
|
||||
changed &= ~((u64)1 << (63 - registerIndex));
|
||||
changed &= ~__shl2i((u64)1, 63 - registerIndex);
|
||||
}
|
||||
flushFlag = 1;
|
||||
flushFlag3in1 = 1;
|
||||
@@ -1141,7 +1170,7 @@ void VISetNextFrameBuffer(void* frameBuffer)
|
||||
|
||||
void* VIGetCurrentFrameBuffer(void)
|
||||
{
|
||||
return (void*)CurrBufAddr;
|
||||
return CurrBufAddr;
|
||||
}
|
||||
|
||||
void VISetBlack(BOOL black)
|
||||
@@ -1180,12 +1209,7 @@ static u32 getCurrentHalfLine(void)
|
||||
break;
|
||||
}
|
||||
}
|
||||
return ((horizontalCount - 1) / CurrTiming->hlw) + ((verticalCount - 1) * 2);
|
||||
}
|
||||
|
||||
static u32 getCurrentFieldEvenOdd(void)
|
||||
{
|
||||
return (getCurrentHalfLine() < CurrTiming->nhlines) ? 1 : 0;
|
||||
return ((verticalCount - 1) * 2) + ((horizontalCount - 1) / CurrTiming->hlw);
|
||||
}
|
||||
|
||||
u32 VIGetCurrentLine(void)
|
||||
@@ -1220,6 +1244,7 @@ u32 VIGetTvFormat(void)
|
||||
u32 format;
|
||||
|
||||
enabled = OSDisableInterrupts();
|
||||
format = CurrTvMode;
|
||||
switch (CurrTvMode) {
|
||||
case 0:
|
||||
case 3:
|
||||
@@ -1234,7 +1259,6 @@ u32 VIGetTvFormat(void)
|
||||
break;
|
||||
case 2:
|
||||
case 5:
|
||||
format = CurrTvMode;
|
||||
break;
|
||||
}
|
||||
OSRestoreInterrupts(enabled);
|
||||
@@ -1295,64 +1319,76 @@ void __VISetAdjustingValues(s16 horizontalOffset, s16 verticalOffset)
|
||||
void __VIDisplayPositionToXY(u32 horizontalCount, u32 verticalCount,
|
||||
s16* pixelX, s16* pixelY)
|
||||
{
|
||||
u32 halfLine = ((verticalCount - 1) << 1) +
|
||||
((horizontalCount - 1) / CurrTiming->hlw);
|
||||
VITiming* currentTiming;
|
||||
u32 halfLine;
|
||||
u32 fieldLine;
|
||||
u32 fieldStart;
|
||||
u32 fieldEnd;
|
||||
|
||||
currentTiming = CurrTiming;
|
||||
halfLine = ((verticalCount - 1) * 2) +
|
||||
((horizontalCount - 1) / currentTiming->hlw);
|
||||
if (HorVer.nonInter == 0) {
|
||||
if (halfLine < CurrTiming->nhlines) {
|
||||
if (halfLine < CurrTiming->equ * 3 + CurrTiming->prbOdd) {
|
||||
if (halfLine < currentTiming->nhlines) {
|
||||
fieldStart = ((u32)currentTiming->equ << 2) - currentTiming->equ;
|
||||
fieldEnd = currentTiming->nhlines - currentTiming->psbOdd;
|
||||
if (halfLine < fieldStart + currentTiming->prbOdd) {
|
||||
*pixelY = -1;
|
||||
} else if (halfLine >= CurrTiming->nhlines - CurrTiming->psbOdd) {
|
||||
} else if (halfLine >= fieldEnd) {
|
||||
*pixelY = -1;
|
||||
} else {
|
||||
*pixelY = (s16)((halfLine - CurrTiming->equ * 3 - CurrTiming->prbOdd) & ~1);
|
||||
*pixelY = (halfLine - fieldStart - currentTiming->prbOdd) & ~1U;
|
||||
}
|
||||
} else {
|
||||
halfLine -= CurrTiming->nhlines;
|
||||
|
||||
if (halfLine < CurrTiming->equ * 3 + CurrTiming->prbEven) {
|
||||
fieldLine = halfLine - currentTiming->nhlines;
|
||||
fieldStart = ((u32)currentTiming->equ << 2) - currentTiming->equ;
|
||||
fieldEnd = currentTiming->nhlines - currentTiming->psbEven;
|
||||
if (fieldLine < fieldStart + currentTiming->prbEven) {
|
||||
*pixelY = -1;
|
||||
} else if (halfLine >= CurrTiming->nhlines - CurrTiming->psbEven) {
|
||||
} else if (fieldLine >= fieldEnd) {
|
||||
*pixelY = -1;
|
||||
} else {
|
||||
*pixelY = (s16)(((halfLine - CurrTiming->equ * 3 - CurrTiming->prbEven) & ~1) + 1);
|
||||
*pixelY = ((fieldLine - fieldStart - currentTiming->prbEven) & ~1U) + 1;
|
||||
}
|
||||
}
|
||||
} else if (HorVer.nonInter == 1) {
|
||||
if (halfLine >= CurrTiming->nhlines) {
|
||||
halfLine -= CurrTiming->nhlines;
|
||||
if (halfLine >= currentTiming->nhlines) {
|
||||
halfLine -= currentTiming->nhlines;
|
||||
}
|
||||
|
||||
if (halfLine < CurrTiming->equ * 3 + CurrTiming->prbOdd) {
|
||||
fieldStart = ((u32)currentTiming->equ << 2) - currentTiming->equ;
|
||||
fieldEnd = currentTiming->nhlines - currentTiming->psbOdd;
|
||||
if (halfLine < fieldStart + currentTiming->prbOdd) {
|
||||
*pixelY = -1;
|
||||
} else if (halfLine >= CurrTiming->nhlines - CurrTiming->psbOdd) {
|
||||
} else if (halfLine >= fieldEnd) {
|
||||
*pixelY = -1;
|
||||
} else {
|
||||
*pixelY = (s16)((halfLine - CurrTiming->equ * 3 - CurrTiming->prbOdd) & ~1);
|
||||
*pixelY = (halfLine - fieldStart - currentTiming->prbOdd) & ~1U;
|
||||
}
|
||||
} else if (HorVer.nonInter == 2) {
|
||||
if (halfLine < CurrTiming->nhlines) {
|
||||
if (halfLine < CurrTiming->equ * 3 + CurrTiming->prbOdd) {
|
||||
if (halfLine < currentTiming->nhlines) {
|
||||
fieldStart = ((u32)currentTiming->equ << 2) - currentTiming->equ;
|
||||
fieldEnd = currentTiming->nhlines - currentTiming->psbOdd;
|
||||
if (halfLine < fieldStart + currentTiming->prbOdd) {
|
||||
*pixelY = -1;
|
||||
} else if (halfLine >= CurrTiming->nhlines - CurrTiming->psbOdd) {
|
||||
} else if (halfLine >= fieldEnd) {
|
||||
*pixelY = -1;
|
||||
} else {
|
||||
*pixelY = (s16)(halfLine - CurrTiming->equ * 3 - CurrTiming->prbOdd);
|
||||
*pixelY = halfLine - fieldStart - currentTiming->prbOdd;
|
||||
}
|
||||
} else {
|
||||
halfLine -= CurrTiming->nhlines;
|
||||
|
||||
if (halfLine < CurrTiming->equ * 3 + CurrTiming->prbEven) {
|
||||
fieldLine = halfLine - currentTiming->nhlines;
|
||||
fieldStart = ((u32)currentTiming->equ << 2) - currentTiming->equ;
|
||||
fieldEnd = currentTiming->nhlines - currentTiming->psbEven;
|
||||
if (fieldLine < fieldStart + currentTiming->prbEven) {
|
||||
*pixelY = -1;
|
||||
} else if (halfLine >= CurrTiming->nhlines - CurrTiming->psbEven) {
|
||||
} else if (fieldLine >= fieldEnd) {
|
||||
*pixelY = -1;
|
||||
} else {
|
||||
*pixelY = (s16)((halfLine - CurrTiming->equ * 3 - CurrTiming->prbEven) & ~1);
|
||||
*pixelY = (fieldLine - fieldStart - currentTiming->prbEven) & ~1U;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
*pixelX = (s16)(horizontalCount - 1);
|
||||
*pixelX = horizontalCount - 1;
|
||||
}
|
||||
|
||||
BOOL VIEnableDimming(BOOL enable)
|
||||
|
||||
@@ -138,25 +138,7 @@ static s32 Vdac_Flag_Region;
|
||||
static s32 __type;
|
||||
static s32 __gamma;
|
||||
static s32 __level;
|
||||
volatile u32 Vdac_Flag_Changed_816991E0;
|
||||
|
||||
static void __VISetCCSEL(u8 flag) {
|
||||
u8 data[2];
|
||||
|
||||
data[0] = 0x6a;
|
||||
data[1] = TRUE;
|
||||
__VISendI2CData(0xe0, data, sizeof(data));
|
||||
WaitMicroTime(2);
|
||||
}
|
||||
|
||||
static void __VISetOverSampling(u8 flag) {
|
||||
u8 data[2];
|
||||
|
||||
data[0] = 0x65;
|
||||
data[1] = TRUE;
|
||||
__VISendI2CData(0xe0, data, sizeof(data));
|
||||
WaitMicroTime(2);
|
||||
}
|
||||
u32 Vdac_Flag_Changed_816991E0;
|
||||
|
||||
void __VISetVolume(u8 wd0, u8 wd1) {
|
||||
u8 data[3];
|
||||
@@ -251,38 +233,36 @@ void __VISetClosedCaption(void) {
|
||||
WaitMicroTime(2);
|
||||
}
|
||||
|
||||
typedef const u8* __VIMacrovisionImm;
|
||||
static void __VISetMacrovisionImm(__VIMacrovisionImm macrovisionImm)
|
||||
{
|
||||
u8 data[0x1a + 1];
|
||||
u8 i;
|
||||
|
||||
data[0] = 0x40;
|
||||
for (i = 1; i < sizeof(data); i++) {
|
||||
data[i] = macrovisionImm[i - 1];
|
||||
}
|
||||
__VISendI2CData(0xe0, data, sizeof(data));
|
||||
WaitMicroTime(2);
|
||||
}
|
||||
|
||||
void __VISetMacrovision(void) {
|
||||
switch (__type) {
|
||||
case 2:
|
||||
switch (__tvType) {
|
||||
case 0: {
|
||||
__VISetMacrovisionImm(VINtscACPType1);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VINtscACPType1);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
__VISetMacrovisionImm(VIPalACPType1);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VIPalACPType1);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
__VISetMacrovisionImm(VIMpalACPType1);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VIMpalACPType1);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
__VISetMacrovisionImm(VIEurgb60ACPType1);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VIEurgb60ACPType1);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -290,19 +270,31 @@ void __VISetMacrovision(void) {
|
||||
case 3:
|
||||
switch (__tvType) {
|
||||
case 0: {
|
||||
__VISetMacrovisionImm(VINtscACPType2);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VINtscACPType2);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
__VISetMacrovisionImm(VIPalACPType2);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VIPalACPType2);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
__VISetMacrovisionImm(VIMpalACPType2);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VIMpalACPType2);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
__VISetMacrovisionImm(VIEurgb60ACPType2);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VIEurgb60ACPType2);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -310,74 +302,103 @@ void __VISetMacrovision(void) {
|
||||
case 4:
|
||||
switch (__tvType) {
|
||||
case 0: {
|
||||
__VISetMacrovisionImm(VINtscACPType3);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VINtscACPType3);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
__VISetMacrovisionImm(VIPalACPType3);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VIPalACPType3);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
__VISetMacrovisionImm(VIMpalACPType3);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VIMpalACPType3);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
__VISetMacrovisionImm(VIEurgb60ACPType3);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VIEurgb60ACPType3);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 1: {
|
||||
__VISetMacrovisionImm(VIZeroACPType);
|
||||
u8 data[0x1b];
|
||||
COPY_ACP(data, VIZeroACPType);
|
||||
__VISendI2CData(0xe0, data, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void VISetCGMS(u8 wd0, u8 wd1, u8 wd2) {
|
||||
if (__wd0 != wd0 || __wd1 != wd1 || __wd2 != wd2) {
|
||||
__wd0 = wd0;
|
||||
__wd1 = wd1;
|
||||
__wd2 = wd2;
|
||||
void VISetMacrovision(s32 type) {
|
||||
u8 oldType;
|
||||
u8 oldWd2;
|
||||
u8 oldWd0;
|
||||
u8 mode;
|
||||
u32 volume;
|
||||
u8 newType;
|
||||
u8 newWd2;
|
||||
s32 tvFormat;
|
||||
|
||||
mode = 0;
|
||||
volume = 0;
|
||||
oldWd0 = __wd0;
|
||||
oldType = __wd1;
|
||||
oldWd2 = __wd2;
|
||||
newType = oldType;
|
||||
if (type == 3) {
|
||||
goto type3;
|
||||
}
|
||||
if (type < 3) {
|
||||
if (type == 1) {
|
||||
goto type1;
|
||||
} else if (type >= 1) {
|
||||
goto type2;
|
||||
}
|
||||
goto done;
|
||||
}
|
||||
if (type >= 5) {
|
||||
goto done;
|
||||
}
|
||||
goto type5;
|
||||
type1:
|
||||
mode = 0;
|
||||
volume = 0;
|
||||
goto done;
|
||||
type2:
|
||||
mode = 2;
|
||||
volume = 3;
|
||||
newType = 0;
|
||||
goto done;
|
||||
type3:
|
||||
mode = 1;
|
||||
volume = 3;
|
||||
newType = 0;
|
||||
goto done;
|
||||
type5:
|
||||
mode = 3;
|
||||
volume = 3;
|
||||
newType = 0;
|
||||
done:
|
||||
volume |= oldWd2 & 0xf0;
|
||||
newWd2 = volume | mode << 2;
|
||||
if ((oldType != newType) || (oldWd2 != newWd2)) {
|
||||
__wd0 = oldWd0;
|
||||
__wd1 = newType;
|
||||
__wd2 = newWd2;
|
||||
Vdac_Flag_Changed_816991E0 |= 1;
|
||||
}
|
||||
}
|
||||
|
||||
void VISetMacrovision(s32 type) {
|
||||
u32 tvFormat;
|
||||
u8 mode = 0;
|
||||
u8 volume = 0;
|
||||
u8 wd0 = __wd0;
|
||||
u8 wd1 = __wd1;
|
||||
u8 wd2 = __wd2;
|
||||
|
||||
switch (type) {
|
||||
case 1:
|
||||
mode = 0;
|
||||
volume = 0;
|
||||
break;
|
||||
case 2:
|
||||
mode = 2;
|
||||
volume = 3;
|
||||
wd1 = 0;
|
||||
break;
|
||||
case 3:
|
||||
mode = 1;
|
||||
volume = 3;
|
||||
wd1 = 0;
|
||||
break;
|
||||
case 4:
|
||||
mode = 3;
|
||||
volume = 3;
|
||||
wd1 = 0;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
wd2 = wd2 & 0xF0;
|
||||
wd2 = (wd2 | (mode << 2)) | volume;
|
||||
VISetCGMS(wd0, wd1, wd2);
|
||||
|
||||
tvFormat = VIGetTvFormat();
|
||||
if ((__type != type) || (__tvType != tvFormat)) {
|
||||
__type = type;
|
||||
@@ -557,90 +578,101 @@ void __VISetRevolutionMode(void) {
|
||||
WaitMicroTime(2);
|
||||
}
|
||||
|
||||
void __VISetTiming(s32 timing) {
|
||||
u8 data[2];
|
||||
void __VISetRevolutionModeSimple(void) {
|
||||
u32 i;
|
||||
u8 powerCommand[2];
|
||||
u8 clockCommand[2];
|
||||
u8 outputCommand[2];
|
||||
u8 volumeCommand[3];
|
||||
u8 syncCommand[2];
|
||||
u8 cgmsCommand[3];
|
||||
u8 wssCommand[3];
|
||||
u8 captionCommand[5];
|
||||
u8 acpCommand[0x1c];
|
||||
u8 driveCommand[2];
|
||||
u8 filterCommand[2];
|
||||
|
||||
data[0] = 0;
|
||||
data[1] = (u8)timing;
|
||||
__VISendI2CData(0xe0, data, sizeof(data));
|
||||
powerCommand[0] = 0x6a;
|
||||
powerCommand[1] = 1;
|
||||
__VISendI2CData(0xe0, powerCommand, 2);
|
||||
WaitMicroTime(2);
|
||||
}
|
||||
|
||||
void __VISetVBICtrl(u8 arg0, u8 arg1, u8 arg2) {
|
||||
u8 data[2];
|
||||
|
||||
data[0] = 2;
|
||||
data[1] = (~arg2 & 1) | (((~arg1 & 1) << 2) | ((~arg0 & 1) << 1));
|
||||
__VISendI2CData(0xe0, data, sizeof(data));
|
||||
clockCommand[0] = 0x65;
|
||||
clockCommand[1] = 1;
|
||||
__VISendI2CData(0xe0, clockCommand, 2);
|
||||
WaitMicroTime(2);
|
||||
__VISetYUVSEL(VIGetDTVStatus());
|
||||
outputCommand[0] = 0;
|
||||
outputCommand[1] = 0;
|
||||
__VISendI2CData(0xe0, outputCommand, 2);
|
||||
WaitMicroTime(2);
|
||||
volumeCommand[0] = 0x71;
|
||||
volumeCommand[1] = 0x8e;
|
||||
volumeCommand[2] = 0x8e;
|
||||
__VISendI2CData(0xe0, volumeCommand, 3);
|
||||
WaitMicroTime(2);
|
||||
syncCommand[0] = 2;
|
||||
syncCommand[1] = 7;
|
||||
__VISendI2CData(0xe0, syncCommand, 2);
|
||||
WaitMicroTime(2);
|
||||
}
|
||||
|
||||
void __VISetCGMSClear(void) {
|
||||
__wd0 = 0;
|
||||
__wd1 = 0;
|
||||
__wd2 = 0;
|
||||
__VISetCGMS();
|
||||
}
|
||||
|
||||
void VISetWSS(u8 gp1, u8 gp2, u8 gp3, u8 gp4) {
|
||||
if (__gp1 != gp1 || __gp2 != gp2 || __gp3 != gp3 || __gp4 != gp4) {
|
||||
__gp1 = gp1;
|
||||
__gp2 = gp2;
|
||||
__gp3 = gp3;
|
||||
__gp4 = gp4;
|
||||
cgmsCommand[0] = 5;
|
||||
cgmsCommand[1] = 0;
|
||||
cgmsCommand[2] = 0;
|
||||
__VISendI2CData(0xe0, cgmsCommand, 3);
|
||||
WaitMicroTime(2);
|
||||
if ((__gp1 != 0) || (__gp2 != 0) || (__gp3 != 0) || (__gp4 != 0)) {
|
||||
__gp1 = 0;
|
||||
__gp2 = 0;
|
||||
__gp3 = 0;
|
||||
__gp4 = 0;
|
||||
Vdac_Flag_Changed_816991E0 |= 2;
|
||||
}
|
||||
}
|
||||
|
||||
void VISetClosedCaption(u8 cc1, u8 cc2, u8 cc3, u8 cc4) {
|
||||
if (__cc1 != cc1 || __cc2 != cc2 || __cc3 != cc3 || __cc4 != cc4) {
|
||||
__cc1 = cc1;
|
||||
__cc2 = cc2;
|
||||
__cc3 = cc3;
|
||||
__cc4 = cc4;
|
||||
wssCommand[0] = 8;
|
||||
wssCommand[1] = (__gp2 & 0xf) << 4 | __gp1 & 0xf;
|
||||
wssCommand[2] = (__gp4 & 7) << 3 | __gp3 & 7;
|
||||
__VISendI2CData(0xe0, wssCommand, 3);
|
||||
WaitMicroTime(2);
|
||||
if ((__cc1 != 0) || (__cc2 != 0) || (__cc3 != 0) || (__cc4 != 0)) {
|
||||
__cc1 = 0;
|
||||
__cc2 = 0;
|
||||
__cc3 = 0;
|
||||
__cc4 = 0;
|
||||
Vdac_Flag_Changed_816991E0 |= 4;
|
||||
}
|
||||
}
|
||||
|
||||
void VISetRGBOverDrive(s32 level) {
|
||||
if (__level != level) {
|
||||
__level = level;
|
||||
captionCommand[0] = 0x7a;
|
||||
captionCommand[1] = __cc1 & 0x7f;
|
||||
captionCommand[2] = __cc2 & 0x7f;
|
||||
captionCommand[3] = __cc3 & 0x7f;
|
||||
captionCommand[4] = __cc4 & 0x7f;
|
||||
__VISendI2CData(0xe0, captionCommand, 5);
|
||||
WaitMicroTime(2);
|
||||
for (i = 0; i < 0x1a; i++) {
|
||||
acpCommand[i + 1] = VIZeroACPType[i];
|
||||
}
|
||||
acpCommand[0] = 0x40;
|
||||
__VISendI2CData(0xe0, acpCommand, 0x1b);
|
||||
WaitMicroTime(2);
|
||||
if (__level != 0) {
|
||||
__level = 0;
|
||||
Vdac_Flag_Changed_816991E0 |= 0x40;
|
||||
}
|
||||
}
|
||||
|
||||
void __VISetTrapFilterImm(u8 flag) {
|
||||
u8 data[2];
|
||||
|
||||
data[0] = 3;
|
||||
if (flag == TRUE) {
|
||||
data[1] = 0;
|
||||
if (Vdac_Flag_Region == 3) {
|
||||
driveCommand[0] = 10;
|
||||
driveCommand[1] = __level << 1 | 1;
|
||||
__VISendI2CData(0xe0, driveCommand, 2);
|
||||
WaitMicroTime(2);
|
||||
} else {
|
||||
data[1] = 1;
|
||||
driveCommand[0] = 10;
|
||||
driveCommand[1] = 0;
|
||||
__VISendI2CData(0xe0, driveCommand, 2);
|
||||
WaitMicroTime(2);
|
||||
}
|
||||
__VISendI2CData(0xe0, data, sizeof(data));
|
||||
filterCommand[0] = 3;
|
||||
filterCommand[1] = 1;
|
||||
__VISendI2CData(0xe0, filterCommand, 2);
|
||||
WaitMicroTime(2);
|
||||
}
|
||||
|
||||
void __VISetRevolutionModeSimple(void) {
|
||||
u32 dtvStatus;
|
||||
|
||||
__VISetCCSEL(TRUE);
|
||||
__VISetOverSampling(TRUE);
|
||||
dtvStatus = VIGetDTVStatus();
|
||||
__VISetYUVSEL(dtvStatus);
|
||||
__VISetTiming(0);
|
||||
__VISetVolume(142, 142);
|
||||
__VISetVBICtrl(0, 0, 0);
|
||||
__VISetCGMSClear();
|
||||
VISetWSS(0, 0, 0, 0);
|
||||
__VISetWSS();
|
||||
VISetClosedCaption(0, 0, 0, 0);
|
||||
__VISetClosedCaption();
|
||||
__VISetMacrovisionImm(VIZeroACPType);
|
||||
VISetRGBOverDrive(0);
|
||||
__VISetRGBOverDrive();
|
||||
__VISetTrapFilterImm(0);
|
||||
__VISetGammaImm(gammaSet[10]);
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -6,10 +6,13 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
char CDBFSPathSeparator = '/';
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata"
|
||||
extern const char lbl_816979E8[8] = "/\0\0\0\0\0\0\0";
|
||||
#pragma pop
|
||||
|
||||
void CDBFSConcatenatePath(char* path, const char* concatPath) {
|
||||
strcat(path, &CDBFSPathSeparator);
|
||||
strcat(path, lbl_816979E8);
|
||||
strcat(path, concatPath);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -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);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -235,7 +235,7 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
|
||||
u32 encodedOffset;
|
||||
char* input;
|
||||
char* output;
|
||||
u8 value = 0;
|
||||
u32 value = 0;
|
||||
NWC24Err result = NWC24_OK;
|
||||
|
||||
if (decoded == NULL)
|
||||
@@ -264,14 +264,14 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
|
||||
input++;
|
||||
decodedOffset++;
|
||||
} else if (*input == '=' && encodedOffset + 2 < encodedSize) {
|
||||
BOOL validHex = TRUE;
|
||||
u32 inputAfterEqual = encodedOffset + 1;
|
||||
char* current = ++input;
|
||||
if (*current == ' ' || *current == '\t') {
|
||||
char* next = current + 1;
|
||||
char* previous = current;
|
||||
u32 scan = 1;
|
||||
while (inputAfterEqual + scan + 1 < encodedSize) {
|
||||
if (*next == '\r' && next[1] == '\n') {
|
||||
char* next = previous + 1;
|
||||
if (*next == '\r' && previous[2] == '\n') {
|
||||
inputAfterEqual += scan;
|
||||
current = next;
|
||||
break;
|
||||
@@ -279,7 +279,7 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
|
||||
if (*next != ' ' && *next != '\t') {
|
||||
break;
|
||||
}
|
||||
next++;
|
||||
previous = next;
|
||||
scan++;
|
||||
}
|
||||
}
|
||||
@@ -293,14 +293,12 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
|
||||
if (high >= 0) {
|
||||
value = (high & 0x0F) << 4;
|
||||
}
|
||||
if (high < 0) { validHex = FALSE; }
|
||||
low = Util_xtoi(current[1]);
|
||||
if (low >= 0) {
|
||||
value |= low & 0x0F;
|
||||
}
|
||||
if (low < 0) { validHex = FALSE; }
|
||||
current += 2;
|
||||
if (validHex) {
|
||||
if (high >= 0 && low >= 0) {
|
||||
*output++ = (char)value;
|
||||
decodedOffset++;
|
||||
}
|
||||
@@ -331,90 +329,97 @@ NWC24Err NWC24DecodeQuotedPrintable(char* decoded, u32 decodedCapacity, u32* dec
|
||||
|
||||
static NWC24Err ConcatEncodedText(char* encoded, u32 encodedCapacity, u32* encodedSize, char encoding, u8* decoded, u32 decodedSize,
|
||||
u32* decodedSizeOut);
|
||||
static inline NWC24Err AppendWordPrefix(char* encoded, u32 capacity) {
|
||||
if (Mail_strlen(encoded) + 2 < capacity) {
|
||||
Mail_strncat(encoded, "=?", 2);
|
||||
} else { return NWC24_ERR_OVERFLOW; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline NWC24Err AppendWordSeparator(char* encoded, u32 capacity) {
|
||||
if (Mail_strlen(encoded) + 2 < capacity) {
|
||||
Mail_strncat(encoded, "?", 1);
|
||||
} else { return NWC24_ERR_OVERFLOW; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline NWC24Err AppendWordSuffix(char* encoded, u32 capacity) {
|
||||
if (Mail_strlen(encoded) + 2 < capacity) {
|
||||
Mail_strncat(encoded, "?=", 2);
|
||||
} else { return NWC24_ERR_OVERFLOW; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline NWC24Err AppendWordCharset(char* encoded, u32 capacity, char* charset, u32 charsetSize) {
|
||||
if (charset == NULL) { return NWC24_ERR_INVALID_VALUE; }
|
||||
if (charsetSize + Mail_strlen(encoded) < capacity) {
|
||||
u32 length = Mail_strlen(charset);
|
||||
Mail_strncat(encoded, charset, length);
|
||||
} else { return NWC24_ERR_OVERFLOW; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline NWC24Err AppendWordEncoding(char* encoded, u32 capacity, char encoding) {
|
||||
char encodingText[1];
|
||||
encodingText[0] = encoding;
|
||||
if (encoding != 'B' && encoding != 'b' && encoding != 'Q' && encoding != 'q') {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
if (Mail_strlen(encoded) + 1 < capacity) {
|
||||
Mail_strncat(encoded, encodingText, 1);
|
||||
} else { return NWC24_ERR_OVERFLOW; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
static NWC24Err EncodeWord(char* encoded, u32 encodedCapacity, u32* encodedSize, char* charset, u32 charsetSize, char encoding, u8* decoded,
|
||||
u32 decodedSize, u32* decodedSizeOut) {
|
||||
NWC24Err result;
|
||||
NWC24Err result = NWC24_OK;
|
||||
BOOL encodeOverflow = FALSE;
|
||||
|
||||
if (decodedSizeOut != NULL) { *decodedSizeOut = 0; }
|
||||
if (decodedSizeOut != NULL) {
|
||||
*decodedSizeOut = 0;
|
||||
}
|
||||
if (encodedCapacity == 0) {
|
||||
if (decodedSizeOut != NULL) { *decodedSizeOut = 0; }
|
||||
if (decodedSizeOut != NULL) {
|
||||
*decodedSizeOut = 0;
|
||||
}
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
*encoded = '\0';
|
||||
if (encodedSize != NULL) { *encodedSize = 1; }
|
||||
|
||||
result = AppendWordPrefix(encoded, encodedCapacity);
|
||||
if (result != NWC24_OK) { *encoded = '\0'; return result; }
|
||||
|
||||
result = AppendWordCharset(encoded, encodedCapacity, charset, charsetSize);
|
||||
if (result != NWC24_OK) { *encoded = '\0'; return result; }
|
||||
|
||||
result = AppendWordSeparator(encoded, encodedCapacity);
|
||||
if (result != NWC24_OK) { *encoded = '\0'; return result; }
|
||||
|
||||
result = AppendWordEncoding(encoded, encodedCapacity, encoding);
|
||||
if (result != NWC24_OK) { *encoded = '\0'; return result; }
|
||||
|
||||
result = AppendWordSeparator(encoded, encodedCapacity);
|
||||
if (result != NWC24_OK) { *encoded = '\0'; return result; }
|
||||
|
||||
result = ConcatEncodedText(encoded, encodedCapacity, encodedSize, encoding, decoded, decodedSize, decodedSizeOut);
|
||||
if (result != NWC24_OK && result != NWC24_ERR_OVERFLOW) {
|
||||
*encoded = '\0';
|
||||
*decodedSizeOut = 1;
|
||||
return result;
|
||||
if (encodedSize != NULL) {
|
||||
*encodedSize = 1;
|
||||
}
|
||||
if (result == NWC24_ERR_OVERFLOW) { encodeOverflow = TRUE; }
|
||||
result = AppendWordSuffix(encoded, encodedCapacity);
|
||||
if (result != NWC24_OK) {
|
||||
*encoded = '\0';
|
||||
*decodedSizeOut = 1;
|
||||
return result;
|
||||
if (Mail_strlen(encoded) + 2 < encodedCapacity) {
|
||||
Mail_strncat(encoded, "=?", 2);
|
||||
} else {
|
||||
result = NWC24_ERR_OVERFLOW;
|
||||
}
|
||||
if (result == NWC24_OK) {
|
||||
if (charset == NULL) {
|
||||
result = NWC24_ERR_INVALID_VALUE;
|
||||
} else if (charsetSize + Mail_strlen(encoded) < encodedCapacity) {
|
||||
u32 length = Mail_strlen(charset);
|
||||
Mail_strncat(encoded, charset, length);
|
||||
} else {
|
||||
result = NWC24_ERR_OVERFLOW;
|
||||
}
|
||||
}
|
||||
if (result == NWC24_OK) {
|
||||
if (Mail_strlen(encoded) + 2 < encodedCapacity) {
|
||||
Mail_strncat(encoded, "?", 1);
|
||||
} else {
|
||||
result = NWC24_ERR_OVERFLOW;
|
||||
}
|
||||
}
|
||||
if (result == NWC24_OK) {
|
||||
char value[1];
|
||||
value[0] = encoding;
|
||||
if (encoding == 'B' || encoding == 'b' || encoding == 'Q' || encoding == 'q') {
|
||||
u32 length = Mail_strlen(encoded);
|
||||
if (length + 1 < encodedCapacity) {
|
||||
Mail_strncat(encoded, value, 1);
|
||||
} else {
|
||||
result = NWC24_ERR_OVERFLOW;
|
||||
}
|
||||
} else {
|
||||
result = NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
}
|
||||
if (result == NWC24_OK) {
|
||||
if (Mail_strlen(encoded) + 2 < encodedCapacity) {
|
||||
Mail_strncat(encoded, "?", 1);
|
||||
} else {
|
||||
result = NWC24_ERR_OVERFLOW;
|
||||
}
|
||||
}
|
||||
if (result == NWC24_OK) {
|
||||
result = ConcatEncodedText(encoded, encodedCapacity, encodedSize, encoding, decoded, decodedSize, decodedSizeOut);
|
||||
if (result == NWC24_OK || result == NWC24_ERR_OVERFLOW) {
|
||||
encodeOverflow = result == NWC24_ERR_OVERFLOW;
|
||||
if (Mail_strlen(encoded) + 2 < encodedCapacity) {
|
||||
Mail_strncat(encoded, "?=", 2);
|
||||
result = NWC24_OK;
|
||||
if (encodedSize != NULL) {
|
||||
*encodedSize = Mail_strlen(encoded) + 1;
|
||||
}
|
||||
if (encodeOverflow) {
|
||||
result = NWC24_ERR_OVERFLOW;
|
||||
}
|
||||
} else {
|
||||
*encoded = '\0';
|
||||
if (decodedSizeOut != NULL) {
|
||||
*decodedSizeOut = 1;
|
||||
}
|
||||
result = NWC24_ERR_OVERFLOW;
|
||||
}
|
||||
} else {
|
||||
*encoded = '\0';
|
||||
if (decodedSizeOut != NULL) {
|
||||
*decodedSizeOut = 1;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
*encoded = '\0';
|
||||
}
|
||||
*encodedSize = Mail_strlen(encoded) + 1;
|
||||
if (result == NWC24_OK && encodeOverflow) { result = NWC24_ERR_OVERFLOW; }
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -455,7 +460,6 @@ static BOOL CopyWithoutLinearWhiteSpaces(char* output, int* outputSize, char* in
|
||||
BOOL afterNewline = FALSE;
|
||||
u32 outputOffset = 0;
|
||||
s32 capacity;
|
||||
u32 limit;
|
||||
|
||||
if (output == NULL || outputSize == NULL || *outputSize == 0) {
|
||||
return FALSE;
|
||||
@@ -466,8 +470,7 @@ static BOOL CopyWithoutLinearWhiteSpaces(char* output, int* outputSize, char* in
|
||||
*outputSize = 1;
|
||||
return TRUE;
|
||||
}
|
||||
limit = capacity - 1U;
|
||||
while (outputOffset < limit && inputSize != 0 && *input != '\0') {
|
||||
while (outputOffset < capacity - 1U && inputSize != 0 && *input != '\0') {
|
||||
char value = *input;
|
||||
switch (value) {
|
||||
case '\r':
|
||||
@@ -510,70 +513,92 @@ static inline char* FindMarker(char* input, u32 size, const char* marker) {
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
static inline char* FindMarkerAfterPrefix(char* input, u32 size, u32 prefix, const char* marker) {
|
||||
u32 markerLength = Mail_strlen(marker);
|
||||
char* current = input + prefix;
|
||||
u32 offset;
|
||||
for (offset = 0; offset <= size; offset++) {
|
||||
if (Mail_strncmp(current, marker, markerLength) == 0) {
|
||||
return input + offset + prefix;
|
||||
}
|
||||
current++;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline NWC24Err ExtractWordEncoding(char* encoding, u32* encodingSize, char* encoded, u32 encodedSize) {
|
||||
char* delimiter = FindMarkerAfterPrefix(encoded, encodedSize, 0, "?");
|
||||
if (delimiter == NULL) { return NWC24_ERR_INVALID_VALUE; }
|
||||
*encoding = delimiter[1];
|
||||
*encodingSize = 2;
|
||||
return NWC24_OK;
|
||||
}
|
||||
static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded, u32 decodedCapacity, u32* decodedSize, char* encoded,
|
||||
u32 encodedSize, u32* encodedSizeOut) {
|
||||
char* encodedWord;
|
||||
int encodedWordPosition = 0;
|
||||
int encodedLength;
|
||||
u32 consumedSize;
|
||||
u32 decodedLength;
|
||||
int encodedLength;
|
||||
NWC24Err result;
|
||||
NWC24Err result = NWC24_OK;
|
||||
|
||||
if (encodedSizeOut != NULL) { *encodedSizeOut = 0; }
|
||||
if (encodedSizeOut != NULL) {
|
||||
*encodedSizeOut = 0;
|
||||
}
|
||||
if (decodedCapacity == 0) {
|
||||
if (encodedSizeOut != NULL) { *encodedSizeOut = 0; }
|
||||
if (encodedSizeOut != NULL)
|
||||
*encodedSizeOut = 0;
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
*decoded = '\0';
|
||||
if (decodedSize != NULL) { *decodedSize = 1; }
|
||||
if (encodedSizeOut != NULL) { *encodedSizeOut = 0; }
|
||||
encodedWord = FindMarker(encoded, encodedSize, "=?");
|
||||
if (encodedWord == encoded) {
|
||||
char encoding;
|
||||
result = ExtractCharset(charsetData, charsetCapacity, &consumedSize, encodedWord, encodedSize);
|
||||
if (result != NWC24_OK) { return result; }
|
||||
encodedLength = consumedSize;
|
||||
result = ExtractWordEncoding(&encoding, &consumedSize, encodedWord + encodedLength, encodedSize - encodedLength);
|
||||
if (result != NWC24_OK) { return result; }
|
||||
encodedLength += consumedSize;
|
||||
result = ExtractEncodedText(decoded, decodedCapacity, &decodedLength, encoding, encodedWord + encodedLength,
|
||||
encodedSize - encodedLength, &consumedSize);
|
||||
if (result != NWC24_OK) { return result; }
|
||||
encodedLength += consumedSize;
|
||||
} else {
|
||||
u32 localSize;
|
||||
if (encodedWord != NULL) {
|
||||
encodedLength = encodedWord - encoded;
|
||||
} else {
|
||||
encodedLength = STD_strnlen(encoded, encodedSize);
|
||||
if (decodedSize != NULL) {
|
||||
*decodedSize = 1;
|
||||
}
|
||||
if (encodedSizeOut != NULL) {
|
||||
*encodedSizeOut = 0;
|
||||
}
|
||||
{
|
||||
u32 markerLength = Mail_strlen("=?");
|
||||
u32 offset;
|
||||
for (offset = 0; offset <= encodedSize; offset++) {
|
||||
encodedWordPosition = (int)(encoded + offset);
|
||||
if (Mail_strncmp((char*)encodedWordPosition, "=?", markerLength) == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (offset > encodedSize) {
|
||||
encodedWordPosition = 0;
|
||||
}
|
||||
}
|
||||
if (encodedWordPosition == (int)encoded) {
|
||||
result = ExtractCharset(charsetData, charsetCapacity, &consumedSize, (char*)encoded, encodedSize);
|
||||
if (result != NWC24_OK) {
|
||||
return result;
|
||||
}
|
||||
encodedLength = consumedSize;
|
||||
{
|
||||
u32 markerLength = Mail_strlen("?");
|
||||
u32 offset;
|
||||
char* delimiter = NULL;
|
||||
char* current = (char*)encodedWordPosition + encodedLength;
|
||||
for (offset = 0; offset <= encodedSize - encodedLength; offset++) {
|
||||
if (Mail_strncmp((char*)current, "?", markerLength) == 0) {
|
||||
delimiter = current;
|
||||
break;
|
||||
}
|
||||
current++;
|
||||
}
|
||||
if (delimiter == 0) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
{
|
||||
char encoding = delimiter[1];
|
||||
consumedSize = 2;
|
||||
encodedLength += consumedSize;
|
||||
result = ExtractEncodedText(decoded, decodedCapacity, &decodedLength, encoding, encoded + encodedLength, encodedSize - encodedLength,
|
||||
&consumedSize);
|
||||
if (result != NWC24_OK) {
|
||||
return result;
|
||||
}
|
||||
encodedLength += consumedSize;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
u32 localSize = decodedCapacity;
|
||||
if (encodedWordPosition == 0) {
|
||||
encodedLength = STD_strnlen(encoded, encodedSize);
|
||||
} else {
|
||||
encodedLength = encodedWordPosition - (int)encoded;
|
||||
}
|
||||
localSize = decodedCapacity;
|
||||
if (!CopyWithoutLinearWhiteSpaces(decoded, (int*)&localSize, encoded, encodedLength)) {
|
||||
*decodedSize = localSize;
|
||||
if (encodedSizeOut != NULL) { *encodedSizeOut = encodedLength; }
|
||||
if (encodedSizeOut != NULL) {
|
||||
*encodedSizeOut = encodedLength;
|
||||
}
|
||||
return NWC24_ERR_OVERFLOW;
|
||||
}
|
||||
decodedLength = localSize;
|
||||
if (encodedWord != NULL) {
|
||||
if (encodedWordPosition != 0) {
|
||||
BOOL whitespaceOnly = TRUE;
|
||||
u32 offset;
|
||||
for (offset = 0; offset < localSize && decoded[offset] != '\0'; offset++) {
|
||||
@@ -588,18 +613,20 @@ static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded
|
||||
}
|
||||
}
|
||||
}
|
||||
*decodedSize = decodedLength;
|
||||
if (encodedSizeOut != NULL) { *encodedSizeOut = encodedLength; }
|
||||
return NWC24_OK;
|
||||
if (decodedSize != NULL) {
|
||||
*decodedSize = decodedLength;
|
||||
}
|
||||
if (encodedSizeOut != NULL) {
|
||||
*encodedSizeOut = encodedLength;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
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 remainingCapacity;
|
||||
u32 inputSize;
|
||||
|
||||
if (decodedSize == NULL) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
@@ -610,34 +637,34 @@ NWC24Err NWC24DecodeMIMEHeaderFieldBody(u8* charsetData, u32 charsetDataSize, u8
|
||||
if (decoded == NULL || decodedCapacity == 0) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
if (encoded == NULL)
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
if (encoded == NULL)
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
*decoded = 0;
|
||||
*charsetData = 0;
|
||||
*decodedSize = 1;
|
||||
input = (char*)encoded;
|
||||
inputSize = encodedSize;
|
||||
output = decoded;
|
||||
remainingCapacity = decodedCapacity;
|
||||
while ((s32)inputSize > 0 && remainingCapacity > 0 && *input != '\0') {
|
||||
while ((s32)inputSize > 0 && (s32)decodedCapacity > 0 && *encoded != '\0') {
|
||||
u32 copiedSize = 0;
|
||||
u32 consumedSize;
|
||||
result =
|
||||
DecodeWord((char*)charsetData, charsetDataSize, (char*)output, remainingCapacity, &copiedSize, (char*)input, inputSize, &consumedSize);
|
||||
DecodeWord((char*)charsetData, charsetDataSize, (char*)output, decodedCapacity, &copiedSize, (char*)encoded, inputSize, &consumedSize);
|
||||
if (copiedSize == 0) {
|
||||
break;
|
||||
}
|
||||
copiedSize--;
|
||||
output += copiedSize;
|
||||
remainingCapacity -= copiedSize;
|
||||
decodedCapacity -= copiedSize;
|
||||
*decodedSize += copiedSize;
|
||||
input += consumedSize;
|
||||
encoded += consumedSize;
|
||||
inputSize -= consumedSize;
|
||||
if (result != NWC24_OK) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (result == NWC24_OK && inputSize > 0 && *input != '\0') {
|
||||
if (result == NWC24_OK && inputSize > 0 && *encoded != '\0') {
|
||||
result = NWC24_ERR_OVERFLOW;
|
||||
}
|
||||
decoded[*decodedSize - 1] = '\0';
|
||||
@@ -668,8 +695,6 @@ static NWC24Err ConcatEncodedText(char* encoded, u32 encodedCapacity, u32* encod
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static NWC24Err ExtractCharset(char* charset, u32 charsetCapacity, u32* charsetSize, char* encoded, u32 encodedSize) {
|
||||
char* start;
|
||||
char* end;
|
||||
@@ -682,29 +707,20 @@ static NWC24Err ExtractCharset(char* charset, u32 charsetCapacity, u32* charsetS
|
||||
if (start == NULL) {
|
||||
return NWC24_ERR_NOT_SUPPORTED;
|
||||
}
|
||||
end = FindMarkerAfterPrefix(start, encodedSize - (u32)(start + 2 - encoded), 2, "?");
|
||||
start += 2;
|
||||
end = FindMarker(start, encodedSize - (u32)(start - encoded), "?");
|
||||
if (end == NULL) {
|
||||
return NWC24_ERR_NOT_SUPPORTED;
|
||||
}
|
||||
charsetLength = (u32)(end - (start + 2));
|
||||
if (charsetLength < charsetCapacity) {
|
||||
Mail_strncpy(charset, start + 2, charsetLength);
|
||||
charset[charsetLength] = '\0';
|
||||
} else { return NWC24_ERR_OVERFLOW; }
|
||||
charsetLength = (u32)(end - start);
|
||||
if (charsetLength >= charsetCapacity) {
|
||||
return NWC24_ERR_OVERFLOW;
|
||||
}
|
||||
Mail_strncpy(charset, start, charsetLength);
|
||||
charset[charsetLength] = '\0';
|
||||
*charsetSize = charsetLength + 2;
|
||||
return NWC24_OK;
|
||||
}
|
||||
static inline char* FindMarkerOffsetPrefix(char* input, u32 size, u32 prefix, const char* marker) {
|
||||
u32 markerLength = Mail_strlen(marker);
|
||||
u32 offset;
|
||||
for (offset = 0; offset <= size; offset++) {
|
||||
if (Mail_strncmp(input + offset + prefix, marker, markerLength) == 0) {
|
||||
return input + prefix + offset;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static NWC24Err ExtractEncodedText(char* decoded, u32 decodedCapacity, u32* decodedSize, char encoding, char* encoded, u32 encodedSize,
|
||||
u32* encodedSizeOut) {
|
||||
@@ -713,8 +729,7 @@ static NWC24Err ExtractEncodedText(char* decoded, u32 decodedCapacity, u32* deco
|
||||
int length;
|
||||
NWC24Err result;
|
||||
|
||||
if (encoded == NULL) { return NWC24_ERR_INVALID_VALUE; }
|
||||
if (decodedSize == NULL) {
|
||||
if (encoded == NULL || decodedSize == NULL) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
*decodedSize = 0;
|
||||
@@ -726,19 +741,20 @@ static NWC24Err ExtractEncodedText(char* decoded, u32 decodedCapacity, u32* deco
|
||||
if (start == NULL) {
|
||||
return NWC24_ERR_NOT_SUPPORTED;
|
||||
}
|
||||
end = FindMarkerOffsetPrefix(start, encodedSize - (u32)(start + 1 - encoded), 1, "?=");
|
||||
start++;
|
||||
end = FindMarker(start, encodedSize - (u32)(start - encoded), "?=");
|
||||
if (end == NULL) {
|
||||
return NWC24_ERR_NOT_SUPPORTED;
|
||||
}
|
||||
length = end - (start + 1);
|
||||
length = end - start;
|
||||
if (encoding == 'B' || encoding == 'b') {
|
||||
result = NWC24Base64Decode((u8*)(start + 1), length, (u8*)decoded, decodedCapacity - 1, decodedSize);
|
||||
result = NWC24Base64Decode((u8*)start, length, (u8*)decoded, decodedCapacity - 1, decodedSize);
|
||||
if (result == NWC24_OK || result == NWC24_ERR_OVERFLOW) {
|
||||
decoded[*decodedSize] = '\0';
|
||||
*decodedSize += 1;
|
||||
}
|
||||
} else if (encoding == 'Q' || encoding == 'q') {
|
||||
result = QDecode(decoded, decodedCapacity - 1, decodedSize, start + 1, length, NULL, 1);
|
||||
result = QDecode(decoded, decodedCapacity - 1, decodedSize, start, length, NULL, 1);
|
||||
if (result == NWC24_OK || result == NWC24_ERR_OVERFLOW) {
|
||||
decoded[*decodedSize] = '\0';
|
||||
*decodedSize += 1;
|
||||
@@ -746,6 +762,6 @@ static NWC24Err ExtractEncodedText(char* decoded, u32 decodedCapacity, u32* deco
|
||||
} else {
|
||||
return NWC24_ERR_NOT_SUPPORTED;
|
||||
}
|
||||
if (end != NULL) { *encodedSizeOut = (u32)(end - encoded) + 2; }
|
||||
*encodedSizeOut = (u32)(end - encoded) + 2;
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
@@ -306,7 +306,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
CHECK_WRITE(WriteIconNewField(msg));
|
||||
if (msg->msgBoardFlags.raw != 0) {
|
||||
CHECK_WRITE(WriteMBNoReplyField(msg));
|
||||
{ u16 dateFlags = msg->msgBoardFlags.raw; CHECK_WRITE(WriteMBRegDateField(msg, dateFlags)); }
|
||||
CHECK_WRITE(WriteMBRegDateField(msg, msg->msgBoardFlags.raw & 0xFFFF));
|
||||
CHECK_WRITE(WriteMBDelayField(msg, msg->msgBoardFlags.raw & 0xFF0000));
|
||||
}
|
||||
}
|
||||
@@ -327,15 +327,16 @@ 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));
|
||||
if (!(msg->type & 0x10000))
|
||||
msg->unk_0x10 = msg->length;
|
||||
text.ptr = (const void*)msg->length;
|
||||
{ NWC24Err textResult = WritePlainText(msg);
|
||||
err = textResult == NWC24_ERR_NULL ? NWC24_OK : textResult; }
|
||||
err = WritePlainText(msg);
|
||||
if (err == NWC24_ERR_NULL)
|
||||
err = NWC24_OK;
|
||||
if (err != NWC24_OK) {
|
||||
NWC24FClose(&file);
|
||||
result = err;
|
||||
@@ -346,7 +347,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;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user