Compare commits
1 Commits
ci/readme-
...
agent/bitt
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2416764fdd |
19
.github/workflows/readme-progress.yml
vendored
19
.github/workflows/readme-progress.yml
vendored
@@ -2,8 +2,6 @@ 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]
|
||||
@@ -17,7 +15,7 @@ concurrency:
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
progress:
|
||||
@@ -50,8 +48,15 @@ jobs:
|
||||
- name: Report
|
||||
run: build/tools/objdiff-cli report generate -p . -o build/43U/report.json -f json
|
||||
|
||||
- name: Summary
|
||||
- name: Update README
|
||||
run: python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
|
||||
|
||||
- name: Commit
|
||||
run: |
|
||||
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
|
||||
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
|
||||
|
||||
170
AGENTS.md
170
AGENTS.md
@@ -78,12 +78,6 @@ Helper tools live in `tools/decomp-assist/`:
|
||||
between your object and the original. This is the main iteration loop.
|
||||
- `disasm_fn.py <object> <symbol>` — disassembly with relocation-resolved call
|
||||
names, so you can see which real functions are being called.
|
||||
- `literal_reference_diff.py [unit ...]` — advisory check of actual narrow-string
|
||||
bytes passed at corresponding calls, including addresses derived from a shared
|
||||
data base. Defaults to functions scored 100% in the live report; use
|
||||
`--all-functions` to include other equal-sized functions. Inspect every
|
||||
candidate against the assembly. This does not follow mutable pointer globals,
|
||||
infer compiler aliases, or prove complete data matching; skips are reported.
|
||||
- `pool_diff.py` — diffs the string pool in `.data` between your object and the
|
||||
original, string by string. See below; this is the highest-signal tool.
|
||||
- `export_pyghidra.py` — regenerates `ghidra_decomp.txt`, decompiled C for the
|
||||
@@ -170,8 +164,9 @@ This repository targets only Wii Menu 4.3U. Do not configure or build 43E,
|
||||
43J, or 43K while doing matching work.
|
||||
|
||||
Most workers should pursue exact matching or safe linking; assign the remainder
|
||||
to decompilation. Keep every worker slot busy (currently four Codex slots; see
|
||||
"Orchestrator loop" below). Fill completed slots with disjoint tasks. Never duplicate a source file or function
|
||||
to decompilation. Keep up to 75 live workers when the runtime allows it, while
|
||||
reserving capacity for fixer and validation workers. Fill completed slots with
|
||||
disjoint tasks. Never duplicate a source file or function
|
||||
range. Workers return changed paths, exact objdiff measurements, and validation
|
||||
results. Fuzzy-only results are not accepted.
|
||||
|
||||
@@ -251,12 +246,6 @@ and merge the PR, fast-forward `origin/main`, and publish progress. If a
|
||||
candidate fails validation, return it to its worker; do not fix the candidate
|
||||
inline in the orchestrator.
|
||||
|
||||
Two exceptions, both set by the human: once a leaf has failed at `max` effort
|
||||
(see the effort scale below) the orchestrator itself takes a crack at it, and
|
||||
the orchestrator may finish PRs whose authors are gone (rebase, drop a
|
||||
forbidden pattern, close with evidence). Record every such attempt in the
|
||||
policy log, including the ones that fail.
|
||||
|
||||
A new thread must begin by reading this file, checking the live 43U report and
|
||||
remote branch, and dispatching the worker pool. The parent must not claim a
|
||||
match without fresh independent verification.
|
||||
@@ -331,159 +320,6 @@ Linked: <percent> | Fuzzy: <percent> | Data: <percent>
|
||||
Do not report stale values, unmerged PR results, or add other text to that
|
||||
update. Continue all required verification and coordination silently.
|
||||
|
||||
## Orchestrator loop (Claude orchestrator, Codex workers)
|
||||
|
||||
This is the loop currently in use. One Claude session is the orchestrator.
|
||||
It does not spawn Claude subagents. All decompilation work goes to Codex CLI
|
||||
workers running `gpt-6.1-sol`. The orchestrator assigns leaves, verifies,
|
||||
lands, reviews outside PRs, and only decompiles by hand in the cases listed
|
||||
under the ownership boundary above.
|
||||
|
||||
Only one orchestrator session may run at a time. If a second session resumes
|
||||
the same thread (for example, the same session opened in two windows), close
|
||||
one of them. Two orchestrators double-merge PRs and fight over the shared
|
||||
build tree.
|
||||
|
||||
### Worker slots and the effort scale
|
||||
|
||||
Run four worker slots, each in its own worktree on a fresh branch from
|
||||
`origin/main`. Every slot gets a disjoint set of three or four leaves (units),
|
||||
closest-to-matching first. A slot starts at `medium` (or `low`) reasoning
|
||||
effort and escalates only when a round produces no new exact function:
|
||||
|
||||
```
|
||||
low/medium -> high -> xhigh -> max -> orchestrator attempt -> parked
|
||||
```
|
||||
|
||||
A round that gains at least one exact function is landed, and the remaining
|
||||
functions go out again at the same effort or one step up. A set that fails at
|
||||
`max` goes to the orchestrator. If the orchestrator also fails, the function
|
||||
is parked as a compiler tie-break with its evidence. Fill freed slots from the
|
||||
live checklist right away; never leave a slot idle.
|
||||
|
||||
Before starting a function, a worker fetches `origin/main` and checks it is
|
||||
not already matched. Outside contributors land work in parallel, and
|
||||
duplicated matches waste a round.
|
||||
|
||||
### Silent mode for workers
|
||||
|
||||
Workers run unattended and must not talk. Every turn is tool calls only: no
|
||||
plans, no progress notes, no summaries. Progress goes into an attempts log
|
||||
file in `tools/decomp-assist/`. The only text message in a run is the final
|
||||
report, at most 8-15 short lines:
|
||||
|
||||
- exact functions per unit, before and after;
|
||||
- the final `GATE` line;
|
||||
- commit hashes;
|
||||
- a link to the attempts log.
|
||||
|
||||
Runs are audited for text messages, and any chatter is a contract
|
||||
violation. Workers also must not push, open PRs, merge, rebase, touch other
|
||||
worktrees, or spawn subagents.
|
||||
|
||||
Each worker prompt has this layout:
|
||||
|
||||
1. the `<task>` block (leaves, current exact counts, method, report format);
|
||||
2. the shared `common.md` block with `<silent_mode>`, `<forbidden>`,
|
||||
`<method>` and `<definition_of_done>`.
|
||||
|
||||
Resume a stalled worker on the same session with the failure evidence. Don't
|
||||
replace it with a fresh one.
|
||||
|
||||
### Gate, landing and review
|
||||
|
||||
- `gate.py <unit...>` is the acceptance check for workers and for outside
|
||||
PRs. It covers:
|
||||
- a full 4.3U build and the DOL SHA1;
|
||||
- per-unit objdiff and instruction-exact counts;
|
||||
- regressions against a baseline report of `origin/main`;
|
||||
- a net forbidden-pattern scan and a readability scan (auto-named
|
||||
identifiers, raw `*(T*)(p + N)` offset casts).
|
||||
- A function that disappears because it was renamed is not a regression,
|
||||
unless the unit's exact count, code or data also drops.
|
||||
- Landing a worker result builds a branch from `origin/main` with the
|
||||
worker's diff, gates it, pushes it, then opens and squash-merges a PR on
|
||||
the fork. After that it regenerates the checklist.
|
||||
- Never run two full builds in the same build tree at once.
|
||||
- Never land while the review queue is building. Both use the same
|
||||
verification worktree.
|
||||
|
||||
Outside PRs are reviewed by a daemon. It re-runs the gate on any open PR
|
||||
whose head commit changed since its last review. A PR is merged
|
||||
automatically only when all of these hold:
|
||||
|
||||
- the PR rebases cleanly;
|
||||
- the full build passes;
|
||||
- the DOL hash matches;
|
||||
- the gate passes, or its only failures are renamed-away functions;
|
||||
- the diff adds no forbidden pattern and no `.s` file.
|
||||
|
||||
Everything else is reviewed by hand:
|
||||
|
||||
- **Conflicts:** comment asking for a rebase.
|
||||
- **Forbidden patterns:** request changes with a concrete honest
|
||||
alternative.
|
||||
- **"Linking" by swapping in retail assembly or pinned labels:** close and
|
||||
explain.
|
||||
- **Proven split/ownership corrections** (relocation evidence, total data
|
||||
unchanged): merge even if one unit's numbers move to its neighbour.
|
||||
|
||||
Policy additions learned in this loop:
|
||||
|
||||
- Linking a unit by building the retail `.s` instead of its C/C++ is
|
||||
forbidden. "Linked" means the C/C++ itself compiles to the exact bytes.
|
||||
- Definition-level `volatile` (on the field or object declaration) is allowed
|
||||
when the target proves it, e.g. back-to-back reloads with no store in
|
||||
between. Check that it changes no other function in the units that use it.
|
||||
Use-site volatile casts and the `register` keyword stay forbidden.
|
||||
|
||||
### Handoff: where the loop lives
|
||||
|
||||
The loop's tools and state live outside the repository, in the author's
|
||||
workers directory `/mnt/drive2/projects/wii-ipl-workers` (`$W` below). A new
|
||||
orchestrator thread picks up from there.
|
||||
|
||||
Tools in `$W/_restore0928-tools/`:
|
||||
|
||||
| File | Purpose |
|
||||
|------|---------|
|
||||
| `gate.py <unit...> [--base origin/main] [--quick]` | the acceptance gate; `--quick` only skips the clean `rm -rf build/43U` |
|
||||
| `land.sh <name> <worktree> merge-base <unit...> <title>` | gate a worker's diff on a fresh branch, push, open and squash-merge the PR |
|
||||
| `luna.sh <worktree> <name> <prompt> <effort> [session]` | start (or resume) one Codex worker; run with `MODEL=gpt-6.1-sol CODEX_BIN=$W/_codex159/bin/codex` |
|
||||
| `reviewd.sh` | review daemon: queues every open PR whose head changed |
|
||||
| `revq.sh`, `automerge.py` | the daemon's gate runner and merge decision |
|
||||
| `checklist.py` | regenerates `$W/CHECKLIST.md` from a report |
|
||||
| `chatter.py <run-prefix>` | counts worker text messages for the silent-mode audit |
|
||||
| `baseline-<sha8>.json` | objdiff reports of past `origin/main` commits, used for regressions |
|
||||
|
||||
State:
|
||||
|
||||
- `$W/_luna-runs/prompts/`: worker prompts. `common.md` is shared; each
|
||||
task is `<name>.task.md`, and the launched prompt is `<name>.md` = task +
|
||||
common.
|
||||
- `$W/_luna-runs/<name>.<time>.jsonl` and `.last.md`: worker transcript and
|
||||
final report.
|
||||
- `$W/_luna-runs/effort-policy.txt`: the policy log. Records escalations,
|
||||
parked functions, and every orchestrator attempt with what was tried.
|
||||
- `$W/CHECKLIST.md`: units with non-exact code, worst first.
|
||||
- Worktrees: `verify-fix` is the only verification and landing tree;
|
||||
`sol-low`, `sol-med`, `sol-high` and `w0929-fix-board` are the four worker
|
||||
slots; `orch` is orchestrator scratch.
|
||||
- Logs: `/tmp/reviewd.log`, `/tmp/vfq.log` (current review batch) and
|
||||
`/tmp/automerge.log` (merge decisions). These are lost on reboot, which
|
||||
only means open PRs get reviewed again.
|
||||
- `/tmp/wii-git.lock`: every `git fetch` or checkout in a shared worktree
|
||||
runs under `flock` on this file, because worktrees share refs.
|
||||
|
||||
To pick up the loop:
|
||||
|
||||
1. Make sure no other orchestrator session is running.
|
||||
2. Check `pgrep -af "reviewd.sh|luna.sh|land.sh"` and restart the review
|
||||
daemon if it isn't running.
|
||||
3. Read the newest `.last.md` for each slot. Land gains, then relaunch the
|
||||
slot per the effort scale.
|
||||
4. Handle every `NEEDS REVIEW` line in `/tmp/automerge.log`.
|
||||
|
||||
## Goal completion contract
|
||||
|
||||
The decompilation loop does not stop after a successful wave, a convenient
|
||||
|
||||
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.55% | 90.33% | 69.37% | 99.37% |
|
||||
| 99.39% | 88.21% | 62.52% | 92.12% |
|
||||
|
||||
units 950/1027 complete, functions 12343/12563 matched.
|
||||
units 921/1027 complete, functions 12239/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 -->
|
||||
|
||||
@@ -869,12 +869,11 @@ src/scene/setting/iplUSBAP.cpp:
|
||||
.bss start:0x810BC148 end:0x810BD498
|
||||
.text start:0x813FC520 end:0x813FC8FC
|
||||
.data start:0x81657B08 end:0x81657B18
|
||||
.sbss start:0x81698C08 end:0x81698C20
|
||||
.sbss start:0x81698C08 end:0x81698C28
|
||||
|
||||
src/scene/setting/iplUSBAPThread.cpp:
|
||||
.text start:0x813FC8FC end:0x813FCA0C
|
||||
.data start:0x81657B18 end:0x81657B60
|
||||
.sbss start:0x81698C20 end:0x81698C28
|
||||
|
||||
src/scene/setting/iplAOSSThread.cpp:
|
||||
.bss start:0x810BD498 end:0x810BD4A8
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
58
configure.py
58
configure.py
@@ -689,7 +689,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("sound", [
|
||||
Object(Matching, "sound/iplSound.cpp"),
|
||||
Object(NonMatching, "sound/iplSound.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("iplwww", [
|
||||
@@ -738,11 +738,11 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("board", [
|
||||
Object(Matching, "scene/board/iplBoard.cpp"),
|
||||
Object(Equivalent, "scene/board/iplBoard.cpp"),
|
||||
Object(Matching, "scene/board/iplBoardObject.cpp"),
|
||||
Object(Matching, "scene/board/iplBoardSD.cpp"),
|
||||
Object(Matching, "scene/board/iplUrlProcessor.cpp"),
|
||||
Object(Matching, "scene/board/iplFocusObject.cpp"),
|
||||
Object(Equivalent, "scene/board/iplFocusObject.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("button", [
|
||||
@@ -816,7 +816,7 @@ config.libs = [
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardManager.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplGCWindow.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplGCWindow.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("textBalloon", [
|
||||
@@ -850,7 +850,7 @@ config.libs = [
|
||||
),
|
||||
IPLSection("sdChannelSelect", [
|
||||
Object(NonMatching, "scene/sdChannelSelect/iplSDChannelSelect.cpp"),
|
||||
Object(Matching, "scene/sdChannelSelect/iplSDChannelObj.cpp"),
|
||||
Object(NonMatching, "scene/sdChannelSelect/iplSDChannelObj.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("sdChannelTitle", [
|
||||
@@ -869,12 +869,12 @@ config.libs = [
|
||||
),
|
||||
IPLSection("setting", [
|
||||
Object(NonMatching, "scene/setting/iplSetting.cpp"),
|
||||
Object(Matching, "scene/setting/iplSensitivity.cpp"),
|
||||
Object(NonMatching, "scene/setting/iplSensitivity.cpp"),
|
||||
Object(Matching, "scene/setting/iplNCDSetting.cpp"),
|
||||
Object(Matching, "scene/setting/iplParental.cpp"),
|
||||
Object(Matching, "scene/setting/iplAPScanThread.cpp"),
|
||||
Object(Matching, "scene/setting/iplUSBAP.cpp"),
|
||||
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/iplUSBAP.cpp"),
|
||||
Object(NonMatching, "scene/setting/iplUSBAPThread.cpp"),
|
||||
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSSLink.c"),
|
||||
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
@@ -901,7 +901,7 @@ config.libs = [
|
||||
),
|
||||
IPLSection("bannerSound", [
|
||||
Object(Matching, "bannerSound/AudioWavePlayer.cpp"),
|
||||
Object(Matching, "bannerSound/AxAdpcmPlayer.cpp"),
|
||||
Object(Equivalent, "bannerSound/AxAdpcmPlayer.cpp"),
|
||||
Object(Matching, "bannerSound/BannerSoundPlayer.cpp"),
|
||||
Object(Matching, "bannerSound/AudioWaveUtility.cpp"),
|
||||
]
|
||||
@@ -928,12 +928,12 @@ config.libs = [
|
||||
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/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "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"]),
|
||||
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiLayout.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiLayoutGather.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(Matching, "clib/zi8dawg.c"),
|
||||
Object(NonMatching, "clib/zi8dawg.c"),
|
||||
Object(Matching, "clib/zi8getc.c"),
|
||||
Object(NonMatching, "clib/zi8getc2.c"),
|
||||
Object(Matching, "clib/zi8getSW.c"),
|
||||
@@ -1045,7 +1045,7 @@ config.libs = [
|
||||
Object(Matching, "net/crc.c"),
|
||||
Object(NonMatching, "net/md5.c"),
|
||||
Object(Matching, "net/sha1.c"),
|
||||
Object(Matching, "net/hmac.c"),
|
||||
Object(NonMatching, "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(Matching, "nhttp/NHTTP_socket_RVL.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_socket_RVL.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_stdlib_RVL.c"),
|
||||
Object(Matching, "nhttp/NHTTP_thread.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_thread.c"),
|
||||
Object(Matching, "nhttp/d_nhttp_private.c"),
|
||||
Object(Matching, "nhttp/d_nhttp.c"),
|
||||
Object(Matching, "nhttp/d_nhttp_common.c"),
|
||||
@@ -1076,11 +1076,11 @@ config.libs = [
|
||||
Object(Matching, "nwc24/NWC24Manage.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgObj.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MBoxCtrl.c"),
|
||||
Object(Matching, "nwc24/NWC24Mime.c"),
|
||||
Object(NonMatching, "nwc24/NWC24Mime.c"),
|
||||
Object(Matching, "nwc24/NWC24Stream.c"),
|
||||
Object(Matching, "nwc24/NWC24Parser.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgCommit.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgRead.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgRead.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgSubject.c"),
|
||||
Object(Matching, "nwc24/NWC24Schedule.c"),
|
||||
Object(NonMatching, "nwc24/NWC24DateParser.c"),
|
||||
@@ -1097,7 +1097,7 @@ config.libs = [
|
||||
RevoEXLib("so", [
|
||||
Object(Matching, "so/SOCommon.c"),
|
||||
Object(NonMatching, "so/SOBasic.c"),
|
||||
Object(Matching, "so/SOInformation.c"),
|
||||
Object(NonMatching, "so/SOInformation.c"),
|
||||
Object(NonMatching, "so/SOOption.c"),
|
||||
]
|
||||
),
|
||||
@@ -1212,7 +1212,7 @@ config.libs = [
|
||||
Object(NonMatching, "exif/exif_parse.c"),
|
||||
|
||||
Object(Matching, "reschange/iqdec_resolution_change_a3.c"),
|
||||
Object(Matching, "reschange/idct_resolution_change_var.c"),
|
||||
Object(NonMatching, "reschange/idct_resolution_change_var.c"),
|
||||
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoY8U8V8.c"),
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
|
||||
@@ -1453,7 +1453,7 @@ config.libs = [
|
||||
Object(Matching, "axfx/AXFXReverbStd.c"),
|
||||
Object(Matching, "axfx/AXFXReverbStdExp.c"),
|
||||
Object(Matching, "axfx/AXFXChorus.c"),
|
||||
Object(Matching, "axfx/AXFXChorusExp.c"),
|
||||
Object(NonMatching, "axfx/AXFXChorusExp.c"),
|
||||
Object(Matching, "axfx/AXFXLfoTable.c"),
|
||||
Object(Matching, "axfx/AXFXSrcCoef.c"),
|
||||
Object(Matching, "axfx/AXFXHooks.c"),
|
||||
@@ -1692,19 +1692,19 @@ config.libs = [
|
||||
Object(Matching, "fa/pdm_disk.c"),
|
||||
Object(NonMatching, "fa/pdm_partition.c"),
|
||||
Object(NonMatching, "fa/pf_cache.c"),
|
||||
Object(Matching, "fa/pf_cluster.c"),
|
||||
Object(Matching, "fa/pf_dir.c"),
|
||||
Object(NonMatching, "fa/pf_cluster.c"),
|
||||
Object(NonMatching, "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_fat12.c"),
|
||||
Object(NonMatching, "fa/pf_fat12.c"),
|
||||
Object(Matching, "fa/pf_fat16.c"),
|
||||
Object(Matching, "fa/pf_fat32.c"),
|
||||
Object(Matching, "fa/pf_fatfs.c"),
|
||||
Object(Matching, "fa/pf_file.c"),
|
||||
Object(Matching, "fa/pf_path.c"),
|
||||
Object(NonMatching, "fa/pf_file.c"),
|
||||
Object(NonMatching, "fa/pf_path.c"),
|
||||
Object(Matching, "fa/pf_sector.c"),
|
||||
Object(Matching, "fa/pf_volume.c"),
|
||||
Object(NonMatching, "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(Matching, "fa/msc/puh_msc_blk.c"),
|
||||
Object(NonMatching, "fa/msc/puh_msc_blk.c"),
|
||||
]
|
||||
),
|
||||
RVLSDKLib("sdi", [
|
||||
@@ -1869,7 +1869,7 @@ config.libs = [
|
||||
),
|
||||
RVLSDKLib("nup", [
|
||||
Object(NonMatching, "nup/nup.cpp"),
|
||||
Object(Matching, "nup/nup_nhttp.cpp"),
|
||||
Object(NonMatching, "nup/nup_nhttp.cpp"),
|
||||
Object(Matching, "nup/nup_mem.cpp"),
|
||||
]
|
||||
),
|
||||
@@ -1892,7 +1892,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RVLSDKLib("kpr", [
|
||||
Object(Matching, "kpr/kpr_lib.c"),
|
||||
Object(NonMatching, "kpr/kpr_lib.c"),
|
||||
]
|
||||
),
|
||||
RVLSDKLib("usbkbd", [
|
||||
|
||||
@@ -37,16 +37,8 @@ namespace ipl {
|
||||
u8 unk_0x06; // 0x06
|
||||
u8 unk_0x07; // 0x07
|
||||
u8 iconFmt[8]; // 0x08
|
||||
#ifdef IPL_MEMORY_CARD_MANAGER_CPP
|
||||
volatile u16 anmFrameBits;
|
||||
#else
|
||||
u16 anmFrameBits;
|
||||
#endif
|
||||
#ifdef IPL_MEMORY_CARD_MANAGER_CPP
|
||||
volatile s16 anmMax;
|
||||
#else
|
||||
u16 anmFrameBits; // 0x10
|
||||
s16 anmMax; // 0x12
|
||||
#endif
|
||||
u32 bannerOffset; // 0x14
|
||||
u32 bannerTlutOffset; // 0x18
|
||||
u32 iconOffset[8]; // 0x1C
|
||||
|
||||
@@ -92,11 +92,7 @@ namespace textinput {
|
||||
virtual void setSaveData(savedata::MemoSetting memoSetting) {
|
||||
mMemoSetting = memoSetting;
|
||||
}
|
||||
#ifdef IPL_KEYBOARD_MEMO_GET_SAVE_DATA
|
||||
virtual savedata::MemoSetting getSaveData();
|
||||
#else
|
||||
virtual savedata::MemoSetting getSaveData() { return mMemoSetting; }
|
||||
#endif
|
||||
|
||||
virtual void changeState(StateTimeLine stateTimeLine);
|
||||
virtual State* getState() { return mpCurrentState; }
|
||||
|
||||
@@ -109,23 +109,10 @@ namespace textinput {
|
||||
HKBManager* manager;
|
||||
};
|
||||
HKBManager() __attribute__((never_inline));
|
||||
~HKBManager();
|
||||
static HKBManager& getInstance() { return sInstance; }
|
||||
void Initialize();
|
||||
void ClearState();
|
||||
u32 FilterCharacter(u32 code) const {
|
||||
if (allowedCharacters == 0) return code;
|
||||
u32 count = allowedCharacterCount;
|
||||
if (count == 0) return code;
|
||||
for (u32 index = 0; index < count; index++) {
|
||||
if (static_cast<u16>(code) == allowedCharacters[index]) return code;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
void DetachDevice(KBDDevEvent* event) {
|
||||
u8 device = event->device;
|
||||
attached[device] = 0;
|
||||
states[device].Clear();
|
||||
}
|
||||
u32 GetModifierState() const;
|
||||
void SetCountry(u8 country);
|
||||
void SetModifierState(u32 state, u32 mask);
|
||||
|
||||
@@ -113,8 +113,6 @@ namespace textinput {
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void setTitleText(wchar_t* titleText);
|
||||
void initAspect();
|
||||
#elif defined(MYTIMANAGER_IMPLEMENTATION)
|
||||
virtual void setTitleText(wchar_t* titleText);
|
||||
#else
|
||||
virtual void setTitleText(const wchar_t* titleText);
|
||||
#endif
|
||||
|
||||
@@ -197,7 +197,6 @@ namespace textinput {
|
||||
bool mbMaintainCursorCache;
|
||||
#elif defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
protected:
|
||||
void setDrawScrollY(const f32& scroll) { mfDrawScrollY = scroll; }
|
||||
u8 mDrawState[0x27];
|
||||
f32 mfDrawScrollY;
|
||||
u8 mDrawCacheState[0x14];
|
||||
|
||||
@@ -7,10 +7,6 @@
|
||||
|
||||
#include "utility/iplFrameController.h"
|
||||
|
||||
#ifdef IPL_GC_WINDOW_CPP
|
||||
#include "math/iplMathTypes.h"
|
||||
#endif
|
||||
|
||||
#ifdef IPL_GCW_INTP_CTOR_OUT_OF_LINE
|
||||
#include "global/decomp/utils.h"
|
||||
#endif
|
||||
@@ -42,33 +38,6 @@ namespace ipl {
|
||||
T mEnd;
|
||||
};
|
||||
|
||||
#ifdef IPL_GC_WINDOW_CPP
|
||||
template <>
|
||||
class Interporation<VEC3> : public utility::FrameController {
|
||||
public:
|
||||
virtual ~Interporation();
|
||||
|
||||
void init(int playback, f32 maxFrame, f32 minFrame, const VEC3& start,
|
||||
const VEC3& end, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
utility::FrameController::init(playback, maxFrame, minFrame, speed);
|
||||
}
|
||||
|
||||
const VEC3& getStart() { return mStart; }
|
||||
const VEC3& getEnd() { return mEnd; }
|
||||
|
||||
void playBackwards() {
|
||||
mAnmType = ANIM_TYPE_BACKWARD;
|
||||
mState = ANIM_STATE_PLAY;
|
||||
}
|
||||
|
||||
protected:
|
||||
VEC3 mStart;
|
||||
VEC3 mEnd;
|
||||
};
|
||||
#endif
|
||||
|
||||
template <typename T>
|
||||
class LinearIntp : public Interporation<T> {
|
||||
public:
|
||||
@@ -92,16 +61,6 @@ namespace ipl {
|
||||
T get2() const { return (((mStart * (mMaxFrame - mFrame)) + (mEnd * mFrame)) / mMaxFrame); }
|
||||
};
|
||||
|
||||
#ifdef IPL_GC_WINDOW_CPP
|
||||
template <>
|
||||
class LinearIntp<VEC3> : public Interporation<VEC3> {
|
||||
public:
|
||||
LinearIntp();
|
||||
virtual ~LinearIntp();
|
||||
VEC3 get() const;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
template <typename T>
|
||||
|
||||
@@ -143,11 +143,7 @@ namespace ipl {
|
||||
#else
|
||||
VEC3 operator-(const VEC3& rhs) const { return VEC3(x - rhs.x, y - rhs.y, z - rhs.z); }
|
||||
#endif
|
||||
#ifdef IPL_FOCUS_OBJECT_CPP
|
||||
VEC3 operator*(f32 val) const;
|
||||
#else
|
||||
VEC3 operator*(f32 val) const { return VEC3(x * val, y * val, z * val); }
|
||||
#endif
|
||||
VEC3 operator*(f64 val) const {
|
||||
nw4r::math::VEC3 vecOut;
|
||||
VEC3Scale(&vecOut, this, (f32)val);
|
||||
|
||||
@@ -53,7 +53,24 @@ namespace ipl {
|
||||
mBScroller.init();
|
||||
}
|
||||
|
||||
BOOL calc(bool canScroll);
|
||||
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 is_busy() const {
|
||||
BOOL result = TRUE;
|
||||
|
||||
@@ -65,11 +65,7 @@ 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 */
|
||||
|
||||
@@ -102,7 +102,12 @@ namespace ipl {
|
||||
static const char* getButtonName(int button) { return smButtonName[button]; }
|
||||
#endif
|
||||
|
||||
void setEventHandler(::gui::EventHandler * event);
|
||||
#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 setText(const char* paneName, u32 msgId);
|
||||
void setText(const char* paneName, const wchar_t* text);
|
||||
|
||||
@@ -203,9 +203,9 @@ namespace ipl {
|
||||
bool enqueueLoadNotice();
|
||||
bool enqueuePageNotice();
|
||||
bool enqueueResultNotice(u32 result);
|
||||
bool enqueueChannelNotice(u64 titleId, u32 value);
|
||||
bool enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value);
|
||||
bool enqueueMoveNotice(u32 controller, u32 page, u32 index);
|
||||
bool enqueueStateNotice(u64 titleId, u32 state);
|
||||
bool enqueueStateNotice(u32 controller, u32 page, u32 index, u32 state);
|
||||
bool enqueueErrorNotice(u32 page, u32 index);
|
||||
bool enqueueCommandNotice(u32 page, u32 index, u32 command);
|
||||
bool enqueueDeleteNotice(u32 controller, u32 page, u32 index);
|
||||
|
||||
@@ -99,7 +99,7 @@ namespace ipl {
|
||||
long clipGELT_S32(long value, long lo, long hi);
|
||||
|
||||
private:
|
||||
u32 unk_0x620[3];
|
||||
u32 unk_0x620[0x18];
|
||||
};
|
||||
|
||||
// use getSystem() and getBannerPlayer() instead
|
||||
|
||||
@@ -1,45 +1,32 @@
|
||||
|
||||
// Yes, versions other than 4.3U align by 8.
|
||||
#if defined(VERSION_43U)
|
||||
#pragma function_align 32
|
||||
#else
|
||||
#pragma function_align 8
|
||||
#endif
|
||||
#endif // VERSION_43U
|
||||
|
||||
#include <TRK_Hollywood_Revolution.h>
|
||||
|
||||
#pragma force_active on
|
||||
|
||||
// clang-format off
|
||||
asm DSIOResult TRKAccessFile(MessageCommandID cmd, unsigned int handle, int* count, unsigned char* buffer) {
|
||||
#ifdef __MWERKS__
|
||||
// Encapsulating function to get the file to align properly
|
||||
asm void __targsupp() {
|
||||
// clang-format off
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
twi 31, r0, 0
|
||||
blr
|
||||
#endif
|
||||
entry TRKAccessFile
|
||||
twi 31, r0, 0
|
||||
blr
|
||||
entry TRKOpenFile
|
||||
twi 31, r0, 0
|
||||
blr
|
||||
entry TRKCloseFile
|
||||
twi 31, r0, 0
|
||||
blr
|
||||
entry TRKPositionFile
|
||||
twi 31, r0, 0
|
||||
blr
|
||||
#endif // __MWERKS__
|
||||
// clang-format on
|
||||
}
|
||||
|
||||
#pragma function_align 8
|
||||
|
||||
asm DSIOResult TRKOpenFile() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
twi 31, r0, 0
|
||||
blr
|
||||
#endif
|
||||
}
|
||||
|
||||
asm DSIOResult TRKCloseFile() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
twi 31, r0, 0
|
||||
blr
|
||||
#endif
|
||||
}
|
||||
|
||||
asm DSIOResult TRKPositionFile() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
twi 31, r0, 0
|
||||
blr
|
||||
#endif
|
||||
}
|
||||
// clang-format on
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#include <nw4r/db/assert.h>
|
||||
|
||||
extern "C" const u8 scLytFatalColorR;
|
||||
extern "C" const u8 scLytFatalColorG;
|
||||
extern "C" const u8 scLytFatalColorB;
|
||||
extern "C" const u8 scLytFatalColorA;
|
||||
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" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
#undef NW4R_ASSERT
|
||||
#define NW4R_GLOBAL_ASSERT(x) \
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
||||
@@ -17,15 +17,6 @@ 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>
|
||||
@@ -497,7 +488,7 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
Material* Window::GetFrameMaterial(u32 frameIdx) const {
|
||||
NW4R_GLOBAL_ASSERT(frameIdx < WINDOWFRAME_MAX);
|
||||
NW4R_ASSERT(frameIdx < WINDOWFRAME_MAX);
|
||||
if (frameIdx >= mFrameNum) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -510,8 +501,3 @@ 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;
|
||||
|
||||
@@ -368,20 +368,20 @@ namespace nw4r {
|
||||
|
||||
u32 sheetOffsetsScratchSize;
|
||||
|
||||
sheetGlyphCount = font->glgr.inner.sheetGlyphCount; // 0x1C
|
||||
dataBlockCount = font->hdr.dataBlocks; // 0x0E
|
||||
sheetGlyphCount = font->glgr.inner.sheetGlyphCount; // 0x1C
|
||||
// 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);
|
||||
|
||||
sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
|
||||
sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)font + ctx->remWorkSpace()) - sheetOffsetsSize, 2);
|
||||
|
||||
pGlgr = &font->glgr;
|
||||
ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize);
|
||||
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) {
|
||||
|
||||
@@ -106,21 +106,21 @@ static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, co
|
||||
|
||||
s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_ptr, TMCCJPEGDecWork* work) {
|
||||
TMCHuffmanEntry dcEntry;
|
||||
u8* huff_sym;
|
||||
TMCHuffmanEntry acEntry;
|
||||
const TMCHuffmanEntry* ac_fast;
|
||||
s32 idx;
|
||||
u8* huff_sym;
|
||||
u32* huff_tbl;
|
||||
s32 bit_pos;
|
||||
u32 bit_data;
|
||||
u32 tmp;
|
||||
const TMCHuffmanEntry* dc_fast;
|
||||
s32 r;
|
||||
s32 blk0;
|
||||
TMCHuffmanEntry acEntry;
|
||||
s32 idx;
|
||||
s32 extra;
|
||||
s32 t;
|
||||
s32 zz;
|
||||
s32 q;
|
||||
const TMCHuffmanEntry* dc_fast;
|
||||
u32 tmp;
|
||||
const u8* zztbl;
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
@@ -135,14 +135,17 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
bit_data = work->bitBuf;
|
||||
tmp = bit_pos - 8;
|
||||
tmp = ((bit_data >> tmp) & 0xFF) << 2;
|
||||
{
|
||||
dcEntry = readHuffmanEntry(dc_fast, (bit_data >> (bit_pos - 8)) & 0xFF);
|
||||
dcEntry = readHuffmanEntry(dc_fast, tmp >> 2);
|
||||
r = dcEntry.bitLength;
|
||||
extra = dcEntry.symbol;
|
||||
}
|
||||
|
||||
if (r != 0) {
|
||||
work->bitCount = bit_pos - r;
|
||||
bit_pos -= r;
|
||||
work->bitCount = bit_pos;
|
||||
r = extra;
|
||||
} else {
|
||||
huff_sym = work->pDCHuffSym;
|
||||
|
||||
@@ -15,13 +15,9 @@ 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;
|
||||
@@ -30,41 +26,57 @@ 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 < 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;
|
||||
for (i = 0; i < 2; i++) {
|
||||
a = sp[0]; // 0x0
|
||||
b = sp[1]; // 0x4
|
||||
c = sp[2]; // 0x8
|
||||
d = sp[3]; // 0xc
|
||||
bd = b + d;
|
||||
evsum = a + c;
|
||||
cd = a - c;
|
||||
rot = (odddiff * 0xB5) >> 8;
|
||||
oddrot = rot + bd;
|
||||
dp[0] = evsum + oddrot;
|
||||
dp[1] = cd + rot;
|
||||
dp[2] = cd - rot;
|
||||
|
||||
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;
|
||||
sp -= 8;
|
||||
dp -= 8;
|
||||
dp[0] = evsum + oddrot;
|
||||
|
||||
b = sp[-7]; // -0x1c
|
||||
d = sp[-5]; // -0x14
|
||||
|
||||
bd = b + d;
|
||||
rot = ((b - d) * 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;
|
||||
}
|
||||
|
||||
{
|
||||
u32 idx = 3;
|
||||
sp = tmp + 3;
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
u8* bp = conv_row_ptr + idx;
|
||||
|
||||
a = tmp[idx] + 0x40000;
|
||||
b = tmp[idx + 8];
|
||||
d = tmp[idx + 24];
|
||||
c = tmp[idx + 16];
|
||||
a = sp[0] + 0x40000;
|
||||
b = sp[8];
|
||||
d = sp[24];
|
||||
c = sp[16];
|
||||
|
||||
evsum = a + c;
|
||||
cd = a - c;
|
||||
@@ -78,6 +90,7 @@ 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;
|
||||
}
|
||||
}
|
||||
@@ -118,37 +131,38 @@ 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 < 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;
|
||||
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;
|
||||
}
|
||||
|
||||
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];
|
||||
@@ -156,7 +170,7 @@ void TMCJPEGDEC_IdctBlock4x4_Col(s32* sp, u8* conv_row_ptr, u16 pitch, s32 zigza
|
||||
d = src[24];
|
||||
|
||||
odddiff = b - d;
|
||||
oddsum = d + b;
|
||||
oddsum = b + d;
|
||||
evsum = a + c;
|
||||
evdiff = a - c;
|
||||
rot = odddiff * 0xB5 >> 8;
|
||||
|
||||
@@ -166,23 +166,23 @@ s32 TMCJPEGDEC_set_converterRGBA8(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 red;
|
||||
s8 crValue;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* texture;
|
||||
s32 height;
|
||||
s32 column;
|
||||
s32 yEnd;
|
||||
s32 xEnd;
|
||||
s32 green;
|
||||
s32 yEnd;
|
||||
s32 column;
|
||||
s32 tileWidth;
|
||||
s32 blueOffset;
|
||||
u16* output;
|
||||
s32 tileRow;
|
||||
s32 lumaSkip;
|
||||
s8 crValue;
|
||||
s32 red;
|
||||
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 = -(crValue * 183 + cbValue * 88) >> 8;
|
||||
greenOffset = -(cbValue * 88 + crValue * 183) >> 8;
|
||||
blueOffset = (cbValue * 454) >> 8;
|
||||
}
|
||||
{
|
||||
@@ -285,20 +285,20 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 chromaSkip;
|
||||
s32 tileRow;
|
||||
s32 xEnd;
|
||||
u8* texture;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 column;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 tileWidth;
|
||||
u8* texture;
|
||||
s32 width;
|
||||
s32 height;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 lumaSkip;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
s32 tileWidth;
|
||||
s32 lumaSkip;
|
||||
s32 chromaSkip;
|
||||
s32 tileRow;
|
||||
u16* output;
|
||||
s32 cbValue;
|
||||
s8 crValue;
|
||||
@@ -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 lumaSkip;
|
||||
s32 blue;
|
||||
s32 cbValue;
|
||||
s32 tileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u16* output;
|
||||
s32 xEnd;
|
||||
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;
|
||||
s32 xEnd;
|
||||
u16* output;
|
||||
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 blue;
|
||||
s32 lumaSkip;
|
||||
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 | green | red) >> 8) {
|
||||
if ((blue | red | green) >> 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 | green | red) >> 8) {
|
||||
if ((blue | red | green) >> 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 blue;
|
||||
u16* output;
|
||||
s32 xEnd;
|
||||
s32 column;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 tileWidth;
|
||||
u8* luminance;
|
||||
u8* texture;
|
||||
s32 width;
|
||||
s32 height;
|
||||
u8* cb;
|
||||
u8* texture;
|
||||
s32 column;
|
||||
s32 chromaSkip;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
s32 lumaSkip;
|
||||
s32 chromaSkip;
|
||||
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 lumaSkip;
|
||||
s32 blue;
|
||||
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 | green | red) >> 8) {
|
||||
if ((blue | red | green) >> 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 tileRow;
|
||||
s32 blue;
|
||||
s8 crValue;
|
||||
s32 chromaSkip;
|
||||
u8* luminance;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* texture;
|
||||
s32 xEnd;
|
||||
s32 width;
|
||||
s32 height;
|
||||
s32 green;
|
||||
s32 blue;
|
||||
s32 blueOffset;
|
||||
u8* texture;
|
||||
s32 lumaSkip;
|
||||
s32 yEnd;
|
||||
s32 xEnd;
|
||||
s32 tileRow;
|
||||
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 blueOffset;
|
||||
s32 green;
|
||||
s32 red;
|
||||
s32 cbValue;
|
||||
|
||||
@@ -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;
|
||||
s32 width;
|
||||
u8* cr = work->convBuf + 324;
|
||||
TMCCJPEGDecState* state = work->pState;
|
||||
s32 tileWidth = (state->convWidth >> 2) << 1;
|
||||
u8* texture = state->pTexBuffer;
|
||||
u8* cr = work->convBuf + 324;
|
||||
s32 width;
|
||||
s32 height;
|
||||
if (state->dataSizeX == (u32)x) {
|
||||
width = state->stepXExt;
|
||||
@@ -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 tileRow;
|
||||
s32 column;
|
||||
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 column;
|
||||
s32 tileRow;
|
||||
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 | green | red) >> 8) {
|
||||
if ((blue | red | green) >> 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;
|
||||
u8* texture;
|
||||
s32 tileRow;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
@@ -783,7 +783,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 greenOffset;
|
||||
s32 yEnd;
|
||||
s32 cbValue;
|
||||
s32 tileRow;
|
||||
u8* texture;
|
||||
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 | green | red) >> 8) {
|
||||
if ((blue | red | green) >> 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,9 +856,9 @@ 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 rowSkip;
|
||||
u8* texture;
|
||||
s32 xEnd;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
@@ -867,9 +867,9 @@ static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 height;
|
||||
s32 width;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 rowSkip;
|
||||
s32 yEnd;
|
||||
s32 tileWidth;
|
||||
u8* texture;
|
||||
s32 row;
|
||||
s32 red;
|
||||
s32 cbValue;
|
||||
@@ -896,10 +896,10 @@ static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
cbValue = (s8)*cb++;
|
||||
crValue = (s8)*cr++;
|
||||
value = *luminance++;
|
||||
green = value + (-(crValue * 183 + cbValue * 88) >> 8);
|
||||
green = value + (-(cbValue * 88 + crValue * 183) >> 8);
|
||||
red = value + ((crValue * 359) >> 8);
|
||||
blue = value + ((cbValue * 454) >> 8);
|
||||
if ((blue | green | red) >> 8) {
|
||||
if ((blue | red | green) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
|
||||
@@ -171,7 +171,9 @@ 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;
|
||||
@@ -214,17 +216,17 @@ static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
luminance += rowSkip;
|
||||
}
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
x = (u32)x >> 2;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
xEnd = x + width;
|
||||
chromaXEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -233,6 +235,7 @@ 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;
|
||||
@@ -247,9 +250,9 @@ static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 width;
|
||||
s32 tileOffset;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -284,13 +287,13 @@ static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 2;
|
||||
width = (width + 3) >> 2;
|
||||
xEnd = x + width;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaTileWidth = 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) * tileWidth) << 5)] = *cb + 128;
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -358,6 +361,7 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
@@ -372,9 +376,9 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 width;
|
||||
s32 tileOffset;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -409,13 +413,13 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 1;
|
||||
width = (width + 1) >> 1;
|
||||
xEnd = x + width;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaTileWidth = 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) * tileWidth) << 5)] = *cb + 128;
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -424,21 +428,23 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 chromaYEnd;
|
||||
u8* lumaTexture;
|
||||
s32 height;
|
||||
u8* luminance;
|
||||
s32 chromaYEnd;
|
||||
s32 column;
|
||||
u8* lumaTexture;
|
||||
s32 chromaXEnd;
|
||||
u8* luminance;
|
||||
u32 chromaTileWidth;
|
||||
u8* cbTexture;
|
||||
s32 row;
|
||||
s32 width;
|
||||
u8* crTexture;
|
||||
s32 xEnd;
|
||||
u32 tileWidth;
|
||||
u8* cb;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 yEnd;
|
||||
s32 width;
|
||||
s32 xEnd;
|
||||
u8* cr;
|
||||
u32 tileWidth;
|
||||
s32 row;
|
||||
|
||||
row = y;
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -464,14 +470,14 @@ static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
y = (u32)y >> 1;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
xEnd = x + width;
|
||||
chromaXEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -480,6 +486,7 @@ 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;
|
||||
@@ -490,13 +497,13 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* crTexture;
|
||||
u32 tileRow;
|
||||
s32 height;
|
||||
s32 width;
|
||||
s32 yEnd;
|
||||
u8* output;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 xEnd;
|
||||
s32 tileOffset;
|
||||
s32 yEnd;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -532,13 +539,13 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 1;
|
||||
width = (width + 1) >> 1;
|
||||
xEnd = x + width;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaTileWidth = 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) * tileWidth) << 5)] = *cb + 128;
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
@@ -547,8 +554,9 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F2570(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* lumaTexture;
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 row;
|
||||
@@ -588,13 +596,13 @@ static void TMCJPEG_814F2570(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
luminance += 8 - width;
|
||||
}
|
||||
y = (u32)y >> 1;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
chromaTileWidth = 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) * tileWidth) << 5)] = *cb + 128;
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
|
||||
@@ -27,11 +27,11 @@ ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziWChar Zi8ConvertUC2UserKey(ziChar, ziU8 ZI_NEED_WORK);
|
||||
|
||||
ziWChar Zi8ConvertUC2WC(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
const ziConversionTables* defaults;
|
||||
ziU8* table;
|
||||
ziWChar* mapped;
|
||||
ziU8* cursor;
|
||||
ziU16 first, last;
|
||||
ziU8* table;
|
||||
const ziConversionTables* defaults;
|
||||
if (character == 0) {
|
||||
Zi8LogError(0x133, __zi8_work_data);
|
||||
return 0;
|
||||
|
||||
@@ -796,11 +796,11 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
if (remaining != 0) {
|
||||
remaining--;
|
||||
} else {
|
||||
totalCandidates = totalCandidates + 1;
|
||||
totalCandidates++;
|
||||
if (options->countOnly == '\0') {
|
||||
*output++ = spellingBuffer[spellingIndex];
|
||||
*output++ = 0;
|
||||
candidateCount = candidateCount + 1;
|
||||
candidateCount++;
|
||||
}
|
||||
else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
|
||||
if (candidateCount >= params->maxCandidates) goto finishSpelling;
|
||||
@@ -1001,10 +1001,10 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
}
|
||||
if (Zi8IsDupWordW(output,(ziU8)phoneticIndex,work) == 0) {
|
||||
if (remaining == 0) {
|
||||
totalCandidates = totalCandidates + 1;
|
||||
totalCandidates++;
|
||||
if (options->countOnly == 0) {
|
||||
output += phoneticIndex + 1;
|
||||
candidateCount = candidateCount + 1;
|
||||
candidateCount++;
|
||||
} else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
|
||||
if (candidateCount >= params->maxCandidates) goto finishSpelling;
|
||||
} else {
|
||||
|
||||
@@ -187,7 +187,8 @@ unsigned int Zi8MatchROMdata1(ziWChar *elements, ziU8 count, ziU8 language, ziWC
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)group;
|
||||
if (ZI_WORK->unk_0x1764 == 0) {
|
||||
if (Zi8GetTableSize(language & 0xff,0xb,ZI_WORK) != 0) {
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)(tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK));
|
||||
tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK);
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)tableAddress;
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x1764 != 0) {
|
||||
|
||||
@@ -49,42 +49,39 @@ void Zi8CopyZHSpelling(ziU8* source, ziWChar* output, ziU16 capacity, int size,
|
||||
}
|
||||
}
|
||||
}
|
||||
ziU8 ZADP_Zi8SetPDremoveOpt(ziU8 option, struct __zi8_work_data_s* __zi8_work_data) {
|
||||
ziU8 ZADP_Zi8SetPDremoveOpt(ziU8 option ZI_NEED_WORK) {
|
||||
ziU8 previous;
|
||||
previous = __zi8_work_data->pdRemoveOpt;
|
||||
__zi8_work_data->pdRemoveOpt = option;
|
||||
previous = ZI_WORK->pdRemoveOpt;
|
||||
ZI_WORK->pdRemoveOpt = option;
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
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;
|
||||
int copied;
|
||||
ziU32 entrySize, wordSize, copied;
|
||||
ziU8* entry;
|
||||
ziU8* word;
|
||||
int index;
|
||||
ziU32 entrySize;
|
||||
int fallback = 0;
|
||||
ziPudHeader* table;
|
||||
ziU8* byteOutput;
|
||||
ziPudSection* section;
|
||||
if (!(ZI_WORK->pudCount <= 16 && ZI_WORK->pudCount != 0 && ZI_WORK->pudTable[ZI_WORK->pudCount - 1] != 0)) {
|
||||
Zi8LogError(0x4B0, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
if (language == 1) {
|
||||
length &= 0x7F;
|
||||
length *= 2;
|
||||
}
|
||||
if (continuation == 0) {
|
||||
table = (ziPudHeader*)ZI_WORK->pudTable[ZI_WORK->pudCount - 1];
|
||||
section = table->sections;
|
||||
index = 0;
|
||||
while (index < table->languageCount) {
|
||||
if (section->language == language) break;
|
||||
section++;
|
||||
section = table->sections;
|
||||
while (index < table->languageCount && section->language != language) {
|
||||
index++;
|
||||
section++;
|
||||
}
|
||||
if (index >= table->languageCount) {
|
||||
if (table->languageCount <= index) {
|
||||
Zi8LogError(0x4F6, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
@@ -93,97 +90,90 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
for (;;) {
|
||||
word = (ziU8*)ZI_WORK->unk_0x310;
|
||||
if (word == 0) {
|
||||
entry = (ziU8*)ZI_WORK->unk_0x310;
|
||||
if (entry == 0) {
|
||||
Zi8LogError(0x4B3, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
while ((ziS32)ZI_WORK->unk_0x318 < (ziS32)ZI_WORK->unk_0x314) {
|
||||
wordSize = *word++;
|
||||
word = entry + 1;
|
||||
wordSize = *entry;
|
||||
entrySize = wordSize;
|
||||
if (language == 1) {
|
||||
if (ZI_WORK->unk_0x17 > *word) goto next;
|
||||
wordSize--;
|
||||
entrySize--;
|
||||
word++;
|
||||
if (*word < ZI_WORK->unk_0x17) goto next;
|
||||
entrySize = wordSize - 1;
|
||||
word = entry + 2;
|
||||
wordSize = ZiGetZHWordSize((ziWChar*)word, entrySize);
|
||||
} 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] != bytePattern[index]) goto next;
|
||||
}
|
||||
goto matched;
|
||||
}
|
||||
matchText:
|
||||
} else if (ZI_WORK->unk_0x31E != 0 && complete != 0 && wordSize > length && word[length] == 0x20) goto matchText;
|
||||
if ((ziS32)length > (ziS32)wordSize || (complete != 0 && wordSize != length) || (complete == 0 && wordSize == length)) goto next;
|
||||
if (language == 1) {
|
||||
for (index = 0; index < length; index++) {
|
||||
if (pattern[index] >= 0xEFF1 && pattern[index] <= 0xF37F) {
|
||||
if (pattern[index] != Zi8ConvertUC2Key(word[index], language, __zi8_work_data)) goto next;
|
||||
} else {
|
||||
folded = Zi8ConvertUC2WC(word[index], language, __zi8_work_data);
|
||||
if (folded != pattern[index] && (!ZI_WORK->unk_0x1F || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[index])) goto next;
|
||||
}
|
||||
if (word[index] != ((ziU8*)pattern)[index]) goto next;
|
||||
}
|
||||
matched:
|
||||
if (fallback) {
|
||||
ZI_WORK->unk_0x310 = 0;
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
ZI_WORK->unk_0x314 = 0;
|
||||
if (*pattern >= 0xEFF1) *output = *pattern;
|
||||
else *output = Zi8ConvertWC2Key(*pattern, language, __zi8_work_data);
|
||||
return 1;
|
||||
}
|
||||
if (language == 1) {
|
||||
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 {
|
||||
for (copied = 0; copied < wordSize && copied < capacity; copied++) {
|
||||
output[copied] = Zi8ConvertUC2WC(word[copied], language, __zi8_work_data);
|
||||
if (ZI_WORK->unk_0x31E != 0 && copied >= length && output[copied] == 0x20) {
|
||||
if (complete != 0 || copied >= length) break;
|
||||
goto next;
|
||||
}
|
||||
}
|
||||
}
|
||||
ZI_WORK->unk_0x318++;
|
||||
ZI_WORK->unk_0x310 = (ziU32)(word + entrySize);
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return (ziU8)copied;
|
||||
goto matched;
|
||||
}
|
||||
matchText:
|
||||
for (index = 0; index < length; index++) {
|
||||
if (pattern[index] < 0xEFF1 || pattern[index] > 0xF37F) {
|
||||
folded = Zi8ConvertUC2WC(word[index], language, __zi8_work_data);
|
||||
if (folded != pattern[index] && (!ZI_WORK->unk_0x1F || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[index])) goto next;
|
||||
} else if (pattern[index] != Zi8ConvertUC2Key(word[index], language, __zi8_work_data)) goto next;
|
||||
}
|
||||
matched:
|
||||
if (fallback) {
|
||||
ZI_WORK->unk_0x310 = 0;
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
ZI_WORK->unk_0x314 = 0;
|
||||
if (*pattern < 0xEFF1) *output = Zi8ConvertWC2Key(*pattern, language, __zi8_work_data);
|
||||
else *output = *pattern;
|
||||
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;
|
||||
}
|
||||
Zi8CopyZHSpelling(word, spelling, spellingCapacity, entrySize, wordSize);
|
||||
} else {
|
||||
for (copied = 0; copied < wordSize && copied < capacity; copied++) {
|
||||
output[copied] = Zi8ConvertUC2WC(word[copied], language, __zi8_work_data);
|
||||
if (ZI_WORK->unk_0x31E != 0 && copied >= length && output[copied] == 0x20) {
|
||||
if (complete != 0 || copied >= length) break;
|
||||
goto next;
|
||||
}
|
||||
}
|
||||
}
|
||||
ZI_WORK->unk_0x318++;
|
||||
ZI_WORK->unk_0x310 = (ziU32)(word + entrySize);
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return (ziU8)copied;
|
||||
next:
|
||||
ZI_WORK->unk_0x318++;
|
||||
entry = word + entrySize;
|
||||
}
|
||||
if (length == 1 && complete != 0 && continuation == 0) {
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
} else {
|
||||
if (length != 1 || complete == 0 || continuation != 0) {
|
||||
ZI_WORK->unk_0x310 = 0;
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
ZI_WORK->unk_0x314 = 0;
|
||||
return 0;
|
||||
}
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
}
|
||||
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation, struct __zi8_work_data_s* __zi8_work_data) {
|
||||
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||
ziU32 result;
|
||||
if (continuation == 0) __zi8_work_data->pudCount = 1;
|
||||
if (continuation == 0) ZI_WORK->pudCount = 1;
|
||||
for (;;) {
|
||||
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
|
||||
if ((ziU8)result != 0) break;
|
||||
if (++__zi8_work_data->pudCount <= 16) {
|
||||
if (++ZI_WORK->pudCount <= 16) {
|
||||
continuation = 0;
|
||||
} else {
|
||||
__zi8_work_data->pudCount = 1;
|
||||
ZI_WORK->pudCount = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
@@ -56,7 +56,8 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
previous = current;
|
||||
current = current->next;
|
||||
}
|
||||
added = &ZI_WORK->uwdNodes[ZI_WORK->uwdCount++];
|
||||
length = ZI_WORK->uwdCount++;
|
||||
added = &ZI_WORK->uwdNodes[length];
|
||||
if (previous == 0) {
|
||||
ZI_WORK->uwdList = added;
|
||||
added->next = current;
|
||||
@@ -86,24 +87,23 @@ 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) {
|
||||
ziUserDictionary* dictionary;
|
||||
ziWChar folded;
|
||||
int fallback = 0;
|
||||
int visited = 0;
|
||||
int prefixLength;
|
||||
int position, previousOffset;
|
||||
ziU32 size;
|
||||
ziU8 entryLanguage;
|
||||
ziU32 entryLength;
|
||||
ziU8* cursor;
|
||||
ziU8* begin;
|
||||
ziU8* boundary;
|
||||
ziU8* end;
|
||||
ziUserWord* candidate;
|
||||
ziUserWord* previous;
|
||||
ziUserWord* result;
|
||||
ziUserDictionary* dictionary;
|
||||
int firstSegment;
|
||||
ziU32 size;
|
||||
int headerSize;
|
||||
int entryLanguage;
|
||||
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);
|
||||
@@ -111,17 +111,16 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
}
|
||||
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
|
||||
if (continuation != 0) {
|
||||
text = (ziU8*)Zi8_814803F4(__zi8_work_data);
|
||||
result = Zi8_814803F4(__zi8_work_data);
|
||||
entryLength = 0;
|
||||
if (text != 0) {
|
||||
language = ((ziUserWord*)text)->language;
|
||||
entryLength = ((ziUserWord*)text)->length;
|
||||
if (result != 0) {
|
||||
entryLanguage = result->language;
|
||||
entryLength = result->length;
|
||||
if (entryLength >= capacity) {
|
||||
Zi8_8148047C(__zi8_work_data);
|
||||
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(result->text[position], entryLanguage, __zi8_work_data);
|
||||
}
|
||||
return entryLength;
|
||||
}
|
||||
@@ -131,20 +130,17 @@ 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; position >= 0;) {
|
||||
if (currentWord[position] == 0x20) break;
|
||||
position--;
|
||||
prefixLength++;
|
||||
}
|
||||
for (position = currentLength - 2; currentWord[position] != 0x20 && position >= 0; position--) prefixLength++;
|
||||
position++;
|
||||
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
|
||||
else {
|
||||
ZI_WORK->unk_0x140 = 1;
|
||||
ZI_WORK->unk_0x141[prefixLength + 4] = ZI_WORK->unk_0x141[0] = prefixLength + 5;
|
||||
ZI_WORK->unk_0x141[0] = prefixLength + 5;
|
||||
ZI_WORK->unk_0x141[prefixLength + 4] = prefixLength + 5;
|
||||
ZI_WORK->unk_0x141[1] = language;
|
||||
ZI_WORK->unk_0x141[2] = prefixLength;
|
||||
previousOffset = 4;
|
||||
while (prefixLength > 0) {
|
||||
for (; prefixLength > 0; prefixLength--, position++) {
|
||||
folded = currentWord[position];
|
||||
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = 0;
|
||||
@@ -156,56 +152,48 @@ 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:
|
||||
cursor = begin = dictionary->entries + dictionary->current;
|
||||
begin = dictionary->entries + dictionary->current;
|
||||
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
|
||||
end = (ziU8*)dictionary + dictionary->end + 7;
|
||||
cursor = begin;
|
||||
if (begin < boundary) firstSegment = 1;
|
||||
else firstSegment = 0;
|
||||
while ((cursor < boundary && firstSegment) || (cursor < end && !firstSegment)) {
|
||||
while (firstSegment ? cursor < boundary : cursor < end) {
|
||||
size = *cursor;
|
||||
if ((ziS32)ZI_WORK->unk_0x13C > visited++ || (((ziUserWord*)cursor)->size & 0xC0) != 0) {
|
||||
next:
|
||||
if ((cursor += size) > end) {
|
||||
if (firstSegment) break;
|
||||
firstSegment = 1;
|
||||
size = cursor - end - 1;
|
||||
cursor = dictionary->entries + size;
|
||||
}
|
||||
} else {
|
||||
candidate = (ziUserWord*)cursor;
|
||||
position = visited++;
|
||||
if ((ziS32)ZI_WORK->unk_0x13C <= position && (size & 0xC0) == 0) {
|
||||
previous = (ziUserWord*)(cursor + size);
|
||||
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)) {
|
||||
if ((ziU8*)previous > end) previous = (ziUserWord*)(cursor + ((ziU8*)dictionary - end) + 7);
|
||||
entryLanguage = candidate->language;
|
||||
entryLength = candidate->length;
|
||||
if (entryLanguage == language && length <= entryLength && 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;
|
||||
} else {
|
||||
folded = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
|
||||
if (pattern[position] < 0xEFF1 || pattern[position] > 0xF010) {
|
||||
folded = Zi8ConvertUC2WC(candidate->text[position], language, __zi8_work_data);
|
||||
if (folded != pattern[position] && (!ZI_WORK->unk_0x1F || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[position])) goto next;
|
||||
}
|
||||
} else if (pattern[position] != Zi8ConvertUC2Key(candidate->text[position], language, __zi8_work_data)) goto 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;
|
||||
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;
|
||||
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;
|
||||
}
|
||||
}
|
||||
Zi8_81480224((ziUserWord*)cursor, __zi8_work_data);
|
||||
Zi8_81480224(candidate, __zi8_work_data);
|
||||
}
|
||||
goto next;
|
||||
}
|
||||
next:
|
||||
cursor += size;
|
||||
if (end < cursor) {
|
||||
if (firstSegment) break;
|
||||
firstSegment = 1;
|
||||
cursor = dictionary->entries + (cursor - end - 1);
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x140 != 0 && length != 0) {
|
||||
@@ -213,24 +201,23 @@ next:
|
||||
visited = 0;
|
||||
goto rescan;
|
||||
}
|
||||
if (length == 1 && complete != 0 && continuation == 0) {
|
||||
if (complete == 1 && length != 0 && continuation == 0) {
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
visited = 0;
|
||||
goto rescan;
|
||||
}
|
||||
}
|
||||
text = (ziU8*)Zi8_814803F4(__zi8_work_data);
|
||||
if (text != 0) {
|
||||
language = ((ziUserWord*)text)->language;
|
||||
entryLength = ((ziUserWord*)text)->length;
|
||||
result = Zi8_814803F4(__zi8_work_data);
|
||||
entryLength = 0;
|
||||
if (result != 0) {
|
||||
entryLanguage = result->language;
|
||||
entryLength = result->length;
|
||||
if (entryLength >= capacity) {
|
||||
Zi8_8148047C(__zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
text = ((ziUserWord*)text)->text;
|
||||
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
|
||||
return entryLength;
|
||||
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
|
||||
}
|
||||
return 0;
|
||||
return entryLength;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <zi8clib/zierror.h>
|
||||
#include <zi8clib/zitypes.h>
|
||||
|
||||
extern const ziU16 nodeHeaderTable[16];
|
||||
extern ziU16 nodeHeaderTable[16];
|
||||
|
||||
ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
ziU32 base;
|
||||
@@ -22,10 +22,11 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
node += offset;
|
||||
if (((ziU32)header & 2) != 0) {
|
||||
if ((*(ziU8*)node & 0x80) != 0) {
|
||||
offset = ((*(ziU8*)node & 0x7f) << 16) +
|
||||
((((ziU32)*((ziU8*)node + 1) & 0xffff) << 8) + *((ziU8*)node + 2)) + 0x8000;
|
||||
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000;
|
||||
offset += *((ziU8*)node + 2);
|
||||
} else {
|
||||
offset = (((ziU32)*(ziU8*)node & 0xffff) << 8) + (ziU32)*((ziU8*)node + 1);
|
||||
offset = ((ziU32)*(ziU8*)node & 0xffff) * 0x100;
|
||||
offset += (ziU32)*((ziU8*)node + 1);
|
||||
}
|
||||
} else if (((ziU32)header & 8) != 0) {
|
||||
if ((*(ziU8*)node & 0x80) != 0) {
|
||||
@@ -41,41 +42,39 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
return node;
|
||||
}
|
||||
|
||||
ziU8* ZiDAWGGetSibling(ziU8* cursor) {
|
||||
ziS32 depth;
|
||||
ziU8* node;
|
||||
ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
ziU16 header;
|
||||
ziU8* cursor = node;
|
||||
ziS32 depth;
|
||||
ziS32 offset;
|
||||
|
||||
depth = 0;
|
||||
node = cursor;
|
||||
offset = 0;
|
||||
header = nodeHeaderTable[cursor[0] >> 4];
|
||||
header = nodeHeaderTable[node[0] >> 4];
|
||||
if ((header & 4) == 0) {
|
||||
return 0;
|
||||
node = 0;
|
||||
} else {
|
||||
if ((header & 8) != 0) {
|
||||
if ((cursor[0] & 0xf) == 0xf) {
|
||||
cursor += 2;
|
||||
if ((node[0] & 0xf) == 0xf) {
|
||||
node += 2;
|
||||
} else {
|
||||
cursor += 1;
|
||||
node += 1;
|
||||
}
|
||||
|
||||
if ((header & 2) != 0) {
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
if ((*node & 0x80) == 0) {
|
||||
node += 2;
|
||||
} else {
|
||||
cursor += 2;
|
||||
node += 3;
|
||||
}
|
||||
}
|
||||
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
node += (*cursor & 0x7f) * 0x10000 +
|
||||
(((ziU32)cursor[1] << 8) + (ziU32)cursor[2]) + 0x8000;
|
||||
if ((*node & 0x80) != 0) {
|
||||
node += (*node & 0x7f) * 0x10000 + (ziU32)node[1] * 0x100 +
|
||||
(ziU32)node[2] + 0x8000;
|
||||
} else {
|
||||
node = cursor[1] + (node + (ziU16)*cursor * 0x100);
|
||||
node += (ziU16)*node * 0x100 + (ziU32)node[1];
|
||||
}
|
||||
return node;
|
||||
} else {
|
||||
cursor = node;
|
||||
do {
|
||||
@@ -89,16 +88,14 @@ ziU8* ZiDAWGGetSibling(ziU8* cursor) {
|
||||
}
|
||||
|
||||
if ((header & 1) != 0) {
|
||||
if ((header & 2) != 0) {
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
} else {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
}
|
||||
} else {
|
||||
if ((header & 2) == 0) {
|
||||
depth++;
|
||||
} else if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
} else {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,17 +113,18 @@ ziU8* ZiDAWGGetSibling(ziU8* cursor) {
|
||||
}
|
||||
} while (0 < depth);
|
||||
|
||||
return node + offset;
|
||||
node += offset;
|
||||
}
|
||||
}
|
||||
|
||||
return node;
|
||||
}
|
||||
|
||||
ziU8 ZiDAWGgetEOWattribute(ziU32 node) {
|
||||
return (nodeHeaderTable[*(ziU8*)node >> 4] & 0x10) > 0;
|
||||
}
|
||||
|
||||
ziU32 ZiDAWGgetCHARattribute(zi8DawgCtx* context, ziU32 node, ziPtr __zi8_work_data) {
|
||||
ziU32 ZiDAWGgetCHARattribute(ziPtr context, ziU32 node, ziPtr __zi8_work_data) {
|
||||
ziU8 key;
|
||||
ziU32 attribute;
|
||||
|
||||
@@ -136,15 +134,15 @@ ziU32 ZiDAWGgetCHARattribute(zi8DawgCtx* context, ziU32 node, ziPtr __zi8_work_d
|
||||
key = (ziU32)*(ziU8*)node & 0xf;
|
||||
}
|
||||
|
||||
if (key > context->cap) {
|
||||
if (key > ((zi8DawgCtx*)context)->cap) {
|
||||
Zi8LogError(0x138b, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
|
||||
attribute = key << 24;
|
||||
attribute |= ((ziU8*)context->p0C)[key] << 16;
|
||||
attribute |= (((ziU32)((ziU8*)context->p08)[key * 2] & 0xFFFF) << 8) +
|
||||
((ziU8*)context->p08 + key * 2)[1];
|
||||
attribute |= ((ziU8*)((zi8DawgCtx*)context)->p0C)[key] << 16;
|
||||
attribute += ((ziU32)((ziU8*)((zi8DawgCtx*)context)->p08)[key * 2] & 0xFFFF) << 8;
|
||||
attribute += ((ziU8*)((zi8DawgCtx*)context)->p08)[key * 2 + 1];
|
||||
Zi8LogError(0x64, __zi8_work_data);
|
||||
return attribute;
|
||||
}
|
||||
@@ -157,55 +155,60 @@ ziU32 ZiDAWGGetGraph(ziPtr context) {
|
||||
|
||||
ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
|
||||
ziU32 graph;
|
||||
ziU8 depth;
|
||||
ziU32 end;
|
||||
ziS32 result;
|
||||
ziU32 end;
|
||||
ziU8 depth;
|
||||
ziU32 pair;
|
||||
|
||||
graph = ZiDAWGGetGraph(context);
|
||||
result = 0;
|
||||
if ((((ziU16)entry[0] << 8) + entry[1]) != 0 || (((ziU16)entry[2] << 8) + entry[3]) != 0) {
|
||||
pair = (((ziU16)entry[0] << 8) + entry[1]);
|
||||
if (pair != 0) {
|
||||
return 0;
|
||||
}
|
||||
end = (ziU32)(entry + (((ziU16)entry[4] << 8) + entry[5] + 1) * 10);
|
||||
entry += 10;
|
||||
depth = 0;
|
||||
while ((depth < 2) && (*keys != 0)) {
|
||||
if (*keys >= 0xeff1 && *keys <= 0xf010) {
|
||||
goto checkEntry;
|
||||
pair = (((ziU16)entry[2] << 8) + entry[3]);
|
||||
if (pair == 0) {
|
||||
end = (ziU32)(entry + (((ziU16)entry[4] << 8) + entry[5] + 1) * 10);
|
||||
entry += 10;
|
||||
depth = 0;
|
||||
while ((depth < 2) && (*keys != 0)) {
|
||||
if ((*keys < 0xeff1) || (0xf010 < *keys)) {
|
||||
break;
|
||||
}
|
||||
|
||||
while (1) {
|
||||
if (*keys == (ziS32)(((ziU16)entry[2] << 8) + entry[3])) {
|
||||
if (*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8))) {
|
||||
break;
|
||||
}
|
||||
entry += (((ziU16)entry[0] << 8) + entry[1]) * 10 + 10;
|
||||
checkEntry:
|
||||
entry += (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10;
|
||||
if (((ziU32)entry >= end) ||
|
||||
(*keys == (ziS32)(((ziU16)entry[2] << 8) + entry[3]))) {
|
||||
(*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8)))) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if ((ziU32)entry >= end) {
|
||||
return 0;
|
||||
}
|
||||
if ((ziU32)entry >= end) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
result = graph + (ziU32)entry[4] * 0x10000 + (((ziU16)entry[5] << 8) + entry[6]);
|
||||
((zi8DawgCtx*)context)->unk_0x338 =
|
||||
graph + (ziU32)entry[7] * 0x10000 + (((ziU16)entry[8] << 8) + entry[9]);
|
||||
if (((zi8DawgCtx*)context)->unk_0x338 == graph) {
|
||||
((zi8DawgCtx*)context)->unk_0x338 = 0;
|
||||
}
|
||||
result = graph + (ziU32)entry[4] * 0x10000 + ((ziU16)entry[5] << 8) +
|
||||
entry[6];
|
||||
((zi8DawgCtx*)context)->unk_0x338 =
|
||||
graph + (ziU32)entry[7] * 0x10000 + ((ziU16)entry[8] << 8) +
|
||||
entry[9];
|
||||
if (((zi8DawgCtx*)context)->unk_0x338 == graph) {
|
||||
((zi8DawgCtx*)context)->unk_0x338 = 0;
|
||||
}
|
||||
|
||||
if ((((ziU16)entry[0] << 8) + entry[1]) == 0) {
|
||||
break;
|
||||
}
|
||||
if ((entry[1] + ((ziU16)entry[0] << 8)) == 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
end = (((ziU16)entry[0] << 8) + entry[1]) * 10 + ((ziU32)entry + 10);
|
||||
entry += 10;
|
||||
depth++;
|
||||
keys++;
|
||||
end = (ziU32)(entry + (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10);
|
||||
entry += 10;
|
||||
depth++;
|
||||
keys++;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
@@ -20,48 +20,54 @@ typedef struct ziChineseEntry {
|
||||
ziU8 offsetLow[2];
|
||||
} ziChineseEntry;
|
||||
|
||||
ziU32 Zi8GetCandidatesOrCount(ziGetParam*, ziSearchState* ZI_NEED_WORK);
|
||||
ziU8 Zi8GetCandidatesOrCount(ziGetParam*, ziSearchState* ZI_NEED_WORK);
|
||||
ziU8 Zi8GetFormatVersion(ziU8 ZI_NEED_WORK);
|
||||
ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
|
||||
|
||||
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziChineseEntry* table = 0;
|
||||
ziU8* baseData = 0;
|
||||
ziU8 group = 0;
|
||||
ziU8 remaining = 0;
|
||||
ziU16 value = 0;
|
||||
int count;
|
||||
int offset;
|
||||
ziU8 group;
|
||||
ziU8 remaining;
|
||||
ziU16 value;
|
||||
ziWChar* cursor;
|
||||
ziSearchState search;
|
||||
ziGetParam request;
|
||||
ziWChar ordinals[65];
|
||||
int count;
|
||||
int countLeft;
|
||||
int length;
|
||||
int unmatched;
|
||||
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;
|
||||
ziSearchState search = {0};
|
||||
search.flags = 0;
|
||||
search.word = 0;
|
||||
search.length = 0;
|
||||
search.position = 0;
|
||||
search.capacity = 0;
|
||||
search.options = 0;
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (word == 0 || *word == 0) {
|
||||
Zi8ReplaceLastError(300, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
if (language != 1) {
|
||||
for (count = 0; word[count] != 0; count++) {
|
||||
if (word[count] >= 0xEFF1 || count == 64) return 0;
|
||||
for (length = 0; word[length] != 0; length++) {
|
||||
if (word[length] >= 0xEFF1 || length == 64) return 0;
|
||||
}
|
||||
((ziU8*)&search.length)[0] = count;
|
||||
((ziU8*)&search.length)[0] = length;
|
||||
((ziU8*)&search.flags)[2] = 1;
|
||||
search.word = word;
|
||||
((ziU16*)&search.capacity)[0] = 64;
|
||||
search.word = word;
|
||||
request.language = language;
|
||||
request.getMode = 0;
|
||||
request.subLanguage = 7;
|
||||
request.context = 1;
|
||||
request.getOptions = 0x81;
|
||||
request.elements = word;
|
||||
request.elementCount = count;
|
||||
request.elementCount = length;
|
||||
request.currentWord = 0;
|
||||
request.wordCharCount = 0;
|
||||
request.candidates = ordinals;
|
||||
@@ -78,70 +84,63 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 6;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 7;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 8;
|
||||
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->unk_0x1418 = 2;
|
||||
else ZI_WORK->unk_0x1418 = 1;
|
||||
} else if (ZI_WORK->unk_0x1C[0] == 0) ZI_WORK->unk_0x1418 = 1;
|
||||
else ZI_WORK->unk_0x1418 = 2;
|
||||
count = Zi8GetCandidatesOrCount(&request, &search, __zi8_work_data);
|
||||
ZI_WORK->unk_0x1410 = savedFormats;
|
||||
ZI_WORK->unk_0x1418 = savedCount;
|
||||
if (count != 0) return 1;
|
||||
}
|
||||
if (language != 1) {
|
||||
Zi8ReplaceLastError(0x26C, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
{
|
||||
count = 0;
|
||||
while (word[count] != 0) {
|
||||
ordinals[count] = Zi8Uni2Ord(word[count], __zi8_work_data);
|
||||
if (ordinals[count] == 0xFFFF) return 0;
|
||||
count++;
|
||||
if (count == 64) return 0;
|
||||
}
|
||||
if (language == 1) {
|
||||
length = 0;
|
||||
do {
|
||||
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
|
||||
if (ordinals[length] == 0xFFFF) return 0;
|
||||
length++;
|
||||
if (length == 64) return 0;
|
||||
} while (word[length] != 0);
|
||||
{
|
||||
if (count-- == 1) return 1;
|
||||
if (length == 1) return 1;
|
||||
count = --length;
|
||||
ordinals[count] |= 0x8000;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||
table = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data);
|
||||
entry = table + ordinals[0];
|
||||
baseData = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data);
|
||||
baseData += ((entry->offsetHigh & 15) << 16 | (entry->offsetLow[1] | (entry->offsetLow[0] << 8)));
|
||||
data = baseData;
|
||||
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
|
||||
if (ZI_WORK->cangjieEnabled != 0) {
|
||||
switch (*data & 7) {
|
||||
case 2:
|
||||
countLeft = 2;
|
||||
offset = 2;
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
countLeft = 3;
|
||||
offset = 3;
|
||||
break;
|
||||
case 5:
|
||||
countLeft = 4;
|
||||
offset = 4;
|
||||
break;
|
||||
default:
|
||||
countLeft = 1;
|
||||
offset = 1;
|
||||
break;
|
||||
}
|
||||
data += countLeft;
|
||||
data += offset;
|
||||
}
|
||||
if ((*data & 0x80) != 0) {
|
||||
group = 0;
|
||||
data += ((*data & 0x7F) >> 4) + 1;
|
||||
} else return 0;
|
||||
if ((*data & 0x80) == 0) return 0;
|
||||
group = 0;
|
||||
data += ((*data & 0x7F) >> 4) + 1;
|
||||
while ((group & 0x80) == 0) {
|
||||
group = *data++;
|
||||
for (remaining = group & 15; remaining != 0; remaining--) {
|
||||
countLeft = count;
|
||||
unmatched = count;
|
||||
cursor = ordinals;
|
||||
while (countLeft > 0) {
|
||||
value = (data[1] << 8) | data[0];
|
||||
while (unmatched > 0) {
|
||||
value = data[0] | (data[1] << 8);
|
||||
data += 2;
|
||||
cursor++;
|
||||
if (value != *cursor) break;
|
||||
countLeft--;
|
||||
unmatched--;
|
||||
if (value & 0x8000) break;
|
||||
}
|
||||
if (countLeft == 0) return 1;
|
||||
if (unmatched == 0) return 1;
|
||||
if (!(value & 0x8000)) {
|
||||
data++;
|
||||
while (!(*data & 0x80)) data += 2;
|
||||
@@ -152,7 +151,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) {
|
||||
|
||||
@@ -72,11 +72,7 @@ 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
|
||||
|
||||
@@ -157,20 +157,8 @@ void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
|
||||
if (fx->delay.outPos >= fx->delay.sizeFP) fx->delay.outPos = 0;
|
||||
}
|
||||
}
|
||||
static inline void chorus_gradient(AXFX_CHORUS_EXP_LFO* lfo, f32 depth, f32 step) {
|
||||
depth /= step;
|
||||
lfo->gradFactor = 65536.0f * depth;
|
||||
}
|
||||
static BOOL __InitParams(AXFX_CHORUS_EXP* fx) {
|
||||
f32 delay;
|
||||
f32 depth;
|
||||
f32 step;
|
||||
u32 channel;
|
||||
u32 sample;
|
||||
s32 stepSamp;
|
||||
s32 phaseAdd;
|
||||
s32 depthSamp;
|
||||
|
||||
f32 delay, depth, step;
|
||||
if (fx->delayTime < 0.1f || fx->delayTime > 50.0f) return FALSE;
|
||||
if (fx->depth < 0.0f || fx->depth > 1.0f) return FALSE;
|
||||
if (fx->rate < 0.1f || fx->rate > 2.0f) return FALSE;
|
||||
@@ -180,60 +168,61 @@ static BOOL __InitParams(AXFX_CHORUS_EXP* fx) {
|
||||
fx->lfo.table = __AXFXGetLfoSinTable();
|
||||
delay = 32.0f * fx->delayTime;
|
||||
depth = delay * fx->depth;
|
||||
if (depth >= delay) {
|
||||
if (delay <= depth) {
|
||||
depth -= 1.0f;
|
||||
if (depth < 0.0f) depth = 0.0f;
|
||||
}
|
||||
fx->lfo.depthSamp = 65536.0f * depth;
|
||||
fx->lfo.phaseAdd = 65536.0f * (256.0f * fx->rate / 32000.0f);
|
||||
step = (32000.0f / fx->rate) * (1.0f / 256.0f);
|
||||
fx->lfo.stepSamp = 65536.0f * step;
|
||||
fx->lfo.gradFactor = 65536.0f * (depth / step);
|
||||
fx->lfo.lastNum = -1;
|
||||
fx->lfo.phase = 0;
|
||||
fx->lfo.sign = 0;
|
||||
fx->lfo.lastValue = 0;
|
||||
fx->lfo.grad = 0;
|
||||
depthSamp = 65536.0f * depth;
|
||||
phaseAdd = 65536.0f * (256.0f * fx->rate / 32000.0f);
|
||||
step = (32000.0f / fx->rate) / 256.0f;
|
||||
stepSamp = 65536.0f * step;
|
||||
fx->lfo.depthSamp = depthSamp;
|
||||
fx->lfo.phaseAdd = phaseAdd;
|
||||
fx->lfo.stepSamp = stepSamp;
|
||||
chorus_gradient(&fx->lfo, depth, step);
|
||||
for (channel = 0; channel < 3; channel++) {
|
||||
for (sample = 0; sample < 4; sample++) {
|
||||
fx->history[channel][sample] = 0.0f;
|
||||
}
|
||||
}
|
||||
fx->history[0][0] = 0.0f;
|
||||
fx->history[0][1] = 0.0f;
|
||||
fx->history[0][2] = 0.0f;
|
||||
fx->history[0][3] = 0.0f;
|
||||
fx->history[1][0] = 0.0f;
|
||||
fx->history[1][1] = 0.0f;
|
||||
fx->history[1][2] = 0.0f;
|
||||
fx->history[1][3] = 0.0f;
|
||||
fx->history[2][0] = 0.0f;
|
||||
fx->history[2][1] = 0.0f;
|
||||
fx->history[2][2] = 0.0f;
|
||||
fx->history[2][3] = 0.0f;
|
||||
fx->histIndex = 0;
|
||||
return TRUE;
|
||||
}
|
||||
static void __CalcLFO(s32* output, AXFX_CHORUS_EXP_LFO* lfo) {
|
||||
s32 start;
|
||||
s64 value;
|
||||
s32 difference;
|
||||
s64 gradient;
|
||||
u32 phase;
|
||||
u32 sample;
|
||||
for (sample = 0; sample < 96; sample++) {
|
||||
phase = lfo->phase & 0xFFFF0000;
|
||||
u32 remaining = 96;
|
||||
do {
|
||||
s32 value;
|
||||
u32 phase = lfo->phase & 0xFFFF0000;
|
||||
if (phase != lfo->lastNum) {
|
||||
s32 start, difference;
|
||||
s64 product;
|
||||
lfo->lastNum = phase;
|
||||
phase >>= 16;
|
||||
start = lfo->table[phase];
|
||||
difference = lfo->table[(phase + 1) & 0x7F] - start;
|
||||
gradient = difference;
|
||||
gradient *= lfo->gradFactor;
|
||||
lfo->grad = gradient >> 24;
|
||||
value = (s64)start * lfo->depthSamp;
|
||||
value >>= 24;
|
||||
} else {
|
||||
value = lfo->lastValue + lfo->grad;
|
||||
product = (s64)start * lfo->depthSamp;
|
||||
value = ((u32)(product >> 32) << 8) | ((u32)product >> 24);
|
||||
product = (s64)difference * lfo->gradFactor;
|
||||
lfo->grad = ((u32)(product >> 32) << 8) | ((u32)product >> 24);
|
||||
}
|
||||
else value = lfo->lastValue + lfo->grad;
|
||||
lfo->lastValue = value;
|
||||
if (lfo->sign >= 1) value = -value;
|
||||
if (lfo->sign != 0) value = -value;
|
||||
lfo->phase += lfo->phaseAdd;
|
||||
if (lfo->phase & 0xFF800000) {
|
||||
lfo->phase &= 0x7FFFFF;
|
||||
lfo->sign ^= 1;
|
||||
}
|
||||
*output++ = value;
|
||||
}
|
||||
remaining--;
|
||||
} while (remaining != 0);
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ typedef struct PFD_SDDRV_INFO {
|
||||
u32 media_inserted;
|
||||
u32 media_ejected;
|
||||
s8 drive;
|
||||
} ATTRIBUTE_ALIGN(8) PFD_SDDRV_INFO;
|
||||
} PFD_SDDRV_INFO;
|
||||
|
||||
typedef union PFD_SDDEV_STORAGE {
|
||||
SDDev device;
|
||||
|
||||
@@ -86,15 +86,9 @@ 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) {
|
||||
struct { UHF_MSC_DEVICE* device; u16 blocks; } transfer;
|
||||
s32 error;
|
||||
UHF_MSC_DEVICE* device;
|
||||
u32 block_size;
|
||||
u8* transfer_buffer;
|
||||
u32 transfer_limit;
|
||||
@@ -108,24 +102,14 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
|
||||
if (blocks == 0) {
|
||||
return 0;
|
||||
}
|
||||
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) {
|
||||
transfer.device = &uhg_msc_blk_device_tbl[index];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (transfer.device == NULL) {
|
||||
device = uhf_msc_blk_find_device(disk);
|
||||
if (device == NULL) {
|
||||
return -1;
|
||||
}
|
||||
if (!(transfer.device->flags & 4)) {
|
||||
if (!(device->flags & 4)) {
|
||||
return -1;
|
||||
}
|
||||
block_size = transfer.device->block_size;
|
||||
block_size = device->block_size;
|
||||
if (block_size == 0) {
|
||||
return -1;
|
||||
}
|
||||
@@ -143,18 +127,21 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
|
||||
transfer_buffer = buffer;
|
||||
}
|
||||
do {
|
||||
transfer.blocks = ReadTransferBlocks(blocks, transfer_limit);
|
||||
error = usbh_msc_read10(transfer.device, sector, transfer.blocks, transfer_buffer, sense);
|
||||
u16 transfer_blocks = transfer_limit;
|
||||
if (blocks <= transfer_limit) {
|
||||
transfer_blocks = blocks;
|
||||
}
|
||||
error = usbh_msc_read10(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;
|
||||
}
|
||||
@@ -164,8 +151,8 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
|
||||
case 11:
|
||||
break;
|
||||
case 34:
|
||||
if (transfer.device->disk != NULL) {
|
||||
pdm_disk_notify_media_insert(transfer.device->disk);
|
||||
if (device->disk != NULL) {
|
||||
pdm_disk_notify_media_insert(device->disk);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@@ -199,17 +186,7 @@ s32 uhf_msc_blk_pwrite(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* co
|
||||
if (blocks == 0) {
|
||||
return 0;
|
||||
}
|
||||
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];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
device = uhf_msc_blk_find_device(disk);
|
||||
if (device == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -603,35 +603,31 @@ 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;
|
||||
deletion.cluster_size = p_vol->bpb.bytes_per_sector << p_vol->bpb.log2_sectors_per_cluster;
|
||||
deletion.position = cluster_index * deletion.cluster_size;
|
||||
cluster_size = p_vol->bpb.bytes_per_sector << p_vol->bpb.log2_sectors_per_cluster;
|
||||
byte_position = cluster_index * cluster_size;
|
||||
err = PFFAT_TraceClustersChain(&p_iter->ffd, *p_iter->ffd.p_start_cluster,
|
||||
deletion.position, &previous_cluster, &first_deleted_cluster);
|
||||
byte_position, &previous_cluster, &first_deleted_cluster);
|
||||
if (err != 0) return err;
|
||||
if (cluster_index == 0) first_deleted_cluster = p_ent->start_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);
|
||||
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);
|
||||
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 -= deletion.length;
|
||||
p_ent->file_size -= num_clusters;
|
||||
PFENT_getcurrentDateTimeForEnt(&p_ent->modify_date, &p_ent->modify_time);
|
||||
p_ent->access_date = p_ent->modify_date;
|
||||
err = PFENT_updateEntry(p_ent, 1);
|
||||
@@ -640,13 +636,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, deletion.length);
|
||||
err = PFFAT_FreeChain(&p_iter->ffd, first_deleted_cluster, -1U, num_clusters);
|
||||
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 = deletion.length / deletion.cluster_size;
|
||||
if (deletion.length % deletion.cluster_size != 0) ++*p_deleted_clusters;
|
||||
*p_deleted_clusters = num_clusters / cluster_size;
|
||||
if (num_clusters % cluster_size != 0) ++*p_deleted_clusters;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -140,19 +140,15 @@ 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_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) {
|
||||
static inline pf_u32 current_directory_is_open(PF_VOLUME* volume, pf_u32 cluster) {
|
||||
pf_u32 index;
|
||||
for (index = 0; index < 4; index++) {
|
||||
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);
|
||||
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;
|
||||
pf_u32 slot;
|
||||
for (slot = 0; slot < 4; slot++, directory++) {
|
||||
if ((directory->stat & 1) != 0 && directory->directory.start_cluster == entry->start_cluster) { return 1; }
|
||||
if ((directory->stat & 1) != 0 && directory->directory.start_cluster == cluster) { return 1; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -385,7 +381,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_u32, pf_u32);
|
||||
extern pf_s32 PFENT_findEntry(PFDIR_FFD*, PF_DIR_ENT*, pf_u32, PFDIR_STR*, pf_u8, 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*);
|
||||
@@ -412,9 +408,17 @@ 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] = '.';
|
||||
for (index = 1; index < 11; index++) { buffer[index] = ' '; }
|
||||
buffer[1] = ' ';
|
||||
buffer[2] = ' ';
|
||||
buffer[3] = ' ';
|
||||
buffer[4] = ' ';
|
||||
buffer[5] = ' ';
|
||||
buffer[6] = ' ';
|
||||
buffer[7] = ' ';
|
||||
buffer[8] = ' ';
|
||||
buffer[9] = ' ';
|
||||
buffer[10] = ' ';
|
||||
}
|
||||
|
||||
static inline void set_dot_dot_entry(pf_u8* buffer) {
|
||||
@@ -449,7 +453,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_u32 required_attributes, pf_u32 forbidden_attributes);
|
||||
pf_u8 attributes, pf_u32* logical_position, pf_u32* entry_position);
|
||||
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);
|
||||
@@ -463,16 +467,6 @@ 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];
|
||||
@@ -486,9 +480,19 @@ 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; }
|
||||
@@ -866,15 +870,12 @@ 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_s32 filename_length;
|
||||
pf_u32* next_sector;
|
||||
pf_s32 allocation_error = 0;
|
||||
pf_u32 sector;
|
||||
pf_u16 saved_initial_char = 0;
|
||||
pf_u32 sector;
|
||||
pf_u32* next_sector;
|
||||
pf_s32 filename_length;
|
||||
pf_s32 parse_error;
|
||||
const pf_s8* filename;
|
||||
pf_u32 remaining_lfns;
|
||||
pf_u32 lfn_index;
|
||||
pf_s32 allocation_error = 0;
|
||||
pf_s32 error;
|
||||
pf_u32 index;
|
||||
PF_DIR_ENT* update_entry;
|
||||
@@ -910,11 +911,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) {
|
||||
filename = PFSTR_GetStrPos(&destination_name, 1);
|
||||
const pf_s8* filename = PFSTR_GetStrPos(&destination_name, 1);
|
||||
error = pf_strcmp(PFSTR_GetStrPos(&directory, 1), filename);
|
||||
} else {
|
||||
filename = PFSTR_GetStrPos(&destination_name, 1);
|
||||
error = pf_w_strcmp((const pf_u16*)PFSTR_GetStrPos(&directory, 1), (const pf_u16*)filename);
|
||||
const pf_u16* filename = (const pf_u16*)PFSTR_GetStrPos(&destination_name, 1);
|
||||
error = pf_w_strcmp((const pf_u16*)PFSTR_GetStrPos(&directory, 1), filename);
|
||||
}
|
||||
if (error != 0) {
|
||||
error = PFENT_ITER_GetEntryOfPath(&destination_iter, &destination_entry,
|
||||
@@ -924,24 +925,23 @@ 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);
|
||||
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &destination_name, 0x7F, 0, 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) != 0) { return 0x1C; }
|
||||
if (current_directory_is_open(source_entry.p_vol, source_entry.start_cluster) != 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;
|
||||
directory_sector = volume->bpb.first_data_sector +
|
||||
pf_u32 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 (volume == file->dir_entry.p_vol && directory_sector == file->dir_entry.entry_sector) { return 0x13; }
|
||||
if (file->dir_entry.p_vol == volume && file->dir_entry.entry_sector == directory_sector) { return 0x13; }
|
||||
found = 0;
|
||||
error = PFENT_ITER_FindCluster(&file->dir_entry, source_entry.start_cluster, &found);
|
||||
if (error != 0) { return error; }
|
||||
@@ -961,13 +961,12 @@ 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);
|
||||
if (error != 0) { return error; }
|
||||
goto return_allocation_error;
|
||||
goto finish_rename;
|
||||
}
|
||||
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 (lfn_index = 1; lfn_index <= source_entry.num_entry_LFNs; lfn_index++) {
|
||||
for (index = 1; index <= source_entry.num_entry_LFNs; index++) {
|
||||
error = PFENT_ITER_Retreat(&source_iter, 0);
|
||||
if (error != 0) { return error; }
|
||||
error = PFSEC_WriteData(volume, deleted_marker, source_iter.sector,
|
||||
@@ -1005,7 +1004,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_u32)source_entry.num_entry_LFNs << 5) & (0xffU << 5);
|
||||
source_entry.entry_offset -= (pf_u16)(source_entry.num_entry_LFNs * 32);
|
||||
}
|
||||
update_entry = &source_entry;
|
||||
} else {
|
||||
@@ -1014,13 +1013,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;
|
||||
}
|
||||
remaining_lfns = update_entry->num_entry_LFNs;
|
||||
if (remaining_lfns != 0 && (update_entry->small_letter_flag & 0x18) == 0) {
|
||||
index = update_entry->num_entry_LFNs;
|
||||
if (index != 0 && (update_entry->small_letter_flag & 0x18) == 0) {
|
||||
sector = update_entry->entry_sector;
|
||||
next_sector = previous_chain;
|
||||
while (remaining_lfns >= 1) {
|
||||
PFENT_storeLFNEntryFieldsToBuf(entry_buffer, update_entry, remaining_lfns,
|
||||
update_entry->check_sum, remaining_lfns == update_entry->num_entry_LFNs);
|
||||
while (index >= 1) {
|
||||
PFENT_storeLFNEntryFieldsToBuf(entry_buffer, update_entry, index,
|
||||
update_entry->check_sum, index == 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; }
|
||||
@@ -1029,13 +1028,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++;
|
||||
}
|
||||
remaining_lfns--;
|
||||
index--;
|
||||
}
|
||||
update_entry->entry_sector = sector;
|
||||
}
|
||||
error = PFENT_updateEntry(update_entry, 1);
|
||||
if (error != 0) { return error; }
|
||||
return_allocation_error:
|
||||
finish_rename:
|
||||
if (error != 0) { allocation_error = error; }
|
||||
return allocation_error;
|
||||
}
|
||||
pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
@@ -1058,16 +1057,15 @@ 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_s32 filename_length;
|
||||
pf_u32* next_sector;
|
||||
pf_u32 parent_cluster;
|
||||
pf_u16 saved_initial_char = 0;
|
||||
pf_u32 sector;
|
||||
pf_u32* next_sector;
|
||||
pf_s32 filename_length;
|
||||
pf_s32 parse_error;
|
||||
pf_s32 allocation_error;
|
||||
pf_s32 error;
|
||||
pf_u16 saved_initial_char = 0;
|
||||
pf_u32 lfn_index;
|
||||
pf_u32 index;
|
||||
pf_u32 lfn_index;
|
||||
PF_DIR_ENT* update_entry;
|
||||
|
||||
error = PFENT_ITER_GetEntryOfPath(&source_iter, &source_entry, volume, (PFDIR_STR*)old_path, 0);
|
||||
@@ -1085,7 +1083,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);
|
||||
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &destination_name, 0x7F, 0, 0);
|
||||
if (error == 0) {
|
||||
if (destination_entry.entry_sector == source_entry.entry_sector &&
|
||||
destination_entry.entry_offset == source_entry.entry_offset) { return 0; }
|
||||
@@ -1096,19 +1094,18 @@ 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) != 0) { return 0x1C; }
|
||||
if (current_directory_is_open(source_entry.p_vol, source_entry.start_cluster) != 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;
|
||||
directory_sector = volume->bpb.first_data_sector +
|
||||
pf_u32 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 (volume == file->dir_entry.p_vol && directory_sector == file->dir_entry.entry_sector) { return 0x13; }
|
||||
if (file->dir_entry.p_vol == volume && file->dir_entry.entry_sector == directory_sector) { return 0x13; }
|
||||
found = 0;
|
||||
error = PFENT_ITER_FindCluster(&file->dir_entry, source_entry.start_cluster, &found);
|
||||
if (error != 0) { return error; }
|
||||
@@ -1118,11 +1115,12 @@ 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);
|
||||
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &parent_name, 0x7F, 0, 0);
|
||||
if (error != 0) { return error; }
|
||||
parent_cluster = destination_entry.start_cluster;
|
||||
if (parent_cluster == 1 || parent_cluster == 0) { break; }
|
||||
@@ -1142,10 +1140,9 @@ 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 (entry_index = 1; entry_index <= source_entry.num_entry_LFNs; entry_index++) {
|
||||
for (index = 1; index <= source_entry.num_entry_LFNs; index++) {
|
||||
error = PFENT_ITER_Retreat(&source_iter, 0);
|
||||
if (error != 0) { return error; }
|
||||
error = PFSEC_WriteData(volume, deleted_marker, source_iter.sector,
|
||||
@@ -1183,7 +1180,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 -= ((pf_u32)source_entry.num_entry_LFNs << 5) & (0xffU << 5);
|
||||
source_entry.entry_offset -= (source_entry.num_entry_LFNs & 0xff) * 32;
|
||||
}
|
||||
update_entry = &source_entry;
|
||||
} else {
|
||||
@@ -1195,7 +1192,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);
|
||||
error = PFENT_findEntry(&source_iter.ffd, &source_entry, 0, &parent_name, 0x7F, 0, 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)) {
|
||||
@@ -1233,164 +1230,6 @@ 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;
|
||||
@@ -1444,6 +1283,47 @@ 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];
|
||||
@@ -2030,3 +1910,121 @@ 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);
|
||||
}
|
||||
|
||||
@@ -726,29 +726,25 @@ 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 index;
|
||||
pf_u8* destination;
|
||||
pf_u32 i;
|
||||
pf_u32 index;
|
||||
pf_s32 err;
|
||||
if (p_ent->num_entry_LFNs != 0 && !(p_ent->small_letter_flag & 0x18)) {
|
||||
i = 0;
|
||||
for (index = 0; i < p_ent->num_entry_LFNs; ++i) {
|
||||
index = 0;
|
||||
for (i = 0; i < p_ent->num_entry_LFNs; ++i) {
|
||||
pf_u16* destination;
|
||||
err = PFENT_ITER_Retreat(p_iter, 0);
|
||||
if (err != 0) return err;
|
||||
err = PFENT_ITER_LoadEntry(p_iter);
|
||||
if (err != 0) return err;
|
||||
destination = (pf_u8*)p_ent->long_name + index;
|
||||
index = CopyLongNameFragment(p_iter, destination, index);
|
||||
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;
|
||||
}
|
||||
p_ent->long_name[(p_ent->num_entry_LFNs * 26U) >> 1] = 0;
|
||||
p_ent->long_name[index] = 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1232,6 +1232,8 @@ s32 PFFAT_GetSector(PFFAT_FFD* file, u32 fileSectorIndex, u32 mode,
|
||||
u32 fatType;
|
||||
u32 chainIndex;
|
||||
u32 cluster;
|
||||
u32 numRemainder;
|
||||
u32 numDivide;
|
||||
u32 numClusters;
|
||||
u32 numSectors;
|
||||
s32 error;
|
||||
@@ -1247,10 +1249,12 @@ s32 PFFAT_GetSector(PFFAT_FFD* file, u32 fileSectorIndex, u32 mode,
|
||||
}
|
||||
chainIndex = fileSectorIndex >> volume->bpb.log2_sectors_per_cluster;
|
||||
if (mode == 2) {
|
||||
numClusters = size / volume->bpb.bytes_per_sector;
|
||||
numSectors = numClusters + (size % volume->bpb.bytes_per_sector != 0);
|
||||
numClusters = numSectors / volume->bpb.sectors_per_cluster;
|
||||
numClusters = numClusters + (numSectors % volume->bpb.sectors_per_cluster != 0);
|
||||
numSectors = (size / volume->bpb.bytes_per_sector) +
|
||||
((size % volume->bpb.bytes_per_sector) != 0);
|
||||
numDivide = numSectors / volume->bpb.sectors_per_cluster;
|
||||
numRemainder =
|
||||
(numSectors % volume->bpb.sectors_per_cluster) != 0;
|
||||
numClusters = numRemainder + numDivide;
|
||||
error = PFFAT_GetClusterAllocated(file, chainIndex, numClusters,
|
||||
&cluster);
|
||||
if (error != 0) {
|
||||
@@ -1872,12 +1876,11 @@ s32 PFFAT_RefreshFSINFO(PF_VOLUME* volume)
|
||||
error = 17;
|
||||
}
|
||||
if (error == 0) {
|
||||
PFFAT_FSINFO* info;
|
||||
u8* freeClusterBytes;
|
||||
info = (PFFAT_FSINFO*)page->p_buf;
|
||||
freeClusterBytes = info->num_free_clusters.bytes;
|
||||
if (((u32)freeClusterBytes & 3) != 0) {
|
||||
freeClusterBytes[0] = (u8)volume->num_free_clusters;
|
||||
if (((u32)&((PFFAT_FSINFO*)page->p_buf)
|
||||
->num_free_clusters.word &
|
||||
3) != 0) {
|
||||
((PFFAT_FSINFO*)page->p_buf)->num_free_clusters.bytes[0] =
|
||||
(u8)volume->num_free_clusters;
|
||||
((PFFAT_FSINFO*)page->p_buf)->num_free_clusters.bytes[1] =
|
||||
(u8)(volume->num_free_clusters >> 8);
|
||||
((PFFAT_FSINFO*)page->p_buf)->num_free_clusters.bytes[2] =
|
||||
@@ -1886,9 +1889,11 @@ s32 PFFAT_RefreshFSINFO(PF_VOLUME* volume)
|
||||
(u8)(volume->num_free_clusters >> 24);
|
||||
} else {
|
||||
u32 freeClusters = volume->num_free_clusters;
|
||||
u32 upperBytes = (freeClusters << 24) | ((freeClusters << 8) & 0x00FF0000);
|
||||
u32 lowerBytes = (freeClusters >> 24) | ((freeClusters >> 8) & 0xFF00);
|
||||
info->num_free_clusters.word = upperBytes | lowerBytes;
|
||||
|
||||
((PFFAT_FSINFO*)page->p_buf)->num_free_clusters.word =
|
||||
(freeClusters << 24) |
|
||||
((freeClusters & 0xFF00) << 8) |
|
||||
((freeClusters >> 8) & 0xFF00) | (freeClusters >> 24);
|
||||
}
|
||||
error = PFSEC_WriteData(
|
||||
volume, page->p_buf, volume->bpb.fs_info_sector, 0,
|
||||
|
||||
@@ -175,70 +175,68 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
|
||||
|
||||
pf_s32 PFFAT12_ReadFATEntryWithBuf(PF_VOLUME* p_vol , pf_u16 cluster , pf_u32* p_value ,
|
||||
PF_CACHE_PAGE* p_page ) {
|
||||
struct {
|
||||
pf_u32 sector;
|
||||
pf_u32 current_fat;
|
||||
pf_s32 err;
|
||||
pf_u32 offset;
|
||||
} state;
|
||||
pf_s32 err;
|
||||
pf_u32 current_fat;
|
||||
pf_u32 sector;
|
||||
pf_u32 offset;
|
||||
pf_s32 result;
|
||||
|
||||
#define LOAD_FAT_SECTOR(next_sector) \
|
||||
if (p_page->sector != state.sector + (next_sector)) { \
|
||||
if (p_page->sector != sector + (next_sector)) { \
|
||||
if (p_page->option == 1) { \
|
||||
for (state.err = 0; (pf_u16)state.err < p_vol->bpb.num_active_FATs; state.err++) { \
|
||||
VFiPFSEC_WriteFAT(p_vol, p_page->p_buf, p_page->sector + (pf_u16)state.err * p_vol->bpb.sectors_per_FAT, 0, p_vol->bpb.bytes_per_sector); \
|
||||
for (err = 0; (pf_u16)err < p_vol->bpb.num_active_FATs; err++) { \
|
||||
VFiPFSEC_WriteFAT(p_vol, p_page->p_buf, p_page->sector + (pf_u16)err * p_vol->bpb.sectors_per_FAT, 0, p_vol->bpb.bytes_per_sector); \
|
||||
} \
|
||||
} \
|
||||
state.err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, state.sector + (next_sector), 0, p_vol->bpb.bytes_per_sector); \
|
||||
if (state.err != 0) { continue; } \
|
||||
p_page->sector = state.sector + (next_sector); \
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, sector + (next_sector), 0, p_vol->bpb.bytes_per_sector); \
|
||||
if (err != 0) { continue; } \
|
||||
p_page->sector = sector + (next_sector); \
|
||||
}
|
||||
|
||||
state.offset = (pf_u16)(cluster + (cluster >> 1));
|
||||
state.sector = p_vol->bpb.active_FAT_sector + (state.offset >> p_vol->bpb.log2_bytes_per_sector) & 0xFFFF;
|
||||
offset = (pf_u16)(cluster + (cluster >> 1));
|
||||
sector = p_vol->bpb.active_FAT_sector + (offset >> p_vol->bpb.log2_bytes_per_sector) & 0xFFFF;
|
||||
if ((p_vol->bpb.ext_flags & 0x80) != 0) {
|
||||
state.current_fat = p_vol->bpb.ext_flags & (0x01 | 0x02 | 0x04);
|
||||
current_fat = p_vol->bpb.ext_flags & (0x01 | 0x02 | 0x04);
|
||||
} else {
|
||||
state.current_fat = 1;
|
||||
current_fat = 1;
|
||||
}
|
||||
state.err = 0;
|
||||
err = 0;
|
||||
while (PF_TRUE) {
|
||||
if (state.err == 0x1000 && p_vol->p_callback != PF_NULL) {
|
||||
if (err == 0x1000 && p_vol->p_callback != PF_NULL) {
|
||||
result = ((PF_VOLUME_CB)p_vol->p_callback)(p_vol->last_driver_error);
|
||||
if (result == 0) {
|
||||
state.err = 0;
|
||||
err = 0;
|
||||
continue;
|
||||
}
|
||||
if (result == 1 && p_vol->bpb.num_active_FATs >= 2 && state.current_fat < p_vol->bpb.num_active_FATs) {
|
||||
state.current_fat++;
|
||||
state.sector += p_vol->bpb.sectors_per_FAT;
|
||||
state.err = 0;
|
||||
if (result == 1 && p_vol->bpb.num_active_FATs >= 2 && current_fat < p_vol->bpb.num_active_FATs) {
|
||||
current_fat++;
|
||||
sector += p_vol->bpb.sectors_per_FAT;
|
||||
err = 0;
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
LOAD_FAT_SECTOR(0);
|
||||
state.offset &= p_vol->bpb.bytes_per_sector - 1;
|
||||
if (state.offset == (p_vol->bpb.bytes_per_sector - 1)) {
|
||||
*p_value = *(p_page->p_buf + state.offset);
|
||||
offset &= p_vol->bpb.bytes_per_sector - 1;
|
||||
if (offset == (p_vol->bpb.bytes_per_sector - 1)) {
|
||||
*p_value = *(p_page->p_buf + offset);
|
||||
if (p_page->option == 1) {
|
||||
for (state.err = 0; (pf_u16)state.err < p_vol->bpb.num_active_FATs; state.err++) {
|
||||
VFiPFSEC_WriteFAT(p_vol, p_page->p_buf, p_page->sector + (pf_u16)state.err * p_vol->bpb.sectors_per_FAT, 0, p_vol->bpb.bytes_per_sector);
|
||||
for (err = 0; (pf_u16)err < p_vol->bpb.num_active_FATs; err++) {
|
||||
VFiPFSEC_WriteFAT(p_vol, p_page->p_buf, p_page->sector + (pf_u16)err * p_vol->bpb.sectors_per_FAT, 0, p_vol->bpb.bytes_per_sector);
|
||||
}
|
||||
}
|
||||
state.err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, state.sector + 1, 0, p_vol->bpb.bytes_per_sector);
|
||||
if (state.err != 0) { continue; }
|
||||
p_page->sector = state.sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, sector + 1, 0, p_vol->bpb.bytes_per_sector);
|
||||
if (err != 0) { continue; }
|
||||
p_page->sector = sector + 1;
|
||||
*p_value += (pf_u16)(*p_page->p_buf) << 8;
|
||||
} else {
|
||||
*p_value = ((pf_u16)p_page->p_buf[state.offset + 1] << 8) + *(p_page->p_buf + state.offset);
|
||||
*p_value = ((pf_u16)p_page->p_buf[offset + 1] << 8) + *(p_page->p_buf + offset);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (state.err != 0) {
|
||||
if (err != 0) {
|
||||
*p_value = -1;
|
||||
return state.err;
|
||||
return err;
|
||||
}
|
||||
if ((cluster & 0x01) != 0) {
|
||||
*p_value = *p_value >> 4;
|
||||
|
||||
@@ -647,16 +647,18 @@ void PFFILE_Cursor_MoveToClusterEnd(PFFILE_FILE* file, pf_u32 size) {
|
||||
}
|
||||
}
|
||||
|
||||
PFFILE_SFD* PFFILE_GetSFD(PFFILE_VOLUME_DIRS* volume_dirs, PF_DIR_ENT* entry) {
|
||||
pf_u32 first_free_index = 0;
|
||||
PFFILE_SFD* PFFILE_GetSFD(PF_VOLUME* volume, PF_DIR_ENT* entry) {
|
||||
PFFILE_VOLUME_DIRS* volume_dirs = (PFFILE_VOLUME_DIRS*)volume;
|
||||
PFFILE_SFD* first_free_sfd = PF_NULL;
|
||||
pf_u32 index;
|
||||
PFFILE_SFD* sfd = volume_dirs->sfds;
|
||||
pf_u32 first_free_index = 0;
|
||||
pf_u32 index = 0;
|
||||
|
||||
for (index = 0; index < 5; index++) {
|
||||
for (; index < 5; index++, sfd++) {
|
||||
if ((volume_dirs->sfds[index].stat & 1) == 0 ||
|
||||
((volume_dirs->sfds[index].stat & 1) != 0 && (!volume_dirs->sfds[index].stat & 2) != 0)) {
|
||||
if (first_free_sfd == PF_NULL) {
|
||||
first_free_sfd = &volume_dirs->sfds[index];
|
||||
first_free_sfd = sfd;
|
||||
first_free_index = index;
|
||||
}
|
||||
} else if (entry->p_vol == volume_dirs->sfds[index].dir_entry.p_vol &&
|
||||
@@ -920,7 +922,7 @@ pf_s32 PFFILE_p_fopen(PF_VOLUME* volume, PF_STR* path, pf_u32 open_mode,
|
||||
}
|
||||
}
|
||||
volume = entry.p_vol;
|
||||
sfd = PFFILE_GetSFD((PFFILE_VOLUME_DIRS*)volume, &entry);
|
||||
sfd = PFFILE_GetSFD(volume, &entry);
|
||||
if (sfd == PF_NULL) {
|
||||
return 0x15;
|
||||
}
|
||||
@@ -1407,7 +1409,7 @@ pf_s32 PFFILE_FsexecOpenFile(PF_DIR_ENT* entry, PFFILE_ENT_ITER* iter,
|
||||
} else {
|
||||
PFENT_getcurrentDateTimeForEnt(&entry->access_date, &access_time);
|
||||
}
|
||||
sfd = PFFILE_GetSFD((PFFILE_VOLUME_DIRS*)volume, entry);
|
||||
sfd = PFFILE_GetSFD(volume, entry);
|
||||
if (sfd == PF_NULL) {
|
||||
return 0x15;
|
||||
}
|
||||
|
||||
@@ -321,21 +321,56 @@ pf_u32 PFPATH_DoMatchFileNameWithPattern(pf_u16 c_name, PF_FILE_NAME_ITER* p_nam
|
||||
return 1;
|
||||
}
|
||||
|
||||
pf_bool PFPATH_MatchFileNameWithPattern(const pf_s8* file_name, PF_STR* p_pattern, pf_bool is_long_name);
|
||||
pf_bool PFPATH_MatchFileNameWithPattern(const pf_s8* file_name, PF_STR* p_pattern, pf_bool is_long_name) {
|
||||
pf_u16 c_name;
|
||||
pf_u16 c_pat;
|
||||
PF_FILE_NAME_ITER name;
|
||||
PF_STR pattern;
|
||||
pf_bool result;
|
||||
|
||||
result = PF_TRUE;
|
||||
name.buf = file_name;
|
||||
name.current = 0;
|
||||
name.kind = is_long_name;
|
||||
name.index = 0;
|
||||
|
||||
pattern = *p_pattern;
|
||||
|
||||
if (PFSTR_GetCodeMode(p_pattern) == 1) {
|
||||
if (is_long_name == PF_FALSE && (pf_vol_set.setting & 0x02) == 0x02 && PFPATH_CheckExtShortNameSignature(&pattern) == 1) {
|
||||
result = PFPATH_CheckExtShortNameSignature(&pattern);
|
||||
if (result == 1) {
|
||||
name.index += 2;
|
||||
pattern.p_head += 2;
|
||||
}
|
||||
}
|
||||
} else if ((pf_vol_set.setting & 0x02) == 0x02 && is_long_name == PF_FALSE &&
|
||||
PFSTR_StrNCmp(p_pattern, (pf_s8*)".", 1, 0, 1) != 0 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"..", 1, 0, 2) != 0 &&
|
||||
PFPATH_CheckExtShortName(p_pattern, 1, PF_FALSE) == 0) {
|
||||
result = PF_FALSE;
|
||||
}
|
||||
if (result == PF_TRUE) {
|
||||
c_name = PFPATH_GetNextCharOfFileName(&name);
|
||||
c_pat = PFPATH_GetNextCharOfPattern(&pattern, is_long_name);
|
||||
result = PFPATH_DoMatchFileNameWithPattern(c_name, &name, c_pat, &pattern, is_long_name);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
pf_s32 PFPATH_cmpNameImpl(const pf_s8* name, const pf_s8* pattern, pf_u32* matched_end) {
|
||||
pf_u32 read_char;
|
||||
pf_s32 recursive_error;
|
||||
pf_s32 name_width;
|
||||
pf_u16 name_char;
|
||||
pf_u16 pattern_char;
|
||||
pf_u16 converted_pattern;
|
||||
pf_u16 converted_name;
|
||||
pf_u16 name_char;
|
||||
pf_s32 name_width;
|
||||
pf_s32 pattern_width;
|
||||
PF_PATH_VOLUME_SET* volume = &pf_vol_set;
|
||||
|
||||
while (*pattern != 0) {
|
||||
pattern_width = pf_vol_set.codeset.oem_char_width(pattern);
|
||||
name_width = pf_vol_set.codeset.oem_char_width(name);
|
||||
pattern_width = volume->codeset.oem_char_width(pattern);
|
||||
name_width = volume->codeset.oem_char_width(name);
|
||||
if (pattern_width == 1) {
|
||||
read_char = pf_toupper(*pattern);
|
||||
} else {
|
||||
@@ -364,18 +399,18 @@ pf_s32 PFPATH_cmpNameImpl(const pf_s8* name, const pf_s8* pattern, pf_u32* match
|
||||
}
|
||||
case '*': {
|
||||
do {
|
||||
pattern_width = pf_vol_set.codeset.oem_char_width(pattern);
|
||||
if (pattern_width == 1) {
|
||||
read_char = pf_toupper(*pattern);
|
||||
} else {
|
||||
pattern_width = volume->codeset.oem_char_width(pattern);
|
||||
if (pattern_width != 1) {
|
||||
read_char = (pf_u16)PF_GET_LE_U16((const pf_u8*)pattern);
|
||||
} else {
|
||||
read_char = pf_toupper(*pattern);
|
||||
}
|
||||
pattern_char = (pf_u16)read_char;
|
||||
pattern += pattern_width;
|
||||
if (pattern_char == '?') {
|
||||
if (name_char == 0) { return 1; }
|
||||
name += name_width;
|
||||
name_width = pf_vol_set.codeset.oem_char_width(name);
|
||||
name_width = volume->codeset.oem_char_width(name);
|
||||
if (name_width == 1) { read_char = pf_toupper(*name); }
|
||||
else { read_char = (pf_u16)PF_GET_LE_U16((const pf_u8*)name); }
|
||||
name_char = (pf_u16)read_char;
|
||||
@@ -393,7 +428,7 @@ pf_s32 PFPATH_cmpNameImpl(const pf_s8* name, const pf_s8* pattern, pf_u32* match
|
||||
}
|
||||
if (*matched_end != 0) { return recursive_error; }
|
||||
}
|
||||
name_width = pf_vol_set.codeset.oem_char_width(name);
|
||||
name_width = volume->codeset.oem_char_width(name);
|
||||
if (name_width == 1) {
|
||||
read_char = pf_toupper(*name);
|
||||
} else {
|
||||
@@ -543,42 +578,6 @@ PF_VOLUME* PFPATH_GetVolumeFromPath(PF_STR* p_path) {
|
||||
return p_vol;
|
||||
}
|
||||
|
||||
pf_bool PFPATH_MatchFileNameWithPattern(const pf_s8* file_name, PF_STR* p_pattern, pf_bool is_long_name) {
|
||||
pf_u16 c_name;
|
||||
pf_u16 c_pat;
|
||||
PF_FILE_NAME_ITER name;
|
||||
PF_STR pattern;
|
||||
pf_bool result;
|
||||
|
||||
result = PF_TRUE;
|
||||
name.buf = file_name;
|
||||
name.current = 0;
|
||||
name.kind = is_long_name;
|
||||
name.index = 0;
|
||||
|
||||
pattern = *p_pattern;
|
||||
|
||||
if (PFSTR_GetCodeMode(p_pattern) == 1) {
|
||||
if (is_long_name == PF_FALSE && (pf_vol_set.setting & 0x02) == 0x02 && PFPATH_CheckExtShortNameSignature(&pattern) == 1) {
|
||||
result = PFPATH_CheckExtShortNameSignature(&pattern);
|
||||
if (result == 1) {
|
||||
name.index += 2;
|
||||
pattern.p_head += 2;
|
||||
}
|
||||
}
|
||||
} else if ((pf_vol_set.setting & 0x02) == 0x02 && is_long_name == PF_FALSE &&
|
||||
PFSTR_StrNCmp(p_pattern, (pf_s8*)".", 1, 0, 1) != 0 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"..", 1, 0, 2) != 0 &&
|
||||
PFPATH_CheckExtShortName(p_pattern, 1, PF_FALSE) == 0) {
|
||||
result = PF_FALSE;
|
||||
}
|
||||
if (result == PF_TRUE) {
|
||||
c_name = PFPATH_GetNextCharOfFileName(&name);
|
||||
c_pat = PFPATH_GetNextCharOfPattern(&pattern, is_long_name);
|
||||
result = PFPATH_DoMatchFileNameWithPattern(c_name, &name, c_pat, &pattern, is_long_name);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
pf_s32 PFPATH_putShortName(pf_u8* pDirEntry, const pf_s8* short_name, pf_u8 attr) {
|
||||
pf_s32 i = 0;
|
||||
|
||||
|
||||
@@ -225,6 +225,8 @@ 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);
|
||||
@@ -370,13 +372,8 @@ static inline s32 finalize_volume(PFVOL_VOLUME* volume) {
|
||||
if (error != 0) { return error; }
|
||||
return 0;
|
||||
}
|
||||
static inline s32 copy_codeset(PFVOL_CHARCODE* code_set) {
|
||||
pf_vol_set.codeset.oem2unicode = code_set->oem2unicode;
|
||||
pf_vol_set.codeset.unicode2oem = code_set->unicode2oem;
|
||||
pf_vol_set.codeset.oem_char_width = code_set->oem_char_width;
|
||||
pf_vol_set.codeset.is_oem_mb_char = code_set->is_oem_mb_char;
|
||||
pf_vol_set.codeset.unicode_char_width = code_set->unicode_char_width;
|
||||
pf_vol_set.codeset.is_unicode_mb_char = code_set->is_unicode_mb_char;
|
||||
static inline s32 copy_codeset(const PFVOL_CHARCODE* code_set) {
|
||||
pf_vol_set.codeset = *code_set;
|
||||
return 0;
|
||||
}
|
||||
s32 PFVOL_DoMountVolume(PFVOL_VOLUME* volume) {
|
||||
@@ -587,7 +584,7 @@ s32 PFVOL_p_rmvvol(PFVOL_VOLUME* volume) {
|
||||
u32 logical_position;
|
||||
u32 entry_position;
|
||||
u32 processed;
|
||||
u8 deleted[1] = {0xE5};
|
||||
u8 deleted = deleted_entry_mark[0];
|
||||
s32 error;
|
||||
|
||||
error = PFENT_GetRootDir(volume, &root_entry);
|
||||
@@ -602,7 +599,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;
|
||||
}
|
||||
@@ -1105,13 +1102,7 @@ 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;
|
||||
error = clear_mount(volume);
|
||||
if (error != 0) {
|
||||
pf_vol_set.last_error = error;
|
||||
volume->last_error = error;
|
||||
return 0;
|
||||
}
|
||||
driver->stat |= 2;
|
||||
attach_mount(volume, driver);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1467,7 +1458,7 @@ s32 PFVOL_getvolcfg(s8 drive, u32* config) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 PFVOL_setcode(PFVOL_CHARCODE* code_set) {
|
||||
s32 PFVOL_setcode(const PFVOL_CHARCODE* code_set) {
|
||||
if (pf_vol_set.num_mounted_volumes > 0) {
|
||||
pf_vol_set.last_error = 36;
|
||||
return 36;
|
||||
@@ -1475,21 +1466,17 @@ 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) {
|
||||
u32 context_index;
|
||||
s32 free_context_index;
|
||||
s32 context_id;
|
||||
s32 free_context_index;
|
||||
u32 context_index;
|
||||
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 = ContextStatus(&pf_vol_set.context[context_index - 1]);
|
||||
stat = pf_vol_set.context[context_index - 1].stat & 1;
|
||||
if (stat != 0 && pf_vol_set.context[context_index - 1].context_id == context_id) { break; }
|
||||
if (stat == 0 && free_context_index == 0) { free_context_index = context_index; }
|
||||
}
|
||||
|
||||
@@ -562,13 +562,11 @@ 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 (callback->callbackAddress == (USBKBDCmdLEDCallback)(u32)kbdCmdBuf[index].device) {
|
||||
if (kbdLCBuf[index].callbackAddress == (USBKBDCmdLEDCallback)(u32)kbdCmdBuf[index].device) {
|
||||
return;
|
||||
}
|
||||
switch (success) {
|
||||
|
||||
@@ -276,15 +276,14 @@ static inline f32 object_interval_distance(f32 interval) {
|
||||
const f32 sensorIntervalConversion = 0.383864f;
|
||||
|
||||
static void reset_kpad(KPADInside* kpad) {
|
||||
f32 sensorDistance;
|
||||
f32 upperY;
|
||||
f32 distanceValue;
|
||||
f32 zero;
|
||||
f32 upperY;
|
||||
f32 sensorDistance;
|
||||
f32 lowerY;
|
||||
f32 one;
|
||||
f32 negativeOne;
|
||||
KPADDPDObject* object;
|
||||
f32 calibratedDistance;
|
||||
negativeOne = -1.0f;
|
||||
one = 1.0f;
|
||||
zero = 0.0f;
|
||||
@@ -300,9 +299,8 @@ 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;
|
||||
calibratedDistance = kp_dist_vv1;
|
||||
distanceValue = calibratedDistance / sensorDistance;
|
||||
kpad->value510 = calibratedDistance;
|
||||
distanceValue = kp_dist_vv1 / sensorDistance;
|
||||
kpad->value510 = kp_dist_vv1;
|
||||
kpad->status.release = 0;
|
||||
kpad->status.trig = 0;
|
||||
kpad->status.hold = 0;
|
||||
@@ -856,33 +854,26 @@ static s8 select_1obj_continue(KPADInside* kpad) {
|
||||
}
|
||||
*matchedCandidate = *source;
|
||||
{
|
||||
f32 distance;
|
||||
f32 normY;
|
||||
f32 vertical;
|
||||
f32 directionY;
|
||||
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 axisY;
|
||||
f32 horizontal;
|
||||
f32 axisX;
|
||||
f32 directionX;
|
||||
f32 normX;
|
||||
f32 directionY;
|
||||
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 = distance * directionX;
|
||||
offsetX = directionX * distance;
|
||||
kpad->dpdObjectDirection.x = directionX;
|
||||
offsetY = distance * directionY;
|
||||
offsetY = directionY * distance;
|
||||
kpad->dpdObjectDirection.y = directionY;
|
||||
if (matchedCandidate == kpad->dpdState.candidates) {
|
||||
kpad->dpdState.candidates[1].x = matchedCandidate->x + offsetX;
|
||||
|
||||
@@ -144,8 +144,8 @@ const u16 kprLookupTable437[] = {
|
||||
0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0,
|
||||
};
|
||||
|
||||
static void (*kprProcDeadKeysFP)(KPRQueue* queue) = NULL;
|
||||
static void (*kprProcRomajiFP)(KPRQueue* queue) = NULL;
|
||||
static void (*kprProcDeadKeysFP)(KPRQueue* queue);
|
||||
static void (*kprProcRomajiFP)(KPRQueue* queue);
|
||||
const char* __KPRVersion = "<< RVL_SDK - KPR \trelease build: Apr 20 2010 11:21:44 (0x4199_60831) >>";
|
||||
|
||||
void KPRProcessDeadKeys(KPRQueue* queue);
|
||||
@@ -242,25 +242,6 @@ u8 KPRLookAhead(KPRQueue* queue, u16* destination, u32 capacity) {
|
||||
return queue->iCount + queue->oCount;
|
||||
}
|
||||
|
||||
static inline u32 KPRConvertAltValue(u32 value, u32 leadingZero) {
|
||||
if (value >= 128 && value <= 255) {
|
||||
if (leadingZero) {
|
||||
if (value < 160) {
|
||||
value = kprLookupTable1252[value - 128];
|
||||
}
|
||||
} else {
|
||||
value = kprLookupTable437[value - 128];
|
||||
}
|
||||
} else if (value > 255) {
|
||||
u32 converted = 32;
|
||||
if (value <= 0x6666666) {
|
||||
converted = (u8)value;
|
||||
}
|
||||
value = converted;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
BOOL KPRProcessAltKeypad(KPRQueue* queue, u16 character) {
|
||||
if (queue->altVal != 0) {
|
||||
u32 accumulator = queue->altVal & 0x7FFFFFFF;
|
||||
@@ -275,7 +256,21 @@ BOOL KPRProcessAltKeypad(KPRQueue* queue, u16 character) {
|
||||
return TRUE;
|
||||
}
|
||||
value = queue->altVal;
|
||||
value = KPRConvertAltValue(value, leadingZero);
|
||||
if (value >= 128 && value <= 255) {
|
||||
if (leadingZero) {
|
||||
if (value < 160) {
|
||||
value = kprLookupTable1252[value - 128];
|
||||
}
|
||||
} else {
|
||||
value = kprLookupTable437[value - 128];
|
||||
}
|
||||
} else if (value > 255) {
|
||||
u32 converted = 32;
|
||||
if (value <= 0x6666666) {
|
||||
converted = (u8)value;
|
||||
}
|
||||
value = converted;
|
||||
}
|
||||
{
|
||||
u16* destination;
|
||||
int index = queue->oCount + queue->iCount;
|
||||
|
||||
@@ -50,16 +50,12 @@ int NHTTPGetHeaderAll(void*, char**);
|
||||
void NHTTPCancelRequestAsync(int);
|
||||
void NHTTPDestroyResponse(void*);
|
||||
|
||||
static inline unsigned long NhttpBufferSize(unsigned long requested) {
|
||||
if (requested != 0 && requested < 0x8000) return requested;
|
||||
return 0x8000;
|
||||
}
|
||||
static u8* __nupNhttpBufFull(u8** buffer, unsigned long* length, unsigned long requested, void*, void*, HttpState* state) {
|
||||
u8* next = NULL;
|
||||
if (state->progress != NULL && *length != 0) {
|
||||
state->progress(state->progressContext, *length);
|
||||
}
|
||||
if ((u32)(state->received + *length) < (u32)state->received) {
|
||||
if ((state->received + *length) < state->received) {
|
||||
if (state->error == 0) state->error = -5012;
|
||||
}
|
||||
state->received += *length;
|
||||
@@ -73,26 +69,22 @@ static u8* __nupNhttpBufFull(u8** buffer, unsigned long* length, unsigned long r
|
||||
if (state->error != 0) goto done;
|
||||
}
|
||||
next = *buffer;
|
||||
switch ((u32)next) {
|
||||
case 0: {
|
||||
requested = NhttpBufferSize(requested);
|
||||
if (next == NULL) {
|
||||
if (requested != 0 && requested < 0x8000) {} else requested = 0x8000;
|
||||
next = (u8*)nup::__nupMalloc(requested);
|
||||
if (next == NULL) {
|
||||
state->error = -5000;
|
||||
goto done;
|
||||
}
|
||||
*length = requested;
|
||||
break;
|
||||
}
|
||||
default: break;
|
||||
}
|
||||
if (*length != 0) state->lastActivity = OSGetTime();
|
||||
}
|
||||
}
|
||||
done:
|
||||
if (state->error != 0) {
|
||||
*length = 0;
|
||||
next = NULL;
|
||||
*length = 0;
|
||||
}
|
||||
return next;
|
||||
}
|
||||
@@ -109,17 +101,12 @@ static void __nupNhttpReqDone(int result, void* response, HttpState* state) {
|
||||
}
|
||||
|
||||
static int __nupNhttpOp(char* url, NHTTPReqMethod method, char* headers, u8* body, unsigned long bodyLength, unsigned long limit, ProgressCallback progress, void* progressContext, FlushCallback flush, void* flushContext) {
|
||||
int result = 0;
|
||||
char* headerCopy = NULL;
|
||||
void* request;
|
||||
int requestId;
|
||||
int status;
|
||||
u8* responseBody = NULL;
|
||||
char* responseHeaders = NULL;
|
||||
unsigned long transferred, expected;
|
||||
int length;
|
||||
unsigned long expected;
|
||||
unsigned long transferred;
|
||||
char* responseHeaders = NULL;
|
||||
u8* responseBody = NULL;
|
||||
HttpState state;
|
||||
int status;
|
||||
state.error = 0;
|
||||
state.limit = limit;
|
||||
state.received = 0;
|
||||
@@ -131,7 +118,10 @@ static int __nupNhttpOp(char* url, NHTTPReqMethod method, char* headers, u8* bod
|
||||
state.done = 0;
|
||||
state.result = 0;
|
||||
state.lastActivity = 0;
|
||||
request = NHTTPCreateRequestEx(url, method, NULL, 0, __nupNhttpReqDone, &state, __nupNhttpBufFull, __nupNhttpBufFree);
|
||||
int result = 0;
|
||||
int requestId = 0;
|
||||
char* headerCopy = NULL;
|
||||
void* request = NHTTPCreateRequestEx(url, method, NULL, 0, __nupNhttpReqDone, &state, __nupNhttpBufFull, __nupNhttpBufFree);
|
||||
if (request == NULL) { result = -7000 - NHTTPGetError(); goto cleanup; }
|
||||
if (NHTTPSetSocketBufferSize(request, 0x8000) != 0) { result = -7000 - NHTTPGetError(); goto cleanup; }
|
||||
if (headers != NULL) {
|
||||
@@ -140,15 +130,16 @@ static int __nupNhttpOp(char* url, NHTTPReqMethod method, char* headers, u8* bod
|
||||
if (headerCopy == NULL) { result = -5000; goto cleanup; }
|
||||
memcpy(headerCopy, headers, size);
|
||||
char* field = headerCopy;
|
||||
char* colon;
|
||||
char* end;
|
||||
while (*field != 0 && (colon = strchr(field, ':')) != NULL && (end = strstr(colon, "\r\n")) != NULL) {
|
||||
while (*field != 0) {
|
||||
char* colon = strchr(field, ':');
|
||||
if (colon == NULL) break;
|
||||
char* end = strstr(colon, "\r\n");
|
||||
if (end == NULL) break;
|
||||
*colon = 0;
|
||||
*end = 0;
|
||||
while (*field && isspace(*field)) field++;
|
||||
char* value = colon + 1;
|
||||
while (*value && isspace(*value)) ++value;
|
||||
if (NHTTPAddHeaderField(request, field, value) != 0) { result = -7000 - NHTTPGetError(); goto cleanup; }
|
||||
do { colon++; } while (*colon && isspace(*colon));
|
||||
if (NHTTPAddHeaderField(request, field, colon) != 0) { result = -7000 - NHTTPGetError(); goto cleanup; }
|
||||
field = end + 2;
|
||||
}
|
||||
}
|
||||
@@ -162,39 +153,40 @@ static int __nupNhttpOp(char* url, NHTTPReqMethod method, char* headers, u8* bod
|
||||
if (method == NHTTP_POST && body != NULL && bodyLength != 0 && NHTTPAddPostDataRaw(request, body, bodyLength) != 0) { result = -7000 - NHTTPGetError(); goto cleanup; }
|
||||
requestId = NHTTPSendRequestAsync(request);
|
||||
if (requestId < 0) {
|
||||
result = -7000 - NHTTPGetError();
|
||||
int error = NHTTPGetError();
|
||||
NHTTPDeleteRequest(request);
|
||||
result = -7000 - error;
|
||||
goto cleanup;
|
||||
}
|
||||
state.lastActivity = OSGetTime();
|
||||
while (NHTTPGetProgress(&expected, &transferred) == 0 || state.done == 0) {
|
||||
if (OSGetTime() - state.lastActivity >= OSMillisecondsToTicks((OSTime)90000)) {
|
||||
if (requestId >= 0) {
|
||||
NHTTPCancelRequestAsync(requestId);
|
||||
NCDSleep(OSMillisecondsToTicks(100));
|
||||
for (;;) {
|
||||
if (NHTTPGetProgress(&expected, &transferred) != 0 && state.done != 0) {
|
||||
if (state.result != 0) { result = -7000 - state.result; goto cleanup; }
|
||||
if (state.response != NULL) {
|
||||
length = NHTTPGetBodyAll(state.response, &responseBody);
|
||||
if (length < 0) { result = -5007; goto cleanup; }
|
||||
__nupNhttpBufFull(&responseBody, (unsigned long*)&length, 0, NULL, NULL, &state);
|
||||
}
|
||||
result = -5009;
|
||||
result = state.error;
|
||||
if (result != 0 || state.response == NULL) goto cleanup;
|
||||
length = NHTTPGetHeaderAll(state.response, &responseHeaders);
|
||||
if (length < 0) { result = -5007; goto cleanup; }
|
||||
char* protocol = strstr(responseHeaders, "HTTP/");
|
||||
if (protocol != NULL && sscanf(protocol, "HTTP/%*d.%*d %d", &status) == 1) {
|
||||
if (status != 200 && status != 202) result = -5000 - status;
|
||||
goto cleanup;
|
||||
}
|
||||
result = -5007;
|
||||
goto cleanup;
|
||||
}
|
||||
if (OSGetTime() - state.lastActivity >= OSMillisecondsToTicks(90000)) break;
|
||||
NCDSleep(OSMillisecondsToTicks(100));
|
||||
}
|
||||
if (state.result != 0) { result = -7000 - state.result; goto cleanup; }
|
||||
if (state.response != NULL) {
|
||||
length = NHTTPGetBodyAll(state.response, &responseBody);
|
||||
if (length < 0) { result = -5007; goto cleanup; }
|
||||
__nupNhttpBufFull(&responseBody, (unsigned long*)&length, 0, NULL, NULL, &state);
|
||||
if (requestId >= 0) {
|
||||
NHTTPCancelRequestAsync(requestId);
|
||||
NCDSleep(OSMillisecondsToTicks(100));
|
||||
}
|
||||
if (state.error != 0) { result = state.error; goto cleanup; }
|
||||
if (state.response == NULL) goto cleanup;
|
||||
length = NHTTPGetHeaderAll(state.response, &responseHeaders);
|
||||
if (length < 0) { result = -5007; goto cleanup; }
|
||||
char* protocol = strstr(responseHeaders, "HTTP/");
|
||||
if (protocol == NULL || sscanf(protocol, "HTTP/%*d.%*d %d", &status) != 1) {
|
||||
result = -5007;
|
||||
goto cleanup;
|
||||
}
|
||||
if (status != 200 && status != 202) result = -5000 - status;
|
||||
goto cleanup;
|
||||
result = -5009;
|
||||
cleanup:
|
||||
if (state.response != NULL || result == -5009) NHTTPDestroyResponse(state.response);
|
||||
if (headerCopy != NULL) nup::__nupFree(headerCopy);
|
||||
@@ -202,21 +194,18 @@ cleanup:
|
||||
}
|
||||
|
||||
extern "C" {
|
||||
static inline unsigned long HttpStringGrowthSize(HttpString* text, unsigned long total, unsigned long requested) {
|
||||
if (requested >= total) return requested;
|
||||
requested = text->growth + total;
|
||||
text->growth <<= 1;
|
||||
if (text->growth >= text->maximumGrowth) text->growth = text->maximumGrowth;
|
||||
return requested;
|
||||
}
|
||||
static inline long AppendHttpString(unsigned long length, u8* data, unsigned long requested, HttpString* text) {
|
||||
u8* next;
|
||||
static long __nupHttpStringFlush(u8* data, unsigned long length, unsigned long requested, void* context) {
|
||||
HttpString* text = (HttpString*)context;
|
||||
unsigned long total;
|
||||
total = text->length + length;
|
||||
total = length + text->length;
|
||||
long result = 0;
|
||||
if (total > text->capacity) {
|
||||
requested = HttpStringGrowthSize(text, total, requested);
|
||||
next = (u8*)nup::__nupMalloc(requested);
|
||||
if (requested >= total) {} else {
|
||||
requested = text->growth + total;
|
||||
text->growth <<= 1;
|
||||
if (text->growth < text->maximumGrowth) {} else text->growth = text->maximumGrowth;
|
||||
}
|
||||
u8* next = (u8*)nup::__nupMalloc(requested);
|
||||
if (next == NULL) { result = -5000; goto done; }
|
||||
if (text->buffer != NULL) {
|
||||
memcpy(next, text->buffer, text->length);
|
||||
@@ -229,9 +218,6 @@ static inline long AppendHttpString(unsigned long length, u8* data, unsigned lon
|
||||
done:
|
||||
return result;
|
||||
}
|
||||
static long __nupHttpStringFlush(u8* data, unsigned long length, unsigned long requested, void* context) {
|
||||
return AppendHttpString(length, data, requested, (HttpString*)context);
|
||||
}
|
||||
}
|
||||
static int __nupNhttpOpString(u8** output, unsigned long* outputLength, char* url, NHTTPReqMethod method, char* headers, u8* body, unsigned long bodyLength, unsigned long limit, ProgressCallback progress, void* context) NO_INLINE;
|
||||
static int __nupNhttpOpString(u8** output, unsigned long* outputLength, char* url, NHTTPReqMethod method, char* headers, u8* body, unsigned long bodyLength, unsigned long limit, ProgressCallback progress, void* context) {
|
||||
|
||||
@@ -1167,9 +1167,9 @@ u32 VIGetRetraceCount(void)
|
||||
|
||||
static u32 getCurrentHalfLine(void)
|
||||
{
|
||||
u32 verticalCount;
|
||||
u32 previousVerticalCount;
|
||||
u32 horizontalCount;
|
||||
u32 previousVerticalCount;
|
||||
u32 verticalCount;
|
||||
|
||||
verticalCount = __VIRegs[22] & 0x7FF;
|
||||
for (;;) {
|
||||
@@ -1180,7 +1180,7 @@ static u32 getCurrentHalfLine(void)
|
||||
break;
|
||||
}
|
||||
}
|
||||
return ((verticalCount - 1) * 2) + ((horizontalCount - 1) / CurrTiming->hlw);
|
||||
return ((horizontalCount - 1) / CurrTiming->hlw) + ((verticalCount - 1) * 2);
|
||||
}
|
||||
|
||||
static u32 getCurrentFieldEvenOdd(void)
|
||||
|
||||
@@ -87,10 +87,6 @@ typedef struct WD_Info_ {
|
||||
u8 unk_0x60[0x30]; // 0x60 (is it padding???)
|
||||
} PACKED WD_Info;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
s32 WDCheckEnableChannel(u16* enableChannel);
|
||||
s32 WDScanOnce(u8* scanBuffer, u32 scanBufferLen, WDScanParam* param);
|
||||
s32 WDGetPrivacyMode(WDBssDesc* bssDesc);
|
||||
@@ -98,8 +94,4 @@ s32 WDGetPrivacyMode(WDBssDesc* bssDesc);
|
||||
BOOL WDFindInformationElement(WDInfoElement** outIE, u32* outIELength, WDBssDesc* bssDesc, int id);
|
||||
BOOL WDiFindVendorSpecificIE(WDVendorInfoElement** outIE, u32* outIELength, WDBssDesc* bssDesc, int id, u8* data, u8 mode);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // REVOLUTION_WD_H
|
||||
|
||||
@@ -367,19 +367,6 @@ CDBErr CDBRecordSeek(CDBRecord* record, s32 offset, CDBSeek seek) {
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetFileSize(CDBRecord* record, u32* size) {
|
||||
CDBErr err;
|
||||
CDBLock();
|
||||
if ((s32)record->file == 0) {
|
||||
CDBReportError("can't get file size of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
err = CDBRecordFileGetFileSize(record, size);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetDataSize(CDBRecord* record, u32* size) {
|
||||
CDBErr err;
|
||||
CDBLock();
|
||||
@@ -468,7 +455,7 @@ CDBErr CDBRecordGetId(CDBRecord* record, CDBId* id) {
|
||||
} else {
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get maker code of the record ; the record is closed\n");
|
||||
CDBReportError("can't get CDBId of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBLock();
|
||||
@@ -669,10 +656,9 @@ 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 dataSize;
|
||||
u32 fileSize;
|
||||
u32 dataSize;
|
||||
u32 cryptSize;
|
||||
u32 authenticatedSize;
|
||||
int fileOffset;
|
||||
u8 iv[0x10];
|
||||
u8 wiiIdKey[0x40] ATTRIBUTE_ALIGN(64);
|
||||
@@ -737,7 +723,14 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
}
|
||||
err = CDBRecordGetFileSize(record, &fileSize);
|
||||
CDBLock();
|
||||
if ((s32)record->file == 0) {
|
||||
CDBReportError("can't get file size of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
err = CDBRecordFileGetFileSize(record, &fileSize);
|
||||
}
|
||||
CDBUnlock();
|
||||
CDBAttrSetFileSize(&recordFile->attr, fileSize);
|
||||
if (err != CDB_ERROR_OK) {
|
||||
return CDB_ERROR_OK;
|
||||
@@ -761,11 +754,10 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
if ((s32)record->file == 0) {
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
int position = CDBRecordFileTellData(record);
|
||||
if (position < 0) {
|
||||
fileOffset = CDBRecordFileTellData(record);
|
||||
if (fileOffset < 0) {
|
||||
err = CDB_ERROR_CANNOT_OPEN_FILE;
|
||||
} else {
|
||||
fileOffset = position;
|
||||
err = CDB_ERROR_OK;
|
||||
}
|
||||
}
|
||||
@@ -812,9 +804,8 @@ 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, authenticatedSize);
|
||||
NETHMACUpdate(&hmac, buffer, cryptSize + CDB_RECORD_BUFFER_SIZE);
|
||||
NETHMACGetDigest(&hmac, digest);
|
||||
memcpy(((CDBAttrBuf*)buffer)->signature.sha1Hmac, digest, sizeof(digest));
|
||||
if (encryptedSize != 0) {
|
||||
@@ -942,7 +933,7 @@ CDBErr CDBRecordDecrypt(CDBRecord* record, void* buffer, u32 size, u32* dataSize
|
||||
if (CDBRecordKeyCompareByDate(&comparisonKey, &record->key) != 0) {
|
||||
if (CDBIsPrintDebugMessage(3)) {
|
||||
CDBReport_(3);
|
||||
OSReport("ファイル名の改竄を検出\n");
|
||||
OSReport("CDBRecordPrivateChangeOwner\n");
|
||||
}
|
||||
return CDB_ERROR_32;
|
||||
}
|
||||
|
||||
@@ -234,39 +234,30 @@ void AESiDecryptBlock(AESContext* context, u32* output, const u32* input) {
|
||||
}
|
||||
|
||||
BOOL NETAESCreateEx(AESContext* context, const void* key, u32 keyLength, const void* iv, const AESBlockMode* mode) {
|
||||
BOOL result=FALSE;
|
||||
u32 words,index,value;
|
||||
u32* schedule;
|
||||
u32 words;
|
||||
u32 index;
|
||||
u32 value;
|
||||
BOOL result = FALSE;
|
||||
if (keyLength != 16 && keyLength != 24 && keyLength != 32) {
|
||||
OSReport("NETAESCreateEx() failed! (key-length is allowed only 16, 20, 24 BYTEs)");
|
||||
} else {
|
||||
context->needsTransform = 1;
|
||||
context->rounds = (keyLength * 8) / 32 + 6;
|
||||
context->mode = mode;
|
||||
context->rounds=keyLength/4+6;
|
||||
context->needsTransform=1;
|
||||
context->mode=mode;
|
||||
memcpy(context->chain, iv, 16);
|
||||
schedule = context->keys;
|
||||
words = keyLength / 4;
|
||||
memcpy(schedule, key, keyLength);
|
||||
value = schedule[words - 1];
|
||||
for (index = words; index < (context->rounds + 1) * 4; ++index) {
|
||||
if (index % words == 0) {
|
||||
u32 high = (u32)AESiSubShiftTable[(value >> 16) & 255] << 24;
|
||||
u32 low = AESiSubShiftTable[value >> 24];
|
||||
u32 lower = (u32)AESiSubShiftTable[value & 255] << 8;
|
||||
u32 upper = (u32)AESiSubShiftTable[(value >> 8) & 255] << 16;
|
||||
value = (low ^ high) ^ (lower ^ upper);
|
||||
value ^= (u32)AESiRoundKeyRcon0[index / words - 1] << 24;
|
||||
} else if (words > 6 && index % words == 4) {
|
||||
value = ((u32)AESiSubShiftTable[value >> 24] << 24) ^
|
||||
(((u32)AESiSubShiftTable[(value >> 16) & 255] << 16) ^
|
||||
(AESiSubShiftTable[value & 255] ^ ((u32)AESiSubShiftTable[(value >> 8) & 255] << 8)));
|
||||
schedule=context->keys;
|
||||
words=keyLength/4;
|
||||
memcpy(schedule,key,keyLength);
|
||||
value=schedule[words-1];
|
||||
for(index=words; index<(context->rounds+1)*4; ++index) {
|
||||
if (index%words == 0) {
|
||||
value=SUBSTITUTE_XOR(AESiSubShiftTable,value<<8,value<<8,value<<8,value>>24) ^ ((u32)AESiRoundKeyRcon0[index/words-1]<<24);
|
||||
} else if(words>6 && index%words==4) {
|
||||
value=SUBSTITUTE_XOR(AESiSubShiftTable,value,value,value,value);
|
||||
}
|
||||
value ^= schedule[index - words];
|
||||
schedule[index] = value;
|
||||
value ^= schedule[index-words];
|
||||
schedule[index]=value;
|
||||
}
|
||||
result = TRUE;
|
||||
result=TRUE;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -19,23 +19,15 @@ typedef struct HMACContext {
|
||||
u8 key[64];
|
||||
} HMACContext;
|
||||
|
||||
static inline void BeginDigest(HMACContext* context, u8 mask) {
|
||||
u8 blockKey[64];
|
||||
void NETHMACInit(HMACContext* context, const DigestInterface* interface, const void* key, u32 length) {
|
||||
u8 innerKey[64];
|
||||
u32 i;
|
||||
u32 keyLength;
|
||||
void* work = context->digestContext;
|
||||
keyLength = context->keyLength;
|
||||
for (i = 0; i < keyLength; ++i) blockKey[i] = context->key[i] ^ mask;
|
||||
memset(blockKey + keyLength, mask, context->interface.blockSize - keyLength);
|
||||
context->interface.init(work);
|
||||
context->interface.update(work, blockKey, context->interface.blockSize);
|
||||
}
|
||||
|
||||
void NETHMACInit(HMACContext* context, const DigestInterface* interface, const void* key, u32 length) {
|
||||
void* work = context->digestContext;
|
||||
const char* function = "NETHMACInit";
|
||||
context->interface = *interface;
|
||||
if (context->interface.contextSize > 96 || context->interface.blockSize > 64) {
|
||||
OSReport("%s(%d):[warning in %s]", "hmac.c", 100, __FUNCTION__);
|
||||
OSReport("%s(%d):[warning in %s]", "hmac.c", 100, function);
|
||||
OSReport("specified interface needs too large workmemory.");
|
||||
OSReport("\n");
|
||||
return;
|
||||
@@ -49,7 +41,11 @@ void NETHMACInit(HMACContext* context, const DigestInterface* interface, const v
|
||||
context->interface.getDigest(work, context->key);
|
||||
context->keyLength = context->interface.digestSize;
|
||||
}
|
||||
BeginDigest(context, 0x36);
|
||||
keyLength = context->keyLength;
|
||||
for (i=0; i<keyLength; ++i) innerKey[i] = context->key[i] ^ 0x36;
|
||||
memset(innerKey + keyLength, 0x36, context->interface.blockSize - keyLength);
|
||||
context->interface.init(context->digestContext);
|
||||
context->interface.update(context->digestContext, innerKey, context->interface.blockSize);
|
||||
}
|
||||
|
||||
void NETHMACUpdate(HMACContext* context, const void* data, u32 length) {
|
||||
@@ -58,9 +54,16 @@ void NETHMACUpdate(HMACContext* context, const void* data, u32 length) {
|
||||
|
||||
void NETHMACGetDigest(HMACContext* context, void* digest) {
|
||||
u8 innerDigest[64];
|
||||
u8 outerKey[64];
|
||||
u32 i;
|
||||
u32 keyLength;
|
||||
void* work = context->digestContext;
|
||||
context->interface.getDigest(work, innerDigest);
|
||||
BeginDigest(context, 0x5c);
|
||||
keyLength = context->keyLength;
|
||||
for (i=0; i<keyLength; ++i) outerKey[i] = context->key[i] ^ 0x5c;
|
||||
memset(outerKey + keyLength, 0x5c, context->interface.blockSize - keyLength);
|
||||
context->interface.init(context->digestContext);
|
||||
context->interface.update(context->digestContext, outerKey, context->interface.blockSize);
|
||||
context->interface.update(work, innerDigest, context->interface.digestSize);
|
||||
context->interface.getDigest(work, digest);
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ static void FindHeaderBlock(const NHTTPResponseInfo* response, s32 position, NHT
|
||||
}
|
||||
}
|
||||
|
||||
static int ReadHeaderChar(const NHTTPResponseInfo* response, NHTTPi_HDRBUFLIST** block, s32* offset) {
|
||||
static s8 ReadHeaderChar(const NHTTPResponseInfo* response, NHTTPi_HDRBUFLIST** block, s32* offset) {
|
||||
if(!*block) {
|
||||
if(*offset<1024) return (s8)response->hdrBufFirst[(*offset)++];
|
||||
*block=response->hdrBufBlock_p;
|
||||
@@ -30,31 +30,30 @@ static int LowerCase(int character) {
|
||||
s32 NHTTPi_findNextLineHdrRecvBuf(const NHTTPResponseInfo* response, s32 position, s32 limit, s32* colon, s32* newlineLength) {
|
||||
NHTTPi_HDRBUFLIST* block;
|
||||
s32 offset;
|
||||
s32 next=-1;
|
||||
BOOL carriage=FALSE;
|
||||
if(colon) *colon=-1;
|
||||
if (position < limit) {
|
||||
s32 next=-1;
|
||||
BOOL carriage=FALSE;
|
||||
FindHeaderBlock(response,position,&block,&offset);
|
||||
for(; position<limit; ++position) {
|
||||
int character=ReadHeaderChar(response,&block,&offset);
|
||||
if((s8)character==':' && colon && *colon<0) *colon=position;
|
||||
if(carriage) {
|
||||
if((s8)character=='\n') {
|
||||
next=position==limit-1 ? 0 : position+1;
|
||||
if(newlineLength) *newlineLength=2;
|
||||
}
|
||||
return next;
|
||||
}
|
||||
if((s8)character=='\r') {
|
||||
if(position>=limit) return -1;
|
||||
FindHeaderBlock(response,position,&block,&offset);
|
||||
for(; position<limit; ++position) {
|
||||
s8 character=ReadHeaderChar(response,&block,&offset);
|
||||
if(character==':' && colon && *colon<0) *colon=position;
|
||||
if(carriage) {
|
||||
if(character=='\n') {
|
||||
next=position==limit-1 ? 0 : position+1;
|
||||
carriage=TRUE;
|
||||
if(newlineLength) *newlineLength=1;
|
||||
}
|
||||
if((s8)character=='\n') {
|
||||
next=position==limit-1 ? 0 : position+1;
|
||||
if(newlineLength) *newlineLength=1;
|
||||
return next;
|
||||
if(newlineLength) *newlineLength=2;
|
||||
}
|
||||
return next;
|
||||
}
|
||||
if(character=='\r') {
|
||||
next=position==limit-1 ? 0 : position+1;
|
||||
carriage=TRUE;
|
||||
if(newlineLength) *newlineLength=1;
|
||||
}
|
||||
if(character=='\n') {
|
||||
next=position==limit-1 ? 0 : position+1;
|
||||
if(newlineLength) *newlineLength=1;
|
||||
return next;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
@@ -63,12 +62,11 @@ s32 NHTTPi_findNextLineHdrRecvBuf(const NHTTPResponseInfo* response, s32 positio
|
||||
s32 NHTTPi_skipSpaceHdrRecvBuf(const NHTTPResponseInfo* response, s32 position, s32 limit) {
|
||||
NHTTPi_HDRBUFLIST* block;
|
||||
s32 offset;
|
||||
if (position < limit) {
|
||||
FindHeaderBlock(response,position,&block,&offset);
|
||||
for(; position<limit; ++position) {
|
||||
s8 character=ReadHeaderChar(response,&block,&offset);
|
||||
if(character!=' ') return position;
|
||||
}
|
||||
if(position>=limit) return -1;
|
||||
FindHeaderBlock(response,position,&block,&offset);
|
||||
for(; position<limit; ++position) {
|
||||
s8 character=ReadHeaderChar(response,&block,&offset);
|
||||
if(character!=' ') return position;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@@ -93,35 +91,32 @@ s32 NHTTPi_loadFromHdrRecvBuf(NHTTPResponseInfo* response, char* destination, s3
|
||||
|
||||
s32 amount;
|
||||
NHTTPi_HDRBUFLIST* block;
|
||||
if (position + length <= response->headerLen) {
|
||||
if(position+length>response->headerLen) return FALSE;
|
||||
if(length) {
|
||||
if(position<1024) {
|
||||
amount=length;
|
||||
if(length>1024-position) amount=1024-position;
|
||||
NHTTPi_memcpy(destination,response->hdrBufFirst+position,amount);
|
||||
position+=amount; length-=amount; destination+=amount;
|
||||
}
|
||||
if(length) {
|
||||
if(position<1024) {
|
||||
s32 blocks;
|
||||
position-=1024;
|
||||
block=response->hdrBufBlock_p;
|
||||
blocks=position>>9;
|
||||
position&=511;
|
||||
while(blocks--) block=block->next_p;
|
||||
while(length) {
|
||||
amount=length;
|
||||
if(length>1024-position) amount=1024-position;
|
||||
NHTTPi_memcpy(destination,response->hdrBufFirst+position,amount);
|
||||
position+=amount; length-=amount; destination+=amount;
|
||||
}
|
||||
if(length) {
|
||||
s32 blocks;
|
||||
position-=1024;
|
||||
block=response->hdrBufBlock_p;
|
||||
blocks=position>>9;
|
||||
position&=511;
|
||||
while(blocks--) block=block->next_p;
|
||||
while(length) {
|
||||
amount=length;
|
||||
if(length>512-position) amount=512-position;
|
||||
NHTTPi_memcpy(destination,block->block+position,amount);
|
||||
position+=amount;
|
||||
position&=511;
|
||||
block=block->next_p;
|
||||
length-=amount; destination+=amount;
|
||||
}
|
||||
if(length>512-position) amount=512-position;
|
||||
NHTTPi_memcpy(destination,block->block+position,amount);
|
||||
position=(position+amount)&511;
|
||||
block=block->next_p;
|
||||
length-=amount; destination+=amount;
|
||||
}
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL NHTTPi_isRecvBufFull(NHTTPResponseInfo* response, u32 length) { return length>=response->recvBufLen; }
|
||||
|
||||
@@ -95,7 +95,7 @@ s32 NHTTPi_SocRecv_sub(NHTTPConnectionInfo* connection, s32 socket, void* data,
|
||||
} else return result;
|
||||
}
|
||||
if(connection->recvBufDataLen!=0) {
|
||||
length = (u32)length > connection->recvBufDataLen ? connection->recvBufDataLen : length;
|
||||
if((u32)length>connection->recvBufDataLen) length=connection->recvBufDataLen;
|
||||
NHTTPi_memcpy(data,buffer+connection->recvBufOffset,length);
|
||||
connection->recvBufDataLen-=length;
|
||||
if(connection->recvBufDataLen==0) {
|
||||
@@ -135,14 +135,10 @@ s32 NHTTPi_SocSend_sub(s32 socket, const char* data, u32 length, s32 flags) {
|
||||
if(head>length) head=length;
|
||||
NHTTPi_memcpy(buffer,data,head);
|
||||
result=SOSend(socket,buffer,head,flags);
|
||||
if (result > 0) {
|
||||
sent = result;
|
||||
if ((u32)result < head) return result;
|
||||
data += result;
|
||||
length -= result;
|
||||
} else {
|
||||
return result;
|
||||
}
|
||||
if(result<=0) return result;
|
||||
sent=result;
|
||||
if((u32)result<head) return result;
|
||||
data+=result; length-=result;
|
||||
}
|
||||
if((s32)length>0) {
|
||||
head=length&~31;
|
||||
@@ -168,7 +164,7 @@ s32 NHTTPi_SocSend_sub(s32 socket, const char* data, u32 length, s32 flags) {
|
||||
return sent;
|
||||
}
|
||||
|
||||
s32 NHTTPi_SocSend(const NHTTPRequestInfo* request, s32 socket, const void* data, s32 length, s32 flags) {
|
||||
s32 NHTTPi_SocSend(NHTTPRequestInfo* request, s32 socket, const char* data, s32 length, s32 flags) {
|
||||
s32 result;
|
||||
SSLId ssl=request->sslId;
|
||||
if(ssl>0) result=SSLWrite(ssl,data,length);
|
||||
|
||||
@@ -67,11 +67,10 @@ s32 NHTTPi_strToHex(const char* string, s32 length) {
|
||||
s32 value;
|
||||
BOOL started;
|
||||
if(length>8) return -1;
|
||||
if((length==8) & (*string>'7')) return -1;
|
||||
if((length==8) & (*string>='7')) return -1;
|
||||
value=0; started=FALSE;
|
||||
for(; length>0; --length,++string) {
|
||||
u8 rawCharacter = *(const u8*)string;
|
||||
s8 character = LowerCase((s8)rawCharacter);
|
||||
s8 character=LowerCase(*string);
|
||||
if(character>='0' && character<='9') { value=(value<<4)+character-'0'; started=TRUE; }
|
||||
else if(character>='a' && character<='f') { value=(value<<4)+character-'a'+10; started=TRUE; }
|
||||
else {
|
||||
@@ -102,25 +101,23 @@ s32 NHTTPi_strToInt(const char* string, s32 length) {
|
||||
return value;
|
||||
}
|
||||
|
||||
static inline u32 TakeDecimalDigit(u32* remaining, u32 scale) {
|
||||
u32 digit = *remaining / scale;
|
||||
*remaining -= digit * scale;
|
||||
return digit;
|
||||
}
|
||||
|
||||
s32 NHTTPi_intToStr(char* destination, u32 value) {
|
||||
u32 scales[9]={1000000000,100000000,10000000,1000000,100000,10000,1000,100,10};
|
||||
int digit;
|
||||
BOOL started;
|
||||
int digit;
|
||||
char* output;
|
||||
s32 length;
|
||||
output = destination;
|
||||
length = 0;
|
||||
started = FALSE;
|
||||
for(digit=0; digit<9; ++digit) {
|
||||
if(value>=scales[digit]) {
|
||||
u32 quotient=TakeDecimalDigit(&value, scales[digit]);
|
||||
u32 quotient=value/scales[digit];
|
||||
started=TRUE;
|
||||
destination[length++]=quotient+'0';
|
||||
} else if(started) { destination[length++]='0'; }
|
||||
++length;
|
||||
*output++=quotient+'0';
|
||||
value-=quotient*scales[digit];
|
||||
} else if(started) { *output++='0'; ++length; }
|
||||
}
|
||||
destination[length]=value+'0';
|
||||
return length+1;
|
||||
@@ -138,22 +135,18 @@ s32 NHTTPi_compareToken(const char* left, const char* right) {
|
||||
}
|
||||
|
||||
s32 NHTTPi_strtonum(const char* string, u32 length) {
|
||||
int character;
|
||||
s32 value;
|
||||
int digits;
|
||||
digits = 0;
|
||||
value = 0;
|
||||
for (; length != 0; --length, ++string) {
|
||||
u8 rawCharacter = *(const u8*)string;
|
||||
character = (s8)rawCharacter;
|
||||
if (character == ' ') continue;
|
||||
if ((character >= '0') & (character <= '9')) {
|
||||
value = value * 10 + character - '0';
|
||||
int digits=0;
|
||||
s32 value=0;
|
||||
while(length--) {
|
||||
int character=*string++;
|
||||
if(character==' ') continue;
|
||||
if((character>='0') & (character<='9')) {
|
||||
value=value*10+character-'0';
|
||||
++digits;
|
||||
if (digits > 9) return -1;
|
||||
if(digits>9) return -1;
|
||||
}
|
||||
}
|
||||
if (digits == 0) return -1;
|
||||
if(digits==0) return -1;
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
@@ -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(const NHTTPRequestInfo* request, s32 socket, const void* buffer, s32 length, s32 flags);
|
||||
s32 NHTTPi_SocSend(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,16 +986,9 @@ 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)
|
||||
{
|
||||
match.matched = TRUE;
|
||||
context->keepAlive = match.matched;
|
||||
}
|
||||
else context->keepAlive = match.matched;
|
||||
context->keepAlive = TRUE;
|
||||
else context->keepAlive = FALSE;
|
||||
}
|
||||
else context->keepAlive = FALSE;
|
||||
}
|
||||
|
||||
@@ -176,8 +176,7 @@ s32 ConvertDateToDays(u16 year, u8 month, u8 day) {
|
||||
}
|
||||
|
||||
validDate:
|
||||
daysOfYear = day - 1;
|
||||
daysOfYear += DAYS_OF_YEAR[month - 1];
|
||||
daysOfYear = day - 1 + DAYS_OF_YEAR[month - 1];
|
||||
if (month >= 3) {
|
||||
isLeapYear = 0;
|
||||
if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) {
|
||||
@@ -207,40 +206,31 @@ void ConvertDaysToDate(u16* year, u8* month, u8* day, s32 days) {
|
||||
for (;;) {
|
||||
u16 currentYear = *year;
|
||||
s32 previousDays = days;
|
||||
BOOL leapYear = TRUE;
|
||||
BOOL commonLeapYear = FALSE;
|
||||
if (currentYear % 4 == 0 && currentYear % 100 != 0) {
|
||||
commonLeapYear = TRUE;
|
||||
}
|
||||
if (!commonLeapYear && currentYear % 400 != 0) {
|
||||
leapYear = FALSE;
|
||||
}
|
||||
BOOL leapYear = (currentYear % 4 == 0 && currentYear % 100 != 0) || currentYear % 400 == 0;
|
||||
days -= 365 + (leapYear != FALSE);
|
||||
if (days < 0) {
|
||||
days = previousDays;
|
||||
break;
|
||||
}
|
||||
*year += 1;
|
||||
continue;
|
||||
*year = *year + 1;
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
s32 previousDays;
|
||||
u8 currentMonth;
|
||||
previousDays = days;
|
||||
currentMonth = *month;
|
||||
if (currentMonth == 2 && IsLeapYear(*year)) {
|
||||
days -= 29;
|
||||
s32 previousDays = days;
|
||||
if (*month == 2) {
|
||||
BOOL leapYear = IsLeapYear(*year);
|
||||
if (leapYear) {
|
||||
days -= 29;
|
||||
} else {
|
||||
days -= DAYS_OF_MONTH[*month - 1];
|
||||
}
|
||||
} else {
|
||||
days -= DAYS_OF_MONTH[currentMonth - 1];
|
||||
days -= DAYS_OF_MONTH[*month - 1];
|
||||
}
|
||||
if (days >= 0) {
|
||||
*month += 1;
|
||||
} else {
|
||||
days = previousDays;
|
||||
break;
|
||||
if (days < 0) {
|
||||
*day += previousDays;
|
||||
return;
|
||||
}
|
||||
*month = *month + 1;
|
||||
}
|
||||
|
||||
*day += days;
|
||||
}
|
||||
|
||||
@@ -555,14 +555,14 @@ NWC24Err NWC24iMBoxFlushHeader(NWC24MBoxType type) {
|
||||
return result != NWC24_OK ? result : closeResult;
|
||||
}
|
||||
|
||||
static inline void GetOldestMsgId(const MBCHeader* header, volatile u32* id) {
|
||||
static inline void GetOldestMsgId(const MBCHeader* header, u32* id) {
|
||||
*id = header->oldestId;
|
||||
}
|
||||
|
||||
NWC24Err NWC24iMBoxCheck(NWC24MBoxType type, u32 size) {
|
||||
u32 required;
|
||||
struct {
|
||||
volatile u32 oldestId;
|
||||
u32 oldestId;
|
||||
MBCHeader* header;
|
||||
} mailbox;
|
||||
NWC24Err err;
|
||||
|
||||
@@ -231,11 +231,11 @@ static NWC24Err QEncode(char* encoded, u32 encodedCapacity, u32* encodedSize, u8
|
||||
}
|
||||
|
||||
static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, char* encoded, u32 encodedSize, u32* encodedSizeOut, int flags) {
|
||||
u32 encodedOffset;
|
||||
u32 decodedOffset = 0;
|
||||
u8 value = 0;
|
||||
u32 encodedOffset;
|
||||
char* input;
|
||||
char* output;
|
||||
u8 value = 0;
|
||||
NWC24Err result = NWC24_OK;
|
||||
|
||||
if (decoded == NULL)
|
||||
@@ -255,7 +255,7 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
|
||||
input = encoded;
|
||||
output = decoded;
|
||||
for (encodedOffset = 0; encodedOffset < encodedSize; encodedOffset++) {
|
||||
if (decodedOffset >= decodedCapacity) {
|
||||
if (decodedCapacity <= decodedOffset) {
|
||||
result = NWC24_ERR_OVERFLOW;
|
||||
break;
|
||||
}
|
||||
@@ -265,15 +265,15 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
|
||||
decodedOffset++;
|
||||
} else if (*input == '=' && encodedOffset + 2 < encodedSize) {
|
||||
BOOL validHex = TRUE;
|
||||
input++;
|
||||
encodedOffset++;
|
||||
if (*input == ' ' || *input == '\t') {
|
||||
char* next = input + 1;
|
||||
u32 inputAfterEqual = encodedOffset + 1;
|
||||
char* current = ++input;
|
||||
if (*current == ' ' || *current == '\t') {
|
||||
char* next = current + 1;
|
||||
u32 scan = 1;
|
||||
while (encodedOffset + scan + 1 < encodedSize) {
|
||||
while (inputAfterEqual + scan + 1 < encodedSize) {
|
||||
if (*next == '\r' && next[1] == '\n') {
|
||||
encodedOffset += scan;
|
||||
input = next;
|
||||
inputAfterEqual += scan;
|
||||
current = next;
|
||||
break;
|
||||
}
|
||||
if (*next != ' ' && *next != '\t') {
|
||||
@@ -283,27 +283,29 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
|
||||
scan++;
|
||||
}
|
||||
}
|
||||
if (*input == '\r' && input[1] == '\n') {
|
||||
input += 2;
|
||||
encodedOffset++;
|
||||
if (*current == '\r' && current[1] == '\n') {
|
||||
current += 2;
|
||||
encodedOffset = inputAfterEqual + 1;
|
||||
input = current;
|
||||
} else {
|
||||
int high = Util_xtoi(*input);
|
||||
int high = Util_xtoi(*current);
|
||||
int low;
|
||||
if (high >= 0) {
|
||||
value = (high & 0x0F) << 4;
|
||||
}
|
||||
if (high < 0) { validHex = FALSE; }
|
||||
low = Util_xtoi(input[1]);
|
||||
low = Util_xtoi(current[1]);
|
||||
if (low >= 0) {
|
||||
value |= low & 0x0F;
|
||||
}
|
||||
if (low < 0) { validHex = FALSE; }
|
||||
input += 2;
|
||||
current += 2;
|
||||
if (validHex) {
|
||||
*output++ = (char)value;
|
||||
decodedOffset++;
|
||||
}
|
||||
encodedOffset++;
|
||||
encodedOffset = inputAfterEqual + 1;
|
||||
input = current;
|
||||
}
|
||||
} else {
|
||||
*output++ = *input++;
|
||||
@@ -499,42 +501,22 @@ static BOOL CopyWithoutLinearWhiteSpaces(char* output, int* outputSize, char* in
|
||||
}
|
||||
|
||||
static inline char* FindMarker(char* input, u32 size, const char* marker) {
|
||||
u32 markerLength = Mail_strlen(marker);
|
||||
u32 offset;
|
||||
u32 markerLength;
|
||||
markerLength = Mail_strlen(marker);
|
||||
for (offset = 0; offset <= size; offset++) {
|
||||
char* current = input + offset;
|
||||
if (Mail_strncmp(current, marker, markerLength) == 0)
|
||||
return input + offset;
|
||||
return current;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
static inline char* FindMarkerAfterPrefix(char* input, u32 size, u32 prefix, const char* marker) {
|
||||
char* current;
|
||||
u32 markerLength = Mail_strlen(marker);
|
||||
char* current = input + prefix;
|
||||
u32 offset;
|
||||
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;
|
||||
}
|
||||
current++;
|
||||
}
|
||||
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;
|
||||
return input + offset + prefix;
|
||||
}
|
||||
current++;
|
||||
}
|
||||
@@ -542,28 +524,14 @@ static inline char* FindEncodingMarker(char* encoded, u32 size) {
|
||||
}
|
||||
|
||||
static inline NWC24Err ExtractWordEncoding(char* encoding, u32* encodingSize, char* encoded, u32 encodedSize) {
|
||||
char* delimiter = FindEncodingMarker(encoded, encodedSize);
|
||||
char* delimiter = FindMarkerAfterPrefix(encoded, encodedSize, 0, "?");
|
||||
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;
|
||||
@@ -580,6 +548,7 @@ 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;
|
||||
@@ -605,7 +574,15 @@ static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded
|
||||
}
|
||||
decodedLength = localSize;
|
||||
if (encodedWord != NULL) {
|
||||
if (IsLinearWhitespaceOnly(decoded, localSize)) {
|
||||
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) {
|
||||
*decoded = '\0';
|
||||
decodedLength = 1;
|
||||
}
|
||||
@@ -718,9 +695,8 @@ static NWC24Err ExtractCharset(char* charset, u32 charsetCapacity, u32* charsetS
|
||||
return NWC24_OK;
|
||||
}
|
||||
static inline char* FindMarkerOffsetPrefix(char* input, u32 size, u32 prefix, const char* marker) {
|
||||
u32 markerLength = Mail_strlen(marker);
|
||||
u32 offset;
|
||||
u32 markerLength;
|
||||
markerLength = Mail_strlen(marker);
|
||||
for (offset = 0; offset <= size; offset++) {
|
||||
if (Mail_strncmp(input + offset + prefix, marker, markerLength) == 0) {
|
||||
return input + prefix + offset;
|
||||
|
||||
@@ -202,40 +202,33 @@ static inline NWC24Err WriteMBNoReplyField(NWC24MsgObjPrivate* msg) {
|
||||
return err;
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
u32 flags;
|
||||
char* buffer;
|
||||
} MBFieldWork;
|
||||
|
||||
static inline NWC24Err WriteMBRegDateField(NWC24MsgObjPrivate* msg) {
|
||||
MBFieldWork field;
|
||||
static inline NWC24Err WriteMBRegDateField(NWC24MsgObjPrivate* msg, u32 flags) {
|
||||
NWC24Err err;
|
||||
s32 length;
|
||||
field.flags = msg->msgBoardFlags.raw & 0xFFFF;
|
||||
if (!field.flags)
|
||||
char* buffer;
|
||||
if (!flags)
|
||||
return NWC24_OK;
|
||||
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);
|
||||
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);
|
||||
if (err == NWC24_OK)
|
||||
msg->length += length;
|
||||
return err;
|
||||
}
|
||||
|
||||
static inline NWC24Err WriteMBDelayField(NWC24MsgObjPrivate* msg) {
|
||||
MBFieldWork field;
|
||||
static inline NWC24Err WriteMBDelayField(NWC24MsgObjPrivate* msg, u32 flags) {
|
||||
NWC24Err err;
|
||||
s32 length;
|
||||
field.flags = msg->msgBoardFlags.raw & 0xFF0000;
|
||||
if (!field.flags)
|
||||
char* buffer;
|
||||
if (!flags)
|
||||
return NWC24_OK;
|
||||
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);
|
||||
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);
|
||||
if (err == NWC24_OK)
|
||||
msg->length += length;
|
||||
return err;
|
||||
@@ -313,8 +306,8 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
CHECK_WRITE(WriteIconNewField(msg));
|
||||
if (msg->msgBoardFlags.raw != 0) {
|
||||
CHECK_WRITE(WriteMBNoReplyField(msg));
|
||||
CHECK_WRITE(WriteMBRegDateField(msg));
|
||||
CHECK_WRITE(WriteMBDelayField(msg));
|
||||
{ u16 dateFlags = msg->msgBoardFlags.raw; CHECK_WRITE(WriteMBRegDateField(msg, dateFlags)); }
|
||||
CHECK_WRITE(WriteMBDelayField(msg, msg->msgBoardFlags.raw & 0xFF0000));
|
||||
}
|
||||
}
|
||||
CHECK_WRITE(WriteExtraFields(msg));
|
||||
|
||||
@@ -19,7 +19,7 @@ static inline NWC24Err SelectMBox(const NWC24MsgObjPrivate* msg, NWC24MBoxType*
|
||||
}
|
||||
|
||||
NWC24Err NWC24ReadMsgField(const NWC24MsgObj* msg, char* fieldName, u8* output, u32 capacity) {
|
||||
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
|
||||
const NWC24MsgObjPrivate* privateMsg = (const 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) {
|
||||
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
|
||||
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
|
||||
NWC24MBoxType type;
|
||||
NWC24File file;
|
||||
NWC24FileStream stream;
|
||||
@@ -312,7 +312,7 @@ NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacit
|
||||
}
|
||||
|
||||
NWC24Err NWC24ReadMsgSubject(const NWC24MsgObj* msg, char* subject, u32 capacity) {
|
||||
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
|
||||
const NWC24MsgObjPrivate* privateMsg = (const 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) {
|
||||
u32 length;
|
||||
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
|
||||
NWC24MBoxType type;
|
||||
NWC24File file;
|
||||
NWC24Err result, closeResult;
|
||||
NWC24Err overflow = NWC24_OK;
|
||||
char* buffer;
|
||||
u32 length;
|
||||
u32 decodedSize;
|
||||
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
|
||||
char* buffer;
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
if (!(privateMsg->type & 0x200))
|
||||
@@ -408,15 +408,13 @@ static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capa
|
||||
return result;
|
||||
}
|
||||
length = privateMsg->textSize;
|
||||
switch (length) {
|
||||
case 0: length = privateMsg->text.size; break;
|
||||
default: break;
|
||||
}
|
||||
if (length == 0)
|
||||
length = privateMsg->text.size;
|
||||
if (length == 0)
|
||||
return NWC24_ERR_NULL;
|
||||
if (length > capacity - 1) {
|
||||
length = capacity - 1;
|
||||
overflow = NWC24_ERR_OVERFLOW;
|
||||
length = capacity - 1;
|
||||
}
|
||||
result = NWC24iMBoxOpenStoredMsg(type, privateMsg->msgId, &file);
|
||||
switch (result) {
|
||||
@@ -452,16 +450,13 @@ static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capa
|
||||
result = NWC24FRead(text, length, &file);
|
||||
text[length] = 0;
|
||||
break;
|
||||
case 2: {
|
||||
NWC24Err decodeResult;
|
||||
case 2:
|
||||
decodedSize = 0;
|
||||
decodeResult = ReadBase64Data(&file, &privateMsg->text, (u8*)text, length, &decodedSize);
|
||||
if (decodeResult == NWC24_OK && decodedSize != privateMsg->textSize)
|
||||
decodeResult = NWC24_ERR_FORMAT;
|
||||
result = decodeResult;
|
||||
result = ReadBase64Data(&file, &privateMsg->text, (u8*)text, length, &decodedSize);
|
||||
if (result == NWC24_OK && decodedSize != privateMsg->textSize)
|
||||
result = NWC24_ERR_FORMAT;
|
||||
text[length] = 0;
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
result = ReadQPText(privateMsg, &file, text, length);
|
||||
break;
|
||||
@@ -473,15 +468,15 @@ static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capa
|
||||
}
|
||||
close:
|
||||
closeResult = NWC24iMBoxCloseMsg(&file);
|
||||
if (result != NWC24_OK)
|
||||
closeResult = result;
|
||||
if (closeResult != NWC24_OK)
|
||||
overflow = closeResult;
|
||||
return overflow;
|
||||
if (result == NWC24_OK)
|
||||
result = closeResult;
|
||||
if (result == NWC24_OK)
|
||||
result = overflow;
|
||||
return result;
|
||||
}
|
||||
|
||||
NWC24Err NWC24ReadMsgAttached(const NWC24MsgObj* msg, u32 index, u8* output, u32 capacity) {
|
||||
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
|
||||
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
|
||||
NWC24File file;
|
||||
NWC24MBoxType type;
|
||||
u32 decodedSize;
|
||||
@@ -510,8 +505,11 @@ NWC24Err NWC24ReadMsgAttached(const NWC24MsgObj* msg, u32 index, u8* output, u32
|
||||
}
|
||||
decodedSize = 0;
|
||||
result = ReadBase64Data(&file, &privateMsg->attached[index], output, capacity, &decodedSize);
|
||||
if (result == NWC24_OK) {
|
||||
if (decodedSize != ((const NWC24MsgObjPrivate*)msg)->attachedSize[index]) result = NWC24_ERR_FORMAT;
|
||||
switch (result) {
|
||||
case NWC24_OK:
|
||||
if (decodedSize != privateMsg->attachedSize[index]) { result = NWC24_ERR_FORMAT; }
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
closeResult = NWC24iMBoxCloseMsg(&file);
|
||||
if (result == NWC24_OK)
|
||||
|
||||
@@ -743,16 +743,15 @@ NWC24Err NWC24iSetMsgSubjectQP(NWC24MsgObj* msg, const u16* subject, u32 subject
|
||||
u32 workSize, NWC24Charset charset, char* charsetName) {
|
||||
u32 workHalf;
|
||||
u32 sourceOffset;
|
||||
u32 charsetLength;
|
||||
u32 secondSize;
|
||||
u8* second;
|
||||
u32 subjectLength;
|
||||
u32 lineLength;
|
||||
u32 secondSize;
|
||||
u32 outputLength;
|
||||
u32 total;
|
||||
u32 combinedLength;
|
||||
u32 i;
|
||||
u32 outputLength;
|
||||
u32 firstCharsetLength;
|
||||
u32 charsetLength;
|
||||
NWC24Err result;
|
||||
|
||||
secondSize = workSize - (workSize >> 1);
|
||||
@@ -771,8 +770,8 @@ NWC24Err NWC24iSetMsgSubjectQP(NWC24MsgObj* msg, const u16* subject, u32 subject
|
||||
work[i] = ' ';
|
||||
}
|
||||
}
|
||||
firstCharsetLength = strlen(charsetName);
|
||||
NWC24iDetectBreakPoint(&lineLength, charset, work, subjectLength, (0x38 - firstCharsetLength) / 3);
|
||||
charsetLength = strlen(charsetName);
|
||||
NWC24iDetectBreakPoint(&lineLength, charset, work, subjectLength, (0x38 - charsetLength) / 3);
|
||||
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'Q', work, lineLength);
|
||||
switch (result) {
|
||||
default:
|
||||
@@ -817,9 +816,9 @@ done:
|
||||
|
||||
NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 subjectSize, NWC24EncodingRegion region, u16 alternative, u8* work,
|
||||
u32 workSize, NWC24Charset charset, char* charsetName) {
|
||||
u8* second;
|
||||
u32 secondSize;
|
||||
u32 workHalf;
|
||||
u32 secondSize;
|
||||
u8* second;
|
||||
u32 subjectLength;
|
||||
u32 lineLength;
|
||||
u32 sourceOffset;
|
||||
@@ -828,22 +827,18 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
|
||||
u32 charsetLength;
|
||||
NWC24Err result;
|
||||
|
||||
second = work + (workSize >> 1);
|
||||
secondSize = workSize - (workSize >> 1);
|
||||
workHalf = workSize >> 1;
|
||||
secondSize = workSize - workHalf;
|
||||
second = work + workHalf;
|
||||
charsetLength = strlen(charsetName);
|
||||
lineLength = ((0x36 - charsetLength) * 3) >> 2;
|
||||
if (lineLength > (workSize >> 1)) {
|
||||
if (lineLength > workHalf) {
|
||||
result = NWC24_ERR_OVERFLOW;
|
||||
} else {
|
||||
workHalf = lineLength + 1;
|
||||
subjectLength = subjectSize;
|
||||
result = NWC24iConvertFromInternalEncoding(work, &workHalf, subject, &subjectLength, charsetName, 0x40, region, alternative);
|
||||
if (result != NWC24_OK) {
|
||||
switch (result) {
|
||||
case NWC24_ERR_OVERFLOW: break;
|
||||
default: goto done;
|
||||
}
|
||||
}
|
||||
switch (result) { case NWC24_OK: case NWC24_ERR_OVERFLOW: break; default: goto done; }
|
||||
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
|
||||
switch (result) { case NWC24_OK: break; default: goto done; }
|
||||
{
|
||||
@@ -854,7 +849,7 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
|
||||
charsetLength = strlen(charsetName);
|
||||
lineLength = (((0x3E - charsetLength) * 3) >> 2) + 1;
|
||||
total = outputLength - 1;
|
||||
for (; sourceOffset < subjectSize;) {
|
||||
for (; sourceOffset < subjectSize; sourceOffset += subjectLength) {
|
||||
subjectLength = subjectSize - sourceOffset;
|
||||
workHalf = lineLength;
|
||||
if (secondSize - total < 3) {
|
||||
@@ -866,15 +861,9 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
|
||||
second[total++] = ' ';
|
||||
result = NWC24iConvertFromInternalEncoding(work, &workHalf, subject + sourceOffset, &subjectLength, charsetName, 0x40, region,
|
||||
alternative);
|
||||
if (result != NWC24_OK) {
|
||||
switch (result) {
|
||||
case NWC24_ERR_OVERFLOW: break;
|
||||
default: goto done;
|
||||
}
|
||||
}
|
||||
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);
|
||||
switch (result) { case NWC24_OK: break; default: goto done; }
|
||||
sourceOffset += subjectLength;
|
||||
total = total + outputLength - 1;
|
||||
}
|
||||
result = NWC24SetMsgSubject(msg, (char*)second, total);
|
||||
|
||||
@@ -47,130 +47,95 @@ s32 SOGetHostID(void) {
|
||||
return address;
|
||||
}
|
||||
|
||||
static inline int GetHostReply(const char* name, s32* rm, SOHostEnt** host) {
|
||||
SOHostEnt* SOGetHostByName(const char* name) {
|
||||
HostReply* reply;
|
||||
int length;
|
||||
char* request;
|
||||
int result;
|
||||
int size;
|
||||
if (!name) return -28;
|
||||
length = strlen(name);
|
||||
size = (length + 32) & ~31;
|
||||
request = SOiAlloc(12, size);
|
||||
reply = SOiGetSysWork()->host;
|
||||
if (!request) return -49;
|
||||
strcpy(request, name);
|
||||
result = IOS_Ioctl(*rm, 17, request, length + 1, reply, 0x460);
|
||||
if (result >= 0) {
|
||||
int displacement = (int)reply->nameStorage - (int)reply->host.name;
|
||||
u8** address = reply->addresses;
|
||||
while (*address) { *address += displacement; ++address; }
|
||||
reply->host.aliases = (char**)((u8*)reply->host.aliases + displacement);
|
||||
*host = &reply->host;
|
||||
reply->host.name += displacement;
|
||||
reply->host.addrList = (u8**)((u8*)reply->host.addrList + displacement);
|
||||
}
|
||||
SOiFree(12, request, size);
|
||||
return result;
|
||||
}
|
||||
|
||||
SOHostEnt* SOGetHostByName(const char* name) {
|
||||
SOHostEnt* host = NULL;
|
||||
int length;
|
||||
SOHostEnt* host;
|
||||
s32 rm;
|
||||
int result;
|
||||
if ((result = SOiPrepare(NULL, &rm)) == 0) {
|
||||
result = GetHostReply(name, &rm, &host);
|
||||
SOiConclude(NULL, result);
|
||||
char* request;
|
||||
host = NULL;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
if(!name) result=-28;
|
||||
else {
|
||||
length=strlen(name);
|
||||
size=(length+32)&~31;
|
||||
request=SOiAlloc(12,size);
|
||||
reply=SOiGetSysWork()->host;
|
||||
if(!request) result=-49;
|
||||
else {
|
||||
strcpy(request,name);
|
||||
result=IOS_Ioctl(rm,17,request,length+1,reply,0x460);
|
||||
if(result>=0) {
|
||||
int displacement=(int)reply->nameStorage-(int)reply->host.name;
|
||||
u8** address=reply->addresses;
|
||||
while(*address) { *address+=displacement; ++address; }
|
||||
reply->host.aliases=(char**)((u8*)reply->host.aliases+displacement);
|
||||
host=&reply->host;
|
||||
reply->host.name+=displacement;
|
||||
reply->host.addrList=(u8**)((u8*)reply->host.addrList+displacement);
|
||||
}
|
||||
SOiFree(12,request,size);
|
||||
}
|
||||
}
|
||||
SOiConclude(NULL,result);
|
||||
}
|
||||
return host;
|
||||
}
|
||||
|
||||
static inline int NameSize(const char* name) {
|
||||
if (name == NULL) {
|
||||
return 0;
|
||||
} else {
|
||||
return strlen(name) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
static inline int NameLength(const char* name) {
|
||||
if (name == NULL) {
|
||||
return 0;
|
||||
} else {
|
||||
return strlen(name);
|
||||
}
|
||||
}
|
||||
|
||||
static inline int ServiceSize(const char* node, const char* service) {
|
||||
if (service == NULL) {
|
||||
return 0;
|
||||
} else {
|
||||
return strlen(node) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
static inline int GetAddressReply(const char* nodeName, const char* servName, const SOAddrInfo* hints,
|
||||
SOAddrInfo** resultInfo, s32* rm) {
|
||||
SOAddrInfo* requestHints;
|
||||
AddrInfoRequest* request;
|
||||
char* service;
|
||||
int nodeLength;
|
||||
AddrInfoReply* reply;
|
||||
int size;
|
||||
char* node;
|
||||
int serviceLength;
|
||||
int result;
|
||||
serviceLength = ServiceSize(nodeName, servName);
|
||||
nodeLength = NameSize(nodeName);
|
||||
size=(((nodeLength+31)&~31)+((serviceLength+31)&~31)+95)&~31;
|
||||
request=SOiAlloc(12,size);
|
||||
if(!request) result=-49;
|
||||
else {
|
||||
reply=SOiAlloc(10,0x840);
|
||||
if(!reply) { SOiFree(12,request,size); result=-49; }
|
||||
else {
|
||||
node=(char*)request->storage;
|
||||
service=node+((NameSize(nodeName)+31)&~31);
|
||||
requestHints=(SOAddrInfo*)(service+((ServiceSize(nodeName, servName)+31)&~31));
|
||||
if(nodeName) strcpy(node,nodeName);
|
||||
request->vectors[0].base=nodeName ? (u8*)node : NULL;
|
||||
request->vectors[0].length=NameLength(nodeName);
|
||||
if(servName) strcpy(service,servName);
|
||||
request->vectors[1].base=servName ? (u8*)service : NULL;
|
||||
request->vectors[1].length=NameLength(servName);
|
||||
if(hints) memcpy(requestHints,hints,32);
|
||||
else memset(requestHints,0,32);
|
||||
if(requestHints->family==0) requestHints->family=2;
|
||||
if(requestHints->family==23) {
|
||||
*resultInfo=NULL; result=-68; SOiFree(10,reply,0x840);
|
||||
} else {
|
||||
request->vectors[2].base=(u8*)requestHints; request->vectors[2].length=32;
|
||||
request->vectors[3].base=(u8*)reply; request->vectors[3].length=0x834;
|
||||
result=IOS_Ioctlv(*rm,24,3,1,request->vectors);
|
||||
if(result>=0) {
|
||||
SOAddrInfo* entry=reply->entries;
|
||||
u8* address=reply->addresses;
|
||||
*resultInfo=entry;
|
||||
while(entry) {
|
||||
entry->addr=address;
|
||||
if(entry->next) entry->next=entry+1;
|
||||
entry=entry->next;
|
||||
address+=28;
|
||||
}
|
||||
} else { *resultInfo=NULL; SOiFree(10,reply,0x840); }
|
||||
}
|
||||
SOiFree(12,request,size);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
static int NameSize(const char* name) { return name ? strlen(name)+1 : 0; }
|
||||
|
||||
int SOGetAddrInfo(const char* nodeName, const char* servName, const SOAddrInfo* hints, SOAddrInfo** resultInfo) {
|
||||
s32 rm;
|
||||
int result;
|
||||
if ((result = SOiPrepare(NULL, &rm)) == 0) {
|
||||
result = GetAddressReply(nodeName, servName, hints, resultInfo, &rm);
|
||||
result = SOiConclude(NULL, result);
|
||||
int result,size;
|
||||
AddrInfoRequest* request;
|
||||
AddrInfoReply* reply;
|
||||
char* node;
|
||||
char* service;
|
||||
SOAddrInfo* requestHints;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
size=(((NameSize(nodeName)+31)&~31)+((servName ? strlen(nodeName)+32 : 31)&~31)+95)&~31;
|
||||
request=SOiAlloc(12,size);
|
||||
if(!request) result=-49;
|
||||
else {
|
||||
reply=SOiAlloc(10,0x840);
|
||||
if(!reply) { SOiFree(12,request,size); result=-49; }
|
||||
else {
|
||||
node=(char*)request->storage;
|
||||
service=node+((NameSize(nodeName)+31)&~31);
|
||||
requestHints=(SOAddrInfo*)(service+((servName ? strlen(nodeName)+32 : 31)&~31));
|
||||
if(nodeName) strcpy(node,nodeName);
|
||||
request->vectors[0].base=nodeName ? (u8*)node : NULL;
|
||||
request->vectors[0].length=nodeName ? strlen(nodeName) : 0;
|
||||
if(servName) strcpy(service,servName);
|
||||
request->vectors[1].base=servName ? (u8*)service : NULL;
|
||||
request->vectors[1].length=servName ? strlen(servName) : 0;
|
||||
if(hints) memcpy(requestHints,hints,32);
|
||||
else memset(requestHints,0,32);
|
||||
if(requestHints->family==0) requestHints->family=2;
|
||||
if(requestHints->family==23) {
|
||||
*resultInfo=NULL; result=-68; SOiFree(10,reply,0x840);
|
||||
} else {
|
||||
request->vectors[2].base=(u8*)requestHints; request->vectors[2].length=32;
|
||||
request->vectors[3].base=(u8*)reply; request->vectors[3].length=0x834;
|
||||
result=IOS_Ioctlv(rm,24,3,1,request->vectors);
|
||||
if(result>=0) {
|
||||
SOAddrInfo* entry=reply->entries;
|
||||
u8* address=reply->addresses;
|
||||
*resultInfo=entry;
|
||||
while(entry) {
|
||||
entry->addr=address;
|
||||
if(entry->next) entry->next=entry+1;
|
||||
entry=entry->next;
|
||||
address+=28;
|
||||
}
|
||||
} else { *resultInfo=NULL; SOiFree(10,reply,0x840); }
|
||||
}
|
||||
SOiFree(12,request,size);
|
||||
}
|
||||
}
|
||||
result=SOiConclude(NULL,result);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -17,19 +17,14 @@ typedef struct SocketOption {
|
||||
u8 value[20];
|
||||
} SocketOption;
|
||||
|
||||
typedef union InterfaceCommand {
|
||||
struct { int level; int option; };
|
||||
u8 bytes[32];
|
||||
} InterfaceCommand;
|
||||
|
||||
typedef union InterfaceLength {
|
||||
int length;
|
||||
u8 bytes[32];
|
||||
} InterfaceLength;
|
||||
typedef struct InterfaceCommand { int level; int option; } InterfaceCommand;
|
||||
|
||||
typedef struct InterfaceOption {
|
||||
IOSIoVector vectors[4];
|
||||
InterfaceCommand command;
|
||||
union {
|
||||
InterfaceCommand command;
|
||||
u8 commandBlock[32];
|
||||
};
|
||||
union {
|
||||
int length;
|
||||
u8 lengthBlock[32];
|
||||
@@ -39,7 +34,10 @@ typedef struct InterfaceOption {
|
||||
|
||||
typedef struct InterfaceSetting {
|
||||
IOSIoVector vectors[4];
|
||||
InterfaceCommand command;
|
||||
union {
|
||||
InterfaceCommand command;
|
||||
u8 commandBlock[32];
|
||||
};
|
||||
u8 value[1];
|
||||
} InterfaceSetting;
|
||||
|
||||
@@ -98,9 +96,9 @@ static int OptionLength(int* length) {
|
||||
int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int* length) {
|
||||
s32 rm;
|
||||
int temporary;
|
||||
int size;
|
||||
int result;
|
||||
InterfaceOption* request;
|
||||
int result;
|
||||
int size;
|
||||
InterfaceCommand* command;
|
||||
int* returnedLength;
|
||||
u8* reply;
|
||||
@@ -113,8 +111,8 @@ int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int*
|
||||
else {
|
||||
command=&request->command;
|
||||
command->level=level; command->option=option;
|
||||
returnedLength=&((InterfaceLength*)(command + 1))->length;
|
||||
reply=(u8*)((InterfaceLength*)returnedLength + 1);
|
||||
returnedLength=&request->length;
|
||||
reply=request->value;
|
||||
*returnedLength=OptionLength(length);
|
||||
request->vectors[0].base=(u8*)command;
|
||||
request->vectors[0].length=8;
|
||||
@@ -140,9 +138,9 @@ int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int*
|
||||
int SOSetInterfaceOpt(void* interface, int level, int option, const void* value, int length) {
|
||||
s32 rm;
|
||||
int temporary;
|
||||
int size;
|
||||
int result;
|
||||
InterfaceSetting* request;
|
||||
int result;
|
||||
int size;
|
||||
InterfaceCommand* command;
|
||||
u8* reply;
|
||||
if ((result=SOiPrepareTempRm(NULL,&rm,&temporary))==0) {
|
||||
@@ -154,7 +152,7 @@ int SOSetInterfaceOpt(void* interface, int level, int option, const void* value,
|
||||
else {
|
||||
command=&request->command;
|
||||
command->level=level; command->option=option;
|
||||
reply=(u8*)(command + 1);
|
||||
reply=request->value;
|
||||
if(value) memcpy(reply,value,length);
|
||||
else memset(reply,0,length);
|
||||
request->vectors[0].base=(u8*)command; request->vectors[0].length=8;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#define BS2_MACH_VOLATILE_DVD_STATE
|
||||
#define BS2_MACH_FIVE_ARG_READ
|
||||
#include "BS2/BS2.h"
|
||||
#include "BS2/BS2BringUp.h"
|
||||
@@ -65,7 +64,7 @@ volatile int CacheFailed = 0;
|
||||
volatile int RegionValid = 0;
|
||||
volatile int NandPending = 0;
|
||||
vu32 CancelNand = 0;
|
||||
vu32 LowReadResult = 0;
|
||||
u32 LowReadResult = 0;
|
||||
u32 CacheCommandComplete = 0;
|
||||
u32 AudioBufferUnconfigured = 0;
|
||||
u64 ResetTime = 0;
|
||||
@@ -578,7 +577,7 @@ void BS2StartGame() {
|
||||
u32 (*entry)(void);
|
||||
|
||||
StartingGame = TRUE;
|
||||
while (CoverBlock.state != DVD_STATE_IDLE) {
|
||||
while (DVDGetCommandBlockStatus(&CoverBlock) != DVD_STATE_IDLE) {
|
||||
}
|
||||
|
||||
BS2Report("BS2StartGame(1)\n");
|
||||
@@ -678,6 +677,8 @@ void BS2StartGame() {
|
||||
LowReadResult = 0;
|
||||
DVDLowReadDiskID(&DiskID, (DVDLowCallback)callback);
|
||||
while (LowReadResult == 0) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
|
||||
status = LowReadResult;
|
||||
@@ -692,6 +693,8 @@ 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) {
|
||||
@@ -726,6 +729,8 @@ disk_done:
|
||||
(DVDLowCallback)callback);
|
||||
}
|
||||
while (LowReadResult == 0) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
|
||||
status = LowReadResult;
|
||||
@@ -743,6 +748,8 @@ disk_done:
|
||||
LowReadResult = 0;
|
||||
DVDLowRequestError((DVDLowCallback)callback);
|
||||
while (LowReadResult == 0) {
|
||||
BOOL enabled = OSDisableInterrupts();
|
||||
OSRestoreInterrupts(enabled);
|
||||
}
|
||||
driveError = DVDLowGetImmBufferReg() & 0xFF000000;
|
||||
if (driveError == 0x01000000 || (driveError = DVDLowGetImmBufferReg() & 0xFF000000) == 0x03000000) {
|
||||
|
||||
@@ -9,12 +9,16 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
static u32 Flags0[BS2_UPDATE_ENTRY_COUNT] = {0};
|
||||
static u32 Flags1[BS2_UPDATE_ENTRY_COUNT] = {0};
|
||||
static OSThread Thread = {0};
|
||||
static u8 ThreadStack[4096] = {0};
|
||||
static BS2UpdateHeader UpdateHeader0 ALIGN32 = {0};
|
||||
static BS2UpdateHeader UpdateHeader1 ALIGN32 = {0};
|
||||
typedef struct UpdateThreadData {
|
||||
OSThread thread;
|
||||
u8 stack[4096];
|
||||
} UpdateThreadData;
|
||||
|
||||
static u32 Flags0[BS2_UPDATE_ENTRY_COUNT];
|
||||
static u32 Flags1[BS2_UPDATE_ENTRY_COUNT];
|
||||
static UpdateThreadData Thread;
|
||||
static BS2UpdateHeader UpdateHeader0 ALIGN32;
|
||||
static BS2UpdateHeader UpdateHeader1 ALIGN32;
|
||||
|
||||
#define UPDATE_DISC_ENTRIES ((BS2UpdateEntry*)0x80480000)
|
||||
|
||||
@@ -22,25 +26,25 @@ s32 WADCheckImport(u64 titleId, u16 titleVersion);
|
||||
s32 WADImportDVDForBS(const char* path, void* buffer, u32 length);
|
||||
s32 WADImportDVDExForBS(const char* path, void* buffer, u32 length);
|
||||
|
||||
static BS2UpdateEntry* pEntries = NULL;
|
||||
static u32 EntriesCount = 0;
|
||||
static u32* pFlags = NULL;
|
||||
static void* MemAllocator = NULL;
|
||||
int State = 0;
|
||||
BS2UpdateEntry* CurrentEntry = 0;
|
||||
static u32 RebootRequired = 0;
|
||||
static BOOL ContainsSeatTitles = 0;
|
||||
static u32 UpdateImportState = 0;
|
||||
static u32 UpdateImportResult = 0;
|
||||
u32 StartUpdate = 0;
|
||||
u32 CancelUpdate = 0;
|
||||
static u32 UpdateProgress = 0;
|
||||
static volatile s32 rc = 0;
|
||||
static u64 VersionIOS = 0;
|
||||
static u32 VersionMEM2 = 0;
|
||||
static u32 VersionES = 0;
|
||||
static u32 ConsoleType = 0;
|
||||
static void* FatalFunc = NULL;
|
||||
static BS2UpdateEntry* pEntries;
|
||||
static u32 EntriesCount;
|
||||
static u32* pFlags;
|
||||
static void* MemAllocator;
|
||||
int State;
|
||||
BS2UpdateEntry* CurrentEntry;
|
||||
static u32 RebootRequired;
|
||||
static BOOL ContainsSeatTitles;
|
||||
static u32 UpdateImportState;
|
||||
static u32 UpdateImportResult;
|
||||
u32 StartUpdate;
|
||||
u32 CancelUpdate;
|
||||
static u32 UpdateProgress;
|
||||
static s32 rc;
|
||||
static u64 VersionIOS;
|
||||
static u32 VersionMEM2;
|
||||
static u32 VersionES;
|
||||
static u32 ConsoleType;
|
||||
static void* FatalFunc;
|
||||
|
||||
#pragma force_active on
|
||||
char* getSuffix(const char* path) {
|
||||
@@ -72,9 +76,9 @@ void BS2UpdateInit(void* allocator) {
|
||||
memset(EntriesToImport, 0, 0x40000);
|
||||
memset(Flags1, 0, sizeof(Flags1));
|
||||
BS2Report("Create update thread\n");
|
||||
OSCreateThread(&Thread, UpdateThread, NULL, ThreadStack + sizeof(ThreadStack),
|
||||
sizeof(ThreadStack), 31, 1);
|
||||
OSResumeThread(&Thread);
|
||||
OSCreateThread(&Thread.thread, UpdateThread, NULL, Thread.stack + sizeof(Thread.stack),
|
||||
sizeof(Thread.stack), 31, 1);
|
||||
OSResumeThread(&Thread.thread);
|
||||
}
|
||||
|
||||
static void* UpdateThread(void* argument) {
|
||||
@@ -170,7 +174,7 @@ product_region_checked:
|
||||
goto selection_done;
|
||||
}
|
||||
strcpy(scratch.updatePath, "__update.inf");
|
||||
strcat(scratch.updatePath, ".");
|
||||
strcat(scratch.updatePath, "-");
|
||||
strcat(scratch.updatePath, scratch.productArea);
|
||||
if (DVDConvertPathToEntrynum(scratch.updatePath) < 0) {
|
||||
switch (SCGetProductArea()) {
|
||||
@@ -267,7 +271,7 @@ product_region_checked:
|
||||
}
|
||||
}
|
||||
strcpy(scratch.seatPath, "__seatholder.inf");
|
||||
strcat(scratch.seatPath, ".");
|
||||
strcat(scratch.seatPath, "-");
|
||||
strcat(scratch.seatPath, scratch.productArea);
|
||||
if (DVDConvertPathToEntrynum(scratch.seatPath) < 0) {
|
||||
switch (SCGetProductArea()) {
|
||||
|
||||
@@ -205,7 +205,7 @@ void AxAdpcmSimplePlayer::init() {
|
||||
}
|
||||
|
||||
int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
|
||||
mpBNSBuffer = (Header*)data;
|
||||
Header* head = mpBNSBuffer = (Header*)data;
|
||||
|
||||
sSysPauseFlag = false;
|
||||
|
||||
@@ -224,6 +224,7 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
|
||||
ChannelInfo* chanInfoBufB[2];
|
||||
ChannelInfo* chanInfoBufA[2];
|
||||
|
||||
AdpcmCoeffs** pCoeffsBufB = NULL;
|
||||
int i;
|
||||
u32* channelStartOffsets;
|
||||
INFOBlock* infoBlock;
|
||||
@@ -239,13 +240,13 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
|
||||
|
||||
int chanCount;
|
||||
{
|
||||
if (((Header*)data)->byteOrder != 0xFEFF) {
|
||||
if (head->byteOrder != 0xFEFF) {
|
||||
chanCount = 0;
|
||||
goto clean_up;
|
||||
}
|
||||
|
||||
infoBlock = ADD_OFFSET(INFOBlock, data, ((Header*)data)->infoHead.offset);
|
||||
dataBlock = ADD_OFFSET(DATABlock, data, ((Header*)data)->dataHead.offset);
|
||||
infoBlock = ADD_OFFSET(INFOBlock, data, head->infoHead.offset);
|
||||
dataBlock = ADD_OFFSET(DATABlock, data, head->dataHead.offset);
|
||||
if (infoBlock->head.sig != 'INFO') {
|
||||
chanCount = 0;
|
||||
goto clean_up;
|
||||
@@ -267,6 +268,8 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
|
||||
pChanInfoBufB = chanInfoBufB;
|
||||
pChanDataBuf = chanDataBuf;
|
||||
pCoeffsBufA = coeffsBufA;
|
||||
pCoeffsBufB = coeffsBufB;
|
||||
pAxvpbBuf = axVoiceBuf;
|
||||
for (i = 0; chanCount = infoBlock->channelCount, i < chanCount; i++) {
|
||||
int chanStartOffs = channelStartOffsets[i];
|
||||
ChannelInfo* chanInfo = ADD_OFFSET(ChannelInfo, infoBlockDataBase, chanStartOffs);
|
||||
@@ -275,9 +278,8 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
|
||||
pChanInfoBufB[i] = chanInfo;
|
||||
pChanDataBuf[i] = ADD_OFFSET(void, dataBlockDataBase, chanInfo->dataOff);
|
||||
pCoeffsBufA[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
|
||||
coeffsBufB[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
|
||||
pCoeffsBufB[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
|
||||
|
||||
pAxvpbBuf = axVoiceBuf;
|
||||
pAxvpbBuf[i] = AXAcquireVoice(0x1f, VoiceCallback, 0);
|
||||
if (pAxvpbBuf[i] == NULL) {
|
||||
chanCount = 0;
|
||||
@@ -310,33 +312,37 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
|
||||
axAddr.currentAddressHi = (u32)currAddr >> 0x10;
|
||||
axAddr.currentAddressLo = (u32)currAddr & 0xFFFF;
|
||||
|
||||
axAdpcm.a[0][0] = coeffsBufB[i]->a[0][0];
|
||||
axAdpcm.a[0][1] = coeffsBufB[i]->a[0][1];
|
||||
axAdpcm.a[1][0] = coeffsBufB[i]->a[1][0];
|
||||
axAdpcm.a[1][1] = coeffsBufB[i]->a[1][1];
|
||||
axAdpcm.a[2][0] = coeffsBufB[i]->a[2][0];
|
||||
axAdpcm.a[2][1] = coeffsBufB[i]->a[2][1];
|
||||
axAdpcm.a[3][0] = coeffsBufB[i]->a[3][0];
|
||||
axAdpcm.a[3][1] = coeffsBufB[i]->a[3][1];
|
||||
axAdpcm.a[4][0] = coeffsBufB[i]->a[4][0];
|
||||
axAdpcm.a[4][1] = coeffsBufB[i]->a[4][1];
|
||||
axAdpcm.a[5][0] = coeffsBufB[i]->a[5][0];
|
||||
axAdpcm.a[5][1] = coeffsBufB[i]->a[5][1];
|
||||
axAdpcm.a[6][0] = coeffsBufB[i]->a[6][0];
|
||||
axAdpcm.a[6][1] = coeffsBufB[i]->a[6][1];
|
||||
axAdpcm.a[7][0] = coeffsBufB[i]->a[7][0];
|
||||
axAdpcm.a[7][1] = coeffsBufB[i]->a[7][1];
|
||||
axAdpcm.gain = coeffsBufB[i]->cfg.gain;
|
||||
axAdpcm.pred_scale = coeffsBufB[i]->cfg.predScale;
|
||||
axAdpcm.yn1 = coeffsBufB[i]->cfg.yn1;
|
||||
axAdpcm.yn2 = coeffsBufB[i]->cfg.yn2;
|
||||
axAdpcm.a[0][0] = pCoeffsBufB[i]->a[0][0];
|
||||
axAdpcm.a[0][1] = pCoeffsBufB[i]->a[0][1];
|
||||
axAdpcm.a[1][0] = pCoeffsBufB[i]->a[1][0];
|
||||
axAdpcm.a[1][1] = pCoeffsBufB[i]->a[1][1];
|
||||
axAdpcm.a[2][0] = pCoeffsBufB[i]->a[2][0];
|
||||
axAdpcm.a[2][1] = pCoeffsBufB[i]->a[2][1];
|
||||
axAdpcm.a[3][0] = pCoeffsBufB[i]->a[3][0];
|
||||
axAdpcm.a[3][1] = pCoeffsBufB[i]->a[3][1];
|
||||
axAdpcm.a[4][0] = pCoeffsBufB[i]->a[4][0];
|
||||
axAdpcm.a[4][1] = pCoeffsBufB[i]->a[4][1];
|
||||
axAdpcm.a[5][0] = pCoeffsBufB[i]->a[5][0];
|
||||
axAdpcm.a[5][1] = pCoeffsBufB[i]->a[5][1];
|
||||
axAdpcm.a[6][0] = pCoeffsBufB[i]->a[6][0];
|
||||
axAdpcm.a[6][1] = pCoeffsBufB[i]->a[6][1];
|
||||
axAdpcm.a[7][0] = pCoeffsBufB[i]->a[7][0];
|
||||
axAdpcm.a[7][1] = pCoeffsBufB[i]->a[7][1];
|
||||
axAdpcm.gain = pCoeffsBufB[i]->cfg.gain;
|
||||
axAdpcm.pred_scale = pCoeffsBufB[i]->cfg.predScale;
|
||||
axAdpcm.yn1 = pCoeffsBufB[i]->cfg.yn1;
|
||||
axAdpcm.yn2 = pCoeffsBufB[i]->cfg.yn2;
|
||||
|
||||
u32 ratio = infoBlock->sampleRate / 32000.0f * 65536.0f;
|
||||
axSrc.ratioHi = ratio >> 16;
|
||||
axSrc.ratioLo = ratio & 0xFFFF;
|
||||
axSrc.last_samples[3] = axSrc.last_samples[2] = axSrc.last_samples[1] = axSrc.last_samples[0] = axSrc.currentAddressFrac = 0;
|
||||
axSrc.currentAddressFrac = 0;
|
||||
axSrc.last_samples[0] = 0;
|
||||
axSrc.last_samples[1] = 0;
|
||||
axSrc.last_samples[2] = 0;
|
||||
axSrc.last_samples[3] = 0;
|
||||
|
||||
AXVPB* vpbA = pAxvpbBuf[i];
|
||||
AXVPB* vpbA = axVoiceBuf[i];
|
||||
AXSetVoiceType(vpbA, 0);
|
||||
AXSetVoiceAddr(vpbA, &axAddr);
|
||||
AXSetVoiceAdpcm(vpbA, &axAdpcm);
|
||||
@@ -353,7 +359,7 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
|
||||
Voices[vpbA->index].getMix()->vL = 0;
|
||||
}
|
||||
}
|
||||
AXVPB* vpbB = pAxvpbBuf[i];
|
||||
AXVPB* vpbB = axVoiceBuf[i];
|
||||
AXSetVoiceMix(vpbB, Voices[vpbA->index].getMix());
|
||||
static AXPBVE voiceVe = {32768, 0};
|
||||
AXSetVoiceVe(vpbB, &voiceVe);
|
||||
|
||||
@@ -619,7 +619,7 @@ vmFloat VmIntToFloat(vmU64 integer) {
|
||||
return result;
|
||||
}
|
||||
|
||||
static s32 CHANSVmParseInt(const CHANSVmObjHdr* obj, s32 base, u64* out) {
|
||||
static s32 CHANSVmParseInt(CHANSVmObjHdr* obj, s32 base, u64* out) {
|
||||
u8 type = obj->type;
|
||||
u32 stringLength;
|
||||
u32 charCount;
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace memo {
|
||||
class EventHandler : public inputform::EventHandler {
|
||||
public:
|
||||
EventHandler(InputForm* form) : inputform::EventHandler(form), mpMemoForm(form) {}
|
||||
virtual ~EventHandler();
|
||||
virtual ~EventHandler() {}
|
||||
virtual void onTiEvent(gui::PaneComponent*, u32, Input*);
|
||||
private:
|
||||
InputForm* mpMemoForm;
|
||||
@@ -48,14 +48,14 @@ protected:
|
||||
class WholePane : public AnmPane {
|
||||
public:
|
||||
WholePane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : AnmPane(pane, observer) { meKeyType = 0; }
|
||||
virtual ~WholePane();
|
||||
virtual ~WholePane() {}
|
||||
virtual void onAnmEvent(AnmPaneEvent event);
|
||||
};
|
||||
|
||||
class NigaoePane : public AnmPane {
|
||||
public:
|
||||
NigaoePane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : AnmPane(pane, observer) { meKeyType = 1; }
|
||||
virtual ~NigaoePane();
|
||||
virtual ~NigaoePane() {}
|
||||
virtual void onAnmEvent(AnmPaneEvent event);
|
||||
};
|
||||
|
||||
@@ -81,7 +81,7 @@ private:
|
||||
class SimpleAnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
SimpleAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer) {}
|
||||
virtual ~SimpleAnmPane();
|
||||
virtual ~SimpleAnmPane() {}
|
||||
virtual void init();
|
||||
virtual void changeAnimation(u32 id);
|
||||
};
|
||||
@@ -523,7 +523,7 @@ void InputForm::calc() {
|
||||
if (meEditMode == EM_Edit) {
|
||||
height = 2.0f * getLineHeight();
|
||||
boundY = (mDefaultBoundTrans.y - (height - mDefaultBoundSize.height) / 2.0f) - mfScroll;
|
||||
} else setDrawScrollY(0.0f);
|
||||
} else mfDrawScrollY = 0.0f;
|
||||
mpBoundPane->SetSize(nw4r::lyt::Size(mpBoundPane->GetSize().width, height));
|
||||
mpBoundPane->SetTranslate(nw4r::math::VEC2(mDefaultBoundTrans.x, boundY));
|
||||
mpBoundPane->CalculateMtx(mDrawInfo);
|
||||
@@ -792,12 +792,8 @@ void AnmPane::changeAnimation(u32 id) {
|
||||
}
|
||||
u32 AnmPane::getKeyType() const { return meKeyType; }
|
||||
void AnmPane::init() { meState = 0; }
|
||||
NigaoePane::~NigaoePane() {}
|
||||
void NigaoePane::onAnmEvent(AnmPaneEvent) {}
|
||||
WholePane::~WholePane() {}
|
||||
bool InputForm::isInScroll() { return mExScrollAnm.isActive(); }
|
||||
EventHandler::~EventHandler() {}
|
||||
SimpleAnmPane::~SimpleAnmPane() {}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,9 +22,7 @@ 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;
|
||||
#pragma explicit_zero_data on
|
||||
extern "C" const wchar_t scEmptyWChars[4] = {0, 0, 0, 0};
|
||||
#pragma explicit_zero_data reset
|
||||
extern "C" const wchar_t scEmptyWChars[4] = {0, 0, 0, 1};
|
||||
extern "C" const char scP_OnBtn[8] = "P_OnBtn";
|
||||
extern "C" const char scB_OnBtn[8] = "B_OnBtn";
|
||||
#pragma pop
|
||||
@@ -208,14 +206,14 @@ namespace textinput {
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char scPaneNameTable[132] =
|
||||
"B_OffBtn\0\0\0\0"
|
||||
"P_JPOffBtn\0\0"
|
||||
"P_CNOffBtn\0\0"
|
||||
"P_CNOnBtn\0\0\0"
|
||||
"B_prdc_scrl_Left\0\0\0\0"
|
||||
"P_prdc_scrl_Left\0\0\0\0"
|
||||
"B_prdc_scrl_Rght\0\0\0\0"
|
||||
"P_prdc_scrl_Rght\0\0\0\0"
|
||||
"B_OffBtn\0\0\0"
|
||||
"P_JPOffBtn\0"
|
||||
"P_CNOffBtn\0"
|
||||
"P_CNOnBtn\0\0"
|
||||
"B_prdc_scrl_Left\0\0\0"
|
||||
"P_prdc_scrl_Left\0\0\0"
|
||||
"B_prdc_scrl_Rght\0\0\0"
|
||||
"P_prdc_scrl_Rght\0\0\0"
|
||||
"\0\0\0";
|
||||
extern "C" char scW_predictWindow[16] = "W_predictWindow";
|
||||
extern "C" const char scN_predictInput[15] = "N_predictInput";
|
||||
|
||||
@@ -78,7 +78,9 @@ void HKBManager::KBDListenerOwn::OnAttach(KBDDevEvent* event) {
|
||||
void HKBManager::KBDListenerOwn::OnDetach(KBDDevEvent* event) {
|
||||
u8 device = event->device;
|
||||
if (device >= 2) return;
|
||||
manager->DetachDevice(event);
|
||||
HKBManager* owner = manager;
|
||||
owner->attached[device] = 0;
|
||||
owner->states[device].Clear();
|
||||
}
|
||||
|
||||
void HKBManager::KBDListenerOwn::OnKeyEvent(KBDKeyEvent* event) {
|
||||
@@ -448,7 +450,15 @@ u32 HKBManager::KeySet::GetWChar() const {
|
||||
} else if ((static_cast<u32>(code) & 0xffff) < 0x20) {
|
||||
code = 0;
|
||||
}
|
||||
return manager->FilterCharacter(code);
|
||||
u32 index = 0;
|
||||
const HKBManager* owner = manager;
|
||||
if (owner->allowedCharacters == 0) return code;
|
||||
u32 count = owner->allowedCharacterCount;
|
||||
if (count == 0) return code;
|
||||
for (; index < count; index++) {
|
||||
if ((static_cast<u32>(code) & 0xffff) == owner->allowedCharacters[index]) return code;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 HKBManager::KeySet::GetVCode() const {
|
||||
@@ -487,23 +497,7 @@ u32 HKBManager::KeySet::GetVCode() const {
|
||||
}
|
||||
|
||||
u32 HKBManager::KeySet::IsValid() const {
|
||||
s8 keyIndex;
|
||||
u32 keyDevice;
|
||||
const HKBManager* owner;
|
||||
|
||||
owner = manager;
|
||||
if (!owner) return false;
|
||||
keyIndex = index;
|
||||
if (keyIndex < 0 || keyIndex >= 8) return false;
|
||||
keyDevice = device;
|
||||
if (keyDevice >= 2) return false;
|
||||
switch (type) {
|
||||
case 0: return (owner->states[keyDevice].held & (1 << keyIndex)) != 0;
|
||||
case 1: return (owner->states[keyDevice].triggered & (1 << keyIndex)) != 0;
|
||||
case 2: return (owner->states[keyDevice].released & (1 << keyIndex)) != 0;
|
||||
case 3: return (owner->states[keyDevice].repeated & (1 << keyIndex)) != 0;
|
||||
}
|
||||
return false;
|
||||
return CheckValidity();
|
||||
}
|
||||
|
||||
HKBManager::KeySet HKBManager::KeySet::GetNext() const {
|
||||
@@ -531,6 +525,7 @@ HKBManager::KeySet HKBManager::KeySet::GetNext() const {
|
||||
}
|
||||
|
||||
|
||||
HKBManager::~HKBManager() {}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2114,12 +2114,7 @@ namespace textinput {
|
||||
void LayoutByNW4R::onPressedShift(bool sound) {
|
||||
u32 flags = mKeyState.getABCFlag();
|
||||
flags |= 128;
|
||||
if ((mKeyState.abcFlags & ~15) != flags) {
|
||||
Base* keyboard = mKeyState.owner;
|
||||
mKeyState.abcFlags = (mKeyState.abcFlags & 15) | (flags & ~15);
|
||||
if (keyboard != NULL)
|
||||
keyboard->refreshState();
|
||||
}
|
||||
mKeyState.setABCFlag(flags);
|
||||
mShiftButton.SetState(true, 5);
|
||||
if (sound)
|
||||
mpEventObserver->onSE(static_cast<sound::SE>(13));
|
||||
@@ -2128,13 +2123,7 @@ namespace textinput {
|
||||
void LayoutByNW4R::onReleasedShift() {
|
||||
u32 flags = mKeyState.getABCFlag();
|
||||
flags &= ~128;
|
||||
u32 currentFlags = mKeyState.abcFlags;
|
||||
if ((currentFlags & ~15) != flags) {
|
||||
Base* keyboard = mKeyState.owner;
|
||||
mKeyState.abcFlags = (currentFlags & 15) | (flags & ~15);
|
||||
if (keyboard != NULL)
|
||||
keyboard->refreshState();
|
||||
}
|
||||
mKeyState.setABCFlag(flags);
|
||||
if (mShiftButton.mbOn) {
|
||||
mShiftButton.mbOn = false;
|
||||
mShiftButton.mpAnimation->onAnmEvent(static_cast<AnmPane::AnmPaneEvent>(5));
|
||||
@@ -2524,24 +2513,8 @@ namespace textinput {
|
||||
} else {
|
||||
gather.setPressedShiftB(false);
|
||||
input::HKBManager::getInstance().SetForceModifierState(0, 0);
|
||||
if (wasShift && !gather.isHoldingShift()) {
|
||||
u32 flags;
|
||||
u32 currentFlags;
|
||||
Base* keyboard;
|
||||
flags = mKeyState.getABCFlag();
|
||||
flags &= ~128;
|
||||
currentFlags = mKeyState.abcFlags;
|
||||
if ((currentFlags & ~15) != flags) {
|
||||
keyboard = mKeyState.owner;
|
||||
mKeyState.abcFlags = (currentFlags & 15) | (flags & ~15);
|
||||
if (keyboard != NULL)
|
||||
keyboard->refreshState();
|
||||
}
|
||||
if (mShiftButton.mbOn) {
|
||||
mShiftButton.mbOn = false;
|
||||
mShiftButton.mpAnimation->onAnmEvent(static_cast<AnmPane::AnmPaneEvent>(5));
|
||||
}
|
||||
}
|
||||
if (wasShift && !gather.isHoldingShift())
|
||||
onReleasedShift();
|
||||
}
|
||||
return handled;
|
||||
}
|
||||
|
||||
@@ -249,14 +249,13 @@ void LayoutByNW4R::create(MEMAllocator* allocator) {
|
||||
animationCount = paneInfo.animationCount;
|
||||
u16 animationIndex = 0;
|
||||
while (animationIndex < animationCount) {
|
||||
const AnimationFile* const& animation = paneInfo.animations[animationIndex];
|
||||
void* resource = mpMultiArcResourceAccessor->GetResource(0, animation->name);
|
||||
void* resource = mpMultiArcResourceAccessor->GetResource(0, paneInfo.animations[animationIndex]->name);
|
||||
AnimTransformPane* transform = static_cast<AnimTransformPane*>(
|
||||
getLayout()->CreateAnimTransform(resource, mpMultiArcResourceAccessor));
|
||||
if (forceName != NULL) {
|
||||
pane->forceAddAnimation(allocator, animation->id, transform, forceName, false, true);
|
||||
pane->forceAddAnimation(allocator, paneInfo.animations[animationIndex]->id, transform, forceName, false, true);
|
||||
} else {
|
||||
pane->addAnimation(allocator, animation->id, transform, false, true);
|
||||
pane->addAnimation(allocator, paneInfo.animations[animationIndex]->id, transform, false, true);
|
||||
}
|
||||
++animationIndex;
|
||||
}
|
||||
|
||||
@@ -1607,12 +1607,8 @@ namespace ipl {
|
||||
|
||||
void Address::set_err_msg(wchar_t* errMsg, u32 errMsgLen, NWC24Err err) {
|
||||
memset(errMsg, 0, errMsgLen * sizeof(wchar_t));
|
||||
union MessageValue {
|
||||
const wchar_t* text;
|
||||
u32 id;
|
||||
} message;
|
||||
message.text = System::getMessage(MESG_ERROR_CODE);
|
||||
wcsncat(errMsg, message.text, errMsgLen - wcslen(errMsg));
|
||||
wcsncat(errMsg, System::getMessage(MESG_ERROR_CODE), errMsgLen - wcslen(errMsg));
|
||||
u32 msgId = MESG_ERROR_CODE;
|
||||
|
||||
wchar_t errCode[32];
|
||||
memset(errCode, 0, sizeof(errCode));
|
||||
@@ -1621,22 +1617,17 @@ namespace ipl {
|
||||
|
||||
switch (err) {
|
||||
case NWC24_ERR_NETWORK: {
|
||||
message.id = MESG_ERROR_NWC24_NETWORK;
|
||||
msgId = MESG_ERROR_NWC24_NETWORK;
|
||||
break;
|
||||
}
|
||||
case NWC24_ERR_SERVER:
|
||||
case NWC24_ERR_FULL: {
|
||||
message.id = MESG_ERROR_NWC24_SERVER;
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
message.id = reinterpret_cast<u32>(message.text);
|
||||
msgId = MESG_ERROR_NWC24_SERVER;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
message.text = System::getMessage(message.id);
|
||||
wcsncat(errMsg, message.text, errMsgLen - wcslen(errMsg));
|
||||
wcsncat(errMsg, System::getMessage(msgId), errMsgLen - wcslen(errMsg));
|
||||
}
|
||||
|
||||
void Address::entry_friend() {
|
||||
|
||||
@@ -1704,9 +1704,6 @@ 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();
|
||||
@@ -1718,11 +1715,11 @@ void ipl::scene::AddressEdit::stt_wait_btn_fadeout() {
|
||||
friendFinished &= !mpCodeLayout->getAnim(0x17)->isPlaying();
|
||||
|
||||
if (friendFinished) {
|
||||
label = mpCodeLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_card_msg_00", true);
|
||||
message = ipl::System::getMessage(0x30);
|
||||
nw4r::lyt::Pane* label = mpCodeLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_card_msg_00", true);
|
||||
const wchar_t* message = ipl::System::getMessage(0x30);
|
||||
set_textbox(label, message);
|
||||
ipl::System::getDialog()->callS2Btn2(0x142, 0x141, true);
|
||||
animator = mpCodeLayout->getAnim(0x1c);
|
||||
ipl::layout::Animator* animator = mpCodeLayout->getAnim(0x1c);
|
||||
animator->initFrame();
|
||||
animator->restart();
|
||||
mState = 4;
|
||||
@@ -2125,8 +2122,6 @@ state0:
|
||||
goto state0Common;
|
||||
case 3:
|
||||
goto state0Button3;
|
||||
case 4:
|
||||
goto done;
|
||||
default:
|
||||
goto done;
|
||||
}
|
||||
@@ -2158,14 +2153,11 @@ 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;
|
||||
f32 scale;
|
||||
f32 height;
|
||||
xOffset = 15.0f;
|
||||
height = 50.0f;
|
||||
scale = 0.5f;
|
||||
f32 xOffset = 15.0f;
|
||||
f32 height = 50.0f;
|
||||
f32 scale = 0.5f;
|
||||
position.x = position.x + xOffset;
|
||||
position.y = position.y + height * scale;
|
||||
position.y = position.y + scale * height;
|
||||
(mpBalloon)
|
||||
->setPos(position, false, 1);
|
||||
(mpBalloon)->fadein();
|
||||
@@ -2202,14 +2194,11 @@ 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;
|
||||
f32 scale;
|
||||
f32 height;
|
||||
xOffset = 15.0f;
|
||||
height = 50.0f;
|
||||
scale = 0.5f;
|
||||
f32 xOffset = 15.0f;
|
||||
f32 height = 50.0f;
|
||||
f32 scale = 0.5f;
|
||||
position.x = position.x + xOffset;
|
||||
position.y = position.y + height * scale;
|
||||
position.y = position.y + scale * height;
|
||||
(mpBalloon)
|
||||
->setPos(position, false, 1);
|
||||
(mpBalloon)->fadein();
|
||||
@@ -2258,8 +2247,6 @@ void ipl::scene::AddressEdit::start_left_event(const char* paneName) {
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 4:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -2311,7 +2298,7 @@ void ipl::scene::AddressEdit::start_trig_event(
|
||||
pane->initFrame();
|
||||
pane->restart();
|
||||
mSelectedButton = buttonNo;
|
||||
ipl::snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
ipl::snd::getSystem()->startSE("WIPL_SE_BT_TARGETTING");
|
||||
mState = 1;
|
||||
break;
|
||||
}
|
||||
@@ -2330,7 +2317,7 @@ void ipl::scene::AddressEdit::start_trig_event(
|
||||
pane->initFrame();
|
||||
pane->restart();
|
||||
mSelectedButton = buttonNo;
|
||||
ipl::snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
ipl::snd::getSystem()->startSE("WIPL_SE_BT_TARGETTING");
|
||||
mState = 1;
|
||||
break;
|
||||
}
|
||||
@@ -2356,7 +2343,7 @@ void ipl::scene::AddressEdit::start_trig_event(
|
||||
pane->initFrame();
|
||||
pane->restart();
|
||||
mSelectedButton = buttonNo;
|
||||
ipl::snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
ipl::snd::getSystem()->startSE("WIPL_SE_BT_TARGETTING");
|
||||
mState = 0x24;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -429,38 +429,32 @@ namespace ipl {
|
||||
}
|
||||
|
||||
BOOL Board::appendRecord(CDBRecord* record) {
|
||||
struct RecordReadState {
|
||||
BOOL recordInterrupts;
|
||||
u32 dataSize;
|
||||
BOOL waitInterrupts;
|
||||
BOOL slotInterrupts;
|
||||
int recordSecond;
|
||||
int recordMin;
|
||||
int recordHour;
|
||||
u32 recordGC;
|
||||
CDBId cdbId;
|
||||
char recordType[8];
|
||||
utility::Date recordDate;
|
||||
CDBRecordKey recordKey;
|
||||
} state;
|
||||
state.recordGC = 0;
|
||||
CDBRecordKey recordKey;
|
||||
|
||||
utility::Date recordDate;
|
||||
int recordDay;
|
||||
int recordMin;
|
||||
int recordHour;
|
||||
|
||||
u32 recordGC = 0;
|
||||
|
||||
cdb::Manager* cdbManager = System::getCdbManager();
|
||||
BOOL result = TRUE;
|
||||
state.recordType[0] = 0;
|
||||
state.recordType[1] = 0;
|
||||
state.recordType[2] = 0;
|
||||
state.recordType[3] = 0;
|
||||
state.recordType[4] = 0;
|
||||
state.recordType[5] = 0;
|
||||
state.recordType[6] = 0;
|
||||
state.recordType[7] = 0;
|
||||
|
||||
struct InterruptState {
|
||||
BOOL first;
|
||||
BOOL second;
|
||||
BOOL third;
|
||||
BOOL result;
|
||||
} interrupts;
|
||||
interrupts.result = TRUE;
|
||||
|
||||
char recordType[8] = "";
|
||||
|
||||
// Get record metadata
|
||||
CDBRecordGetCalendarTimeForce(record, &state.recordDate.year, &state.recordDate.month, &state.recordDate.day,
|
||||
&state.recordHour, &state.recordMin, &state.recordSecond);
|
||||
CDBRecordGetKeyForce(record, &state.recordKey);
|
||||
CDBRecordGetTypeForce(record, state.recordType);
|
||||
CDBRecordGetGameCodeForce(record, (char*)&state.recordGC);
|
||||
CDBRecordGetCalendarTimeForce(record, &recordDate.year, &recordDate.month, &recordDate.day, &recordHour, &recordMin, &recordDay);
|
||||
CDBRecordGetKeyForce(record, &recordKey);
|
||||
CDBRecordGetTypeForce(record, recordType);
|
||||
CDBRecordGetGameCodeForce(record, (char*)&recordGC);
|
||||
|
||||
if (mbReading == true && mSearchRecord_Prev.created) {
|
||||
mbReading = false;
|
||||
@@ -468,34 +462,34 @@ namespace ipl {
|
||||
}
|
||||
|
||||
// Verify record
|
||||
if (!cdbManager->isValidType(state.recordType)) {
|
||||
if (!cdbManager->isValidType(recordType)) {
|
||||
return TRUE;
|
||||
}
|
||||
if (is_already_read(state.recordKey.keyString)) {
|
||||
if (is_already_read(recordKey.keyString)) {
|
||||
return TRUE;
|
||||
}
|
||||
if (is_exist_keytbl(state.recordKey.keyString)) {
|
||||
if (is_exist_keytbl(recordKey.keyString)) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
state.recordDate.month++;
|
||||
if (!(state.recordDate == mCurrentDate)) {
|
||||
recordDate.month++;
|
||||
if (!(recordDate == mCurrentDate)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
// Find any free space to put the object on screen
|
||||
|
||||
state.slotInterrupts = OSDisableInterrupts();
|
||||
interrupts.first = OSDisableInterrupts();
|
||||
BOOL exist = is_exist_diff_date();
|
||||
BoardObject* obj = mObjList.getNextFree();
|
||||
OSRestoreInterrupts(state.slotInterrupts);
|
||||
OSRestoreInterrupts(interrupts.first);
|
||||
|
||||
if (obj == NULL && exist) {
|
||||
while (obj == NULL) {
|
||||
OSSleepMilliseconds((OSTime)1);
|
||||
state.waitInterrupts = OSDisableInterrupts();
|
||||
interrupts.second = OSDisableInterrupts();
|
||||
obj = mObjList.getNextFree();
|
||||
OSRestoreInterrupts(state.waitInterrupts);
|
||||
OSRestoreInterrupts(interrupts.second);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -512,59 +506,61 @@ namespace ipl {
|
||||
|
||||
// Get CDB metadata
|
||||
|
||||
if (!cdbManager->getDataSize(record, &state.dataSize)) {
|
||||
u32 dataSize;
|
||||
if (!cdbManager->getDataSize(record, &dataSize)) {
|
||||
return TRUE;
|
||||
}
|
||||
if (state.dataSize > 0x32000) {
|
||||
if (dataSize > 0x32000) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if (!System::getCdbManager()->getCDBId(record, &state.cdbId)) {
|
||||
CDBId cdbId;
|
||||
if (!System::getCdbManager()->getCDBId(record, &cdbId)) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// Read CDB metadata
|
||||
u8* rbrData = new (obj->mpHeap, DEFAULT_ALIGN) u8[state.dataSize];
|
||||
u8* rbrData = new (obj->mpHeap, DEFAULT_ALIGN) u8[dataSize];
|
||||
if (rbrData == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
if (!cdbManager->read(record, rbrData, state.dataSize)) {
|
||||
if (!cdbManager->read(record, rbrData, dataSize)) {
|
||||
delete[] rbrData;
|
||||
goto close;
|
||||
}
|
||||
|
||||
result = TRUE;
|
||||
interrupts.result = TRUE;
|
||||
|
||||
if (((RBRHeader*)rbrData)->magic == RBR_MAGIC && cdbManager->isValidHeader((RBRHeader*)rbrData)) {
|
||||
state.recordInterrupts = OSDisableInterrupts();
|
||||
interrupts.third = OSDisableInterrupts();
|
||||
|
||||
if (state.recordDate == mCurrentDate) {
|
||||
if (recordDate == mCurrentDate) {
|
||||
if (mbReading == true && mSearchRecord_Prev.created) {
|
||||
mbReading = false;
|
||||
delete[] rbrData;
|
||||
OSRestoreInterrupts(state.recordInterrupts);
|
||||
OSRestoreInterrupts(interrupts.third);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// Create on screen object
|
||||
obj->create(mpLayoutFile, rbrData, state.recordGC, state.cdbId, state.recordKey, state.recordDate);
|
||||
obj->create(mpLayoutFile, rbrData, recordGC, cdbId, recordKey, recordDate);
|
||||
mObjList.append(obj);
|
||||
|
||||
CDBRecordGetCalendarTimeForce(record, &mSearchRecord_Next.year, &mSearchRecord_Next.month, &mSearchRecord_Next.day,
|
||||
&mSearchRecord_Next.hour, &mSearchRecord_Next.min, &mSearchRecord_Next.sec);
|
||||
memcpy(&mSearchRecord_Next.key, &state.recordKey, sizeof(CDBRecordKey));
|
||||
memcpy(&mSearchRecord_Next.key, &recordKey, sizeof(CDBRecordKey));
|
||||
|
||||
mSearchRecord_Next.created = true;
|
||||
if (mSearchRecord_Prev.created == false) {
|
||||
memcpy(&mSearchRecord_Prev, &mSearchRecord_Next, sizeof(SearchRecord));
|
||||
}
|
||||
} else {
|
||||
result = FALSE;
|
||||
interrupts.result = FALSE;
|
||||
delete[] rbrData;
|
||||
}
|
||||
|
||||
OSRestoreInterrupts(state.recordInterrupts);
|
||||
OSRestoreInterrupts(interrupts.third);
|
||||
} else {
|
||||
delete[] rbrData;
|
||||
}
|
||||
@@ -588,13 +584,13 @@ namespace ipl {
|
||||
show_ricon();
|
||||
}
|
||||
|
||||
result = FALSE;
|
||||
interrupts.result = FALSE;
|
||||
goto out;
|
||||
|
||||
error:
|
||||
result = FALSE;
|
||||
interrupts.result = FALSE;
|
||||
out:
|
||||
return result;
|
||||
return interrupts.result;
|
||||
}
|
||||
|
||||
void Board::stt_wait_cdb_init() {
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#define IPL_FOCUS_OBJECT_CPP
|
||||
#include "scene/board/iplFocusObject.h"
|
||||
#include "scene/parentalDialog/iplParentalDialog.h"
|
||||
|
||||
@@ -12,28 +11,6 @@
|
||||
#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
|
||||
@@ -360,13 +337,6 @@ 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();
|
||||
|
||||
@@ -2121,7 +2091,7 @@ namespace ipl {
|
||||
|
||||
if (event == ::gui::EventHandler::ON_TRIG) {
|
||||
if (con->downTrg(controller::BTN_INTERACT)) {
|
||||
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
|
||||
if (strcmp(paneName, "B_Stop") == 0) {
|
||||
if (mpInstance->mState == focus_object::STATE_NORMAL) {
|
||||
focus_object::get_button()->animation(Button::IDANIM_OPTOUT_SELECT);
|
||||
|
||||
@@ -2142,24 +2112,3 @@ 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;
|
||||
}
|
||||
|
||||
@@ -1734,13 +1734,11 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" char scSE_WSD_SELECT[] = "WSD_SELECT";
|
||||
|
||||
void ChannelSelect::preparePageScrolling(int nextState) {
|
||||
mbModuleSceneChange = true;
|
||||
mState = nextState;
|
||||
unk_0x185 = false;
|
||||
snd::getSystem()->startSE(scSE_WSD_SELECT);
|
||||
snd::getSystem()->startSE("WSD_SELECT");
|
||||
}
|
||||
|
||||
void ChannelSelect::startPageScroll(int nextState) {
|
||||
@@ -2089,6 +2087,7 @@ namespace ipl {
|
||||
mpMoveLytDrop->getAnim()->initAnmFrame();
|
||||
}
|
||||
|
||||
extern "C" char scSE_WSD_SELECT[] = "WSD_SELECT";
|
||||
extern "C" char scSE_WIPL_SE_CH_TARGETTING[] = "WIPL_SE_CH_TARGETTING";
|
||||
extern "C" char scSE_WIPL_SE_CH_HOLD[] = "WIPL_SE_CH_HOLD";
|
||||
extern "C" char scSE_WIPL_SE_CH_SET[] = "WIPL_SE_CH_SET";
|
||||
|
||||
@@ -90,12 +90,6 @@ MemCardEventHandler::~MemCardEventHandler() {}
|
||||
|
||||
MemoryBaseEvent::MemoryBaseEvent(MemoryBase* memoryBase) : mpBase(memoryBase) {}
|
||||
|
||||
} // namespace scene
|
||||
namespace math {
|
||||
inline LinearIntp<VEC3>::LinearIntp() {}
|
||||
}
|
||||
namespace scene {
|
||||
|
||||
void GCWindow::init(const math::VEC3& translate, MemoryCardManager* manager, u8 cardState, short cardIndex) {
|
||||
mActive = true;
|
||||
mFlags1[cardState] = 0;
|
||||
@@ -112,8 +106,8 @@ void GCWindow::init(const math::VEC3& translate, MemoryCardManager* manager, u8
|
||||
}
|
||||
int blocks = mpMemoryCardManager->getBlocks(cardState, cardIndex);
|
||||
DigitTable digitTable = scNumber;
|
||||
wchar_t decimal[5] = {0};
|
||||
int blockCount = static_cast<u16>(blocks);
|
||||
wchar_t decimal[5] = {0};
|
||||
int skipCount = 0;
|
||||
wchar_t blockText[5] = {0};
|
||||
decimal[0] = digitTable.w[blockCount / 1000];
|
||||
@@ -129,7 +123,8 @@ void GCWindow::init(const math::VEC3& translate, MemoryCardManager* manager, u8
|
||||
wcscpy(blockText, decimal + skipCount);
|
||||
set_textbox("T_Block_00", blockText);
|
||||
mTranslate = translate;
|
||||
mLinearInterp.init(ANIM_TYPE_FORWARD, 12.0f, 0.0f, mTranslate, math::VEC3(0.0f, 0.0f, 0.0f), 1.0f);
|
||||
math::VEC3 zero(0.0f, 0.0f, 0.0f);
|
||||
mLinearInterp.init(ANIM_TYPE_FORWARD, 12.0f, 0.0f, mTranslate, zero, 1.0f);
|
||||
mLinearInterp.initFrame();
|
||||
mLinearInterp.restart();
|
||||
math::VEC3 position = mLinearInterp.get();
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#define IPL_MEMORY_CARD_MANAGER_CPP
|
||||
#include "scene/memoryCard/iplMemoryCardManager.h"
|
||||
#include "utility/iplCharacterCode.h"
|
||||
#include <revolution/sc.h>
|
||||
@@ -253,9 +252,7 @@ void MemoryCardManager::update_icon_anm() {
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
if (file < 0x7f && dirs[slot][file].fileNo != 0) {
|
||||
memorycard::IconState* icon = icons[slot] + file;
|
||||
s8 delta = icon->anmDelta;
|
||||
s16 currentFrame = mFileCell[slot][file].iconAnmCounter;
|
||||
s32 frame = currentFrame + delta;
|
||||
s32 frame = mFileCell[slot][file].iconAnmCounter + icon->anmDelta;
|
||||
mFileCell[slot][file].iconAnmCounter = frame;
|
||||
if ((s16)frame >= icons[slot][file].anmMax) {
|
||||
if (icon->anmType == 4) {
|
||||
@@ -345,10 +342,12 @@ void MemoryCardManager::update_change_cardstate(u8 slot) {
|
||||
GXTexObj* MemoryCardManager::create_icon(u8 slot, s16 index) {
|
||||
memorycard::IconState (*icons)[0x7f] = reinterpret_cast<memorycard::IconState(*)[0x7f]>(memorycard::getIconStateArray());
|
||||
int total = 0;
|
||||
s16 frame = 0;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
s16 frame = 0;
|
||||
do {
|
||||
total += ((icons[slot][file].anmFrameBits >> (frame++ << 1)) & 3) * 4;
|
||||
u32 shift = frame << 1;
|
||||
frame++;
|
||||
total += ((icons[slot][file].anmFrameBits >> shift) & 3) * 4;
|
||||
if (mFileCell[slot][file].iconAnmCounter <= total) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -328,7 +328,7 @@ namespace ipl {
|
||||
return isSceneCreated();
|
||||
}
|
||||
|
||||
void SDButton::setEventHandler(::gui::EventHandler* event) {
|
||||
void SDButton::setEventHandler(::gui::EventHandler* event, ::gui::EventHandler* optOutEvent) {
|
||||
mpGui->setEventHandler(event);
|
||||
}
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace ipl {
|
||||
"A", "B", "B_BtnA",
|
||||
};
|
||||
|
||||
static const char* sTitlePaneNames[] = {"A", "B", "C", "D", "B_BtnA"};
|
||||
static const char* sTitlePaneNames[] = {"A", "B", "B_BtnA", "C", "D"};
|
||||
static const char* sAdditionalTitlePaneNames[] = {"B_00", "C_00", "D_00", "B_BtnA"};
|
||||
static const char* sDialogPaneNames[] = {"B_ArwR", "B_ArwL", "B_CalExit", "B_CalExit_00"};
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ namespace ipl {
|
||||
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_applyLanguageGroups(layout::Object* layout) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_createBaseLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) NO_INLINE;
|
||||
@@ -255,15 +255,15 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_applyLanguageGroups(layout::Object* layout) {
|
||||
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) {
|
||||
int lang = System::getLanguage();
|
||||
const char* langGroup = scLangGroups[lang];
|
||||
char availableLanguages[10][4] = {};
|
||||
|
||||
bool languageFound = false;
|
||||
|
||||
for (nw4r::lyt::GroupList::Iterator it = layout->getNW4RLyt()->GetGroupContainer()->GetGroupList().GetBeginIter();
|
||||
it != layout->getNW4RLyt()->GetGroupContainer()->GetGroupList().GetEndIter(); it++) {
|
||||
for (nw4r::lyt::GroupList::Iterator it = layout->GetGroupList().GetBeginIter();
|
||||
it != layout->GetGroupList().GetEndIter(); it++) {
|
||||
if (strcmp(it->GetName(), langGroup) == 0) {
|
||||
languageFound = true;
|
||||
} else {
|
||||
@@ -295,7 +295,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (languageFound) {
|
||||
nw4r::lyt::Group* group = layout->getNW4RLyt()->GetGroupContainer()->FindGroupByName(langGroup);
|
||||
nw4r::lyt::Group* group = layout->FindGroupByName(langGroup);
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter();
|
||||
it != group->GetPaneList().GetEndIter(); it++) {
|
||||
it->mTarget->SetVisible(true);
|
||||
@@ -305,7 +305,7 @@ namespace ipl {
|
||||
for (int i = 0; i < channel::MAX_ANIMS; i++) {
|
||||
if (scRegionGroups[region][i] != NULL) {
|
||||
if (strcmp(scRegionGroups[region][i], availableLanguages[scLangLookup[region][i]]) == 0) {
|
||||
nw4r::lyt::Group* group = layout->getNW4RLyt()->GetGroupContainer()->FindGroupByName(scRegionGroups[region][i]);
|
||||
nw4r::lyt::Group* group = layout->FindGroupByName(scRegionGroups[region][i]);
|
||||
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter();
|
||||
it != group->GetPaneList().GetEndIter(); it++) {
|
||||
it->mTarget->SetVisible(true);
|
||||
|
||||
@@ -335,7 +335,7 @@ namespace ipl {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SDChannelSelect::enqueueChannelNotice(u64 titleId, u32 value) {
|
||||
bool SDChannelSelect::enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value) {
|
||||
if (mCurrentSDState != 6) {
|
||||
return false;
|
||||
}
|
||||
@@ -344,7 +344,7 @@ namespace ipl {
|
||||
command.type = 10;
|
||||
command.arguments.values[0] = value;
|
||||
command.arguments.values[1] = (u32)&mFirstTitleCount;
|
||||
command.titleId = titleId;
|
||||
command.titleId = ((u64)page << 32) | index;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -363,7 +363,7 @@ namespace ipl {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SDChannelSelect::enqueueStateNotice(u64 titleId, u32 state) {
|
||||
bool SDChannelSelect::enqueueStateNotice(u32 controller, u32 page, u32 index, u32 state) {
|
||||
if (mCurrentSDState != 6) {
|
||||
return false;
|
||||
}
|
||||
@@ -372,7 +372,7 @@ namespace ipl {
|
||||
command.type = 7;
|
||||
command.arguments.values[0] = state;
|
||||
command.arguments.values[1] = 0;
|
||||
command.titleId = titleId;
|
||||
command.titleId = ((u64)page << 32) | index;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -225,7 +225,8 @@ void SDChannelTitle::create() {
|
||||
comment->SetString(System::getMessage(0xad));
|
||||
iplSDChannelTitle_rebuildBannerLayout(this);
|
||||
mpFade = new math::HermiteIntp<f32>();
|
||||
mpFade->init(0.0f, 255.0f, 28.0f, 0.0f, 0.0f);
|
||||
static f32 fadeRange[2] = {0.0f, 255.0f};
|
||||
mpFade->init(fadeRange[0], fadeRange[1], 28.0f, 0.0f, 0.0f);
|
||||
mpFade->setAnmType(ANIM_TYPE_FORWARD);
|
||||
mpScreenCapture = new (System::getTreasureHeap(), 32) utility::Capture(System::getTreasureHeap(), 0, 0,
|
||||
System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight, GX_TF_RGB565);
|
||||
@@ -282,7 +283,7 @@ FaderSceneCommand SDChannelTitle::calcFadein() {
|
||||
if (!mpFade->isPlaying()) {
|
||||
iplSDChannelTitle_playBannerIntro(this);
|
||||
SDButton* button = static_cast<SDButton*>(System::getScene(0x24));
|
||||
button->setEventHandler(mpButtonEventHandler);
|
||||
button->setEventHandler(mpButtonEventHandler, NULL);
|
||||
button->animation(13);
|
||||
button->animation(14);
|
||||
mState = 1;
|
||||
@@ -344,7 +345,7 @@ void SDChannelTitle::initCalcFadeout() {
|
||||
button->animation(15);
|
||||
button->animation(16);
|
||||
}
|
||||
button->setEventHandler(NULL);
|
||||
button->setEventHandler(NULL, NULL);
|
||||
}
|
||||
|
||||
FaderSceneCommand SDChannelTitle::calcFadeout() {
|
||||
@@ -736,7 +737,8 @@ extern "C" void iplSDChannelTitle_startCopyProgress(SDChannelTitle* scene) {
|
||||
if (channel->mStateFlags == 3) {
|
||||
scene->mState = 26;
|
||||
scene->mErrorMessage = 0xaf;
|
||||
} else if (scene->mpChannelSelect->enqueueChannelNotice(scene->mTitleId, reinterpret_cast<u32>(&scene->mTitleRange))) {
|
||||
} else if (scene->mpChannelSelect->enqueueChannelNotice(0, static_cast<u32>(scene->mTitleId >> 32),
|
||||
static_cast<u32>(scene->mTitleId), reinterpret_cast<u32>(&scene->mTitleRange))) {
|
||||
scene->mState = 20;
|
||||
} else {
|
||||
scene->mState = 26;
|
||||
@@ -825,7 +827,8 @@ extern "C" void iplSDChannelTitle_updateCopyStart(SDChannelTitle* scene) {
|
||||
ESTitleId temporaryTitle = SCGetTmpTitleID();
|
||||
if (temporaryTitle && scene->mTitleId != temporaryTitle) {
|
||||
if (System::isReceiveScheduleStopped()) {
|
||||
if (scene->mpChannelSelect->enqueueStateNotice(temporaryTitle, 1)) {
|
||||
if (scene->mpChannelSelect->enqueueStateNotice(0, static_cast<u32>(temporaryTitle >> 32),
|
||||
static_cast<u32>(temporaryTitle), 1)) {
|
||||
scene->mState = 16;
|
||||
} else {
|
||||
scene->mState = 26;
|
||||
@@ -1013,7 +1016,8 @@ extern "C" void iplSDChannelTitle_preparePageRestart(SDChannelTitle* scene) {
|
||||
if (!scene->mScriptEnabled || scene->mScriptState == 4) {
|
||||
if (scene->mpChannelSelect->prepareRestarting(scene->mPage)) {
|
||||
scene->mpChannelSelect->startPageTransition(scene->mPage, scene->mIndex);
|
||||
scene->mpFade->init(0.0f, 255.0f, 28.0f, 0.0f, 0.0f);
|
||||
static f32 fadeRange[2] = {0.0f, 255.0f};
|
||||
scene->mpFade->init(fadeRange[0], fadeRange[1], 28.0f, 0.0f, 0.0f);
|
||||
scene->mpFade->setAnmType(ANIM_TYPE_BACKWARD);
|
||||
scene->mpFade->play();
|
||||
scene->mState = 6;
|
||||
@@ -1463,9 +1467,8 @@ extern "C" BOOL iplSDChannelTitle_passesParentalCheck(SDChannelTitle* scene, EST
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
|
||||
SDTitlePaneEventHandler* handler = this;
|
||||
const controller::Interface* controller = static_cast<const controller::Interface*>(data);
|
||||
extern "C" void iplSDChannelTitle_onTitlePaneEvent(SDTitlePaneEventHandler* handler, u32 component,
|
||||
u32 event, const controller::Interface* controller) {
|
||||
const char* paneName = handler->getPane(component)->GetName();
|
||||
switch (event) {
|
||||
case ::gui::EventHandler::ON_TRIG: {
|
||||
@@ -1523,8 +1526,8 @@ void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
|
||||
}
|
||||
}
|
||||
|
||||
void SDTitleButtonEventHandler::onEventDerived(u32 component, u32 event, const controller::Interface* controller) {
|
||||
SDTitleButtonEventHandler* handler = this;
|
||||
extern "C" void iplSDChannelTitle_onTitleButtonEvent(SDTitleButtonEventHandler* handler, u32 component,
|
||||
u32 event, const controller::Interface* controller) {
|
||||
const char* name = handler->getPane(component)->GetName();
|
||||
switch (event) {
|
||||
case 0:
|
||||
@@ -1554,14 +1557,12 @@ void SDChannelTitle::startResetting() {
|
||||
snd::getSystem()->resetAllSound();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelTitle_onTitleButtonEvent(SDTitleButtonEventHandler* handler, u32 component,
|
||||
u32 event, const controller::Interface* controller) {
|
||||
handler->onEventDerived(component, event, controller);
|
||||
void SDTitleButtonEventHandler::onEventDerived(u32 component, u32 event, const controller::Interface* controller) {
|
||||
iplSDChannelTitle_onTitleButtonEvent(this, component, event, controller);
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelTitle_onTitlePaneEvent(SDTitlePaneEventHandler* handler, u32 component,
|
||||
u32 event, const controller::Interface* controller) {
|
||||
handler->onEvent(component, event, const_cast<controller::Interface*>(controller));
|
||||
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
|
||||
iplSDChannelTitle_onTitlePaneEvent(this, component, event, static_cast<const controller::Interface*>(data));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -3,15 +3,15 @@
|
||||
#include <private/wd.h>
|
||||
#include <string.h>
|
||||
|
||||
s32 AOSSi_cancel_flag = 0;
|
||||
static u8 ipAddress[4] = {0};
|
||||
static u8 ipNetmask[4] = {0};
|
||||
static u8 ipGateway[4] = {0};
|
||||
static u8 primaryDns[4] = {0};
|
||||
static u8 secondaryDns[4] = {0};
|
||||
static void* (*allocateMemory)(u32, s32) = NULL;
|
||||
static void (*releaseMemory)(u32, void*, s32) = NULL;
|
||||
static void (*statusCallback)(void) = NULL;
|
||||
s32 AOSSi_cancel_flag;
|
||||
static u8 ipAddress[4];
|
||||
static u8 ipNetmask[4];
|
||||
static u8 ipGateway[4];
|
||||
static u8 primaryDns[4];
|
||||
static u8 secondaryDns[4];
|
||||
static void* (*allocateMemory)(u32, s32);
|
||||
static void (*releaseMemory)(u32, void*, s32);
|
||||
static void (*statusCallback)(void);
|
||||
static NCDIfConfig AOSSi_NcdIfConfig;
|
||||
static NCDIpConfig AOSSi_NcdIpConfig;
|
||||
|
||||
|
||||
@@ -763,7 +763,7 @@ unlock_driver:
|
||||
int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet* previousRecords,
|
||||
u32* changedIndex) {
|
||||
u32 previousIndex;
|
||||
u32 currentIndex;
|
||||
u32 currentIndex = 0;
|
||||
int found = 0;
|
||||
int result = 0;
|
||||
u32 ssidLength;
|
||||
@@ -774,7 +774,6 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
|
||||
AtermApRecord* previousRecord = previousRecords->entries;
|
||||
|
||||
|
||||
currentIndex = 0;
|
||||
for (; currentIndex < currentRecords->count; currentIndex++) {
|
||||
AtermSsidBuffer ssidName;
|
||||
ssidName.clear.word0 = 0;
|
||||
@@ -817,6 +816,8 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
|
||||
int currentHasAoss;
|
||||
int previousHasAoss;
|
||||
|
||||
previousHasAoss = 0;
|
||||
currentHasAoss = 0;
|
||||
aossSsidName.clear.word0 = 0;
|
||||
aossSsidName.clear.word1 = 0;
|
||||
aossSsidName.clear.word2 = 0;
|
||||
@@ -826,8 +827,6 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
|
||||
aossSsidName.clear.word6 = 0;
|
||||
aossSsidName.clear.word7 = 0;
|
||||
aossSsidName.clear.finalWord = 0;
|
||||
currentHasAoss = 0;
|
||||
previousHasAoss = 0;
|
||||
|
||||
currentRecord = currentRecords->entries;
|
||||
previousRecord = previousRecords->entries;
|
||||
@@ -1871,13 +1870,13 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
|
||||
union { u64 value; u8 bytes[8]; } counter;
|
||||
u32 initialValue[2];
|
||||
u8* outputBlock;
|
||||
s32 blockIndex;
|
||||
s32 blockOffset;
|
||||
u8* destinationBytes;
|
||||
const u8* sourceBytes;
|
||||
s32 pass;
|
||||
s32 blockCount;
|
||||
u32 rounds;
|
||||
s32 blockOffset;
|
||||
s32 blockCount;
|
||||
s32 pass;
|
||||
s32 blockIndex;
|
||||
int result = 1;
|
||||
|
||||
initialValue[1] = 0xA6A6A6A6;
|
||||
@@ -1896,7 +1895,7 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
|
||||
memcpy(destinationBytes + 8, sourceBytes, length);
|
||||
memcpy(block.bytes, initialValue, sizeof(initialValue));
|
||||
for (pass = 0; pass < 6; pass++) {
|
||||
for (blockIndex = 1, blockOffset = 8; blockIndex <= blockCount; blockIndex++, blockOffset += 8) {
|
||||
for (blockOffset = 8, blockIndex = 1; blockIndex <= blockCount; blockIndex++, blockOffset += 8) {
|
||||
u64 passBase = (u64)(s64)blockCount * (u64)(s64)pass;
|
||||
u8* stateBytes = block.bytes;
|
||||
|
||||
|
||||
@@ -38,10 +38,9 @@ extern "C" RakuStatus sRakuStatus;
|
||||
RakuStatus sRakuStatus;
|
||||
extern "C" OSMessageQueue sRakuMsgQueue;
|
||||
OSMessageQueue sRakuMsgQueue;
|
||||
static u32 startTimeHigh = 0;
|
||||
static u32 startTimeLow = 0;
|
||||
static bool active = false;
|
||||
static OSMessage messageSlot = NULL;
|
||||
static OSTime startTime;
|
||||
static bool active;
|
||||
static OSMessage messageSlot;
|
||||
static int displayState = 1;
|
||||
|
||||
extern "C" {
|
||||
@@ -82,9 +81,7 @@ private:
|
||||
void RakuRakuThread::syncRakuProgress() {
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
sRakuStatus.progress = *(RakuProgress*)this;
|
||||
OSTime time = OSGetTime();
|
||||
startTimeHigh = time >> 32;
|
||||
startTimeLow = time;
|
||||
startTime = OSGetTime();
|
||||
OSRestoreInterrupts(interrupts);
|
||||
}
|
||||
|
||||
@@ -140,9 +137,7 @@ int RakuRakuThread::start() {
|
||||
return 0;
|
||||
}
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
OSTime time = OSGetTime();
|
||||
startTimeHigh = time >> 32;
|
||||
startTimeLow = time;
|
||||
startTime = OSGetTime();
|
||||
mHeap = MEMCreateExpHeapEx(mHeapBuffer, 0x40000, 2);
|
||||
MEMInitAllocatorForExpHeap(&sRakuAllocator, mHeap, 32);
|
||||
mPriority = OSGetThreadPriority(OSGetCurrentThread()) - 1;
|
||||
@@ -218,7 +213,7 @@ int RakuRakuThread::getState() {
|
||||
default: displayState = 1; break;
|
||||
}
|
||||
if (displayState != 6 && displayState != 7 &&
|
||||
((u32)OSGetTime() - startTimeLow) / (OS_TIMER_CLOCK / 1000) >= 90000) {
|
||||
((u32)OSGetTime() - (u32)startTime) / (OS_TIMER_CLOCK / 1000) >= 90000) {
|
||||
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
|
||||
}
|
||||
OSRestoreInterrupts(interrupts);
|
||||
|
||||
@@ -17,16 +17,8 @@ namespace ipl {
|
||||
class SensitivityDrawing {
|
||||
public:
|
||||
static void draw(nand::File* texture);
|
||||
private:
|
||||
static void verticalScale(f32 height, f32& scale);
|
||||
static f32 horizontalScale(f32 width);
|
||||
static f32 projectY(s32 y, f32 scale);
|
||||
};
|
||||
|
||||
void SensitivityDrawing::verticalScale(f32 height, f32& scale) { scale = 0.5f * height / 768.0f; }
|
||||
f32 SensitivityDrawing::horizontalScale(f32 width) { return 0.5f * width / 1024.0f; }
|
||||
f32 SensitivityDrawing::projectY(s32 y, f32 scale) { return (y - 384) * scale; }
|
||||
|
||||
void SensitivityDrawing::draw(nand::File* texture) {
|
||||
GXRenderModeObj renderMode = *System::getRenderModeObj();
|
||||
nw4r::ut::Rect projection;
|
||||
@@ -55,9 +47,8 @@ void SensitivityDrawing::draw(nand::File* texture) {
|
||||
GXInitTexObjWrapMode(&image, GX_MIRROR, GX_MIRROR);
|
||||
f32 width = projection.GetWidth();
|
||||
f32 height = projection.GetHeight();
|
||||
f32 horizontalScale = SensitivityDrawing::horizontalScale(width);
|
||||
f32 verticalScale;
|
||||
SensitivityDrawing::verticalScale(height, verticalScale);
|
||||
f32 horizontalScale = (0.5f * width) / 1024.0f;
|
||||
f32 verticalScale = (0.5f * height) / 768.0f;
|
||||
int sample = WPADGetLatestIndexInBuf(controller->getChannel());
|
||||
DPDObject* object;
|
||||
DPDObject* first;
|
||||
@@ -85,7 +76,7 @@ void SensitivityDrawing::draw(nand::File* texture) {
|
||||
if (object->size != 0) {
|
||||
f32 radius = 0.15f * (object->size + 25);
|
||||
f32 x = (object->x - 512) * horizontalScale;
|
||||
f32 y = projectY(object->y, verticalScale);
|
||||
f32 y = (object->y - 384) * verticalScale;
|
||||
GXColor foreground = {255, 255, 255, 255};
|
||||
nw4r::ut::Rect rectangle(x - radius, -y + radius - -45.0f,
|
||||
x + radius, -y - radius - -45.0f);
|
||||
|
||||
@@ -36,6 +36,12 @@ extern "C" int abs(int value);
|
||||
|
||||
extern "C" void __VISetAdjustingValues(s32 horizontal, s32 vertical);
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
static s32 browserScrollDirection;
|
||||
}
|
||||
}
|
||||
|
||||
namespace ipl {
|
||||
class SensitivityDrawing {
|
||||
public:
|
||||
@@ -143,7 +149,6 @@ namespace ipl {
|
||||
|
||||
void* Setting::mem1Buffer_;
|
||||
void* Setting::mem2Buffer_;
|
||||
static s32 browserScrollDirection;
|
||||
|
||||
Setting::Setting(EGG::Heap* heap, int arg) : FaderSceneBase(heap) {
|
||||
unk_0x5C = 0;
|
||||
@@ -412,7 +417,7 @@ namespace ipl {
|
||||
"Setup/ScreenSave.html", "Setup/ScreenSave.html",
|
||||
"Setup/ScreenSave.html", "Setup/ScreenSave.html",
|
||||
"Setup/ScreenSave.html", "Setup/ScreenSave.html",
|
||||
"Setup/ScreenSave.html", "Setup/ScreenSave.html"};
|
||||
"Setup/ScreenSave.html", "Calendar"};
|
||||
|
||||
char basePath[100];
|
||||
char browserPath[100];
|
||||
@@ -438,8 +443,8 @@ namespace ipl {
|
||||
snprintf(browserPath, sizeof(browserPath), basePath, regionCodes[regionIndex],
|
||||
languageCodes[System::getLanguage()], regionPages[regionIndex]);
|
||||
} else if (mInitialArgument == ARG_UNK_6) {
|
||||
const char* pageNames[] = {"Calendar", "Display", "Sound", "Parental_Control",
|
||||
"Internet", "Wiiconnect24", "Update"};
|
||||
const char* pageNames[] = {"Display", "Sound", "Parental_Control", "Internet",
|
||||
"Wiiconnect24", "Update", "Update"};
|
||||
int directPage;
|
||||
for (directPage = 0; directPage < 7; directPage++) {
|
||||
if (strstr(mpStringBuffer->netSettingArg, pageNames[directPage]) != NULL) {
|
||||
@@ -2162,8 +2167,8 @@ namespace ipl {
|
||||
const char* versionSuffix[12] = {"J", "U", "E", "", "", "J", "K", "", "", "", "", "C"};
|
||||
u32 versionData[24] = {
|
||||
0x00010008, 0x48414B4A, 0x00010008, 0x48414B45, 0x00010008, 0x48414B50,
|
||||
0, 0, 0, 0, 0x00010008, 0x48414B4A, 0x00010008, 0x48414B4B,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0x00010008, 0x48414B43,
|
||||
0, 0, 0, 0, 0, 0, 0x00010008, 0x48414B4A, 0x00010008, 0x48414B4B,
|
||||
0, 0, 0, 0, 0, 0, 0x00010008, 0x48414B43,
|
||||
};
|
||||
u32 region = System::getRegion();
|
||||
sprintf(mpStringBuffer->version, "Ver. %d.%d%s", 4, 3, versionSuffix[region]);
|
||||
@@ -3740,13 +3745,13 @@ namespace ipl {
|
||||
layout::Animator* animation = mpWaitLayout->getAnim(0);
|
||||
animation->initFrame();
|
||||
animation->restart();
|
||||
mpWaitLayout->FindPaneByName("N_Wait")->SetVisible(true);
|
||||
mpWaitLayout->FindPaneByName("G_Wait")->SetVisible(true);
|
||||
snd::getSystem()->startSE("WIPL_SE_COPYING");
|
||||
}
|
||||
|
||||
void Setting::waitFinish() {
|
||||
mpWaitLayout->getAnim(0)->stop();
|
||||
mpWaitLayout->FindPaneByName("N_Wait")->SetVisible(false);
|
||||
mpWaitLayout->FindPaneByName("G_Wait")->SetVisible(false);
|
||||
snd::getSystem()->startSE("WIPL_SE_COPY_FINISH");
|
||||
}
|
||||
|
||||
@@ -3844,12 +3849,5 @@ namespace ipl {
|
||||
return mIsResetAcceptable;
|
||||
}
|
||||
|
||||
extern const wchar_t scNumber[10] = {
|
||||
L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'
|
||||
};
|
||||
extern const wchar_t scNumber2[10] = {
|
||||
L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'
|
||||
};
|
||||
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -5,22 +5,17 @@
|
||||
static OSThread usbapThread;
|
||||
static u8 usbapStack[4096];
|
||||
static OSMessageQueue usbapMessageQ;
|
||||
static wchar_t usbapNickname[12];
|
||||
static wchar_t usbapNickname[11];
|
||||
static OSMessage registrationMessage;
|
||||
static void (*registrationCallback)(int);
|
||||
static s32 registrationMode;
|
||||
static u16 enabledChannels;
|
||||
static u8* scanBuffer;
|
||||
// Registration buffer: a count byte followed by twenty MAC addresses.
|
||||
static u8* registeredAccessPoints;
|
||||
|
||||
static inline int FindRegisteredAddress(const u8* registered, const u8* address) {
|
||||
int index;
|
||||
for (index = 0; index < 20; ++index) {
|
||||
if (memcmp(address, ®istered[index * WD_BSSID_LENGTH + 1], WD_BSSID_LENGTH) == 0) break;
|
||||
}
|
||||
return index;
|
||||
}
|
||||
struct RegisteredAccessPoints {
|
||||
u8 count;
|
||||
u8 addresses[20][6];
|
||||
};
|
||||
static RegisteredAccessPoints* registeredAccessPoints;
|
||||
|
||||
extern "C" {
|
||||
static void* DoRegistration(void*);
|
||||
@@ -31,7 +26,7 @@ extern "C" BOOL USBAPStartRegistration(void*, void*, u32 priority, u32 mode,
|
||||
u16* buffer, u8* accessPoints) {
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
scanBuffer = (u8*)buffer;
|
||||
registeredAccessPoints = accessPoints;
|
||||
registeredAccessPoints = (RegisteredAccessPoints*)accessPoints;
|
||||
if (usbapThread.state != 0 && !OSIsThreadTerminated(&usbapThread)) {
|
||||
OSRestoreInterrupts(interrupts);
|
||||
return FALSE;
|
||||
@@ -83,13 +78,8 @@ struct USBAPScan {
|
||||
};
|
||||
|
||||
static void* DoRegistration(void*) {
|
||||
int failed, found, index;
|
||||
s32 count;
|
||||
WDBssDesc* accessPoint;
|
||||
int result;
|
||||
int address;
|
||||
const u8* registered;
|
||||
BOOL success;
|
||||
int result;
|
||||
if (WDCheckEnableChannel(&enabledChannels) != 0) {
|
||||
success = FALSE;
|
||||
if (registrationCallback != NULL) {
|
||||
@@ -126,20 +116,25 @@ static void* DoRegistration(void*) {
|
||||
memset(scan.ssidMask, 0, 8);
|
||||
memset(&scan.ssidMask[8], 255, 24);
|
||||
if (WDScanOnce(scanBuffer, 2048, (WDScanParam*)&scan) == 0) {
|
||||
count = *(u16*)scanBuffer;
|
||||
accessPoint = (WDBssDesc*)&scanBuffer[2];
|
||||
found = 0;
|
||||
failed = 0;
|
||||
for (index = 0; index < count; ++index) {
|
||||
u16 count = *(u16*)scanBuffer;
|
||||
WDBssDesc* accessPoint = (WDBssDesc*)&scanBuffer[2];
|
||||
int found = 0;
|
||||
int failed = 0;
|
||||
for (int index = 0; index < count; ++index) {
|
||||
if (accessPoint->ssidLength == 32 && strncmp((char*)accessPoint->ssid, "NWCUSBAP", 8) == 0) {
|
||||
registered = registeredAccessPoints;
|
||||
address = FindRegisteredAddress(registered, accessPoint->bssid);
|
||||
RegisteredAccessPoints* registered = registeredAccessPoints;
|
||||
int address;
|
||||
for (address = 0; address < 20; ++address) {
|
||||
if (memcmp(accessPoint->bssid, registered->addresses[address], 6) == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (address == 20) {
|
||||
USBAPSSID* response = (USBAPSSID*)accessPoint->ssid;
|
||||
if (response->flags == 1) {
|
||||
memcpy(®isteredAccessPoints[registeredAccessPoints[0] * WD_BSSID_LENGTH + 1], accessPoint->bssid, WD_BSSID_LENGTH);
|
||||
memcpy(registeredAccessPoints->addresses[registeredAccessPoints->count], accessPoint->bssid, 6);
|
||||
found = 1;
|
||||
++registeredAccessPoints[0];
|
||||
++registeredAccessPoints->count;
|
||||
} else if (response->flags == 0) {
|
||||
failed = 1;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "utility/iplCharacterCode.h"
|
||||
|
||||
extern "C" {
|
||||
BOOL USBAPStartRegistration(u64, u32, u32, void*, void (*)(int), u16*, u8*);
|
||||
BOOL USBAPStartRegistration(void*, void*, u32, u32, void*, void (*)(int), u16*, u8*);
|
||||
BOOL USBAPCancelRegistration();
|
||||
BOOL USBAPIsThreadTerminated();
|
||||
}
|
||||
@@ -40,7 +40,7 @@ void USBAPRegisterCallback(int result) {
|
||||
|
||||
void USBAPThread::Init(unsigned short* buffer, unsigned char* accessPoints) {
|
||||
int priority = OSGetThreadPriority(OSGetCurrentThread()) + 1;
|
||||
if (USBAPStartRegistration(0, priority,
|
||||
if (USBAPStartRegistration(NULL, NULL, priority,
|
||||
0, this, USBAPRegisterCallback, buffer, accessPoints) == 1) {
|
||||
OSReport("Registration started\n");
|
||||
}
|
||||
|
||||
@@ -10,6 +10,13 @@
|
||||
#undef IPL_SOUND_RECT_OUT_OF_LINE
|
||||
#undef AutoLock
|
||||
|
||||
extern "C" void __ct__Q23EGG20SimpleAudioMgrWithFxFv();
|
||||
extern "C" void __dt__Q34nw4r3snd11SoundHandleFv();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" {
|
||||
void __destroy_arr();
|
||||
void __dt__Q33ipl3snd10tagSSeInfoFv();
|
||||
}
|
||||
extern "C" void _seBlk__Q23ipl3snd();
|
||||
extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd;
|
||||
extern "C" const f32 scSoundZeroF;
|
||||
@@ -17,9 +24,19 @@ extern "C" const f32 scSoundOneF;
|
||||
extern "C" const f32 scSoundTwoF;
|
||||
extern "C" const f32 scSoundThirtyF;
|
||||
extern "C" const f32 scSoundSixtyF;
|
||||
extern "C" {
|
||||
void _savegpr_29();
|
||||
void pauseOffSE__Q33ipl3snd6SystemFv();
|
||||
void pauseOnSE__Q33ipl3snd6SystemFv();
|
||||
}
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" void _savegpr_24();
|
||||
extern "C" void _restgpr_24();
|
||||
extern "C" void _savegpr_26();
|
||||
extern "C" void _restgpr_26();
|
||||
extern "C" void sBannerSoundPlayer__Q23ipl3snd();
|
||||
extern "C" void pause__17BannerSoundPlayerFb();
|
||||
extern "C" void initFx__Q33ipl3snd6SystemFv();
|
||||
extern "C" void GetInstance__Q44nw4r3snd6detail9AxManagerFv();
|
||||
extern "C" void ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi();
|
||||
extern "C" void stop__17BannerSoundPlayerFUl();
|
||||
@@ -28,8 +45,9 @@ extern "C" void SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi();
|
||||
|
||||
namespace ipl {
|
||||
namespace snd {
|
||||
extern "C" void __vt__Q33ipl3snd6System();
|
||||
|
||||
inline System::System() {
|
||||
System::System() {
|
||||
}
|
||||
|
||||
struct tagSSeInfo {
|
||||
@@ -41,30 +59,39 @@ namespace ipl {
|
||||
u32 id;
|
||||
};
|
||||
|
||||
inline tagSSeInfo::tagSSeInfo() {
|
||||
tagSSeInfo::tagSSeInfo() {
|
||||
}
|
||||
|
||||
BOOL m_isLocked;
|
||||
struct tagSBgmInfo {
|
||||
nw4r::snd::SoundHandle handle;
|
||||
tagSBgmInfo();
|
||||
~tagSBgmInfo();
|
||||
};
|
||||
|
||||
inline tagSBgmInfo::tagSBgmInfo() {
|
||||
tagSBgmInfo::tagSBgmInfo() {
|
||||
}
|
||||
|
||||
inline tagSSeInfo::~tagSSeInfo() {
|
||||
tagSSeInfo::~tagSSeInfo() {
|
||||
}
|
||||
|
||||
inline tagSBgmInfo::~tagSBgmInfo() {
|
||||
tagSBgmInfo::~tagSBgmInfo() {
|
||||
}
|
||||
|
||||
tagSSeInfo _seBlk[16];
|
||||
tagSBgmInfo _bgmBlk;
|
||||
System sSystem;
|
||||
BannerSoundPlayer sBannerSoundPlayer;
|
||||
nw4r::snd::SoundHandle* _mainBGMHandle;
|
||||
BOOL m_isLocked;
|
||||
extern nw4r::snd::SoundHandle _bgmBlk;
|
||||
extern tagSSeInfo _seBlk[16];
|
||||
extern nw4r::snd::SoundHandle* _mainBGMHandle;
|
||||
|
||||
extern "C" asm void __dt__Q33ipl3snd6UnkClsFv() {
|
||||
nofralloc
|
||||
lis r3, _seBlk__Q23ipl3snd@ha
|
||||
lis r4, __dt__Q33ipl3snd10tagSSeInfoFv@ha
|
||||
addi r3, r3, _seBlk__Q23ipl3snd@l
|
||||
li r5, 0xc
|
||||
addi r4, r4, __dt__Q33ipl3snd10tagSSeInfoFv@l
|
||||
li r6, 0x10
|
||||
b __destroy_arr
|
||||
}
|
||||
|
||||
static const nw4r::snd::FxReverbHi::ReverbHiParam reverbHiParam = {
|
||||
0.0f,
|
||||
@@ -75,6 +102,148 @@ namespace ipl {
|
||||
1.0f,
|
||||
};
|
||||
|
||||
void System::stopBGM(int frames) {
|
||||
if (_mainBGMHandle && _mainBGMHandle->IsAttachedSound()) {
|
||||
_mainBGMHandle->Stop(frames);
|
||||
}
|
||||
}
|
||||
|
||||
void System::muteOnBGM(int frames) {
|
||||
nw4r::snd::SoundHandle* handle = _mainBGMHandle;
|
||||
if (handle && handle->IsAttachedSound()) handle->SetVolume(0.0f, frames);
|
||||
}
|
||||
|
||||
void System::muteOffBGM(int frames) {
|
||||
nw4r::snd::SoundHandle* handle = _mainBGMHandle;
|
||||
if (handle && handle->IsAttachedSound()) handle->SetVolume(1.0f, frames);
|
||||
}
|
||||
|
||||
void System::pauseOnSE() {
|
||||
for (int index = 0; index < 16; ++index) {
|
||||
if (_seBlk[index].handle.IsAttachedSound()) {
|
||||
_seBlk[index].handle.Pause(true, 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOffSE() {
|
||||
for (int index = 0; index < 16; ++index) {
|
||||
if (_seBlk[index].handle.IsAttachedSound()) {
|
||||
_seBlk[index].handle.Pause(false, 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOnBGM() {
|
||||
if (_mainBGMHandle) {
|
||||
if (_mainBGMHandle->IsAttachedSound()) _mainBGMHandle->Pause(true, 5);
|
||||
pauseOnSE();
|
||||
sBannerSoundPlayer.pause(true);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_A, 250);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_B, 250);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_C, 250);
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOffBGM() {
|
||||
if (_mainBGMHandle) {
|
||||
initFx();
|
||||
if (_mainBGMHandle->IsAttachedSound()) _mainBGMHandle->Pause(false, 5);
|
||||
pauseOffSE();
|
||||
sBannerSoundPlayer.pause(false);
|
||||
}
|
||||
}
|
||||
|
||||
void System::stopSE(nw4r::snd::SoundHandle* handle, int frames) {
|
||||
tagSSeInfo* block;
|
||||
int i;
|
||||
if (handle != NULL && handle->IsAttachedSound()) {
|
||||
for (i = 0; i < 16; i++) {
|
||||
block = &_seBlk[i];
|
||||
if (handle == &block->handle) {
|
||||
block->handle.Stop(frames);
|
||||
block->name = NULL;
|
||||
block->id = 0xFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" asm void resetAllSound__Q33ipl3snd6SystemFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
stw r0, 0x24(r1)
|
||||
addi r11, r1, 0x20
|
||||
bl _savegpr_26
|
||||
li r26, 0
|
||||
lis r28, _seBlk__Q23ipl3snd@ha
|
||||
lis r3, 1
|
||||
li r31, 0
|
||||
mr r29, r26
|
||||
addi r28, r28, _seBlk__Q23ipl3snd@l
|
||||
subi r30, r3, 1
|
||||
resetAllSound_loop:
|
||||
lwzx r3, r28, r31
|
||||
add r27, r28, r31
|
||||
cmpwi r3, 0
|
||||
beq resetAllSound_clear
|
||||
lwz r12, 0(r3)
|
||||
li r4, 0
|
||||
lwz r12, 0x18(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
resetAllSound_clear:
|
||||
stw r29, 0x4(r27)
|
||||
addi r26, r26, 1
|
||||
cmpwi r26, 0x10
|
||||
addi r31, r31, 0xc
|
||||
stw r30, 0x8(r27)
|
||||
blt resetAllSound_loop
|
||||
lwz r3, _mainBGMHandle__Q23ipl3snd
|
||||
cmpwi r3, 0
|
||||
beq resetAllSound_banner
|
||||
lwz r0, 0(r3)
|
||||
cmpwi r0, 0
|
||||
beq resetAllSound_banner
|
||||
lwz r3, 0(r3)
|
||||
li r4, 0
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x18(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
resetAllSound_banner:
|
||||
lis r31, sBannerSoundPlayer__Q23ipl3snd@ha
|
||||
li r4, 0
|
||||
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl stop__17BannerSoundPlayerFUl
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 0
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 1
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 2
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
lfs f1, scSoundZeroF
|
||||
li r4, 0
|
||||
bl SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi
|
||||
lfs f1, scSoundZeroF
|
||||
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl setMasterVolume__17BannerSoundPlayerFf
|
||||
addi r11, r1, 0x20
|
||||
bl _restgpr_26
|
||||
lwz r0, 0x24(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
}
|
||||
|
||||
void System::shutup(BOOL shutUpDMA) {
|
||||
if (m_isLocked == shutUpDMA) {
|
||||
return;
|
||||
@@ -111,10 +280,32 @@ namespace ipl {
|
||||
sBannerSoundPlayer.setMasterVolume(0.9f);
|
||||
}
|
||||
|
||||
extern "C" const f32 scSoundZeroF = 0.0f;
|
||||
|
||||
void System::stopBannerSound(int unk) {
|
||||
sBannerSoundPlayer.stop(unk);
|
||||
}
|
||||
|
||||
BOOL System::checkTmpSoundFile(void* data, u32 size) {
|
||||
return sBannerSoundPlayer.checkData(data, size, false);
|
||||
}
|
||||
|
||||
void System::initFx() {
|
||||
setFxReverbHi(nw4r::snd::AUX_A, &reverbHiParam);
|
||||
}
|
||||
|
||||
#pragma force_active on
|
||||
|
||||
}
|
||||
}
|
||||
namespace nw4r {
|
||||
namespace snd {
|
||||
SoundHandle::SoundHandle() : mSound(NULL) {}
|
||||
}
|
||||
}
|
||||
namespace ipl {
|
||||
namespace snd {
|
||||
|
||||
void System::calc() {
|
||||
EGG::SimpleAudioMgr::calc();
|
||||
sBannerSoundPlayer.calc();
|
||||
@@ -125,9 +316,9 @@ namespace ipl {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
EGG::ArcPlayer::startSound(&_bgmBlk.handle, bgmName);
|
||||
_mainBGMHandle = &_bgmBlk.handle;
|
||||
return &_bgmBlk.handle;
|
||||
EGG::ArcPlayer::startSound(&_bgmBlk, bgmName);
|
||||
_mainBGMHandle = &_bgmBlk;
|
||||
return &_bgmBlk;
|
||||
}
|
||||
|
||||
nw4r::snd::SoundHandle* System::startSE(const char* sndName) {
|
||||
@@ -196,7 +387,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
block->handle.Stop(0);
|
||||
EGG::ArcPlayer::startSound(&block->handle, sndIndex);
|
||||
mSoundArchivePlayer.StartSound(&block->handle, sndIndex);
|
||||
block->id = sndIndex;
|
||||
return (int)block;
|
||||
}
|
||||
@@ -294,27 +485,6 @@ namespace ipl {
|
||||
return (int)block;
|
||||
}
|
||||
|
||||
void System::stopBGM(int frames) {
|
||||
if (_mainBGMHandle && _mainBGMHandle->IsAttachedSound()) {
|
||||
_mainBGMHandle->Stop(frames);
|
||||
}
|
||||
}
|
||||
|
||||
void System::stopSE(nw4r::snd::SoundHandle* handle, int frames) {
|
||||
tagSSeInfo* block;
|
||||
int i;
|
||||
if (handle != NULL && handle->IsAttachedSound()) {
|
||||
for (i = 0; i < 16; i++) {
|
||||
block = &_seBlk[i];
|
||||
if (handle == &block->handle) {
|
||||
block->handle.Stop(frames);
|
||||
block->name = NULL;
|
||||
block->id = 0xFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void System::stopAllSound(int unk) {
|
||||
int frame;
|
||||
tagSSeInfo* block;
|
||||
@@ -338,137 +508,6 @@ namespace ipl {
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_C, frame);
|
||||
}
|
||||
|
||||
extern "C" asm void resetAllSound__Q33ipl3snd6SystemFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
stw r0, 0x24(r1)
|
||||
addi r11, r1, 0x20
|
||||
bl _savegpr_26
|
||||
li r26, 0
|
||||
lis r28, _seBlk__Q23ipl3snd@ha
|
||||
lis r3, 1
|
||||
li r31, 0
|
||||
mr r29, r26
|
||||
addi r28, r28, _seBlk__Q23ipl3snd@l
|
||||
subi r30, r3, 1
|
||||
resetAllSound_loop:
|
||||
lwzx r3, r28, r31
|
||||
add r27, r28, r31
|
||||
cmpwi r3, 0
|
||||
beq resetAllSound_clear
|
||||
lwz r12, 0(r3)
|
||||
li r4, 0
|
||||
lwz r12, 0x18(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
resetAllSound_clear:
|
||||
stw r29, 0x4(r27)
|
||||
addi r26, r26, 1
|
||||
cmpwi r26, 0x10
|
||||
addi r31, r31, 0xc
|
||||
stw r30, 0x8(r27)
|
||||
blt resetAllSound_loop
|
||||
lwz r3, _mainBGMHandle__Q23ipl3snd
|
||||
cmpwi r3, 0
|
||||
beq resetAllSound_banner
|
||||
lwz r0, 0(r3)
|
||||
cmpwi r0, 0
|
||||
beq resetAllSound_banner
|
||||
lwz r3, 0(r3)
|
||||
li r4, 0
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x18(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
resetAllSound_banner:
|
||||
lis r31, sBannerSoundPlayer__Q23ipl3snd@ha
|
||||
li r4, 0
|
||||
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl stop__17BannerSoundPlayerFUl
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 0
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 1
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 2
|
||||
li r5, 0
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
lfs f1, scSoundZeroF
|
||||
li r4, 0
|
||||
bl SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi
|
||||
lfs f1, scSoundZeroF
|
||||
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl setMasterVolume__17BannerSoundPlayerFf
|
||||
addi r11, r1, 0x20
|
||||
bl _restgpr_26
|
||||
lwz r0, 0x24(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
namespace nw4r {
|
||||
namespace snd {
|
||||
inline SoundHandle::SoundHandle() : mSound(NULL) {}
|
||||
}
|
||||
}
|
||||
namespace ipl {
|
||||
namespace snd {
|
||||
|
||||
void System::muteOnBGM(int frames) {
|
||||
nw4r::snd::SoundHandle* handle = _mainBGMHandle;
|
||||
if (handle && handle->IsAttachedSound()) handle->SetVolume(scSoundZeroF, frames);
|
||||
}
|
||||
|
||||
void System::muteOffBGM(int frames) {
|
||||
nw4r::snd::SoundHandle* handle = _mainBGMHandle;
|
||||
if (handle && handle->IsAttachedSound()) handle->SetVolume(scSoundOneF, frames);
|
||||
}
|
||||
|
||||
void System::pauseOnBGM() {
|
||||
if (_mainBGMHandle) {
|
||||
if (_mainBGMHandle->IsAttachedSound()) _mainBGMHandle->Pause(true, 5);
|
||||
pauseOnSE();
|
||||
sBannerSoundPlayer.pause(true);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_A, 250);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_B, 250);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_C, 250);
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOffBGM() {
|
||||
if (_mainBGMHandle) {
|
||||
initFx();
|
||||
if (_mainBGMHandle->IsAttachedSound()) _mainBGMHandle->Pause(false, 5);
|
||||
pauseOffSE();
|
||||
sBannerSoundPlayer.pause(false);
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOnSE() {
|
||||
for (int index = 0; index < 16; ++index) {
|
||||
if (_seBlk[index].handle.IsAttachedSound()) {
|
||||
_seBlk[index].handle.Pause(true, 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void System::pauseOffSE() {
|
||||
for (int index = 0; index < 16; ++index) {
|
||||
if (_seBlk[index].handle.IsAttachedSound()) {
|
||||
_seBlk[index].handle.Pause(false, 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void System::setOutputMode(EAudioOutputMode mode) {
|
||||
nw4r::snd::OutputMode outputMode;
|
||||
|
||||
@@ -550,14 +589,6 @@ namespace snd {
|
||||
return sBannerSoundPlayer.start(data, size);
|
||||
}
|
||||
|
||||
void System::stopBannerSound(int unk) {
|
||||
sBannerSoundPlayer.stop(unk);
|
||||
}
|
||||
|
||||
BOOL System::checkTmpSoundFile(void* data, u32 size) {
|
||||
return sBannerSoundPlayer.checkData(data, size, false);
|
||||
}
|
||||
|
||||
long System::clipGELT_S32(long value, long lo, long hi) {
|
||||
long range = hi - lo;
|
||||
|
||||
@@ -576,10 +607,5 @@ namespace snd {
|
||||
|
||||
return value;
|
||||
}
|
||||
extern "C" const f32 scSoundZeroF = 0.0f;
|
||||
extern "C" const f32 scSoundTwoF = 2.0f;
|
||||
extern "C" const f32 scSoundOneF = 1.0f;
|
||||
extern "C" const f32 scSoundThirtyF = 30.0f;
|
||||
extern "C" const f32 scSoundSixtyF = 60.0f;
|
||||
} // namespace snd
|
||||
} // namespace ipl
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#define IPL_KEYBOARD_MEMO_GET_SAVE_DATA
|
||||
#define IPL_SOUND_RECT_OUT_OF_LINE
|
||||
#include "system/iplKeyboard.h"
|
||||
|
||||
@@ -219,7 +218,9 @@ namespace ipl {
|
||||
u8* usedSystemDict = System::getZiDicData(i);
|
||||
u8* usedOemDict = System::getZiDicData(oemIndex);
|
||||
|
||||
usedSystemDict = usedSystemDict != NULL ? usedSystemDict : systemDict;
|
||||
if (usedSystemDict == NULL) {
|
||||
usedSystemDict = systemDict;
|
||||
}
|
||||
if (usedOemDict == NULL) {
|
||||
usedOemDict = oemDict;
|
||||
}
|
||||
@@ -744,7 +745,3 @@ namespace ipl {
|
||||
}
|
||||
} // namespace keyboard
|
||||
} // namespace ipl
|
||||
|
||||
textinput::extend::savedata::MemoSetting textinput::extend::memo::Manager::getSaveData() {
|
||||
return mMemoSetting;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ from pathlib import Path
|
||||
|
||||
EXPECTED_DOL_SHA1 = "26116613f624061ba99c8d1a299aaa6efa85670d"
|
||||
EXPECTED_TOTAL_UNITS = 1027
|
||||
EXPECTED_TOTAL_CODE = 2995176
|
||||
EXPECTED_TOTAL_CODE = 2995188
|
||||
EXPECTED_TOTAL_DATA = 1832684
|
||||
EXPECTED_TOTAL_FUNCTIONS = 12563
|
||||
INTEGER_PATTERN = re.compile(r"-?(0|[1-9][0-9]*)\Z")
|
||||
|
||||
@@ -1,122 +0,0 @@
|
||||
# Data lane d1
|
||||
|
||||
Base eecf16f0, fetched origin before inspection. Owned sources agree with origin/main. Initial full quick gate PASS, SHA1 26116613f624061ba99c8d1a299aaa6efa85670d, zero regressions.
|
||||
|
||||
| Unit | Initial matched data / total | Initial exact functions | Initial matched code |
|
||||
|---|---|---|---|
|
||||
| OSUtf | 0 / 48704 | 4 / 4 | 568 / 568 |
|
||||
| iplKeyboard | 8 / 1184 | 30 / 32 | 4680 / 6024 |
|
||||
| iplController | 80 / 696 | 84 / 84 | 5708 / 5708 |
|
||||
| d_nhttp | 16 / 720 | 22 / 22 | 3180 / 3180 |
|
||||
|
||||
All four pool_diff checks identical. Inspected both ELF symbol tables, all owned non-text section bytes, and relocation records with pyelftools.
|
||||
|
||||
## OSUtf
|
||||
|
||||
The 93 typed u16 lookup pages exactly match. The only 372 differing bytes are the 93 non-null pointers in UcsSjisTable. Original extraction retained absolute DOL addresses without relocation records because symbols.txt marks the pointer table noreloc. Built C table has 93 R_PPC_ADDR32 relocations to the correct UcsXX pages. First original values at offsets 0xba40, 0xba4c, 0xba50 are 0x81674228, 0x81674428, 0x81674628, precisely Ucs00, Ucs03, Ucs04 in symbols.txt. Remove noreloc only from the pointer table and describe data:4byte. Keep the u16 pages noreloc. No symbol address, size, section boundary, source object, or total byte count changes. Regenerated extraction now reports .data 100%, matched_data 48704/48704.
|
||||
|
||||
## iplController
|
||||
|
||||
All 616 original .data bytes and all 133 relocation records match built prefix exactly. All other sections match. Built .data is 752 bytes: Base vtable is 140 bytes instead of original extraction's 144, followed by a 140-byte weak Interface vtable at 0x264. Original trailing four bytes are zero without relocations, not a virtual slot. Existing original vtables and member-pointer objects have identical typed source and relocations. Extra weak abstract-base vtable is linker discarded in the already Matching unit, and current DOL hash proves linked data. No dummy padding, forced placement, or removing real virtual functions is justified.
|
||||
|
||||
## d_nhttp
|
||||
|
||||
Built .data 701 bytes is identical to original 704-byte prefix; last three extraction bytes are zero linker alignment. Built .sdata 6 bytes is identical to original 8-byte prefix; last two bytes zero alignment, and this section already scores 100%. The only relocation is __NHTTPVersion to first version string at offset zero on both sides. .sbss 8 bytes exact. No missing table or object. Changing array counts or adding padding would violate task policy. Already Matching DOL proves these linked bytes.
|
||||
|
||||
## iplKeyboard
|
||||
|
||||
Built .data 1161 bytes is byte-identical to original 1168-byte prefix. Last seven extraction bytes are zero alignment. Built .sdata 6 bytes is identical to original 8-byte prefix, with two zero alignment bytes. .sdata2 exact. All 85 .data relocation offsets and target names match; twelve create switch-table addends differ by exactly four bytes because create has 317 versus 318 instructions. Other data discrepancy is coarse original string symbols versus individual compiler literals. Do not shrink symbols or alter ownership to hide that. Investigate create source variations for switch-table instruction addresses.
|
||||
|
||||
Clean full four-unit gate PASS after OSUtf metadata correction; zero regressions, exact counts 4/30/84/22 unchanged, global matched data 93.05085 -> 95.70837. DOL hash correct.
|
||||
|
||||
Keyboard create attempt 1: separate ArcResourceLink declaration/assignment and omit value-initialization parentheses. Output unchanged, 317/318 instructions, objdiff 94.18239%. Reverted.
|
||||
|
||||
Keyboard create attempt 2: obtain the archive buffer directly at ArcResourceLink::Set instead of extending its lifetime across allocation. 317/318 instructions, 93.03459% objdiff, exact counts unchanged. Reverted.
|
||||
|
||||
Keyboard create attempt 3: separate allocator declaration/assignment and declare OEM dictionary before system dictionary. 317/318 instructions, 94.22956% objdiff, exact counts unchanged. Changed loop register assignment but did not recover the missing instruction or switch-table addends. Reverted; fuzzy gain alone is not accepted. Remaining create is 94.18239%, with allocation register lifetimes, loop registers, and one-instruction size discrepancy. Three distinct source attempts complete.
|
||||
|
||||
Keyboard getSaveData attempt 1: under a macro defined only by iplKeyboard.cpp, declare the existing virtual getter out of line, then implement the real member as `return mMemoSetting`. This emits the real function already present in the original object, without forcing references or changing any vtable slot. ctxdiff 18/18 instructions, diffs 0; exact-name objdiff 100%. Unit exact functions 30 -> 31 and matched code 4680 -> 4752. No new assembly. Other header consumers retain their existing inline definition. Stop iteration on this function because it is exact.
|
||||
|
||||
Final upstream check: origin/main advanced to 9eb08c48 while this leaf was running. None of the four owned units or the guarded getter header changed between eecf16f0 and current origin/main. No rebase or cross-worktree operations performed.
|
||||
|
||||
Data-lane audit: OSUtf has no unresolved section; all functions exact. Controller has no unresolved function, no byte or relocation difference in original section ranges, and only the linker-discarded weak Interface table beyond them. NHTTP has no unresolved function and only final zero alignment bytes in .data. Keyboard has exactly one open function, create, with three distinct source attempts above; getter is now exact. No additional non-text sections, missing statics, initializer differences, or pointer-table differences were found in these four original objects. Section ownership and symbol sizes remain unchanged throughout.
|
||||
|
||||
## Final verification
|
||||
|
||||
Clean non-quick four-unit gate PASS. Full build ok; DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d; regressions 0; forbidden patterns 0; readability warnings 0. Fresh pool_diff checks all identical. Fresh getter ctxdiff 18/18 instructions, diffs 0. Final exact counts OSUtf 4/4, keyboard 31/32, controller 84/84, NHTTP 22/22. Final matched data OSUtf 48704/48704, keyboard 8/1184, controller 80/696, NHTTP 16/720. Final matched code OSUtf 568/568, keyboard 4752/6024, controller 5708/5708, NHTTP 3180/3180. The gate passes but the all-data-100% objective is not met for the latter three units; no claim of completion for those sections. All remaining genuine unmatched functions have three distinct attempts recorded. Final full gate output is /tmp/data-d1.final-gate.txt.
|
||||
|
||||
# Round 2, after #730
|
||||
|
||||
Fresh leaf HEAD bcb2ac0e equals fetched origin/main at start. Initial quick three-unit gate PASS, DOL SHA1 correct, zero regressions. Keyboard data 8/1184, exact 31/32, code 4752/6024; controller data 80/696, exact 84/84, code 5708/5708; NHTTP data 16/720, exact 22/22, code 3180/3180. All three pool_diff checks identical. Rechecked ELF bytes, nm, objdump symbol tables and relocations. Prior round's byte/relocation findings remain reproducible.
|
||||
|
||||
Inspect the installed objdiff 3.4.5 data comparison algorithm to distinguish relocation mismatches from legal linker tail alignment; do not alter comparison settings or tool code to hide mismatches. Investigate source changes and extraction metadata only when supported by byte/relocation evidence.
|
||||
|
||||
Round 2 keyboard create attempt 1: replace the second loop's parallel OEM induction variable with the meaningful expression `i + EZTX_LANG_MAX`. Objdiff create 94.50944%, 313/318 instructions, no exact function loss. Compiler strength-reduces both indices into one byte offset and removes five instructions instead of recovering the target's independently maintained OEM index. Not accepted.
|
||||
|
||||
Objdiff 3.4.5 diff_data_section compares bytes up to maximum data symbol extent and only uses raw byte match percentage when every original relocation matches. This explains keyboard .data's 25% despite identical bytes: create jump-table relocations fail. The final keyboard data string ends at 1161 on both sides, so those seven section tail bytes do not obstruct .data matching. NHTTP original last coarse blob includes tail alignment and extends to 704 while built last literal ends at 701, so its 99.786476% score is the byte ratio 2*701/(704+701). Controller's extra weak Interface table extends built symbol extent to 752 against original 616. These are specific measured causes, not guessed missing objects. Do not change symbol sizes or suppress the real extra source vtable to fake matching.
|
||||
|
||||
Round 2 keyboard create attempt 2: express both OEM indices as `i + EZTX_LANG_MAX`, removing parallel induction variables. 309/318 instructions, create 92.28616%, no exact function loss. Both loops strength-reduce OEM addressing to the system byte offset plus 40, unlike target's separate index addition and shift. Reverted.
|
||||
|
||||
Round 2 keyboard create attempt 4, memo_declaration_order: src 0x4f4 base 0x4f8 insns 317/318; create 94.157234%; code 4752, data 8, exact-name functions 31.
|
||||
|
||||
Round 2 keyboard create attempt 5, memo_copy_initialization: src 0x4b8 base 0x4f8 insns 302/318; create 87.8522%; code 4752, data 8, exact-name functions 31.
|
||||
|
||||
Round 2 keyboard create attempt 6, dictionary_fallback_order: src 0x4f4 base 0x4f8 insns 317/318; create 93.83648%; code 4752, data 8, exact-name functions 31.
|
||||
|
||||
Round 2 keyboard create attempt 7, dictionary_ternary_fallback: src 0x4fc base 0x4f8 insns 319/318; create 93.93082%; code 4752, data 8, exact-name functions 31.
|
||||
|
||||
Round 2 keyboard create attempt 8, oem_load_after_system_fallback: src 0x4f4 base 0x4f8 insns 317/318; create 94.57861%; code 4752, data 8, exact-name functions 31.
|
||||
|
||||
Round 2 keyboard create attempt 9, signed_counter_unsigned_oem: src 0x4f4 base 0x4f8 insns 317/318; create 94.18239%; code 4752, data 8, exact-name functions 31.
|
||||
|
||||
Round 2 keyboard create attempt 3: use unsigned loop induction variables for both dictionaries, retaining parallel OEM indices. Output unchanged at 317/318 instructions and 94.18239%; exact functions remain 31. Reverted.
|
||||
|
||||
Round 2 controller vtable attempt 1: make the abstract Interface destructor an inline non-pure destructor under a source-only header guard. Abstractness remains enforced by decide and setForceInvalid; this tests whether the pure destructor caused unwanted table emission. All 84 original functions remain 100%, but extra Interface table remains and .data stays 92.03601%. Reverted both source and header; no justification for changing destructor semantics without a match.
|
||||
|
||||
Round 2 keyboard create attempt 10, system_ternary_fallback: src 0x4f8 base 0x4f8 insns 318/318; create 94.00944% ; code 4752, data 1176, exact-name functions 31.
|
||||
|
||||
Round 2 keyboard create attempt 11, oem_ternary_fallback: src 0x4f8 base 0x4f8 insns 318/318; create 94.00944% ; code 4752, data 1176, exact-name functions 31.
|
||||
|
||||
Round 2 keyboard create attempt 12, system_inverted_ternary: src 0x4f4 base 0x4f8 insns 317/318; create 94.35535% ; code 4752, data 8, exact-name functions 31.
|
||||
|
||||
Round 2 keyboard create attempt 13, oem_inverted_ternary: src 0x4f4 base 0x4f8 insns 317/318; create 94.35535% ; code 4752, data 8, exact-name functions 31.
|
||||
|
||||
Round 2 candidate: retain attempt 10's ordinary system dictionary fallback selection `usedSystemDict != NULL ? usedSystemDict : systemDict`. OEM selection remains unchanged. The resulting create has 318 instructions, and all twelve destination switch-table relocation addends now exactly match the original object. Both .data byte extents are 1161, and every one of the 85 original .data relocation records matches; objdiff .data is 100%, raising matched_data from 8 to 1176 of 1184. No string, symbol, section ownership, source object, or data byte is altered; no padding or assembly is introduced. This is a genuine relocation-data match from a readable conditional expression, even though create remains instruction-nonexact at 94.00944%. Instruction-exact count remains 31/32. Attempts 11 through 13 are not retained. The data-lane task permits improvements with unchanged exact counts; the generic worker count-growth criterion is not met.
|
||||
|
||||
Candidate quick three-unit gate PASS, zero regressions, zero forbidden patterns, zero readability warnings, correct DOL SHA1. Keyboard .data 100%; .sdata remains 85.71429%, .sdata2 100%. Controller .data 92.03601%; other data sections 100%. NHTTP .data 99.786476%; .sdata and .sbss 100%. No original extab/extabindex, .bss, or additional small-data sections are present in the owned objects.
|
||||
|
||||
Remaining keyboard .sdata contains `arc\0` at offset 0, followed by empty 16-bit wchar string at offset 4. Source literal is 2 bytes, extraction labels it as a 4-byte object including two alignment zeros. All instructions using it still match exactly. Changing L"" to an artificially longer null literal or enlarging its symbol would fabricate storage; neither is accepted. NHTTP and controller residual section differences remain exactly the extraction alignment/weak-vtable findings above. They contain no unmatched functions. All failed experimental source and header changes were restored before the candidate gate.
|
||||
|
||||
Attempts 4-9 detail: 4 reverses the two MemoSetting declarations; 5 uses direct initialization for the loaded setting and copied setting; 6 reverses system/OEM fallback statement order; 7 expresses both fallback selections as ternaries; 8 postpones the OEM pointer load until after system fallback selection; 9 moves OEM induction initialization outside the first loop and uses an unsigned system index. Each was independently compiled, measured, and reverted. Attempts 10/12 use respectively non-null/null-first system ternaries; 11/13 use respectively non-null/null-first OEM ternaries. Only 10 is retained. The single remaining unmatched function, keyboard create, has thirteen distinct source-level experiments in this round, in addition to the three original attempts. Controller and NHTTP have zero remaining unmatched original functions.
|
||||
|
||||
Final fetch during verification reached f6fd2780; owned three sources do not differ between this branch's base and fetched origin/main. The worktree remains on its assigned leaf branch.
|
||||
|
||||
## Round 2 final clean gate
|
||||
|
||||
Final non-quick gate over all three units PASS. Full 43U build succeeds and DOL SHA1 is 26116613f624061ba99c8d1a299aaa6efa85670d. Regressions 0; forbidden additions 0; readability warnings 0; all pools identical. Keyboard exact functions 31 -> 31, matched code 4752 -> 4752, matched data 8 -> 1176 of 1184; .data 100%. Controller exact 84 -> 84, code 5708 -> 5708, data 80 -> 80 of 696. NHTTP exact 22 -> 22, code 3180 -> 3180, data 16 -> 16 of 720. No instruction-exact function count dropped. Fresh relocation comparison confirms every original keyboard .data relocation matches. Final gate output /tmp/data-d1-r2.final-gate.txt.
|
||||
|
||||
Incomplete data sections: keyboard .sdata 85.71429% from extracted empty-string extent; controller .data 92.03601% from linker-discarded weak Interface vtable and unit-boundary alignment; NHTTP .data 99.786476% from last extraction blob covering three tail alignment zeros. No symbol size or section boundary has been changed to improve the score. The all-data-100% goal remains incomplete. Remaining function create is 94.00944%, 318/318 instructions with 210 instruction differences; register allocation, dictionary-loop instruction scheduling, and MemoSetting temporary stack placement still differ. Every remaining function has at least three distinct logged attempts; all thirteen are retained as evidence, with only the data-exact candidate in the source diff.
|
||||
|
||||
# Round 3, after #739
|
||||
|
||||
Base 775167f4 fetched origin/main before starting. Initial quick gate PASS, DOL SHA1 correct, instruction-exact functions controller 84/84, NHTTP 22/22, keyboard 31/32. Matched data respectively 80/696, 16/720, 1176/1184; matched code respectively 5708/5708, 3180/3180, 4752/6024. All string pools identical. The human explicitly authorizes proven symbol extent corrections that exclude alignment or neighbour bytes while keeping addresses and section totals unchanged. This supersedes earlier rounds' interpretation that every extent correction was forbidden.
|
||||
|
||||
Controller proof: lbl_816346A8 -> kDownMember__Q23ipl10controller, same address 0x816346A8 and size 12; Master::down relocations at .text+0xcb6/+0xcc2 load it, and member-pointer words {0,0x14,0} encode Interface::down's vtable offset, byte-identical to the typed source member pointer.
|
||||
Controller proof: lbl_816346B4 -> kDownTrgMember__Q23ipl10controller, same address 0x816346B4 and size 12; Master::downTrg relocations at .text+0xcf6/+0xd02 load it, and words {0,0x18,0} encode Interface::downTrg, matching the source member pointer.
|
||||
Controller proof: lbl_816346C0 -> kUpTrgMember__Q23ipl10controller, same address 0x816346C0 and size 12; Master::upTrg relocations at .text+0xd36/+0xd42 load it, and words {0,0x1c,0} encode Interface::upTrg, matching the source member pointer.
|
||||
Controller proof: lbl_816346CC -> kRepeatMember__Q23ipl10controller, same address 0x816346CC and size 12; Master::repeat relocations at .text+0xd7e/+0xd8a load it, and words {0,0x30,0} encode Interface::repeat, matching the source member pointer.
|
||||
Controller extent proof: __vt__Q33ipl10controller4Base at unchanged 0x81634880 is 0x8c, not 0x90: the real class has two header words plus 33 virtual entries, with 33 target relocations from +0x08 through final Base::read at +0x88; the compiler emits exactly 140 bytes, and the final unrelocated zero word at +0x8c is alignment before neighbour FreeStyle at 0x81634910. Leave that word unowned, keep .data section size 616 and all addresses unchanged. Extra emitted weak Interface table is ignored, not suppressed.
|
||||
|
||||
Controller measurement after proven four renames and Base extent correction: every non-text section 100%, matched_data 696/696. No source or section boundary change.
|
||||
|
||||
NHTTP extent proof: lbl_8166D328 stays at 0x8166D328 and spans the real emitted diagnostic string pool from compiler literal @1000 at unit .data+0xb8 through @1126 at +0x29c, a char[33] holding NHTTPDisableVerifyOptionForDebug and its final NUL at +0x2bc; its real pool extent is 0x205, not 0x208. Both objects agree on all 517 bytes in that span and every literal's internal offset; the three bytes +0x2bd..+0x2bf are unreferenced trailing alignment. NHTTPAddHeaderField's .text+0x452/+0x45a relocations reference the pool start; the source's last function references the final ordinary literal. Leave those three alignment bytes unowned, with .data size still 704 and all addresses unchanged. No symbol rename is needed because .data has no relocations and its byte comparison then spans the same emitted pool extent.
|
||||
|
||||
NHTTP measurement after proven string-pool extent correction: .data, .sdata, .sbss all 100%, matched_data 720/720; all 22 original functions remain exact in objdiff.
|
||||
|
||||
Keyboard extent proof: lbl_816961FC stays at 0x816961FC, with size 2 instead of 4: start's .text+0xf84 and +0xfe4 SDA relocations load the same ordinary empty wchar_t literal for setWCString and setTitleText; wchar_t[1] is 2 bytes in the target ABI, the compiled symbol @17447 is size 2 at identical .sdata+4 with bytes 0000, and the following two zero bytes are section alignment. Leave them unowned; .sdata stays 8 bytes and the entire unit stays 1184 data bytes. The other .sdata object, "arc", already has matching address and four-byte extent; do not rename it or any unrelated compiler literal.
|
||||
|
||||
Keyboard measurement after the proven empty-wide-string extent correction: .data, .sdata and .sdata2 all 100%, matched_data 1184/1184; exact-name functions remain 31/32. Controller and NHTTP also retain every non-text section at 100%. All seven metadata edits are backed by the one-line proofs above. No source files, build configuration, split boundaries, addresses, section totals, bytes, or weak-table emission are changed. Remaining keyboard create is code work and is outside this completed data-only lane; prior rounds logged thirteen distinct attempts without reducing its exact function count.
|
||||
|
||||
## Round 3 final verification
|
||||
|
||||
Clean non-quick gate over controller, NHTTP and keyboard PASS. Full 43U build passes; DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Regressions 0, forbidden patterns 0, readability warnings 0, all pools identical. Controller data 80 -> 696/696, instruction-exact 84 -> 84, matched code 5708 -> 5708. NHTTP data 16 -> 720/720, instruction-exact 22 -> 22, matched code 3180 -> 3180. Keyboard data 1176 -> 1184/1184, instruction-exact 31 -> 31, matched code 4752 -> 4752. Fresh report asserts every owned non-text section is 100%, matched_data equals unchanged total_data, and original section sizes are unchanged. Data-lane goal achieved. Remaining keyboard create stays 94.00944%; its instruction differences are outside data scope and its prior thirteen attempts are logged. No new source experiment is needed for this metadata-only lane. Final full gate output /tmp/data-d1-r3.final-gate.txt, final report /tmp/data-d1-r3.final-report.json.
|
||||
@@ -1,253 +0,0 @@
|
||||
# data-d10 rework
|
||||
|
||||
The prior candidate was rejected for edits outside assigned ownership. This replacement starts from origin/main and resolves symbols by section plus absolute address within splits.txt ranges, never by generated name alone.
|
||||
|
||||
## RFL_MiddleDatabase
|
||||
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Ownership: extab 0x81330bc0-0x81330c10, extabindex 0x81331b30-0x81331ba8
|
||||
- extab:0x81330bc0 @2294 -> @2302; 8 bytes unchanged; index relocation identifies updateHDBcallback_, paired length 488, unwind bytes identical; owned range 0x81330bc0-0x81330c10.
|
||||
- extabindex:0x81331b30 @2295 -> @2303; 12 bytes unchanged; index relocation identifies updateHDBcallback_, paired length 488, unwind bytes identical; owned range 0x81331b30-0x81331ba8.
|
||||
- extab:0x81330bc8 @2312 -> @2320; 8 bytes unchanged; index relocation identifies loadHiddenDataSync_, paired length 372, unwind bytes identical; owned range 0x81330bc0-0x81330c10.
|
||||
- extabindex:0x81331b3c @2313 -> @2321; 12 bytes unchanged; index relocation identifies loadHiddenDataSync_, paired length 372, unwind bytes identical; owned range 0x81331b30-0x81331ba8.
|
||||
- extab:0x81330bd0 @2327 -> @2335; 8 bytes unchanged; index relocation identifies updateHiddenOld_, paired length 340, unwind bytes identical; owned range 0x81330bc0-0x81330c10.
|
||||
- extabindex:0x81331b48 @2328 -> @2336; 12 bytes unchanged; index relocation identifies updateHiddenOld_, paired length 340, unwind bytes identical; owned range 0x81331b30-0x81331ba8.
|
||||
- extab:0x81330bd8 @2347 -> @2355; 8 bytes unchanged; index relocation identifies loadHiddenRandomSync_, paired length 316, unwind bytes identical; owned range 0x81330bc0-0x81330c10.
|
||||
- extabindex:0x81331b54 @2348 -> @2356; 12 bytes unchanged; index relocation identifies loadHiddenRandomSync_, paired length 316, unwind bytes identical; owned range 0x81331b30-0x81331ba8.
|
||||
- extab:0x81330be0 @2373 -> @2381; 8 bytes unchanged; index relocation identifies updateHDBRandcallback_, paired length 404, unwind bytes identical; owned range 0x81330bc0-0x81330c10.
|
||||
- extabindex:0x81331b60 @2374 -> @2382; 12 bytes unchanged; index relocation identifies updateHDBRandcallback_, paired length 404, unwind bytes identical; owned range 0x81331b30-0x81331ba8.
|
||||
- extab:0x81330be8 @2434 -> @2442; 8 bytes unchanged; index relocation identifies updateHiddenRandom_, paired length 732, unwind bytes identical; owned range 0x81330bc0-0x81330c10.
|
||||
- extabindex:0x81331b6c @2435 -> @2443; 12 bytes unchanged; index relocation identifies updateHiddenRandom_, paired length 732, unwind bytes identical; owned range 0x81331b30-0x81331ba8.
|
||||
- extab:0x81330bf0 @2447 -> @2455; 8 bytes unchanged; index relocation identifies updateRandom_, paired length 248, unwind bytes identical; owned range 0x81330bc0-0x81330c10.
|
||||
- extabindex:0x81331b78 @2448 -> @2456; 12 bytes unchanged; index relocation identifies updateRandom_, paired length 248, unwind bytes identical; owned range 0x81331b30-0x81331ba8.
|
||||
- extab:0x81330bf8 @2464 -> @2472; 8 bytes unchanged; index relocation identifies RFLUpdateMiddleDBAsync, paired length 92, unwind bytes identical; owned range 0x81330bc0-0x81330c10.
|
||||
- extabindex:0x81331b84 @2465 -> @2473; 12 bytes unchanged; index relocation identifies RFLUpdateMiddleDBAsync, paired length 92, unwind bytes identical; owned range 0x81331b30-0x81331ba8.
|
||||
- extab:0x81330c00 @2482 -> @2490; 8 bytes unchanged; index relocation identifies RFLiUpdateMiddleDBAsync, paired length 312, unwind bytes identical; owned range 0x81330bc0-0x81330c10.
|
||||
- extabindex:0x81331b90 @2483 -> @2491; 12 bytes unchanged; index relocation identifies RFLiUpdateMiddleDBAsync, paired length 312, unwind bytes identical; owned range 0x81331b30-0x81331ba8.
|
||||
- extab:0x81330c08 @2497 -> @2505; 8 bytes unchanged; index relocation identifies RFLiGetCharInfoMiddleDB, paired length 156, unwind bytes identical; owned range 0x81330bc0-0x81330c10.
|
||||
- extabindex:0x81331b9c @2498 -> @2506; 12 bytes unchanged; index relocation identifies RFLiGetCharInfoMiddleDB, paired length 156, unwind bytes identical; owned range 0x81331b30-0x81331ba8.
|
||||
## RFL_MakeTex
|
||||
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Ownership: extab 0x813309c0-0x81330a00, extabindex 0x81331830-0x81331890, .rodata 0x8161d358-0x8161d418, .sdata2 0x816950b0-0x81695170
|
||||
- extab:0x813309c0 @2834 -> @2842; 8 bytes unchanged; index relocation identifies RFLiSetupCopyTex, paired length 304, unwind bytes identical; owned range 0x813309c0-0x81330a00.
|
||||
- extabindex:0x81331830 @2835 -> @2843; 12 bytes unchanged; index relocation identifies RFLiSetupCopyTex, paired length 304, unwind bytes identical; owned range 0x81331830-0x81331890.
|
||||
- extab:0x813309c8 @3102 -> @3110; 8 bytes unchanged; index relocation identifies RFLiMakeTexture, paired length 4232, unwind bytes identical; owned range 0x813309c0-0x81330a00.
|
||||
- extabindex:0x8133183c @3103 -> @3111; 12 bytes unchanged; index relocation identifies RFLiMakeTexture, paired length 4232, unwind bytes identical; owned range 0x81331830-0x81331890.
|
||||
- extab:0x813309d0 @3139 -> @3147; 8 bytes unchanged; index relocation identifies RFLiSetup2DCameraAndParam, paired length 472, unwind bytes identical; owned range 0x813309c0-0x81330a00.
|
||||
- extabindex:0x81331848 @3140 -> @3148; 12 bytes unchanged; index relocation identifies RFLiSetup2DCameraAndParam, paired length 472, unwind bytes identical; owned range 0x81331830-0x81331890.
|
||||
- extab:0x813309d8 @3153 -> @3161; 8 bytes unchanged; index relocation identifies RFLiSetTev4Mouth, paired length 584, unwind bytes identical; owned range 0x813309c0-0x81330a00.
|
||||
- extabindex:0x81331854 @3154 -> @3162; 12 bytes unchanged; index relocation identifies RFLiSetTev4Mouth, paired length 584, unwind bytes identical; owned range 0x81331830-0x81331890.
|
||||
- extab:0x813309e0 @3179 -> @3187; 8 bytes unchanged; index relocation identifies RFLiSetTev4Eye, paired length 688, unwind bytes identical; owned range 0x813309c0-0x81330a00.
|
||||
- extabindex:0x81331860 @3180 -> @3188; 12 bytes unchanged; index relocation identifies RFLiSetTev4Eye, paired length 688, unwind bytes identical; owned range 0x81331830-0x81331890.
|
||||
- extab:0x813309e8 @3227 -> @3235; 8 bytes unchanged; index relocation identifies RFLiSetFaceParts, paired length 1288, unwind bytes identical; owned range 0x813309c0-0x81330a00.
|
||||
- extabindex:0x8133186c @3228 -> @3236; 12 bytes unchanged; index relocation identifies RFLiSetFaceParts, paired length 1288, unwind bytes identical; owned range 0x81331830-0x81331890.
|
||||
- extab:0x813309f0 @3251 -> @3259; 8 bytes unchanged; index relocation identifies RFLiCapture, paired length 2156, unwind bytes identical; owned range 0x813309c0-0x81330a00.
|
||||
- extabindex:0x81331878 @3252 -> @3260; 12 bytes unchanged; index relocation identifies RFLiCapture, paired length 2156, unwind bytes identical; owned range 0x81331830-0x81331890.
|
||||
- extab:0x813309f8 @3267 -> @3275; 8 bytes unchanged; index relocation identifies RFLiDrawQuad, paired length 504, unwind bytes identical; owned range 0x813309c0-0x81330a00.
|
||||
- extabindex:0x81331884 @3268 -> @3276; 12 bytes unchanged; index relocation identifies RFLiDrawQuad, paired length 504, unwind bytes identical; owned range 0x81331830-0x81331890.
|
||||
## RFL_DataUtility
|
||||
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Ownership: extab 0x81330c30-0x81330c58, extabindex 0x81331bd8-0x81331c14, .rodata 0x8161e070-0x8161e080
|
||||
- extab:0x81330c30 @2175 -> @2183; 8 bytes unchanged; index relocation identifies RFLiCheckValidInfo, paired length 1124, unwind bytes identical; owned range 0x81330c30-0x81330c58.
|
||||
- extabindex:0x81331bd8 @2176 -> @2184; 12 bytes unchanged; index relocation identifies RFLiCheckValidInfo, paired length 1124, unwind bytes identical; owned range 0x81331bd8-0x81331c14.
|
||||
- extab:0x81330c38 @2237 -> @2245; 8 bytes unchanged; index relocation identifies RFLiIsValidOnNAND, paired length 44, unwind bytes identical; owned range 0x81330c30-0x81330c58.
|
||||
- extabindex:0x81331be4 @2238 -> @2246; 12 bytes unchanged; index relocation identifies RFLiIsValidOnNAND, paired length 44, unwind bytes identical; owned range 0x81331bd8-0x81331c14.
|
||||
- extab:0x81330c40 @2281 -> @2289; 8 bytes unchanged; index relocation identifies RFLiPickupCharInfo, paired length 320, unwind bytes identical; owned range 0x81330c30-0x81330c58.
|
||||
- extabindex:0x81331bf0 @2282 -> @2290; 12 bytes unchanged; index relocation identifies RFLiPickupCharInfo, paired length 320, unwind bytes identical; owned range 0x81331bd8-0x81331c14.
|
||||
- extab:0x81330c48 @2298 -> @2306; 8 bytes unchanged; index relocation identifies copyChar2Additional_, paired length 400, unwind bytes identical; owned range 0x81330c30-0x81330c58.
|
||||
- extabindex:0x81331bfc @2299 -> @2307; 12 bytes unchanged; index relocation identifies copyChar2Additional_, paired length 400, unwind bytes identical; owned range 0x81331bd8-0x81331c14.
|
||||
- extab:0x81330c50 @2304 -> @2312; 8 bytes unchanged; index relocation identifies RFLGetAdditionalInfo, paired length 84, unwind bytes identical; owned range 0x81330c30-0x81330c58.
|
||||
- extabindex:0x81331c08 @2305 -> @2313; 12 bytes unchanged; index relocation identifies RFLGetAdditionalInfo, paired length 84, unwind bytes identical; owned range 0x81331bd8-0x81331c14.
|
||||
## RFL_NWC24
|
||||
|
||||
POOL IDENTICAL up to 15 (mine=15 base=15)
|
||||
Ownership: extab 0x81330c58-0x81330c78, extabindex 0x81331c14-0x81331c44, .data 0x8166f0f0-0x8166f2c8
|
||||
- extab:0x81330c58 @1981 -> @1986; 8 bytes unchanged; index relocation identifies RFLiNWC24Msg2CharData, paired length 120, unwind bytes identical; owned range 0x81330c58-0x81330c78.
|
||||
- extabindex:0x81331c14 @1982 -> @1987; 12 bytes unchanged; index relocation identifies RFLiNWC24Msg2CharData, paired length 120, unwind bytes identical; owned range 0x81331c14-0x81331c44.
|
||||
- extab:0x81330c60 @1990 -> @1995; 8 bytes unchanged; index relocation identifies RFLiSetOfficial2NWC24Msg, paired length 216, unwind bytes identical; owned range 0x81330c58-0x81330c78.
|
||||
- extabindex:0x81331c20 @1991 -> @1996; 12 bytes unchanged; index relocation identifies RFLiSetOfficial2NWC24Msg, paired length 216, unwind bytes identical; owned range 0x81331c14-0x81331c44.
|
||||
- extab:0x81330c68 @2044 -> @2049; 8 bytes unchanged; index relocation identifies RFLiNWC24Msg2HiddenAsync, paired length 392, unwind bytes identical; owned range 0x81330c58-0x81330c78.
|
||||
- extabindex:0x81331c2c @2045 -> @2050; 12 bytes unchanged; index relocation identifies RFLiNWC24Msg2HiddenAsync, paired length 392, unwind bytes identical; owned range 0x81331c14-0x81331c44.
|
||||
- extab:0x81330c70 @2129 -> @2134; 8 bytes unchanged; index relocation identifies makeNWC24MsgforExchange_, paired length 2256, unwind bytes identical; owned range 0x81330c58-0x81330c78.
|
||||
- extabindex:0x81331c38 @2130 -> @2135; 12 bytes unchanged; index relocation identifies makeNWC24MsgforExchange_, paired length 2256, unwind bytes identical; owned range 0x81331c14-0x81331c44.
|
||||
|
||||
Ownership audit: 54 name-only changes; every changed absolute address is inside exactly one assigned unit range. Addresses, extents, attributes and section totals unchanged. RFL_Model, RFL_Database, RFL_HiddenDatabase and RFL_NANDLoader have no configuration edits.
|
||||
|
||||
## Baseline gate
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] objdiff: code 3648/3648 data 80/200 functions 13/13 fuzzy 100.0000 linked code 3648
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] instruction-exact functions: 13/13
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] section .text size 3648 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] section extab size 80 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] section extabindex size 120 match 95.5
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] baseline: code 3648/3648 data 80 functions 13 fuzzy 100.0000
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] objdiff: code 10396/10396 data 448/544 functions 10/10 fuzzy 100.0000 linked code 10396
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] instruction-exact functions: 10/10
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] section .rodata size 192 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] section .sdata2 size 192 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] section .text size 10396 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] section extab size 64 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] section extabindex size 96 match 86.25
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] baseline: code 10396/10396 data 448 functions 10 fuzzy 100.0000
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] objdiff: code 2244/2244 data 56/116 functions 6/6 fuzzy 100.0000 linked code 2244
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] instruction-exact functions: 6/6
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] section .rodata size 16 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] section .text size 2244 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] section extab size 40 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] section extabindex size 60 match 86.0
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] baseline: code 2244/2244 data 56 functions 6 fuzzy 100.0000
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] objdiff: code 2992/2992 data 504/552 functions 5/5 fuzzy 100.0000 linked code 2992
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] instruction-exact functions: 5/5
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] section .data size 472 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] section .text size 2992 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] section extab size 32 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] section extabindex size 48 match 92.5
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] baseline: code 2992/2992 data 504 functions 5 fuzzy 100.0000
|
||||
[libs/RVLFaceLib/src/RFL_Model] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_Model] objdiff: code 7788/7788 data 552/552 functions 15/15 fuzzy 100.0000 linked code 7788
|
||||
[libs/RVLFaceLib/src/RFL_Model] instruction-exact functions: 15/15
|
||||
[libs/RVLFaceLib/src/RFL_Model] section .data size 16 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] section .rodata size 272 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] section .sdata2 size 64 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] section .text size 7788 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] section extab size 80 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] section extabindex size 120 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] baseline: code 7788/7788 data 552 functions 15 fuzzy 100.0000
|
||||
[libs/RVLFaceLib/src/RFL_Database] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_Database] objdiff: code 7508/7508 data 688/688 functions 39/39 fuzzy 100.0000 linked code 7508
|
||||
[libs/RVLFaceLib/src/RFL_Database] instruction-exact functions: 38/39
|
||||
[libs/RVLFaceLib/src/RFL_Database] section .sdata2 size 8 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Database] section .text size 7508 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Database] section extab size 272 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Database] section extabindex size 408 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Database] baseline: code 7508/7508 data 688 functions 39 fuzzy 100.0000
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 88.57407 -> 88.57407
|
||||
global fuzzy_match_percent: 99.45531 -> 99.45531
|
||||
global complete_code_percent: 63.07103 -> 63.07103
|
||||
global matched_data_percent: 97.78074 -> 97.78074
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
Independent address audit passed on the actual git diff. The RFL_Model range beginning 0x81330970 and all neighboring unowned ranges retain origin/main names exactly. MakeTex was checked before edits and still had 448/544 matched data, so its eight unwind entries required pairing.
|
||||
|
||||
## Fresh report and instruction audit
|
||||
|
||||
All 1023 unowned units have identical measures, function results and section results before/after, including Model, Database, HiddenDatabase and NANDLoader. All owned sections are 100%.
|
||||
- RFL_MiddleDatabase updateHDBcallback_: src 0x1e8 base 0x1e8 insns 122/122; diffs 0: []
|
||||
- RFL_MiddleDatabase loadHiddenDataSync_: src 0x174 base 0x174 insns 93/93; diffs 0: []
|
||||
- RFL_MiddleDatabase updateHiddenOld_: src 0x154 base 0x154 insns 85/85; diffs 0: []
|
||||
- RFL_MiddleDatabase loadHiddenRandomSync_: src 0x13c base 0x13c insns 79/79; diffs 0: []
|
||||
- RFL_MiddleDatabase updateHDBRandcallback_: src 0x194 base 0x194 insns 101/101; diffs 0: []
|
||||
- RFL_MiddleDatabase updateHiddenRandom_: src 0x2dc base 0x2dc insns 183/183; diffs 0: []
|
||||
- RFL_MiddleDatabase updateRandom_: src 0xf8 base 0xf8 insns 62/62; diffs 0: []
|
||||
- RFL_MiddleDatabase RFLGetMiddleDBBufferSize: src 0x8 base 0x8 insns 2/2; diffs 0: []
|
||||
- RFL_MiddleDatabase RFLInitMiddleDB: src 0xac base 0xac insns 43/43; diffs 0: []
|
||||
- RFL_MiddleDatabase RFLUpdateMiddleDBAsync: src 0x5c base 0x5c insns 23/23; diffs 0: []
|
||||
- RFL_MiddleDatabase RFLiUpdateMiddleDBAsync: src 0x138 base 0x138 insns 78/78; diffs 0: []
|
||||
- RFL_MiddleDatabase RFLGetMiddleDBStoredSize: src 0x8 base 0x8 insns 2/2; diffs 0: []
|
||||
- RFL_MiddleDatabase RFLiGetCharInfoMiddleDB: src 0x9c base 0x9c insns 39/39; diffs 0: []
|
||||
libs/RVLFaceLib/src/RFL_MiddleDatabase: data 80 -> 200/200; instruction-exact 13 -> 13; code 3648 -> 3648/3648.
|
||||
- RFL_MakeTex RFLiSetupCopyTex: src 0x130 base 0x130 insns 76/76; diffs 0: []
|
||||
- RFL_MakeTex RFLiMakeTexture: src 0x1088 base 0x1088 insns 1058/1058; diffs 0: []
|
||||
- RFL_MakeTex RFLiSetup2DCameraAndParam: src 0x1d8 base 0x1d8 insns 118/118; diffs 0: []
|
||||
- RFL_MakeTex RFLiSetTev4Mouth: src 0x248 base 0x248 insns 146/146; diffs 0: []
|
||||
- RFL_MakeTex RFLiSetTev4Eye: src 0x2b0 base 0x2b0 insns 172/172; diffs 0: []
|
||||
- RFL_MakeTex RFLiSetFaceParts: src 0x508 base 0x508 insns 322/322; diffs 0: []
|
||||
- RFL_MakeTex RFLiCapture: src 0x86c base 0x86c insns 539/539; diffs 0: []
|
||||
- RFL_MakeTex RFLiDrawQuad: src 0x1f8 base 0x1f8 insns 126/126; diffs 0: []
|
||||
- RFL_MakeTex RFLiGetMaxMaskRsl: src 0x68 base 0x68 insns 26/26; diffs 0: []
|
||||
- RFL_MakeTex RFLiGetMaskBufSize: src 0x40 base 0x40 insns 16/16; diffs 0: []
|
||||
libs/RVLFaceLib/src/RFL_MakeTex: data 448 -> 544/544; instruction-exact 10 -> 10; code 10396 -> 10396/10396.
|
||||
- RFL_DataUtility copyChar2Additional_: src 0x190 base 0x190 insns 100/100; diffs 0: []
|
||||
- RFL_DataUtility RFLiCheckValidInfo: src 0x464 base 0x464 insns 281/281; diffs 0: []
|
||||
- RFL_DataUtility RFLiIsValidOnNAND: src 0x2c base 0x2c insns 11/11; diffs 0: []
|
||||
- RFL_DataUtility RFLiIsSameFaceCore: src 0x110 base 0x110 insns 68/68; diffs 0: []
|
||||
- RFL_DataUtility RFLiPickupCharInfo: src 0x140 base 0x140 insns 80/80; diffs 0: []
|
||||
- RFL_DataUtility RFLGetAdditionalInfo: src 0x54 base 0x54 insns 21/21; diffs 0: []
|
||||
libs/RVLFaceLib/src/RFL_DataUtility: data 56 -> 116/116; instruction-exact 6 -> 6; code 2244 -> 2244/2244.
|
||||
- RFL_NWC24 RFLiNWC24Msg2CharData: src 0x78 base 0x78 insns 30/30; diffs 0: []
|
||||
- RFL_NWC24 RFLiSetOfficial2NWC24Msg: src 0xd8 base 0xd8 insns 54/54; diffs 0: []
|
||||
- RFL_NWC24 RFLiNWC24Msg2HiddenAsync: src 0x188 base 0x188 insns 98/98; diffs 0: []
|
||||
- RFL_NWC24 makeNWC24MsgforExchange_: src 0x8d0 base 0x8d0 insns 564/564; diffs 0: []
|
||||
- RFL_NWC24 RFLiMakeNWC24MsgforExchange: src 0x8 base 0x8 insns 2/2; diffs 0: []
|
||||
libs/RVLFaceLib/src/RFL_NWC24: data 504 -> 552/552; instruction-exact 5 -> 5; code 2992 -> 2992/2992.
|
||||
|
||||
Remaining owned target nonmatching functions: none. Uncertain mappings: none.
|
||||
|
||||
## Final full gate
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] objdiff: code 3648/3648 data 200/200 functions 13/13 fuzzy 100.0000 linked code 3648
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] instruction-exact functions: 13/13
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] section .text size 3648 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] section extab size 80 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] section extabindex size 120 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MiddleDatabase] baseline: code 3648/3648 data 80 functions 13 fuzzy 100.0000
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] objdiff: code 10396/10396 data 544/544 functions 10/10 fuzzy 100.0000 linked code 10396
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] instruction-exact functions: 10/10
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] section .rodata size 192 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] section .sdata2 size 192 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] section .text size 10396 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] section extab size 64 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] section extabindex size 96 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_MakeTex] baseline: code 10396/10396 data 448 functions 10 fuzzy 100.0000
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] objdiff: code 2244/2244 data 116/116 functions 6/6 fuzzy 100.0000 linked code 2244
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] instruction-exact functions: 6/6
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] section .rodata size 16 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] section .text size 2244 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] section extab size 40 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] section extabindex size 60 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_DataUtility] baseline: code 2244/2244 data 56 functions 6 fuzzy 100.0000
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] objdiff: code 2992/2992 data 552/552 functions 5/5 fuzzy 100.0000 linked code 2992
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] instruction-exact functions: 5/5
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] section .data size 472 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] section .text size 2992 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] section extab size 32 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] section extabindex size 48 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_NWC24] baseline: code 2992/2992 data 504 functions 5 fuzzy 100.0000
|
||||
[libs/RVLFaceLib/src/RFL_Model] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_Model] objdiff: code 7788/7788 data 552/552 functions 15/15 fuzzy 100.0000 linked code 7788
|
||||
[libs/RVLFaceLib/src/RFL_Model] instruction-exact functions: 15/15
|
||||
[libs/RVLFaceLib/src/RFL_Model] section .data size 16 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] section .rodata size 272 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] section .sdata2 size 64 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] section .text size 7788 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] section extab size 80 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] section extabindex size 120 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Model] baseline: code 7788/7788 data 552 functions 15 fuzzy 100.0000
|
||||
[libs/RVLFaceLib/src/RFL_Database] pool: IDENTICAL
|
||||
[libs/RVLFaceLib/src/RFL_Database] objdiff: code 7508/7508 data 688/688 functions 39/39 fuzzy 100.0000 linked code 7508
|
||||
[libs/RVLFaceLib/src/RFL_Database] instruction-exact functions: 38/39
|
||||
[libs/RVLFaceLib/src/RFL_Database] section .sdata2 size 8 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Database] section .text size 7508 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Database] section extab size 272 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Database] section extabindex size 408 match 100.0
|
||||
[libs/RVLFaceLib/src/RFL_Database] baseline: code 7508/7508 data 688 functions 39 fuzzy 100.0000
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 88.57407 -> 88.57407
|
||||
global fuzzy_match_percent: 99.45531 -> 99.45531
|
||||
global complete_code_percent: 63.07103 -> 63.07103
|
||||
global matched_data_percent: 97.78074 -> 97.79842
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
|
||||
GATE PASS
|
||||
```
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,100 +0,0 @@
|
||||
# Data lane d12
|
||||
|
||||
Baseline HEAD and fetched origin/main: 9702056b. Owned sources and symbols unchanged on origin/main. Initial quick full gate PASS, zero regressions, DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.
|
||||
|
||||
| Unit | Exact functions | Code bytes | Data bytes |
|
||||
| --- | --- | --- | --- |
|
||||
| src/keyboard/tiHwKeyboard | 10/10 | 4596/4596 | 472/504 |
|
||||
| libs/RevoEX/src/net/sha1 | 5/5 | 1496/1496 | 16/48 |
|
||||
| libs/RevoEX/src/net/nettime | 1/1 | 228/228 | 0/8 |
|
||||
|
||||
All three pool_diff checks are identical, zero strings. No non-exact functions exist; code experiments are unnecessary for this data assignment.
|
||||
|
||||
## tiHwKeyboard
|
||||
|
||||
- .bss extent/name mismatch: target lbl_810C8940 has 16 bytes, source @6371 has 12; init .text+0x5a/0x66 and updateShift +0x102/0x10e pass its address as r5 to __register_global_object for LayoutGather singleton. Runtime NMWException.h defines DestructorChain as three 32-bit pointers, hence 12 bytes; trailing four bytes are alignment. Rename to compiler-emitted @6371 and set size 12, preserving section range and bytes.
|
||||
- .sdata2 extent mismatch: target lbl_81694F00 has four bytes but source @6555 has eight, both contain command 8 followed by zero. updateTriggerKey .text+0x8d8 and source +0x9a0 load the first word for NavigationCommand {u32 command, u32 modifiers}; sizeof is 8, and dynamic modifiers overwrite the second initializer word. Correct extent to eight within existing section, retaining address and all bytes.
|
||||
- .rodata/.data/.sdata already 100%; no renames needed for automatically paired anonymous symbols or controlKeys. Additional weak singleton storage is linker-deduplicated and ignored.
|
||||
|
||||
## sha1
|
||||
|
||||
- .rodata extent/name mismatch: NETGetSHA1Interface target .text+0x232/+0x236 and source same offsets load sha1template$2339/interface$143; its data relocations +0x10/+0x14/+0x18 point to NETSHA1Init/NETSHA1Update/NETSHA1GetDigest. DigestInterface contains four u32 fields and three function pointers, sizeof 28; target extent 32 absorbed four trailing alignment bytes. Rename to interface$143 and set size 28, preserving address, section range and bytes.
|
||||
- .sbss2/.sdata2 already 100%; padlead$2309/endMarker$120 and padalign$2310/zeroBytes$121 are automatically paired by matching code references and need no renames.
|
||||
|
||||
## nettime
|
||||
|
||||
- .sbss split/name mismatch: target .text+0xc/+0x38/+0x78 uses lbl_81698DB0, +0x18/+0x2c/+0x74 uses lbl_81698DB4; source relocations at identical offsets use whenCached$1061 with addends 0 and 4 respectively. The two words hold the s64 __OSGetSystemTime return in r3:r4 and are compared/added as one s64. Combine into the real eight-byte whenCached$1061 at unchanged 0x81698DB0; remove artificial second-word symbol at 0x81698DB4, preserving section range and bytes.
|
||||
|
||||
## Verification after corrections
|
||||
|
||||
Quick gate PASS: tiHwKeyboard data 504/504, sha1 data 48/48, nettime data 8/8. All owned non-text sections report 100%; exact functions remain 10/10, 5/5, 1/1. Code bytes remain 4596/4596, 1496/1496, 228/228. Zero global regressions, forbidden patterns, or readability warnings. Only symbol metadata changed; no source edits or split edits.
|
||||
|
||||
## Final clean full gate
|
||||
|
||||
Command: `python3 /mnt/drive2/projects/wii-ipl-workers/_restore0928-tools/gate.py src/keyboard/tiHwKeyboard libs/RevoEX/src/net/sha1 libs/RevoEX/src/net/nettime`
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/keyboard/tiHwKeyboard] pool: IDENTICAL
|
||||
[src/keyboard/tiHwKeyboard] objdiff: code 4596/4596 data 504/504 functions 10/10 fuzzy 100.0000 linked code 4596
|
||||
[src/keyboard/tiHwKeyboard] instruction-exact functions: 10/10
|
||||
[src/keyboard/tiHwKeyboard] section .bss size 16 match 100.0
|
||||
[src/keyboard/tiHwKeyboard] section .data size 288 match 100.0
|
||||
[src/keyboard/tiHwKeyboard] section .rodata size 176 match 100.0
|
||||
[src/keyboard/tiHwKeyboard] section .sdata size 8 match 100.0
|
||||
[src/keyboard/tiHwKeyboard] section .sdata2 size 16 match 100.0
|
||||
[src/keyboard/tiHwKeyboard] section .text size 4596 match 100.0
|
||||
[src/keyboard/tiHwKeyboard] baseline: code 4596/4596 data 472 functions 10 fuzzy 100.0000
|
||||
[libs/RevoEX/src/net/sha1] pool: IDENTICAL
|
||||
[libs/RevoEX/src/net/sha1] objdiff: code 1496/1496 data 48/48 functions 5/5 fuzzy 100.0000 linked code 1496
|
||||
[libs/RevoEX/src/net/sha1] instruction-exact functions: 5/5
|
||||
[libs/RevoEX/src/net/sha1] section .rodata size 32 match 100.0
|
||||
[libs/RevoEX/src/net/sha1] section .sbss2 size 8 match 100.0
|
||||
[libs/RevoEX/src/net/sha1] section .sdata2 size 8 match 100.0
|
||||
[libs/RevoEX/src/net/sha1] section .text size 1496 match 100.0
|
||||
[libs/RevoEX/src/net/sha1] baseline: code 1496/1496 data 16 functions 5 fuzzy 100.0000
|
||||
[libs/RevoEX/src/net/nettime] pool: IDENTICAL
|
||||
[libs/RevoEX/src/net/nettime] objdiff: code 228/228 data 8/8 functions 1/1 fuzzy 100.0000 linked code 228
|
||||
[libs/RevoEX/src/net/nettime] instruction-exact functions: 1/1
|
||||
[libs/RevoEX/src/net/nettime] section .sbss size 8 match 100.0
|
||||
[libs/RevoEX/src/net/nettime] section .text size 228 match 100.0
|
||||
[libs/RevoEX/src/net/nettime] baseline: code 228/228 data None functions 1 fuzzy 100.0000
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 88.57407 -> 88.57407
|
||||
global fuzzy_match_percent: 99.45531 -> 99.45531
|
||||
global complete_code_percent: 63.07103 -> 63.07103
|
||||
global matched_data_percent: 97.78074 -> 97.78467
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
All target sections retain their original sizes and bytes. splits.txt unchanged. Every owned symbol remains within its assigned split; only proven object extents and names changed. The two nettime word labels were consolidated into the s64 object rather than dropping data.
|
||||
|
||||
## Fresh pool and instruction checks after clean build
|
||||
|
||||
```text
|
||||
src/keyboard/tiHwKeyboard: POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
__ct__Q49textinput8keyboard5hwkey10HWKeyboardFPQ29textinput7Manager: src 0x28 base 0x28 insns 10/10; diffs 0: []
|
||||
init__Q49textinput8keyboard5hwkey10HWKeyboardFv: src 0xa0 base 0xa0 insns 40/40; diffs 0: []
|
||||
updateShift__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager: src 0x184 base 0x184 insns 97/97; diffs 0: []
|
||||
updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager: src 0x1e8 base 0x1e8 insns 122/122; diffs 0: []
|
||||
updateRepeatKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager: src 0x2d0 base 0x2d0 insns 180/180; diffs 0: []
|
||||
updateTriggerKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager: src 0x654 base 0x654 insns 405/405; diffs 0: []
|
||||
updateTappingShift___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager: src 0x244 base 0x244 insns 145/145; diffs 0: []
|
||||
updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFiffUlUlUlPv: src 0x14 base 0x14 insns 5/5; diffs 0: []
|
||||
convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw: src 0x20c base 0x20c insns 131/131; diffs 0: []
|
||||
setLanguage__Q49textinput8keyboard5hwkey10HWKeyboardFQ29textinput11DestinationQ29textinput8Language: src 0x38 base 0x38 insns 14/14; diffs 0: []
|
||||
libs/RevoEX/src/net/sha1: POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
NETSHA1Init: src 0x50 base 0x50 insns 20/20; diffs 0: []
|
||||
NETSHA1Update: src 0xb4 base 0xb4 insns 45/45; diffs 0: []
|
||||
NETSHA1GetDigest: src 0x12c base 0x12c insns 75/75; diffs 0: []
|
||||
NETGetSHA1Interface: src 0xc base 0xc insns 3/3; diffs 0: []
|
||||
NETSHA1iProcessBlock: src 0x39c base 0x39c insns 231/231; diffs 0: []
|
||||
libs/RevoEX/src/net/nettime: POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
NETGetUniversalCalendar: src 0xe4 base 0xe4 insns 57/57; diffs 0: []
|
||||
```
|
||||
|
||||
Open-function audit: none in any assigned unit. All sixteen functions were already instruction-exact before this data lane and remain exact. No source experiments, new code, or changes to configure.py were needed. All owned non-text sections reach 100% and matched_data equals total_data in each unit. No unresolved uncertainty.
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user