Compare commits

...

137 Commits

Author SHA1 Message Date
coah
9b8d11475d cleanup(Controller): name Base/Classic status and pinch fields
- unk_0x08 → mDecideHoldCount (decide() when == 5)
- unk_0x1C → mbForceInvalid (setForceInvalid)
- unk_0x1D/1E → mbPinch/mbPrevPinch (A+B pinch state)
- unk_0x20 → mpStatus
- Classic unk_0x24/2C → mClassicCursor/mClassicCursorTimer

Also update ControllerManager ctor that touches Base fields.

Verified: Controller/ControllerManager 100%/100%, build/43U/ok,
DOL sha1 26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-02 14:18:39 -05:00
coah
413c779180 cleanup(eZiText): rename work unk_0x0A to maxWordLength (#886)
Copied to/from options->maxWordLength; assigned from length.
2026-10-02 14:18:33 -05:00
coah
f9ecefa6a2 cleanup(NWC24Work): rename MBox header/entry work buffers (#883)
sendMbcHeader/recvMbcHeader/mbcEntry for cached MBC structures.
2026-10-02 14:17:06 -05:00
coah
320700d49b cleanup(eZiText): rename work unk_0x141E to graphTableId (#882)
Passed to Zi8GetTableAddress / Zi8GetTableSize (often 0x10).
2026-10-02 14:16:39 -05:00
coah
c52153e9f7 cleanup(eZiText): rename work unk_0x141A to capacity (#880)
Copied into options.capacity in zi8getc2; init to 0x100.
2026-10-02 14:15:52 -05:00
coah
899438ff02 cleanup(NWC24MsgObj): rename unk_0xD0 to extraData (#879)
Written by WriteExtraFields during commit.
2026-10-02 14:15:25 -05:00
coah
8476c93f00 cleanup(eZiText): rename work unk_0x17EA to matchOffset (#878)
Offset into match elements / result buffer during Zi8MatchROMdata1.
2026-10-02 14:14:57 -05:00
coah
9b375e1e50 cleanup(eZiText): rename work unk_0x1764 to groupPtr (#876)
Cursor into DAWG group table (from group / Zi8GetTableAddress).
2026-10-02 14:14:04 -05:00
coah
73795cb3fb cleanup(ErrorHandler): name set() arg storage fields (#875)
Rename unused debug-ish stash fields to match ErrorHandler::set params:
- unk_0x14 → mArg1 (char[4] from arg1)
- unk_0x0C → mArg2
- unk_0x10 → mArg3

Verified: ErrorHandler 100%/100%, build/43U/ok, DOL sha1
26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-02 14:11:44 -05:00
coah
0c780f6d1f cleanup(eZiText): rename work unk_0x1418 to formatCount (#874)
Count of entries filled into formats[]; saved as savedCount.
2026-10-02 14:11:17 -05:00
coah
63f4c7aeab cleanup(NWC24MsgObj): rename flags to headerSize (#873)
Same 0x10 slot as MsgRead headerSize; Commit stamps body offset.
2026-10-02 14:10:50 -05:00
coah
282ddd99b7 cleanup(iplSettingButton): rename Unk ring-buffer placeholders (#872)
Unk -> CmdEntry; unk_0x64 -> mCmdQueue; capacity/count/read/write
indices. Byte-identical (DOL sha1 unchanged).
2026-10-02 14:10:24 -05:00
coah
c7d0f8f01b cleanup(CDBRecordFile): rename unk_0x1C to allocFlag (#871)
Stores CDB_RECORD_ALLOC_* from CDBRecordInstanceInit type arg.
2026-10-02 14:09:58 -05:00
coah
414b553743 cleanup(iplNwc24Manager): name receiving / title-table flags (#870)
unk_0xA31 -> mbReceiving
unk_0xA33 -> mbNewTitleTblReady
isUnk0xA31 -> isReceivingIdle (same == false semantics)

Touched channelTitle / sdChannelTitle / iplResetHandler callers for the getter rename.

Matching units 100% before/after; DOL sha1 unchanged.
2026-10-02 14:09:31 -05:00
coah
da96c27969 cleanup(NWC24MsgObj): rename unk_0x30/38 to fromData/toData (#868)
MIME From/To address spans used by WriteFromField/WriteToField and ReadMsgFromAddr.
2026-10-02 14:08:59 -05:00
coah
0a925c7053 cleanup(iplUrlProcessor): rename collision and processor placeholders (#865)
line_collision: unk_0x00/04/08 -> mLeft/mRight/mY
url_collision: unk_0x00/04/08 -> mTagNo/mpStart/mpEnd
UrlProcessor: unk_0x40..53 -> mHitYOffset/mMemoTranslateY/mCurTagNo/
mSelectedTagNo/mbColorPass/mbInTag/mbHoverOffset/mbFocusEnabled
Rename setUnk/getUnk accessors; update FocusObject call sites.
Byte-identical (DOL sha1 unchanged). Unit objdiff 100%.
2026-10-02 14:07:51 -05:00
coah
c0126c37d4 cleanup(WPADMem): rename WPADMemBlock.unk_0x10 to callback (#864)
Typed as WPADCallback and invoked on disconnect; leave other
_wmb fields that are only zeroed unnamed for now.

Verified: WPAD/WPADMem 100%/100%, build/43U/ok, DOL sha1
26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-02 14:07:46 -05:00
coah
fc2d150c6d cleanup(WPAD): rename unk_0x98D/98E to encStatus/continuous (#863)
encStatus drives extension decode; continuous selects report mode.
2026-10-02 14:07:19 -05:00
coah
7851b2b29f cleanup(NWC24MsgObj): rename unk_0x10 to flags (#862)
Copied to/from mailbox entry->flags in NWC24MBoxCtrl.
2026-10-02 14:05:10 -05:00
coah
263411ccac cleanup(iplContest): name session NAT/HTTP unk fields (#861)
Rename clear Contest session placeholders from usage:
- unk_0x030 → natState (GameSpy/NAT detect state machine)
- unk_0x034 → gsAvailable
- unk_0x038 → natTimedOut
- unk_0x03c → natFailed
- unk_0x7f0 → httpBuf (NHTTP response buffer)

Verified: iplContest 100%/100%, build/43U/ok, DOL sha1 26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-02 14:04:43 -05:00
coah
09de907f0b cleanup(eZiText): rename work unk_0x141F to maxCnt (#860)
Tracks max context->cnt during DAWG match in Matching zi8dawg.
2026-10-02 14:04:17 -05:00
coah
4e3ab6eae5 cleanup(jdec): rename MCU product fields to mcuTotal (#859)
Frame unk_0x14 and work unk_0x1804 are mcuX*mcuY totals.
2026-10-02 14:04:10 -05:00
coah
99d6fe20a2 cleanup(eZiText): rename work unk_0x1410 to formats (#858)
Saved/restored as savedFormats; assigned from formats arrays.
2026-10-02 14:03:44 -05:00
coah
00013016df cleanup(iplBS2Manager): name tick/update/abort/restart flags (#857)
unk_0x0C -> mbTickEnabled
unk_0x0D -> mbUpdateRequested
unk_0x0E -> mbAbortRequested
unk_0x0F -> mbRestartRequested

Matching 100% before/after; DOL sha1 unchanged.
2026-10-02 14:03:18 -05:00
coah
3e279ef189 cleanup(eZiText): rename work unk_0x17F0 to dawgGroup (#856)
Holds NextDawgGroup() cursor in Matching zi8dawg.
2026-10-02 14:02:52 -05:00
coah
32417fe8a2 cleanup(eZiText): rename work unk_0x01 to countOnly (#855)
Assigned/compared with options->countOnly in zi8getc2.
2026-10-02 14:02:44 -05:00
coah
2d9e3ee14a cleanup(eZiText): rename work unk_0x1A to separator (#854)
Init to space (0x20); Matching zi8space emits it; zi8cgetc saves as separator.
2026-10-02 14:00:30 -05:00
coah
23db5e05e1 cleanup(CDBCryptBuf): rename unk_0x3EC00/04 to size/offset (#853)
Decrypt fills size; Matching CDBRecordFile uses offset for seek/tell/read.
2026-10-02 14:00:24 -05:00
coah
741c9263e3 cleanup(iplSDButton): rename unk_0x54 to mAnimWait (#852)
Same pattern as Button: wait flag while help-button click anim plays.
2026-10-02 14:00:18 -05:00
coah
29fe1efaf2 Use the original Raku progress callback directly and link its thread (#851) 2026-10-02 13:32:07 -05:00
devin-ai-integration[bot]
45aaeb16b2 Link iplChannelTitle: emit gates + name 5 real .data objects (#834)
iplNand.h: IPL_CHANNEL_TITLE_NOVTABLE makes LangFile/LayoutFile virtuals
inline-only for this TU (orig emits their vtables elsewhere), while the
GUIManager.h/iplGuiManager.h gates no longer suppress ~Interface/
EventHandler/~PaneManager emission here - those vtables emit weakly as in
orig. config/43U/symbols.txt: name the 5 real emitted objects at
0x8164EFE4-0x8164F0B8 (dedup'd PaneManager/EventHandler/Interface/
LayoutFile/LangFile vtable emits) so objdiff's byte-diff range covers the
full .data extent; without names the compare stopped at 0x87c and the
extra emit range scored as inserts.

DOL sha1 identical, .data bytes + .rela.data set identical to orig, unit
all sections 100.

Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: coah80 <usernamecole7@gmail.com>
2026-10-02 13:26:47 -05:00
coah
e9114959c9 Retain original socket-option APIs and link matched routines (#848) 2026-10-02 13:20:27 -05:00
coah
1f0eb50f01 match(iplChannelSelect 102/102) (rt7b) (worker e0f02483) (#850) 2026-10-02 13:17:47 -05:00
coah
d93fb2d5f8 match(iplRakuRakuThread 14/14) (rt8b) (worker 8e747652) (#849) 2026-10-02 13:14:53 -05:00
coah
27abfe81d9 Link matched FAT allocation-chain routines (#847) 2026-10-02 13:10:48 -05:00
coah
bf6bc87fbd match(nup 20/23) (fz15h) (worker d8281f4c) (#846) 2026-10-02 13:01:18 -05:00
coah
786a2dd3e8 match(ATERM 17/26, zi8alpha 11/12) (fz20e) (worker 8133f528) (#845) 2026-10-02 12:55:03 -05:00
coah
bdd15186a7 match(pf_fat 35/35) (fz21e) (worker 4f270f72) (#844) 2026-10-02 12:48:07 -05:00
coah
40a2ea7e91 match(SOOption 4/4) (fz3k) (worker 6d7c19b7) (#843) 2026-10-02 12:45:44 -05:00
coah
0b10215388 match(iplSDChannelSelect 122/129) (fz16f) (worker abd61c86) (#842) 2026-10-02 12:42:39 -05:00
coah
4e293a4223 match(odh 24/28) (fz10h) (worker afc4f94d) (#841) 2026-10-02 12:41:08 -05:00
coah
d94df60412 Link matched eZiText wide-word routines (#840) 2026-10-02 12:36:59 -05:00
coah
daf04f1f26 Link matched NWC24 mailbox and message-commit routines (#839) 2026-10-02 12:36:52 -05:00
coah
1994d24f06 match(ZiDAWGGetSibling, Zi8IsWordW: 16-bit byte widening) (orchestrator + data-d11j) (worker 993402bc) (#838) 2026-10-02 12:28:01 -05:00
coah
0d9b038782 match(NWC24MsgCommit 18/18, Texture_MCUtoY8U8V8 12/13) (fz15g) (worker fed147c9) (#837) 2026-10-02 12:25:41 -05:00
coah
ff90063ef9 match(NWC24MBoxCtrl 25/25) (fz21d) (worker 710e3312) (#836) 2026-10-02 12:19:14 -05:00
devin-ai-integration[bot]
c1183780c2 eggAudioExpMgr: emit-gate headers for orig symbol set (stays Equivalent) (#835)
Split 2 of 2 from #815. Removes the invented 'Sample' class. The
EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS gates (ArcPlayerMgr 9 virtuals,
SoundHeapMgr loadState/getCurrentLevel, nw4r AutoLock ct/dt) reproduce
orig's .o emit set exactly: same 8 .text symbols at the same offsets plus
__vt__ at .data+0/0x78.

Stays Equivalent: orig orders the secondary-vtable thunks
[@52@dt][@52@calc] while MWCC emits [@52@calc][@52@dt] here, and orig
emits them GLOBAL while ours are WEAK. Verified across 6 other orig
units that thunk order follows most-derived declared-virtual order; the
only lever found that flips it is a second ODR-used derived class's
vtable build - invented code, rejected. See
tools/decomp-assist/linkgap-audio.attempts.md.

Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: coah80 <usernamecole7@gmail.com>
2026-10-02 12:07:38 -05:00
coah
2050ad7616 match(odh 23/28, iplAddress 96/101) (fz10g) (worker 5f8a5379) (#833) 2026-10-02 11:52:47 -05:00
coah
9077ef8c7a data(SOBasic data 100%) (fz3j) (worker 2898f5a5) (#832) 2026-10-02 11:50:33 -05:00
coah
bc303bc36e match(NWC24MsgCommit 17/18) (fz15f) (worker a92a10dd) (#831) 2026-10-02 11:44:54 -05:00
coah
5518cb16fd match(NWC24MsgSubject 9/12, NWC24DateParser 6/8) (fz7h) (worker 5c09b5ac) (#830) 2026-10-02 11:21:02 -05:00
coah
0c06b01c8d Restore memo manager animation vtable and destructor emission for linking (#829) 2026-10-02 11:19:48 -05:00
coah
adc15fdf6f Link matched FAT directory-entry iterator (#828) 2026-10-02 11:17:41 -05:00
coah
dea64a8c9c data(tiPcKeyboard data 100%) (fz21b) (worker c70a72a8) (#827) 2026-10-02 11:10:50 -05:00
coah
3cde45682d match(pf_entry_iterator 16/16) (fz3i) (worker 03d4f3a7) (#826) 2026-10-02 11:04:54 -05:00
coah
ae7cf34cab match(iplSDChannelSelect 121/129) (fz16d) (worker df276bb6) (#825) 2026-10-02 11:03:03 -05:00
coah
91cc177cb7 ci: stop the separate README progress commit (#824)
Landings now write the README progress table inside their own commit,
so the progress job only rebuilds and publishes the numbers to the job
summary instead of pushing a second docs commit to main.
2026-10-02 10:51:22 -05:00
github-actions[bot]
ecee6f01e4 docs: update progress [skip ci] 2026-10-02 15:50:37 +00:00
coah
28d3333887 Link matched JPEG resolution-change routines (#823) 2026-10-02 10:49:57 -05:00
github-actions[bot]
2119935c1d docs: update progress [skip ci] 2026-10-02 15:48:02 +00:00
coah
c7896c3802 match(ATERM 15/26) (fz20) (worker 4adbcdd4) (#822) 2026-10-02 10:46:43 -05:00
github-actions[bot]
68c4c9aeac docs: update progress [skip ci] 2026-10-02 15:45:30 +00:00
coah
1b942565f7 match(Texture_MCUtoY8U8V8 11/13) (fz15e) (worker 2e0b96a1) (#821) 2026-10-02 10:44:28 -05:00
github-actions[bot]
a9705fa1a3 docs: update progress [skip ci] 2026-10-02 15:43:50 +00:00
coah
e1f0ef93a5 match(BS2Update 9/10) (fz1f) (worker 8d7decce) (#820) 2026-10-02 10:42:48 -05:00
github-actions[bot]
adcd8ca586 docs: update progress [skip ci] 2026-10-02 15:40:05 +00:00
coah
76d72f06ce match(idct_resolution_change_var 6/6) (fz3h) (worker ac1e42c9) (#819) 2026-10-02 10:39:11 -05:00
github-actions[bot]
b0474b6eac docs: update progress [skip ci] 2026-10-02 15:38:42 +00:00
coah
9ce28d272f match(KPAD 21/29) (fz16c) (worker a1ca8f8d) (#818) 2026-10-02 10:37:46 -05:00
github-actions[bot]
771208ab77 docs: update progress [skip ci] 2026-10-02 15:10:45 +00:00
coah
cee13c5a0b Correct SD notice APIs to accept aligned 64-bit title IDs (#817) 2026-10-02 10:10:09 -05:00
github-actions[bot]
1c974dbd49 docs: update progress [skip ci] 2026-10-02 14:53:28 +00:00
devin-ai-integration[bot]
bac1e5427a Decode iplSDChannelTitle + ut_ArchiveFontBase (source-only, stays NonMatching) (#816)
- SDButton::setEventHandler was genuinely 1-arg in retail (dead second
  param): corrected decl/def/call sites + symbols.txt mangle. Fixes 5
  fns to instruction-identical and lifts iplSDChannelTitle data to
  .data/.rodata/.sdata/.sdata2 100% (was 12.1%).
- ut_ArchiveFontBase: reordered sheetOffsetsScratch decl/assign to
  match orig materialization.

Both units remain NonMatching — flip attempts verified to break the
linked DOL: iplSDChannelTitle's object emits 51 net-extra anonymous
literal objects (pool merge/order differs, fuzzy 99.94) plus two fns
+4B each (updateCopyStart, startCopyProgress); ut_ArchiveFontBase has
a ~0x380B content region differing (fuzzy 98.47). DOL sha1 stays
26116613f624061ba99c8d1a299aaa6efa85670d with them unlinked.

Co-authored-by: devin <devin@cognition.ai>
Co-authored-by: coah80 <usernamecole7@gmail.com>
2026-10-02 09:52:51 -05:00
github-actions[bot]
b6687e9ff9 docs: update progress [skip ci] 2026-10-02 11:41:42 +00:00
coah
ff52d5235d Restore focus-object emission order and shared pane string for native linking (#814) 2026-10-02 06:40:57 -05:00
github-actions[bot]
7be7f1594e docs: update progress [skip ci] 2026-10-02 11:34:52 +00:00
coah
51b483cbb7 Restore FAT directory definition order and link directory/volume routines (#812) 2026-10-02 06:34:15 -05:00
github-actions[bot]
1bb1fb08be docs: update progress [skip ci] 2026-10-02 11:33:16 +00:00
coah
2f759f35f1 match(iplAddress 95/101) (fz10e) (worker 3c5ccd78) (#813) 2026-10-02 06:32:21 -05:00
github-actions[bot]
ed5c96bd85 docs: update progress [skip ci] 2026-10-02 11:24:46 +00:00
coah
3816427a3e match(iplAddressEdit 90/94) (fz16b) (worker 95d2a3ab) (#811) 2026-10-02 06:23:21 -05:00
github-actions[bot]
2d0a4faa6f docs: update progress [skip ci] 2026-10-02 11:22:42 +00:00
coah
a61a7cf140 match(pf_volume 37/37, idct_resolution_change_var 5/6) (fz3g) (worker fa51267c) (#810) 2026-10-02 06:21:42 -05:00
github-actions[bot]
dce9e0732d docs: update progress [skip ci] 2026-10-02 11:20:10 +00:00
coah
8121c71188 match(Texture_MCUtoY8U8V8 6/13, NWC24MsgCommit 16/18) (fz15c) (worker c264f4a8) (#809) 2026-10-02 06:18:58 -05:00
github-actions[bot]
d6997b0cb9 docs: update progress [skip ci] 2026-10-02 11:15:33 +00:00
github-actions[bot]
6b80fd87f5 docs: update progress [skip ci] 2026-10-02 11:13:58 +00:00
coah
8f920a08c2 match(pf_dir 38/38, iplFocusObject 89/89) (fz1e) (worker db809c39) (#808) 2026-10-02 06:13:48 -05:00
coah
9c81288c55 Link matched eZiText DAWG routines (#807) 2026-10-02 06:12:34 -05:00
github-actions[bot]
abb652bb85 docs: update progress [skip ci] 2026-10-02 11:09:26 +00:00
coah
b578087994 match(Zi8MatchUWDdata; zi8uwd 3/4) (data-d11g) (worker bd9a219c) (#806) 2026-10-02 06:07:57 -05:00
github-actions[bot]
d542ace0ed docs: update progress [skip ci] 2026-10-02 11:02:05 +00:00
coah
d195c16c86 match(zi8dawg 6/6) (fz10d) (worker 64753ac9) (#805) 2026-10-02 06:00:09 -05:00
github-actions[bot]
2daa6aedf6 docs: update progress [skip ci] 2026-10-02 10:55:47 +00:00
coah
9432f36a57 Link matched NWC24 message-reading routines (#804) 2026-10-02 05:54:37 -05:00
github-actions[bot]
4f77bbd2ae docs: update progress [skip ci] 2026-10-02 10:49:20 +00:00
coah
9c6416820d match(NWC24MsgRead 16/16) (fz7e) (worker 784d9f03) (#803) 2026-10-02 05:47:59 -05:00
github-actions[bot]
4bfa1b6c4c docs: update progress [skip ci] 2026-10-02 10:40:05 +00:00
coah
cbed5f6d77 Link matched USB mass-storage block routines (#801) 2026-10-02 05:38:55 -05:00
github-actions[bot]
f8da383802 docs: update progress [skip ci] 2026-10-02 10:38:03 +00:00
coah
18786d6b7d match(ZiDAWGGetChild; zidawg1 3/6) (data-d11f) (worker 07efcb48) (#802) 2026-10-02 05:36:59 -05:00
github-actions[bot]
e7e35742dd docs: update progress [skip ci] 2026-10-02 10:33:16 +00:00
coah
73a89b06e5 match(iplAddressEdit 88/94) (fz16) (worker 41ea7122) (#800) 2026-10-02 05:32:10 -05:00
github-actions[bot]
f0d938021e docs: update progress [skip ci] 2026-10-02 10:26:08 +00:00
coah
e9545f74d5 match(NWC24MsgSubject 8/12) (fz7d) (worker 8ef4fd28) (#799) 2026-10-02 05:25:05 -05:00
github-actions[bot]
d0a9514c9b docs: update progress [skip ci] 2026-10-02 10:22:53 +00:00
github-actions[bot]
c653415d77 docs: update progress [skip ci] 2026-10-02 10:22:05 +00:00
coah
f98ffd0da3 Link matched SD channel object natively (#797) 2026-10-02 05:21:44 -05:00
coah
c31af38e0e Link matched HTTP worker and FAT cluster routines (#796) 2026-10-02 05:21:17 -05:00
github-actions[bot]
9aef037505 docs: update progress [skip ci] 2026-10-02 10:20:51 +00:00
coah
72cf3991b2 match(pf_volume 35/37, pf_entry_iterator 15/16, puh_msc_blk 11/11) (fz3f) (worker 6b7deeb0) (#798) 2026-10-02 05:19:45 -05:00
github-actions[bot]
d8937f9e82 docs: update progress [skip ci] 2026-10-02 10:12:22 +00:00
coah
36d651fe72 match(NWC24iMBoxCheck: volatile oldest-id local proven by store/reload) (orchestrator) (worker 2dcffb88) (#795) 2026-10-02 05:11:13 -05:00
github-actions[bot]
e133119aa5 docs: update progress [skip ci] 2026-10-02 10:09:35 +00:00
coah
fa50eeea1a Link matched NWC24 MIME parser natively (#794) 2026-10-02 05:08:40 -05:00
coah
ae5f904c0b Match CHANS integer parser with a read-only input object (#793) 2026-10-02 05:08:34 -05:00
github-actions[bot]
11f4b29c64 docs: update progress [skip ci] 2026-10-02 10:04:23 +00:00
coah
c7344eccc8 match(NHTTP_thread 26/26, pf_cluster 8/8) (fz8c) (worker 0b57076a) (#792) 2026-10-02 05:03:18 -05:00
github-actions[bot]
86cda2adbe docs: update progress [skip ci] 2026-10-02 10:01:15 +00:00
coah
0d1fa438ba Match HTTP socket send with a const request view and link (#790) 2026-10-02 05:00:25 -05:00
github-actions[bot]
343fa90f9b docs: update progress [skip ci] 2026-10-02 09:59:04 +00:00
coah
ed52b1987e data(ziswordw, zi8uwd data 100%) (data-d11e) (worker d8fd359e) (#791) 2026-10-02 04:57:57 -05:00
github-actions[bot]
00f44a924b docs: update progress [skip ci] 2026-10-02 09:53:45 +00:00
coah
d494f44516 match(NWC24Mime 16/16) (fz7c) (worker 112576fc) (#789) 2026-10-02 04:52:29 -05:00
github-actions[bot]
5439b99f38 docs: update progress [skip ci] 2026-10-02 09:49:58 +00:00
coah
4ccc441d7e data(iplSDChannelTitle, tiCandidateBox data 100%) (data-d15b) (worker 1e30e292) (#788) 2026-10-02 04:48:32 -05:00
github-actions[bot]
4264e5ff51 docs: update progress [skip ci] 2026-10-02 09:44:23 +00:00
coah
f182215e66 match(NHTTP_socket_RVL 9/10, lyt_window data) (fz2e) (worker 3f0262d6) (#787) 2026-10-02 04:42:46 -05:00
github-actions[bot]
fe6a45c09a docs: update progress [skip ci] 2026-10-02 09:21:35 +00:00
coah
f07dd4a6ca match(NWC24Mime 15/16) (fz7b) (worker b676b7bc) (#786) 2026-10-02 04:20:07 -05:00
github-actions[bot]
65cd387bcb docs: update progress [skip ci] 2026-10-02 09:07:11 +00:00
coah
d0c3d43000 match(vi 29/30) (fz10) (worker 2323903b) (#785) 2026-10-02 04:05:45 -05:00
github-actions[bot]
a2abf24854 docs: update progress [skip ci] 2026-10-02 09:01:43 +00:00
coah
1ce1b0458a Link matched USB access-point thread natively (#784) 2026-10-02 04:00:56 -05:00
github-actions[bot]
0e37502750 docs: update progress [skip ci] 2026-10-02 09:00:50 +00:00
coah
78d6827757 Link matched board scene natively (#783) 2026-10-02 03:58:42 -05:00
coah
b0fbec3f25 Link matched HMAC and socket-information units (#782) 2026-10-02 03:58:34 -05:00
138 changed files with 44973 additions and 1675 deletions

View File

@@ -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

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.50% | 88.93% | 65.20% | 99.07% |
| 99.59% | 90.81% | 71.43% | 99.37% |
units 934/1027 complete, functions 12289/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 -->

View File

@@ -11,6 +11,8 @@ splits: 'config/43U/splits.txt'
ldscript_template: 'config/ldscript_ipl2.lcf'
force_active:
- SOGetSockOpt
- SOSetInterfaceOpt
- fprintf
- leap_days
- __msl_time2tm

View File

@@ -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
@@ -4798,8 +4799,8 @@ iplSDChannelTitle_setPaneMessage = .text:0x813E8D14; // type:function size:0xB8
iplSDChannelTitle_loadBannerMetaFiles = .text:0x813E8DCC; // type:function size:0xA4
iplSDChannelTitle_fetchTmdViewTask = .text:0x813E8E70; // type:function size:0x94
iplSDChannelTitle_passesParentalCheck = .text:0x813E8F04; // type:function size:0x100
iplSDChannelTitle_onTitlePaneEvent = .text:0x813E9004; // type:function size:0x2E8
iplSDChannelTitle_onTitleButtonEvent = .text:0x813E92EC; // type:function size:0x17C
onEvent__Q33ipl5scene23SDTitlePaneEventHandlerFUlUlPv = .text:0x813E9004; // type:function size:0x2E8
onEventDerived__Q33ipl5scene25SDTitleButtonEventHandlerFUlUlPCQ33ipl10controller9Interface = .text:0x813E92EC; // type:function size:0x17C
startResetting__Q33ipl5scene14SDChannelTitleFv = .text:0x813E9468; // type:function size:0xC
@20@__dt__Q33ipl5scene14SDChannelTitleFv = .text:0x813E9474; // type:function size:0x8
__ct__Q33ipl5scene8SDButtonFPQ23EGG4Heap = .text:0x813E947C; // type:function size:0x9C
@@ -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
@@ -16990,34 +16996,66 @@ lbl_81654F23 = .data:0x81654F23; // type:object size:0x12 data:string
lbl_81654F35 = .data:0x81654F35; // type:object size:0x19 data:string
lbl_81654F4E = .data:0x81654F4E; // type:object size:0x26 data:string
lbl_81654F74 = .data:0x81654F74; // type:object size:0x1F data:string
lbl_81654F98 = .data:0x81654F98; // type:object size:0xC data:string
lbl_81654FA4 = .data:0x81654FA4; // type:object size:0xC data:string
lbl_81654FB0 = .data:0x81654FB0; // type:object size:0xD data:string
lbl_81654FBD = .data:0x81654FBD; // type:object size:0xD data:string
lbl_81654FCA = .data:0x81654FCA; // type:object size:0xC data:string
lbl_81654FD6 = .data:0x81654FD6; // type:object size:0xC data:string
lbl_81654FE2 = .data:0x81654FE2; // type:object size:0x26
lbl_81655008 = .data:0x81655008; // type:object size:0x2B data:string
lbl_81655033 = .data:0x81655033; // type:object size:0x29 data:string
lbl_8165505C = .data:0x8165505C; // type:object size:0x2A data:string
lbl_81655086 = .data:0x81655086; // type:object size:0x24 data:string
lbl_816550AA = .data:0x816550AA; // type:object size:0x23 data:string
lbl_816550CD = .data:0x816550CD; // type:object size:0x3F
lbl_8165510C = .data:0x8165510C; // type:object size:0xD data:string
lbl_81655119 = .data:0x81655119; // type:object size:0x13 data:string
lbl_8165512C = .data:0x8165512C; // type:object size:0x12 data:string
lbl_81655140 = .data:0x81655140; // type:object size:0x3C
lbl_8165517C = .data:0x8165517C; // type:object size:0x120
jumptable_8165529C = .data:0x8165529C; // type:object size:0x7C scope:local
lbl_81655318 = .data:0x81655318; // type:object size:0xB2
lbl_816553CA = .data:0x816553CA; // type:object size:0x34
lbl_816553FE = .data:0x816553FE; // type:object size:0xB data:string
lbl_81655409 = .data:0x81655409; // type:object size:0x10 data:string
lbl_81655419 = .data:0x81655419; // type:object size:0x14 data:string
lbl_8165542D = .data:0x8165542D; // type:object size:0x14 data:string
lbl_81655441 = .data:0x81655441; // type:object size:0x12 data:string
lbl_81655453 = .data:0x81655453; // type:object size:0xF data:string
lbl_81655462 = .data:0x81655462; // type:object size:0x62
@18027 = .data:0x81654F98; // type:object size:0xC scope:local data:string
@18028 = .data:0x81654FA4; // type:object size:0xC scope:local data:string
@18029 = .data:0x81654FB0; // type:object size:0xD scope:local data:string
@18030 = .data:0x81654FBD; // type:object size:0xD scope:local data:string
@18031 = .data:0x81654FCA; // type:object size:0xC scope:local data:string
@18032 = .data:0x81654FD6; // type:object size:0xC scope:local data:string
@18033 = .data:0x81654FE2; // type:object size:0x9 scope:local data:string
sButtonGroups__Q23ipl5scene = .data:0x81654FEC; // type:object size:0x1C scope:local
@18034 = .data:0x81655008; // type:object size:0x2B scope:local data:string
@18035 = .data:0x81655033; // type:object size:0x29 scope:local data:string
@18036 = .data:0x8165505C; // type:object size:0x2A scope:local data:string
@18037 = .data:0x81655086; // type:object size:0x24 scope:local data:string
@18038 = .data:0x816550AA; // type:object size:0x23 scope:local data:string
@18039 = .data:0x816550CD; // type:object size:0x24 scope:local data:string
sButtonAnimationNames__Q23ipl5scene = .data:0x816550F4; // type:object size:0x18 scope:local
@18040 = .data:0x8165510C; // type:object size:0xD scope:local data:string
@18041 = .data:0x81655119; // type:object size:0x13 scope:local data:string
@18042 = .data:0x8165512C; // type:object size:0x12 scope:local data:string
sBannerAnimationNames__Q23ipl5scene = .data:0x81655140; // type:object size:0xC scope:local
sTexturePaneNames__Q23ipl5scene = .data:0x8165514C; // type:object size:0x30 scope:local
@22820 = .data:0x8165517C; // type:object size:0xE scope:local data:string
@22960 = .data:0x8165518A; // type:object size:0x1D scope:local data:string
@22961 = .data:0x816551A7; // type:object size:0xB scope:local data:string
@22962 = .data:0x816551B2; // type:object size:0xB scope:local data:string
@22963 = .data:0x816551BD; // type:object size:0xB scope:local data:string
@22964 = .data:0x816551C8; // type:object size:0x1C scope:local data:string
@22965 = .data:0x816551E4; // type:object size:0x23 scope:local data:string
@22966 = .data:0x81655207; // type:object size:0x25 scope:local data:string
@22967 = .data:0x8165522C; // type:object size:0xB scope:local data:string
@22968 = .data:0x81655237; // type:object size:0x20 scope:local data:string
@22970 = .data:0x81655257; // type:object size:0x21 scope:local data:string
@22972 = .data:0x81655278; // type:object size:0xD scope:local data:string
@22975 = .data:0x81655285; // type:object size:0xB scope:local data:string
@22976 = .data:0x81655290; // type:object size:0xC scope:local data:string
@23080 = .data:0x8165529C; // type:object size:0x7C scope:local
@23094 = .data:0x81655318; // type:object size:0xF scope:local data:string
@23172 = .data:0x81655327; // type:object size:0x1A scope:local data:string
@23173 = .data:0x81655341; // type:object size:0x1C scope:local data:string
@23174 = .data:0x8165535D; // type:object size:0xF scope:local data:string
@23175 = .data:0x8165536C; // type:object size:0xE scope:local data:string
@23176 = .data:0x8165537A; // type:object size:0x19 scope:local data:string
@23177 = .data:0x81655393; // type:object size:0xA scope:local data:string
@23178 = .data:0x8165539D; // type:object size:0xB scope:local data:string
@23179 = .data:0x816553A8; // type:object size:0x14 scope:local data:string
@23181 = .data:0x816553BC; // type:object size:0xE scope:local data:string
@23314 = .data:0x816553CA; // type:object size:0xD scope:local data:string
@23343 = .data:0x816553D7; // type:object size:0xB scope:local data:string
@23344 = .data:0x816553E2; // type:object size:0xB scope:local data:string
@23345 = .data:0x816553ED; // type:object size:0x11 scope:local data:string
@23366 = .data:0x816553FE; // type:object size:0xB scope:local data:string
@23587 = .data:0x81655409; // type:object size:0x10 scope:local data:string
@23645 = .data:0x81655419; // type:object size:0x14 scope:local data:string
@23769 = .data:0x8165542D; // type:object size:0x14 scope:local data:string
@23878 = .data:0x81655441; // type:object size:0x12 scope:local data:string
@23964 = .data:0x81655453; // type:object size:0xF scope:local data:string
@24191 = .data:0x81655462; // type:object size:0x16 scope:local data:string
@24247 = .data:0x81655478; // type:object size:0x10 scope:local data:string
@24248 = .data:0x81655488; // type:object size:0x14 scope:local data:string
@24249 = .data:0x8165549C; // type:object size:0xF scope:local data:string
@24250 = .data:0x816554AB; // type:object size:0x16 scope:local data:string
__vt__Q33ipl5scene25SDTitleButtonEventHandler = .data:0x816554C4; // type:object size:0x1C
__vt__Q33ipl5scene23SDTitlePaneEventHandler = .data:0x816554E0; // type:object size:0x18
__vt__Q33ipl5scene14SDChannelTitle = .data:0x816554F8; // type:object size:0x68
@@ -17640,47 +17678,47 @@ scW_predictWindow = .data:0x8165DA08; // type:object size:0x10 data:string
scN_predictInput = .data:0x8165DA18; // type:object size:0xF data:string
scW_OnOff_Area = .data:0x8165DA28; // type:object size:0xD data:string
scN_prdc_Texts = .data:0x8165DA38; // type:object size:0xD data:string
jumptable_8165DA48 = .data:0x8165DA48; // type:object size:0x1C scope:local
lbl_8165DA64 = .data:0x8165DA64; // type:object size:0xF data:string
lbl_8165DA74 = .data:0x8165DA74; // type:object size:0xF data:string
lbl_8165DA84 = .data:0x8165DA84; // type:object size:0xF data:string
lbl_8165DA94 = .data:0x8165DA94; // type:object size:0xF data:string
lbl_8165DAA4 = .data:0x8165DAA4; // type:object size:0xF data:string
lbl_8165DAB4 = .data:0x8165DAB4; // type:object size:0xF data:string
lbl_8165DAC4 = .data:0x8165DAC4; // type:object size:0xF data:string
lbl_8165DAD4 = .data:0x8165DAD4; // type:object size:0xF data:string
lbl_8165DAE4 = .data:0x8165DAE4; // type:object size:0xF data:string
lbl_8165DAF4 = .data:0x8165DAF4; // type:object size:0xF data:string
lbl_8165DB04 = .data:0x8165DB04; // type:object size:0xF data:string
lbl_8165DB14 = .data:0x8165DB14; // type:object size:0xF data:string
lbl_8165DB24 = .data:0x8165DB24; // type:object size:0xF data:string
lbl_8165DB34 = .data:0x8165DB34; // type:object size:0xF data:string
lbl_8165DB44 = .data:0x8165DB44; // type:object size:0xF data:string
lbl_8165DB54 = .data:0x8165DB54; // type:object size:0xF data:string
lbl_8165DB64 = .data:0x8165DB64; // type:object size:0xF data:string
lbl_8165DB74 = .data:0x8165DB74; // type:object size:0xF data:string
lbl_8165DB84 = .data:0x8165DB84; // type:object size:0xF data:string
lbl_8165DB94 = .data:0x8165DB94; // type:object size:0xF data:string
lbl_8165DBA4 = .data:0x8165DBA4; // type:object size:0xF data:string
lbl_8165DBB4 = .data:0x8165DBB4; // type:object size:0xF data:string
lbl_8165DBC4 = .data:0x8165DBC4; // type:object size:0xF data:string
lbl_8165DBD4 = .data:0x8165DBD4; // type:object size:0xF data:string
lbl_8165DBE4 = .data:0x8165DBE4; // type:object size:0xF data:string
lbl_8165DBF4 = .data:0x8165DBF4; // type:object size:0xF data:string
lbl_8165DC04 = .data:0x8165DC04; // type:object size:0xF data:string
lbl_8165DC14 = .data:0x8165DC14; // type:object size:0xF data:string
lbl_8165DC24 = .data:0x8165DC24; // type:object size:0xF data:string
lbl_8165DC34 = .data:0x8165DC34; // type:object size:0xF data:string
lbl_8165DC44 = .data:0x8165DC44; // type:object size:0xF data:string
lbl_8165DC54 = .data:0x8165DC54; // type:object size:0xF data:string
lbl_8165DC64 = .data:0x8165DC64; // type:object size:0xF data:string
lbl_8165DC74 = .data:0x8165DC74; // type:object size:0xF data:string
lbl_8165DC84 = .data:0x8165DC84; // type:object size:0xF data:string
lbl_8165DC94 = .data:0x8165DC94; // type:object size:0xF data:string
lbl_8165DCA4 = .data:0x8165DCA4; // type:object size:0xF data:string
lbl_8165DCB4 = .data:0x8165DCB4; // type:object size:0xF data:string
lbl_8165DCC4 = .data:0x8165DCC4; // type:object size:0xF data:string
lbl_8165DCD4 = .data:0x8165DCD4; // type:object size:0xF data:string
@10530 = .data:0x8165DA48; // type:object size:0x1C scope:local
@6761 = .data:0x8165DA64; // type:object size:0xF scope:local data:string
@6762 = .data:0x8165DA74; // type:object size:0xF scope:local data:string
@6763 = .data:0x8165DA84; // type:object size:0xF scope:local data:string
@6764 = .data:0x8165DA94; // type:object size:0xF scope:local data:string
@6765 = .data:0x8165DAA4; // type:object size:0xF scope:local data:string
@6766 = .data:0x8165DAB4; // type:object size:0xF scope:local data:string
@6767 = .data:0x8165DAC4; // type:object size:0xF scope:local data:string
@6768 = .data:0x8165DAD4; // type:object size:0xF scope:local data:string
@6769 = .data:0x8165DAE4; // type:object size:0xF scope:local data:string
@6770 = .data:0x8165DAF4; // type:object size:0xF scope:local data:string
@6771 = .data:0x8165DB04; // type:object size:0xF scope:local data:string
@6772 = .data:0x8165DB14; // type:object size:0xF scope:local data:string
@6773 = .data:0x8165DB24; // type:object size:0xF scope:local data:string
@6774 = .data:0x8165DB34; // type:object size:0xF scope:local data:string
@6775 = .data:0x8165DB44; // type:object size:0xF scope:local data:string
@6776 = .data:0x8165DB54; // type:object size:0xF scope:local data:string
@6777 = .data:0x8165DB64; // type:object size:0xF scope:local data:string
@6778 = .data:0x8165DB74; // type:object size:0xF scope:local data:string
@6779 = .data:0x8165DB84; // type:object size:0xF scope:local data:string
@6782 = .data:0x8165DB94; // type:object size:0xF scope:local data:string
@6783 = .data:0x8165DBA4; // type:object size:0xF scope:local data:string
@6784 = .data:0x8165DBB4; // type:object size:0xF scope:local data:string
@6785 = .data:0x8165DBC4; // type:object size:0xF scope:local data:string
@6786 = .data:0x8165DBD4; // type:object size:0xF scope:local data:string
@6787 = .data:0x8165DBE4; // type:object size:0xF scope:local data:string
@6788 = .data:0x8165DBF4; // type:object size:0xF scope:local data:string
@6789 = .data:0x8165DC04; // type:object size:0xF scope:local data:string
@6790 = .data:0x8165DC14; // type:object size:0xF scope:local data:string
@6791 = .data:0x8165DC24; // type:object size:0xF scope:local data:string
@6792 = .data:0x8165DC34; // type:object size:0xF scope:local data:string
@6793 = .data:0x8165DC44; // type:object size:0xF scope:local data:string
@6794 = .data:0x8165DC54; // type:object size:0xF scope:local data:string
@6795 = .data:0x8165DC64; // type:object size:0xF scope:local data:string
@6796 = .data:0x8165DC74; // type:object size:0xF scope:local data:string
@6797 = .data:0x8165DC84; // type:object size:0xF scope:local data:string
@6798 = .data:0x8165DC94; // type:object size:0xF scope:local data:string
@6799 = .data:0x8165DCA4; // type:object size:0xF scope:local data:string
@6800 = .data:0x8165DCB4; // type:object size:0xF scope:local data:string
@6801 = .data:0x8165DCC4; // type:object size:0xF scope:local data:string
@10601 = .data:0x8165DCD4; // type:object size:0xF scope:local data:string
__vt__Q39textinput12candidatebox13PredictWindow = .data:0x8165DCE4; // type:object size:0x2C
__vt__Q39textinput12candidatebox12OnOffAnmPane = .data:0x8165DD10; // type:object size:0x2C
__vt__Q39textinput12candidatebox22CandidateScrollAnmPane = .data:0x8165DD3C; // type:object size:0x2C
@@ -20727,15 +20765,12 @@ lbl_81694B4C = .sdata2:0x81694B4C; // type:object size:0x4 align:4 data:float
lbl_81694B50 = .sdata2:0x81694B50; // type:object size:0x4 align:4 data:float
lbl_81694B58 = .sdata2:0x81694B58; // type:object size:0x8 align:8 data:double
sMissingTitle__Q23ipl5scene = .sdata2:0x81694B60; // type:object size:0x8 data:wstring
lbl_81694B68 = .sdata2:0x81694B68; // type:object size:0x4 align:4 data:float
lbl_81694B6C = .sdata2:0x81694B6C; // type:object size:0x4 align:4 data:float
lbl_81694B70 = .sdata2:0x81694B70; // type:object size:0x4 align:4 data:float
lbl_81694B74 = .sdata2:0x81694B74; // type:object size:0x1 data:byte
lbl_81694B75 = .sdata2:0x81694B75; // type:object size:0x1 data:byte
lbl_81694B76 = .sdata2:0x81694B76; // type:object size:0x1 data:byte
lbl_81694B77 = .sdata2:0x81694B77; // type:object size:0x1 data:byte
lbl_81694B78 = .sdata2:0x81694B78; // type:object size:0x8 align:8 data:double
lbl_81694B80 = .sdata2:0x81694B80; // type:object size:0x4 align:4 data:float
@22804 = .sdata2:0x81694B68; // type:object size:0x4 scope:local align:4 data:float
@22973 = .sdata2:0x81694B6C; // type:object size:0x4 scope:local align:4 data:float
@22974 = .sdata2:0x81694B70; // type:object size:0x4 scope:local align:4 data:float
@18592 = .sdata2:0x81694B74; // type:object size:0x4 scope:local data:byte
@23648 = .sdata2:0x81694B78; // type:object size:0x8 scope:local align:8 data:double
@24146 = .sdata2:0x81694B80; // type:object size:0x4 scope:local align:4 data:float
scBalloonMsg__Q23ipl5scene = .sdata2:0x81694B88; // type:object size:0x8 scope:local
@11491 = .sdata2:0x81694B90; // type:object size:0x4 scope:local align:4 data:float
@11492 = .sdata2:0x81694B94; // type:object size:0x4 scope:local align:4 data:float
@@ -21464,7 +21499,7 @@ lbl_81695998 = .sdata2:0x81695998; // type:object size:0x1 data:byte
lbl_81695999 = .sdata2:0x81695999; // type:object size:0x1 data:byte
lbl_8169599C = .sdata2:0x8169599C; // type:object size:0x1 data:byte
lbl_8169599D = .sdata2:0x8169599D; // type:object size:0x1 data:byte
lbl_816959A0 = .sdata2:0x816959A0; // type:object size:0x8 data:byte
lbl_816959A0 = .sdata2:0x816959A0; // type:object size:0x1 data:byte
@3654 = .sdata2:0x816959A8; // type:object size:0x4 scope:local align:4 data:float
@3714 = .sdata2:0x816959AC; // type:object size:0x4 scope:local align:4 data:float
lbl_816959B0 = .sdata2:0x816959B0; // type:object size:0x8 align:8 data:double
@@ -23800,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

View File

@@ -738,11 +738,11 @@ config.libs = [
]
),
IPLSection("board", [
Object(Equivalent, "scene/board/iplBoard.cpp"),
Object(Matching, "scene/board/iplBoard.cpp"),
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", [
@@ -772,7 +772,7 @@ config.libs = [
]
),
IPLSection("channelTitle", [
Object(Equivalent, "scene/channelTitle/iplChannelTitle.cpp"),
Object(Matching, "scene/channelTitle/iplChannelTitle.cpp"),
]
),
IPLSection("faceSelect", [
@@ -850,7 +850,7 @@ config.libs = [
),
IPLSection("sdChannelSelect", [
Object(NonMatching, "scene/sdChannelSelect/iplSDChannelSelect.cpp"),
Object(NonMatching, "scene/sdChannelSelect/iplSDChannelObj.cpp"),
Object(Matching, "scene/sdChannelSelect/iplSDChannelObj.cpp"),
]
),
IPLSection("sdChannelTitle", [
@@ -874,10 +874,10 @@ config.libs = [
Object(Matching, "scene/setting/iplParental.cpp"),
Object(Matching, "scene/setting/iplAPScanThread.cpp"),
Object(Matching, "scene/setting/iplUSBAP.cpp"),
Object(NonMatching, "scene/setting/iplUSBAPThread.cpp"),
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"),
@@ -1045,7 +1045,7 @@ config.libs = [
Object(Matching, "net/crc.c"),
Object(NonMatching, "net/md5.c"),
Object(Matching, "net/sha1.c"),
Object(NonMatching, "net/hmac.c"),
Object(Matching, "net/hmac.c"),
Object(Matching, "net/neterrorcode.c"),
Object(Matching, "net/NETVersion.c"),
Object(NonMatching, "net/aes.c"),
@@ -1060,9 +1060,9 @@ config.libs = [
Object(NonMatching, "nhttp/NHTTP_recvbuf.c"),
Object(Matching, "nhttp/NHTTP_request.c"),
Object(Matching, "nhttp/NHTTP_response.c"),
Object(NonMatching, "nhttp/NHTTP_socket_RVL.c"),
Object(Matching, "nhttp/NHTTP_socket_RVL.c"),
Object(NonMatching, "nhttp/NHTTP_stdlib_RVL.c"),
Object(NonMatching, "nhttp/NHTTP_thread.c"),
Object(Matching, "nhttp/NHTTP_thread.c"),
Object(Matching, "nhttp/d_nhttp_private.c"),
Object(Matching, "nhttp/d_nhttp.c"),
Object(Matching, "nhttp/d_nhttp_common.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(NonMatching, "nwc24/NWC24Mime.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"),
@@ -1097,8 +1097,8 @@ config.libs = [
RevoEXLib("so", [
Object(Matching, "so/SOCommon.c"),
Object(NonMatching, "so/SOBasic.c"),
Object(NonMatching, "so/SOInformation.c"),
Object(NonMatching, "so/SOOption.c"),
Object(Matching, "so/SOInformation.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"),
@@ -1692,11 +1692,11 @@ config.libs = [
Object(Matching, "fa/pdm_disk.c"),
Object(NonMatching, "fa/pdm_partition.c"),
Object(NonMatching, "fa/pf_cache.c"),
Object(NonMatching, "fa/pf_cluster.c"),
Object(NonMatching, "fa/pf_dir.c"),
Object(Matching, "fa/pf_cluster.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"),
@@ -1860,7 +1860,7 @@ config.libs = [
Object(Matching, "fa/msc/puh_msc.c"),
Object(Matching, "fa/msc/puh_msc_cmd.c"),
Object(NonMatching, "fa/msc/puh_msc_blk.c"),
Object(Matching, "fa/msc/puh_msc_blk.c"),
]
),
RVLSDKLib("sdi", [

View File

@@ -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*);

View File

@@ -34,14 +34,14 @@ namespace gui {
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
virtual void draw() {} // 0x18 (0x06)
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
virtual ~Interface(); // 0x1C (0x07)
#else
virtual ~Interface() {} // 0x1C (0x07)
#endif
};
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
#if defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
class __declspec(novtable) EventHandler {
#else
class EventHandler {

View File

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

View File

@@ -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);

View File

@@ -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;

View File

@@ -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

View File

@@ -65,7 +65,11 @@ namespace ipl {
virtual BOOL isReady() const { return FALSE; }
/** @brief If the user can power off/reset the system */
#ifdef IPL_SD_CHANNEL_TITLE_CPP
virtual BOOL isResetAcceptable() { return TRUE; }
#else
virtual BOOL isResetAcceptable() const { return TRUE; }
#endif
/** @brief The scene running code when powering off/resetting the system */
virtual void startResetting() {}
/** @brief If the scene has finished its powering off/resetting task */

View File

@@ -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

View File

@@ -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);

View File

@@ -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

View File

@@ -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

View File

@@ -118,26 +118,26 @@ namespace ipl {
public:
Base(int chan, KPADStatus& status) {
mButton = 0;
unk_0x08 = 0;
mDecideHoldCount = 0;
mLastRumbleTime = 0;
mRumbleType = -1;
mChan = chan;
mType = 2;
unk_0x1C = 0;
mbForceInvalid = 0;
KPADEnableDPD(chan);
unk_0x1D = 0;
unk_0x1E = 0;
unk_0x20 = &status;
mbPinch = 0;
mbPrevPinch = 0;
mpStatus = &status;
}
Base(int chan, int type, KPADStatus& status) {
mButton = 0;
unk_0x08 = 0;
mDecideHoldCount = 0;
mLastRumbleTime = 0;
mRumbleType = -1;
mChan = chan;
mType = type;
unk_0x1C = 0;
mbForceInvalid = 0;
KPADEnableDPD(chan);
}
@@ -152,15 +152,15 @@ namespace ipl {
protected:
u8 mButton;
u32 unk_0x08;
u32 mDecideHoldCount;
OSTick mLastRumbleTime;
s32 mRumbleType;
u32 mChan;
u32 mType;
u8 unk_0x1C;
u8 unk_0x1D;
u8 unk_0x1E;
KPADStatus* unk_0x20;
u8 mbForceInvalid;
u8 mbPinch;
u8 mbPrevPinch;
KPADStatus* mpStatus;
};
class Revolution : public Base {
@@ -206,8 +206,8 @@ namespace ipl {
virtual BOOL isValidDpdClassic() const;
private:
math::VEC2 unk_0x24;
int unk_0x2C;
math::VEC2 mClassicCursor;
int mClassicCursorTimer;
};
class Master : public Interface {
@@ -264,18 +264,18 @@ namespace ipl {
public:
Base(int chan, KPADStatus& arg1) {
mButton = 0;
unk_0x08 = 0;
mDecideHoldCount = 0;
mLastRumbleTime = 0;
mRumbleType = -1;
mChan = chan;
mType = 2;
unk_0x1C = 0;
mbForceInvalid = 0;
KPADEnableDPD(chan);
unk_0x1D = 0;
unk_0x1E = 0;
unk_0x20 = &arg1;
mbPinch = 0;
mbPrevPinch = 0;
mpStatus = &arg1;
}
virtual ~Base(); // 0x08
@@ -326,15 +326,15 @@ namespace ipl {
// protected:
u8 mButton; // 0x4
u32 unk_0x08; // 0x8
u32 mDecideHoldCount; // 0x8
OSTick mLastRumbleTime; // 0xC
s32 mRumbleType; // 0x10
u32 mChan; // 0x14
u32 mType; // 0x18
u8 unk_0x1C;
u8 unk_0x1D; // 0x1D
u8 unk_0x1E; // 0x1E
KPADStatus* unk_0x20; // 0x20
u8 mbForceInvalid;
u8 mbPinch; // 0x1D
u8 mbPrevPinch; // 0x1E
KPADStatus* mpStatus; // 0x20
};
class Interface : public Base {
@@ -446,8 +446,8 @@ namespace ipl {
virtual BOOL isValidDpdClassic() const; // 0x8C
private:
math::VEC2 unk_0x24;
int unk_0x2C;
math::VEC2 mClassicCursor;
int mClassicCursorTimer;
};
class Manager {

View File

@@ -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

View File

@@ -145,6 +145,13 @@ namespace ipl {
mpCommonFile = commonFile;
mpLangFile = langFile;
}
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~LangFile() {}
virtual void read() {}
virtual bool isFinished() { return false; }
virtual int checkData() { return 0; }
virtual bool isFatalError() { return false; }
#else
virtual ~LangFile(); // 0x08
virtual void read(); // 0x0C
@@ -152,6 +159,7 @@ namespace ipl {
virtual bool isFinished(); // 0x14
virtual int checkData(); // 0x18
virtual bool isFatalError(); // 0x1C
#endif
File* getCmnFile() const { return mpCommonFile; }
File* getLangFile() const { return mpLangFile; }
@@ -165,7 +173,11 @@ namespace ipl {
public:
LayoutFile(EGG::Heap* heap, const char* dirName, const char* fileName, ARCHandle* arc, bool bIsNandFile);
LayoutFile(File* commonFile, File* langFile = NULL) : LangFile(commonFile, langFile) {}
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~LayoutFile() {} // 0x08
#else
virtual ~LayoutFile(); // 0x08
#endif
};
} // namespace nand
} // namespace ipl

View File

@@ -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;

View File

@@ -38,6 +38,19 @@ namespace EGG {
virtual void calc(); // 0x30
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x34
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x38
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x3C
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x44
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x44
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x48
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x50
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x50
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x58
#else
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x34
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x38
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName) NO_INLINE {
@@ -66,6 +79,7 @@ namespace EGG {
u32 id = changeNameToId(pName);
return mSoundArchivePlayer.HoldSound(pHandle, id);
} // 0x58
#endif
u32 changeNameToId(const char* pName) { return mpArchive->ConvertLabelStringToSoundId(pName); }
const char* changeIdToName(u32 id) { return mpArchive->GetSoundLabelString(id); }

View File

@@ -19,6 +19,10 @@ namespace EGG {
~SoundHeapMgr() { destroySoundHeap(); }
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
virtual bool loadState(s32 id); // 0x08
virtual s32 getCurrentLevel(); // 0x0C
#else
virtual bool loadState(s32 id) {
#ifdef IPL_SOUND_MATCHING
if (id > 0 && mHeap.GetCurrentLevel() >= id) {
@@ -35,6 +39,7 @@ namespace EGG {
} // 0x08
virtual s32 getCurrentLevel() { return mHeap.GetCurrentLevel(); } // 0x0C
#endif
s32 saveState() { return mHeap.SaveState(); }

View File

@@ -1,3 +1,5 @@
#define EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
#include <egg/core.h>
namespace EGG {

View File

@@ -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 {

View File

@@ -19,8 +19,13 @@ namespace nw4r {
template <typename T>
class AutoLock : private NonCopyable {
public:
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
explicit AutoLock(T& rLockObj);
~AutoLock();
#else
explicit AutoLock(T& rLockObj) : mLockObj(rLockObj) { Lock(rLockObj); }
~AutoLock() { Unlock(mLockObj); }
#endif
private:
T& mLockObj; // 0x00

View File

@@ -1,13 +1,13 @@
#include <nw4r/db/assert.h>
extern "C" const u8 scLytFatalColorR = 255;
extern "C" const u8 scLytFatalColorG = 255;
extern "C" const u8 scLytFatalColorB = 255;
extern "C" const u8 scLytFatalColorA = 0;
extern "C" const u8 scLytFatalColorR;
extern "C" const u8 scLytFatalColorG;
extern "C" const u8 scLytFatalColorB;
extern "C" const u8 scLytFatalColorA;
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
#undef NW4R_ASSERT
#define NW4R_ASSERT(x) \
#define NW4R_GLOBAL_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
@@ -17,6 +17,15 @@ extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system
} \
}
#define NW4R_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {255, 255, 255, 0}; \
GXColor back = {0, 0, 0, 0}; \
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
} \
}
#include <nw4r/lyt/window.h>
#include <nw4r/lyt/common.h>
@@ -488,7 +497,7 @@ namespace nw4r {
}
Material* Window::GetFrameMaterial(u32 frameIdx) const {
NW4R_ASSERT(frameIdx < WINDOWFRAME_MAX);
NW4R_GLOBAL_ASSERT(frameIdx < WINDOWFRAME_MAX);
if (frameIdx >= mFrameNum) {
return NULL;
}
@@ -501,3 +510,8 @@ namespace nw4r {
}
} // namespace lyt
} // namespace nw4r
extern "C" const u8 scLytFatalColorR = 255;
extern "C" const u8 scLytFatalColorG = 255;
extern "C" const u8 scLytFatalColorB = 255;
extern "C" const u8 scLytFatalColorA = 0;

View File

@@ -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;

View File

@@ -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

View File

@@ -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;
}

View File

@@ -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);

View File

@@ -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;

View File

@@ -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;

View File

@@ -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,38 +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;
dst[0] = evsum0 + (oddsum0 + rot0);
dst[1] = evdiff0 + rot0;
dst[2] = evdiff0 - rot0;
dst[3] = evsum0 - (oddsum0 + rot0);
dst[-8] = evsum1 + (oddsum1 + rot1);
dst[-7] = evdiff1 + rot1;
dst[-6] = evdiff1 - rot1;
dst[-5] = evsum1 - (oddsum1 + rot1);
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];
@@ -170,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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -205,12 +205,12 @@ 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;
ziU8 unk_0x09;
ziU8 unk_0x0A;
ziU8 maxWordLength;
ziU8 unk_0x0B;
ziU32 unk_0x0C;
ziU32 unk_0x10;
@@ -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;
ziU16 capacity; // 0x141A
ziU8 unk_0x141C;
ziU8 unk_0x141D;
ziU8 unk_0x141E;
ziU8 unk_0x141F;
ziU8 graphTableId; // 0x141E
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;

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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) {

View File

@@ -39,10 +39,10 @@ ziU32 Zi8MatchROMdata0(ziWChar* elements, ziU8 count, ziU8 language,
}
if (mode == 1) acceptPrefix = 0;
} else {
if (ZI_WORK->unk_0x141E != 0 && graphTable == 0xc &&
Zi8GetTableSize(language, ZI_WORK->unk_0x141E, ZI_WORK) != 0) {
graphData = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->unk_0x141E, ZI_WORK);
keyTable = ZI_WORK->unk_0x141E + 1;
if (ZI_WORK->graphTableId != 0 && graphTable == 0xc &&
Zi8GetTableSize(language, ZI_WORK->graphTableId, ZI_WORK) != 0) {
graphData = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->graphTableId, ZI_WORK);
keyTable = ZI_WORK->graphTableId + 1;
} else {
if (Zi8GetTableSize(language, graphTable, ZI_WORK) == 0) {
Zi8LogError(0x961, ZI_WORK);
@@ -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,31 +230,31 @@ 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;
ZI_WORK->graphTableId = 0x10;
} else {
ZI_WORK->unk_0x141E = 0;
ZI_WORK->graphTableId = 0;
}
}
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,25 +262,25 @@ 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;
ZI_WORK->graphTableId = 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:
case 0x75:
ZI_WORK->unk_0x141E = 0x10;
ZI_WORK->graphTableId = 0x10;
goto search_segment;
}
}
@@ -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,

View File

@@ -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;
}
@@ -158,7 +158,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
length = length - parameters->firstCandidate;
if (countOnly != 0) {
parameters->letters = length;
ZI_WORK->unk_0x0A = 0xff;
ZI_WORK->maxWordLength = 0xff;
return 1;
}
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
@@ -175,7 +175,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
current = signatures.first;
length = signatures.length;
}
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
if (length > ZI_WORK->maxWordLength) length = ZI_WORK->maxWordLength;
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
length = parameters->elementCount;
@@ -185,7 +185,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
if (parameters->letters == 2) {
current = signatures.second;
length = secondLength;
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
if (length > ZI_WORK->maxWordLength) length = ZI_WORK->maxWordLength;
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
length = parameters->elementCount;
@@ -194,7 +194,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
*output++ = 0;
}
*output++ = 0;
ZI_WORK->unk_0x0A = 0xff;
ZI_WORK->maxWordLength = 0xff;
return 1;
}
@@ -226,7 +226,7 @@ static ziBool Zi8ZhSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WO
length = length - parameters->firstCandidate;
if (countOnly != 0) {
parameters->letters = length;
ZI_WORK->unk_0x0A = 0xff;
ZI_WORK->maxWordLength = 0xff;
return 1;
}
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
@@ -279,13 +279,13 @@ static ziBool Zi8ZhSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WO
ziU8 _Zi8GetCandidates(ziGetParam* parameters ZI_NEED_WORK) {
ZiCandidateOptions options = {0};
options.capacity = ZI_WORK->unk_0x141A;
options.capacity = ZI_WORK->capacity;
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
}
ziU8 _Zi8CheckCandidates(ziGetParam* parameters ZI_NEED_WORK) {
ZiCandidateOptions options = {0};
options.capacity = ZI_WORK->unk_0x141A;
options.capacity = ZI_WORK->capacity;
options.flags = 1;
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
}
@@ -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;
@@ -493,8 +493,8 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
ZI_WORK->subLanguage = parameters->subLanguage;
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1,ZI_WORK) & 2;
options->maxCount = ZI_WORK->unk_0x10;
options->maxWordLength = ZI_WORK->unk_0x0A;
ZI_WORK->unk_0x0A = -1;
options->maxWordLength = ZI_WORK->maxWordLength;
ZI_WORK->maxWordLength = -1;
if ((ziU8)Zi8LangSupported(parameters->language,ZI_WORK) == 0) {
Zi8LogError(0x163,ZI_WORK);
return 0;
@@ -711,6 +711,6 @@ void Zi8Memcpy(ziU8* destination, ziU8* source, ziS32 count) {
}
ziBool Zi8SetMaxWordLength(ziU8 length ZI_NEED_WORK) {
ZI_WORK->unk_0x0A = length;
ZI_WORK->maxWordLength = length;
return 1;
}

View File

@@ -18,10 +18,10 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
Zi8Memset(__zi8_work_data, 0, 0x1B44);
ZI_WORK->unk_0x08 = 1;
ZI_WORK->unk_0x09 = 1;
ZI_WORK->unk_0x0A = 0xFF;
ZI_WORK->maxWordLength = 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;
@@ -44,7 +44,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
ZI_WORK->unk_0x1874 = 0x2D;
ZI_WORK->language = 0;
ZI_WORK->unk_0x1C[3] = 0;
ZI_WORK->unk_0x141A = 0x100;
ZI_WORK->capacity = 0x100;
Zi8SetLatinSearchOrder(0, 0, ZI_WORK);
ZADP_Zi8SetPDremoveOpt(1, ZI_WORK);
ZI_WORK->unk_0x17 = 5;

View File

@@ -57,6 +57,8 @@ ziU8 ZADP_Zi8SetPDremoveOpt(ziU8 option, struct __zi8_work_data_s* __zi8_work_da
return previous;
}
ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziWChar* spelling, ziU16 spellingCapacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
int fallback = 0;
ziU8* bytePattern;
ziWChar folded;
ziPudSection* section;
int wordSize;
@@ -65,7 +67,7 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
int index;
ziU32 entrySize;
ziPudHeader* table;
int fallback = 0;
ziU8* byteOutput;
if (!(ZI_WORK->pudCount <= 16 && ZI_WORK->pudCount != 0 && ZI_WORK->pudTable[ZI_WORK->pudCount - 1] != 0)) {
Zi8LogError(0x4B0, __zi8_work_data);
return 0;
@@ -79,8 +81,8 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
index = 0;
while (index < table->languageCount) {
if (section->language == language) break;
index++;
section++;
index++;
}
if (index >= table->languageCount) {
Zi8LogError(0x4F6, __zi8_work_data);
@@ -101,18 +103,20 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
entrySize = wordSize;
if (language == 1) {
if (ZI_WORK->unk_0x17 > *word) goto next;
entrySize = wordSize - 1;
wordSize--;
entrySize--;
word++;
wordSize = ZiGetZHWordSize((ziWChar*)word, entrySize);
} else if (ZI_WORK->unk_0x31E != 0 && complete != 0 && wordSize > length && word[length] == 0x20) goto matchText;
} else if (ZI_WORK->unk_0x31E != 0 && complete != 0 && length < wordSize && word[length] == 0x20) goto matchText;
if ((ziS32)length > (ziS32)wordSize || (complete != 0 && wordSize != length) || (complete == 0 && wordSize == length)) {
next:
ZI_WORK->unk_0x318++;
word += entrySize;
} else {
if (language == 1) {
bytePattern = (ziU8*)pattern;
for (index = 0; index < length; index++) {
if (word[index] != ((ziU8*)pattern)[index]) goto next;
if (word[index] != bytePattern[index]) goto next;
}
goto matched;
}
@@ -135,11 +139,12 @@ matched:
return 1;
}
if (language == 1) {
index = 0;
for (copied = 0; index < (ziS32)wordSize && copied < capacity; copied++) {
((ziU8*)output)[index] = word[index];
((ziU8*)output)[index + 1] = word[index + 1];
index += 2;
byteOutput = (ziU8*)output;
for (index = copied = 0; index < (ziS32)wordSize && copied < capacity; copied++) {
byteOutput[index] = word[index];
index++;
byteOutput[index] = word[index];
index++;
}
Zi8CopyZHSpelling(word, spelling, spellingCapacity, entrySize, wordSize);
} else {

View File

@@ -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;

View File

@@ -15,11 +15,11 @@ void Zi8Memset(ziPtr, ziU32, ziU32);
ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
ziU8 length;
ziU8 position;
ziUwdNode* previous;
ziUwdNode* current;
ziUwdNode* added;
ziUserWord* candidate;
ziU8 position;
if (ZI_WORK->uwdCount >= 32) {
Zi8LogError(0x19D, __zi8_work_data);
return 0;
@@ -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) {
@@ -56,8 +56,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
previous = current;
current = current->next;
}
length = ZI_WORK->uwdCount++;
added = &ZI_WORK->uwdNodes[length];
added = &ZI_WORK->uwdNodes[ZI_WORK->uwdCount++];
if (previous == 0) {
ZI_WORK->uwdList = added;
added->next = current;
@@ -87,24 +86,24 @@ void Zi8_8148047C(ziPtr __zi8_work_data) {
ZI_WORK->uwdList = 0;
}
ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16 currentLength, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
ziU32 size;
int fallback = 0;
int firstSegment;
ziUserDictionary* dictionary;
ziU8* text;
int position;
ziU8* cursor;
ziU8* begin;
ziU8* boundary;
int entryLength;
int prefixLength;
ziUserWord* previous;
int visited = 0;
ziU8* end;
ziWChar folded;
ziUserWord* previous;
int firstSegment;
ziU32 size;
int headerSize;
int entryLanguage;
ziUserWord* candidate;
volatile int entryLength;
int previousOffset;
int visited = 0;
int fallback = 0;
ziWChar folded;
ziU8* text;
int position;
int prefixLength;
Zi8LogError(100, __zi8_work_data);
if (!(ZI_WORK->unk_0x138 <= 2 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
Zi8ReplaceLastError(0x19C, __zi8_work_data);
@@ -122,7 +121,7 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
return 0;
}
text = ((ziUserWord*)text)->text;
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
}
return entryLength;
}
@@ -132,17 +131,20 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
else {
prefixLength = 0;
for (position = currentLength - 2; currentWord[position] != 0x20 && position >= 0; position--) prefixLength++;
for (position = currentLength - 2; position >= 0;) {
if (currentWord[position] == 0x20) break;
position--;
prefixLength++;
}
position++;
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
else {
ZI_WORK->unk_0x140 = 1;
ZI_WORK->unk_0x141[0] = prefixLength + 5;
ZI_WORK->unk_0x141[prefixLength + 4] = prefixLength + 5;
ZI_WORK->unk_0x141[prefixLength + 4] = ZI_WORK->unk_0x141[0] = prefixLength + 5;
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;
@@ -154,36 +156,37 @@ 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 = dictionary->entries + dictionary->current;
cursor = begin;
cursor = begin = dictionary->entries + dictionary->current;
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
end = (ziU8*)dictionary + dictionary->end + 7;
if (begin < boundary) firstSegment = 1;
else firstSegment = 0;
while (firstSegment ? cursor < boundary : cursor < end) {
while ((cursor < boundary && firstSegment) || (cursor < end && !firstSegment)) {
size = *cursor;
candidate = (ziUserWord*)cursor;
position = visited++;
if ((ziS32)ZI_WORK->unk_0x13C > position || (candidate->size & 0xC0) != 0) {
if ((ziS32)ZI_WORK->unk_0x13C > visited++ || (((ziUserWord*)cursor)->size & 0xC0) != 0) {
next:
cursor += size;
if (end < cursor) {
if ((cursor += size) > end) {
if (firstSegment) break;
firstSegment = 1;
cursor = dictionary->entries + (cursor - end - 1);
size = cursor - end - 1;
cursor = dictionary->entries + size;
}
} else {
previous = (ziUserWord*)(cursor + size);
if ((ziU8*)previous > end) previous = (ziUserWord*)(cursor + ((ziU8*)dictionary - end) + 7);
entryLanguage = candidate->language;
entryLength = candidate->length;
text = candidate->text;
if (entryLanguage == language && length <= entryLength && entryLength < capacity && (complete == 0 || entryLength == length) && (complete != 0 || entryLength != length)) {
if ((ziU8*)previous > end) previous = (ziUserWord*)(dictionary->entries + (cursor - end - 1));
text = cursor;
headerSize = *text++;
entryLanguage = *text++;
entryLength = *text++;
text++;
if (entryLanguage == language && entryLength >= length && entryLength < capacity && (complete == 0 || entryLength == length) && (complete != 0 || entryLength != length)) {
for (position = 0; position < length; position++) {
if (pattern[position] >= 0xEFF1 && pattern[position] <= 0xF010) {
if (pattern[position] != Zi8ConvertUC2Key(text[position], language, __zi8_work_data)) goto next;
@@ -194,11 +197,13 @@ next:
}
if (ZI_WORK->unk_0x140 != 0) {
if (ZI_WORK->unk_0x141[0] != previous->size || ZI_WORK->unk_0x141[1] != previous->language || ZI_WORK->unk_0x141[2] != previous->length) goto next;
for (position = 4; position < ZI_WORK->unk_0x141[2] + 4; position++) {
if (ZI_WORK->unk_0x141[position] != ((ziU8*)previous)[position] && ZI_WORK->unk_0x184[position] != ((ziU8*)previous)[position]) goto next;
prefixLength = 4;
position = ZI_WORK->unk_0x141[2] + 4;
for (; prefixLength < position; prefixLength++) {
if (ZI_WORK->unk_0x141[prefixLength] != ((ziU8*)previous)[prefixLength] && ZI_WORK->unk_0x184[prefixLength] != ((ziU8*)previous)[prefixLength]) goto next;
}
}
Zi8_81480224(candidate, __zi8_work_data);
Zi8_81480224((ziUserWord*)cursor, __zi8_work_data);
}
goto next;
}
@@ -208,7 +213,7 @@ next:
visited = 0;
goto rescan;
}
if (complete == 1 && length != 0 && continuation == 0) {
if (length == 1 && complete != 0 && continuation == 0) {
complete = 0;
fallback = 1;
visited = 0;
@@ -216,7 +221,6 @@ next:
}
}
text = (ziU8*)Zi8_814803F4(__zi8_work_data);
entryLength = 0;
if (text != 0) {
language = ((ziUserWord*)text)->language;
entryLength = ((ziUserWord*)text)->length;
@@ -225,7 +229,8 @@ next:
return 0;
}
text = ((ziUserWord*)text)->text;
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
return entryLength;
}
return entryLength;
return 0;
}

View File

@@ -22,11 +22,10 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
node += offset;
if (((ziU32)header & 2) != 0) {
if ((*(ziU8*)node & 0x80) != 0) {
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000;
offset += *((ziU8*)node + 2);
offset = ((*(ziU8*)node & 0x7f) << 16) +
((((ziU32)*((ziU8*)node + 1) & 0xffff) << 8) + *((ziU8*)node + 2)) + 0x8000;
} else {
offset = ((ziU32)*(ziU8*)node & 0xffff) * 0x100;
offset += (ziU32)*((ziU8*)node + 1);
offset = (((ziU32)*(ziU8*)node & 0xffff) << 8) + (ziU32)*((ziU8*)node + 1);
}
} else if (((ziU32)header & 8) != 0) {
if ((*(ziU8*)node & 0x80) != 0) {
@@ -42,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;
@@ -71,14 +77,14 @@ ziU8* ZiDAWGGetSibling(ziU8* cursor) {
}
if ((*cursor & 0x80) != 0) {
node += (*cursor & 0x7f) * 0x10000 + (ziU32)cursor[1] * 0x100 +
(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) {

View File

@@ -25,29 +25,29 @@ 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) {
int unmatched;
ziU8 group;
ziU8 remaining;
ziU16 value;
ziChineseEntry* table;
ziSearchState search;
ziChineseEntry* table = 0;
ziU8* baseData = 0;
ziU8 group = 0;
ziU8 remaining = 0;
ziU16 value = 0;
ziGetParam request;
ziWChar ordinals[65];
int count;
int offset;
int countLeft;
ziChineseEntry* entry;
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;
search.flags = 0;
search.word = 0;
search.length = 0;
search.position = 0;
search.capacity = 0;
search.options = 0;
ziU32 savedFormats = ZI_WORK->formats;
ziU8 savedCount = ZI_WORK->formatCount;
ziSearchState search = {0};
Zi8LogError(100, __zi8_work_data);
if (word == 0 || *word == 0) {
Zi8ReplaceLastError(300, __zi8_work_data);
@@ -59,8 +59,8 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
}
((ziU8*)&search.length)[0] = count;
((ziU8*)&search.flags)[2] = 1;
((ziU16*)&search.capacity)[0] = 64;
search.word = word;
((ziU16*)&search.capacity)[0] = 64;
request.language = language;
request.getMode = 0;
request.subLanguage = 7;
@@ -73,76 +73,81 @@ 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 = 1;
else ZI_WORK->unk_0x1418 = 2;
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) {
if (language != 1) {
Zi8ReplaceLastError(0x26C, __zi8_work_data);
return 0;
}
{
count = 0;
do {
while (word[count] != 0) {
ordinals[count] = Zi8Uni2Ord(word[count], __zi8_work_data);
if (ordinals[count] == 0xFFFF) return 0;
count++;
if (count == 64) return 0;
} while (word[count] != 0);
}
{
if (count == 1) return 1;
count--;
if (count-- == 1) return 1;
ordinals[count] |= 0x8000;
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
table = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data);
entry = table + ordinals[0];
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data);
data += ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
baseData = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data);
baseData += ((entry->offsetHigh & 15) << 16 | (entry->offsetLow[1] | (entry->offsetLow[0] << 8)));
data = baseData;
if (ZI_WORK->cangjieEnabled != 0) {
switch (*data & 7) {
case 2:
offset = 2;
countLeft = 2;
break;
case 3:
case 4:
offset = 3;
countLeft = 3;
break;
case 5:
offset = 4;
countLeft = 4;
break;
default:
offset = 1;
countLeft = 1;
break;
}
data += offset;
data += countLeft;
}
if ((*data & 0x80) == 0) return 0;
group = 0;
data += ((*data & 0x7F) >> 4) + 1;
if ((*data & 0x80) != 0) {
group = 0;
data += ((*data & 0x7F) >> 4) + 1;
} else return 0;
while ((group & 0x80) == 0) {
group = *data++;
for (remaining = group & 15; remaining != 0; remaining--) {
unmatched = count;
countLeft = count;
cursor = ordinals;
while (unmatched > 0) {
value = data[0] | (data[1] << 8);
while (countLeft > 0) {
value = ((ziU32)(ziU16)data[1] << 8) |
((const ziEncodedOrdinal*)data)->low;
data += 2;
cursor++;
if (value != *cursor) break;
unmatched--;
if (value != *++cursor) break;
countLeft--;
if (value & 0x8000) break;
}
if (unmatched == 0) return 1;
if (countLeft == 0) return 1;
if (!(value & 0x8000)) {
data++;
while (!(*data & 0x80)) data += 2;
@@ -153,7 +158,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
Zi8LogError(0x2BD, __zi8_work_data);
return 0;
}
} else Zi8ReplaceLastError(0x26C, __zi8_work_data);
}
return 0;
}
ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {

View File

@@ -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;
}

View File

@@ -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);

View File

@@ -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 {

View File

@@ -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

View File

@@ -86,9 +86,14 @@ s32 uhf_msc_blk_mount(FADisk* disk) {
return ((device->flags >> 2) & 1) - 1;
}
static inline u16 ReadTransferBlocks(u32 remaining, u32 limit) {
u16 count = limit;
if (remaining <= limit) { count = remaining; }
return count;
}
s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* completed) {
UHF_MSC_DEVICE* device;
u16 transfer_blocks;
struct { UHF_MSC_DEVICE* device; u16 blocks; } transfer;
s32 error;
u32 block_size;
u8* transfer_buffer;
@@ -103,24 +108,24 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
if (blocks == 0) {
return 0;
}
device = NULL;
transfer.device = NULL;
{
u32 index;
UHF_MSC_DEVICE* candidate;
for (candidate = uhg_msc_blk_device_tbl, index = 0; index < 8; candidate++, index++) {
if (candidate->disk == disk) {
device = &uhg_msc_blk_device_tbl[index];
transfer.device = &uhg_msc_blk_device_tbl[index];
break;
}
}
}
if (device == NULL) {
if (transfer.device == NULL) {
return -1;
}
if (!(device->flags & 4)) {
if (!(transfer.device->flags & 4)) {
return -1;
}
block_size = device->block_size;
block_size = transfer.device->block_size;
if (block_size == 0) {
return -1;
}
@@ -138,21 +143,18 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
transfer_buffer = buffer;
}
do {
transfer_blocks = transfer_limit;
if (blocks <= transfer_limit) {
transfer_blocks = blocks;
}
error = usbh_msc_read10(device, sector, transfer_blocks, transfer_buffer, sense);
transfer.blocks = ReadTransferBlocks(blocks, transfer_limit);
error = usbh_msc_read10(transfer.device, sector, transfer.blocks, transfer_buffer, sense);
if (error == 0) {
if (!cacheable) {
memcpy(buffer, transfer_buffer, transfer_blocks * block_size);
buffer += transfer_blocks * block_size;
memcpy(buffer, transfer_buffer, transfer.blocks * block_size);
buffer += transfer.blocks * block_size;
} else {
transfer_buffer += transfer_blocks * block_size;
transfer_buffer += transfer.blocks * block_size;
}
blocks -= transfer_blocks;
sector += transfer_blocks;
*completed += transfer_blocks;
blocks -= transfer.blocks;
sector += transfer.blocks;
*completed += transfer.blocks;
if (blocks == 0) {
break;
}
@@ -162,8 +164,8 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
case 11:
break;
case 34:
if (device->disk != NULL) {
pdm_disk_notify_media_insert(device->disk);
if (transfer.device->disk != NULL) {
pdm_disk_notify_media_insert(transfer.device->disk);
}
break;
default:

View File

@@ -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) {

View File

@@ -603,31 +603,35 @@ pf_s32 PFCLUSTER_InsertCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
pf_s32 PFCLUSTER_DeleteCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
pf_u32 cluster_index, pf_u32 num_clusters, pf_u32* p_deleted_clusters) {
struct ClusterDeletion {
pf_u32 length;
pf_u32 cluster_size;
pf_u32 position;
};
struct ClusterDeletion deletion;
pf_s32 err;
pf_u32 previous_cluster;
pf_u32 next_cluster;
pf_u32 first_deleted_cluster;
pf_u32 last_deleted_cluster;
PF_VOLUME* p_vol;
pf_u32 cluster_size;
pf_u32 byte_position;
p_vol = p_ent->p_vol;
cluster_size = p_vol->bpb.bytes_per_sector << p_vol->bpb.log2_sectors_per_cluster;
byte_position = cluster_index * cluster_size;
deletion.cluster_size = p_vol->bpb.bytes_per_sector << p_vol->bpb.log2_sectors_per_cluster;
deletion.position = cluster_index * deletion.cluster_size;
err = PFFAT_TraceClustersChain(&p_iter->ffd, *p_iter->ffd.p_start_cluster,
byte_position, &previous_cluster, &first_deleted_cluster);
deletion.position, &previous_cluster, &first_deleted_cluster);
if (err != 0) return err;
if (cluster_index == 0) first_deleted_cluster = p_ent->start_cluster;
num_clusters = num_clusters * cluster_size;
if (num_clusters > p_ent->file_size - byte_position) num_clusters = p_ent->file_size - byte_position;
err = PFFAT_TraceClustersChain(&p_iter->ffd, first_deleted_cluster, num_clusters, &last_deleted_cluster, &next_cluster);
deletion.length = num_clusters * deletion.cluster_size;
if (deletion.length > p_ent->file_size - deletion.position) deletion.length = p_ent->file_size - deletion.position;
err = PFFAT_TraceClustersChain(&p_iter->ffd, first_deleted_cluster, deletion.length, &last_deleted_cluster, &next_cluster);
if (err != 0) return err;
if (cluster_index == 0) {
if (next_cluster == PFFAT_GetValueOfEOC2(p_vol)) next_cluster = 0;
p_ent->start_cluster = next_cluster;
}
p_ent->file_size -= num_clusters;
p_ent->file_size -= deletion.length;
PFENT_getcurrentDateTimeForEnt(&p_ent->modify_date, &p_ent->modify_time);
p_ent->access_date = p_ent->modify_date;
err = PFENT_updateEntry(p_ent, 1);
@@ -636,13 +640,13 @@ pf_s32 PFCLUSTER_DeleteCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
err = PFCACHE_FlushDataCacheSpecific(p_vol, PF_NULL);
if (err != 0) return err;
}
err = PFFAT_FreeChain(&p_iter->ffd, first_deleted_cluster, -1U, num_clusters);
err = PFFAT_FreeChain(&p_iter->ffd, first_deleted_cluster, -1U, deletion.length);
if (err != 0) return err;
if (cluster_index != 0) {
err = PFFAT_WriteValueToSpecifiedCluster(p_vol, previous_cluster, next_cluster);
if (err != 0) return err;
}
*p_deleted_clusters = num_clusters / cluster_size;
if (num_clusters % cluster_size != 0) ++*p_deleted_clusters;
*p_deleted_clusters = deletion.length / deletion.cluster_size;
if (deletion.length % deletion.cluster_size != 0) ++*p_deleted_clusters;
return 0;
}

View File

@@ -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);
}

View File

@@ -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;
@@ -726,25 +726,29 @@ pf_s32 PFENT_ITER_GetEntryOfIter(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
return 0;
}
static inline pf_u32 CopyLongNameFragment(PFITER_ENT_ITER* iter, pf_u8* destination, pf_u32 offset) {
pf_memcpy(destination, &iter->buf[1], 10);
pf_memcpy(destination + 10, &iter->buf[14], 12);
pf_memcpy(destination + 22, &iter->buf[28], 4);
return offset + 26;
}
pf_s32 PFENT_ITER_GetLFNEntryName(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
pf_u32 i;
pf_u32 index;
pf_u8* destination;
pf_u32 i;
pf_s32 err;
if (p_ent->num_entry_LFNs != 0 && !(p_ent->small_letter_flag & 0x18)) {
index = 0;
for (i = 0; i < p_ent->num_entry_LFNs; ++i) {
pf_u16* destination;
i = 0;
for (index = 0; i < p_ent->num_entry_LFNs; ++i) {
err = PFENT_ITER_Retreat(p_iter, 0);
if (err != 0) return err;
err = PFENT_ITER_LoadEntry(p_iter);
if (err != 0) return err;
destination = &p_ent->long_name[index];
pf_memcpy(destination, &p_iter->buf[1], 10);
pf_memcpy(destination + 5, &p_iter->buf[14], 12);
pf_memcpy(destination + 11, &p_iter->buf[28], 4);
index += 13;
destination = (pf_u8*)p_ent->long_name + index;
index = CopyLongNameFragment(p_iter, destination, index);
}
p_ent->long_name[index] = 0;
p_ent->long_name[(p_ent->num_entry_LFNs * 26U) >> 1] = 0;
}
return 0;
}

View File

@@ -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;

View File

@@ -225,7 +225,6 @@ typedef struct PFVOL_SET {
PFVOL_SET pf_vol_set;
static s8 default_volume_label[12] = "NO NAME ";
static const u8 deleted_entry_mark[8] = {0xE5};
extern s32 PFDRV_mount(PFVOL_VOLUME* volume);
extern s32 PFDRV_unmount(PFVOL_VOLUME* volume, u32 mode);
extern s32 PFDRV_format(PFVOL_VOLUME* volume, const u8* format_options);
@@ -588,7 +587,7 @@ s32 PFVOL_p_rmvvol(PFVOL_VOLUME* volume) {
u32 logical_position;
u32 entry_position;
u32 processed;
u8 deleted = deleted_entry_mark[0];
u8 deleted[1] = {0xE5};
s32 error;
error = PFENT_GetRootDir(volume, &root_entry);
@@ -603,7 +602,7 @@ s32 PFVOL_p_rmvvol(PFVOL_VOLUME* volume) {
return error;
}
if (entry_position != 999999) {
error = PFSEC_WriteData(volume, &deleted, entry.entry_sector, entry.entry_offset, 1, &processed, 0);
error = PFSEC_WriteData(volume, deleted, entry.entry_sector, entry.entry_offset, 1, &processed, 0);
if (error != 0) {
return error;
}
@@ -1106,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;
}
@@ -1470,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; }
}

View File

@@ -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) {

View File

@@ -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;

View File

@@ -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;
}

View File

@@ -1167,9 +1167,9 @@ u32 VIGetRetraceCount(void)
static u32 getCurrentHalfLine(void)
{
u32 horizontalCount;
u32 previousVerticalCount;
u32 verticalCount;
u32 previousVerticalCount;
u32 horizontalCount;
verticalCount = __VIRegs[22] & 0x7FF;
for (;;) {
@@ -1180,7 +1180,7 @@ static u32 getCurrentHalfLine(void)
break;
}
}
return ((horizontalCount - 1) / CurrTiming->hlw) + ((verticalCount - 1) * 2);
return ((verticalCount - 1) * 2) + ((horizontalCount - 1) / CurrTiming->hlw);
}
static u32 getCurrentFieldEvenOdd(void)

View File

@@ -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) {

View File

@@ -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);

View File

@@ -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;

View File

@@ -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];

View File

@@ -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;
@@ -73,7 +73,7 @@ typedef struct NWC24MsgObjPrivate {
};
u32 raw;
} msgBoardFlags; // 0xCC
NWC24Data unk_0xD0;
NWC24Data extraData; // 0xD0
NWC24Data faceData; // 0xD8
NWC24Data altName; // 0xE0
u32 textSize; // 0xE4

View File

@@ -26,9 +26,9 @@ extern struct NWC24Work {
u8 configData[1024]; // 0x1300
u8 unk_0x1700[128]; // 0x1700
u8 unk_0x1780[128]; // 0x1780
u8 unk_0x1800[256]; // 0x1800
u8 sendMbcHeader[128]; // 0x1700
u8 recvMbcHeader[128]; // 0x1780
u8 mbcEntry[256]; // 0x1800
u8 base64Work[256]; // 0x1900
u8 unk_0x1A00[4096]; // 0x1A00

View File

@@ -57,7 +57,7 @@ void CDBRecordInstanceInit(CDBRecordFile* recordFile, CDBRecord* record, int typ
OSLockMutex((OSMutex*)recordFile);
recordFile->used = 1;
OSUnlockMutex((OSMutex*)recordFile);
recordFile->unk_0x1C = type;
recordFile->allocFlag = type;
recordFile->database = record->unk_0x00;
CDBAttrInit(&recordFile->attr);
CDBRecordKeyCopy(&recordFile->key, &record->key);
@@ -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;
}
@@ -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;
}
@@ -669,9 +669,10 @@ CDBErr CDBCryptBuffer(void* buffer, u32 size, void* iv, u32* processedSize, BOOL
CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32 size, u32* encryptedSize) {
CDBRecordFile* recordFile;
CDBErr err;
u32 fileSize;
u32 dataSize;
u32 fileSize;
u32 cryptSize;
u32 authenticatedSize;
int fileOffset;
u8 iv[0x10];
u8 wiiIdKey[0x40] ATTRIBUTE_ALIGN(64);
@@ -686,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) {
@@ -698,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());
@@ -712,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);
@@ -726,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);
@@ -760,10 +761,11 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
if ((s32)record->file == 0) {
err = CDB_ERROR_27;
} else {
fileOffset = CDBRecordFileTellData(record);
if (fileOffset < 0) {
int position = CDBRecordFileTellData(record);
if (position < 0) {
err = CDB_ERROR_CANNOT_OPEN_FILE;
} else {
fileOffset = position;
err = CDB_ERROR_OK;
}
}
@@ -810,8 +812,9 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
CDBGetWiiIdKey((char*)wiiIdKey);
CDBGetDeviceKey((char*)&wiiIdKey[12]);
CDBAttrClearSignature((CDBAttr*)buffer);
authenticatedSize = cryptSize + CDB_RECORD_BUFFER_SIZE;
NETHMACInit(&hmac, NETGetSHA1Interface(), wiiIdKey, 0x40);
NETHMACUpdate(&hmac, buffer, cryptSize + CDB_RECORD_BUFFER_SIZE);
NETHMACUpdate(&hmac, buffer, authenticatedSize);
NETHMACGetDigest(&hmac, digest);
memcpy(((CDBAttrBuf*)buffer)->signature.sha1Hmac, digest, sizeof(digest));
if (encryptedSize != 0) {

View File

@@ -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);
}

View File

@@ -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);
}

View File

@@ -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;
}

View File

@@ -95,7 +95,7 @@ s32 NHTTPi_SocRecv_sub(NHTTPConnectionInfo* connection, s32 socket, void* data,
} else return result;
}
if(connection->recvBufDataLen!=0) {
if((u32)length>connection->recvBufDataLen) length=connection->recvBufDataLen;
length = (u32)length > connection->recvBufDataLen ? connection->recvBufDataLen : length;
NHTTPi_memcpy(data,buffer+connection->recvBufOffset,length);
connection->recvBufDataLen-=length;
if(connection->recvBufDataLen==0) {
@@ -168,7 +168,7 @@ s32 NHTTPi_SocSend_sub(s32 socket, const char* data, u32 length, s32 flags) {
return sent;
}
s32 NHTTPi_SocSend(NHTTPRequestInfo* request, s32 socket, const char* data, s32 length, s32 flags) {
s32 NHTTPi_SocSend(const NHTTPRequestInfo* request, s32 socket, const void* data, s32 length, s32 flags) {
s32 result;
SSLId ssl=request->sslId;
if(ssl>0) result=SSLWrite(ssl,data,length);

View File

@@ -82,7 +82,7 @@ s32 NHTTPi_ReceivedCallback(void* mutex, NHTTPConnectionInfo* connection);
void NHTTPi_NotifyCompletion(NHTTPConnectionInfo* connection);
void NHTTPi_SetVirtualContentLength(NHTTPConnectionInfo* connection, u32 length);
BOOL NHTTPi_isRecvBufFull(NHTTPResponseInfo* response, s32 offset);
s32 NHTTPi_SocSend(NHTTPRequestInfo* request, s32 socket, const void* buffer, s32 length, s32 flags);
s32 NHTTPi_SocSend(const NHTTPRequestInfo* request, s32 socket, const void* buffer, s32 length, s32 flags);
s32 NHTTPi_SocRecv(void* mutex, NHTTPRequestInfo* request, s32 socket, void* buffer, s32 length, s32 flags);
s32 NHTTPi_SocClose(void* mutex, NHTTPRequestInfo* request, s32 socket);
s32 NHTTPi_SocOpen(NHTTPRequestInfo* request);
@@ -986,9 +986,16 @@ static BOOL NHTTPi_ThreadParseHeaderProc(NHTTPThreadContext* context)
if (length > 0x100) context->keepAlive = FALSE;
else if (length > 0)
{
struct TokenMatch {
BOOL matched;
};
struct TokenMatch match = {FALSE};
if (NHTTPi_compareTokenN_HdrRecvBuf(response, offset, offset + length, "Keep-Alive", 0) == 0)
context->keepAlive = TRUE;
else context->keepAlive = FALSE;
{
match.matched = TRUE;
context->keepAlive = match.matched;
}
else context->keepAlive = match.matched;
}
else context->keepAlive = FALSE;
}

View File

@@ -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) {
@@ -207,27 +208,40 @@ void ConvertDaysToDate(u16* year, u8* month, u8* day, s32 days) {
for (;;) {
u16 currentYear = *year;
s32 previousDays = days;
BOOL leapYear = (currentYear % 4 == 0 && currentYear % 100 != 0) || currentYear % 400 == 0;
BOOL leapYear = TRUE;
BOOL commonLeapYear = FALSE;
if (currentYear % 4 == 0 && currentYear % 100 != 0) {
commonLeapYear = TRUE;
}
if (!commonLeapYear && currentYear % 400 != 0) {
leapYear = FALSE;
}
days -= 365 + (leapYear != FALSE);
if (days < 0) {
days = previousDays;
break;
}
*year = *year + 1;
*year += 1;
continue;
}
for (;;) {
s32 previousDays = days;
if (*month == 2 && IsLeapYear(*year)) {
s32 previousDays;
u8 currentMonth;
const u8* parsedMonth = month;
previousDays = days;
currentMonth = *parsedMonth;
if (currentMonth == 2 && IsLeapYear(*year)) {
days -= 29;
} else {
days -= DAYS_OF_MONTH[*month - 1];
days -= DAYS_OF_MONTH[currentMonth - 1];
}
if (days < 0) {
if (days >= 0) {
*month += 1;
} else {
days = previousDays;
break;
}
*month = *month + 1;
}
*day += days;

View File

@@ -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) {
@@ -170,7 +170,7 @@ NWC24Err NWC24GetMsgObj(NWC24MsgObj* msg, NWC24MBoxType type, u32 id) {
u32 count = 0;
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
return NWC24_ERR_LIB_NOT_OPENED;
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
memset(entry, 0, sizeof(*entry));
if (id == 0)
return NWC24_ERR_HIDDEN;
@@ -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)
@@ -251,7 +251,7 @@ NWC24Err NWC24GetMsgIdList(NWC24MBoxType type, u32* ids, u32 maxLength) {
MBCEntry* entry;
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
return NWC24_ERR_LIB_NOT_OPENED;
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
err = GetCachedMBCHeader(type, &header);
if (err != NWC24_OK)
return err;
@@ -307,11 +307,11 @@ NWC24Err NWC24iOpenMBox(void) {
NWC24File recvFile, sendFile;
char* path = NWC24WorkP->pathWork;
NWC24Err err;
Mail_memset(NWC24WorkP->unk_0x1700, 0, 128);
Mail_memset(NWC24WorkP->sendMbcHeader, 0, 128);
err = GetCachedMBCHeader(NWC24_MBOX_TYPE_SEND, &header);
if (err != NWC24_OK)
return err;
Mail_memset(NWC24WorkP->unk_0x1780, 0, 128);
Mail_memset(NWC24WorkP->recvMbcHeader, 0, 128);
err = GetCachedMBCHeader(NWC24_MBOX_TYPE_RECV, &header);
if (err != NWC24_OK)
return err;
@@ -340,11 +340,11 @@ NWC24Err NWC24iInitMBox(void) {
NWC24File recvFile, sendFile;
NWC24Err recvResult, sendResult, err, sendStatus;
char* path = NWC24WorkP->pathWork;
Mail_memset(NWC24WorkP->unk_0x1700, 0, 128);
Mail_memset(NWC24WorkP->sendMbcHeader, 0, 128);
sendResult = CreateCtrlFile(NWC24_MBOX_TYPE_SEND, FALSE);
if (sendResult < 0)
return sendResult;
Mail_memset(NWC24WorkP->unk_0x1780, 0, 128);
Mail_memset(NWC24WorkP->recvMbcHeader, 0, 128);
recvResult = CreateCtrlFile(NWC24_MBOX_TYPE_RECV, FALSE);
if (recvResult < 0)
return recvResult;
@@ -555,14 +555,14 @@ NWC24Err NWC24iMBoxFlushHeader(NWC24MBoxType type) {
return result != NWC24_OK ? result : closeResult;
}
static inline void GetOldestMsgId(const MBCHeader* header, u32* id) {
static inline void GetOldestMsgId(const MBCHeader* header, volatile u32* id) {
*id = header->oldestId;
}
NWC24Err NWC24iMBoxCheck(NWC24MBoxType type, u32 size) {
u32 required;
struct {
u32 oldestId;
volatile u32 oldestId;
MBCHeader* header;
} mailbox;
NWC24Err err;
@@ -616,11 +616,11 @@ static NWC24Err CreateCtrlFile(NWC24MBoxType type, BOOL force) {
err = MakeCtrlPath(path, type);
if (err != NWC24_OK)
return err;
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
if (type == NWC24_MBOX_TYPE_SEND)
header = (MBCHeader*)NWC24WorkP->unk_0x1700;
header = (MBCHeader*)NWC24WorkP->sendMbcHeader;
else if (type == NWC24_MBOX_TYPE_RECV)
header = (MBCHeader*)NWC24WorkP->unk_0x1780;
header = (MBCHeader*)NWC24WorkP->recvMbcHeader;
else
return NWC24_ERR_INVALID_VALUE;
result = err;
@@ -676,7 +676,7 @@ static NWC24Err DeleteMsg(NWC24MBoxType type, u32 id, BOOL protect) {
NWC24Err err, deleteResult, closeResult;
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
return NWC24_ERR_LIB_NOT_OPENED;
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
err = GetCachedMBCHeader(type, &header);
if (err != NWC24_OK)
return err;
@@ -754,7 +754,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
NWC24Err clearResult, deleteResult;
if (type == NWC24_MBOX_TYPE_SEND)
return NWC24_OK;
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
for (offset = 128; offset < header->fileSize; offset += 128) {
if (count >= header->numMessages)
break;
@@ -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;
@@ -809,9 +809,9 @@ static NWC24Err GetCachedMBCHeader(NWC24MBoxType type, MBCHeader** header) {
char* path;
NWC24Err err = NWC24_OK, closeResult;
if (type == NWC24_MBOX_TYPE_SEND)
*header = (MBCHeader*)NWC24WorkP->unk_0x1700;
*header = (MBCHeader*)NWC24WorkP->sendMbcHeader;
else if (type == NWC24_MBOX_TYPE_RECV)
*header = (MBCHeader*)NWC24WorkP->unk_0x1780;
*header = (MBCHeader*)NWC24WorkP->recvMbcHeader;
else {
*header = NULL;
return NWC24_ERR_INVALID_VALUE;
@@ -874,7 +874,7 @@ static NWC24Err InitMBCHeader(MBCHeader* header, NWC24MBoxType type) {
static NWC24Err AddMBCEntry(MBCHeader* header, const NWC24MsgObjPrivate* msg, NWC24File* file) {
u32 offset = header->freeOffset;
MBCEntry* entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
MBCEntry* entry = (MBCEntry*)NWC24WorkP->mbcEntry;
u32 next;
NWC24Err err;
if (offset == 0)
@@ -906,7 +906,7 @@ static NWC24Err AddMBCEntry(MBCHeader* header, const NWC24MsgObjPrivate* msg, NW
}
static NWC24Err ClearMBCEntry(MBCHeader* header, NWC24File* file, u32 offset) {
MBCEntry* entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
MBCEntry* entry = (MBCEntry*)NWC24WorkP->mbcEntry;
NWC24Err err = NWC24FSeek(file, offset, NWC24_SEEK_BEG);
if (err != NWC24_OK)
return err;
@@ -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;

View File

@@ -505,14 +505,16 @@ static inline char* FindMarker(char* input, u32 size, const char* marker) {
for (offset = 0; offset <= size; offset++) {
char* current = input + offset;
if (Mail_strncmp(current, marker, markerLength) == 0)
return current;
return input + offset;
}
return NULL;
}
static inline char* FindMarkerAfterPrefix(char* input, u32 size, u32 prefix, const char* marker) {
u32 markerLength = Mail_strlen(marker);
char* current;
u32 offset;
char* current = input + prefix;
u32 markerLength;
markerLength = Mail_strlen(marker);
current = input + prefix;
for (offset = 0; offset <= size; offset++) {
if (Mail_strncmp(current, marker, markerLength) == 0) {
return input + prefix + offset;
@@ -522,15 +524,46 @@ static inline char* FindMarkerAfterPrefix(char* input, u32 size, u32 prefix, con
return NULL;
}
static inline char* FindEncodingMarker(char* encoded, u32 size) {
u32 offset;
u32 markerLength;
const char* marker;
char* current;
marker = "?";
markerLength = Mail_strlen(marker);
current = encoded;
for (offset = 0; offset <= size; offset++) {
if (Mail_strncmp(current, marker, markerLength) == 0) {
return encoded + offset;
}
current++;
}
return NULL;
}
static inline NWC24Err ExtractWordEncoding(char* encoding, u32* encodingSize, char* encoded, u32 encodedSize) {
char* delimiter = FindMarkerAfterPrefix(encoded, encodedSize, 0, "?");
char* delimiter = FindEncodingMarker(encoded, encodedSize);
if (delimiter == NULL) { return NWC24_ERR_INVALID_VALUE; }
*encoding = delimiter[1];
*encodingSize = 2;
return NWC24_OK;
}
static inline BOOL IsLinearWhitespaceOnly(char* text, u32 size) {
u32 offset;
BOOL whitespaceOnly;
whitespaceOnly = TRUE;
for (offset = 0; offset < size && text[offset] != '\0'; offset++) {
char value = text[offset];
if (value != ' ' && value != '\t' && value != '\r' && value != '\n') {
whitespaceOnly = FALSE;
}
}
return whitespaceOnly;
}
static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded, u32 decodedCapacity, u32* decodedSize, char* encoded,
u32 encodedSize, u32* encodedSizeOut) {
char encoding;
char* encodedWord;
u32 consumedSize;
u32 decodedLength;
@@ -547,7 +580,6 @@ static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded
if (encodedSizeOut != NULL) { *encodedSizeOut = 0; }
encodedWord = FindMarker(encoded, encodedSize, "=?");
if (encodedWord == encoded) {
char encoding;
result = ExtractCharset(charsetData, charsetCapacity, &consumedSize, encodedWord, encodedSize);
if (result != NWC24_OK) { return result; }
encodedLength = consumedSize;
@@ -573,15 +605,7 @@ static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded
}
decodedLength = localSize;
if (encodedWord != NULL) {
BOOL whitespaceOnly = TRUE;
u32 offset;
for (offset = 0; offset < localSize && decoded[offset] != '\0'; offset++) {
char value = decoded[offset];
if (value != ' ' && value != '\t' && value != '\r' && value != '\n') {
whitespaceOnly = FALSE;
}
}
if (whitespaceOnly) {
if (IsLinearWhitespaceOnly(decoded, localSize)) {
*decoded = '\0';
decodedLength = 1;
}

View File

@@ -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;
@@ -236,11 +243,11 @@ static inline NWC24Err WriteMBDelayField(NWC24MsgObjPrivate* msg, u32 flags) {
static inline NWC24Err WriteExtraFields(NWC24MsgObjPrivate* msg) {
NWC24Err err;
if (msg->unk_0xD0.size == 0)
if (msg->extraData.size == 0)
return NWC24_OK;
err = NWC24FWrite(msg->unk_0xD0.ptr, msg->unk_0xD0.size, m_pFile);
err = NWC24FWrite(msg->extraData.ptr, msg->extraData.size, m_pFile);
if (err == NWC24_OK)
msg->length += msg->unk_0xD0.size;
msg->length += msg->extraData.size;
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);

View File

@@ -73,11 +73,11 @@ 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);
NWC24Data_Init(&msgObj->extraData);
NWC24Data_Init(&msgObj->faceData);
NWC24Data_Init(&msgObj->altName);

View File

@@ -19,7 +19,7 @@ static inline NWC24Err SelectMBox(const NWC24MsgObjPrivate* msg, NWC24MBoxType*
}
NWC24Err NWC24ReadMsgField(const NWC24MsgObj* msg, char* fieldName, u8* output, u32 capacity) {
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
NWC24File file;
NWC24FileStream stream;
char* field;
@@ -268,7 +268,7 @@ NWC24Err NWC24ReadMsgMBOptOutFlag(const NWC24MsgObj* msg, BOOL* optOut, u32* app
}
NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacity) {
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
NWC24MBoxType type;
NWC24File file;
NWC24FileStream stream;
@@ -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)
@@ -312,7 +312,7 @@ NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacit
}
NWC24Err NWC24ReadMsgSubject(const NWC24MsgObj* msg, char* subject, u32 capacity) {
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
NWC24MBoxType type;
NWC24File file;
u32 length;
@@ -386,14 +386,14 @@ NWC24Err NWC24ReadMsgTextEx(const NWC24MsgObj* msg, char* text, u32 capacity, ch
}
static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capacity, char* charset, u32 charsetCapacity, NWC24Encoding* encoding) {
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
u32 length;
NWC24MBoxType type;
NWC24File file;
NWC24Err result, closeResult;
NWC24Err overflow = NWC24_OK;
u32 length;
u32 decodedSize;
char* buffer;
u32 decodedSize;
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
return NWC24_ERR_LIB_NOT_OPENED;
if (!(privateMsg->type & 0x200))
@@ -408,13 +408,15 @@ static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capa
return result;
}
length = privateMsg->textSize;
if (length == 0)
length = privateMsg->text.size;
switch (length) {
case 0: length = privateMsg->text.size; break;
default: break;
}
if (length == 0)
return NWC24_ERR_NULL;
if (length > capacity - 1) {
overflow = NWC24_ERR_OVERFLOW;
length = capacity - 1;
overflow = NWC24_ERR_OVERFLOW;
}
result = NWC24iMBoxOpenStoredMsg(type, privateMsg->msgId, &file);
switch (result) {
@@ -450,13 +452,16 @@ static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capa
result = NWC24FRead(text, length, &file);
text[length] = 0;
break;
case 2:
case 2: {
NWC24Err decodeResult;
decodedSize = 0;
result = ReadBase64Data(&file, &privateMsg->text, (u8*)text, length, &decodedSize);
if (result == NWC24_OK && decodedSize != privateMsg->textSize)
result = NWC24_ERR_FORMAT;
decodeResult = ReadBase64Data(&file, &privateMsg->text, (u8*)text, length, &decodedSize);
if (decodeResult == NWC24_OK && decodedSize != privateMsg->textSize)
decodeResult = NWC24_ERR_FORMAT;
result = decodeResult;
text[length] = 0;
break;
}
case 3:
result = ReadQPText(privateMsg, &file, text, length);
break;
@@ -468,15 +473,15 @@ static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capa
}
close:
closeResult = NWC24iMBoxCloseMsg(&file);
if (result == NWC24_OK)
result = closeResult;
if (result == NWC24_OK)
result = overflow;
return result;
if (result != NWC24_OK)
closeResult = result;
if (closeResult != NWC24_OK)
overflow = closeResult;
return overflow;
}
NWC24Err NWC24ReadMsgAttached(const NWC24MsgObj* msg, u32 index, u8* output, u32 capacity) {
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
NWC24File file;
NWC24MBoxType type;
u32 decodedSize;
@@ -505,11 +510,8 @@ NWC24Err NWC24ReadMsgAttached(const NWC24MsgObj* msg, u32 index, u8* output, u32
}
decodedSize = 0;
result = ReadBase64Data(&file, &privateMsg->attached[index], output, capacity, &decodedSize);
switch (result) {
case NWC24_OK:
if (decodedSize != privateMsg->attachedSize[index]) { result = NWC24_ERR_FORMAT; }
break;
default: break;
if (result == NWC24_OK) {
if (decodedSize != ((const NWC24MsgObjPrivate*)msg)->attachedSize[index]) result = NWC24_ERR_FORMAT;
}
closeResult = NWC24iMBoxCloseMsg(&file);
if (result == NWC24_OK)

View File

@@ -743,15 +743,16 @@ NWC24Err NWC24iSetMsgSubjectQP(NWC24MsgObj* msg, const u16* subject, u32 subject
u32 workSize, NWC24Charset charset, char* charsetName) {
u32 workHalf;
u32 sourceOffset;
u32 secondSize;
u32 charsetLength;
u8* second;
u32 subjectLength;
u32 lineLength;
u32 outputLength;
u32 secondSize;
u32 total;
u32 combinedLength;
u32 i;
u32 charsetLength;
u32 outputLength;
u32 firstCharsetLength;
NWC24Err result;
secondSize = workSize - (workSize >> 1);
@@ -770,8 +771,8 @@ NWC24Err NWC24iSetMsgSubjectQP(NWC24MsgObj* msg, const u16* subject, u32 subject
work[i] = ' ';
}
}
charsetLength = strlen(charsetName);
NWC24iDetectBreakPoint(&lineLength, charset, work, subjectLength, (0x38 - charsetLength) / 3);
firstCharsetLength = strlen(charsetName);
NWC24iDetectBreakPoint(&lineLength, charset, work, subjectLength, (0x38 - firstCharsetLength) / 3);
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'Q', work, lineLength);
switch (result) {
default:
@@ -816,9 +817,10 @@ done:
NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 subjectSize, NWC24EncodingRegion region, u16 alternative, u8* work,
u32 workSize, NWC24Charset charset, char* charsetName) {
u32 workHalf;
u32 secondSize;
const u8* encodedInput = work;
u8* second;
u32 secondSize;
u32 workHalf;
u32 subjectLength;
u32 lineLength;
u32 sourceOffset;
@@ -827,19 +829,23 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
u32 charsetLength;
NWC24Err result;
workHalf = workSize >> 1;
second = work + workHalf;
secondSize = workSize - workHalf;
second = work + (workSize >> 1);
secondSize = workSize - (workSize >> 1);
charsetLength = strlen(charsetName);
lineLength = ((0x36 - charsetLength) * 3) >> 2;
if (lineLength > workHalf) {
if (lineLength > (workSize >> 1)) {
result = NWC24_ERR_OVERFLOW;
} else {
workHalf = lineLength + 1;
subjectLength = subjectSize;
result = NWC24iConvertFromInternalEncoding(work, &workHalf, subject, &subjectLength, charsetName, 0x40, region, alternative);
switch (result) { case NWC24_OK: case NWC24_ERR_OVERFLOW: break; default: goto done; }
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
if (result != NWC24_OK) {
switch (result) {
case NWC24_ERR_OVERFLOW: break;
default: goto done;
}
}
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', (u8*)encodedInput, workHalf - 1);
switch (result) { case NWC24_OK: break; default: goto done; }
{
sourceOffset = subjectLength;
@@ -861,8 +867,13 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
second[total++] = ' ';
result = NWC24iConvertFromInternalEncoding(work, &workHalf, subject + sourceOffset, &subjectLength, charsetName, 0x40, region,
alternative);
switch (result) { case NWC24_OK: case NWC24_ERR_OVERFLOW: break; default: goto done; }
result = NWC24EncodeWord(second + total, secondSize - total, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
if (result != NWC24_OK) {
switch (result) {
case NWC24_ERR_OVERFLOW: break;
default: goto done;
}
}
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;

View File

@@ -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;

View File

@@ -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);

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -619,7 +619,7 @@ vmFloat VmIntToFloat(vmU64 integer) {
return result;
}
static s32 CHANSVmParseInt(CHANSVmObjHdr* obj, s32 base, u64* out) {
static s32 CHANSVmParseInt(const CHANSVmObjHdr* obj, s32 base, u64* out) {
u8 type = obj->type;
u32 stringLength;
u32 charCount;

View File

@@ -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;
}

View File

@@ -22,7 +22,9 @@ namespace textinput {
#pragma section sconst_type ".sdata"
extern "C" const char* scCommonTextAnimName = scT_prdc_Text_00;
extern "C" const char* scCommonScrollAnimName = scP_prdc_scrl_Left;
extern "C" const wchar_t scEmptyWChars[4] = {0, 0, 0, 1};
#pragma explicit_zero_data on
extern "C" const wchar_t scEmptyWChars[4] = {0, 0, 0, 0};
#pragma explicit_zero_data reset
extern "C" const char scP_OnBtn[8] = "P_OnBtn";
extern "C" const char scB_OnBtn[8] = "B_OnBtn";
#pragma pop

View File

@@ -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();
}

View File

@@ -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;

View File

@@ -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() {

View File

@@ -1704,6 +1704,9 @@ void ipl::scene::AddressEdit::stt_wait_btn_fadein() {
}
void ipl::scene::AddressEdit::stt_wait_btn_fadeout() {
nw4r::lyt::Pane* label;
const wchar_t* message;
ipl::utility::FrameController* animator;
bool friendFinished;
if (mpFriendCache->getInfo(mSelectedFriend).attr.status == 2) {
friendFinished = !mpCodeLayout->getAnim(0x15)->isPlaying();
@@ -1715,11 +1718,11 @@ void ipl::scene::AddressEdit::stt_wait_btn_fadeout() {
friendFinished &= !mpCodeLayout->getAnim(0x17)->isPlaying();
if (friendFinished) {
nw4r::lyt::Pane* label = mpCodeLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_card_msg_00", true);
const wchar_t* message = ipl::System::getMessage(0x30);
label = mpCodeLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_card_msg_00", true);
message = ipl::System::getMessage(0x30);
set_textbox(label, message);
ipl::System::getDialog()->callS2Btn2(0x142, 0x141, true);
ipl::layout::Animator* animator = mpCodeLayout->getAnim(0x1c);
animator = mpCodeLayout->getAnim(0x1c);
animator->initFrame();
animator->restart();
mState = 4;
@@ -2122,6 +2125,8 @@ state0:
goto state0Common;
case 3:
goto state0Button3;
case 4:
goto done;
default:
goto done;
}
@@ -2153,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();
@@ -2194,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();
@@ -2247,6 +2258,8 @@ void ipl::scene::AddressEdit::start_left_event(const char* paneName) {
}
break;
}
case 4:
break;
default:
break;
}

View File

@@ -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;
}

View File

@@ -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));
}

View File

@@ -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;
}
}
}

View File

@@ -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);
}
}

View File

@@ -20,7 +20,7 @@
#include <private/os.h>
#include <private/wpad.h>
#pragma dont_instantiate ipl::math::HermiteIntp<float>
#undef IPL_CHANNEL_TITLE_NOVTABLE
@@ -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;
}

View File

@@ -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;
}

View File

@@ -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: {

View File

@@ -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);

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