Compare commits
90 Commits
agent/w092
...
cleanup/cd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f4f31ae198 | ||
|
|
8476c93f00 | ||
|
|
9b375e1e50 | ||
|
|
73795cb3fb | ||
|
|
0c780f6d1f | ||
|
|
63f4c7aeab | ||
|
|
282ddd99b7 | ||
|
|
c7d0f8f01b | ||
|
|
414b553743 | ||
|
|
da96c27969 | ||
|
|
0a925c7053 | ||
|
|
c0126c37d4 | ||
|
|
fc2d150c6d | ||
|
|
7851b2b29f | ||
|
|
263411ccac | ||
|
|
09de907f0b | ||
|
|
4e3ab6eae5 | ||
|
|
99d6fe20a2 | ||
|
|
00013016df | ||
|
|
3e279ef189 | ||
|
|
32417fe8a2 | ||
|
|
2d9e3ee14a | ||
|
|
23db5e05e1 | ||
|
|
741c9263e3 | ||
|
|
29fe1efaf2 | ||
|
|
45aaeb16b2 | ||
|
|
e9114959c9 | ||
|
|
1f0eb50f01 | ||
|
|
d93fb2d5f8 | ||
|
|
27abfe81d9 | ||
|
|
bf6bc87fbd | ||
|
|
786a2dd3e8 | ||
|
|
bdd15186a7 | ||
|
|
40a2ea7e91 | ||
|
|
0b10215388 | ||
|
|
4e293a4223 | ||
|
|
d94df60412 | ||
|
|
daf04f1f26 | ||
|
|
1994d24f06 | ||
|
|
0d9b038782 | ||
|
|
ff90063ef9 | ||
|
|
c1183780c2 | ||
|
|
2050ad7616 | ||
|
|
9077ef8c7a | ||
|
|
bc303bc36e | ||
|
|
5518cb16fd | ||
|
|
0c06b01c8d | ||
|
|
adc15fdf6f | ||
|
|
dea64a8c9c | ||
|
|
3cde45682d | ||
|
|
ae7cf34cab | ||
|
|
91cc177cb7 | ||
|
|
ecee6f01e4 | ||
|
|
28d3333887 | ||
|
|
2119935c1d | ||
|
|
c7896c3802 | ||
|
|
68c4c9aeac | ||
|
|
1b942565f7 | ||
|
|
a9705fa1a3 | ||
|
|
e1f0ef93a5 | ||
|
|
adcd8ca586 | ||
|
|
76d72f06ce | ||
|
|
b0474b6eac | ||
|
|
9ce28d272f | ||
|
|
771208ab77 | ||
|
|
cee13c5a0b | ||
|
|
1c974dbd49 | ||
|
|
bac1e5427a | ||
|
|
b6687e9ff9 | ||
|
|
ff52d5235d | ||
|
|
7be7f1594e | ||
|
|
51b483cbb7 | ||
|
|
1bb1fb08be | ||
|
|
2f759f35f1 | ||
|
|
ed5c96bd85 | ||
|
|
3816427a3e | ||
|
|
2d0a4faa6f | ||
|
|
a61a7cf140 | ||
|
|
dce9e0732d | ||
|
|
8121c71188 | ||
|
|
d6997b0cb9 | ||
|
|
6b80fd87f5 | ||
|
|
8f920a08c2 | ||
|
|
9c81288c55 | ||
|
|
abb652bb85 | ||
|
|
b578087994 | ||
|
|
d542ace0ed | ||
|
|
d195c16c86 | ||
|
|
2daa6aedf6 | ||
|
|
9432f36a57 |
19
.github/workflows/readme-progress.yml
vendored
19
.github/workflows/readme-progress.yml
vendored
@@ -2,6 +2,8 @@ name: README progress
|
||||
|
||||
# runs on the self-hosted runner on cole's server so it doesn't use hosted minutes.
|
||||
# only push/schedule/manual triggers, never pull_request, so fork PRs can't reach this machine.
|
||||
# README progress is written inside each landing commit by the orchestrator, so this job never commits;
|
||||
# it only rebuilds and publishes the current numbers to the job summary.
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
@@ -15,7 +17,7 @@ concurrency:
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
progress:
|
||||
@@ -48,15 +50,8 @@ jobs:
|
||||
- name: Report
|
||||
run: build/tools/objdiff-cli report generate -p . -o build/43U/report.json -f json
|
||||
|
||||
- name: Update README
|
||||
run: python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
|
||||
|
||||
- name: Commit
|
||||
- name: Summary
|
||||
run: |
|
||||
if git diff --quiet README.md; then exit 0; fi
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git add README.md
|
||||
git commit -m "docs: update progress [skip ci]"
|
||||
git pull --rebase origin main || { git rebase --abort; echo "main moved, next run will update"; exit 0; }
|
||||
git push origin HEAD:main
|
||||
python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
|
||||
sed -n '/progress:start/,/progress:end/p' README.md >> "$GITHUB_STEP_SUMMARY"
|
||||
git checkout -- README.md
|
||||
|
||||
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.53% | 89.30% | 67.08% | 99.37% |
|
||||
| 99.59% | 90.81% | 71.43% | 99.37% |
|
||||
|
||||
units 944/1027 complete, functions 12312/12563 matched.
|
||||
units 956/1027 complete, functions 12365/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,6 +11,8 @@ splits: 'config/43U/splits.txt'
|
||||
ldscript_template: 'config/ldscript_ipl2.lcf'
|
||||
|
||||
force_active:
|
||||
- SOGetSockOpt
|
||||
- SOSetInterfaceOpt
|
||||
- fprintf
|
||||
- leap_days
|
||||
- __msl_time2tm
|
||||
|
||||
@@ -44,7 +44,7 @@ UpdateDiskID = .bss:0x810ADF60; // type:object size:0x20 align:32 data:4byte
|
||||
TicketViewsBuf = .bss:0x810ADF80; // type:object size:0x3600 scope:local align:32
|
||||
Flags0 = .bss:0x810B1580; // type:object size:0x800 scope:local
|
||||
Flags1 = .bss:0x810B1D80; // type:object size:0x800 scope:local
|
||||
Thread = .bss:0x810B2580; // type:object size:0x1318 scope:local
|
||||
Thread = .bss:0x810B2580; // type:object size:0x318 scope:local
|
||||
UpdateHeader0 = .bss:0x810B38A0; // type:object size:0x20 scope:local
|
||||
UpdateHeader1 = .bss:0x810B38C0; // type:object size:0x20 scope:local
|
||||
viewsBuf = .bss:0x810B38E0; // type:object size:0x3600 scope:local
|
||||
@@ -87,7 +87,8 @@ m_allocator__Q23ipl5scene = .bss:0x810BD498; // type:object size:0x10
|
||||
AOSSi_NcdIfConfig = .bss:0x810BD4A8; // type:object size:0x15E data:byte
|
||||
AOSSi_NcdIpConfig = .bss:0x810BD608; // type:object size:0x7C4 data:4byte
|
||||
sRakuAllocator = .bss:0x810BDDD0; // type:object size:0x10
|
||||
sRakuStatus = .bss:0x810BDDE0; // type:object size:0xF4 data:4byte
|
||||
sRakuStatus = .bss:0x810BDDE0; // type:object size:0xC data:4byte
|
||||
sRakuConfiguration = .bss:0x810BDDEC; // type:object size:0xE8
|
||||
sRakuMsgQueue = .bss:0x810BDED4; // type:object size:0x20
|
||||
AOSS_810BDEF8 = .bss:0x810BDEF8; // type:object size:0x20 data:4byte
|
||||
AOSS_810BDF18 = .bss:0x810BDF18; // type:object size:0x6A0
|
||||
@@ -103,7 +104,7 @@ AtermThread = .bss:0x810C0958; // type:object size:0x318 scope:local align:32
|
||||
Voices = .bss:0x810C0C80; // type:object size:0x1800 data:4byte
|
||||
sZeroMem = .bss:0x810C2480; // type:object size:0x100 data:byte
|
||||
s_player_thread_stack = .bss:0x810C2580; // type:object size:0x4000 scope:local
|
||||
lbl_810C6580 = .bss:0x810C6580; // type:object size:0x10
|
||||
lbl_810C6580 = .bss:0x810C6580; // type:object size:0xC
|
||||
layoutGatherDestructorRecord = .bss:0x810C6590; // type:object size:0xC data:4byte
|
||||
unInputedWCharColorDestructorRecord = .bss:0x810C659C; // type:object size:0xC data:4byte
|
||||
charColorDestructorRecord = .bss:0x810C65A8; // type:object size:0xC data:4byte
|
||||
@@ -4576,9 +4577,9 @@ enqueueNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB254; // type:
|
||||
enqueueLoadNotice__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB308; // type:function size:0x5C
|
||||
enqueuePageNotice__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB364; // type:function size:0x5C
|
||||
enqueueResultNotice__Q33ipl5scene15SDChannelSelectFUl = .text:0x813DB3C0; // type:function size:0x5C
|
||||
enqueueChannelNotice__Q33ipl5scene15SDChannelSelectFUlUlUlUl = .text:0x813DB41C; // type:function size:0x5C
|
||||
enqueueChannelNotice__Q33ipl5scene15SDChannelSelectFUxUl = .text:0x813DB41C; // type:function size:0x5C
|
||||
enqueueMoveNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB478; // type:function size:0x5C
|
||||
enqueueStateNotice__Q33ipl5scene15SDChannelSelectFUlUlUlUl = .text:0x813DB4D4; // type:function size:0x5C
|
||||
enqueueStateNotice__Q33ipl5scene15SDChannelSelectFUxUl = .text:0x813DB4D4; // type:function size:0x5C
|
||||
enqueueErrorNotice__Q33ipl5scene15SDChannelSelectFUlUl = .text:0x813DB530; // type:function size:0x5C
|
||||
enqueueCommandNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB58C; // type:function size:0x60
|
||||
enqueueDeleteNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB5EC; // type:function size:0x60
|
||||
@@ -4814,7 +4815,7 @@ reset_gui__Q33ipl5scene8SDButtonFv = .text:0x813E9BC0; // type:function size:0x1
|
||||
startPointEvent__Q33ipl5scene8SDButtonFPCcPQ33ipl10controller9Interface = .text:0x813E9D08; // type:function size:0x258
|
||||
startLeftEvent__Q33ipl5scene8SDButtonFPCc = .text:0x813E9F60; // type:function size:0x220
|
||||
isActive__Q33ipl5scene8SDButtonCFv = .text:0x813EA180; // type:function size:0xC
|
||||
setEventHandler__Q33ipl5scene8SDButtonFPQ23gui12EventHandlerPQ23gui12EventHandler = .text:0x813EA18C; // type:function size:0x14
|
||||
setEventHandler__Q33ipl5scene8SDButtonFPQ23gui12EventHandler = .text:0x813EA18C; // type:function size:0x14
|
||||
setText__Q33ipl5scene8SDButtonFPCcPCw = .text:0x813EA1A0; // type:function size:0xB4
|
||||
animation__Q33ipl5scene8SDButtonFi = .text:0x813EA254; // type:function size:0x1C4
|
||||
initArrowAppearance__Q33ipl5scene8SDButtonFib = .text:0x813EA418; // type:function size:0xD0
|
||||
@@ -5158,7 +5159,7 @@ AOSSi_WLANConnect = .text:0x813FD72C; // type:function size:0x26C
|
||||
AOSSi_Sleep = .text:0x813FD998; // type:function size:0x4
|
||||
AOSSi_Status = .text:0x813FD99C; // type:function size:0x34
|
||||
AOSS_SetCallback = .text:0x813FD9D0; // type:function size:0x34
|
||||
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDA04; // type:function size:0x6C scope:local
|
||||
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFP12RakuProgress = .text:0x813FDA04; // type:function size:0x6C scope:local
|
||||
__ct__Q33ipl5scene14RakuRakuThreadFPQ23EGG4Heap = .text:0x813FDA70; // type:function size:0xD8
|
||||
__dt__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDB48; // type:function size:0xA4
|
||||
destroy__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDBEC; // type:function size:0xD8
|
||||
@@ -16149,6 +16150,11 @@ lbl_8164EF14 = .data:0x8164EF14; // type:object size:0x34
|
||||
__vt__Q33ipl5scene27CsChanTtlButtonEventHandler = .data:0x8164EF48; // type:object size:0x1C
|
||||
__vt__Q33ipl5scene24ChannelTitleEventHandler = .data:0x8164EF64; // type:object size:0x18
|
||||
__vt__Q33ipl5scene12ChannelTitle = .data:0x8164EF7C; // type:object size:0x68
|
||||
lbl_8164EFE4 = .data:0x8164EFE4; // type:object size:0x5C
|
||||
lbl_8164F040 = .data:0x8164F040; // type:object size:0x18
|
||||
lbl_8164F058 = .data:0x8164F058; // type:object size:0x20
|
||||
lbl_8164F078 = .data:0x8164F078; // type:object size:0x20
|
||||
lbl_8164F098 = .data:0x8164F098; // type:object size:0x20
|
||||
@10125 = .data:0x8164F0B8; // type:object size:0xD scope:local data:string
|
||||
...data.0 = .data:0x8164F0B8; // type:label scope:local
|
||||
@10126 = .data:0x8164F0C5; // type:object size:0xD scope:local data:string
|
||||
@@ -23829,7 +23835,7 @@ result$1126 = .sbss:0x81698E48; // type:object size:0x4 data:4byte
|
||||
soState = .sbss:0x81698E50; // type:object size:0x1 scope:local data:byte
|
||||
soError = .sbss:0x81698E54; // type:object size:0x4 scope:local data:4byte
|
||||
soRegistered = .sbss:0x81698E58; // type:object size:0x4 scope:local data:4byte
|
||||
soSocketRegistered = .sbss:0x81698E60; // type:object size:0x8 scope:local data:4byte
|
||||
soSocketRegistered = .sbss:0x81698E60; // type:object size:0x4 scope:local data:4byte
|
||||
sslRegistered = .sbss:0x81698E68; // type:object size:0x4 scope:local data:4byte
|
||||
l_initialized = .sbss:0x81698E6C; // type:object size:0x4 scope:local data:4byte
|
||||
VFipf_sys_set = .sbss:0x81698E70; // type:object size:0x4 scope:global data:4byte
|
||||
|
||||
30
configure.py
30
configure.py
@@ -742,7 +742,7 @@ config.libs = [
|
||||
Object(Matching, "scene/board/iplBoardObject.cpp"),
|
||||
Object(Matching, "scene/board/iplBoardSD.cpp"),
|
||||
Object(Matching, "scene/board/iplUrlProcessor.cpp"),
|
||||
Object(Equivalent, "scene/board/iplFocusObject.cpp"),
|
||||
Object(Matching, "scene/board/iplFocusObject.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("button", [
|
||||
@@ -877,7 +877,7 @@ config.libs = [
|
||||
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
|
||||
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSSLink.c"),
|
||||
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(Matching, "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"]),
|
||||
]
|
||||
@@ -927,7 +927,7 @@ config.libs = [
|
||||
Object(Matching, "keyboard/tiPkData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiLanguageIndependentData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
|
||||
@@ -989,7 +989,7 @@ config.libs = [
|
||||
Object(NonMatching, "clib/zi8cgetc.c"),
|
||||
Object(Matching, "clib/zi8cinfo.c"),
|
||||
Object(Matching, "clib/zi8copy.c"),
|
||||
Object(NonMatching, "clib/zi8dawg.c"),
|
||||
Object(Matching, "clib/zi8dawg.c"),
|
||||
Object(Matching, "clib/zi8getc.c"),
|
||||
Object(NonMatching, "clib/zi8getc2.c"),
|
||||
Object(Matching, "clib/zi8getSW.c"),
|
||||
@@ -1005,7 +1005,7 @@ config.libs = [
|
||||
Object(Matching, "clib/zi8ZHuwd.c"),
|
||||
Object(NonMatching, "clib/zidawg1.c"),
|
||||
Object(Matching, "clib/zikorean.c"),
|
||||
Object(NonMatching, "clib/ziswordw.c"),
|
||||
Object(Matching, "clib/ziswordw.c"),
|
||||
Object(NonMatching, "clib/zkokeyp.c"),
|
||||
Object(Matching, "clib/zierror.c"),
|
||||
Object(NonMatching, "clib/zmtkey.c"),
|
||||
@@ -1075,12 +1075,12 @@ config.libs = [
|
||||
Object(Matching, "nwc24/NWC24Utils.c"),
|
||||
Object(Matching, "nwc24/NWC24Manage.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgObj.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MBoxCtrl.c"),
|
||||
Object(Matching, "nwc24/NWC24MBoxCtrl.c"),
|
||||
Object(Matching, "nwc24/NWC24Mime.c"),
|
||||
Object(Matching, "nwc24/NWC24Stream.c"),
|
||||
Object(Matching, "nwc24/NWC24Parser.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgCommit.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgRead.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgCommit.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgRead.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgSubject.c"),
|
||||
Object(Matching, "nwc24/NWC24Schedule.c"),
|
||||
Object(NonMatching, "nwc24/NWC24DateParser.c"),
|
||||
@@ -1098,7 +1098,7 @@ config.libs = [
|
||||
Object(Matching, "so/SOCommon.c"),
|
||||
Object(NonMatching, "so/SOBasic.c"),
|
||||
Object(Matching, "so/SOInformation.c"),
|
||||
Object(NonMatching, "so/SOOption.c"),
|
||||
Object(Matching, "so/SOOption.c"),
|
||||
]
|
||||
),
|
||||
RevoEXLib("ssl", [
|
||||
@@ -1212,7 +1212,7 @@ config.libs = [
|
||||
Object(NonMatching, "exif/exif_parse.c"),
|
||||
|
||||
Object(Matching, "reschange/iqdec_resolution_change_a3.c"),
|
||||
Object(NonMatching, "reschange/idct_resolution_change_var.c"),
|
||||
Object(Matching, "reschange/idct_resolution_change_var.c"),
|
||||
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoY8U8V8.c"),
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
|
||||
@@ -1693,10 +1693,10 @@ config.libs = [
|
||||
Object(NonMatching, "fa/pdm_partition.c"),
|
||||
Object(NonMatching, "fa/pf_cache.c"),
|
||||
Object(Matching, "fa/pf_cluster.c"),
|
||||
Object(NonMatching, "fa/pf_dir.c"),
|
||||
Object(Matching, "fa/pf_dir.c"),
|
||||
Object(Matching, "fa/pf_entry.c"),
|
||||
Object(NonMatching, "fa/pf_entry_iterator.c"),
|
||||
Object(NonMatching, "fa/pf_fat.c"),
|
||||
Object(Matching, "fa/pf_entry_iterator.c"),
|
||||
Object(Matching, "fa/pf_fat.c"),
|
||||
Object(Matching, "fa/pf_fat12.c"),
|
||||
Object(Matching, "fa/pf_fat16.c"),
|
||||
Object(Matching, "fa/pf_fat32.c"),
|
||||
@@ -1704,7 +1704,7 @@ config.libs = [
|
||||
Object(Matching, "fa/pf_file.c"),
|
||||
Object(Matching, "fa/pf_path.c"),
|
||||
Object(Matching, "fa/pf_sector.c"),
|
||||
Object(NonMatching, "fa/pf_volume.c"),
|
||||
Object(Matching, "fa/pf_volume.c"),
|
||||
Object(Matching, "fa/pf_volume_apiadd.c"),
|
||||
Object(Matching, "fa/pf_cp932.c"),
|
||||
Object(Matching, "fa/pf_api_util.c"),
|
||||
@@ -1908,7 +1908,7 @@ config.libs = [
|
||||
[
|
||||
Object(Matching, "core/eggAllocator.cpp"),
|
||||
Object(Matching, "core/eggAudioArcPlayerMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioExpMgr.cpp"),
|
||||
Object(Equivalent, "core/eggAudioExpMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioFxMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioHeapMgr.cpp"),
|
||||
|
||||
@@ -55,7 +55,7 @@ namespace textinput {
|
||||
public:
|
||||
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(MYTIMANAGER_IMPLEMENTATION)
|
||||
virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
||||
#else
|
||||
virtual void startAnm(AnimObserver*, f32, f32, f32, void*);
|
||||
|
||||
@@ -103,11 +103,7 @@ namespace ipl {
|
||||
*/
|
||||
Object(EGG::Heap* heap, nand::LayoutFile* file, const char* directory, const char* fileName);
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~Object() {}
|
||||
#else
|
||||
virtual ~Object();
|
||||
#endif
|
||||
|
||||
void initLocationAdjust();
|
||||
|
||||
|
||||
@@ -143,7 +143,11 @@ namespace ipl {
|
||||
#else
|
||||
VEC3 operator-(const VEC3& rhs) const { return VEC3(x - rhs.x, y - rhs.y, z - rhs.z); }
|
||||
#endif
|
||||
#ifdef IPL_FOCUS_OBJECT_CPP
|
||||
VEC3 operator*(f32 val) const;
|
||||
#else
|
||||
VEC3 operator*(f32 val) const { return VEC3(x * val, y * val, z * val); }
|
||||
#endif
|
||||
VEC3 operator*(f64 val) const {
|
||||
nw4r::math::VEC3 vecOut;
|
||||
VEC3Scale(&vecOut, this, (f32)val);
|
||||
|
||||
@@ -53,24 +53,7 @@ namespace ipl {
|
||||
mBScroller.init();
|
||||
}
|
||||
|
||||
BOOL calc(bool canScroll) __attribute__((never_inline)) /*for now*/ {
|
||||
BOOL result = FALSE;
|
||||
|
||||
if (canScroll) {
|
||||
if (mBScroller.calc()) {
|
||||
result = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
mScroller.calc();
|
||||
|
||||
f32 movable = mScroller.movable_pos(mBScroller.getSpeed());
|
||||
|
||||
mScroller.addScroll(movable);
|
||||
mBScroller.addSoundFreq(movable);
|
||||
|
||||
return result;
|
||||
}
|
||||
BOOL calc(bool canScroll);
|
||||
|
||||
BOOL is_busy() const {
|
||||
BOOL result = TRUE;
|
||||
|
||||
@@ -18,11 +18,11 @@ namespace ipl {
|
||||
|
||||
class line_collision {
|
||||
public:
|
||||
line_collision() : unk_0x00(0.0f), unk_0x04(0.0f), unk_0x08(0.0f) {}
|
||||
line_collision() : mLeft(0.0f), mRight(0.0f), mY(0.0f) {}
|
||||
|
||||
f32 unk_0x00;
|
||||
f32 unk_0x04;
|
||||
f32 unk_0x08;
|
||||
f32 mLeft;
|
||||
f32 mRight;
|
||||
f32 mY;
|
||||
nw4r::ut::Link mLinkList; // 0x0C
|
||||
};
|
||||
|
||||
@@ -31,9 +31,9 @@ namespace ipl {
|
||||
url_collision();
|
||||
~url_collision();
|
||||
|
||||
int unk_0x00;
|
||||
wchar_t* unk_0x04;
|
||||
wchar_t* unk_0x08;
|
||||
int mTagNo;
|
||||
wchar_t* mpStart;
|
||||
wchar_t* mpEnd;
|
||||
nw4r::ut::Link mLinkList; // 0x0C
|
||||
nw4r::ut::List mLineCollisions; // 0x14
|
||||
};
|
||||
@@ -53,19 +53,19 @@ namespace ipl {
|
||||
void parse(nw4r::ut::PrintContext<wchar_t>* context);
|
||||
|
||||
BOOL is_focused() const;
|
||||
void select(int unk);
|
||||
void select(int tagNo);
|
||||
|
||||
int get_focused_tagno(int chan) const;
|
||||
url_collision* get_selected_col();
|
||||
|
||||
void get_url(char* urlOut, u32 urlLen);
|
||||
|
||||
void setUnk_0x40(f32 val) { unk_0x40 = val; }
|
||||
void setUnk_0x44(f32 val) { unk_0x44 = val; }
|
||||
void setUnk_0x53(bool val) { unk_0x53 = val; }
|
||||
void setHitYOffset(f32 val) { mHitYOffset = val; }
|
||||
void setMemoTranslateY(f32 val) { mMemoTranslateY = val; }
|
||||
void setFocusEnabled(bool val) { mbFocusEnabled = val; }
|
||||
|
||||
u8 getUnk_0x50() const { return unk_0x50; }
|
||||
void setUnk_0x50(u8 val) { unk_0x50 = val; }
|
||||
u8 getColorPass() const { return mbColorPass; }
|
||||
void setColorPass(u8 val) { mbColorPass = val; }
|
||||
|
||||
private:
|
||||
typedef struct {
|
||||
@@ -75,14 +75,14 @@ namespace ipl {
|
||||
|
||||
con_data mConData[WPAD_MAX_CONTROLLERS]; // 0x00
|
||||
nw4r::ut::List mUrlCollisions; // 0x34
|
||||
f32 unk_0x40;
|
||||
f32 unk_0x44;
|
||||
int unk_0x48;
|
||||
int unk_0x4C;
|
||||
u8 unk_0x50;
|
||||
u8 unk_0x51;
|
||||
u8 unk_0x52;
|
||||
u8 unk_0x53;
|
||||
f32 mHitYOffset;
|
||||
f32 mMemoTranslateY;
|
||||
int mCurTagNo;
|
||||
int mSelectedTagNo;
|
||||
u8 mbColorPass;
|
||||
u8 mbInTag;
|
||||
u8 mbHoverOffset;
|
||||
u8 mbFocusEnabled;
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -102,12 +102,7 @@ namespace ipl {
|
||||
static const char* getButtonName(int button) { return smButtonName[button]; }
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
void setEventHandler(::gui::EventHandler * event,
|
||||
::gui::EventHandler * optOutEvent = NULL);
|
||||
#else
|
||||
void setEventHandler(::gui::EventHandler * event, ::gui::EventHandler * optOutEvent);
|
||||
#endif
|
||||
void setEventHandler(::gui::EventHandler * event);
|
||||
|
||||
void setText(const char* paneName, u32 msgId);
|
||||
void setText(const char* paneName, const wchar_t* text);
|
||||
@@ -150,7 +145,7 @@ namespace ipl {
|
||||
ANIM_MAX,
|
||||
};
|
||||
|
||||
int unk_0x54;
|
||||
int mAnimWait;
|
||||
|
||||
layout::Object* mpLayout; // 0x58
|
||||
nand::LayoutFile* mpLayoutFile; // 0x5C
|
||||
|
||||
@@ -203,9 +203,9 @@ namespace ipl {
|
||||
bool enqueueLoadNotice();
|
||||
bool enqueuePageNotice();
|
||||
bool enqueueResultNotice(u32 result);
|
||||
bool enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value);
|
||||
bool enqueueChannelNotice(u64 titleId, u32 value);
|
||||
bool enqueueMoveNotice(u32 controller, u32 page, u32 index);
|
||||
bool enqueueStateNotice(u32 controller, u32 page, u32 index, u32 state);
|
||||
bool enqueueStateNotice(u64 titleId, u32 state);
|
||||
bool enqueueErrorNotice(u32 page, u32 index);
|
||||
bool enqueueCommandNotice(u32 page, u32 index, u32 command);
|
||||
bool enqueueDeleteNotice(u32 controller, u32 page, u32 index);
|
||||
|
||||
@@ -62,17 +62,17 @@ namespace ipl {
|
||||
void start_left_event(const char* paneName);
|
||||
void start_trig_event(const char* paneName);
|
||||
|
||||
typedef struct Unk {
|
||||
typedef struct CmdEntry {
|
||||
int command; // 0x00
|
||||
u32 msgID; // 0x04
|
||||
} Unk;
|
||||
} CmdEntry;
|
||||
|
||||
Unk unk_0x64[64];
|
||||
CmdEntry mCmdQueue[64];
|
||||
|
||||
int unk_0x264;
|
||||
int unk_0x268;
|
||||
int unk_0x26C;
|
||||
int unk_0x270;
|
||||
int mQueueCapacity;
|
||||
int mQueueCount;
|
||||
int mQueueRead;
|
||||
int mQueueWrite;
|
||||
|
||||
int mSettingArg; // 0x274
|
||||
|
||||
|
||||
@@ -89,10 +89,10 @@ namespace ipl {
|
||||
|
||||
int mIPLState; // 0x04
|
||||
volatile BS2State mState; // 0x08
|
||||
bool unk_0x0C;
|
||||
bool unk_0x0D;
|
||||
bool unk_0x0E;
|
||||
bool unk_0x0F;
|
||||
bool mbTickEnabled; // 0x0C
|
||||
bool mbUpdateRequested; // 0x0D
|
||||
bool mbAbortRequested; // 0x0E
|
||||
bool mbRestartRequested; // 0x0F
|
||||
bool mbIsDiagDisc; // 0x10
|
||||
bool mbIncludesSeatTitles; // 0x11
|
||||
u8* mpBannerBuffer; // 0x14
|
||||
|
||||
@@ -60,9 +60,9 @@ namespace ipl {
|
||||
|
||||
int mMessageID; // 0x08
|
||||
|
||||
int unk_0x0C;
|
||||
int unk_0x10;
|
||||
char unk_0x14[4];
|
||||
int mArg2;
|
||||
int mArg3;
|
||||
char mArg1[4];
|
||||
|
||||
u8* mpArcData; // 0x18
|
||||
u32 mArcSize; // 0x1C
|
||||
|
||||
@@ -139,7 +139,7 @@ namespace ipl {
|
||||
|
||||
bool received() { return mbReviecedMsg; }
|
||||
void prepNextReceive() { mbReviecedMsg = false; }
|
||||
volatile bool isUnk0xA31() { return unk_0xA31 == false; }
|
||||
volatile bool isReceivingIdle() { return mbReceiving == false; }
|
||||
|
||||
BOOL isAppDlEnableLock(u32 appId) {
|
||||
utility::autoMutexLock lock(mAutoLock);
|
||||
@@ -175,9 +175,9 @@ namespace ipl {
|
||||
OSMutex mAutoLock; // 0xA18
|
||||
|
||||
bool mbReviecedMsg;
|
||||
bool unk_0xA31;
|
||||
bool mbReceiving;
|
||||
bool mbReceivePaused; // 0xA32
|
||||
bool unk_0xA33;
|
||||
bool mbNewTitleTblReady;
|
||||
|
||||
static Arg smArg;
|
||||
|
||||
|
||||
@@ -3,18 +3,6 @@
|
||||
#include <egg/core.h>
|
||||
|
||||
namespace EGG {
|
||||
class Sample : public SimpleAudioMgrWithFx {
|
||||
public:
|
||||
Sample();
|
||||
virtual ~Sample();
|
||||
};
|
||||
|
||||
Sample::Sample() {
|
||||
}
|
||||
|
||||
Sample::~Sample() {
|
||||
}
|
||||
|
||||
SimpleAudioMgrWithFx::SimpleAudioMgrWithFx() {
|
||||
}
|
||||
|
||||
|
||||
@@ -1120,6 +1120,7 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
case 's':
|
||||
if (format.argument_options == wchar_argument) {
|
||||
wchar_t* wcs_ptr = va_arg(args, wchar_t*);
|
||||
int wideLength;
|
||||
|
||||
if (wcs_ptr == NULL) {
|
||||
wcs_ptr = L"";
|
||||
@@ -1127,22 +1128,24 @@ 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;
|
||||
wideLength = (unsigned char)first;
|
||||
|
||||
if (format.precision_specified && num_chars > format.precision) {
|
||||
num_chars = format.precision;
|
||||
if (format.precision_specified && wideLength > format.precision) {
|
||||
wideLength = format.precision;
|
||||
}
|
||||
} else if (format.precision_specified) {
|
||||
num_chars = format.precision;
|
||||
wideLength = format.precision;
|
||||
|
||||
if ((string_end = wmemchr((wchar_t*)wcs_ptr, 0, num_chars)) != 0) {
|
||||
num_chars = string_end - wcs_ptr;
|
||||
if ((string_end = wmemchr((wchar_t*)wcs_ptr, 0, wideLength)) != 0) {
|
||||
wideLength = string_end - wcs_ptr;
|
||||
}
|
||||
|
||||
} else {
|
||||
num_chars = wcslen(wcs_ptr);
|
||||
wideLength = wcslen(wcs_ptr);
|
||||
}
|
||||
|
||||
num_chars = wideLength;
|
||||
|
||||
buff_ptr = wcs_ptr;
|
||||
break;
|
||||
} else {
|
||||
|
||||
@@ -314,7 +314,7 @@ namespace nw4r {
|
||||
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader) {
|
||||
u32 glgrInnerLen;
|
||||
HeaderedGlyphGroups* pGlgr;
|
||||
ArchiveFontBinaryLayout* font;
|
||||
const ArchiveFontBinaryLayout* font;
|
||||
u8* glgrEnd;
|
||||
|
||||
u32 expectedMaxSize;
|
||||
@@ -337,7 +337,7 @@ namespace nw4r {
|
||||
|
||||
// Copy the glgr to work
|
||||
{
|
||||
pGlgr = &font->glgr;
|
||||
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
|
||||
glgrEnd = (u8*)pGlgr + (u32)ctx->mNextBlockHdr.size;
|
||||
|
||||
memcpy(pGlgr, &ctx->mNextBlockHdr, sizeof(BinaryBlockHeader));
|
||||
@@ -368,21 +368,21 @@ namespace nw4r {
|
||||
|
||||
u32 sheetOffsetsScratchSize;
|
||||
|
||||
dataBlockCount = font->hdr.dataBlocks; // 0x0E
|
||||
sheetGlyphCount = font->glgr.inner.sheetGlyphCount; // 0x1C
|
||||
dataBlockCount = font->hdr.dataBlocks; // 0x0E
|
||||
// countName = font->glgr.inner.nameCount;
|
||||
countSheet = font->glgr.inner.sheetCount;
|
||||
// count0A = font->glgr.inner.smthCount_0x0a;
|
||||
// count0C = font->glgr.inner.smthCount_0x0c;
|
||||
sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
|
||||
sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)font + ctx->remWorkSpace()) - sheetOffsetsSize, 2);
|
||||
|
||||
stepSheetFlags = detail::CalcSizeFlagSet(countSheet);
|
||||
flagsSheetsOff = detail::CalcOffsetSheetFlags(font->glgr.inner.nameCount, countSheet, font->glgr.inner.smthCount_0x0a,
|
||||
font->glgr.inner.smthCount_0x0c);
|
||||
flagsSheets = (const u32*)font + (flagsSheetsOff >> 2);
|
||||
|
||||
pGlgr = &font->glgr;
|
||||
sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
|
||||
sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)font + ctx->remWorkSpace()) - sheetOffsetsSize, 2);
|
||||
|
||||
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
|
||||
ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize);
|
||||
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) {
|
||||
// return CONSTRUCT_STATE_FATAL_ERR;
|
||||
|
||||
@@ -63,7 +63,7 @@ typedef struct {
|
||||
u8 mcuYRem; // 0x0F
|
||||
u16 mcuYCount; // 0x10
|
||||
u16 mcuXCount2; // 0x12
|
||||
u32 unk_0x14;
|
||||
u32 mcuTotal; // 0x14
|
||||
u8 remX; // 0x18
|
||||
u8 remY; // 0x19
|
||||
u8 compCount; // 0x1A
|
||||
@@ -142,7 +142,7 @@ struct TMCCJPEGDecWork_t {
|
||||
u8 mcuYRem; // 0x17FF
|
||||
u16 mcuYCount; // 0x1800
|
||||
u16 mcuXCount2; // 0x1802
|
||||
u32 unk_0x1804;
|
||||
u32 mcuTotal; // 0x1804
|
||||
u8 remX; // 0x1808
|
||||
u8 remY; // 0x1809
|
||||
u8 compCount; // 0x180A
|
||||
|
||||
@@ -10,14 +10,12 @@ static TMCHuffmanEntry readHuffmanEntry(const TMCHuffmanEntry* entries, u32 inde
|
||||
return entries[index];
|
||||
}
|
||||
|
||||
static TMCHuffmanEntry readHuffmanLimit(const TMCHuffmanEntry* entries) {
|
||||
TMCHuffmanEntry limit;
|
||||
limit.bitLength = entries->bitLength;
|
||||
limit.symbol = entries->symbol;
|
||||
return limit;
|
||||
static void readHuffmanLimit(const TMCHuffmanEntry* entries, TMCHuffmanEntry* limit) {
|
||||
limit->bitLength = entries->bitLength;
|
||||
limit->symbol = entries->symbol;
|
||||
}
|
||||
|
||||
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
|
||||
u32 bitData;
|
||||
u32 code;
|
||||
u32 length;
|
||||
@@ -51,17 +49,21 @@ static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table,
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
if (code > (u32)decoded.bitLength) {
|
||||
readHuffmanLimit(entry, limit);
|
||||
*decoded = *limit;
|
||||
if (code > (u32)decoded->bitLength) {
|
||||
continue;
|
||||
}
|
||||
code = code - entry->bitLength + entry->symbol;
|
||||
return symbols[code & 0xFF];
|
||||
{
|
||||
u32 relativeCode = code - entry->bitLength;
|
||||
u32 symbolIndex = relativeCode + entry->symbol;
|
||||
return symbols[symbolIndex & 0xFF];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
|
||||
u32 bitData;
|
||||
u32 code;
|
||||
u32 length;
|
||||
@@ -94,18 +96,26 @@ static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, co
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
if (code > (u32)decoded.bitLength) {
|
||||
readHuffmanLimit(entry, limit);
|
||||
*decoded = *limit;
|
||||
if (code > (u32)decoded->bitLength) {
|
||||
continue;
|
||||
}
|
||||
code = code - entry->bitLength + entry->symbol;
|
||||
return symbols[code & 0xFF];
|
||||
{
|
||||
u32 relativeCode = code - entry->bitLength;
|
||||
u32 symbolIndex = relativeCode + entry->symbol;
|
||||
return symbols[symbolIndex & 0xFF];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_ptr, TMCCJPEGDecWork* work) {
|
||||
TMCHuffmanEntry dcEntry;
|
||||
TMCHuffmanEntry dcDecoded;
|
||||
TMCHuffmanEntry dcLimit;
|
||||
TMCHuffmanEntry acDecoded;
|
||||
TMCHuffmanEntry acLimit;
|
||||
u8* huff_sym;
|
||||
const TMCHuffmanEntry* ac_fast;
|
||||
s32 idx;
|
||||
@@ -147,7 +157,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
} else {
|
||||
huff_sym = work->pDCHuffSym;
|
||||
huff_tbl = work->pDCHuffTbl;
|
||||
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work, &dcLimit, &dcDecoded);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -207,7 +217,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
r = acEntry.symbol;
|
||||
} else {
|
||||
bit_pos = work->bitCount;
|
||||
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work, &acLimit, &acDecoded);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ static u16 readU16(const u8* p, u16 byteOrder) {
|
||||
}
|
||||
|
||||
static u16 readExifU16(const u8* data, u16 byteOrder) {
|
||||
u32 value = data[0] | data[1] << 8;
|
||||
u16 value = data[0] | data[1] << 8;
|
||||
if (byteOrder == 0x4949) {
|
||||
return (u16)value;
|
||||
}
|
||||
@@ -246,9 +246,9 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
u32 ifdOffset;
|
||||
const u8* entries;
|
||||
u16 remaining;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
s32 entriesSize;
|
||||
u16 count;
|
||||
pInfo->thumbnailData = (u8*)data;
|
||||
pInfo->dataEnd = (u8*)data + size;
|
||||
pInfo->nextIfdOffset = 0;
|
||||
@@ -339,7 +339,7 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, const u8* entry) {
|
||||
u16 tag;
|
||||
s32 tag;
|
||||
u16 type;
|
||||
|
||||
tag = readU16(entry, byteOrder);
|
||||
|
||||
@@ -51,7 +51,7 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
state->componentCount = work->componentCount;
|
||||
state->result = work->unk_0x1804;
|
||||
state->result = work->mcuTotal;
|
||||
state->maxX = work->mcuYCount;
|
||||
state->maxY = work->mcuXCount2;
|
||||
|
||||
|
||||
@@ -567,7 +567,7 @@ s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work) {
|
||||
|
||||
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
|
||||
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
|
||||
p->unk_0x14 = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
||||
p->mcuTotal = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
||||
|
||||
for (idx = 0; idx < (s32)p->scanCompCount; idx++) {
|
||||
u8 compId;
|
||||
@@ -1929,7 +1929,7 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
|
||||
mcuCountY += yr;
|
||||
frameInfo->mcuYCount = mcuCountX;
|
||||
frameInfo->mcuXCount2 = mcuCountY;
|
||||
work->unk_0x1804 = (u32)mcuCountX * (u32)mcuCountY;
|
||||
work->mcuTotal = (u32)mcuCountX * (u32)mcuCountY;
|
||||
}
|
||||
|
||||
compCount2 = frameInfo->compCount;
|
||||
|
||||
@@ -15,9 +15,13 @@ static s8 clampS8(s32 v) {
|
||||
|
||||
void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag) {
|
||||
s32 bd;
|
||||
s32 d;
|
||||
s32 c;
|
||||
s32 a;
|
||||
s32 cd;
|
||||
s32 oddrot;
|
||||
s32 evsum;
|
||||
s32 rot;
|
||||
s32 d;
|
||||
s32 b;
|
||||
|
||||
s32* sp;
|
||||
@@ -26,57 +30,41 @@ void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag
|
||||
s32 tmp[64];
|
||||
s32 i;
|
||||
|
||||
s32 evsum, rot, oddrot, cd;
|
||||
|
||||
sp = block + 24;
|
||||
dp = tmp + 24;
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
a = sp[0]; // 0x0
|
||||
b = sp[1]; // 0x4
|
||||
c = sp[2]; // 0x8
|
||||
d = sp[3]; // 0xc
|
||||
for (i = 0; i < 4; i++) {
|
||||
s32 a, b, c, d;
|
||||
s32 odddiff, bd, evsum, cd, rot, oddrot;
|
||||
a = sp[0];
|
||||
b = sp[1];
|
||||
c = sp[2];
|
||||
d = sp[3];
|
||||
odddiff = b - d;
|
||||
bd = b + d;
|
||||
evsum = a + c;
|
||||
|
||||
oddrot = (0xB5 * (sp[1] - sp[3]) >> 8) + bd;
|
||||
rot = (0xB5 * (sp[1] - sp[3])) >> 8;
|
||||
|
||||
dp[1] = (a - c) + rot;
|
||||
dp[2] = (a - c) - rot;
|
||||
dp[3] = evsum - oddrot;
|
||||
dp[0] = evsum + oddrot;
|
||||
|
||||
b = sp[-7]; // -0x1c
|
||||
d = sp[-5]; // -0x14
|
||||
|
||||
bd = b + d;
|
||||
rot = ((b - d) * 0xB5) >> 8;
|
||||
cd = a - c;
|
||||
rot = (odddiff * 0xB5) >> 8;
|
||||
oddrot = rot + bd;
|
||||
|
||||
a = sp[-8]; // -0x20
|
||||
c = sp[-6]; // -0x18
|
||||
|
||||
dp[-8] = (a + c) + oddrot;
|
||||
dp[-7] = (a - c) + rot;
|
||||
dp[-6] = (a - c) - rot;
|
||||
dp[-5] = (a + c) - oddrot;
|
||||
|
||||
sp -= 16;
|
||||
dp -= 16;
|
||||
dp[0] = evsum + oddrot;
|
||||
dp[1] = cd + rot;
|
||||
dp[2] = cd - rot;
|
||||
dp[3] = evsum - oddrot;
|
||||
sp -= 8;
|
||||
dp -= 8;
|
||||
}
|
||||
|
||||
{
|
||||
u32 idx = 3;
|
||||
sp = tmp + 3;
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
u8* bp = conv_row_ptr + idx;
|
||||
|
||||
a = sp[0] + 0x40000;
|
||||
b = sp[8];
|
||||
d = sp[24];
|
||||
c = sp[16];
|
||||
a = tmp[idx] + 0x40000;
|
||||
b = tmp[idx + 8];
|
||||
d = tmp[idx + 24];
|
||||
c = tmp[idx + 16];
|
||||
|
||||
evsum = a + c;
|
||||
cd = a - c;
|
||||
@@ -90,7 +78,6 @@ void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag
|
||||
bp[pitch * 2] = clampU8((cd - rot) >> 11);
|
||||
bp[pitch * 4 - pitch] = clampU8((evsum - oddrot) >> 11);
|
||||
|
||||
sp--;
|
||||
idx -= 1;
|
||||
}
|
||||
}
|
||||
@@ -131,41 +118,37 @@ void TMCJPEGDEC_IdctBlock4x4_Col(s32* sp, u8* conv_row_ptr, u16 pitch, s32 zigza
|
||||
s32 a, b, c, d;
|
||||
s32 evsum, evdiff, oddsum, odddiff, rot, oddrot;
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
s32 a0 = src[0], b0 = src[1], c0 = src[2], d0 = src[3];
|
||||
s32 a1 = src[-8], b1 = src[-7], c1 = src[-6], d1 = src[-5];
|
||||
|
||||
s32 odddiff0 = b0 - d0;
|
||||
s32 oddsum0 = b0 + d0;
|
||||
s32 evsum0 = a0 + c0;
|
||||
s32 evdiff0 = a0 - c0;
|
||||
s32 rot0 = (odddiff0 * 0xB5) >> 8;
|
||||
|
||||
s32 odddiff1 = b1 - d1;
|
||||
s32 oddsum1 = b1 + d1;
|
||||
s32 evsum1 = a1 + c1;
|
||||
s32 evdiff1 = a1 - c1;
|
||||
s32 rot1 = (odddiff1 * 0xB5) >> 8;
|
||||
|
||||
s32 oddrot0 = oddsum0 + rot0;
|
||||
s32 oddrot1 = oddsum1 + rot1;
|
||||
|
||||
dst[0] = evsum0 + oddrot0;
|
||||
dst[1] = evdiff0 + rot0;
|
||||
dst[2] = evdiff0 - rot0;
|
||||
dst[3] = evsum0 - oddrot0;
|
||||
|
||||
dst[-8] = evsum1 + oddrot1;
|
||||
dst[-7] = evdiff1 + rot1;
|
||||
dst[-6] = evdiff1 - rot1;
|
||||
dst[-5] = evsum1 - oddrot1;
|
||||
|
||||
src -= 16;
|
||||
dst -= 16;
|
||||
for (i = 0; i < 4; i++) {
|
||||
a = src[0];
|
||||
b = src[1];
|
||||
c = src[2];
|
||||
d = src[3];
|
||||
odddiff = b - d;
|
||||
oddsum = b + d;
|
||||
evsum = a + c;
|
||||
evdiff = a - c;
|
||||
rot = (odddiff * 0xB5) >> 8;
|
||||
oddrot = rot + oddsum;
|
||||
dst[0] = evsum + oddrot;
|
||||
dst[1] = evdiff + rot;
|
||||
dst[2] = evdiff - rot;
|
||||
dst[3] = evsum - oddrot;
|
||||
src -= 8;
|
||||
dst -= 8;
|
||||
}
|
||||
|
||||
src = tmp + 3;
|
||||
for (i = 3; i >= 0; i--) {
|
||||
s32 evdiff;
|
||||
s32 a;
|
||||
s32 c;
|
||||
s32 b;
|
||||
s32 evsum;
|
||||
s32 d;
|
||||
s32 oddsum;
|
||||
s32 odddiff;
|
||||
s32 rot;
|
||||
s32 oddrot;
|
||||
u8* out = conv_row_ptr + i;
|
||||
a = src[0];
|
||||
b = src[8];
|
||||
@@ -173,7 +156,7 @@ void TMCJPEGDEC_IdctBlock4x4_Col(s32* sp, u8* conv_row_ptr, u16 pitch, s32 zigza
|
||||
d = src[24];
|
||||
|
||||
odddiff = b - d;
|
||||
oddsum = b + d;
|
||||
oddsum = d + b;
|
||||
evsum = a + c;
|
||||
evdiff = a - c;
|
||||
rot = odddiff * 0xB5 >> 8;
|
||||
|
||||
@@ -166,23 +166,23 @@ s32 TMCJPEGDEC_set_converterRGBA8(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s8 crValue;
|
||||
s32 red;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* texture;
|
||||
s32 height;
|
||||
s32 yEnd;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 green;
|
||||
s32 column;
|
||||
s32 yEnd;
|
||||
s32 tileWidth;
|
||||
s32 blueOffset;
|
||||
u16* output;
|
||||
s32 tileRow;
|
||||
s32 lumaSkip;
|
||||
s32 red;
|
||||
s8 crValue;
|
||||
s32 chromaSkip;
|
||||
s32 width;
|
||||
s32 cbValue;
|
||||
@@ -216,7 +216,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
cbValue = (s8)*cb++;
|
||||
crValue = (s8)*cr++;
|
||||
redOffset = (crValue * 359) >> 8;
|
||||
greenOffset = -(cbValue * 88 + crValue * 183) >> 8;
|
||||
greenOffset = -(crValue * 183 + cbValue * 88) >> 8;
|
||||
blueOffset = (cbValue * 454) >> 8;
|
||||
}
|
||||
{
|
||||
@@ -224,7 +224,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((blue | green | red) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -238,7 +238,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((blue | green | red) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -252,7 +252,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((blue | green | red) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -266,7 +266,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((blue | green | red) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -285,20 +285,20 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 column;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 tileWidth;
|
||||
u8* texture;
|
||||
s32 width;
|
||||
s32 height;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
s32 lumaSkip;
|
||||
s32 chromaSkip;
|
||||
s32 tileRow;
|
||||
s32 xEnd;
|
||||
u8* texture;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
s32 width;
|
||||
s32 height;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 lumaSkip;
|
||||
s32 yEnd;
|
||||
s32 tileWidth;
|
||||
u16* output;
|
||||
s32 cbValue;
|
||||
s8 crValue;
|
||||
@@ -345,7 +345,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
red = blue + redOffset;
|
||||
green = blue + greenOffset;
|
||||
blue = blue + blueOffset;
|
||||
if ((blue | red | green) >> 8) {
|
||||
if ((green | red | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -366,11 +366,11 @@ static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
|
||||
static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 chromaSkip;
|
||||
s32 blue;
|
||||
s32 lumaSkip;
|
||||
s32 cbValue;
|
||||
s32 tileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 xEnd;
|
||||
u16* output;
|
||||
u8* texture;
|
||||
s32 width;
|
||||
s32 height;
|
||||
@@ -379,7 +379,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 red;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
u16* output;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
s32 redOffset;
|
||||
s32 tileRow;
|
||||
@@ -387,7 +387,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 blueOffset;
|
||||
s32 value;
|
||||
s32 green;
|
||||
s32 lumaSkip;
|
||||
s32 blue;
|
||||
s32 crValue;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -415,7 +415,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((blue | red | green) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -426,7 +426,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((blue | red | green) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -441,21 +441,21 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 column;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
s32 blue;
|
||||
u16* output;
|
||||
s32 xEnd;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 tileWidth;
|
||||
u8* texture;
|
||||
u8* luminance;
|
||||
s32 width;
|
||||
s32 height;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
s32 lumaSkip;
|
||||
u8* cb;
|
||||
u8* texture;
|
||||
s32 column;
|
||||
s32 chromaSkip;
|
||||
s32 yEnd;
|
||||
s32 tileRow;
|
||||
u16* output;
|
||||
s32 cbValue;
|
||||
s32 crValue;
|
||||
s32 redOffset;
|
||||
@@ -463,7 +463,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 blueOffset;
|
||||
s32 value;
|
||||
s32 red;
|
||||
s32 blue;
|
||||
s32 lumaSkip;
|
||||
s32 green;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -502,7 +502,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
green = value + greenOffset;
|
||||
if ((blue | red | green) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -517,19 +517,19 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 blue;
|
||||
s32 tileRow;
|
||||
s8 crValue;
|
||||
s32 chromaSkip;
|
||||
u8* luminance;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 xEnd;
|
||||
u8* texture;
|
||||
s32 width;
|
||||
s32 height;
|
||||
s32 blueOffset;
|
||||
u8* texture;
|
||||
s32 green;
|
||||
s32 blue;
|
||||
s32 lumaSkip;
|
||||
s32 yEnd;
|
||||
s32 tileRow;
|
||||
s32 xEnd;
|
||||
s32 value;
|
||||
s32 column;
|
||||
u8* cr;
|
||||
@@ -538,7 +538,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 redOffset;
|
||||
u8* cb;
|
||||
u16* output;
|
||||
s32 green;
|
||||
s32 blueOffset;
|
||||
s32 red;
|
||||
s32 cbValue;
|
||||
|
||||
@@ -578,7 +578,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
|
||||
|
||||
|
||||
if ((blue | green | red) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -593,7 +593,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((blue | green | red) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -620,11 +620,11 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* luminance = work->convBuf + 4;
|
||||
u8* cb = work->convBuf + 260;
|
||||
u8* cr = work->convBuf + 324;
|
||||
s32 width;
|
||||
TMCCJPEGDecState* state = work->pState;
|
||||
s32 tileWidth = (state->convWidth >> 2) << 1;
|
||||
u8* texture = state->pTexBuffer;
|
||||
s32 width;
|
||||
u8* cr = work->convBuf + 324;
|
||||
s32 height;
|
||||
if (state->dataSizeX == (u32)x) {
|
||||
width = state->stepXExt;
|
||||
@@ -660,7 +660,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 green = value + greenOffset;
|
||||
s32 red = value + redOffset;
|
||||
s32 blue = value + blueOffset;
|
||||
if ((blue | red | green) >> 8) {
|
||||
if ((green | red | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -686,7 +686,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
|
||||
static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u16* output;
|
||||
s32 column;
|
||||
s32 tileRow;
|
||||
s32 redOffset;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 lumaSkip;
|
||||
@@ -695,7 +695,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 height;
|
||||
s32 tileRow;
|
||||
s32 column;
|
||||
s32 chromaSkip;
|
||||
s32 width;
|
||||
s32 xEnd;
|
||||
@@ -742,7 +742,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((blue | red | green) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -770,7 +770,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
u16* output;
|
||||
s32 lumaSkip;
|
||||
s32 blue;
|
||||
s32 tileRow;
|
||||
u8* texture;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
@@ -783,7 +783,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 greenOffset;
|
||||
s32 yEnd;
|
||||
s32 cbValue;
|
||||
u8* texture;
|
||||
s32 tileRow;
|
||||
s32 blueOffset;
|
||||
s32 red;
|
||||
s8 crValue;
|
||||
@@ -831,7 +831,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((blue | red | green) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -856,20 +856,20 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
|
||||
static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u16* output;
|
||||
s32 tileWidth;
|
||||
s32 tileRow;
|
||||
s32 xEnd;
|
||||
s32 rowSkip;
|
||||
u8* texture;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
s8 crValue;
|
||||
s32 crValue;
|
||||
s32 height;
|
||||
s32 width;
|
||||
s32 column;
|
||||
s32 rowSkip;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
u8* texture;
|
||||
s32 tileWidth;
|
||||
s32 row;
|
||||
s32 red;
|
||||
s32 cbValue;
|
||||
@@ -899,7 +899,7 @@ static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + (-(cbValue * 88 + crValue * 183) >> 8);
|
||||
red = value + ((crValue * 359) >> 8);
|
||||
blue = value + ((cbValue * 454) >> 8);
|
||||
if ((blue | red | green) >> 8) {
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
|
||||
@@ -171,9 +171,7 @@ s32 TMCJPEGDEC_set_converterY8U8V8(TMCCJPEGDecWork* work) {
|
||||
static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 rowSkip;
|
||||
u8* output;
|
||||
s32 chromaXEnd;
|
||||
u32 tileRow;
|
||||
u32 chromaTileWidth;
|
||||
s32 chromaYEnd;
|
||||
u8* lumaTexture;
|
||||
TMCCJPEGDecState* state;
|
||||
@@ -216,17 +214,17 @@ static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
luminance += rowSkip;
|
||||
}
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
x = (u32)x >> 2;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
chromaXEnd = x + width;
|
||||
xEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -235,7 +233,6 @@ static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
@@ -250,9 +247,9 @@ static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
s32 tileOffset;
|
||||
s32 xEnd;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -287,13 +284,13 @@ static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 2;
|
||||
width = (width + 3) >> 2;
|
||||
xEnd = x + width;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + height;
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -306,9 +303,7 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 chromaXEnd;
|
||||
s32 row;
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 width;
|
||||
s32 height;
|
||||
@@ -319,7 +314,6 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* cb;
|
||||
u32 tileWidth;
|
||||
u8* cr;
|
||||
s32 chromaRowSkip;
|
||||
|
||||
row = y;
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -344,24 +338,22 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 1;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
chromaXEnd = x + width;
|
||||
xEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaRowSkip = 8 - width;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
for (row = y; row < chromaYEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += chromaRowSkip;
|
||||
cb += 8 - width;
|
||||
cr += 8 - width;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
@@ -376,9 +368,9 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
s32 tileOffset;
|
||||
s32 xEnd;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -413,13 +405,13 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 1;
|
||||
width = (width + 1) >> 1;
|
||||
xEnd = x + width;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + height;
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -428,23 +420,21 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 height;
|
||||
s32 chromaYEnd;
|
||||
s32 column;
|
||||
u8* lumaTexture;
|
||||
s32 chromaXEnd;
|
||||
s32 height;
|
||||
u8* luminance;
|
||||
u32 chromaTileWidth;
|
||||
s32 column;
|
||||
u8* cbTexture;
|
||||
s32 width;
|
||||
s32 row;
|
||||
u8* crTexture;
|
||||
u32 tileWidth;
|
||||
s32 xEnd;
|
||||
u8* cb;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 yEnd;
|
||||
s32 xEnd;
|
||||
s32 width;
|
||||
u8* cr;
|
||||
s32 row;
|
||||
u32 tileWidth;
|
||||
|
||||
row = y;
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -470,14 +460,14 @@ static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
y = (u32)y >> 1;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
chromaXEnd = x + width;
|
||||
xEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -486,7 +476,6 @@ static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
@@ -497,13 +486,13 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* crTexture;
|
||||
u32 tileRow;
|
||||
s32 height;
|
||||
s32 yEnd;
|
||||
s32 width;
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
s32 yEnd;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -539,13 +528,13 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 1;
|
||||
width = (width + 1) >> 1;
|
||||
xEnd = x + width;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + ((height + 1) >> 1);
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -554,9 +543,8 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F2570(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 row;
|
||||
@@ -596,13 +584,13 @@ static void TMCJPEG_814F2570(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
luminance += 8 - width;
|
||||
}
|
||||
y = (u32)y >> 1;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaEnd = y + 8 / state->scaleFactor;
|
||||
for (; y < chromaEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
|
||||
@@ -205,7 +205,7 @@ typedef struct _ziUwdNode {
|
||||
|
||||
struct __zi8_work_data_s {
|
||||
ziU8 unk_0x00;
|
||||
ziU8 unk_0x01;
|
||||
ziU8 countOnly; // 0x01
|
||||
ziU8 unk_0x02[2];
|
||||
ziLanguageEntry* langEntries; // 0x04
|
||||
ziU8 unk_0x08;
|
||||
@@ -219,7 +219,7 @@ struct __zi8_work_data_s {
|
||||
ziU8 unk_0x17;
|
||||
ziU8 subLanguage; // 0x18
|
||||
ziU8 unk_0x19;
|
||||
ziU16 unk_0x1A;
|
||||
ziU16 separator; // 0x1A
|
||||
ziU8 unk_0x1C[3];
|
||||
ziU8 unk_0x1F;
|
||||
ziU16 unk_0x20[0x40];
|
||||
@@ -265,25 +265,25 @@ struct __zi8_work_data_s {
|
||||
ziPtr unk_0x11FC;
|
||||
ziPtr userKeys[0x83]; // 0x1200
|
||||
ziU8 unk_0x140C[4];
|
||||
ziU32 unk_0x1410;
|
||||
ziU32 formats; // 0x1410
|
||||
ziU8 unk_0x1414[4];
|
||||
ziU8 unk_0x1418;
|
||||
ziU8 formatCount;
|
||||
ziU8 unk_0x1419;
|
||||
ziU16 unk_0x141A;
|
||||
ziU8 unk_0x141C;
|
||||
ziU8 unk_0x141D;
|
||||
ziU8 unk_0x141E;
|
||||
ziU8 unk_0x141F;
|
||||
ziU8 maxCnt; // 0x141F
|
||||
ziU8 unk_0x1420[4];
|
||||
zi8DawgCtx dawgCtx; // 0x1424
|
||||
ziU8 unk_0x1760[4]; // 0x1760
|
||||
ziU8* unk_0x1764; // 0x1764
|
||||
ziU8* groupPtr; // 0x1764
|
||||
ziU8 unk_0x1768;
|
||||
ziU8 unk_0x1769[0x81];
|
||||
ziU16 unk_0x17EA;
|
||||
ziU16 matchOffset; // 0x17EA
|
||||
ziU8 unk_0x17EC;
|
||||
ziU8 unk_0x17ED[3];
|
||||
ziU8* unk_0x17F0;
|
||||
ziU8* dawgGroup; // 0x17F0
|
||||
ziWChar unk_0x17F4[0x40]; // 0x17F4..0x1874
|
||||
ziU16 unk_0x1874;
|
||||
ziU8 unk_0x1876;
|
||||
|
||||
@@ -796,11 +796,11 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
if (remaining != 0) {
|
||||
remaining--;
|
||||
} else {
|
||||
totalCandidates++;
|
||||
totalCandidates = totalCandidates + 1;
|
||||
if (options->countOnly == '\0') {
|
||||
*output++ = spellingBuffer[spellingIndex];
|
||||
*output++ = 0;
|
||||
candidateCount++;
|
||||
candidateCount = candidateCount + 1;
|
||||
}
|
||||
else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
|
||||
if (candidateCount >= params->maxCandidates) goto finishSpelling;
|
||||
@@ -940,8 +940,7 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
for (tableIndex = 0; tableIndex < params->count;) {
|
||||
while (*output != 0) {
|
||||
if (*output != 0x27) {
|
||||
*output |= 0xf300;
|
||||
output++;
|
||||
*output++ |= 0xf300;
|
||||
} else {
|
||||
*output++ = 0xf360;
|
||||
}
|
||||
@@ -1001,10 +1000,10 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
}
|
||||
if (Zi8IsDupWordW(output,(ziU8)phoneticIndex,work) == 0) {
|
||||
if (remaining == 0) {
|
||||
totalCandidates++;
|
||||
totalCandidates = totalCandidates + 1;
|
||||
if (options->countOnly == 0) {
|
||||
output += phoneticIndex + 1;
|
||||
candidateCount++;
|
||||
++candidateCount;
|
||||
} else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
|
||||
if (candidateCount >= params->maxCandidates) goto finishSpelling;
|
||||
} else {
|
||||
|
||||
@@ -285,9 +285,9 @@ static ziBool ZiIsLetterHyphen(ziWChar character ZI_NEED_WORK) {
|
||||
else return ZI8_FALSE;
|
||||
}
|
||||
|
||||
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ziPtr work) {
|
||||
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ZiAlphaWork* work) {
|
||||
enum { LOWER_CASE, UPPER_CASE } upper = LOWER_CASE;
|
||||
if (((ZiAlphaWork*)work)->caseMode == 3) {
|
||||
if (work->caseMode == 3) {
|
||||
Zi8ChangeCharCase(1, word++, language, work);
|
||||
} else if (((ZiAlphaWork*)work)->caseMode == 1) {
|
||||
upper = UPPER_CASE;
|
||||
|
||||
@@ -18,7 +18,7 @@ static Zi8UInt Zi8SetFindCand(ziU8* foundCandidates, Zi8UInt ordinal, ziPtr work
|
||||
}
|
||||
|
||||
ziWChar* ZiGetNextPhonetic(ziWChar* spelling, ziWChar* end ZI_NEED_WORK) {
|
||||
while (*spelling && *spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360 && spelling < end) {
|
||||
while (*spelling && *spelling != ZI_WORK->separator && *spelling != 0xF360 && spelling < end) {
|
||||
++spelling;
|
||||
}
|
||||
if (!*spelling || spelling == end) {
|
||||
@@ -37,8 +37,8 @@ int ZiPartialMatch(ziWChar* spelling, ziWChar* spellingEnd,
|
||||
if (spelling == spellingEnd || candidate == candidateEnd || !*spelling || !*candidate) {
|
||||
return 1;
|
||||
}
|
||||
while (*spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360) {
|
||||
if (*candidate == ZI_WORK->unk_0x1A || *candidate == 0xF360) {
|
||||
while (*spelling != ZI_WORK->separator && *spelling != 0xF360) {
|
||||
if (*candidate == ZI_WORK->separator || *candidate == 0xF360) {
|
||||
break;
|
||||
}
|
||||
if (*spelling != *candidate) {
|
||||
@@ -753,8 +753,7 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
|
||||
if (!componentTable) {
|
||||
componentCount = Zi8GetTableCount(1, 7, work);
|
||||
componentOrdinals = (ziU8*)Zi8GetTableAddress(1, 7, work);
|
||||
componentCursor = (ziU8*)Zi8GetTableAddress(1, 2, work);
|
||||
componentTable = componentCursor;
|
||||
componentTable = componentCursor = (ziU8*)Zi8GetTableAddress(1, 2, work);
|
||||
componentCursor += 8;
|
||||
--componentCount;
|
||||
componentIndex = componentCount;
|
||||
@@ -2869,7 +2868,7 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
||||
ziU8 count;
|
||||
ziWChar spacedElements[256];
|
||||
struct { ziWChar separator; } savedState;
|
||||
savedState.separator = ZI_WORK->unk_0x1A;
|
||||
savedState.separator = ZI_WORK->separator;
|
||||
if (elementCount <= 1 || !charCount) {
|
||||
return elementCount;
|
||||
}
|
||||
@@ -2882,9 +2881,9 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
||||
if (spacedIndex == elementCount) {
|
||||
return elementCount;
|
||||
}
|
||||
ZI_WORK->unk_0x1A = 0xF360;
|
||||
ZI_WORK->separator = 0xF360;
|
||||
Zi8ZHaddSpace(elements, elementCount, spacedElements, 256, __zi8_work_data);
|
||||
ZI_WORK->unk_0x1A = savedState.separator;
|
||||
ZI_WORK->separator = savedState.separator;
|
||||
spacedIndex = elementIndex = count = 0;
|
||||
while (charCount && elementIndex < elementCount) {
|
||||
if (spacedElements[spacedIndex] == 0xF360) {
|
||||
|
||||
@@ -136,7 +136,7 @@ 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;
|
||||
if (ZI_WORK->maxCnt < context->cnt) ZI_WORK->maxCnt = context->cnt;
|
||||
goto update_current;
|
||||
next_sibling:
|
||||
while (context->cnt != 0) {
|
||||
@@ -184,37 +184,36 @@ unsigned int Zi8MatchROMdata1(ziWChar *elements, ziU8 count, ziU8 language, ziWC
|
||||
|
||||
result = 0;
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)group;
|
||||
if (ZI_WORK->unk_0x1764 == 0) {
|
||||
ZI_WORK->groupPtr = (ziU8*)group;
|
||||
if (ZI_WORK->groupPtr == 0) {
|
||||
if (Zi8GetTableSize(language & 0xff,0xb,ZI_WORK) != 0) {
|
||||
tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK);
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)tableAddress;
|
||||
ZI_WORK->groupPtr = (ziU8*)(tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK));
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x1764 != 0) {
|
||||
for (; (*ZI_WORK->unk_0x1764 != 0xff && ((groupIndex & 0xff) != 0));
|
||||
if (ZI_WORK->groupPtr != 0) {
|
||||
for (; (*ZI_WORK->groupPtr != 0xff && ((groupIndex & 0xff) != 0));
|
||||
groupIndex = groupIndex - 1) {
|
||||
while (*ZI_WORK->unk_0x1764 != 0xff) {
|
||||
ZI_WORK->unk_0x1764 += 2;
|
||||
while (*ZI_WORK->groupPtr != 0xff) {
|
||||
ZI_WORK->groupPtr += 2;
|
||||
}
|
||||
ZI_WORK->unk_0x1764++;
|
||||
ZI_WORK->groupPtr++;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x1764 == 0) {
|
||||
if (ZI_WORK->groupPtr == 0) {
|
||||
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,capacity & 0xffff,
|
||||
mode & 0xff,status & 0xff,0,1,acceptPrefix,0,&ZI_WORK->dawgCtx,
|
||||
ZI_WORK->unk_0x1760,ZI_WORK);
|
||||
}
|
||||
else {
|
||||
while (*ZI_WORK->unk_0x1764 != 0xff) {
|
||||
while (*ZI_WORK->groupPtr != 0xff) {
|
||||
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,
|
||||
capacity & 0xffff,mode & 0xff,status & 0xff,
|
||||
*ZI_WORK->unk_0x1764,
|
||||
ZI_WORK->unk_0x1764[1],acceptPrefix,0,
|
||||
*ZI_WORK->groupPtr,
|
||||
ZI_WORK->groupPtr[1],acceptPrefix,0,
|
||||
&ZI_WORK->dawgCtx,ZI_WORK->unk_0x1760,ZI_WORK);
|
||||
if ((result & 0xff) != 0) break;
|
||||
ZI_WORK->unk_0x1764 += 2;
|
||||
ZI_WORK->groupPtr += 2;
|
||||
status = 0;
|
||||
}
|
||||
}
|
||||
@@ -231,7 +230,7 @@ unsigned int Zi8MatchROMdata2(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
if (reservedMode != 0) return 0;
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x1768 = 0;
|
||||
ZI_WORK->unk_0x17EA = 0;
|
||||
ZI_WORK->matchOffset = 0;
|
||||
if (group != 0 && *group == 0xc && language == 10 && ZI_WORK->unk_0x141C != 0) {
|
||||
ZI_WORK->unk_0x141E = 0x10;
|
||||
} else {
|
||||
@@ -239,23 +238,23 @@ unsigned int Zi8MatchROMdata2(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
}
|
||||
}
|
||||
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,
|
||||
ZI_WORK->maxCnt = 1;
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->matchOffset,
|
||||
count - ZI_WORK->matchOffset, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], 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--) {
|
||||
for (index = (ziU8)(ZI_WORK->matchOffset + result); index != 0; index--) {
|
||||
output[index - 1] = ZI_WORK->unk_0x17F4[index - 1];
|
||||
}
|
||||
result = (ziU8)(result + ZI_WORK->unk_0x17EA);
|
||||
result = (ziU8)(result + ZI_WORK->matchOffset);
|
||||
} 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,
|
||||
(ziU8)Zi8MatchROMdata1(elements + ZI_WORK->matchOffset,
|
||||
count - ZI_WORK->matchOffset, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
||||
0, status, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK) != 0) goto finish_segments;
|
||||
if ((Zi8GetTableCount(language, 0x1f, ZI_WORK) & 4) == 0) {
|
||||
@@ -263,20 +262,20 @@ search_segment:
|
||||
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,
|
||||
if (ZI_WORK->maxCnt > capacity) goto finish_segments;
|
||||
for (index = ZI_WORK->maxCnt; index != 0; index--) {
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->matchOffset, index, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], 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->matchOffset += (ziU8)result;
|
||||
if (ZI_WORK->matchOffset == 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++) {
|
||||
for (index = 0; index < ZI_WORK->matchOffset; index++) {
|
||||
switch (ZI_WORK->unk_0x17F4[index]) {
|
||||
case 0x61:
|
||||
case 0x6f:
|
||||
@@ -307,7 +306,7 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
} else {
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x17EC = 0;
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
} else if (ZI_WORK->unk_0x17EC != 0) {
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
goto finish_match;
|
||||
@@ -317,30 +316,30 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK);
|
||||
} else {
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
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);
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, 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) {
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
acceptPrefix, ZI_WORK) != 0) {
|
||||
*output = *elements;
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
}
|
||||
} else {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
|
||||
@@ -50,11 +50,11 @@ ziBool Zi8ZHsetZYfuzzyPairs(ziFuzzyZYPairs pairs ZI_NEED_WORK) {
|
||||
|
||||
ziBool Zi8SetLatinSearchOrder(ziU8* searchArray, ziU8 searchSize ZI_NEED_WORK) {
|
||||
if (searchArray == 0 || *searchArray == 0) {
|
||||
ZI_WORK->unk_0x1410 = (ziU32)Zi8SOdefaultArray;
|
||||
ZI_WORK->unk_0x1418 = 9;
|
||||
ZI_WORK->formats = (ziU32)Zi8SOdefaultArray;
|
||||
ZI_WORK->formatCount = 9;
|
||||
} else {
|
||||
ZI_WORK->unk_0x1410 = (ziU32)searchArray;
|
||||
ZI_WORK->unk_0x1418 = searchSize;
|
||||
ZI_WORK->formats = (ziU32)searchArray;
|
||||
ZI_WORK->formatCount = searchSize;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
@@ -339,11 +339,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
if ((parameters->elementCount == 1) && (parameters->firstCandidate == 0)) {
|
||||
switch (parameters->language) {
|
||||
case 1:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEF04) {
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
@@ -400,11 +400,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
break;
|
||||
case 0x11:
|
||||
default:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEFF2) {
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -21,7 +21,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
ZI_WORK->unk_0x0A = 0xFF;
|
||||
ZI_WORK->unk_0x10 = 0x64;
|
||||
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
|
||||
ZI_WORK->unk_0x1A = 0x20;
|
||||
ZI_WORK->separator = 0x20;
|
||||
ZI_WORK->unk_0x1C[2] = 0;
|
||||
ZI_WORK->unk_0x1B30 = 0;
|
||||
ZI_WORK->unk_0x1B3A = 0;
|
||||
|
||||
@@ -68,7 +68,7 @@ ziU8 Zi8ZHaddSpace(ziWChar* src, ziU8 count, ziWChar* dst,
|
||||
}
|
||||
if (pdst[k - 1] != 0xF360 &&
|
||||
(pdst[k - 1] < 0xF331 || pdst[k - 1] > 0xF335)) {
|
||||
pdst[k++] = ZI_WORK->unk_0x1A;
|
||||
pdst[k++] = ZI_WORK->separator;
|
||||
}
|
||||
psrc += i;
|
||||
n -= i;
|
||||
|
||||
@@ -41,7 +41,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
current = ZI_WORK->uwdList;
|
||||
while (current != 0) {
|
||||
candidate = (ziUserWord*)current->word;
|
||||
if (ZI_WORK->unk_0x12E == 1 && word->priority > candidate->priority) break;
|
||||
if (ZI_WORK->unk_0x12E == 1 && candidate->priority < word->priority) break;
|
||||
if (candidate->length == length) {
|
||||
position = 0;
|
||||
while (position < length) {
|
||||
@@ -88,17 +88,18 @@ void Zi8_8148047C(ziPtr __zi8_work_data) {
|
||||
ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16 currentLength, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||
ziUserDictionary* dictionary;
|
||||
ziU8* cursor;
|
||||
int fallback = 0;
|
||||
ziU8* begin;
|
||||
ziU8* boundary;
|
||||
ziU8* end;
|
||||
ziUserWord* previous;
|
||||
int firstSegment;
|
||||
ziU32 size;
|
||||
int entryLength;
|
||||
int headerSize;
|
||||
int entryLanguage;
|
||||
volatile int entryLength;
|
||||
int previousOffset;
|
||||
int visited = 0;
|
||||
ziU8* begin;
|
||||
int fallback = 0;
|
||||
ziWChar folded;
|
||||
ziU8* text;
|
||||
int position;
|
||||
@@ -143,7 +144,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++) {
|
||||
while (prefixLength > 0) {
|
||||
folded = currentWord[position];
|
||||
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = 0;
|
||||
@@ -155,12 +156,14 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ZI_WORK->unk_0x140 = 0;
|
||||
break;
|
||||
}
|
||||
prefixLength--;
|
||||
position++;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x140 == 0 && length == 0) return 0;
|
||||
rescan:
|
||||
begin = cursor = dictionary->entries + dictionary->current;
|
||||
cursor = begin = dictionary->entries + dictionary->current;
|
||||
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
|
||||
end = (ziU8*)dictionary + dictionary->end + 7;
|
||||
if (begin < boundary) firstSegment = 1;
|
||||
@@ -169,8 +172,7 @@ rescan:
|
||||
size = *cursor;
|
||||
if ((ziS32)ZI_WORK->unk_0x13C > visited++ || (((ziUserWord*)cursor)->size & 0xC0) != 0) {
|
||||
next:
|
||||
cursor += size;
|
||||
if (cursor > end) {
|
||||
if ((cursor += size) > end) {
|
||||
if (firstSegment) break;
|
||||
firstSegment = 1;
|
||||
size = cursor - end - 1;
|
||||
@@ -178,8 +180,9 @@ next:
|
||||
}
|
||||
} else {
|
||||
previous = (ziUserWord*)(cursor + size);
|
||||
if ((ziU8*)previous > end) previous = (ziUserWord*)(cursor + ((ziU8*)dictionary - end) + 7);
|
||||
text = &((ziUserWord*)cursor)->language;
|
||||
if ((ziU8*)previous > end) previous = (ziUserWord*)(dictionary->entries + (cursor - end - 1));
|
||||
text = cursor;
|
||||
headerSize = *text++;
|
||||
entryLanguage = *text++;
|
||||
entryLength = *text++;
|
||||
text++;
|
||||
|
||||
@@ -41,6 +41,13 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
return node;
|
||||
}
|
||||
|
||||
typedef struct ziDawgLongOffset {
|
||||
ziU8 flags;
|
||||
ziU8 middle;
|
||||
ziU8 low;
|
||||
} ziDawgLongOffset;
|
||||
typedef char ziDawgLongOffsetSizeCheck[(sizeof(ziDawgLongOffset) == 3) ? 1 : -1];
|
||||
|
||||
ziU8* ZiDAWGGetSibling(ziU8* cursor) {
|
||||
ziS32 depth;
|
||||
ziU8* node;
|
||||
@@ -70,14 +77,14 @@ ziU8* ZiDAWGGetSibling(ziU8* cursor) {
|
||||
}
|
||||
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
node += (*cursor & 0x7f) * 0x10000 +
|
||||
(((ziU32)cursor[1] << 8) + (ziU32)cursor[2]) + 0x8000;
|
||||
node += (((const ziDawgLongOffset*)cursor)->flags & 0x7f) * 0x10000 +
|
||||
(((ziU32)(ziU16)cursor[1] << 8) +
|
||||
((const ziDawgLongOffset*)cursor)->low) + 0x8000;
|
||||
} else {
|
||||
node = cursor[1] + (node + (ziU16)*cursor * 0x100);
|
||||
}
|
||||
return node;
|
||||
} else {
|
||||
cursor = node;
|
||||
do {
|
||||
header = nodeHeaderTable[cursor[0] >> 4];
|
||||
if ((cursor[0] & 0xf) == 0xf) {
|
||||
|
||||
@@ -25,6 +25,12 @@ ziU8 Zi8GetFormatVersion(ziU8 ZI_NEED_WORK);
|
||||
ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
|
||||
|
||||
typedef struct ziEncodedOrdinal {
|
||||
ziU8 low;
|
||||
ziU8 high;
|
||||
} ziEncodedOrdinal;
|
||||
typedef char ziEncodedOrdinalSizeCheck[(sizeof(ziEncodedOrdinal) == 2) ? 1 : -1];
|
||||
|
||||
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziChineseEntry* table = 0;
|
||||
ziU8* baseData = 0;
|
||||
@@ -39,8 +45,8 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziWChar* cursor;
|
||||
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;
|
||||
ziU32 savedFormats = ZI_WORK->formats;
|
||||
ziU8 savedCount = ZI_WORK->formatCount;
|
||||
ziSearchState search = {0};
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (word == 0 || *word == 0) {
|
||||
@@ -67,22 +73,22 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
request.candidates = ordinals;
|
||||
request.maxCandidates = 1;
|
||||
request.firstCandidate = 0;
|
||||
ZI_WORK->unk_0x1410 = (ziU32)formats;
|
||||
ZI_WORK->formats = (ziU32)formats;
|
||||
if (ZI_WORK->unk_0x1C[0] == 2) {
|
||||
ZI_WORK->unk_0x1418 = 0;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->unk_0x1418++] = 1;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 2;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 3;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 4;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->unk_0x1418++] = 5;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 6;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 7;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 8;
|
||||
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->unk_0x1418 = 2;
|
||||
else ZI_WORK->unk_0x1418 = 1;
|
||||
ZI_WORK->formatCount = 0;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->formatCount++] = 1;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->formatCount++] = 2;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->formatCount++] = 3;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->formatCount++] = 4;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->formatCount++] = 5;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->formatCount++] = 6;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->formatCount++] = 7;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->formatCount++] = 8;
|
||||
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->formatCount = 2;
|
||||
else ZI_WORK->formatCount = 1;
|
||||
count = Zi8GetCandidatesOrCount(&request, &search, __zi8_work_data);
|
||||
ZI_WORK->unk_0x1410 = savedFormats;
|
||||
ZI_WORK->unk_0x1418 = savedCount;
|
||||
ZI_WORK->formats = savedFormats;
|
||||
ZI_WORK->formatCount = savedCount;
|
||||
if (count != 0) return 1;
|
||||
}
|
||||
if (language != 1) {
|
||||
@@ -134,10 +140,10 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
countLeft = count;
|
||||
cursor = ordinals;
|
||||
while (countLeft > 0) {
|
||||
value = (data[1] << 8) | data[0];
|
||||
value = ((ziU32)(ziU16)data[1] << 8) |
|
||||
((const ziEncodedOrdinal*)data)->low;
|
||||
data += 2;
|
||||
cursor++;
|
||||
if (value != *cursor) break;
|
||||
if (value != *++cursor) break;
|
||||
countLeft--;
|
||||
if (value & 0x8000) break;
|
||||
}
|
||||
|
||||
@@ -30,8 +30,7 @@ ziU8 Zi8MatchOEMdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* word
|
||||
index = ZI_WORK->oemIdx;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
|
||||
if (ZI_WORK->oemMatch == 0) goto failed;
|
||||
capacity--;
|
||||
if ((ziS32)length >= (ziS32)capacity) {
|
||||
if ((ziS32)length >= (ziS32)--capacity) {
|
||||
failed:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -242,8 +242,8 @@ typedef struct WPADCB {
|
||||
WPADCallback getInfoCB; // 0x988
|
||||
u8 getInfoBusy; // 0x98C
|
||||
|
||||
u8 unk_0x98D; // 0x98D
|
||||
u8 unk_0x98E; // 0x98E
|
||||
u8 encStatus; // 0x98D
|
||||
u8 continuous; // 0x98E
|
||||
u8 unk_0x98F[0x9A0 - 0x990];
|
||||
} WPADCB;
|
||||
|
||||
@@ -261,7 +261,7 @@ void WPADiExcludeButton(s32 chan);
|
||||
void WPADiCopyOut(s32 chan);
|
||||
|
||||
BOOL WPADiSendSetPort(WPADCommandQueue* pQueue, u8 port, WPADCallback pCallback);
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL unk, WPADCallback pCallback);
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL continuous, WPADCallback pCallback);
|
||||
BOOL WPADiSendEnableDPD(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
||||
BOOL WPADiSendEnableSpeaker(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
||||
BOOL WPADiSendGetContStat(WPADCommandQueue* pQueue, WPADInfo* pInfo, WPADCallback pCallback);
|
||||
|
||||
@@ -24,7 +24,7 @@ typedef struct WPADMemBlock {
|
||||
int unk_0x04; // 0x04
|
||||
s16 unk_0x08; // 0x08
|
||||
int unk_0x0C; // 0x0C
|
||||
WPADCallback unk_0x10; // 0x10
|
||||
WPADCallback callback; // 0x10
|
||||
} WPADMemBlock;
|
||||
|
||||
typedef struct WPADGameInfo {
|
||||
|
||||
@@ -72,7 +72,11 @@ struct DVDCommandBlock {
|
||||
DVDCommandBlock* prev; // 0x04
|
||||
|
||||
u32 command; // 0x08
|
||||
#ifdef BS2_MACH_VOLATILE_DVD_STATE
|
||||
volatile s32 state;
|
||||
#else
|
||||
s32 state; // 0x0C
|
||||
#endif
|
||||
|
||||
u32 offset; // 0x10
|
||||
u32 length; // 0x14
|
||||
|
||||
@@ -550,7 +550,15 @@ pf_s32 PFCACHE_DoWriteSector(PF_VOLUME* p_vol, PF_CACHE_PAGE** pp_head, const pf
|
||||
|
||||
#pragma dont_inline reset
|
||||
|
||||
#pragma dont_inline on
|
||||
static inline pf_u32 PFCACHE_RecordPageEndOverlap(PF_CACHE_PAGE* p_page, pf_u32 end_sector, pf_u32* p_num_success, pf_u32* p_num_rest_sector) {
|
||||
pf_u32 last_sector = end_sector - 1;
|
||||
pf_u32 num_overlap = end_sector - p_page->sector;
|
||||
*p_num_success += num_overlap;
|
||||
*p_num_rest_sector -= num_overlap;
|
||||
p_page->stat |= 2;
|
||||
return last_sector;
|
||||
}
|
||||
|
||||
pf_s32 PFCACHE_DoWriteNumSectorAndFreeIfNeeded(PF_VOLUME* p_vol, PF_CACHE_PAGE** pp_head, const pf_u8* p_buf, pf_u32 sector,
|
||||
pf_u32 num_sector, pf_u32* p_num_success) {
|
||||
PF_CACHE_PAGE* p_page = PF_NULL;
|
||||
@@ -609,11 +617,9 @@ pf_s32 PFCACHE_DoWriteNumSectorAndFreeIfNeeded(PF_VOLUME* p_vol, PF_CACHE_PAGE**
|
||||
(p_page->sector + p_page->size) >= (sector + num_sector)) {
|
||||
pf_memcpy(p_page->buffer, (pf_u8*)&p_buf[(p_page->sector - sector) << p_vol->bpb.log2_bytes_per_sector],
|
||||
(sector + num_sector - p_page->sector) << p_vol->bpb.log2_bytes_per_sector);
|
||||
num_overlap = p_page->size - ((p_page->sector + p_page->size) - (num_sector + sector));
|
||||
last_sector = p_page->sector + num_overlap - 1;
|
||||
*p_num_success += num_overlap;
|
||||
num_rest_sector -= num_overlap;
|
||||
p_page->stat |= 2;
|
||||
num_overlap = num_sector;
|
||||
num_overlap += sector;
|
||||
last_sector = PFCACHE_RecordPageEndOverlap(p_page, num_overlap, p_num_success, &num_rest_sector);
|
||||
p_ebuf = &p_page->buffer[(last_sector - p_page->sector) << p_vol->bpb.log2_bytes_per_sector];
|
||||
p_page->p_mod_sbuf = p_page->buffer;
|
||||
if (p_page->p_mod_ebuf == NULL || p_page->p_mod_ebuf < p_ebuf) {
|
||||
|
||||
@@ -140,15 +140,19 @@ extern pf_s32 PFVOL_CheckCurrentDir(PF_VOLUME* volume, pf_u32 start_cluster);
|
||||
extern pf_s32 PFENT_RemoveEntry(PF_DIR_ENT* entry, PF_ENT_ITER* iter);
|
||||
extern pf_s32 PFFAT_FreeChain(PFDIR_FFD* ffd, pf_u32 start_cluster, pf_u32 chain_index, pf_u32 size);
|
||||
|
||||
static inline pf_u32 current_directory_is_open(PF_VOLUME* volume, pf_u32 cluster) {
|
||||
static inline PF_CUR_DIR* current_directories(PFDIR_VOLUME_DIRS* state) {
|
||||
return state->current_dirs;
|
||||
}
|
||||
|
||||
static inline pf_u32 current_directory_is_open(PF_VOLUME* volume, const PF_DIR_ENT* entry) {
|
||||
pf_u32 index;
|
||||
for (index = 0; index < 4; index++) {
|
||||
if (pf_vol_set.volume_state.volumes[index].p_vol == volume) {
|
||||
PFDIR_VOLUME_DIRS* state = (PFDIR_VOLUME_DIRS*)volume;
|
||||
PF_CUR_DIR* directory = state->current_dirs;
|
||||
if (volume == pf_vol_set.volume_state.volumes[index].p_vol) {
|
||||
PFDIR_VOLUME_DIRS* state = (PFDIR_VOLUME_DIRS*)pf_vol_set.volume_state.volumes[index].p_vol;
|
||||
PF_CUR_DIR* directory = current_directories(state);
|
||||
pf_u32 slot;
|
||||
for (slot = 0; slot < 4; slot++, directory++) {
|
||||
if ((directory->stat & 1) != 0 && directory->directory.start_cluster == cluster) { return 1; }
|
||||
if ((directory->stat & 1) != 0 && directory->directory.start_cluster == entry->start_cluster) { return 1; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -381,7 +385,7 @@ pf_s32 PFDIR_p_readdir(PFDIR_DIR* dir, PFDIR_READ_RESULT* result) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern pf_s32 PFENT_findEntry(PFDIR_FFD*, PF_DIR_ENT*, pf_u32, PFDIR_STR*, pf_u8, pf_u32*, pf_u32*);
|
||||
extern pf_s32 PFENT_findEntry(PFDIR_FFD*, PF_DIR_ENT*, pf_u32, PFDIR_STR*, pf_u32, pf_u32);
|
||||
extern pf_s32 PFFAT_GetSectorSpecified(PFDIR_FFD*, pf_u32, pf_u32, pf_u32*);
|
||||
extern pf_s32 PFPATH_transformInUnicode(pf_u16*, const pf_s8*);
|
||||
extern void PFPATH_SetSearchPattern(pf_s8*, pf_u16*, PFDIR_STR*);
|
||||
@@ -408,17 +412,9 @@ extern void PFPATH_AdjustExtShortName(pf_s8* name, pf_u32 position);
|
||||
extern pf_s32 PFCACHE_AllocateDataPage(PF_VOLUME* volume, pf_u32 sector, PF_CACHE_PAGE** page, pf_u32* size);
|
||||
extern void PFCACHE_FreeDataPage(PF_VOLUME* volume, PF_CACHE_PAGE* page);
|
||||
static inline void set_dot_entry(pf_u8* buffer) {
|
||||
pf_u32 index;
|
||||
buffer[0] = '.';
|
||||
buffer[1] = ' ';
|
||||
buffer[2] = ' ';
|
||||
buffer[3] = ' ';
|
||||
buffer[4] = ' ';
|
||||
buffer[5] = ' ';
|
||||
buffer[6] = ' ';
|
||||
buffer[7] = ' ';
|
||||
buffer[8] = ' ';
|
||||
buffer[9] = ' ';
|
||||
buffer[10] = ' ';
|
||||
for (index = 1; index < 11; index++) { buffer[index] = ' '; }
|
||||
}
|
||||
|
||||
static inline void set_dot_dot_entry(pf_u8* buffer) {
|
||||
@@ -453,7 +449,7 @@ extern pf_s32 PFENT_ITER_GetEntryOfPattern(PF_ENT_ITER* iter, PF_DIR_ENT* entry,
|
||||
extern pf_s32 PFENT_ITER_FindEntry(PF_ENT_ITER* iter, PF_DIR_ENT* entry, PFDIR_STR* pattern,
|
||||
pf_u8 attributes, pf_u32 start, pf_u32* found);
|
||||
extern pf_s32 PFENT_findEntry(PFDIR_FFD* ffd, PF_DIR_ENT* entry, pf_u32 start, PFDIR_STR* pattern,
|
||||
pf_u8 attributes, pf_u32* logical_position, pf_u32* entry_position);
|
||||
pf_u32 required_attributes, pf_u32 forbidden_attributes);
|
||||
extern pf_u32 PFSTR_GetCodeMode(PFDIR_STR* path);
|
||||
extern const pf_s8* PFSTR_GetStrPos(PFDIR_STR* path, pf_u32 target);
|
||||
extern pf_s32 PFPATH_SplitPathPattern(PF_STR* path, PFDIR_STR* directory, PFDIR_STR* pattern);
|
||||
@@ -467,6 +463,16 @@ extern pf_s32 PFFILE_FsexecOpenFile(PF_DIR_ENT* entry, PF_ENT_ITER* iter, pf_u32
|
||||
extern pf_s32 PFPATH_cmpName(const pf_s8* short_name, PFDIR_STR* pattern, pf_u32 short_search);
|
||||
extern pf_s32 PFPATH_cmpNameUni(const pf_u16* name, PFDIR_STR* pattern);
|
||||
pf_s32 PFDIR_p_mkdir(PF_VOLUME* volume, PF_STR* path, pf_u32 option, PF_DTA* data) {
|
||||
pf_u32 index;
|
||||
pf_u32* next_sector;
|
||||
pf_u16 filename_length;
|
||||
pf_u16 original_offset;
|
||||
pf_u8 checksum;
|
||||
pf_u8 lfn_count = 0;
|
||||
pf_u32 cluster;
|
||||
pf_u32 lfn_index;
|
||||
pf_u32 entry_sector;
|
||||
pf_s32 error;
|
||||
PF_DIR_ENT parent_entry;
|
||||
PF_DIR_ENT entry;
|
||||
pf_s8 normalized_name[512];
|
||||
@@ -480,19 +486,9 @@ pf_s32 PFDIR_p_mkdir(PF_VOLUME* volume, PF_STR* path, pf_u32 option, PF_DTA* dat
|
||||
pf_u32 found;
|
||||
pf_u32 page_size;
|
||||
PF_CACHE_PAGE* page;
|
||||
pf_u8 lfn_count = 0;
|
||||
pf_u32 sector = 0;
|
||||
pf_u32 written;
|
||||
pf_u32 position;
|
||||
pf_u32 entry_sector;
|
||||
pf_u16 filename_length;
|
||||
pf_u16 original_offset;
|
||||
pf_u8 checksum;
|
||||
pf_u32 cluster;
|
||||
pf_u32 index;
|
||||
pf_u32 lfn_index;
|
||||
pf_u32* next_sector;
|
||||
pf_s32 error;
|
||||
|
||||
error = PFPATH_SplitPath((PFDIR_STR*)path, &directory, &filename);
|
||||
if (error != 0) { return error; }
|
||||
@@ -870,12 +866,15 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
pf_u32 found;
|
||||
pf_u16 time;
|
||||
pf_u8 deleted_marker[1] = {0xE5};
|
||||
pf_u16 saved_initial_char = 0;
|
||||
pf_u32 sector;
|
||||
pf_u32* next_sector;
|
||||
pf_s32 filename_length;
|
||||
pf_s32 parse_error;
|
||||
pf_u32* next_sector;
|
||||
pf_s32 allocation_error = 0;
|
||||
pf_u32 sector;
|
||||
pf_u16 saved_initial_char = 0;
|
||||
pf_s32 parse_error;
|
||||
const pf_s8* filename;
|
||||
pf_u32 remaining_lfns;
|
||||
pf_u32 lfn_index;
|
||||
pf_s32 error;
|
||||
pf_u32 index;
|
||||
PF_DIR_ENT* update_entry;
|
||||
@@ -911,11 +910,11 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
}
|
||||
PFSTR_SetLocalStr(&destination_name, (pf_u32)normalized_name);
|
||||
if (PFSTR_GetCodeMode(&destination_name) == 1) {
|
||||
const pf_s8* filename = PFSTR_GetStrPos(&destination_name, 1);
|
||||
filename = PFSTR_GetStrPos(&destination_name, 1);
|
||||
error = pf_strcmp(PFSTR_GetStrPos(&directory, 1), filename);
|
||||
} else {
|
||||
const pf_u16* filename = (const pf_u16*)PFSTR_GetStrPos(&destination_name, 1);
|
||||
error = pf_w_strcmp((const pf_u16*)PFSTR_GetStrPos(&directory, 1), filename);
|
||||
filename = PFSTR_GetStrPos(&destination_name, 1);
|
||||
error = pf_w_strcmp((const pf_u16*)PFSTR_GetStrPos(&directory, 1), (const pf_u16*)filename);
|
||||
}
|
||||
if (error != 0) {
|
||||
error = PFENT_ITER_GetEntryOfPath(&destination_iter, &destination_entry,
|
||||
@@ -925,23 +924,24 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
}
|
||||
destination_entry.start_cluster = source_parent.start_cluster;
|
||||
PFFAT_InitFFD(&destination_iter.ffd, &destination_hint, volume, &destination_entry.start_cluster);
|
||||
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &destination_name, 0x7F, 0, 0);
|
||||
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &destination_name, 0x7F, 0);
|
||||
if (error == 0) { return 8; }
|
||||
if (error != 0 && error != 3) { return error; }
|
||||
if ((source_entry.attr & 0x10) == 0) {
|
||||
if (PFFILE_IsOpened(&source_entry) != 0) { return 0x13; }
|
||||
} else {
|
||||
if (directory_is_open(&source_entry) != 0) { return 0x13; }
|
||||
if (current_directory_is_open(source_entry.p_vol, source_entry.start_cluster) != 0) { return 0x1C; }
|
||||
if (current_directory_is_open(source_entry.p_vol, &source_entry) != 0) { return 0x1C; }
|
||||
if (PFSTR_StrNCmp(&source_name, (const pf_s8*)"..", 1, 0, 2) == 0) { return 0x1C; }
|
||||
if (PFSTR_StrNCmp(&source_name, (const pf_s8*)".", 1, 0, 1) == 0) { return 0x1C; }
|
||||
{
|
||||
pf_u32 directory_sector;
|
||||
PFDIR_SFD* file = ((PFDIR_VOLUME_DIRS*)volume)->sfds;
|
||||
pf_u32 directory_sector = volume->bpb.first_data_sector +
|
||||
directory_sector = volume->bpb.first_data_sector +
|
||||
((source_entry.start_cluster - 2) << volume->bpb.log2_sectors_per_cluster);
|
||||
for (index = 0; index < 5; index++, file++) {
|
||||
if ((file->stat & 1) != 0 && (file->stat & 2) != 0) {
|
||||
if (file->dir_entry.p_vol == volume && file->dir_entry.entry_sector == directory_sector) { return 0x13; }
|
||||
if (volume == file->dir_entry.p_vol && directory_sector == file->dir_entry.entry_sector) { return 0x13; }
|
||||
found = 0;
|
||||
error = PFENT_ITER_FindCluster(&file->dir_entry, source_entry.start_cluster, &found);
|
||||
if (error != 0) { return error; }
|
||||
@@ -961,12 +961,13 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
destination_entry.num_entry_LFNs = 0;
|
||||
PFENT_getcurrentDateTimeForEnt(&destination_entry.access_date, &time);
|
||||
error = PFENT_updateEntry(&destination_entry, 1);
|
||||
goto finish_rename;
|
||||
if (error != 0) { return error; }
|
||||
goto return_allocation_error;
|
||||
}
|
||||
if (source_entry.num_entry_LFNs != 0 && (source_entry.small_letter_flag & 0x18) == 0) {
|
||||
saved_initial_char = source_entry.long_name[0];
|
||||
source_entry.long_name[0] = 0;
|
||||
for (index = 1; index <= source_entry.num_entry_LFNs; index++) {
|
||||
for (lfn_index = 1; lfn_index <= source_entry.num_entry_LFNs; lfn_index++) {
|
||||
error = PFENT_ITER_Retreat(&source_iter, 0);
|
||||
if (error != 0) { return error; }
|
||||
error = PFSEC_WriteData(volume, deleted_marker, source_iter.sector,
|
||||
@@ -1004,7 +1005,7 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
if (allocation_error != 0) {
|
||||
if (source_entry.num_entry_LFNs != 0 && (source_entry.small_letter_flag & 0x18) == 0) {
|
||||
source_entry.long_name[0] = saved_initial_char;
|
||||
source_entry.entry_offset -= (pf_u16)(source_entry.num_entry_LFNs * 32);
|
||||
source_entry.entry_offset -= ((pf_u32)source_entry.num_entry_LFNs << 5) & (0xffU << 5);
|
||||
}
|
||||
update_entry = &source_entry;
|
||||
} else {
|
||||
@@ -1013,13 +1014,13 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
PFENT_getcurrentDateTimeForEnt(&destination_entry.access_date, &time);
|
||||
update_entry = &destination_entry;
|
||||
}
|
||||
index = update_entry->num_entry_LFNs;
|
||||
if (index != 0 && (update_entry->small_letter_flag & 0x18) == 0) {
|
||||
remaining_lfns = update_entry->num_entry_LFNs;
|
||||
if (remaining_lfns != 0 && (update_entry->small_letter_flag & 0x18) == 0) {
|
||||
sector = update_entry->entry_sector;
|
||||
next_sector = previous_chain;
|
||||
while (index >= 1) {
|
||||
PFENT_storeLFNEntryFieldsToBuf(entry_buffer, update_entry, index,
|
||||
update_entry->check_sum, index == update_entry->num_entry_LFNs);
|
||||
while (remaining_lfns >= 1) {
|
||||
PFENT_storeLFNEntryFieldsToBuf(entry_buffer, update_entry, remaining_lfns,
|
||||
update_entry->check_sum, remaining_lfns == update_entry->num_entry_LFNs);
|
||||
error = PFSEC_WriteData(volume, entry_buffer, sector, update_entry->entry_offset, 32, &written, 0);
|
||||
if (error != 0) { return error; }
|
||||
if (written != 32) { return 0x11; }
|
||||
@@ -1028,13 +1029,13 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
update_entry->entry_offset = 0;
|
||||
sector = *next_sector++;
|
||||
}
|
||||
index--;
|
||||
remaining_lfns--;
|
||||
}
|
||||
update_entry->entry_sector = sector;
|
||||
}
|
||||
error = PFENT_updateEntry(update_entry, 1);
|
||||
finish_rename:
|
||||
if (error != 0) { allocation_error = error; }
|
||||
if (error != 0) { return error; }
|
||||
return_allocation_error:
|
||||
return allocation_error;
|
||||
}
|
||||
pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
@@ -1057,15 +1058,16 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
pf_u32 found;
|
||||
pf_u16 time;
|
||||
pf_u8 deleted_marker[1] = {0xE5};
|
||||
pf_u16 saved_initial_char = 0;
|
||||
pf_u32 sector;
|
||||
pf_u32* next_sector;
|
||||
pf_s32 filename_length;
|
||||
pf_u32* next_sector;
|
||||
pf_u32 parent_cluster;
|
||||
pf_u32 sector;
|
||||
pf_s32 parse_error;
|
||||
pf_s32 allocation_error;
|
||||
pf_s32 error;
|
||||
pf_u32 index;
|
||||
pf_u16 saved_initial_char = 0;
|
||||
pf_u32 lfn_index;
|
||||
pf_u32 index;
|
||||
PF_DIR_ENT* update_entry;
|
||||
|
||||
error = PFENT_ITER_GetEntryOfPath(&source_iter, &source_entry, volume, (PFDIR_STR*)old_path, 0);
|
||||
@@ -1083,7 +1085,7 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
if (error != 0) { return error; }
|
||||
destination_entry.start_cluster = destination_parent.start_cluster;
|
||||
PFFAT_InitFFD(&destination_iter.ffd, &destination_hint, volume, &destination_entry.start_cluster);
|
||||
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &destination_name, 0x7F, 0, 0);
|
||||
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &destination_name, 0x7F, 0);
|
||||
if (error == 0) {
|
||||
if (destination_entry.entry_sector == source_entry.entry_sector &&
|
||||
destination_entry.entry_offset == source_entry.entry_offset) { return 0; }
|
||||
@@ -1094,18 +1096,19 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
if (PFFILE_IsOpened(&source_entry) != 0) { return 0x13; }
|
||||
} else {
|
||||
if (directory_is_open(&source_entry) != 0) { return 0x13; }
|
||||
if (current_directory_is_open(source_entry.p_vol, source_entry.start_cluster) != 0) { return 0x1C; }
|
||||
if (current_directory_is_open(source_entry.p_vol, &source_entry) != 0) { return 0x1C; }
|
||||
error = PFPATH_SplitPath((PFDIR_STR*)old_path, &directory, &source_name);
|
||||
if (error != 0) { return error; }
|
||||
if (PFSTR_StrNCmp(&source_name, (const pf_s8*)"..", 1, 0, 2) == 0) { return 10; }
|
||||
if (PFSTR_StrNCmp(&source_name, (const pf_s8*)".", 1, 0, 1) == 0) { return 10; }
|
||||
{
|
||||
pf_u32 directory_sector;
|
||||
PFDIR_SFD* file = ((PFDIR_VOLUME_DIRS*)volume)->sfds;
|
||||
pf_u32 directory_sector = volume->bpb.first_data_sector +
|
||||
directory_sector = volume->bpb.first_data_sector +
|
||||
((source_entry.start_cluster - 2) << volume->bpb.log2_sectors_per_cluster);
|
||||
for (index = 0; index < 5; index++, file++) {
|
||||
if ((file->stat & 1) != 0 && (file->stat & 2) != 0) {
|
||||
if (file->dir_entry.p_vol == volume && file->dir_entry.entry_sector == directory_sector) { return 0x13; }
|
||||
if (volume == file->dir_entry.p_vol && directory_sector == file->dir_entry.entry_sector) { return 0x13; }
|
||||
found = 0;
|
||||
error = PFENT_ITER_FindCluster(&file->dir_entry, source_entry.start_cluster, &found);
|
||||
if (error != 0) { return error; }
|
||||
@@ -1115,12 +1118,11 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
}
|
||||
destination_entry.start_cluster = destination_parent.start_cluster;
|
||||
for (;;) {
|
||||
pf_u32 parent_cluster;
|
||||
if (destination_entry.start_cluster == 1 || destination_entry.start_cluster == 0) { break; }
|
||||
PFFAT_InitFFD(&destination_iter.ffd, &destination_hint, volume, &destination_entry.start_cluster);
|
||||
PFSTR_InitStr(&parent_name, (const pf_s8*)"..", 1);
|
||||
PFSTR_SetLocalStr(&parent_name, 0);
|
||||
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &parent_name, 0x7F, 0, 0);
|
||||
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &parent_name, 0x7F, 0);
|
||||
if (error != 0) { return error; }
|
||||
parent_cluster = destination_entry.start_cluster;
|
||||
if (parent_cluster == 1 || parent_cluster == 0) { break; }
|
||||
@@ -1140,9 +1142,10 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
parse_error = PFPATH_parseShortName(destination_entry.short_name, &destination_name);
|
||||
if (destination_entry.short_name[0] == 0) { return 2; }
|
||||
if (source_entry.num_entry_LFNs != 0 && (source_entry.small_letter_flag & 0x18) == 0) {
|
||||
pf_u32 entry_index;
|
||||
saved_initial_char = source_entry.long_name[0];
|
||||
source_entry.long_name[0] = 0;
|
||||
for (index = 1; index <= source_entry.num_entry_LFNs; index++) {
|
||||
for (entry_index = 1; entry_index <= source_entry.num_entry_LFNs; entry_index++) {
|
||||
error = PFENT_ITER_Retreat(&source_iter, 0);
|
||||
if (error != 0) { return error; }
|
||||
error = PFSEC_WriteData(volume, deleted_marker, source_iter.sector,
|
||||
@@ -1180,7 +1183,7 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
if (allocation_error != 0) {
|
||||
if (source_entry.num_entry_LFNs != 0 && (source_entry.small_letter_flag & 0x18) == 0) {
|
||||
source_entry.long_name[0] = saved_initial_char;
|
||||
source_entry.entry_offset -= (source_entry.num_entry_LFNs & 0xff) * 32;
|
||||
source_entry.entry_offset -= ((pf_u32)source_entry.num_entry_LFNs << 5) & (0xffU << 5);
|
||||
}
|
||||
update_entry = &source_entry;
|
||||
} else {
|
||||
@@ -1192,7 +1195,7 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
PFFAT_InitFFD(&source_iter.ffd, &source_hint, volume, &source_entry.start_cluster);
|
||||
PFSTR_InitStr(&parent_name, (const pf_s8*)"..", 1);
|
||||
PFSTR_SetLocalStr(&parent_name, 0);
|
||||
error = PFENT_findEntry(&source_iter.ffd, &source_entry, 0, &parent_name, 0x7F, 0, 0);
|
||||
error = PFENT_findEntry(&source_iter.ffd, &source_entry, 0, &parent_name, 0x7F, 0);
|
||||
if (error != 0) { return error; }
|
||||
if (destination_parent.start_cluster == 1 || destination_parent.start_cluster == 0 ||
|
||||
(destination_parent.start_cluster == 2 && volume->bpb.fat_type == FAT_32)) {
|
||||
@@ -1230,6 +1233,164 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
return allocation_error;
|
||||
}
|
||||
|
||||
pf_s32 PFDIR_p_fsnext(PF_DTA* data) {
|
||||
PFDIR_FFD ffd;
|
||||
PFDIR_FAT_HINT hint;
|
||||
PF_DIR_ENT entry;
|
||||
PFDIR_STR pattern;
|
||||
pf_u32 logical_position = 0;
|
||||
pf_u32 entry_position = 0;
|
||||
pf_u32 code_mode;
|
||||
pf_s32 index = 0;
|
||||
pf_s32 error;
|
||||
|
||||
if ((data->status & 1) == 1) {
|
||||
code_mode = 1;
|
||||
error = PFSTR_InitStr(&pattern, data->reg_exp, code_mode);
|
||||
} else {
|
||||
code_mode = 2;
|
||||
error = PFSTR_InitStr(&pattern, (const pf_s8*)((PF_DTAW*)data)->reg_expW, code_mode);
|
||||
}
|
||||
if (error != 0) {
|
||||
return error;
|
||||
}
|
||||
PFSTR_SetLocalStr(&pattern, (pf_u32)data->reg_exp);
|
||||
while (entry_position < 999999) {
|
||||
if (data->parent_pos >= 999999) { return 10; }
|
||||
entry.start_cluster = data->parent_start_cluster;
|
||||
PFFAT_InitFFD(&ffd, &hint, data->p_vol, &entry.start_cluster);
|
||||
error = PFENT_findEntryPos(&ffd, &entry, data->parent_pos, &pattern, data->attr, 0,
|
||||
&logical_position, &entry_position);
|
||||
if (error != 0) { return error; }
|
||||
data->parent_pos = entry_position + 1;
|
||||
if (entry_position == 999999) { return 3; }
|
||||
else { break; }
|
||||
}
|
||||
pf_strcpy(data->FileName, entry.short_name);
|
||||
if ((data->status & 2) == 2) {
|
||||
PFPATH_transformInUnicode(((PF_DTAW*)data)->FileNameW, data->FileName);
|
||||
}
|
||||
if (entry.long_name[0] != 0) {
|
||||
if ((pf_vol_set.setting & 2) == 2) {
|
||||
pf_vol_set.setting &= 0xFFFFFFFC;
|
||||
pf_vol_set.setting |= 1;
|
||||
PFPATH_transformFromUnicodeToNormal(data->LongName, entry.long_name);
|
||||
pf_vol_set.setting &= 0xFFFFFFFC;
|
||||
pf_vol_set.setting |= 2;
|
||||
} else {
|
||||
PFPATH_transformFromUnicodeToNormal(data->LongName, entry.long_name);
|
||||
}
|
||||
if ((data->status & 2) == 2) {
|
||||
pf_w_strcpy(((PF_DTAW*)data)->LongNameW, entry.long_name);
|
||||
}
|
||||
} else {
|
||||
data->LongName[0] = 0;
|
||||
if ((data->status & 2) == 2) {
|
||||
((PF_DTAW*)data)->LongNameW[0] = 0;
|
||||
}
|
||||
}
|
||||
if (((PFDIR_VOLUME_DIRS*)data->p_vol)->num_opened_files != 0) {
|
||||
for (index = 0; index < 5; index++) {
|
||||
if ((((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].stat & 1) != 0 && (((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].stat & 2) != 0 &&
|
||||
entry.p_vol == ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.p_vol &&
|
||||
((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.entry_sector == entry.entry_sector &&
|
||||
((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.entry_offset == entry.entry_offset) {
|
||||
data->FileSize = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.file_size;
|
||||
data->Time = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.modify_time;
|
||||
data->Date = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.modify_date;
|
||||
data->Attribute = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.attr;
|
||||
data->num_entry_LFNs = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.num_entry_LFNs;
|
||||
data->ordinal = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.ordinal;
|
||||
data->check_sum = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.check_sum;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (((PFDIR_VOLUME_DIRS*)data->p_vol)->num_opened_files == 0 || index == 5) {
|
||||
data->FileSize = entry.file_size;
|
||||
data->Time = entry.modify_time;
|
||||
data->Date = entry.modify_date;
|
||||
data->Attribute = entry.attr;
|
||||
data->num_entry_LFNs = entry.num_entry_LFNs;
|
||||
data->ordinal = entry.ordinal;
|
||||
data->check_sum = entry.check_sum;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
pf_s32 PFDIR_p_fsfirst(PF_VOLUME* volume, PF_STR* path, pf_u8 attributes, PF_DTA* data) {
|
||||
PFDIR_STR directory;
|
||||
PFDIR_STR pattern;
|
||||
PF_DIR_ENT entry;
|
||||
PF_ENT_ITER iter;
|
||||
pf_s32 error;
|
||||
|
||||
error = PFPATH_SplitPathPattern(path, &directory, &pattern);
|
||||
if (error != 0) {
|
||||
return error;
|
||||
}
|
||||
error = PFENT_ITER_GetEntryOfPattern(&iter, &entry, volume, &directory);
|
||||
if (error != 0) {
|
||||
return error;
|
||||
}
|
||||
if ((entry.attr & 0x10) == 0) {
|
||||
return 0x14;
|
||||
}
|
||||
data->parent_start_cluster = entry.start_cluster;
|
||||
data->parent_pos = 0;
|
||||
data->p_vol = entry.p_vol;
|
||||
data->attr = attributes;
|
||||
data->status = 0;
|
||||
if (PFSTR_GetCodeMode(&pattern) == 1) {
|
||||
PFPATH_SetSearchPattern(data->reg_exp, 0, &pattern);
|
||||
data->status |= 1;
|
||||
} else {
|
||||
PFPATH_SetSearchPattern(data->reg_exp, ((PF_DTAW*)data)->reg_expW, &pattern);
|
||||
data->status |= 2;
|
||||
}
|
||||
return PFDIR_p_fsnext(data);
|
||||
}
|
||||
|
||||
pf_s32 PFDIR_p_fsexec_chmod(PF_DTA* data, PF_DIR_ENT* entry, pf_u32 mode, pf_u32 attributes) {
|
||||
PFDIR_VOLUME_DIRS* volume_dirs = (PFDIR_VOLUME_DIRS*)entry->p_vol;
|
||||
pf_u16 date;
|
||||
pf_u16 time;
|
||||
pf_u8 create_time_ms;
|
||||
pf_s32 index = 0;
|
||||
pf_s32 error;
|
||||
|
||||
if ((attributes & 0x40) != 0) {
|
||||
attributes = (pf_u8)(attributes & ~0x40);
|
||||
}
|
||||
if ((entry->attr & 0x10) != 0) {
|
||||
if ((attributes & 4) != 0) {
|
||||
return 10;
|
||||
}
|
||||
if (directory_is_open(entry) != 0) { return 0x13; }
|
||||
|
||||
entry->attr = attributes | 0x10;
|
||||
} else {
|
||||
if ((attributes & 0x10) != 0) {
|
||||
return 10;
|
||||
}
|
||||
if (PFFILE_IsOpened(entry) != 0) {
|
||||
return 0x13;
|
||||
}
|
||||
entry->attr = attributes;
|
||||
}
|
||||
PFENT_getcurrentDateTimeForEnt(&entry->access_date, &time);
|
||||
error = PFENT_updateEntry(entry, 0);
|
||||
if (error != 0) {
|
||||
return error;
|
||||
}
|
||||
if ((mode & 0x80000000) == 0) {
|
||||
data->Attribute = entry->attr;
|
||||
}
|
||||
error = PFCACHE_FlushDataCacheSpecific(entry->p_vol, 0);
|
||||
if (error != 0) { return error; }
|
||||
return 0;
|
||||
}
|
||||
|
||||
pf_s32 PFDIR_p_fsexec_remove(PF_DTA* data, PF_DIR_ENT* entry, PF_ENT_ITER* iter) {
|
||||
PFDIR_VOLUME_DIRS* volume_dirs = (PFDIR_VOLUME_DIRS*)entry->p_vol;
|
||||
PFDIR_FAT_HINT hint;
|
||||
@@ -1283,47 +1444,6 @@ pf_s32 PFDIR_p_fsexec_remove(PF_DTA* data, PF_DIR_ENT* entry, PF_ENT_ITER* iter)
|
||||
return release_directory_chain(&iter->ffd, start_cluster, chain_size);
|
||||
}
|
||||
|
||||
|
||||
pf_s32 PFDIR_p_fsexec_chmod(PF_DTA* data, PF_DIR_ENT* entry, pf_u32 mode, pf_u32 attributes) {
|
||||
PFDIR_VOLUME_DIRS* volume_dirs = (PFDIR_VOLUME_DIRS*)entry->p_vol;
|
||||
pf_u16 date;
|
||||
pf_u16 time;
|
||||
pf_u8 create_time_ms;
|
||||
pf_s32 index = 0;
|
||||
pf_s32 error;
|
||||
|
||||
if ((attributes & 0x40) != 0) {
|
||||
attributes = (pf_u8)(attributes & ~0x40);
|
||||
}
|
||||
if ((entry->attr & 0x10) != 0) {
|
||||
if ((attributes & 4) != 0) {
|
||||
return 10;
|
||||
}
|
||||
if (directory_is_open(entry) != 0) { return 0x13; }
|
||||
|
||||
entry->attr = attributes | 0x10;
|
||||
} else {
|
||||
if ((attributes & 0x10) != 0) {
|
||||
return 10;
|
||||
}
|
||||
if (PFFILE_IsOpened(entry) != 0) {
|
||||
return 0x13;
|
||||
}
|
||||
entry->attr = attributes;
|
||||
}
|
||||
PFENT_getcurrentDateTimeForEnt(&entry->access_date, &time);
|
||||
error = PFENT_updateEntry(entry, 0);
|
||||
if (error != 0) {
|
||||
return error;
|
||||
}
|
||||
if ((mode & 0x80000000) == 0) {
|
||||
data->Attribute = entry->attr;
|
||||
}
|
||||
error = PFCACHE_FlushDataCacheSpecific(entry->p_vol, 0);
|
||||
if (error != 0) { return error; }
|
||||
return 0;
|
||||
}
|
||||
|
||||
pf_s32 PFDIR_p_fsexec_fopen(PF_DTA* data, PF_DIR_ENT* entry, PF_ENT_ITER* iter, pf_u32 flags,
|
||||
pf_u32 mode) {
|
||||
pf_s8 long_name[13];
|
||||
@@ -1910,121 +2030,3 @@ void PFDIR_chdmod(PF_STR* path, pf_u8 attributes) {
|
||||
}
|
||||
volume_dirs->cache.signature = 0;
|
||||
}
|
||||
|
||||
pf_s32 PFDIR_p_fsnext(PF_DTA* data) {
|
||||
PFDIR_FFD ffd;
|
||||
PFDIR_FAT_HINT hint;
|
||||
PF_DIR_ENT entry;
|
||||
PFDIR_STR pattern;
|
||||
pf_u32 logical_position = 0;
|
||||
pf_u32 entry_position = 0;
|
||||
pf_u32 code_mode;
|
||||
pf_s32 index = 0;
|
||||
pf_s32 error;
|
||||
|
||||
if ((data->status & 1) == 1) {
|
||||
code_mode = 1;
|
||||
error = PFSTR_InitStr(&pattern, data->reg_exp, code_mode);
|
||||
} else {
|
||||
code_mode = 2;
|
||||
error = PFSTR_InitStr(&pattern, (const pf_s8*)((PF_DTAW*)data)->reg_expW, code_mode);
|
||||
}
|
||||
if (error != 0) {
|
||||
return error;
|
||||
}
|
||||
PFSTR_SetLocalStr(&pattern, (pf_u32)data->reg_exp);
|
||||
while (entry_position < 999999) {
|
||||
if (data->parent_pos >= 999999) { return 10; }
|
||||
entry.start_cluster = data->parent_start_cluster;
|
||||
PFFAT_InitFFD(&ffd, &hint, data->p_vol, &entry.start_cluster);
|
||||
error = PFENT_findEntryPos(&ffd, &entry, data->parent_pos, &pattern, data->attr, 0,
|
||||
&logical_position, &entry_position);
|
||||
if (error != 0) { return error; }
|
||||
data->parent_pos = entry_position + 1;
|
||||
if (entry_position == 999999) { return 3; }
|
||||
else { break; }
|
||||
}
|
||||
pf_strcpy(data->FileName, entry.short_name);
|
||||
if ((data->status & 2) == 2) {
|
||||
PFPATH_transformInUnicode(((PF_DTAW*)data)->FileNameW, data->FileName);
|
||||
}
|
||||
if (entry.long_name[0] != 0) {
|
||||
if ((pf_vol_set.setting & 2) == 2) {
|
||||
pf_vol_set.setting &= 0xFFFFFFFC;
|
||||
pf_vol_set.setting |= 1;
|
||||
PFPATH_transformFromUnicodeToNormal(data->LongName, entry.long_name);
|
||||
pf_vol_set.setting &= 0xFFFFFFFC;
|
||||
pf_vol_set.setting |= 2;
|
||||
} else {
|
||||
PFPATH_transformFromUnicodeToNormal(data->LongName, entry.long_name);
|
||||
}
|
||||
if ((data->status & 2) == 2) {
|
||||
pf_w_strcpy(((PF_DTAW*)data)->LongNameW, entry.long_name);
|
||||
}
|
||||
} else {
|
||||
data->LongName[0] = 0;
|
||||
if ((data->status & 2) == 2) {
|
||||
((PF_DTAW*)data)->LongNameW[0] = 0;
|
||||
}
|
||||
}
|
||||
if (((PFDIR_VOLUME_DIRS*)data->p_vol)->num_opened_files != 0) {
|
||||
for (index = 0; index < 5; index++) {
|
||||
if ((((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].stat & 1) != 0 && (((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].stat & 2) != 0 &&
|
||||
entry.p_vol == ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.p_vol &&
|
||||
((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.entry_sector == entry.entry_sector &&
|
||||
((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.entry_offset == entry.entry_offset) {
|
||||
data->FileSize = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.file_size;
|
||||
data->Time = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.modify_time;
|
||||
data->Date = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.modify_date;
|
||||
data->Attribute = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.attr;
|
||||
data->num_entry_LFNs = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.num_entry_LFNs;
|
||||
data->ordinal = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.ordinal;
|
||||
data->check_sum = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.check_sum;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (((PFDIR_VOLUME_DIRS*)data->p_vol)->num_opened_files == 0 || index == 5) {
|
||||
data->FileSize = entry.file_size;
|
||||
data->Time = entry.modify_time;
|
||||
data->Date = entry.modify_date;
|
||||
data->Attribute = entry.attr;
|
||||
data->num_entry_LFNs = entry.num_entry_LFNs;
|
||||
data->ordinal = entry.ordinal;
|
||||
data->check_sum = entry.check_sum;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
pf_s32 PFDIR_p_fsfirst(PF_VOLUME* volume, PF_STR* path, pf_u8 attributes, PF_DTA* data) {
|
||||
PFDIR_STR directory;
|
||||
PFDIR_STR pattern;
|
||||
PF_DIR_ENT entry;
|
||||
PF_ENT_ITER iter;
|
||||
pf_s32 error;
|
||||
|
||||
error = PFPATH_SplitPathPattern(path, &directory, &pattern);
|
||||
if (error != 0) {
|
||||
return error;
|
||||
}
|
||||
error = PFENT_ITER_GetEntryOfPattern(&iter, &entry, volume, &directory);
|
||||
if (error != 0) {
|
||||
return error;
|
||||
}
|
||||
if ((entry.attr & 0x10) == 0) {
|
||||
return 0x14;
|
||||
}
|
||||
data->parent_start_cluster = entry.start_cluster;
|
||||
data->parent_pos = 0;
|
||||
data->p_vol = entry.p_vol;
|
||||
data->attr = attributes;
|
||||
data->status = 0;
|
||||
if (PFSTR_GetCodeMode(&pattern) == 1) {
|
||||
PFPATH_SetSearchPattern(data->reg_exp, 0, &pattern);
|
||||
data->status |= 1;
|
||||
} else {
|
||||
PFPATH_SetSearchPattern(data->reg_exp, ((PF_DTAW*)data)->reg_expW, &pattern);
|
||||
data->status |= 2;
|
||||
}
|
||||
return PFDIR_p_fsnext(data);
|
||||
}
|
||||
|
||||
@@ -511,8 +511,8 @@ pf_s32 PFENT_ITER_FindCluster(PF_DIR_ENT* p_ent, pf_u32 cluster, pf_bool* p_is_f
|
||||
iter.ffd.cluster_link.buffer = PF_NULL;
|
||||
iter.log2_entries_per_sector = p_ent->p_vol->bpb.log2_bytes_per_sector - 5;
|
||||
iter.file_sector_index = sector_index;
|
||||
entries_per_sector = 1 << iter.log2_entries_per_sector;
|
||||
iter.offset_mask = entries_per_sector - 1;
|
||||
iter.offset_mask = (1U << iter.log2_entries_per_sector) - 1;
|
||||
entries_per_sector = 1U << iter.log2_entries_per_sector;
|
||||
iter.p_vol = p_ent->p_vol;
|
||||
iter.sector = p_ent->entry_sector;
|
||||
iter.offset = p_ent->entry_offset;
|
||||
|
||||
@@ -1458,6 +1458,19 @@ s32 PFFAT_CountFreeClusters(PF_VOLUME* volume, u32* numFreeClusters)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline s32 PFFAT_ClearEntryWithBuf(PF_VOLUME* volume, u32 cluster, PF_CACHE_PAGE* page) {
|
||||
switch (volume->bpb.fat_type) {
|
||||
case FAT_12:
|
||||
return PFFAT12_WriteFATEntryWithBuf(volume, (u16)cluster, 0, page);
|
||||
case FAT_16:
|
||||
return PFFAT16_WriteFATEntryWithBuf(volume, cluster, 0, page);
|
||||
case FAT_32:
|
||||
return PFFAT32_WriteFATEntryWithBuf(volume, cluster, 0, page);
|
||||
default:
|
||||
return 15;
|
||||
}
|
||||
}
|
||||
|
||||
s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
|
||||
u32 size)
|
||||
{
|
||||
@@ -1523,9 +1536,9 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
|
||||
}
|
||||
if (nextCluster == 0) {
|
||||
s32 firstFlushError;
|
||||
PF_CACHE_PAGE* flushPage;
|
||||
u16 fatIndex;
|
||||
u32 fatSector;
|
||||
u16 fatIndex;
|
||||
const PF_CACHE_PAGE* flushPage;
|
||||
|
||||
firstFlushError = 0;
|
||||
flushPage = page;
|
||||
@@ -1546,33 +1559,19 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
|
||||
PFCACHE_FreeDataPage(volume, page);
|
||||
return 0;
|
||||
}
|
||||
if (chainIndex != -1) {
|
||||
error = PFFAT_WriteClusterWithBuf(file, startCluster, chainIndex,
|
||||
0, 1, page);
|
||||
chainIndex++;
|
||||
} else {
|
||||
currentPage = page;
|
||||
switch (volume->bpb.fat_type) {
|
||||
case FAT_12:
|
||||
error = PFFAT12_WriteFATEntryWithBuf(
|
||||
volume, (u16)startCluster, 0, currentPage);
|
||||
break;
|
||||
case FAT_16:
|
||||
error = PFFAT16_WriteFATEntryWithBuf(volume, startCluster, 0,
|
||||
currentPage);
|
||||
break;
|
||||
case FAT_32:
|
||||
error = PFFAT32_WriteFATEntryWithBuf(volume, startCluster, 0,
|
||||
currentPage);
|
||||
break;
|
||||
default:
|
||||
error = 15;
|
||||
break;
|
||||
{
|
||||
s32 writeError;
|
||||
if (chainIndex != -1) {
|
||||
writeError = PFFAT_WriteClusterWithBuf(file, startCluster, chainIndex,
|
||||
0, 1, page);
|
||||
chainIndex++;
|
||||
} else {
|
||||
writeError = PFFAT_ClearEntryWithBuf(volume, startCluster, page);
|
||||
}
|
||||
if (writeError != 0) {
|
||||
PFCACHE_FreeDataPage(volume, page);
|
||||
return writeError;
|
||||
}
|
||||
}
|
||||
if (error != 0) {
|
||||
PFCACHE_FreeDataPage(volume, page);
|
||||
return error;
|
||||
}
|
||||
if (size != 0 && fileSize != 0) {
|
||||
if (fileSize <= clusterSize) {
|
||||
@@ -1590,7 +1589,7 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
|
||||
s32 firstFlushError;
|
||||
u32 fatSector;
|
||||
u16 fatIndex;
|
||||
PF_CACHE_PAGE* flushPage;
|
||||
const PF_CACHE_PAGE* flushPage;
|
||||
|
||||
firstFlushError = 0;
|
||||
flushPage = page;
|
||||
|
||||
@@ -1105,7 +1105,13 @@ s32 PFVOL_attach(PFVOL_DRIVER* driver, s32 notify_command, void* callback_data)
|
||||
pf_vol_set.num_attached_drives++;
|
||||
if (PFDRV_IsInserted(volume) != 0) {
|
||||
driver->stat |= 0x10;
|
||||
attach_mount(volume, driver);
|
||||
error = clear_mount(volume);
|
||||
if (error != 0) {
|
||||
pf_vol_set.last_error = error;
|
||||
volume->last_error = error;
|
||||
return 0;
|
||||
}
|
||||
driver->stat |= 2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1469,17 +1475,21 @@ s32 PFVOL_setcode(PFVOL_CHARCODE* code_set) {
|
||||
return copy_codeset(code_set);
|
||||
}
|
||||
|
||||
static inline u32 ContextStatus(const PFVOL_CONTEXT* context) {
|
||||
return context->stat & 1;
|
||||
}
|
||||
|
||||
s32 PFVOL_regctx(void) {
|
||||
s32 context_id;
|
||||
s32 free_context_index;
|
||||
u32 context_index;
|
||||
s32 free_context_index;
|
||||
s32 context_id;
|
||||
s32 error;
|
||||
error = PFSYS_GetCurrentContextID(&context_id);
|
||||
if (error != 0) { pf_vol_set.last_error = 26; return 26; }
|
||||
free_context_index = 0;
|
||||
for (context_index = 1; context_index < 4; context_index++) {
|
||||
u32 stat;
|
||||
stat = pf_vol_set.context[context_index - 1].stat & 1;
|
||||
stat = ContextStatus(&pf_vol_set.context[context_index - 1]);
|
||||
if (stat != 0 && pf_vol_set.context[context_index - 1].context_id == context_id) { break; }
|
||||
if (stat == 0 && free_context_index == 0) { free_context_index = context_index; }
|
||||
}
|
||||
|
||||
@@ -562,11 +562,13 @@ static inline u32 kbdChannelFlags(u32 channel) {
|
||||
}
|
||||
|
||||
static void kbd_led_handler(BOOL success, void* callbackArg) {
|
||||
const KBDLEDCallbackData* callback;
|
||||
u32 index;
|
||||
u32 err;
|
||||
index = (u32)callbackArg;
|
||||
callback = &kbdLCBuf[index];
|
||||
kbdCmdBuf[index].device = 0;
|
||||
if (kbdLCBuf[index].callbackAddress == (USBKBDCmdLEDCallback)(u32)kbdCmdBuf[index].device) {
|
||||
if (callback->callbackAddress == (USBKBDCmdLEDCallback)(u32)kbdCmdBuf[index].device) {
|
||||
return;
|
||||
}
|
||||
switch (success) {
|
||||
|
||||
@@ -276,14 +276,15 @@ static inline f32 object_interval_distance(f32 interval) {
|
||||
const f32 sensorIntervalConversion = 0.383864f;
|
||||
|
||||
static void reset_kpad(KPADInside* kpad) {
|
||||
f32 upperY;
|
||||
f32 sensorDistance;
|
||||
f32 distanceValue;
|
||||
f32 zero;
|
||||
f32 sensorDistance;
|
||||
f32 upperY;
|
||||
f32 lowerY;
|
||||
f32 one;
|
||||
f32 negativeOne;
|
||||
KPADDPDObject* object;
|
||||
f32 calibratedDistance;
|
||||
negativeOne = -1.0f;
|
||||
one = 1.0f;
|
||||
zero = 0.0f;
|
||||
@@ -299,8 +300,9 @@ static void reset_kpad(KPADInside* kpad) {
|
||||
kpad->value508 = negativeOne / kp_err_dist_speed;
|
||||
kpad->value50C = kp_ah_circle_radius * kp_ah_circle_radius;
|
||||
kpad->value514 = kp_err_dist_min;
|
||||
distanceValue = kp_dist_vv1 / sensorDistance;
|
||||
kpad->value510 = kp_dist_vv1;
|
||||
calibratedDistance = kp_dist_vv1;
|
||||
distanceValue = calibratedDistance / sensorDistance;
|
||||
kpad->value510 = calibratedDistance;
|
||||
kpad->status.release = 0;
|
||||
kpad->status.trig = 0;
|
||||
kpad->status.hold = 0;
|
||||
@@ -854,26 +856,33 @@ static s8 select_1obj_continue(KPADInside* kpad) {
|
||||
}
|
||||
*matchedCandidate = *source;
|
||||
{
|
||||
f32 axisX = kpad->horizonTangent.x;
|
||||
f32 normX = kpad->horizonAxis.x;
|
||||
f32 axisY = kpad->horizonTangent.y;
|
||||
f32 normY = kpad->horizonAxis.y;
|
||||
f32 distance = kpad->dpdObjectDistance;
|
||||
f32 horizontal = axisX * normX;
|
||||
f32 vertical = axisY * normX;
|
||||
f32 offsetX;
|
||||
f32 directionX;
|
||||
f32 distance;
|
||||
f32 normY;
|
||||
f32 vertical;
|
||||
f32 directionY;
|
||||
f32 offsetX;
|
||||
f32 axisY;
|
||||
f32 horizontal;
|
||||
f32 axisX;
|
||||
f32 directionX;
|
||||
f32 normX;
|
||||
f32 offsetY;
|
||||
f32 tangentY;
|
||||
f32 tangentX;
|
||||
axisX = kpad->horizonTangent.x;
|
||||
normX = kpad->horizonAxis.x;
|
||||
axisY = kpad->horizonTangent.y;
|
||||
normY = kpad->horizonAxis.y;
|
||||
distance = kpad->dpdObjectDistance;
|
||||
horizontal = axisX * normX;
|
||||
vertical = axisY * normX;
|
||||
tangentY = axisY * normY;
|
||||
tangentX = axisX * normY;
|
||||
directionX = horizontal + tangentY;
|
||||
directionY = vertical - tangentX;
|
||||
offsetX = directionX * distance;
|
||||
offsetX = distance * directionX;
|
||||
kpad->dpdObjectDirection.x = directionX;
|
||||
offsetY = directionY * distance;
|
||||
offsetY = distance * directionY;
|
||||
kpad->dpdObjectDirection.y = directionY;
|
||||
if (matchedCandidate == kpad->dpdState.candidates) {
|
||||
kpad->dpdState.candidates[1].x = matchedCandidate->x + offsetX;
|
||||
|
||||
@@ -484,6 +484,7 @@ static inline unsigned long __nupBase64EncodedSize(unsigned long length) {
|
||||
}
|
||||
|
||||
static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
static char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
u8* end = input + length;
|
||||
u32 value = 0;
|
||||
u32 count = 0;
|
||||
@@ -496,26 +497,19 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
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 +517,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;
|
||||
}
|
||||
|
||||
@@ -1283,7 +1283,7 @@ static void __ClearControlBlock(s32 chan) {
|
||||
p->sleeping = TRUE;
|
||||
p->getInfoBusy = FALSE;
|
||||
p->getInfoCB = NULL;
|
||||
p->unk_0x98E = 0;
|
||||
p->continuous = 0;
|
||||
|
||||
memset(&p->wpInfo, 0, sizeof(p->wpInfo));
|
||||
memset(&p->wmReadDataBuf, 0, sizeof(p->wmReadDataBuf));
|
||||
@@ -1315,7 +1315,7 @@ static void __ClearControlBlock(s32 chan) {
|
||||
_wmb[chan].unk_0x04 = 0;
|
||||
_wmb[chan].unk_0x08 = 0;
|
||||
_wmb[chan].unk_0x0C = 0;
|
||||
_wmb[chan].unk_0x10 = NULL;
|
||||
_wmb[chan].callback = NULL;
|
||||
|
||||
_rumbleCnt[chan] = 0;
|
||||
}
|
||||
@@ -1551,7 +1551,7 @@ static void firmwareCheckCallback(s32 chan, s32 status) {
|
||||
|
||||
DEBUGPrint(" ==>this error means that the firmware is for NDEV %s\n", p->configIndex != 0 ? "2.0" : "2.1 or later");
|
||||
|
||||
WPADiSendSetReportType(&p->stdCmdQueue, WPAD_FMT_CORE_BTN, p->unk_0x98E, &abortConnCallback);
|
||||
WPADiSendSetReportType(&p->stdCmdQueue, WPAD_FMT_CORE_BTN, p->continuous, &abortConnCallback);
|
||||
|
||||
WPADiSendDPDCSB(&p->stdCmdQueue, FALSE, &abortConnCallback);
|
||||
WPADiSendSetPort(&p->stdCmdQueue, port, &abortConnCallback);
|
||||
@@ -1626,7 +1626,7 @@ static void WPADiConnCallback(WUDDevInfo* devInfo, u8 open) {
|
||||
p->status = WPAD_ERR_OK;
|
||||
p->radioSensitivity = 100;
|
||||
p->sleeping = FALSE;
|
||||
p->unk_0x98D = FALSE;
|
||||
p->encStatus = FALSE;
|
||||
|
||||
WPADiSendReadData(&p->stdCmdQueue, p->wmReadDataBuf, 1, WM_ADDR_MEM_1770, firmwareCheckCallback);
|
||||
|
||||
@@ -1643,8 +1643,8 @@ static void WPADiConnCallback(WUDDevInfo* devInfo, u8 open) {
|
||||
|
||||
if (p->cmdBlkCB != NULL) {
|
||||
p->cmdBlkCB(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
} else if (_wmb[chan].unk_0x10 != NULL) {
|
||||
_wmb[chan].unk_0x10(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
} else if (_wmb[chan].callback != NULL) {
|
||||
_wmb[chan].callback(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
}
|
||||
|
||||
do {
|
||||
@@ -1886,7 +1886,7 @@ s32 WPADSetDataFormat(s32 chan, u32 format) {
|
||||
}
|
||||
|
||||
if (currFormat != format) {
|
||||
if (!WPADiSendSetReportType(&p->stdCmdQueue, format, p->unk_0x98E, NULL)) {
|
||||
if (!WPADiSendSetReportType(&p->stdCmdQueue, format, p->continuous, NULL)) {
|
||||
status = WPAD_ERR_COMMUNICATION_ERROR;
|
||||
} else {
|
||||
enabled = OSDisableInterrupts();
|
||||
@@ -2741,13 +2741,13 @@ BOOL WPADiSendSetPort(WPADCommandQueue* pQueue, u8 port, WPADCallback pCallback)
|
||||
return success;
|
||||
}
|
||||
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL unk, WPADCallback pCallback) {
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL continuous, WPADCallback pCallback) {
|
||||
BOOL success;
|
||||
WPADCommand command;
|
||||
|
||||
command.reportID = RPTID_SET_DATA_REPORT_MODE;
|
||||
command.dataLength = RPT12_SIZE;
|
||||
command.dataBuf[RPT12_CONT_REPORT] = unk ? 0 : 4; // Always continuous reporting
|
||||
command.dataBuf[RPT12_CONT_REPORT] = continuous ? 0 : 4; // Always continuous reporting
|
||||
command.cmdCB = pCallback;
|
||||
|
||||
switch (format) {
|
||||
|
||||
@@ -111,8 +111,8 @@ static void initExtension(s32 chan) {
|
||||
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat,
|
||||
p_wpd->unk_0x98E, abortInitExtension);
|
||||
p_wpd->unk_0x98D = 1;
|
||||
p_wpd->continuous, abortInitExtension);
|
||||
p_wpd->encStatus = 1;
|
||||
WPADiSendWriteDataCmd(&p_wpd->extCmdQueue, 0x55, 0x04a400f0,
|
||||
abortInitExtension);
|
||||
WPADiSendWriteDataCmd(&p_wpd->extCmdQueue, 0, 0x04a400fb,
|
||||
@@ -127,7 +127,7 @@ static void abortInitExtension(s32 chan, s32 result) {
|
||||
|
||||
if (result != WPAD_ERR_NONE) {
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
p_wpd->unk_0x98D = 0;
|
||||
p_wpd->encStatus = 0;
|
||||
if (result == WPAD_ERR_NO_CONTROLLER) {
|
||||
type = WPAD_DEV_NOT_FOUND;
|
||||
}
|
||||
@@ -142,7 +142,7 @@ static void abortInitExtension(s32 chan, s32 result) {
|
||||
|
||||
else {
|
||||
DEBUGPrint("detaching extension during initialization.\n");
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->unk_0x98E, NULL);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->continuous, NULL);
|
||||
return;
|
||||
}
|
||||
p_wpd->devType = (u8)type;
|
||||
@@ -509,7 +509,7 @@ static void getExtType(s32 chan, s32 result) {
|
||||
}
|
||||
} else {
|
||||
if (isExtEncMain(_devType[chan])) {
|
||||
p_wpd->unk_0x98D = 2;
|
||||
p_wpd->encStatus = 2;
|
||||
WPADiSendWriteDataCmd(cmdq, 0xAA, 0x4A400F0, abortInitExtension);
|
||||
WPADiCreateKey(chan);
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey, 6, 0x4A40040, abortInitExtension);
|
||||
@@ -517,7 +517,7 @@ static void getExtType(s32 chan, s32 result) {
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey + 12, 4, 0x4A4004C, abortInitExtension);
|
||||
WPADiSendReadData(cmdq, p_wpd->wmReadDataBuf, 32, 0x4A40020, p_wpd->extensionCB);
|
||||
} else {
|
||||
p_wpd->unk_0x98D = 3;
|
||||
p_wpd->encStatus = 3;
|
||||
WPADiSendWriteDataCmd(cmdq, 0xAA, 0x4A400F0, abortInitExtension);
|
||||
WPADiCreateKeyFor3rd(chan);
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey, 6, 0x4A40040, abortInitExtension);
|
||||
@@ -651,7 +651,7 @@ void __a1_20_status_report(u8 chan, u8* data) {
|
||||
p_wpd->devMode = 0;
|
||||
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->unk_0x98E, NULL);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->continuous, NULL);
|
||||
|
||||
if (attach) {
|
||||
if (p_wpd->extensionCB) {
|
||||
@@ -741,11 +741,11 @@ void __a1_21_user_data(u8 chan, u8* data) {
|
||||
DEBUGPrint("length : %d\n", p_wpd->wmReadLength);
|
||||
status = (p_wpd->wmReadHadError < 0) ? WPAD_ERR_TRANSFER : 0;
|
||||
DEBUGPrint("i2c = %04x\n", i2c);
|
||||
DEBUGPrint("enc = %d\n", p_wpd->unk_0x98D);
|
||||
DEBUGPrint("enc = %d\n", p_wpd->encStatus);
|
||||
|
||||
if (i2c == 0x04a4) {
|
||||
DEBUGPrint("Access to extension register.\n");
|
||||
if (p_wpd->unk_0x98D == 2 || p_wpd->unk_0x98D == 3) {
|
||||
if (p_wpd->encStatus == 2 || p_wpd->encStatus == 3) {
|
||||
DEBUGPrint("Decode!!!!\n");
|
||||
DEBUGPrint(" len = %d, addr = %04x\n", len, base);
|
||||
|
||||
|
||||
@@ -13,8 +13,8 @@ typedef struct _CDBCryptBuf {
|
||||
u32 buffer32[0xFB00];
|
||||
}; // 0x00
|
||||
|
||||
u32 unk_0x3EC00;
|
||||
u32 unk_0x3EC04;
|
||||
u32 size; // 0x3EC00
|
||||
u32 offset; // 0x3EC04
|
||||
BOOL allocated; // 0x3EC08
|
||||
u8 unk_0x3EC0C[0x34];
|
||||
} CDBCryptBuf;
|
||||
|
||||
@@ -19,7 +19,7 @@ typedef struct _CDBRecordFile {
|
||||
#else
|
||||
u8 unk_0x00[0x1C - 0x00];
|
||||
#endif
|
||||
int unk_0x1C;
|
||||
int allocFlag; // 0x1C
|
||||
CDBAttr attr; // 0x20
|
||||
CDBBridgeFile bridgeFile; // 0x42C
|
||||
u8 unk_0x434[0x438 - 0x434];
|
||||
|
||||
@@ -24,7 +24,7 @@ typedef struct NWC24MsgObjPrivate {
|
||||
#ifdef NWC24_MSG_READ
|
||||
u32 headerSize;
|
||||
#elif defined(NWC24_MBOX_CTRL) || defined(NWC24_MSG_COMMIT)
|
||||
u32 unk_0x10;
|
||||
u32 headerSize; // 0x10
|
||||
#else
|
||||
u8 unk_0x10[0x4];
|
||||
#endif
|
||||
@@ -46,8 +46,8 @@ typedef struct NWC24MsgObjPrivate {
|
||||
#endif
|
||||
u32 date; // 0x28
|
||||
u32 receivedDate; // 0x2C
|
||||
NWC24Data unk_0x30;
|
||||
NWC24Data unk_0x38;
|
||||
NWC24Data fromData; // 0x30
|
||||
NWC24Data toData; // 0x38
|
||||
NWC24Data subject; // 0x40
|
||||
NWC24Data text; // 0x48
|
||||
NWC24Data unk_0x50;
|
||||
|
||||
@@ -62,7 +62,7 @@ typedef struct _CDBRecordKey {
|
||||
} CDBRecordKey;
|
||||
|
||||
typedef struct _CDBRecord {
|
||||
u32 unk_0x00;
|
||||
u32 database; // 0x00
|
||||
void* cryptBuf; // 0x04
|
||||
CDBRecordKey key; // 0x08
|
||||
void* file; // 0x38
|
||||
|
||||
@@ -57,8 +57,8 @@ void CDBRecordInstanceInit(CDBRecordFile* recordFile, CDBRecord* record, int typ
|
||||
OSLockMutex((OSMutex*)recordFile);
|
||||
recordFile->used = 1;
|
||||
OSUnlockMutex((OSMutex*)recordFile);
|
||||
recordFile->unk_0x1C = type;
|
||||
recordFile->database = record->unk_0x00;
|
||||
recordFile->allocFlag = type;
|
||||
recordFile->database = record->database;
|
||||
CDBAttrInit(&recordFile->attr);
|
||||
CDBRecordKeyCopy(&recordFile->key, &record->key);
|
||||
}
|
||||
@@ -73,7 +73,7 @@ BOOL CDBRecordInstanceIsUsed(CDBRecordFile* recordFile) {
|
||||
|
||||
void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key) {
|
||||
CDBLock();
|
||||
record->unk_0x00 = (u32)database;
|
||||
record->database = (u32)database;
|
||||
CDBRecordKeyCopy(&record->key, key);
|
||||
record->cryptBuf = NULL;
|
||||
record->file = NULL;
|
||||
@@ -95,7 +95,7 @@ CDBErr CDBRecordCreateAtOnce(CDBRecord* record, CDBDatabase* database, const cha
|
||||
|
||||
CDBRecordKeyInit(&key, epoch, gameCode, makerCode, 0, fileType, CDB_FS_LOCATION_NAND);
|
||||
CDBLock();
|
||||
record->unk_0x00 = (u32)database;
|
||||
record->database = (u32)database;
|
||||
CDBRecordKeyCopy(&record->key, &key);
|
||||
record->cryptBuf = NULL;
|
||||
record->file = NULL;
|
||||
@@ -128,7 +128,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
|
||||
CDBDatabase* database;
|
||||
CDBRecordDatabaseState* instance;
|
||||
|
||||
database = (CDBDatabase*)record->unk_0x00;
|
||||
database = (CDBDatabase*)record->database;
|
||||
instance = database->instance;
|
||||
record->cryptBuf = NULL;
|
||||
if (instance == NULL) {
|
||||
@@ -164,7 +164,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
|
||||
goto open_result_ready;
|
||||
open_location_ok:
|
||||
if (CDBFSSDIsMounted()) {
|
||||
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
|
||||
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
|
||||
} else {
|
||||
err = CDB_ERROR_SD_IS_NOT_MOUNTED;
|
||||
}
|
||||
@@ -174,7 +174,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
|
||||
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
|
||||
return err;
|
||||
}
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
@@ -223,7 +223,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
|
||||
goto result_ready;
|
||||
location_ok:
|
||||
if (CDBFSSDIsMounted()) {
|
||||
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
|
||||
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
|
||||
} else {
|
||||
result = CDB_ERROR_SD_IS_NOT_MOUNTED;
|
||||
}
|
||||
@@ -233,7 +233,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
|
||||
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
|
||||
return result;
|
||||
}
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
@@ -292,7 +292,7 @@ CDBErr CDBRecordWrite_(CDBRecord* record, void* buffer, u32 size) {
|
||||
CDBErr result;
|
||||
CDBRecordDatabaseState* instance;
|
||||
|
||||
database = (CDBDatabase*)record->unk_0x00;
|
||||
database = (CDBDatabase*)record->database;
|
||||
instance = database->instance;
|
||||
recordFile = record->file;
|
||||
if (record->key.location == CDB_FS_LOCATION_SD) {
|
||||
@@ -310,7 +310,7 @@ CDBErr CDBRecordWrite_(CDBRecord* record, void* buffer, u32 size) {
|
||||
CDBReportError("can't write data in the record; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->unk_0x1C & 2) == 0) {
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
CDBReportError("can't write data in the record; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
@@ -508,7 +508,7 @@ CDBErr CDBRecordUpdateModifiedDate(CDBRecord* record) {
|
||||
ticks = OSGetTime();
|
||||
modifiedDate = ticks / (OS_BUS_CLOCK / 4);
|
||||
recordFile = record->file;
|
||||
if ((((CDBRecordDatabaseState*)((CDBDatabase*)record->unk_0x00)->instance)->openFlags & 2) == 0) {
|
||||
if ((((CDBRecordDatabaseState*)((CDBDatabase*)record->database)->instance)->openFlags & 2) == 0) {
|
||||
CDBReportError("can't set modified time of the record; the database is opened as READONLY\n");
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
@@ -570,7 +570,7 @@ CDBErr CDBRecordBackupToSD_(CDBRecord* record) {
|
||||
CDBRecordKeyCopy(&localRecord.key, &record->key);
|
||||
localRecord.file = NULL;
|
||||
localRecord.key.location = CDB_FS_LOCATION_SD;
|
||||
localRecord.unk_0x00 = record->unk_0x00;
|
||||
localRecord.database = record->database;
|
||||
err = CDBRecordFileCreateBlank(&localRecord);
|
||||
if (err != CDB_ERROR_OK) {
|
||||
CDBLock();
|
||||
@@ -614,7 +614,7 @@ CDBErr CDBRecordBackupToSD_(CDBRecord* record) {
|
||||
CDBLock();
|
||||
recordFile = localRecord.file;
|
||||
CDBRecordKeyCopy(&record->key, &localRecord.key);
|
||||
record->unk_0x00 = localRecord.unk_0x00;
|
||||
record->database = localRecord.database;
|
||||
record->file = localRecord.file;
|
||||
record->cryptBuf = localRecord.cryptBuf;
|
||||
CDBRecordKeyCopy(&recordFile->key, &localRecord.key);
|
||||
@@ -687,7 +687,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
if ((s32)recordFile == 0) {
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if (recordFile->unk_0x1C == 1) {
|
||||
if (recordFile->allocFlag == 1) {
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
if ((s32)buffer == 0) {
|
||||
@@ -699,7 +699,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
tempFile = record->file;
|
||||
if ((s32)tempFile == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (tempFile->unk_0x1C == 1) {
|
||||
} else if (tempFile->allocFlag == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrSetWiiId(&tempFile->attr, CDBGetWiiId());
|
||||
@@ -713,7 +713,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
CDBErr result;
|
||||
if ((s32)record->file == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (((CDBRecordFile*)record->file)->unk_0x1C == 1) {
|
||||
} else if (((CDBRecordFile*)record->file)->allocFlag == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrInitIV(&((CDBRecordFile*)record->file)->attr);
|
||||
@@ -727,7 +727,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
CDBErr result;
|
||||
if ((s32)record->file == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (((CDBRecordFile*)record->file)->unk_0x1C == 1) {
|
||||
} else if (((CDBRecordFile*)record->file)->allocFlag == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrSetKeyStr(&((CDBRecordFile*)record->file)->attr, key);
|
||||
|
||||
@@ -264,8 +264,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
|
||||
CDBCryptBuf* cryptBuf = record->cryptBuf;
|
||||
|
||||
if (cryptBuf != NULL) {
|
||||
u32 unk = cryptBuf->unk_0x3EC00 - cryptBuf->unk_0x3EC04;
|
||||
if (cryptBuf->unk_0x3EC00 < unk) {
|
||||
u32 unk = cryptBuf->size - cryptBuf->offset;
|
||||
if (cryptBuf->size < unk) {
|
||||
unk = 0;
|
||||
}
|
||||
|
||||
@@ -274,8 +274,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
|
||||
}
|
||||
|
||||
if (unk != 0) {
|
||||
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->unk_0x3EC04], unk);
|
||||
cryptBuf->unk_0x3EC04 += unk;
|
||||
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->offset], unk);
|
||||
cryptBuf->offset += unk;
|
||||
}
|
||||
|
||||
if (readSize != NULL) {
|
||||
@@ -300,16 +300,16 @@ CDBErr CDBRecordFileSeekData(CDBRecord* record, u32 offset, CDBSeek seek) {
|
||||
if (cryptBuf != NULL) {
|
||||
switch (seek) {
|
||||
case CDB_SEEK_BEGIN: {
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
cryptBuf->unk_0x3EC04 += offset;
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
cryptBuf->offset += offset;
|
||||
break;
|
||||
}
|
||||
case CDB_SEEK_END: {
|
||||
cryptBuf->unk_0x3EC04 = (cryptBuf->unk_0x3EC00 - 1) - offset;
|
||||
cryptBuf->offset = (cryptBuf->size - 1) - offset;
|
||||
break;
|
||||
}
|
||||
case CDB_SEEK_CUR: {
|
||||
cryptBuf->unk_0x3EC04 += offset;
|
||||
cryptBuf->offset += offset;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -329,7 +329,7 @@ int CDBRecordFileTellData(CDBRecord* record) {
|
||||
CDBCryptBuf* cryptBuf = record->cryptBuf;
|
||||
|
||||
if (cryptBuf != NULL) {
|
||||
return cryptBuf->unk_0x3EC04 - sizeof(CDBAttrBuf);
|
||||
return cryptBuf->offset - sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDBFTellData(&recordFile->bridgeFile, record->key.location);
|
||||
}
|
||||
|
||||
@@ -265,7 +265,7 @@ CDBErr CDBRecordFree(CDBRecord* record) {
|
||||
OSLockMutex((OSMutex*)recordFile);
|
||||
*(u32*)&recordFile->unk_0x00[0x18] = 0;
|
||||
OSUnlockMutex((OSMutex*)recordFile);
|
||||
recordFile->unk_0x1C = 0;
|
||||
recordFile->allocFlag = 0;
|
||||
record->file = NULL;
|
||||
OSUnlockMutex(&s_mutex);
|
||||
}
|
||||
|
||||
@@ -23,8 +23,7 @@ static int ReadHeaderChar(const NHTTPResponseInfo* response, NHTTPi_HDRBUFLIST**
|
||||
}
|
||||
|
||||
static int LowerCase(int character) {
|
||||
if((character>='A') & (character<='Z')) character+=32;
|
||||
return character;
|
||||
return ((character >= 'A') & (character <= 'Z')) ? character + 32 : character;
|
||||
}
|
||||
|
||||
s32 NHTTPi_findNextLineHdrRecvBuf(const NHTTPResponseInfo* response, s32 position, s32 limit, s32* colon, s32* newlineLength) {
|
||||
@@ -76,15 +75,17 @@ s32 NHTTPi_skipSpaceHdrRecvBuf(const NHTTPResponseInfo* response, s32 position,
|
||||
s32 NHTTPi_compareTokenN_HdrRecvBuf(const NHTTPResponseInfo* response, s32 position, s32 limit, const char* token, s8 delimiter) {
|
||||
NHTTPi_HDRBUFLIST* block;
|
||||
s32 offset;
|
||||
s8 character;
|
||||
if(position>=limit) return -1;
|
||||
FindHeaderBlock(response,position,&block,&offset);
|
||||
character=ReadHeaderChar(response,&block,&offset);
|
||||
while(LowerCase(character)==LowerCase(*token)) {
|
||||
if(*token==0 || *token==' ' || *token==delimiter || position==limit-1) return 0;
|
||||
character=ReadHeaderChar(response,&block,&offset);
|
||||
++position;
|
||||
++token;
|
||||
int character;
|
||||
|
||||
if (position < limit) {
|
||||
FindHeaderBlock(response, position, &block, &offset);
|
||||
character = ReadHeaderChar(response, &block, &offset);
|
||||
while (LowerCase((s8)character) == LowerCase(*token)) {
|
||||
if (*token == 0 || *token == ' ' || *token == delimiter || position == limit - 1) return 0;
|
||||
character = ReadHeaderChar(response, &block, &offset);
|
||||
++position;
|
||||
++token;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -120,10 +120,11 @@ NWC24Err NWC24iMinutesToOSCalendarTime(OSCalendarTime* calendar, s32 minutes) {
|
||||
NWC24Err NWC24iDateToOSCalendarTime(OSCalendarTime* calendar, const NWC24Date* date) {
|
||||
BOOL isLeapYear;
|
||||
s32 days;
|
||||
const u16 year = date->year;
|
||||
|
||||
isLeapYear = 0;
|
||||
|
||||
calendar->year = date->year;
|
||||
calendar->year = year;
|
||||
calendar->mon = date->month - 1;
|
||||
calendar->mday = date->day;
|
||||
calendar->hour = date->hour;
|
||||
@@ -132,7 +133,7 @@ NWC24Err NWC24iDateToOSCalendarTime(OSCalendarTime* calendar, const NWC24Date* d
|
||||
calendar->msec = 0;
|
||||
calendar->usec = 0;
|
||||
calendar->yday = date->day + DAYS_OF_YEAR[date->month - 1] - 1;
|
||||
if (((date->year % 4 == 0 && date->year % 100 != 0) || date->year % 400 == 0)) {
|
||||
if (((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)) {
|
||||
isLeapYear = 1;
|
||||
}
|
||||
if (isLeapYear && date->month > 2) {
|
||||
@@ -227,8 +228,9 @@ void ConvertDaysToDate(u16* year, u8* month, u8* day, s32 days) {
|
||||
for (;;) {
|
||||
s32 previousDays;
|
||||
u8 currentMonth;
|
||||
const u8* parsedMonth = month;
|
||||
previousDays = days;
|
||||
currentMonth = *month;
|
||||
currentMonth = *parsedMonth;
|
||||
if (currentMonth == 2 && IsLeapYear(*year)) {
|
||||
days -= 29;
|
||||
} else {
|
||||
|
||||
@@ -64,7 +64,7 @@ static NWC24Err ClearMBCEntry(MBCHeader* header, NWC24File* file, u32 offset);
|
||||
static NWC24Err MountVFMBox(NWC24MBoxType type);
|
||||
static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entry);
|
||||
static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* msg) NO_INLINE;
|
||||
BOOL NWC24iIsMsgObjReadable(const MBCEntry* entry) NO_INLINE;
|
||||
BOOL NWC24iIsMsgObjReadable(MBCEntry* entry) NO_INLINE;
|
||||
NWC24Err NWC24CreateVF(const char* path, u32 size);
|
||||
|
||||
static inline NWC24Err MakeCtrlPath(char* path, NWC24MBoxType type) {
|
||||
@@ -221,7 +221,7 @@ NWC24Err NWC24GetMsgObj(NWC24MsgObj* msg, NWC24MBoxType type, u32 id) {
|
||||
return result;
|
||||
}
|
||||
|
||||
BOOL NWC24iIsMsgObjReadable(const MBCEntry* entry) {
|
||||
BOOL NWC24iIsMsgObjReadable(MBCEntry* entry) {
|
||||
if (!(entry->type & 0x200000))
|
||||
return FALSE;
|
||||
if (entry->type & 0xFE000000)
|
||||
@@ -783,7 +783,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
|
||||
continue;
|
||||
}
|
||||
if (msg->unk_0x1C != 0 && entry->crc == msg->unk_0x1C && entry->type == msg->type && entry->length == msg->length &&
|
||||
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->date) {
|
||||
entry->flags == msg->headerSize && (s32)entry->date == (s32)msg->date) {
|
||||
duplicateId = entry->msgId;
|
||||
duplicateOffset = offset;
|
||||
continue;
|
||||
@@ -947,8 +947,8 @@ static NWC24Err MountVFMBox(NWC24MBoxType type) {
|
||||
}
|
||||
|
||||
static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entry) {
|
||||
u32 field1 = ((u32)msg->unk_0x30.ptr & 0xFFFFF) | (msg->unk_0x30.size << 20);
|
||||
u32 field2 = ((u32)msg->unk_0x38.ptr & 0xFFFFF) | (msg->unk_0x38.size << 20);
|
||||
u32 field1 = ((u32)msg->fromData.ptr & 0xFFFFF) | (msg->fromData.size << 20);
|
||||
u32 field2 = ((u32)msg->toData.ptr & 0xFFFFF) | (msg->toData.size << 20);
|
||||
u32 field3 = ((u32)msg->subject.ptr & 0xFFFFF) | (msg->subject.size << 20);
|
||||
u32 field4 = ((u32)msg->unk_0x50.ptr & 0xFFFFF) | (msg->unk_0x50.size << 20);
|
||||
u32 field5 = ((u32)msg->unk_0x58.ptr & 0xFFFFF) | (msg->unk_0x58.size << 20);
|
||||
@@ -956,7 +956,7 @@ static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entr
|
||||
entry->type = msg->type;
|
||||
entry->length = msg->length;
|
||||
entry->appId = msg->appId;
|
||||
entry->flags = msg->unk_0x10;
|
||||
entry->flags = msg->headerSize;
|
||||
entry->tag = msg->tag;
|
||||
entry->ledPattern = msg->ledPattern;
|
||||
entry->crc = msg->unk_0x1C;
|
||||
@@ -1003,7 +1003,7 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
|
||||
msg->type = entry->type;
|
||||
msg->length = entry->length;
|
||||
msg->appId = entry->appId;
|
||||
msg->unk_0x10 = entry->flags;
|
||||
msg->headerSize = entry->flags;
|
||||
msg->tag = entry->tag;
|
||||
msg->ledPattern = entry->ledPattern;
|
||||
msg->unk_0x1C = entry->crc;
|
||||
@@ -1019,10 +1019,10 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
|
||||
msg->textSize = entry->textSize;
|
||||
msg->dwcId = entry->dwcId;
|
||||
msg->iconNew = entry->iconNew;
|
||||
msg->unk_0x30.ptr = (void*)offset1;
|
||||
msg->unk_0x30.size = size1;
|
||||
msg->unk_0x38.ptr = (void*)offset2;
|
||||
msg->unk_0x38.size = size2;
|
||||
msg->fromData.ptr = (void*)offset1;
|
||||
msg->fromData.size = size1;
|
||||
msg->toData.ptr = (void*)offset2;
|
||||
msg->toData.size = size2;
|
||||
msg->subject.ptr = (void*)offset3;
|
||||
msg->subject.size = size3;
|
||||
msg->unk_0x50.ptr = (void*)offset4;
|
||||
|
||||
@@ -202,33 +202,40 @@ static inline NWC24Err WriteMBNoReplyField(NWC24MsgObjPrivate* msg) {
|
||||
return err;
|
||||
}
|
||||
|
||||
static inline NWC24Err WriteMBRegDateField(NWC24MsgObjPrivate* msg, u32 flags) {
|
||||
typedef struct {
|
||||
u32 flags;
|
||||
char* buffer;
|
||||
} MBFieldWork;
|
||||
|
||||
static inline NWC24Err WriteMBRegDateField(NWC24MsgObjPrivate* msg) {
|
||||
MBFieldWork field;
|
||||
NWC24Err err;
|
||||
s32 length;
|
||||
char* buffer;
|
||||
if (!flags)
|
||||
field.flags = msg->msgBoardFlags.raw & 0xFFFF;
|
||||
if (!field.flags)
|
||||
return NWC24_OK;
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_sprintf(buffer, "X-Wii-MB-RegDate: %04X\r\n", flags);
|
||||
length = STD_strnlen(buffer, 1024);
|
||||
err = NWC24FWrite(buffer, length, m_pFile);
|
||||
field.buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(field.buffer, 0, 1024);
|
||||
Mail_sprintf(field.buffer, "X-Wii-MB-RegDate: %04X\r\n", field.flags);
|
||||
length = STD_strnlen(field.buffer, 1024);
|
||||
err = NWC24FWrite(field.buffer, length, m_pFile);
|
||||
if (err == NWC24_OK)
|
||||
msg->length += length;
|
||||
return err;
|
||||
}
|
||||
|
||||
static inline NWC24Err WriteMBDelayField(NWC24MsgObjPrivate* msg, u32 flags) {
|
||||
static inline NWC24Err WriteMBDelayField(NWC24MsgObjPrivate* msg) {
|
||||
MBFieldWork field;
|
||||
NWC24Err err;
|
||||
s32 length;
|
||||
char* buffer;
|
||||
if (!flags)
|
||||
field.flags = msg->msgBoardFlags.raw & 0xFF0000;
|
||||
if (!field.flags)
|
||||
return NWC24_OK;
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_sprintf(buffer, "X-Wii-MB-Delay: %02X\r\n", flags >> 16);
|
||||
length = STD_strnlen(buffer, 1024);
|
||||
err = NWC24FWrite(buffer, length, m_pFile);
|
||||
field.buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(field.buffer, 0, 1024);
|
||||
Mail_sprintf(field.buffer, "X-Wii-MB-Delay: %02X\r\n", field.flags >> 16);
|
||||
length = STD_strnlen(field.buffer, 1024);
|
||||
err = NWC24FWrite(field.buffer, length, m_pFile);
|
||||
if (err == NWC24_OK)
|
||||
msg->length += length;
|
||||
return err;
|
||||
@@ -306,8 +313,8 @@ 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(WriteMBDelayField(msg, msg->msgBoardFlags.raw & 0xFF0000));
|
||||
CHECK_WRITE(WriteMBRegDateField(msg));
|
||||
CHECK_WRITE(WriteMBDelayField(msg));
|
||||
}
|
||||
}
|
||||
CHECK_WRITE(WriteExtraFields(msg));
|
||||
@@ -323,7 +330,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteString(msg, buffer));
|
||||
if (msg->type & 0x10000) {
|
||||
msg->unk_0x10 = msg->length;
|
||||
msg->headerSize = msg->length;
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_sprintf(buffer, "\r\n--%s", MultiPartDivider);
|
||||
@@ -332,7 +339,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteContentTypeField(msg));
|
||||
if (!(msg->type & 0x10000))
|
||||
msg->unk_0x10 = msg->length;
|
||||
msg->headerSize = msg->length;
|
||||
text.ptr = (const void*)msg->length;
|
||||
{ NWC24Err textResult = WritePlainText(msg);
|
||||
err = textResult == NWC24_ERR_NULL ? NWC24_OK : textResult; }
|
||||
@@ -423,14 +430,17 @@ static NWC24Err CheckMsgObject(const NWC24MsgObjPrivate* msg) {
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline u32 Base64StorageSize(const u32* byteCount) {
|
||||
return (*byteCount * 4 + 2) / 3 + *byteCount / 57 * 2 + 4;
|
||||
}
|
||||
|
||||
static NWC24Err CheckMsgBoxSpace(const NWC24MsgObjPrivate* msg, NWC24MBoxType type) {
|
||||
u32 total = 0;
|
||||
u32 textSize = 0;
|
||||
s32 index;
|
||||
NWC24Err err;
|
||||
for (index = 0; index < msg->numAttached; ++index) {
|
||||
u32 size = msg->attachedSize[index];
|
||||
total += (size * 4 + 2) / 3 + size / 57 * 2 + 4;
|
||||
total += Base64StorageSize(&msg->attachedSize[index]);
|
||||
}
|
||||
switch (msg->encoding) {
|
||||
case NWC24_ENC_7BIT:
|
||||
@@ -567,7 +577,7 @@ static NWC24Err WriteFromField(NWC24MsgObjPrivate* msg) {
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_strncat(buffer, "From: ", 1022);
|
||||
address = buffer + 6;
|
||||
msg->unk_0x30.ptr = (const void*)(msg->length + 6);
|
||||
msg->fromData.ptr = (const void*)(msg->length + 6);
|
||||
type = 1;
|
||||
if (msg->type & 0x100000)
|
||||
type = 2;
|
||||
@@ -586,7 +596,7 @@ static NWC24Err WriteFromField(NWC24MsgObjPrivate* msg) {
|
||||
err = NWC24FWrite(NWC24WorkP->stringWork, total, m_pFile);
|
||||
if (err == NWC24_OK) {
|
||||
msg->length += total;
|
||||
msg->unk_0x30.size = msg->length - (u32)msg->unk_0x30.ptr - 2;
|
||||
msg->fromData.size = msg->length - (u32)msg->fromData.ptr - 2;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
@@ -602,7 +612,7 @@ static NWC24Err WriteToField(NWC24MsgObjPrivate* msg) {
|
||||
cursor += 4;
|
||||
index = 0;
|
||||
total = 4;
|
||||
msg->unk_0x38.ptr = (const void*)(msg->length + 4);
|
||||
msg->toData.ptr = (const void*)(msg->length + 4);
|
||||
remaining = 1018;
|
||||
for (; index < msg->numTo; ++index) {
|
||||
err = SynthesizeAddrStr(&msg->toAddrs[index], msg->type, cursor, remaining, &length);
|
||||
@@ -631,7 +641,7 @@ static NWC24Err WriteToField(NWC24MsgObjPrivate* msg) {
|
||||
err = NWC24FWrite(NWC24WorkP->stringWork, total + 2, m_pFile);
|
||||
if (err == NWC24_OK) {
|
||||
msg->length += total + 2;
|
||||
msg->unk_0x38.size = msg->length - (u32)msg->unk_0x38.ptr - 2;
|
||||
msg->toData.size = msg->length - (u32)msg->toData.ptr - 2;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
@@ -759,19 +769,14 @@ static NWC24Err WriteMIMEAttachHeader(NWC24MsgObjPrivate* msg, u32 index) {
|
||||
char* buffer;
|
||||
const char* mime;
|
||||
const char* suffix;
|
||||
s32 typeLength, encodingLength, dispositionLength, mimeLength;
|
||||
int mimeLength;
|
||||
s32 first, second, third, total;
|
||||
NWC24Err err;
|
||||
Mail_memset(NWC24WorkP->stringWork, 0, 1024);
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
mime = NWC24GetMIMETypeStr(msg->attachedType[index]);
|
||||
suffix = NWC24iGetMIMETypeSuffix(msg->attachedType[index]);
|
||||
encodingLength = Mail_strlen(ContentTxEncA);
|
||||
typeLength = Mail_strlen(ContentTypeA);
|
||||
dispositionLength = Mail_strlen(ContentDispA);
|
||||
typeLength += encodingLength;
|
||||
mimeLength = Mail_strlen(mime);
|
||||
mimeLength = (dispositionLength + typeLength) + mimeLength + 4;
|
||||
mimeLength = (Mail_strlen(ContentTypeA) + Mail_strlen(ContentTxEncA)) + Mail_strlen(ContentDispA) + Mail_strlen(mime) + 4;
|
||||
if (mimeLength >= 1024)
|
||||
return NWC24_ERR_NOMEM;
|
||||
first = Mail_sprintf(buffer, (char*)ContentTypeA, mime, (char)('a' + index), msg->msgId, suffix);
|
||||
|
||||
@@ -73,8 +73,8 @@ NWC24Err NWC24InitMsgObj(NWC24MsgObj* msg, NWC24MsgType type) {
|
||||
msgObj->attachedType[i] = NWC24_TEXT_PLAIN;
|
||||
}
|
||||
|
||||
NWC24Data_Init(&msgObj->unk_0x30);
|
||||
NWC24Data_Init(&msgObj->unk_0x38);
|
||||
NWC24Data_Init(&msgObj->fromData);
|
||||
NWC24Data_Init(&msgObj->toData);
|
||||
NWC24Data_Init(&msgObj->unk_0x50);
|
||||
NWC24Data_Init(&msgObj->unk_0x58);
|
||||
NWC24Data_Init(&msgObj->unk_0xD0);
|
||||
|
||||
@@ -289,7 +289,7 @@ NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacit
|
||||
default:
|
||||
return result;
|
||||
}
|
||||
if (privateMsg->unk_0x30.size == 0)
|
||||
if (privateMsg->fromData.size == 0)
|
||||
return NWC24_ERR_NULL;
|
||||
result = NWC24iMBoxOpenStoredMsg(type, privateMsg->msgId, &file);
|
||||
switch (result) {
|
||||
@@ -300,9 +300,9 @@ NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacit
|
||||
}
|
||||
result = NWC24FStreamInit(&stream, &file, 0, privateMsg->length, buffer, 1024);
|
||||
if (result == NWC24_OK) {
|
||||
result = NWC24FStreamSeek(&stream, (u32)privateMsg->unk_0x30.ptr);
|
||||
result = NWC24FStreamSeek(&stream, (u32)privateMsg->fromData.ptr);
|
||||
if (result == NWC24_OK)
|
||||
result = NWC24iExtractAddrSpec(&stream, privateMsg->unk_0x30.size, 0, address, capacity);
|
||||
result = NWC24iExtractAddrSpec(&stream, privateMsg->fromData.size, 0, address, capacity);
|
||||
}
|
||||
closeResult = NWC24iMBoxCloseMsg(&file);
|
||||
if (result != NWC24_OK)
|
||||
|
||||
@@ -817,6 +817,7 @@ done:
|
||||
|
||||
NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 subjectSize, NWC24EncodingRegion region, u16 alternative, u8* work,
|
||||
u32 workSize, NWC24Charset charset, char* charsetName) {
|
||||
const u8* encodedInput = work;
|
||||
u8* second;
|
||||
u32 secondSize;
|
||||
u32 workHalf;
|
||||
@@ -844,7 +845,7 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
|
||||
default: goto done;
|
||||
}
|
||||
}
|
||||
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
|
||||
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', (u8*)encodedInput, workHalf - 1);
|
||||
switch (result) { case NWC24_OK: break; default: goto done; }
|
||||
{
|
||||
sourceOffset = subjectLength;
|
||||
@@ -872,7 +873,7 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
|
||||
default: goto done;
|
||||
}
|
||||
}
|
||||
result = NWC24EncodeWord(second + total, secondSize - total, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
|
||||
result = NWC24EncodeWord(second + total, secondSize - total, &outputLength, charsetName, 0x40, 'B', (u8*)encodedInput, workHalf - 1);
|
||||
switch (result) { case NWC24_OK: break; default: goto done; }
|
||||
sourceOffset += subjectLength;
|
||||
total = total + outputLength - 1;
|
||||
|
||||
@@ -138,9 +138,9 @@ int SOGetSockName(int socket, void* address) {
|
||||
int size;
|
||||
int result;
|
||||
s32 rm;
|
||||
SOSockAddr* addr;
|
||||
SOSockAddr* reply;
|
||||
NameRequest* request;
|
||||
SOSockAddr* reply;
|
||||
SOSockAddr* addr;
|
||||
addr=address;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
if(!addr || addr->len>8 || addr->len<8) result=-28;
|
||||
|
||||
@@ -101,7 +101,7 @@ int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int*
|
||||
int size;
|
||||
int result;
|
||||
InterfaceOption* request;
|
||||
InterfaceCommand* command;
|
||||
const InterfaceCommand* command;
|
||||
int* returnedLength;
|
||||
u8* reply;
|
||||
if ((result=SOiPrepareTempRm(NULL,&rm,&temporary))==0) {
|
||||
@@ -112,7 +112,7 @@ int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int*
|
||||
if(!request) result=-49;
|
||||
else {
|
||||
command=&request->command;
|
||||
command->level=level; command->option=option;
|
||||
request->command.level=level; request->command.option=option;
|
||||
returnedLength=&((InterfaceLength*)(command + 1))->length;
|
||||
reply=(u8*)((InterfaceLength*)returnedLength + 1);
|
||||
*returnedLength=OptionLength(length);
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#define BS2_MACH_VOLATILE_DVD_STATE
|
||||
#define BS2_MACH_FIVE_ARG_READ
|
||||
#include "BS2/BS2.h"
|
||||
#include "BS2/BS2BringUp.h"
|
||||
@@ -64,7 +65,7 @@ volatile int CacheFailed = 0;
|
||||
volatile int RegionValid = 0;
|
||||
volatile int NandPending = 0;
|
||||
vu32 CancelNand = 0;
|
||||
u32 LowReadResult = 0;
|
||||
vu32 LowReadResult = 0;
|
||||
u32 CacheCommandComplete = 0;
|
||||
u32 AudioBufferUnconfigured = 0;
|
||||
u64 ResetTime = 0;
|
||||
@@ -577,7 +578,7 @@ void BS2StartGame() {
|
||||
u32 (*entry)(void);
|
||||
|
||||
StartingGame = TRUE;
|
||||
while (DVDGetCommandBlockStatus(&CoverBlock) != DVD_STATE_IDLE) {
|
||||
while (CoverBlock.state != DVD_STATE_IDLE) {
|
||||
}
|
||||
|
||||
BS2Report("BS2StartGame(1)\n");
|
||||
@@ -677,8 +678,6 @@ void BS2StartGame() {
|
||||
LowReadResult = 0;
|
||||
DVDLowReadDiskID(&DiskID, (DVDLowCallback)callback);
|
||||
while (LowReadResult == 0) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
|
||||
status = LowReadResult;
|
||||
@@ -693,8 +692,6 @@ void BS2StartGame() {
|
||||
LowReadResult = 0;
|
||||
DVDLowRequestError((DVDLowCallback)callback);
|
||||
while (LowReadResult == 0) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
driveError = DVDLowGetImmBufferReg() & 0xFF000000;
|
||||
if (driveError == 0x01000000 || (driveError = DVDLowGetImmBufferReg() & 0xFF000000) == 0x03000000) {
|
||||
@@ -729,8 +726,6 @@ disk_done:
|
||||
(DVDLowCallback)callback);
|
||||
}
|
||||
while (LowReadResult == 0) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
|
||||
status = LowReadResult;
|
||||
@@ -748,8 +743,6 @@ disk_done:
|
||||
LowReadResult = 0;
|
||||
DVDLowRequestError((DVDLowCallback)callback);
|
||||
while (LowReadResult == 0) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
driveError = DVDLowGetImmBufferReg() & 0xFF000000;
|
||||
if (driveError == 0x01000000 || (driveError = DVDLowGetImmBufferReg() & 0xFF000000) == 0x03000000) {
|
||||
|
||||
@@ -9,14 +9,10 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
typedef struct UpdateThreadData {
|
||||
OSThread thread;
|
||||
u8 stack[4096];
|
||||
} UpdateThreadData;
|
||||
|
||||
static u32 Flags0[BS2_UPDATE_ENTRY_COUNT] = {0};
|
||||
static u32 Flags1[BS2_UPDATE_ENTRY_COUNT] = {0};
|
||||
static UpdateThreadData Thread = {0};
|
||||
static OSThread Thread = {0};
|
||||
static u8 ThreadStack[4096] = {0};
|
||||
static BS2UpdateHeader UpdateHeader0 ALIGN32 = {0};
|
||||
static BS2UpdateHeader UpdateHeader1 ALIGN32 = {0};
|
||||
|
||||
@@ -39,7 +35,7 @@ static u32 UpdateImportResult = 0;
|
||||
u32 StartUpdate = 0;
|
||||
u32 CancelUpdate = 0;
|
||||
static u32 UpdateProgress = 0;
|
||||
static s32 rc = 0;
|
||||
static volatile s32 rc = 0;
|
||||
static u64 VersionIOS = 0;
|
||||
static u32 VersionMEM2 = 0;
|
||||
static u32 VersionES = 0;
|
||||
@@ -76,9 +72,9 @@ void BS2UpdateInit(void* allocator) {
|
||||
memset(EntriesToImport, 0, 0x40000);
|
||||
memset(Flags1, 0, sizeof(Flags1));
|
||||
BS2Report("Create update thread\n");
|
||||
OSCreateThread(&Thread.thread, UpdateThread, NULL, Thread.stack + sizeof(Thread.stack),
|
||||
sizeof(Thread.stack), 31, 1);
|
||||
OSResumeThread(&Thread.thread);
|
||||
OSCreateThread(&Thread, UpdateThread, NULL, ThreadStack + sizeof(ThreadStack),
|
||||
sizeof(ThreadStack), 31, 1);
|
||||
OSResumeThread(&Thread);
|
||||
}
|
||||
|
||||
static void* UpdateThread(void* argument) {
|
||||
|
||||
@@ -64,6 +64,7 @@ public:
|
||||
class AppearMemoState : public State {
|
||||
public:
|
||||
AppearMemoState() : mTime(0.0f) {}
|
||||
virtual ~AppearMemoState();
|
||||
Manager::StateType getStateType();
|
||||
void create();
|
||||
void init();
|
||||
@@ -1229,6 +1230,8 @@ Manager::StateType EditMemoState::getStateType() {
|
||||
|
||||
inline State::~State() {}
|
||||
|
||||
AppearMemoState::~AppearMemoState() {}
|
||||
|
||||
Manager::StateType AppearMemoState::getStateType() {
|
||||
return Manager::ST_Appearing;
|
||||
}
|
||||
@@ -1242,3 +1245,48 @@ Manager::StateType DispMemoState::getStateType() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data) {
|
||||
mfStartPoint = start;
|
||||
mfEndPoint = end;
|
||||
mfAnimationTime = duration;
|
||||
mfCurrentFrame = 0.0f;
|
||||
mbInAnimation = true;
|
||||
mpAnimObserver = observer;
|
||||
mpData = data;
|
||||
mbSE = false;
|
||||
if (observer) observer->onAnmEvent(AnimObserver::AE_0, data);
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::calc() {
|
||||
if (mbInAnimation) {
|
||||
if (mfCurrentFrame < mfAnimationTime) {
|
||||
mfCurrentFrame = 1.0f + mfCurrentFrame;
|
||||
} else {
|
||||
if (mbInAnimation && mpAnimObserver) {
|
||||
mpAnimObserver->onAnmEvent(AnimObserver::AE_1, mpData);
|
||||
}
|
||||
mbInAnimation = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline f32 textinput::util::Animation::getValue() {
|
||||
return hermiteInterporation(mfCurrentFrame, 0.0f, mfStartPoint, 0.0f, mfAnimationTime, mfEndPoint, 0.0f);
|
||||
}
|
||||
|
||||
inline bool textinput::util::Animation::isActive() {
|
||||
return mbInAnimation;
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::setSEFlag(bool flag) {
|
||||
mbSE = flag;
|
||||
}
|
||||
|
||||
inline bool textinput::util::Animation::isSEFlag() {
|
||||
return mbSE;
|
||||
}
|
||||
|
||||
inline void textinput::util::Animation::stop() {
|
||||
mbInAnimation = false;
|
||||
}
|
||||
|
||||
@@ -223,7 +223,7 @@ void LayoutByNW4R::create(MEMAllocator* allocator) {
|
||||
const char* forceName;
|
||||
u32 animationCount;
|
||||
u32 paneIndex = 0;
|
||||
do {
|
||||
for (; paneIndex < 25; ++paneIndex) {
|
||||
AnmPane* pane = NULL;
|
||||
const PaneAnimation& paneInfo = csPaneToAnimationInSign[paneIndex & 0xFFFF];
|
||||
switch (paneInfo.type) {
|
||||
@@ -249,18 +249,18 @@ void LayoutByNW4R::create(MEMAllocator* allocator) {
|
||||
animationCount = paneInfo.animationCount;
|
||||
u16 animationIndex = 0;
|
||||
while (animationIndex < animationCount) {
|
||||
void* resource = mpMultiArcResourceAccessor->GetResource(0, paneInfo.animations[animationIndex]->name);
|
||||
const AnimationFile* const& animation = paneInfo.animations[animationIndex];
|
||||
void* resource = mpMultiArcResourceAccessor->GetResource(0, animation->name);
|
||||
AnimTransformPane* transform = static_cast<AnimTransformPane*>(
|
||||
getLayout()->CreateAnimTransform(resource, mpMultiArcResourceAccessor));
|
||||
if (forceName != NULL) {
|
||||
pane->forceAddAnimation(allocator, paneInfo.animations[animationIndex]->id, transform, forceName, false, true);
|
||||
pane->forceAddAnimation(allocator, animation->id, transform, forceName, false, true);
|
||||
} else {
|
||||
pane->addAnimation(allocator, paneInfo.animations[animationIndex]->id, transform, false, true);
|
||||
pane->addAnimation(allocator, animation->id, transform, false, true);
|
||||
}
|
||||
++animationIndex;
|
||||
}
|
||||
++paneIndex;
|
||||
} while (paneIndex < 25);
|
||||
}
|
||||
init();
|
||||
}
|
||||
|
||||
|
||||
@@ -111,12 +111,13 @@ void WithZi::init() {
|
||||
|
||||
void WithZi::clearCandidates() {
|
||||
if (mbDictionaryOpen != 0) {
|
||||
u16* const candidates = CandidatesBuffer;
|
||||
mInputLength = 0;
|
||||
mCandidateCount = 0;
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(CandidatesBuffer, 0, 0x200);
|
||||
memset(CandidatesBuffer + 0x100, 0, 0x1fe);
|
||||
memset(CandidatesBuffer + 0x200, 0, 0x200);
|
||||
memset(candidates, 0, 0x200);
|
||||
memset(candidates + 0x100, 0, 0x1fe);
|
||||
memset(candidates + 0x200, 0, 0x200);
|
||||
memset(CandidatedWord, 0, 0x1400);
|
||||
memset(&mSearch, 0, sizeof(mSearch) + sizeof(mSearchState));
|
||||
mSearch.language = getPredictLanguage();
|
||||
@@ -125,7 +126,7 @@ void WithZi::clearCandidates() {
|
||||
mSearch.context = 1;
|
||||
mSearch.getOptions = 0x81;
|
||||
mSearch.elements = reinterpret_cast<wchar_t*>(ElementBuffer);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&candidates[0x200]);
|
||||
mSearch.maxCandidates = 0x28;
|
||||
mSearch.elementCount = 0;
|
||||
mSearch.firstCandidate = 0;
|
||||
@@ -510,12 +511,14 @@ scanDone:
|
||||
}
|
||||
|
||||
u32 WithZi::setElementBuffer() {
|
||||
u16* elements;
|
||||
u16* candidates;
|
||||
u16 inputCharacter;
|
||||
u32 count = 0;
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(&CandidatesBuffer[0x100], 0, 0x1fe);
|
||||
u16* elements = ElementBuffer;
|
||||
u16* candidates = CandidatesBuffer;
|
||||
u16 inputCharacter;
|
||||
elements = ElementBuffer;
|
||||
candidates = CandidatesBuffer;
|
||||
while ((inputCharacter = candidates[static_cast<u16>(count)]) != 0 && static_cast<u16>(count) < 0xff) {
|
||||
u16 index = count;
|
||||
elements[index] = inputCharacter;
|
||||
|
||||
@@ -1557,6 +1557,15 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
static inline math::VEC2 scaledPageOffset(const math::VEC2& source, f32 factor) {
|
||||
const f32 vertical = source.y * factor;
|
||||
const f32 horizontal = source.x * factor;
|
||||
math::VEC2 scaled;
|
||||
scaled.y = vertical;
|
||||
scaled.x = horizontal;
|
||||
return scaled;
|
||||
}
|
||||
|
||||
void Address::onPreviousPage() {
|
||||
switch (mState) {
|
||||
case STATE_NORMAL:
|
||||
@@ -1586,10 +1595,7 @@ namespace ipl {
|
||||
mPage = PAGE_MAX - 1;
|
||||
mNextPageNum = 0;
|
||||
mbCover = false;
|
||||
math::VEC2 offset;
|
||||
offset.y = sPageOffset.y * PAGE_MAX;
|
||||
offset.x = sPageOffset.x * PAGE_MAX;
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), scaledPageOffset(sPageOffset, PAGE_MAX));
|
||||
mpLayout->getAnim(4)->setAnmType(0);
|
||||
mpLayout->getAnim(4)->play();
|
||||
set_page_text("T_nmbr_b", mPage + 1);
|
||||
@@ -1607,8 +1613,12 @@ namespace ipl {
|
||||
|
||||
void Address::set_err_msg(wchar_t* errMsg, u32 errMsgLen, NWC24Err err) {
|
||||
memset(errMsg, 0, errMsgLen * sizeof(wchar_t));
|
||||
wcsncat(errMsg, System::getMessage(MESG_ERROR_CODE), errMsgLen - wcslen(errMsg));
|
||||
u32 msgId = MESG_ERROR_CODE;
|
||||
union MessageValue {
|
||||
const wchar_t* text;
|
||||
u32 id;
|
||||
} message;
|
||||
message.text = System::getMessage(MESG_ERROR_CODE);
|
||||
wcsncat(errMsg, message.text, errMsgLen - wcslen(errMsg));
|
||||
|
||||
wchar_t errCode[32];
|
||||
memset(errCode, 0, sizeof(errCode));
|
||||
@@ -1617,17 +1627,22 @@ namespace ipl {
|
||||
|
||||
switch (err) {
|
||||
case NWC24_ERR_NETWORK: {
|
||||
msgId = MESG_ERROR_NWC24_NETWORK;
|
||||
message.id = MESG_ERROR_NWC24_NETWORK;
|
||||
break;
|
||||
}
|
||||
case NWC24_ERR_SERVER:
|
||||
case NWC24_ERR_FULL: {
|
||||
msgId = MESG_ERROR_NWC24_SERVER;
|
||||
message.id = MESG_ERROR_NWC24_SERVER;
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
message.id = reinterpret_cast<u32>(message.text);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
wcsncat(errMsg, System::getMessage(msgId), errMsgLen - wcslen(errMsg));
|
||||
message.text = System::getMessage(message.id);
|
||||
wcsncat(errMsg, message.text, errMsgLen - wcslen(errMsg));
|
||||
}
|
||||
|
||||
void Address::entry_friend() {
|
||||
|
||||
@@ -2125,6 +2125,8 @@ state0:
|
||||
goto state0Common;
|
||||
case 3:
|
||||
goto state0Button3;
|
||||
case 4:
|
||||
goto done;
|
||||
default:
|
||||
goto done;
|
||||
}
|
||||
@@ -2156,11 +2158,14 @@ state0Button3: {
|
||||
nw4r::lyt::Pane* pane = layout->getNW4RLyt()->GetRootPane()->FindPaneByName(paneName, true);
|
||||
ipl::math::VEC3 position(0.0f, 0.0f, 0.0f);
|
||||
PSMTXMultVec(pane->GetGlobalMtx(), reinterpret_cast<Vec*>(&position), reinterpret_cast<Vec*>(&position));
|
||||
f32 xOffset = 15.0f;
|
||||
f32 height = 50.0f;
|
||||
f32 scale = 0.5f;
|
||||
f32 xOffset;
|
||||
f32 scale;
|
||||
f32 height;
|
||||
xOffset = 15.0f;
|
||||
height = 50.0f;
|
||||
scale = 0.5f;
|
||||
position.x = position.x + xOffset;
|
||||
position.y = position.y + scale * height;
|
||||
position.y = position.y + height * scale;
|
||||
(mpBalloon)
|
||||
->setPos(position, false, 1);
|
||||
(mpBalloon)->fadein();
|
||||
@@ -2197,11 +2202,14 @@ state22Button3:
|
||||
nw4r::lyt::Pane* pane = layout->getNW4RLyt()->GetRootPane()->FindPaneByName(paneName, true);
|
||||
ipl::math::VEC3 position(0.0f, 0.0f, 0.0f);
|
||||
PSMTXMultVec(pane->GetGlobalMtx(), reinterpret_cast<Vec*>(&position), reinterpret_cast<Vec*>(&position));
|
||||
f32 xOffset = 15.0f;
|
||||
f32 height = 50.0f;
|
||||
f32 scale = 0.5f;
|
||||
f32 xOffset;
|
||||
f32 scale;
|
||||
f32 height;
|
||||
xOffset = 15.0f;
|
||||
height = 50.0f;
|
||||
scale = 0.5f;
|
||||
position.x = position.x + xOffset;
|
||||
position.y = position.y + scale * height;
|
||||
position.y = position.y + height * scale;
|
||||
(mpBalloon)
|
||||
->setPos(position, false, 1);
|
||||
(mpBalloon)->fadein();
|
||||
@@ -2250,6 +2258,8 @@ void ipl::scene::AddressEdit::start_left_event(const char* paneName) {
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 4:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#define IPL_FOCUS_OBJECT_CPP
|
||||
#include "scene/board/iplFocusObject.h"
|
||||
#include "scene/parentalDialog/iplParentalDialog.h"
|
||||
|
||||
@@ -11,6 +12,28 @@
|
||||
#include <revolution/cx.h>
|
||||
#include <revolution/enc.h>
|
||||
|
||||
extern char scPaneName_B_Stop[];
|
||||
|
||||
namespace ipl {
|
||||
namespace math {
|
||||
static inline VEC3 addWeightedVectors(const VEC3& start, const VEC3& end) {
|
||||
VEC3 sum;
|
||||
nw4r::math::VEC3Add(&sum, &start, &end);
|
||||
return sum;
|
||||
}
|
||||
static inline void normalizeVector(nw4r::math::VEC3* result, const VEC3& sum, f32 frames) {
|
||||
nw4r::math::VEC3Scale(result, &sum, 1.0f / frames);
|
||||
}
|
||||
template <>
|
||||
VEC3 LinearIntp<VEC3>::get() const {
|
||||
nw4r::math::VEC3 result;
|
||||
VEC3 sum = addWeightedVectors(mStart * (mMaxFrame - mFrame), mEnd * getCurrentFrame());
|
||||
normalizeVector(&result, sum, getMaxFrame());
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
// clang-format off
|
||||
@@ -337,6 +360,13 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
namespace math {
|
||||
inline VEC3 VEC3::operator*(f32 val) const {
|
||||
return VEC3(x * val, y * val, z * val);
|
||||
}
|
||||
}
|
||||
namespace scene {
|
||||
void focus_object::stt_normal() {
|
||||
Button* button = get_button();
|
||||
|
||||
@@ -900,13 +930,13 @@ namespace ipl {
|
||||
math::VEC3 translate(mpLayout->FindPaneByName("N_Memo")->GetTranslate());
|
||||
|
||||
mURLProc.clear_prev_drawing();
|
||||
mURLProc.setUnk_0x44(translate.y);
|
||||
mURLProc.setMemoTranslateY(translate.y);
|
||||
|
||||
bool result = false;
|
||||
if (mState == STATE_NORMAL && mScroller.is_busy() == FALSE) {
|
||||
result = true;
|
||||
}
|
||||
mURLProc.setUnk_0x53(result);
|
||||
mURLProc.setFocusEnabled(result);
|
||||
|
||||
if (translate.y < 500.0f) {
|
||||
mpLayout->draw("N_Header");
|
||||
@@ -953,8 +983,8 @@ namespace ipl {
|
||||
mpLayout->draw("ReplyMask");
|
||||
}
|
||||
|
||||
if (!mURLProc.getUnk_0x50()) {
|
||||
mURLProc.setUnk_0x50(1);
|
||||
if (!mURLProc.getColorPass()) {
|
||||
mURLProc.setColorPass(1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1482,7 +1512,7 @@ namespace ipl {
|
||||
mURLProc.init();
|
||||
|
||||
if (mpBoardObj->mLetterType == BoardObject::TYPE_MEMO) {
|
||||
mURLProc.setUnk_0x40(8.0f);
|
||||
mURLProc.setHitYOffset(8.0f);
|
||||
}
|
||||
|
||||
nw4r::lyt::Pane* pane = mpLayout->FindPaneByName("T_Letter");
|
||||
@@ -2091,7 +2121,7 @@ namespace ipl {
|
||||
|
||||
if (event == ::gui::EventHandler::ON_TRIG) {
|
||||
if (con->downTrg(controller::BTN_INTERACT)) {
|
||||
if (strcmp(paneName, "B_Stop") == 0) {
|
||||
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
|
||||
if (mpInstance->mState == focus_object::STATE_NORMAL) {
|
||||
focus_object::get_button()->animation(Button::IDANIM_OPTOUT_SELECT);
|
||||
|
||||
@@ -2112,3 +2142,24 @@ namespace ipl {
|
||||
}
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
char scPaneName_B_Stop[] = "B_Stop";
|
||||
|
||||
BOOL ipl::scene::scroller::calc(bool canScroll) {
|
||||
BOOL result = FALSE;
|
||||
|
||||
if (canScroll) {
|
||||
if (mBScroller.calc()) {
|
||||
result = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
mScroller.calc();
|
||||
|
||||
f32 movable = mScroller.movable_pos(mBScroller.getSpeed());
|
||||
|
||||
mScroller.addScroll(movable);
|
||||
mBScroller.addSoundFreq(movable);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -15,16 +15,16 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void UrlProcessor::init() {
|
||||
unk_0x52 = 0;
|
||||
unk_0x51 = 0;
|
||||
unk_0x50 = 0;
|
||||
unk_0x53 = 1;
|
||||
mbHoverOffset = 0;
|
||||
mbInTag = 0;
|
||||
mbColorPass = 0;
|
||||
mbFocusEnabled = 1;
|
||||
|
||||
unk_0x40 = 0.0f;
|
||||
unk_0x44 = 0.0f;
|
||||
mHitYOffset = 0.0f;
|
||||
mMemoTranslateY = 0.0f;
|
||||
|
||||
unk_0x48 = 0;
|
||||
unk_0x4C = -1;
|
||||
mCurTagNo = 0;
|
||||
mSelectedTagNo = -1;
|
||||
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
mConData[i].valid = false;
|
||||
@@ -60,14 +60,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void UrlProcessor::clear_prev_drawing() {
|
||||
unk_0x48 = 0;
|
||||
unk_0x52 = 0;
|
||||
unk_0x51 = 0;
|
||||
mCurTagNo = 0;
|
||||
mbHoverOffset = 0;
|
||||
mbInTag = 0;
|
||||
}
|
||||
|
||||
nw4r::ut::Operation UrlProcessor::Process(u16 code, nw4r::ut::PrintContext<wchar_t>* context) {
|
||||
if (code == SEPERATOR || code == (u16)'\n') {
|
||||
if (unk_0x50 == 0) {
|
||||
if (mbColorPass == 0) {
|
||||
make_collision(context, code);
|
||||
} else if (code == SEPERATOR) {
|
||||
parse(context);
|
||||
@@ -78,42 +78,42 @@ namespace ipl {
|
||||
|
||||
void UrlProcessor::make_collision(nw4r::ut::PrintContext<wchar_t>* context, u16 code) {
|
||||
if (code == SEPERATOR) {
|
||||
if (unk_0x51 == 0) {
|
||||
if (mbInTag == 0) {
|
||||
url_collision* const url_col = new (System::getMem2App(), 4) url_collision();
|
||||
line_collision* const line_col = new (System::getMem2App(), 4) line_collision();
|
||||
|
||||
url_col->unk_0x00 = unk_0x48;
|
||||
url_col->unk_0x04 = (wchar_t*)context->str;
|
||||
url_col->mTagNo = mCurTagNo;
|
||||
url_col->mpStart = (wchar_t*)context->str;
|
||||
|
||||
line_col->unk_0x00 = context->writer->GetCursorX();
|
||||
line_col->mLeft = context->writer->GetCursorX();
|
||||
nw4r::ut::List_Append(&url_col->mLineCollisions, line_col);
|
||||
nw4r::ut::List_Append(&mUrlCollisions, url_col);
|
||||
|
||||
unk_0x51 = 1;
|
||||
mbInTag = 1;
|
||||
} else {
|
||||
void* url_col_raw = nw4r::ut::List_GetPrev(&mUrlCollisions, NULL);
|
||||
void* line_col_raw = nw4r::ut::List_GetPrev(&((url_collision*)url_col_raw)->mLineCollisions, NULL);
|
||||
url_collision* url_col = (url_collision*)url_col_raw;
|
||||
line_collision* line_col = (line_collision*)line_col_raw;
|
||||
|
||||
line_col->unk_0x04 = context->writer->GetCursorX();
|
||||
line_col->unk_0x08 = context->writer->GetCursorY();
|
||||
line_col->mRight = context->writer->GetCursorX();
|
||||
line_col->mY = context->writer->GetCursorY();
|
||||
|
||||
url_col->unk_0x08 = (wchar_t*)context->str;
|
||||
url_col->mpEnd = (wchar_t*)context->str;
|
||||
|
||||
unk_0x51 = 0;
|
||||
unk_0x48++;
|
||||
mbInTag = 0;
|
||||
mCurTagNo++;
|
||||
}
|
||||
} else {
|
||||
if (unk_0x51 != 0) {
|
||||
if (mbInTag != 0) {
|
||||
url_collision* url_col = (url_collision*)nw4r::ut::List_GetPrev(&mUrlCollisions, NULL);
|
||||
line_collision* line_col = (line_collision*)nw4r::ut::List_GetPrev(&url_col->mLineCollisions, NULL);
|
||||
|
||||
line_col->unk_0x04 = context->writer->GetCursorX();
|
||||
line_col->unk_0x08 = context->writer->GetCursorY();
|
||||
line_col->mRight = context->writer->GetCursorX();
|
||||
line_col->mY = context->writer->GetCursorY();
|
||||
|
||||
line_col = new (System::getMem2App(), 4) line_collision();
|
||||
line_col->unk_0x00 = -208.0f;
|
||||
line_col->mLeft = -208.0f;
|
||||
|
||||
nw4r::ut::List_Append(&url_col->mLineCollisions, line_col);
|
||||
}
|
||||
@@ -122,41 +122,41 @@ namespace ipl {
|
||||
|
||||
void UrlProcessor::parse(nw4r::ut::PrintContext<wchar_t>* context) {
|
||||
f32 curY = context->writer->GetCursorY();
|
||||
if (unk_0x51 == 0) {
|
||||
if (unk_0x4C == unk_0x48) {
|
||||
if (mbInTag == 0) {
|
||||
if (mSelectedTagNo == mCurTagNo) {
|
||||
context->writer->SetTextColor(0xFFE664FF);
|
||||
} else if (unk_0x53 != 0 && is_focused()) {
|
||||
} else if (mbFocusEnabled != 0 && is_focused()) {
|
||||
context->writer->SetCursorY(curY - 2.0f);
|
||||
context->writer->SetTextColor(0xF06E28FF);
|
||||
unk_0x52 = 1;
|
||||
mbHoverOffset = 1;
|
||||
} else {
|
||||
context->writer->SetTextColor(0x34BEEDFF);
|
||||
}
|
||||
unk_0x51 = 1;
|
||||
mbInTag = 1;
|
||||
} else {
|
||||
if (unk_0x52 != 0) {
|
||||
if (mbHoverOffset != 0) {
|
||||
context->writer->SetCursorY(2.0f + curY);
|
||||
unk_0x52 = 0;
|
||||
mbHoverOffset = 0;
|
||||
}
|
||||
|
||||
context->writer->SetTextColor(0x646464FF);
|
||||
|
||||
unk_0x51 = 0;
|
||||
unk_0x48++;
|
||||
mbInTag = 0;
|
||||
mCurTagNo++;
|
||||
}
|
||||
}
|
||||
|
||||
BOOL UrlProcessor::is_focused() const {
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
if (unk_0x48 == get_focused_tagno(i)) {
|
||||
if (mCurTagNo == get_focused_tagno(i)) {
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void UrlProcessor::select(int unk) {
|
||||
unk_0x4C = unk;
|
||||
void UrlProcessor::select(int tagNo) {
|
||||
mSelectedTagNo = tagNo;
|
||||
}
|
||||
|
||||
int UrlProcessor::get_focused_tagno(int chan) const {
|
||||
@@ -174,13 +174,13 @@ namespace ipl {
|
||||
|
||||
while (url_col = (url_collision*)nw4r::ut::List_GetNext(&mUrlCollisions, url_col), url_col != NULL) {
|
||||
while (line_col = (line_collision*)nw4r::ut::List_GetNext(&url_col->mLineCollisions, line_col), line_col != NULL) {
|
||||
f32 left = line_col->unk_0x00 - var_f28;
|
||||
f32 right = var_f28 + line_col->unk_0x04;
|
||||
f32 temp_f0 = ((unk_0x44 + unk_0x40) - line_col->unk_0x08);
|
||||
f32 left = line_col->mLeft - var_f28;
|
||||
f32 right = var_f28 + line_col->mRight;
|
||||
f32 temp_f0 = ((mMemoTranslateY + mHitYOffset) - line_col->mY);
|
||||
f32 top = (var_f29 + temp_f0) - var_f28;
|
||||
f32 bottom = var_f28 + (var_f30 + temp_f0);
|
||||
if (left <= var_f31 && var_f31 <= right && top <= -pos.y && -pos.y <= bottom) {
|
||||
return url_col->unk_0x00;
|
||||
return url_col->mTagNo;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -194,7 +194,7 @@ namespace ipl {
|
||||
url_collision* url_col = NULL;
|
||||
|
||||
while (got = (url_collision*)nw4r::ut::List_GetNext(&mUrlCollisions, got), got != NULL) {
|
||||
if (got->unk_0x00 == unk_0x4C) {
|
||||
if (got->mTagNo == mSelectedTagNo) {
|
||||
url_col = got;
|
||||
break;
|
||||
}
|
||||
@@ -210,10 +210,10 @@ namespace ipl {
|
||||
|
||||
int chIdx2 = 0;
|
||||
int chIdx = 0;
|
||||
u32 count = (u32)url_col->unk_0x08 - (u32)url_col->unk_0x04;
|
||||
u32 count = (u32)url_col->mpEnd - (u32)url_col->mpStart;
|
||||
count >>= 1;
|
||||
for (u32 i = 0; i < count; i++) {
|
||||
wchar_t wch = url_col->unk_0x04[i];
|
||||
wchar_t wch = url_col->mpStart[i];
|
||||
if (wch != SEPERATOR && chIdx2 < 0x200) {
|
||||
url[chIdx2++] = wch;
|
||||
}
|
||||
@@ -226,9 +226,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
UrlProcessor::url_collision::url_collision() {
|
||||
unk_0x00 = 0;
|
||||
unk_0x04 = NULL;
|
||||
unk_0x08 = NULL;
|
||||
mTagNo = 0;
|
||||
mpStart = NULL;
|
||||
mpEnd = NULL;
|
||||
nw4r::ut::List_Init(&mLineCollisions, offsetof(line_collision, mLinkList));
|
||||
}
|
||||
|
||||
|
||||
@@ -638,7 +638,7 @@ namespace ipl {
|
||||
void ChannelObj::setLangPane(const layout::Object* layout) {
|
||||
int lang = System::getLanguage();
|
||||
const char* langGroup = scLangGroups[lang];
|
||||
char langCodeBuf[40] = "";
|
||||
char langCodeBuf[10][4] = {""};
|
||||
|
||||
bool foundLangGroup = false;
|
||||
|
||||
@@ -648,7 +648,7 @@ namespace ipl {
|
||||
} else {
|
||||
bool isNonRsoGroup = true;
|
||||
for (int i = 0; i < channel::MAX_ANIMS; i++) {
|
||||
char name[6];
|
||||
char name[8];
|
||||
sprintf(name, "Rso%d", i);
|
||||
if (strncmp(it->GetName(), name, 5) == 0) {
|
||||
isNonRsoGroup = false;
|
||||
@@ -663,8 +663,8 @@ namespace ipl {
|
||||
|
||||
for (int i = 0; i < 10; i++) {
|
||||
if (strncmp(it->GetName(), scLangGroups[i], 3) == 0) {
|
||||
memcpy(&langCodeBuf[i], it->GetName(), 3);
|
||||
langCodeBuf[i + 3] = 0;
|
||||
memcpy(langCodeBuf[i], it->GetName(), 3);
|
||||
langCodeBuf[i][3] = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -680,16 +680,15 @@ namespace ipl {
|
||||
} else {
|
||||
s32 region = System::getRegion();
|
||||
for (int i = 0; i < channel::MAX_ANIMS; i++) {
|
||||
char* groupName = (char*)scModuleData.langGroupLookup[region][i];
|
||||
|
||||
if (groupName != NULL) {
|
||||
if (strcmp(groupName, &langCodeBuf[scLangLookup[region][i]]) == 0) {
|
||||
nw4r::lyt::Group* group = layout->FindGroupByName(groupName);
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter();
|
||||
it++) {
|
||||
it->mTarget->SetVisible(true);
|
||||
}
|
||||
if (scModuleData.langGroupLookup[region][i] == NULL) {
|
||||
break;
|
||||
}
|
||||
if (strcmp(scModuleData.langGroupLookup[region][i], langCodeBuf[scLangLookup[region][i]]) == 0) {
|
||||
nw4r::lyt::Group* group = layout->FindGroupByName(scModuleData.langGroupLookup[region][i]);
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter(); it++) {
|
||||
it->mTarget->SetVisible(true);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1901,64 +1901,59 @@ namespace ipl {
|
||||
nw4r::ut::Rect projRect;
|
||||
System::getProjectionRect(&projRect);
|
||||
GXRenderModeObj* rMode = System::getRenderModeObj();
|
||||
f32 var_f29;
|
||||
f32 var_f30;
|
||||
f32 var_f31;
|
||||
f32 var_f1;
|
||||
u16 var_r0;
|
||||
u16 var_r3;
|
||||
f32 scissorX;
|
||||
f32 scissorY;
|
||||
f32 scissorWidth;
|
||||
f32 scissorHeight;
|
||||
u16 fbWidth;
|
||||
u16 efbHeight;
|
||||
if (mState == STATE_NORMAL_FADE_ZOOM || mState == STATE_NORMAL_DONE_FADE_ZOOM || mState == STATE_NORMAL_RESTART) {
|
||||
nw4r::math::MTX44 mtx;
|
||||
f32 rightScale = projRect.right / unk_0xE4.x;
|
||||
f32 leftScale = projRect.left / unk_0xE4.x;
|
||||
f32 topScale = projRect.top / unk_0xE4.y;
|
||||
f32 bottomScale = projRect.bottom / unk_0xE4.y;
|
||||
f32 bottom = unk_0xD8.y - bottomScale;
|
||||
f32 right = unk_0xD8.x + rightScale;
|
||||
f32 left = unk_0xD8.x + leftScale;
|
||||
f32 top = unk_0xD8.y - topScale;
|
||||
f32 right = unk_0xD8.x + projRect.right / unk_0xE4.x;
|
||||
f32 left = unk_0xD8.x + projRect.left / unk_0xE4.x;
|
||||
f32 bottom = unk_0xD8.y - projRect.bottom / unk_0xE4.y;
|
||||
f32 top = unk_0xD8.y - projRect.top / unk_0xE4.y;
|
||||
MTXOrtho(mtx, top, bottom, left, right, -100.0f, 100.0f);
|
||||
nw4r::math::VEC4 vec4_in(vec.x, vec.y, 0.0f, 1.0f);
|
||||
nw4r::math::VEC4 vec4;
|
||||
nw4r::math::VEC4Transform(&vec4, &mtx, &vec4_in);
|
||||
var_r0 = rMode->fbWidth;
|
||||
var_r3 = rMode->efbHeight;
|
||||
var_f29 = projRect.GetWidth();
|
||||
var_f30 = (var_r3 - ((1.0f + vec4.y) * var_r3 / 2)) - (mChanThumbOff_Y * unk_0xE4.y);
|
||||
f32 temp_f7_2 = var_r0 / var_f29;
|
||||
var_f31 = ((1.0f + vec4.x) * var_r0 / 2) - ((mChanThumbOff_X * unk_0xE4.x) * (temp_f7_2));
|
||||
var_f29 = 2.0f * (mChanThumbOff_X * unk_0xE4.x) * (var_r0 / var_f29);
|
||||
var_f1 = 2.0f * (mChanThumbOff_Y * unk_0xE4.y);
|
||||
fbWidth = rMode->fbWidth;
|
||||
efbHeight = rMode->efbHeight;
|
||||
f32 projectionWidth = projRect.GetWidth();
|
||||
scissorX = ((1.0f + vec4.x) * fbWidth / 2) - ((mChanThumbOff_X * unk_0xE4.x) * (fbWidth / projectionWidth));
|
||||
scissorY = (efbHeight - ((1.0f + vec4.y) * efbHeight / 2)) - (mChanThumbOff_Y * unk_0xE4.y);
|
||||
scissorWidth = 2.0f * (mChanThumbOff_X * unk_0xE4.x) * (fbWidth / projectionWidth);
|
||||
scissorHeight = 2.0f * (mChanThumbOff_Y * unk_0xE4.y);
|
||||
} else {
|
||||
var_r0 = rMode->fbWidth;
|
||||
var_r3 = rMode->efbHeight;
|
||||
var_f31 = ((f32)var_r0 / 2) + ((vec.x - mChanThumbOff_X) * (var_r0 / projRect.GetWidth()));
|
||||
var_f30 = (((f32)var_r3 / 2) - vec.y) - mChanThumbOff_Y;
|
||||
var_f29 = 2.0f * mChanThumbOff_X * (var_r0 / projRect.GetWidth());
|
||||
var_f1 = 2.0f * mChanThumbOff_Y;
|
||||
fbWidth = rMode->fbWidth;
|
||||
efbHeight = rMode->efbHeight;
|
||||
scissorX = ((f32)fbWidth / 2) + ((vec.x - mChanThumbOff_X) * (fbWidth / projRect.GetWidth()));
|
||||
scissorY = (((f32)efbHeight / 2) - vec.y) - mChanThumbOff_Y;
|
||||
scissorWidth = 2.0f * mChanThumbOff_X * (fbWidth / projRect.GetWidth());
|
||||
scissorHeight = 2.0f * mChanThumbOff_Y;
|
||||
}
|
||||
var_f31 -= 1.0f;
|
||||
var_f30 -= 1.0f;
|
||||
var_f29 += 2.0f;
|
||||
var_f1 += 2.0f;
|
||||
if (var_f31 >= var_r0 || (var_f31 + var_f29) <= 0.0f || var_f30 >= var_r3 || (var_f30 + var_f1) <= 0.0f) {
|
||||
scissorX -= 1.0f;
|
||||
scissorY -= 1.0f;
|
||||
scissorWidth += 2.0f;
|
||||
scissorHeight += 2.0f;
|
||||
if (scissorX >= fbWidth || (scissorX + scissorWidth) <= 0.0f || scissorY >= efbHeight || (scissorY + scissorHeight) <= 0.0f) {
|
||||
GXSetScissor(0, 0, 0, 0);
|
||||
} else {
|
||||
if (var_f31 < 0.0f) {
|
||||
var_f29 += var_f31;
|
||||
var_f31 = 0.0f;
|
||||
if (scissorX < 0.0f) {
|
||||
scissorWidth += scissorX;
|
||||
scissorX = 0.0f;
|
||||
}
|
||||
if (var_f30 < 0.0f) {
|
||||
var_f1 += var_f30;
|
||||
var_f30 = 0.0f;
|
||||
if (scissorY < 0.0f) {
|
||||
scissorHeight += scissorY;
|
||||
scissorY = 0.0f;
|
||||
}
|
||||
if ((var_f31 + var_f29) > 1705.0f) {
|
||||
var_f29 -= (var_f31 + var_f29) - 1705.0f;
|
||||
if ((scissorX + scissorWidth) > 1705.0f) {
|
||||
scissorWidth -= (scissorX + scissorWidth) - 1705.0f;
|
||||
}
|
||||
if ((var_f30 + var_f1) > 1705.0f) {
|
||||
var_f1 -= (var_f30 + var_f1) - 1705.0f;
|
||||
if ((scissorY + scissorHeight) > 1705.0f) {
|
||||
scissorHeight -= (scissorY + scissorHeight) - 1705.0f;
|
||||
}
|
||||
GXSetScissor(var_f31, var_f30, var_f29, var_f1);
|
||||
GXSetScissor(scissorX, scissorY, scissorWidth, scissorHeight);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -648,7 +648,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN && System::isReceiveScheduleStopped()) {
|
||||
if (System::getNwc24Manager() && !System::getNwc24Manager()->isUnk0xA31()) {
|
||||
if (System::getNwc24Manager() && !System::getNwc24Manager()->isReceivingIdle()) {
|
||||
goto scn_continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,16 +25,16 @@ typedef struct {
|
||||
undefined4 result;
|
||||
undefined4 errCode;
|
||||
HTTPTestState httpTestState;
|
||||
undefined4 unk_0x030;
|
||||
undefined4 unk_0x034;
|
||||
undefined4 unk_0x038;
|
||||
undefined4 unk_0x03c;
|
||||
undefined4 natState;
|
||||
undefined4 gsAvailable;
|
||||
undefined4 natTimedOut;
|
||||
undefined4 natFailed;
|
||||
OSTime detectStartTime;
|
||||
NHTTPConnection httpConnection;
|
||||
NHTTPRequest* httpRequest;
|
||||
NHTTPResponse* httpResponse;
|
||||
NCDProxyProfile proxy;
|
||||
void* unk_0x7f0;
|
||||
void* httpBuf;
|
||||
NAT nat;
|
||||
} StaticSession;
|
||||
|
||||
@@ -64,14 +64,14 @@ void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
|
||||
g_session.result = 0xFF00;
|
||||
g_session.errCode = 0;
|
||||
g_session.httpTestState = HTTP_TEST_NOT_STARTED;
|
||||
g_session.unk_0x030 = 0;
|
||||
g_session.natState = 0;
|
||||
g_session.detectStartTime = 0;
|
||||
g_session.httpConnection = 0;
|
||||
g_session.httpRequest = 0;
|
||||
g_session.httpResponse = NULL;
|
||||
g_session.unk_0x034 = 0;
|
||||
g_session.unk_0x038 = 0;
|
||||
g_session.unk_0x03c = 1;
|
||||
g_session.gsAvailable = 0;
|
||||
g_session.natTimedOut = 0;
|
||||
g_session.natFailed = 1;
|
||||
g_session.proxy = *proxy;
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ int IPLContestProcess() {
|
||||
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200;
|
||||
OSReport("[error] Failed to start up NHTTP.\n");
|
||||
} else {
|
||||
g_session.unk_0x7f0 = IPLContestAlloc(0x400);
|
||||
g_session.httpBuf = IPLContestAlloc(0x400);
|
||||
g_session.httpTestState = HTTP_TEST_STARTED;
|
||||
OSReport("Starting HTTP conectting test.\n");
|
||||
}
|
||||
@@ -108,7 +108,7 @@ int IPLContestProcess() {
|
||||
}
|
||||
case HTTP_TEST_STARTED: {
|
||||
g_session.httpRequest =
|
||||
NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.unk_0x7f0, 0x400, sNHTTPReqCallback, 0);
|
||||
NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.httpBuf, 0x400, sNHTTPReqCallback, 0);
|
||||
if (g_session.httpRequest == 0) {
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
|
||||
g_session.result |= 4;
|
||||
@@ -156,9 +156,9 @@ int IPLContestProcess() {
|
||||
NHTTPDestroyResponse(g_session.httpResponse);
|
||||
g_session.httpResponse = NULL;
|
||||
}
|
||||
if (g_session.unk_0x7f0 != NULL) {
|
||||
IPLContestFree(g_session.unk_0x7f0, 0);
|
||||
g_session.unk_0x7f0 = NULL;
|
||||
if (g_session.httpBuf != NULL) {
|
||||
IPLContestFree(g_session.httpBuf, 0);
|
||||
g_session.httpBuf = NULL;
|
||||
}
|
||||
g_session.httpTestState = HTTP_TEST_DONE;
|
||||
NHTTPCleanupAsync(sNHTTPCleanupCallback);
|
||||
@@ -176,9 +176,9 @@ int IPLContestProcess() {
|
||||
NHTTPDestroyResponse(g_session.httpResponse);
|
||||
g_session.httpResponse = NULL;
|
||||
}
|
||||
if (g_session.unk_0x7f0 != NULL) {
|
||||
IPLContestFree(g_session.unk_0x7f0, 0);
|
||||
g_session.unk_0x7f0 = NULL;
|
||||
if (g_session.httpBuf != NULL) {
|
||||
IPLContestFree(g_session.httpBuf, 0);
|
||||
g_session.httpBuf = NULL;
|
||||
}
|
||||
g_session.httpTestState = HTTP_TEST_DONE;
|
||||
NHTTPCleanupAsync(sNHTTPCleanupCallback);
|
||||
@@ -198,11 +198,11 @@ int IPLContestProcess() {
|
||||
OSReport("Port mapping detectioning test has been skipped.\n");
|
||||
|
||||
} else
|
||||
switch (g_session.unk_0x030) {
|
||||
switch (g_session.natState) {
|
||||
case 0: {
|
||||
gsiMemoryCallbacksSet(IPLContestGSMalloc, IPLContestGSFree, IPLContestGSRealloc, IPLContestGSMemalign);
|
||||
GSIStartAvailableCheckA("wiinat");
|
||||
g_session.unk_0x030 = 1;
|
||||
g_session.natState = 1;
|
||||
OSReport("Starting GameSpy available check.\n");
|
||||
break;
|
||||
}
|
||||
@@ -212,14 +212,14 @@ int IPLContestProcess() {
|
||||
break;
|
||||
}
|
||||
case GSIACAvailable: {
|
||||
g_session.unk_0x034 = 1;
|
||||
g_session.unk_0x030 = 2;
|
||||
g_session.gsAvailable = 1;
|
||||
g_session.natState = 2;
|
||||
OSReport("GameSpy server is currently available.\n");
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
g_session.unk_0x034 = 0;
|
||||
g_session.unk_0x030 = 5;
|
||||
g_session.gsAvailable = 0;
|
||||
g_session.natState = 5;
|
||||
OSReport("GameSpy server is currently unavailable.\n");
|
||||
break;
|
||||
}
|
||||
@@ -228,7 +228,7 @@ int IPLContestProcess() {
|
||||
}
|
||||
case 2: {
|
||||
NNStartNatDetection(onNatDetectionDone);
|
||||
g_session.unk_0x030 = 3;
|
||||
g_session.natState = 3;
|
||||
OSReport("Port mapping detectioning test has been started.\n");
|
||||
g_session.detectStartTime = OSGetTime();
|
||||
break;
|
||||
@@ -238,8 +238,8 @@ int IPLContestProcess() {
|
||||
if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks((OSTime)90000)) {
|
||||
break;
|
||||
}
|
||||
g_session.unk_0x030 = 5;
|
||||
g_session.unk_0x038 = 1;
|
||||
g_session.natState = 5;
|
||||
g_session.natTimedOut = 1;
|
||||
OSReport("[error] NAT timeout.\n");
|
||||
break;
|
||||
}
|
||||
@@ -289,10 +289,10 @@ int IPLGetNATSupportCode(int conntype) {
|
||||
|
||||
nat = g_session.nat;
|
||||
|
||||
if (g_session.unk_0x034 != 0) {
|
||||
if (g_session.unk_0x038 != 0) {
|
||||
if (g_session.gsAvailable != 0) {
|
||||
if (g_session.natTimedOut != 0) {
|
||||
code = 11180;
|
||||
} else if (g_session.unk_0x03c != 0) {
|
||||
} else if (g_session.natFailed != 0) {
|
||||
code = 11170;
|
||||
} else {
|
||||
if (nat.mappingScheme == 0 && nat.mappings[2].publicPort == nat.mappings[1].publicPort * 2 - nat.mappings[0].publicPort) {
|
||||
@@ -464,10 +464,10 @@ void sNHTTPCleanupCallback() {
|
||||
void onNatDetectionDone(gsi_bool success, NAT nat) {
|
||||
if (success) {
|
||||
g_session.nat = nat;
|
||||
g_session.unk_0x03c = 0;
|
||||
g_session.natFailed = 0;
|
||||
} else {
|
||||
g_session.unk_0x03c = 1;
|
||||
g_session.natFailed = 1;
|
||||
}
|
||||
g_session.unk_0x030 = 4;
|
||||
g_session.natState = 4;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
SDButton::SDButton(EGG::Heap* heap) : Base(heap), unk_0x54(0) {
|
||||
SDButton::SDButton(EGG::Heap* heap) : Base(heap), mAnimWait(0) {
|
||||
setSceneParentFlags(SCN_PARENTFLAG_CALC | SCN_PARENTFLAG_DRAW);
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
@@ -114,10 +114,10 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SDButton::calc() {
|
||||
if (unk_0x54 == 1) {
|
||||
if (mAnimWait == 1) {
|
||||
if (!mpLayout->isPlaying(ANIM_HELP_BTN_ROLL_ON)) {
|
||||
reset_gui();
|
||||
unk_0x54 = 0;
|
||||
mAnimWait = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -328,7 +328,7 @@ namespace ipl {
|
||||
return isSceneCreated();
|
||||
}
|
||||
|
||||
void SDButton::setEventHandler(::gui::EventHandler* event, ::gui::EventHandler* optOutEvent) {
|
||||
void SDButton::setEventHandler(::gui::EventHandler* event) {
|
||||
mpGui->setEventHandler(event);
|
||||
}
|
||||
|
||||
@@ -347,7 +347,7 @@ namespace ipl {
|
||||
switch (animNo) {
|
||||
case IDANIM_HELP_BTN_CLICK: {
|
||||
anim = mpLayout->getAnim(ANIM_HELP_BTN_ROLL_ON);
|
||||
unk_0x54 = 1;
|
||||
mAnimWait = 1;
|
||||
break;
|
||||
}
|
||||
case IDANIM_ARROW_RIGHT_CLICK: {
|
||||
|
||||
@@ -69,6 +69,13 @@ namespace ipl {
|
||||
SDMemory::~SDMemory() {}
|
||||
|
||||
void SDMemory::create(EGG::Heap* heap, nand::LayoutFile* layoutFile, SDChannelSelect* channelSelect) {
|
||||
s32 cachedTitleCount;
|
||||
const savedata::Manager* saveData;
|
||||
nw4r::lyt::TextBox* textBox;
|
||||
layout::Animator* scrollAnimator;
|
||||
ControlPaneEventHandler* controlEvent;
|
||||
TitlePaneEventHandler* titleEvent;
|
||||
DialogPaneEventHandler* dialogEvent;
|
||||
mpSDChannelSelect = channelSelect;
|
||||
|
||||
mpMainLayout = new layout::Object(heap, layoutFile, "arc", "mn_DialogWindow_ChChange_a.brlyt");
|
||||
@@ -89,7 +96,7 @@ namespace ipl {
|
||||
mpMainLayout->getAnim(5)->initAnmFrame();
|
||||
mpMainLayout->getAnim(8)->initAnmFrame();
|
||||
|
||||
nw4r::lyt::TextBox* textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_Dialog_00"));
|
||||
textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_Dialog_00"));
|
||||
textBox->SetString(System::getMessage(0xB0));
|
||||
textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("TextBox_05"));
|
||||
textBox->SetString(System::getMessage(0xBB));
|
||||
@@ -143,8 +150,8 @@ namespace ipl {
|
||||
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_07"));
|
||||
textBox->SetString(System::getMessage(0xBA));
|
||||
|
||||
const savedata::Manager* saveData = System::getSaveData();
|
||||
s32 cachedTitleCount = 0;
|
||||
saveData = System::getSaveData();
|
||||
cachedTitleCount = 0;
|
||||
for (s32 i = 0; i < 48; ++i) {
|
||||
if (saveData->getTitleCacheEntry(i) == 0) {
|
||||
break;
|
||||
@@ -153,10 +160,12 @@ namespace ipl {
|
||||
}
|
||||
if (cachedTitleCount >= 5) {
|
||||
mpTitleLayout->FindPaneByName("N_Btn_3")->SetVisible(false);
|
||||
mpTitleLayout->FindPaneByName("N_Btn_4")->SetVisible(true);
|
||||
nw4r::lyt::Pane* expandedButton = mpTitleLayout->FindPaneByName("N_Btn_4");
|
||||
expandedButton->SetVisible(true);
|
||||
mDisplayMode = 4;
|
||||
} else {
|
||||
mpTitleLayout->FindPaneByName("N_Btn_3")->SetVisible(true);
|
||||
nw4r::lyt::Pane* compactButton = mpTitleLayout->FindPaneByName("N_Btn_3");
|
||||
compactButton->SetVisible(true);
|
||||
mpTitleLayout->FindPaneByName("N_Btn_4")->SetVisible(false);
|
||||
mDisplayMode = 3;
|
||||
}
|
||||
@@ -195,7 +204,7 @@ namespace ipl {
|
||||
mpDialogLayout->getAnim(11)->initAnmFrame();
|
||||
mpDialogLayout->getAnim(8)->initAnmFrame();
|
||||
mpDialogLayout->getAnim(18)->initAnmFrame();
|
||||
layout::Animator* scrollAnimator = mpDialogLayout->getAnim(18);
|
||||
scrollAnimator = mpDialogLayout->getAnim(18);
|
||||
scrollAnimator->initFrame();
|
||||
scrollAnimator->restart();
|
||||
|
||||
@@ -210,7 +219,7 @@ namespace ipl {
|
||||
mpDialogLayout->finishBinding();
|
||||
mpProgressLayout->getAnim(0)->initAnmFrame();
|
||||
|
||||
ControlPaneEventHandler* controlEvent = new ControlPaneEventHandler(this);
|
||||
controlEvent = new ControlPaneEventHandler(this);
|
||||
mpPaneManagers[0] = new gui::PaneManager(controlEvent, mpMainLayout->getDrawInfo(), NULL, NULL);
|
||||
mpPaneManagers[0]->setupScene(mpMainLayout);
|
||||
mpPaneManagers[0]->setAllComponentTriggerTarget(false);
|
||||
@@ -218,7 +227,7 @@ namespace ipl {
|
||||
mpPaneManagers[0]->setTriggerTarget(mpMainLayout->FindPaneByName(sControlPaneNames[i]), true);
|
||||
}
|
||||
|
||||
TitlePaneEventHandler* titleEvent = new TitlePaneEventHandler(this);
|
||||
titleEvent = new TitlePaneEventHandler(this);
|
||||
mpPaneManagers[1] = new gui::PaneManager(titleEvent, mpTitleLayout->getDrawInfo(), NULL, NULL);
|
||||
mpPaneManagers[1]->setupScene(mpTitleLayout);
|
||||
mpPaneManagers[1]->setAllComponentTriggerTarget(false);
|
||||
@@ -233,7 +242,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
DialogPaneEventHandler* dialogEvent = new DialogPaneEventHandler(this);
|
||||
dialogEvent = new DialogPaneEventHandler(this);
|
||||
mpPaneManagers[2] = new gui::PaneManager(dialogEvent, mpDialogLayout->getDrawInfo(), NULL, NULL);
|
||||
mpPaneManagers[2]->setupScene(mpDialogLayout);
|
||||
mpPaneManagers[2]->setAllComponentTriggerTarget(false);
|
||||
|
||||
@@ -335,7 +335,7 @@ namespace ipl {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SDChannelSelect::enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value) {
|
||||
bool SDChannelSelect::enqueueChannelNotice(u64 titleId, u32 value) {
|
||||
if (mCurrentSDState != 6) {
|
||||
return false;
|
||||
}
|
||||
@@ -344,7 +344,7 @@ namespace ipl {
|
||||
command.type = 10;
|
||||
command.arguments.values[0] = value;
|
||||
command.arguments.values[1] = (u32)&mFirstTitleCount;
|
||||
command.titleId = ((u64)page << 32) | index;
|
||||
command.titleId = titleId;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -363,7 +363,7 @@ namespace ipl {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SDChannelSelect::enqueueStateNotice(u32 controller, u32 page, u32 index, u32 state) {
|
||||
bool SDChannelSelect::enqueueStateNotice(u64 titleId, u32 state) {
|
||||
if (mCurrentSDState != 6) {
|
||||
return false;
|
||||
}
|
||||
@@ -372,7 +372,7 @@ namespace ipl {
|
||||
command.type = 7;
|
||||
command.arguments.values[0] = state;
|
||||
command.arguments.values[1] = 0;
|
||||
command.titleId = ((u64)page << 32) | index;
|
||||
command.titleId = titleId;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -729,8 +729,11 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
if (OSGetTime() - mOperationStartTime < OS_TIMER_CLOCK) {
|
||||
switch (OSGetTime() - mOperationStartTime < OS_TIMER_CLOCK) {
|
||||
default:
|
||||
return;
|
||||
case false:
|
||||
break;
|
||||
}
|
||||
setDialogMessage(1, 0);
|
||||
int result = mpSDWorker->get_async_result();
|
||||
@@ -781,11 +784,15 @@ namespace ipl {
|
||||
enqueueLoadNotice();
|
||||
}
|
||||
} else {
|
||||
int channelCount = 0;
|
||||
int channelIndex = 0;
|
||||
u32 titleIndex = 0;
|
||||
u32 titleId;
|
||||
u32 titleIndex;
|
||||
int channelIndex;
|
||||
int channelCount;
|
||||
channelCount = 0;
|
||||
channelIndex = 0;
|
||||
titleIndex = 0;
|
||||
for (; titleIndex < mSDTitleCount; ++titleIndex) {
|
||||
u32 titleId = mpSDTitleInfo[titleIndex].titleId;
|
||||
titleId = mpSDTitleInfo[titleIndex].titleId;
|
||||
if (titleId != 0x48415A41) {
|
||||
++channelCount;
|
||||
mpChannelTitleIds[channelIndex++] = titleId;
|
||||
@@ -3458,7 +3465,11 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
|
||||
if (event == 0) {
|
||||
switch (event) {
|
||||
default: return;
|
||||
case 0: break;
|
||||
}
|
||||
{
|
||||
if (mpScene->mState == 1) {
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_OUT) {
|
||||
if (con != NULL) {
|
||||
@@ -3504,8 +3515,6 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -282,7 +282,7 @@ FaderSceneCommand SDChannelTitle::calcFadein() {
|
||||
if (!mpFade->isPlaying()) {
|
||||
iplSDChannelTitle_playBannerIntro(this);
|
||||
SDButton* button = static_cast<SDButton*>(System::getScene(0x24));
|
||||
button->setEventHandler(mpButtonEventHandler, NULL);
|
||||
button->setEventHandler(mpButtonEventHandler);
|
||||
button->animation(13);
|
||||
button->animation(14);
|
||||
mState = 1;
|
||||
@@ -344,7 +344,7 @@ void SDChannelTitle::initCalcFadeout() {
|
||||
button->animation(15);
|
||||
button->animation(16);
|
||||
}
|
||||
button->setEventHandler(NULL, NULL);
|
||||
button->setEventHandler(NULL);
|
||||
}
|
||||
|
||||
FaderSceneCommand SDChannelTitle::calcFadeout() {
|
||||
@@ -353,7 +353,7 @@ FaderSceneCommand SDChannelTitle::calcFadeout() {
|
||||
mWpadStopTick = OSGetTick();
|
||||
}
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN && System::isReceiveScheduleStopped() &&
|
||||
(!System::getNwc24Manager() || System::getNwc24Manager()->isUnk0xA31())) {
|
||||
(!System::getNwc24Manager() || System::getNwc24Manager()->isReceivingIdle())) {
|
||||
OSReport("NWC24 Scheduler stopped.\n");
|
||||
NandSDWorker* worker = mpChannelSelect->getWorker();
|
||||
if (mNextScene == 17) {
|
||||
@@ -736,8 +736,7 @@ extern "C" void iplSDChannelTitle_startCopyProgress(SDChannelTitle* scene) {
|
||||
if (channel->mStateFlags == 3) {
|
||||
scene->mState = 26;
|
||||
scene->mErrorMessage = 0xaf;
|
||||
} else if (scene->mpChannelSelect->enqueueChannelNotice(0, static_cast<u32>(scene->mTitleId >> 32),
|
||||
static_cast<u32>(scene->mTitleId), reinterpret_cast<u32>(&scene->mTitleRange))) {
|
||||
} else if (scene->mpChannelSelect->enqueueChannelNotice(scene->mTitleId, reinterpret_cast<u32>(&scene->mTitleRange))) {
|
||||
scene->mState = 20;
|
||||
} else {
|
||||
scene->mState = 26;
|
||||
@@ -826,8 +825,7 @@ extern "C" void iplSDChannelTitle_updateCopyStart(SDChannelTitle* scene) {
|
||||
ESTitleId temporaryTitle = SCGetTmpTitleID();
|
||||
if (temporaryTitle && scene->mTitleId != temporaryTitle) {
|
||||
if (System::isReceiveScheduleStopped()) {
|
||||
if (scene->mpChannelSelect->enqueueStateNotice(0, static_cast<u32>(temporaryTitle >> 32),
|
||||
static_cast<u32>(temporaryTitle), 1)) {
|
||||
if (scene->mpChannelSelect->enqueueStateNotice(temporaryTitle, 1)) {
|
||||
scene->mState = 16;
|
||||
} else {
|
||||
scene->mState = 26;
|
||||
|
||||
@@ -34,7 +34,7 @@ struct AOSSAccessPoint {
|
||||
u8 bssid[6];
|
||||
u16 capabilities;
|
||||
u32 rateCount;
|
||||
u8 rates[12];
|
||||
u8 rates[16];
|
||||
u32 beaconPeriod;
|
||||
u32 mode;
|
||||
};
|
||||
@@ -84,7 +84,7 @@ void* AOSSi_Alloc(u32 size) {
|
||||
}
|
||||
|
||||
void AOSSi_Free(void* block) {
|
||||
if (releaseMemory != NULL) {
|
||||
if (releaseMemory) {
|
||||
releaseMemory(0, block, 0);
|
||||
}
|
||||
}
|
||||
@@ -129,15 +129,15 @@ int AOSSi_EndLocal(void) {
|
||||
int AOSSi_WLANGetBSSList(struct AOSSAccessPointList** output) {
|
||||
int result = -1;
|
||||
int startupRetries = 0;
|
||||
int scanRetries = 0;
|
||||
int cleanupRetries = 0;
|
||||
WDScanParam scan ATTRIBUTE_ALIGN(32);
|
||||
WD_Info info ATTRIBUTE_ALIGN(32);
|
||||
int unlockRetries = 0;
|
||||
int driver;
|
||||
u8* buffer;
|
||||
WD_Info info ATTRIBUTE_ALIGN(32);
|
||||
WDScanParam scan;
|
||||
int cleanupRetries = 0;
|
||||
int scanRetries = 0;
|
||||
u8 macAddress[6];
|
||||
if (allocateMemory == NULL || releaseMemory == NULL) {
|
||||
if (!allocateMemory || !releaseMemory) {
|
||||
return -1;
|
||||
}
|
||||
driver = NCDLockWirelessDriver();
|
||||
@@ -157,7 +157,7 @@ startup:
|
||||
memcpy(macAddress, info.MAC, 6);
|
||||
}
|
||||
buffer = AOSSi_Alloc(0x3200);
|
||||
if (buffer != NULL) {
|
||||
if (buffer) {
|
||||
memset(buffer, 0, 0x3200);
|
||||
scan.channelBit = info.enableChannel;
|
||||
scan.maxChannelTime = 40;
|
||||
@@ -178,37 +178,37 @@ startup:
|
||||
count = *(u16*)buffer;
|
||||
if (count != 0) {
|
||||
list = AOSSi_Alloc(sizeof(*list) + (count - 1) * sizeof(struct AOSSAccessPoint));
|
||||
if (list == NULL) {
|
||||
if (!list) {
|
||||
result = -1;
|
||||
break;
|
||||
}
|
||||
list->count = count;
|
||||
descriptor = (WDBssDesc*)&buffer[2];
|
||||
for (index = 0; index < count; ++index) {
|
||||
struct AOSSAccessPoint* accessPoint = &list->accessPoints[index];
|
||||
int rate;
|
||||
int rateCount = 0;
|
||||
accessPoint->ssidLength = descriptor->ssidLength;
|
||||
memcpy(accessPoint->ssid, descriptor->ssid, 32);
|
||||
accessPoint->channel = descriptor->channel;
|
||||
memcpy(accessPoint->bssid, descriptor->bssid, 6);
|
||||
int rateCount;
|
||||
list->accessPoints[index].ssidLength = descriptor->ssidLength;
|
||||
memcpy(list->accessPoints[index].ssid, descriptor->ssid, 32);
|
||||
list->accessPoints[index].channel = descriptor->channel;
|
||||
memcpy(list->accessPoints[index].bssid, descriptor->bssid, 6);
|
||||
rateCount = 0;
|
||||
for (rate = 0; rate < 12; ++rate) {
|
||||
if (descriptor->rateSet.support & supportedRates[rate].mask) {
|
||||
accessPoint->rates[rateCount] = supportedRates[rate].value;
|
||||
list->accessPoints[index].rates[rateCount] = supportedRates[rate].value;
|
||||
if (descriptor->rateSet.basic & supportedRates[rate].mask) {
|
||||
accessPoint->rates[rateCount] |= 128;
|
||||
list->accessPoints[index].rates[rateCount] |= 128;
|
||||
}
|
||||
++rateCount;
|
||||
}
|
||||
}
|
||||
accessPoint->rateCount = rateCount;
|
||||
accessPoint->beaconPeriod = descriptor->beaconPeriod;
|
||||
list->accessPoints[index].rateCount = rateCount;
|
||||
list->accessPoints[index].beaconPeriod = descriptor->beaconPeriod;
|
||||
if ((descriptor->capabilities & 3) == 1) {
|
||||
accessPoint->mode = 1;
|
||||
list->accessPoints[index].mode = 1;
|
||||
} else if ((descriptor->capabilities & 3) == 2) {
|
||||
accessPoint->mode = 2;
|
||||
list->accessPoints[index].mode = 2;
|
||||
} else {
|
||||
accessPoint->mode = 0;
|
||||
list->accessPoints[index].mode = 0;
|
||||
}
|
||||
descriptor = (WDBssDesc*)((u16*)descriptor + descriptor->length);
|
||||
}
|
||||
@@ -222,7 +222,7 @@ startup:
|
||||
}
|
||||
if (++scanRetries > 10) {
|
||||
list = AOSSi_Alloc(sizeof(*list));
|
||||
if (list == NULL) {
|
||||
if (!list) {
|
||||
result = -1;
|
||||
break;
|
||||
}
|
||||
@@ -236,31 +236,29 @@ startup:
|
||||
AOSSi_Free(buffer);
|
||||
}
|
||||
cleanup:
|
||||
if (WD_Cleanup() != 0) {
|
||||
while (WD_Cleanup() != 0) {
|
||||
if (cleanupRetries > 10) {
|
||||
result = -1;
|
||||
goto unlock;
|
||||
}
|
||||
++cleanupRetries;
|
||||
AOSSi_SleepMs(10);
|
||||
goto cleanup;
|
||||
}
|
||||
unlock:
|
||||
if (NCDUnlockWirelessDriver(driver) != 0) {
|
||||
while (NCDUnlockWirelessDriver(driver) != 0) {
|
||||
if (unlockRetries > 10) {
|
||||
result = -1;
|
||||
return -1;
|
||||
break;
|
||||
}
|
||||
++unlockRetries;
|
||||
AOSSi_SleepMs(10);
|
||||
goto unlock;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionStatus* status) {
|
||||
int retries = 0;
|
||||
int result = 0;
|
||||
int result;
|
||||
WD_Info info ATTRIBUTE_ALIGN(32);
|
||||
NCDIfConfig* interfaceConfig = &AOSSi_NcdIfConfig;
|
||||
NCDIpConfig* ipConfig;
|
||||
@@ -288,6 +286,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
|
||||
}
|
||||
interfaceConfig->netif.wireless.config.manual.ssidLength = (u8)connection->ssidLength;
|
||||
memcpy(interfaceConfig->netif.wireless.config.manual.ssid, connection->ssid, connection->ssidLength);
|
||||
result = 0;
|
||||
ipConfig = &AOSSi_NcdIpConfig;
|
||||
memset(ipConfig, 0, sizeof(*ipConfig));
|
||||
ipConfig->adjust.maxTransferUnit = 1300;
|
||||
@@ -321,13 +320,14 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
|
||||
}
|
||||
}
|
||||
if (result == 0) {
|
||||
u32 ssidLength;
|
||||
status->connected = 1;
|
||||
if (WD_GetInfo(&info) == 0) {
|
||||
status->channel = info.channel;
|
||||
}
|
||||
status->ssidLength = interfaceConfig->netif.wireless.config.manual.ssidLength;
|
||||
memcpy(status->ssid, interfaceConfig->netif.wireless.config.manual.ssid,
|
||||
interfaceConfig->netif.wireless.config.manual.ssidLength);
|
||||
ssidLength = interfaceConfig->netif.wireless.config.manual.ssidLength;
|
||||
status->ssidLength = ssidLength;
|
||||
memcpy(status->ssid, interfaceConfig->netif.wireless.config.manual.ssid, ssidLength);
|
||||
} else {
|
||||
status->connected = 0;
|
||||
}
|
||||
|
||||
@@ -763,7 +763,7 @@ unlock_driver:
|
||||
int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet* previousRecords,
|
||||
u32* changedIndex) {
|
||||
u32 previousIndex;
|
||||
u32 currentIndex = 0;
|
||||
u32 currentIndex;
|
||||
int found = 0;
|
||||
int result = 0;
|
||||
u32 ssidLength;
|
||||
@@ -774,6 +774,7 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
|
||||
AtermApRecord* previousRecord = previousRecords->entries;
|
||||
|
||||
|
||||
currentIndex = 0;
|
||||
for (; currentIndex < currentRecords->count; currentIndex++) {
|
||||
AtermSsidBuffer ssidName;
|
||||
ssidName.clear.word0 = 0;
|
||||
@@ -816,8 +817,6 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
|
||||
int currentHasAoss;
|
||||
int previousHasAoss;
|
||||
|
||||
previousHasAoss = 0;
|
||||
currentHasAoss = 0;
|
||||
aossSsidName.clear.word0 = 0;
|
||||
aossSsidName.clear.word1 = 0;
|
||||
aossSsidName.clear.word2 = 0;
|
||||
@@ -827,6 +826,8 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
|
||||
aossSsidName.clear.word6 = 0;
|
||||
aossSsidName.clear.word7 = 0;
|
||||
aossSsidName.clear.finalWord = 0;
|
||||
currentHasAoss = 0;
|
||||
previousHasAoss = 0;
|
||||
|
||||
currentRecord = currentRecords->entries;
|
||||
previousRecord = previousRecords->entries;
|
||||
@@ -1646,7 +1647,10 @@ s32 ATERMRunConfigProtocol(void) {
|
||||
SONtoHs(option->length);
|
||||
optionValue = option->value;
|
||||
}
|
||||
if (optionValue != NULL && optionType == 0x101) {
|
||||
if (optionValue == NULL || optionType != 0x101) {
|
||||
break;
|
||||
}
|
||||
{
|
||||
AtermProgress progress;
|
||||
u32 authenticationTime = (u32)(OSGetTime() /
|
||||
(__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6));
|
||||
@@ -1870,13 +1874,13 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
|
||||
union { u64 value; u8 bytes[8]; } counter;
|
||||
u32 initialValue[2];
|
||||
u8* outputBlock;
|
||||
s32 blockOffset;
|
||||
s32 blockIndex;
|
||||
u8* destinationBytes;
|
||||
const u8* sourceBytes;
|
||||
u32 rounds;
|
||||
s32 blockCount;
|
||||
s32 pass;
|
||||
s32 blockIndex;
|
||||
s32 blockCount;
|
||||
u32 rounds;
|
||||
s32 blockOffset;
|
||||
int result = 1;
|
||||
|
||||
initialValue[1] = 0xA6A6A6A6;
|
||||
@@ -1895,11 +1899,11 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
|
||||
memcpy(destinationBytes + 8, sourceBytes, length);
|
||||
memcpy(block.bytes, initialValue, sizeof(initialValue));
|
||||
for (pass = 0; pass < 6; pass++) {
|
||||
for (blockOffset = 8, blockIndex = 1; blockIndex <= blockCount; blockIndex++, blockOffset += 8) {
|
||||
for (blockIndex = 1, blockOffset = 8; blockIndex <= blockCount; blockIndex++, blockOffset += 8) {
|
||||
u64 passBase = (u64)(s64)blockCount * (u64)(s64)pass;
|
||||
u8* stateBytes = block.bytes;
|
||||
|
||||
outputBlock = destinationBytes + blockOffset;
|
||||
outputBlock = (u8*)(destination + blockOffset / 2);
|
||||
memcpy(stateBytes + 8, outputBlock, 8);
|
||||
ATERMAesEncryptBlock(expandedKey, rounds, stateBytes, stateBytes);
|
||||
counter.value = (u64)(s64)blockIndex + passBase;
|
||||
|
||||
@@ -30,12 +30,10 @@ namespace ipl {
|
||||
namespace scene {
|
||||
extern "C" MEMAllocator sRakuAllocator;
|
||||
MEMAllocator sRakuAllocator;
|
||||
struct RakuStatus {
|
||||
RakuProgress progress;
|
||||
RakuConfiguration configuration;
|
||||
};
|
||||
extern "C" RakuStatus sRakuStatus;
|
||||
RakuStatus sRakuStatus;
|
||||
extern "C" RakuProgress sRakuStatus;
|
||||
RakuProgress sRakuStatus;
|
||||
extern "C" RakuConfiguration sRakuConfiguration;
|
||||
RakuConfiguration sRakuConfiguration;
|
||||
extern "C" OSMessageQueue sRakuMsgQueue;
|
||||
OSMessageQueue sRakuMsgQueue;
|
||||
static u32 startTimeHigh = 0;
|
||||
@@ -61,8 +59,7 @@ public:
|
||||
virtual ~RakuRakuThread();
|
||||
virtual void* Run();
|
||||
virtual void unk_0x2C() = 0;
|
||||
void syncRakuProgress();
|
||||
static void progressCallback(RakuProgress* progress);
|
||||
static void syncRakuProgress(RakuProgress* progress);
|
||||
void destroy();
|
||||
int start();
|
||||
int getState();
|
||||
@@ -79,19 +76,15 @@ private:
|
||||
MEMHeapHandle mHeap;
|
||||
};
|
||||
|
||||
void RakuRakuThread::syncRakuProgress() {
|
||||
void RakuRakuThread::syncRakuProgress(RakuProgress* progress) {
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
sRakuStatus.progress = *(RakuProgress*)this;
|
||||
sRakuStatus = *progress;
|
||||
OSTime time = OSGetTime();
|
||||
startTimeHigh = time >> 32;
|
||||
startTimeLow = time;
|
||||
OSRestoreInterrupts(interrupts);
|
||||
}
|
||||
|
||||
void RakuRakuThread::progressCallback(RakuProgress* progress) {
|
||||
((RakuRakuThread*)progress)->syncRakuProgress();
|
||||
}
|
||||
|
||||
RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
|
||||
u32 version = ATERMi_ApConfigGetVersion();
|
||||
if (((version >> 12) & 15) * 10 + ((version >> 8) & 15) != 1) {
|
||||
@@ -148,14 +141,14 @@ int RakuRakuThread::start() {
|
||||
mPriority = OSGetThreadPriority(OSGetCurrentThread()) - 1;
|
||||
active = true;
|
||||
mFinished = 0;
|
||||
memset(&sRakuStatus.configuration, 0, sizeof(RakuConfiguration));
|
||||
memset(&sRakuStatus.progress, 0, sizeof(RakuProgress));
|
||||
memset(&sRakuConfiguration, 0, sizeof(RakuConfiguration));
|
||||
memset(&sRakuStatus, 0, sizeof(RakuProgress));
|
||||
SOLibraryConfig socketConfig;
|
||||
socketConfig.alloc = RakuSocketAlloc;
|
||||
socketConfig.free = RakuSocketFree;
|
||||
SOInit(&socketConfig);
|
||||
ATERMi_ApConfigStart(mPriority, 200,
|
||||
progressCallback,
|
||||
syncRakuProgress,
|
||||
RakuAtermAlloc, RakuAtermFree, 4096);
|
||||
if (!mRunning) {
|
||||
mRunning = 1;
|
||||
@@ -207,7 +200,7 @@ int RakuRakuThread::getState() {
|
||||
return 0;
|
||||
}
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
switch (sRakuStatus.progress.state) {
|
||||
switch (sRakuStatus.state) {
|
||||
case 1: displayState = 1; break;
|
||||
case 2: displayState = 2; break;
|
||||
case 3: displayState = 2; break;
|
||||
@@ -229,6 +222,30 @@ int RakuRakuThread::cancel() {
|
||||
return OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
|
||||
}
|
||||
|
||||
inline void copyRakuPrivacy(NCDApConfig* config, const RakuConfiguration* settings) {
|
||||
if (settings->security == 1) {
|
||||
config->privacy.mode = 1;
|
||||
config->privacy.wep40.keyId = settings->keyId;
|
||||
for (int index = 0; index < 4; ++index) {
|
||||
memcpy(config->privacy.wep40.key[index], settings->wepKeys[index], 5);
|
||||
}
|
||||
} else if (settings->security == 2) {
|
||||
config->privacy.mode = 2;
|
||||
config->privacy.wep104.keyId = settings->keyId;
|
||||
for (int index = 0; index < 4; ++index) {
|
||||
memcpy(config->privacy.wep104.key[index], settings->wepKeys[index], 13);
|
||||
}
|
||||
} else if (settings->security == 4) {
|
||||
config->privacy.mode = 4;
|
||||
memcpy(config->privacy.tkip.key, settings->passphrase, 64);
|
||||
config->privacy.tkip.keyLen = strlen(settings->passphrase);
|
||||
} else if (settings->security == 5) {
|
||||
config->privacy.mode = 6;
|
||||
memcpy(config->privacy.aes.key, settings->passphrase, 64);
|
||||
config->privacy.aes.keyLen = strlen(settings->passphrase);
|
||||
}
|
||||
}
|
||||
|
||||
int RakuRakuThread::finish(NCDApConfig* config, int* result) {
|
||||
if (!active) {
|
||||
if (result != NULL) {
|
||||
@@ -236,49 +253,29 @@ int RakuRakuThread::finish(NCDApConfig* config, int* result) {
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
s32 state = sRakuStatus.progress.state;
|
||||
if ((u32)(state - 6) > 1) {
|
||||
return 0;
|
||||
}
|
||||
if (!mFinished) {
|
||||
if (state == 6) {
|
||||
ATERMi_ApConfigGetResult(&sRakuStatus.configuration);
|
||||
printInfo();
|
||||
s32 state = sRakuStatus.state;
|
||||
if ((u32)(state - 6) <= 1) {
|
||||
if (!mFinished) {
|
||||
if (state == 6) {
|
||||
ATERMi_ApConfigGetResult(&sRakuConfiguration);
|
||||
printInfo();
|
||||
}
|
||||
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
|
||||
return 0;
|
||||
}
|
||||
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
|
||||
SOFinish();
|
||||
active = false;
|
||||
destroy();
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
SOFinish();
|
||||
active = false;
|
||||
destroy();
|
||||
if (config != NULL) {
|
||||
RakuConfiguration* settings = &sRakuStatus.configuration;
|
||||
memcpy(config->ssid, settings->ssid, 32);
|
||||
config->ssidLength = strlen(settings->ssid);
|
||||
if (settings->security == 1) {
|
||||
config->privacy.mode = 1;
|
||||
config->privacy.wep40.keyId = settings->keyId;
|
||||
for (int index = 0; index < 4; ++index) {
|
||||
memcpy(config->privacy.wep40.key[index], settings->wepKeys[index], 5);
|
||||
}
|
||||
} else if (settings->security == 2) {
|
||||
config->privacy.mode = 2;
|
||||
config->privacy.wep104.keyId = settings->keyId;
|
||||
for (int index = 0; index < 4; ++index) {
|
||||
memcpy(config->privacy.wep104.key[index], settings->wepKeys[index], 13);
|
||||
}
|
||||
} else if (settings->security == 4) {
|
||||
config->privacy.mode = 4;
|
||||
memcpy(config->privacy.tkip.key, settings->passphrase, 64);
|
||||
config->privacy.tkip.keyLen = strlen(settings->passphrase);
|
||||
} else if (settings->security == 5) {
|
||||
config->privacy.mode = 6;
|
||||
memcpy(config->privacy.aes.key, settings->passphrase, 64);
|
||||
config->privacy.aes.keyLen = strlen(settings->passphrase);
|
||||
}
|
||||
memcpy(config->ssid, sRakuConfiguration.ssid, 32);
|
||||
config->ssidLength = strlen(sRakuConfiguration.ssid);
|
||||
copyRakuPrivacy(config, &sRakuConfiguration);
|
||||
}
|
||||
if (result != NULL) {
|
||||
*result = sRakuStatus.progress.result;
|
||||
*result = sRakuStatus.result;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -15,10 +15,10 @@ namespace ipl {
|
||||
// clang-format on
|
||||
|
||||
SettingButton::SettingButton(EGG::Heap* heap, int arg) : FaderSceneBase(heap), ::gui::EventHandler() {
|
||||
unk_0x264 = 64;
|
||||
unk_0x268 = 0;
|
||||
unk_0x26C = 0;
|
||||
unk_0x270 = 0;
|
||||
mQueueCapacity = 64;
|
||||
mQueueCount = 0;
|
||||
mQueueRead = 0;
|
||||
mQueueWrite = 0;
|
||||
mSettingArg = arg;
|
||||
mpLayout = NULL;
|
||||
mpLayoutFile = NULL;
|
||||
@@ -81,9 +81,9 @@ namespace ipl {
|
||||
|
||||
FaderSceneCommand SettingButton::calcNormal() {
|
||||
if (!mpLayout->getAnim(ANIM_ALPHA_IN)->isPlaying() && !mpLayout->getAnim(ANIM_ALPHA_OUT)->isPlaying() &&
|
||||
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && unk_0x268 != 0) {
|
||||
Unk unk = unk_0x64[unk_0x26C];
|
||||
switch (unk.command) {
|
||||
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && mQueueCount != 0) {
|
||||
CmdEntry entry = mCmdQueue[mQueueRead];
|
||||
switch (entry.command) {
|
||||
case CMD_SHOW_BTN: {
|
||||
showBtn();
|
||||
break;
|
||||
@@ -93,16 +93,16 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case CMD_SET_TEXT: {
|
||||
setText(unk.msgID);
|
||||
setText(entry.msgID);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (unk_0x268 != 0) {
|
||||
if (++unk_0x26C >= unk_0x264) {
|
||||
unk_0x26C = 0;
|
||||
if (mQueueCount != 0) {
|
||||
if (++mQueueRead >= mQueueCapacity) {
|
||||
mQueueRead = 0;
|
||||
}
|
||||
unk_0x268--;
|
||||
mQueueCount--;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,16 +225,16 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SettingButton::reserve(int command, u32 msgId) {
|
||||
if (unk_0x264 != unk_0x268) {
|
||||
int unk = unk_0x270;
|
||||
unk_0x64[unk].command = command;
|
||||
unk_0x64[unk].msgID = msgId;
|
||||
unk_0x270++;
|
||||
if (mQueueCapacity != mQueueCount) {
|
||||
int writeIdx = mQueueWrite;
|
||||
mCmdQueue[writeIdx].command = command;
|
||||
mCmdQueue[writeIdx].msgID = msgId;
|
||||
mQueueWrite++;
|
||||
|
||||
if (unk_0x270 >= unk_0x264) {
|
||||
unk_0x270 = 0;
|
||||
if (mQueueWrite >= mQueueCapacity) {
|
||||
mQueueWrite = 0;
|
||||
}
|
||||
unk_0x268++;
|
||||
mQueueCount++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
namespace ipl {
|
||||
namespace bs2 {
|
||||
Manager::Manager(EGG::Heap* pHeap)
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), unk_0x0C(true), unk_0x0D(false), unk_0x0E(false), unk_0x0F(false),
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), mbTickEnabled(true), mbUpdateRequested(false), mbAbortRequested(false), mbRestartRequested(false),
|
||||
mbIsDiagDisc(false), mbIncludesSeatTitles(false), mbHasBanner(FALSE), mUnlockedState(BS2_STT_NO_DISK), mbStartUpdate(false),
|
||||
mEntries(NULL), mEntrySize(1), mEntryOffset(0) {
|
||||
mpBannerBuffer = new (pHeap, DEFAULT_ALIGN) u8[BS2_DEFAULT_BANNER_SIZE];
|
||||
@@ -30,13 +30,13 @@ namespace ipl {
|
||||
return mIPLState;
|
||||
}
|
||||
|
||||
if (unk_0x0F && !System::isNandFull()) {
|
||||
if (mbRestartRequested && !System::isNandFull()) {
|
||||
BS2RestartStateMachine();
|
||||
|
||||
unk_0x0C = true;
|
||||
mbTickEnabled = true;
|
||||
mIPLState = IPL_STATE_NO_DISK;
|
||||
unk_0x0F = false;
|
||||
} else if (unk_0x0C) {
|
||||
mbRestartRequested = false;
|
||||
} else if (mbTickEnabled) {
|
||||
BOOL old = OSDisableInterrupts();
|
||||
|
||||
mState = BS2Tick();
|
||||
@@ -51,7 +51,7 @@ namespace ipl {
|
||||
|
||||
if (mbIsDiagDisc && System::isRsrcLoaded()) {
|
||||
__WPADReconnect(TRUE);
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
bootNewSystem();
|
||||
}
|
||||
}
|
||||
@@ -65,7 +65,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::startUpdate() {
|
||||
unk_0x0D = true;
|
||||
mbUpdateRequested = true;
|
||||
mbStartUpdate = true;
|
||||
mPrevEntry = 0;
|
||||
mPrevFound = 0;
|
||||
@@ -88,11 +88,11 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::reserveRVLGame() {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
}
|
||||
|
||||
void Manager::reserveGCGame() {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
}
|
||||
|
||||
void Manager::startRVLGame() {
|
||||
@@ -103,13 +103,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::abort() {
|
||||
unk_0x0E = true;
|
||||
unk_0x0F = false;
|
||||
mbAbortRequested = true;
|
||||
mbRestartRequested = false;
|
||||
}
|
||||
|
||||
void Manager::restart() {
|
||||
unk_0x0E = false;
|
||||
unk_0x0F = true;
|
||||
mbAbortRequested = false;
|
||||
mbRestartRequested = true;
|
||||
|
||||
System::checkNandOverFlowFlagAsync();
|
||||
}
|
||||
@@ -195,7 +195,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BS2_STT_64: {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
break;
|
||||
}
|
||||
@@ -216,25 +216,25 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::execTick(BS2State state) {
|
||||
if (unk_0x0D) {
|
||||
if (mbUpdateRequested) {
|
||||
if (state == BS2_STT_UPDATE_DISK) {
|
||||
BS2StartUpdate();
|
||||
} else {
|
||||
mbStartUpdate = false;
|
||||
}
|
||||
} else if (unk_0x0E) {
|
||||
} else if (mbAbortRequested) {
|
||||
if (state == BS2_STT_NO_DISK || state == BS2_STT_COVER_OPEN || state == BS2_STT_55 || state == BS2_STT_WRONG_DISK ||
|
||||
state == BS2_STT_66 || state == BS2_STT_67 || state == BS2_STT_68 || state == BS2_STT_FATAL_ERROR ||
|
||||
state == BS2_STT_UPDATE_FAILED || state == BS2_STT_DIRTY_DISK) {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
} else {
|
||||
BS2AbortStateMachine();
|
||||
}
|
||||
}
|
||||
|
||||
unk_0x0D = false;
|
||||
unk_0x0E = false;
|
||||
mbUpdateRequested = false;
|
||||
mbAbortRequested = false;
|
||||
}
|
||||
|
||||
void Manager::updateTick() {
|
||||
|
||||
@@ -43,13 +43,13 @@ namespace ipl {
|
||||
mMessageID = msgId;
|
||||
|
||||
// Debug related? (seems to be incomplete; unused)
|
||||
unk_0x0C = arg2;
|
||||
unk_0x10 = arg3;
|
||||
mArg2 = arg2;
|
||||
mArg3 = arg3;
|
||||
if (arg1) {
|
||||
strncpy(unk_0x14, arg1, sizeof(unk_0x14));
|
||||
unk_0x14[sizeof(unk_0x14) - 1] = 0;
|
||||
strncpy(mArg1, arg1, sizeof(mArg1));
|
||||
mArg1[sizeof(mArg1) - 1] = 0;
|
||||
} else {
|
||||
memset(unk_0x14, 0, sizeof(unk_0x14));
|
||||
memset(mArg1, 0, sizeof(mArg1));
|
||||
}
|
||||
|
||||
curThread = OSGetCurrentThread();
|
||||
|
||||
@@ -47,7 +47,7 @@ namespace ipl {
|
||||
(((mLastError > NWC24_ERR_FILE_OPEN || mLastError < NWC24_ERR_FILE_OTHER) && mLastError != NWC24_ERR_NAND_CORRUPT) && \
|
||||
(mLastError != NWC24_ERR_FILE_EXISTS && mLastError != NWC24_ERR_INTERNAL_VF && mLastError != NWC24_ERR_FILE_BROKEN))
|
||||
|
||||
Manager::Manager(EGG::Heap* heap) : mbReviecedMsg(false), unk_0xA31(false), mbReceivePaused(false), unk_0xA33(false) {
|
||||
Manager::Manager(EGG::Heap* heap) : mbReviecedMsg(false), mbReceiving(false), mbReceivePaused(false), mbNewTitleTblReady(false) {
|
||||
OSInitMutex(&mLock);
|
||||
OSInitMutex(&mAutoLock);
|
||||
|
||||
@@ -526,7 +526,7 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
unk_0xA31 = true;
|
||||
mbReceiving = true;
|
||||
|
||||
NWC24UserId myUserId;
|
||||
getMyUserId(&myUserId);
|
||||
@@ -910,8 +910,8 @@ namespace ipl {
|
||||
|
||||
close();
|
||||
|
||||
unk_0xA33 = true;
|
||||
unk_0xA31 = false;
|
||||
mbNewTitleTblReady = true;
|
||||
mbReceiving = false;
|
||||
}
|
||||
|
||||
void Manager::addDlTask() {
|
||||
@@ -996,7 +996,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
BOOL Manager::getNewTitleTbl(u32* titleTbl) const {
|
||||
if (!unk_0xA33) {
|
||||
if (!mbNewTitleTblReady) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ namespace ipl {
|
||||
if (System::getPostmanManager()->IsUnknown() ||
|
||||
(System::getSceneManager() != NULL && System::getScene(SCENE_ADDRESS) != NULL)) {
|
||||
if (System::getNwc24Manager() != NULL && !System::isNandFull()) {
|
||||
if (System::createdAfterAndLibMgr() && !System::getNwc24Manager()->isUnk0xA31()) {
|
||||
if (System::createdAfterAndLibMgr() && !System::getNwc24Manager()->isReceivingIdle()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -914,7 +914,8 @@ void CArGBAOdh::cdj_c_setQuantizationTable(SArCDJ_OdhMaster* master, u32 quality
|
||||
for (i = 0; i < 64; i++) {
|
||||
temp = ((const u16*)gArAANScales)[i];
|
||||
temp *= quantization[table * 64 + i];
|
||||
master->quantizationTables[table * 64 + i] = 0x4000000 / temp;
|
||||
temp = 0x4000000 / temp;
|
||||
master->quantizationTables[table * 64 + i] = temp;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1193,8 +1194,9 @@ s32 CArGBAOdh::huffmanCoder(u16* coefficientInput, SArCDJ_HuffmanRequest* reques
|
||||
}
|
||||
}
|
||||
code = request->dcTable[bitCount];
|
||||
if (EmitBit(((code & 0xFFFFFF) << bitCount) | (difference & ((1 << bitCount) - 1)), ((s32)code >> 24) + bitCount,
|
||||
request) == ODH_ERROR_80000004) {
|
||||
magnitude = (difference & ((1 << bitCount) - 1)) | ((code & 0xFFFFFF) << bitCount);
|
||||
code = (s32)code >> 24;
|
||||
if (EmitBit(magnitude, code + bitCount, request) == ODH_ERROR_80000004) {
|
||||
return ODH_ERROR_80000004;
|
||||
}
|
||||
|
||||
@@ -1223,8 +1225,9 @@ s32 CArGBAOdh::huffmanCoder(u16* coefficientInput, SArCDJ_HuffmanRequest* reques
|
||||
}
|
||||
}
|
||||
code = request->acTable[bitCount];
|
||||
if (EmitBit(((code & 0xFFFFFF) << bitCount) | (runLength & ((1 << bitCount) - 1)), ((s32)code >> 24) + bitCount,
|
||||
request) == ODH_ERROR_80000004) {
|
||||
magnitude = (runLength & ((1 << bitCount) - 1)) | ((code & 0xFFFFFF) << bitCount);
|
||||
code = (s32)code >> 24;
|
||||
if (EmitBit(magnitude, code + bitCount, request) == ODH_ERROR_80000004) {
|
||||
return ODH_ERROR_80000004;
|
||||
}
|
||||
|
||||
@@ -1243,8 +1246,9 @@ s32 CArGBAOdh::huffmanCoder(u16* coefficientInput, SArCDJ_HuffmanRequest* reques
|
||||
}
|
||||
}
|
||||
code = request->dcTable[bitCount];
|
||||
if (EmitBit(((code & 0xFFFFFF) << bitCount) | (value & ((1 << bitCount) - 1)), ((s32)code >> 24) + bitCount,
|
||||
request) == ODH_ERROR_80000004) {
|
||||
magnitude = (value & ((1 << bitCount) - 1)) | ((code & 0xFFFFFF) << bitCount);
|
||||
code = (s32)code >> 24;
|
||||
if (EmitBit(magnitude, code + bitCount, request) == ODH_ERROR_80000004) {
|
||||
return ODH_ERROR_80000004;
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
3943
tools/decomp-assist/fz1.attempts.md
Normal file
3943
tools/decomp-assist/fz1.attempts.md
Normal file
File diff suppressed because it is too large
Load Diff
69
tools/decomp-assist/fz1.next.final-gate.txt
Normal file
69
tools/decomp-assist/fz1.next.final-gate.txt
Normal file
@@ -0,0 +1,69 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] objdiff: code None/500 data 240/240 functions 0/1 fuzzy 99.3600 linked code 0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] instruction-exact functions: 0/1
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .bss size 208 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .data size 24 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .sdata size 8 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .text size 500 match 99.36
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] below 100: FAAttach 99.36
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] baseline: code None/500 data 240 functions 0 fuzzy 99.3600
|
||||
[src/bannerSound/AxAdpcmPlayer] pool: IDENTICAL
|
||||
[src/bannerSound/AxAdpcmPlayer] objdiff: code 3088/3088 data 6476/6476 functions 13/13 fuzzy 100.0000 linked code 3088
|
||||
[src/bannerSound/AxAdpcmPlayer] instruction-exact functions: 12/13
|
||||
[src/bannerSound/AxAdpcmPlayer] section .bss size 6400 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .ctors size 4 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .data size 32 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .sbss size 16 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .sdata size 8 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .sdata2 size 16 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .text size 3088 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] baseline: code 3088/3088 data 6476 functions 13 fuzzy 100.0000
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] objdiff: code 332/5200 data 96/180 functions 1/7 fuzzy 98.6539 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] instruction-exact functions: 1/7
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section .data size 40 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section .text size 5200 match 98.65385
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section extab size 56 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section extabindex size 84 match 97.61904
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_8148302C 99.49152
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_81483264 98.902435
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_81483308 99.13793
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_814833F0 99.04256
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_814834AC 99.3586
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8GetKOcandidates 97.96712
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] baseline: code 332/5200 data 96 functions 1 fuzzy 98.6539
|
||||
[src/scene/board/iplFocusObject] pool: IDENTICAL
|
||||
[src/scene/board/iplFocusObject] objdiff: code 20332/20332 data 2576/2576 functions 89/89 fuzzy 100.0000 linked code 0
|
||||
[src/scene/board/iplFocusObject] instruction-exact functions: 89/89
|
||||
[src/scene/board/iplFocusObject] section .data size 2168 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .rodata size 176 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .sdata size 176 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .sdata2 size 56 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .text size 20332 match 100.0
|
||||
[src/scene/board/iplFocusObject] baseline: code 19772/20332 data 2576 functions 88 fuzzy 99.6471
|
||||
[src/system/iplKeyboard] pool: IDENTICAL
|
||||
[src/system/iplKeyboard] objdiff: code 4752/6024 data 1184/1184 functions 31/32 fuzzy 98.7351 linked code 0
|
||||
[src/system/iplKeyboard] instruction-exact functions: 31/32
|
||||
[src/system/iplKeyboard] section .data size 1168 match 100.0
|
||||
[src/system/iplKeyboard] section .sdata size 8 match 100.0
|
||||
[src/system/iplKeyboard] section .sdata2 size 8 match 100.0
|
||||
[src/system/iplKeyboard] section .text size 6024 match 98.73506
|
||||
[src/system/iplKeyboard] below 100: create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap 94.00944
|
||||
[src/system/iplKeyboard] baseline: code 4752/6024 data 1184 functions 31 fuzzy 98.7351
|
||||
[libs/RVL_SDK/src/fa/pf_dir] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/pf_dir] objdiff: code 18976/18976 data 40/40 functions 38/38 fuzzy 100.0000 linked code 0
|
||||
[libs/RVL_SDK/src/fa/pf_dir] instruction-exact functions: 38/38
|
||||
[libs/RVL_SDK/src/fa/pf_dir] section .sdata size 32 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_dir] section .sdata2 size 8 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_dir] section .text size 18976 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_dir] baseline: code 11704/18976 data 40 functions 35 fuzzy 99.5432
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 88.93407 -> 89.19556
|
||||
global fuzzy_match_percent: 99.50078 -> 99.50607
|
||||
global complete_code_percent: 65.19670 -> 65.19670
|
||||
global matched_data_percent: 99.07044 -> 99.07044
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
126
tools/decomp-assist/fz1.next.report.md
Normal file
126
tools/decomp-assist/fz1.next.report.md
Normal file
@@ -0,0 +1,126 @@
|
||||
# Fuzzy lane continuation
|
||||
|
||||
Baseline: `711ee737f98c1febb2e3d9580bec9be423fd3b19`. Four new exact functions; AxAdpcmPlayer was already matched and linked after origin/main #774.
|
||||
|
||||
| Unit | Instruction-exact before → after | Objdiff functions before → after | Code bytes before → after / total | Data bytes before → after / total |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| `libs/RVL_SDK/src/fa/api/FAAttach` | 0/1 → 0/1 | 0/1 → 0/1 | 0 → 0 / 500 | 240 → 240 / 240 |
|
||||
| `src/bannerSound/AxAdpcmPlayer` | 12/13 → 12/13 | 13/13 → 13/13 | 3088 → 3088 / 3088 | 6476 → 6476 / 6476 |
|
||||
| `libs/RVLMiddleware/eZiText/src/clib/zkokeyp` | 1/7 → 1/7 | 1/7 → 1/7 | 332 → 332 / 5200 | 96 → 96 / 180 |
|
||||
| `src/scene/board/iplFocusObject` | 88/89 → 89/89 | 88/89 → 89/89 | 19772 → 20332 / 20332 | 2576 → 2576 / 2576 |
|
||||
| `src/system/iplKeyboard` | 31/32 → 31/32 | 31/32 → 31/32 | 4752 → 4752 / 6024 | 1184 → 1184 / 1184 |
|
||||
| `libs/RVL_SDK/src/fa/pf_dir` | 35/38 → 38/38 | 35/38 → 38/38 | 11704 → 18976 / 18976 | 40 → 40 / 40 |
|
||||
|
||||
Instruction-exact counts above reproduce the gate. Ax reports 12/13 there despite objdiff 13/13; the existing CR1 branch-disassembly normalization issue is independently proven: `checkFile__19AxAdpcmSimplePlayerFPvUl` has all 372 encoded function bytes identical, while odiff displays two different CR1 branch targets. It contributes no new gain.
|
||||
|
||||
## Remaining functions
|
||||
|
||||
- `FAAttach` 99.36% — 125/125 instructions; ten index/scaled-index/table-base register differences. 3 distinct compiled source forms; attempts lines 3166–3168.
|
||||
- `Zi8_8148302C` 99.49152% — 59/59 instructions; six work-pointer/value register differences. 4 distinct compiled source forms; attempts lines 3173–3176.
|
||||
- `Zi8_81483264` 98.902435% — 41/41 instructions; eight metadata/index register differences. 9 distinct compiled source forms; attempts lines 3180–3190.
|
||||
- `Zi8_81483308` 99.13793% — 58/58 instructions; nine count-pointer/index register differences. 7 distinct compiled source forms; attempts lines 3194–3200.
|
||||
- `Zi8_814833F0` 99.04256% — 47/47 instructions; eight key/index register differences. 5 distinct compiled source forms; attempts lines 3205–3209.
|
||||
- `Zi8_814834AC` 99.3586% — 344/343 instructions; extra narrowing in initialized-byte chain, operand scheduling and register differences. 21 distinct compiled source forms; attempts lines 3213–3235.
|
||||
- `Zi8GetKOcandidates` 97.96712% — 673/669 instructions; extra zero load, helper-return narrowing, final postincrement copy, addressing/condition scheduling. 14 distinct compiled source forms; attempts lines 3241–3257.
|
||||
- `create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap` 94.00944% — 318/318 instructions; allocation-result moves across null constructors, dictionary index scheduling and MemoSetting stack-temporary order. 24 distinct compiled source forms; attempts lines 3293–3318.
|
||||
|
||||
## Matched functions and source review
|
||||
|
||||
`focus_object::cmn_calc`: added a real VEC3 sum and result temporary, with reciprocal evaluation inside normalization; frame 0x60 → 0x70, 140/140 instructions, zero differences.
|
||||
`PFDIR_p_move`: corrected the six-argument entry-search prototype, used the matching table entry as the current-directory base, moved the actual cluster read inside that helper, separated LFN traversal lifetimes; 631/631 instructions, zero differences.
|
||||
`PFDIR_p_rename`: shared the typed filename cursor and separated the file, retreat and remaining-LFN counters; corrected error-return branches and count mask; 625/625 instructions, zero differences.
|
||||
`PFDIR_p_mkdir`: ordinary 11-byte short-name loop and full real scalar declaration order, preserving addressable local order; 562/562 instructions, zero differences.
|
||||
|
||||
## Data proof
|
||||
|
||||
FAAttach 240/240, Ax 6476/6476, focus 2576/2576, keyboard 1184/1184, PF 40/40 already have all data matched. No config/symbol rename or extent edit was justified.
|
||||
zkokeyp .data 40-byte ten-entry switch table is byte-identical and each relocation names the exact Zi8_81483118 at the same offset/addend. extab 56 bytes match. extabindex 84 bytes differ only at length words offset64 (1376 versus1372 for Zi8_814834AC) and offset76 (2692 versus2676 for Zi8GetKOcandidates). Exception relocations resolve to identical extab offsets0,8,16,24,32,40,48; anonymous compiler symbol names differ as expected. The candidate function begins four bytes later in our .text because the previous function has an extra instruction. The remaining data differences follow these two code lengths.
|
||||
|
||||
## Files and local commits
|
||||
|
||||
- `libs/RVL_SDK/src/fa/pf_dir.c`
|
||||
- `src/scene/board/iplFocusObject.cpp`
|
||||
- `tools/decomp-assist/fz1.attempts.md`
|
||||
- `tools/decomp-assist/fz1.next.final-gate.txt`
|
||||
- `tools/decomp-assist/fz1.next.report.md`
|
||||
|
||||
- d4976af8 match focus vector interpolation
|
||||
- 0035e899 match directory move and correct entry prototype
|
||||
- d5de7189 match directory rename traversal
|
||||
- 9170cd3e match directory creation locals
|
||||
|
||||
The final evidence commit is identified in the final reply. Matching phase only; the gate retains the existing linked status.
|
||||
|
||||
## Final clean gate, verbatim
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] objdiff: code None/500 data 240/240 functions 0/1 fuzzy 99.3600 linked code 0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] instruction-exact functions: 0/1
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .bss size 208 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .data size 24 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .sdata size 8 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .text size 500 match 99.36
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] below 100: FAAttach 99.36
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] baseline: code None/500 data 240 functions 0 fuzzy 99.3600
|
||||
[src/bannerSound/AxAdpcmPlayer] pool: IDENTICAL
|
||||
[src/bannerSound/AxAdpcmPlayer] objdiff: code 3088/3088 data 6476/6476 functions 13/13 fuzzy 100.0000 linked code 3088
|
||||
[src/bannerSound/AxAdpcmPlayer] instruction-exact functions: 12/13
|
||||
[src/bannerSound/AxAdpcmPlayer] section .bss size 6400 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .ctors size 4 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .data size 32 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .sbss size 16 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .sdata size 8 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .sdata2 size 16 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] section .text size 3088 match 100.0
|
||||
[src/bannerSound/AxAdpcmPlayer] baseline: code 3088/3088 data 6476 functions 13 fuzzy 100.0000
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] objdiff: code 332/5200 data 96/180 functions 1/7 fuzzy 98.6539 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] instruction-exact functions: 1/7
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section .data size 40 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section .text size 5200 match 98.65385
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section extab size 56 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section extabindex size 84 match 97.61904
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_8148302C 99.49152
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_81483264 98.902435
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_81483308 99.13793
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_814833F0 99.04256
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_814834AC 99.3586
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8GetKOcandidates 97.96712
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] baseline: code 332/5200 data 96 functions 1 fuzzy 98.6539
|
||||
[src/scene/board/iplFocusObject] pool: IDENTICAL
|
||||
[src/scene/board/iplFocusObject] objdiff: code 20332/20332 data 2576/2576 functions 89/89 fuzzy 100.0000 linked code 0
|
||||
[src/scene/board/iplFocusObject] instruction-exact functions: 89/89
|
||||
[src/scene/board/iplFocusObject] section .data size 2168 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .rodata size 176 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .sdata size 176 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .sdata2 size 56 match 100.0
|
||||
[src/scene/board/iplFocusObject] section .text size 20332 match 100.0
|
||||
[src/scene/board/iplFocusObject] baseline: code 19772/20332 data 2576 functions 88 fuzzy 99.6471
|
||||
[src/system/iplKeyboard] pool: IDENTICAL
|
||||
[src/system/iplKeyboard] objdiff: code 4752/6024 data 1184/1184 functions 31/32 fuzzy 98.7351 linked code 0
|
||||
[src/system/iplKeyboard] instruction-exact functions: 31/32
|
||||
[src/system/iplKeyboard] section .data size 1168 match 100.0
|
||||
[src/system/iplKeyboard] section .sdata size 8 match 100.0
|
||||
[src/system/iplKeyboard] section .sdata2 size 8 match 100.0
|
||||
[src/system/iplKeyboard] section .text size 6024 match 98.73506
|
||||
[src/system/iplKeyboard] below 100: create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap 94.00944
|
||||
[src/system/iplKeyboard] baseline: code 4752/6024 data 1184 functions 31 fuzzy 98.7351
|
||||
[libs/RVL_SDK/src/fa/pf_dir] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/pf_dir] objdiff: code 18976/18976 data 40/40 functions 38/38 fuzzy 100.0000 linked code 0
|
||||
[libs/RVL_SDK/src/fa/pf_dir] instruction-exact functions: 38/38
|
||||
[libs/RVL_SDK/src/fa/pf_dir] section .sdata size 32 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_dir] section .sdata2 size 8 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_dir] section .text size 18976 match 100.0
|
||||
[libs/RVL_SDK/src/fa/pf_dir] baseline: code 11704/18976 data 40 functions 35 fuzzy 99.5432
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 88.93407 -> 89.19556
|
||||
global fuzzy_match_percent: 99.50078 -> 99.50607
|
||||
global complete_code_percent: 65.19670 -> 65.19670
|
||||
global matched_data_percent: 99.07044 -> 99.07044
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
107
tools/decomp-assist/fz1.r2.final-gate.txt
Normal file
107
tools/decomp-assist/fz1.r2.final-gate.txt
Normal file
@@ -0,0 +1,107 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] pool: IDENTICAL
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] objdiff: code None/500 data 240/240 functions 0/1 fuzzy 99.3600 linked code 0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] instruction-exact functions: 0/1
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .bss size 208 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .data size 24 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .sdata size 8 match 100.0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] section .text size 500 match 99.36
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] below 100: FAAttach 99.36
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] baseline: code None/500 data 240 functions 0 fuzzy 99.3600
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] pool: IDENTICAL
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] objdiff: code 332/5200 data 96/180 functions 1/7 fuzzy 98.6539 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] instruction-exact functions: 1/7
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section .data size 40 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section .text size 5200 match 98.65385
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section extab size 56 match 100.0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section extabindex size 84 match 97.61904
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_8148302C 99.49152
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_81483264 98.902435
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_81483308 99.13793
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_814833F0 99.04256
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_814834AC 99.3586
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8GetKOcandidates 97.96712
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] baseline: code 332/5200 data 96 functions 1 fuzzy 98.6539
|
||||
[src/system/iplKeyboard] pool: IDENTICAL
|
||||
[src/system/iplKeyboard] objdiff: code 4752/6024 data 1184/1184 functions 31/32 fuzzy 98.7351 linked code 0
|
||||
[src/system/iplKeyboard] instruction-exact functions: 31/32
|
||||
[src/system/iplKeyboard] section .data size 1168 match 100.0
|
||||
[src/system/iplKeyboard] section .sdata size 8 match 100.0
|
||||
[src/system/iplKeyboard] section .sdata2 size 8 match 100.0
|
||||
[src/system/iplKeyboard] section .text size 6024 match 98.73506
|
||||
[src/system/iplKeyboard] below 100: create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap 94.00944
|
||||
[src/system/iplKeyboard] baseline: code 4752/6024 data 1184 functions 31 fuzzy 98.7351
|
||||
[src/BS2/BS2Update] pool: IDENTICAL
|
||||
[src/BS2/BS2Update] objdiff: code 400/4052 data 10488/10488 functions 9/10 fuzzy 94.2300 linked code 0
|
||||
[src/BS2/BS2Update] instruction-exact functions: 9/10
|
||||
[src/BS2/BS2Update] section .bss size 9056 match 100.0
|
||||
[src/BS2/BS2Update] section .data size 1328 match 100.0
|
||||
[src/BS2/BS2Update] section .sbss size 80 match 100.0
|
||||
[src/BS2/BS2Update] section .sdata size 24 match 100.0
|
||||
[src/BS2/BS2Update] section .text size 4052 match 94.23001
|
||||
[src/BS2/BS2Update] below 100: UpdateThread 93.59803
|
||||
[src/BS2/BS2Update] baseline: code 112/4052 data 10488 functions 8 fuzzy 91.6604
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 37608/53564 data 6904/6904 functions 221/233 fuzzy 99.3644 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 221/233
|
||||
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
|
||||
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
|
||||
[src/channelScript/CHANSVm] section .text size 53564 match 99.364426
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmConvertToFloatFromStr 97.59036
|
||||
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
|
||||
[src/channelScript/CHANSVm] below 100: VmStringReplace 97.878784
|
||||
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmFormatString 99.84919
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.949104
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.452614
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmAddExe 99.625984
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.46608
|
||||
[src/channelScript/CHANSVm] baseline: code 37608/53564 data 6904 functions 221 fuzzy 99.3644
|
||||
[src/BS2/BS2Mach] pool: IDENTICAL
|
||||
[src/BS2/BS2Mach] objdiff: code 4940/16980 data 155504/158528 functions 24/29 fuzzy 98.1595 linked code 0
|
||||
[src/BS2/BS2Mach] instruction-exact functions: 24/29
|
||||
[src/BS2/BS2Mach] section .bss size 155232 match 100.0
|
||||
[src/BS2/BS2Mach] section .data size 3024 match None
|
||||
[src/BS2/BS2Mach] section .sbss size 240 match 100.0
|
||||
[src/BS2/BS2Mach] section .sdata size 32 match 100.0
|
||||
[src/BS2/BS2Mach] section .text size 16980 match 98.159485
|
||||
[src/BS2/BS2Mach] below 100: Run 16.744186
|
||||
[src/BS2/BS2Mach] below 100: BS2StartGame 98.72774
|
||||
[src/BS2/BS2Mach] below 100: BS2StartGCGame 99.5614
|
||||
[src/BS2/BS2Mach] below 100: CheckBS2CommandStatus 99.50739
|
||||
[src/BS2/BS2Mach] below 100: BS2Tick 98.230415
|
||||
[src/BS2/BS2Mach] baseline: code 4940/16980 data 155504 functions 24 fuzzy 97.8276
|
||||
[src/scene/setting/AOSS] pool: IDENTICAL
|
||||
[src/scene/setting/AOSS] objdiff: code 6436/16192 data 3928/3928 functions 16/21 fuzzy 96.7779 linked code 0
|
||||
[src/scene/setting/AOSS] instruction-exact functions: 15/21
|
||||
[src/scene/setting/AOSS] section .bss size 3496 match 100.0
|
||||
[src/scene/setting/AOSS] section .data size 368 match 100.0
|
||||
[src/scene/setting/AOSS] section .sbss size 32 match 100.0
|
||||
[src/scene/setting/AOSS] section .sdata size 24 match 100.0
|
||||
[src/scene/setting/AOSS] section .sdata2 size 8 match 100.0
|
||||
[src/scene/setting/AOSS] section .text size 16192 match 96.777916
|
||||
[src/scene/setting/AOSS] below 100: AOSS_Init_old 93.78725
|
||||
[src/scene/setting/AOSS] below 100: AOSSDecryptMessage 97.74143
|
||||
[src/scene/setting/AOSS] below 100: AOSSApplyAuthOptions 98.77193
|
||||
[src/scene/setting/AOSS] below 100: AOSSSendHelloRequest 92.190475
|
||||
[src/scene/setting/AOSS] below 100: AOSSXorBufferWithKey 98.605446
|
||||
[src/scene/setting/AOSS] baseline: code 6436/16192 data 3928 functions 16 fuzzy 96.7779
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 89.64909 -> 89.65871
|
||||
global fuzzy_match_percent: 99.53278 -> 99.53815
|
||||
global complete_code_percent: 67.39544 -> 67.39544
|
||||
global matched_data_percent: 99.36508 -> 99.36508
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
review note: libs/RVL_SDK/include/revolution/dvd.h: volatile object declaration (orchestrator checks the target really re-reads it) (+1 net), e.g. volatile s32 state;
|
||||
review note: src/BS2/BS2Mach.c: volatile object declaration (orchestrator checks the target really re-reads it) (+1 net), e.g. vu32 LowReadResult = 0;
|
||||
review note: src/BS2/BS2Update.c: volatile object declaration (orchestrator checks the target really re-reads it) (+1 net), e.g. static volatile s32 rc = 0;
|
||||
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
|
||||
GATE PASS
|
||||
129
tools/decomp-assist/fz1.r2.report.md
Normal file
129
tools/decomp-assist/fz1.r2.report.md
Normal file
@@ -0,0 +1,129 @@
|
||||
# Fuzzy lane round 2, final verified handoff
|
||||
|
||||
One new exact function: `BS2UpdateInit`. Two additional target-proven volatile/poll corrections improve fuzzy code, and remain non-matching. All 31 remaining functions have at least three distinct successfully compiled source forms logged; build failures do not count.
|
||||
|
||||
Final full gate (no `--quick`; clean build):
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] objdiff: code None/500 data 240/240 functions 0/1 fuzzy 99.3600 linked code 0
|
||||
[libs/RVL_SDK/src/fa/api/FAAttach] instruction-exact functions: 0/1
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] objdiff: code 332/5200 data 96/180 functions 1/7 fuzzy 98.6539 linked code 0
|
||||
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] instruction-exact functions: 1/7
|
||||
[src/system/iplKeyboard] objdiff: code 4752/6024 data 1184/1184 functions 31/32 fuzzy 98.7351 linked code 0
|
||||
[src/system/iplKeyboard] instruction-exact functions: 31/32
|
||||
[src/BS2/BS2Update] objdiff: code 400/4052 data 10488/10488 functions 9/10 fuzzy 94.2300 linked code 0
|
||||
[src/BS2/BS2Update] instruction-exact functions: 9/10
|
||||
[src/channelScript/CHANSVm] objdiff: code 37608/53564 data 6904/6904 functions 221/233 fuzzy 99.3644 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 221/233
|
||||
[src/BS2/BS2Mach] objdiff: code 4940/16980 data 155504/158528 functions 24/29 fuzzy 98.1595 linked code 0
|
||||
[src/BS2/BS2Mach] instruction-exact functions: 24/29
|
||||
[src/scene/setting/AOSS] objdiff: code 6436/16192 data 3928/3928 functions 16/21 fuzzy 96.7779 linked code 0
|
||||
[src/scene/setting/AOSS] instruction-exact functions: 15/21
|
||||
regressions vs baseline: 0
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
Before -> after (matched code/data bytes; denominators unchanged):
|
||||
|
||||
| Unit | Raw gate exact functions | Objdiff exact functions | Code bytes | Data bytes |
|
||||
|---|---|---|---|---|
|
||||
| `libs/RVL_SDK/src/fa/api/FAAttach` | 0/1 -> 0/1 | 0/1 -> 0/1 | 0 -> 0 / 500 | 240 -> 240 / 240 |
|
||||
| `libs/RVLMiddleware/eZiText/src/clib/zkokeyp` | 1/7 -> 1/7 | 1/7 -> 1/7 | 332 -> 332 / 5200 | 96 -> 96 / 180 |
|
||||
| `src/system/iplKeyboard` | 31/32 -> 31/32 | 31/32 -> 31/32 | 4752 -> 4752 / 6024 | 1184 -> 1184 / 1184 |
|
||||
| `src/BS2/BS2Update` | 8/10 -> 9/10 | 8/10 -> 9/10 | 112 -> 400 / 4052 | 10488 -> 10488 / 10488 |
|
||||
| `src/channelScript/CHANSVm` | 221/233 -> 221/233 | 221/233 -> 221/233 | 37608 -> 37608 / 53564 | 6904 -> 6904 / 6904 |
|
||||
| `src/BS2/BS2Mach` | 24/29 -> 24/29 | 24/29 -> 24/29 | 4940 -> 4940 / 16980 | 155504 -> 155504 / 158528 |
|
||||
| `src/scene/setting/AOSS` | 15/21 -> 15/21 | 16/21 -> 16/21 | 6436 -> 6436 / 16192 | 3928 -> 3928 / 3928 |
|
||||
|
||||
Remaining functions (one line each; successful distinct source forms are additional to declaration permutations):
|
||||
|
||||
- `libs/RVL_SDK/src/fa/api/FAAttach::FAAttach` — 99.36%; Drive index narrowing and attached-table base register allocation; 125/125 instructions. 9 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_8148302C` — 99.49152%; Work pointer and key-table value registers exchange; 59/59. 5 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_81483264` — 98.902435%; Parameter/metadata and byte iteration index registers exchange; 41/41. 6 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_81483308` — 99.13793%; Count pointer and running counter registers exchange; 58/58. 5 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_814833F0` — 99.04256%; Metadata pointer and candidate index registers exchange; 47/47. 5 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8_814834AC` — 99.3586%; Zero initialization chain emits an extra clrlwi; addressing/register operands also differ; 344/343. 8 source forms.
|
||||
- `libs/RVLMiddleware/eZiText/src/clib/zkokeyp::Zi8GetKOcandidates` — 97.96712%; Candidate loop boundaries, helper return narrowing and temporary scheduling; 673/669. 6 source forms.
|
||||
- `src/system/iplKeyboard::create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap` — 94.00944%; Inline resource-node constructor boundary, OEM dictionary index and MemoSetting stack copy order; 318/318. 7 source forms.
|
||||
- `src/BS2/BS2Update::UpdateThread` — 93.59803%; Import/scan branch and store scheduling, common bases and temporaries; proven rc reloads restored, nine target instructions still absent; 904/913. 10 source forms.
|
||||
- `src/channelScript/CHANSVm::CHANSVmConvertToFloatFromStr` — 97.59036%; End pointer initialization store and object-type compare occur in opposite order; 83/83. 6 source forms.
|
||||
- `src/channelScript/CHANSVm::VmDateDtor` — 94.96703%; Variadic date argument and year stack-store scheduling; 91/91. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::VmStringReplace` — 97.878784%; Search/replacement lengths and live cursor register allocation; 132/132. 3 source forms.
|
||||
- `src/channelScript/CHANSVm::VmStringSplit` — 98.04054%; Delimiter/parent cursor and result array register allocation; 222/222. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::CHANSVmFormatString` — 99.84919%; Two temporary object/string-length registers exchange late in the formatter; 431/431. 6 source forms.
|
||||
- `src/channelScript/CHANSVm::VmBlobGetHexString` — 98.71951%; Output offset and decoded hex digit registers exchange; 82/82. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::VmBlobPackCommon` — 97.949104%; Packing mode, format and copy-loop temporary register allocation; 668/668. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::VmBlobUnpack` — 98.452614%; Two-pass format parser and blob cursor/count register allocation; 517/517. 5 source forms.
|
||||
- `src/channelScript/CHANSVm::VmWinEmuWrite` — 99.62687%; String object and total byte-length registers exchange; 67/67. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::CHANSVmAddExe` — 99.625984%; Module header and executable type argument registers exchange, plus address operand order; 254/254. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::CHANSVmLinkModules` — 98.677246%; Dispatch/module/index and global-list pointer registers exchange; 189/189. 4 source forms.
|
||||
- `src/channelScript/CHANSVm::CHANSVmStep` — 96.46608%; Default step count and loop-entry branch form, floating constant bases and opcode temporaries; 1253/1253. 5 source forms.
|
||||
- `src/BS2/BS2Mach::Run` — 16.744186%; Target explicitly clears fixed GPRs and the stack pointer and enters via LR; ordinary C cache-loop/callback forms cannot encode that handoff under the no-asm constraint; 11/43. 3 source forms.
|
||||
- `src/BS2/BS2Mach::BS2StartGame` — 98.72774%; Five initial base/store scheduling operands and five legacy DI address/value register operands remain after fixing all polling loops; 393/393. 17 source forms.
|
||||
- `src/BS2/BS2Mach::BS2StartGCGame` — 99.5614%; External DVD getter call versus inline state load, and wide tick multiplication operand allocation; 228/228. 8 source forms.
|
||||
- `src/BS2/BS2Mach::CheckBS2CommandStatus` — 99.50739%; Partition-count slwi and CacheCommandComplete store occur in opposite order; 406/406. 13 source forms.
|
||||
- `src/BS2/BS2Mach::BS2Tick` — 98.230415%; Boot/hardware address-base sharing, progress-store scheduling and loader output scope; six target instructions absent; 1934/1940. 4 source forms.
|
||||
- `src/scene/setting/AOSS::AOSS_Init_old` — 93.78725%; Timeout default loads share an array base instead of independent references; local/global allocation and initialization/branch scheduling also differ; 1575/1584. 7 source forms.
|
||||
- `src/scene/setting/AOSS::AOSSDecryptMessage` — 97.74143%; Checksum and key schedule/state/input/output cursor registers exchange; 321/321. 4 source forms.
|
||||
- `src/scene/setting/AOSS::AOSSApplyAuthOptions` — 98.77193%; Authentication flags and configuration subrecord pointers use different registers; 114/114. 4 source forms.
|
||||
- `src/scene/setting/AOSS::AOSSSendHelloRequest` — 92.190475%; Common CRC/key-state base hoisting and packet/key/socket local boundaries differ; 271/273. 8 source forms.
|
||||
- `src/scene/setting/AOSS::AOSSXorBufferWithKey` — 98.605446%; Unrolled XOR result ownership and packet/mask address register allocation; 147/147. 21 source forms.
|
||||
|
||||
Data proof and limits:
|
||||
|
||||
- `BS2Update`: `Thread` at 0x810B2580 is an OSThread of size 0x318; target OSCreateThread uses a separate 4096-byte stack starting at thread+0x318. Corrected only the data extent from 0x1318 to 0x318, kept the address and full .bss section size 9056, and left stack bytes unowned. Separate real, initialized thread/stack objects produce 72/72 identical Init instructions and preserve data 10488/10488.
|
||||
- `zkokeyp`: .data and .extab bytes match. .extabindex has two differing real function-size words (1376/1372 and 2692/2676), corresponding to the two remaining functions with extra instructions. No data rename/extent fix can legitimately conceal that.
|
||||
- `BS2Mach`: the first 3020 .data bytes are identical, followed by four zero alignment bytes in the target. Anonymous string/table symbols have no authorized real source object name to pair. Two jump table relocation sets also refer into non-matching functions. Data remains 155504/158528; no invented names, pinned literals or padding objects were added.
|
||||
- Other owned units retain 100% objdiff data. No weak inline/vtable data was suppressed. No other symbol rename or extent correction was made.
|
||||
|
||||
Target proof for qualifiers:
|
||||
|
||||
- DVD state field: repeated target CoverBlock.state reads at 0xDE0 with a back edge from 0xDE8 and no call. Qualification is guarded by BS2_MACH_VOLATILE_DVD_STATE, defined only by BS2Mach.c; all other translation units compile the original header field.
|
||||
- LowReadResult: empty repeated polls at 0x1130/0x117C/0x1290/0x12E8, with further loads at 0x113C/0x129C immediately after poll exits. The previous interrupt calls were absent from target code.
|
||||
- Static signed rc: target store at 0xD5C followed by load at 0xD64, and store at 0xE48 followed by load at 0xE50, with no intervening call. Signed volatile restores two real reads. No use-site volatile cast was added.
|
||||
|
||||
Uncertainties:
|
||||
|
||||
- AOSSParseNetworkSettings is objdiff 100%, byte-identical, and declaration-tool score (0,0). The gate uses odiff, which incorrectly rebases its CR1 conditional branches by the 36-byte function-position delta. The raw gate consequently prints 15/21, while objdiff and bytes prove 16/21. Raw output is preserved verbatim above; source/metadata were not changed to manipulate this metric.
|
||||
- Remaining allocation/scheduling causes are hypotheses supported by target diffs and unsuccessful source experiments, not claims that the original source is known.
|
||||
- Run needs the fixed-register handoff described above; no forbidden assembly or fabricated match was attempted.
|
||||
|
||||
Files changed and source commits:
|
||||
|
||||
```text
|
||||
fcbd5a298408059adaf22d29cecb21b9a9cfa301
|
||||
match update thread creation and object extent
|
||||
|
||||
config/43U/symbols.txt
|
||||
src/BS2/BS2Update.c
|
||||
tools/decomp-assist/fz1.attempts.md
|
||||
```
|
||||
|
||||
```text
|
||||
9ab3eb8183594c3a940d7bbb147de7e3c085bca0
|
||||
restore dvd callback polling
|
||||
|
||||
libs/RVL_SDK/include/revolution/dvd.h
|
||||
src/BS2/BS2Mach.c
|
||||
tools/decomp-assist/fz1.attempts.md
|
||||
```
|
||||
|
||||
```text
|
||||
ce9cff4fa6c2d03310c780b1592d02c49bc6c367
|
||||
preserve update result reloads
|
||||
|
||||
src/BS2/BS2Update.c
|
||||
tools/decomp-assist/fz1.attempts.md
|
||||
```
|
||||
|
||||
Verification artifacts:
|
||||
|
||||
- `tools/decomp-assist/fz1.attempts.md` — structural diagnoses, source variant hashes/results, proofs and final all-open audit.
|
||||
- `tools/decomp-assist/fz1.r2.final-gate.txt` — complete final clean gate output.
|
||||
- `tools/decomp-assist/fz1.r2.report.md` — this report.
|
||||
|
||||
No push, PR, branch switch, rebase, other worktree mutation or subagent was used. Earlier untracked artifacts were left untouched.
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user