Compare commits
1 Commits
cleanup/ip
...
agent/w092
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
865d0c620f |
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.59% | 90.81% | 71.43% | 99.37% |
|
||||
| 98.86% | 86.11% | 60.34% | 90.91% |
|
||||
|
||||
units 956/1027 complete, functions 12365/12563 matched.
|
||||
units 901/1027 complete, functions 12124/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -11,8 +11,6 @@ splits: 'config/43U/splits.txt'
|
||||
ldscript_template: 'config/ldscript_ipl2.lcf'
|
||||
|
||||
force_active:
|
||||
- SOGetSockOpt
|
||||
- SOSetInterfaceOpt
|
||||
- fprintf
|
||||
- leap_days
|
||||
- __msl_time2tm
|
||||
@@ -31,8 +29,8 @@ force_active:
|
||||
- strspn
|
||||
- strcspn
|
||||
- padding__Q23ipl5scene
|
||||
- scRsnOuiPad
|
||||
- scWpaOuiPad
|
||||
- lbl_81695063
|
||||
- lbl_81695067
|
||||
- __vt__Q49textinput6extend4memo19NigaoeEventObserver
|
||||
|
||||
# textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile.
|
||||
|
||||
@@ -688,13 +688,13 @@ src/scene/memoryCard/iplMemoryCard.cpp:
|
||||
.text start:0x813C9DCC end:0x813CC1FC
|
||||
.rodata start:0x81610368 end:0x81610480
|
||||
.data start:0x81651D30 end:0x81652640
|
||||
.sdata2 start:0x81694A68 end:0x81694A78
|
||||
.sdata2 start:0x81694A68 end:0x81694A80
|
||||
.sdata start:0x81696C78 end:0x81696CA0
|
||||
|
||||
src/scene/memoryCard/iplMemoryCardBase.cpp:
|
||||
.text start:0x813CC1FC end:0x813CD034
|
||||
.data start:0x81652640 end:0x816526D0
|
||||
.sdata2 start:0x81694A78 end:0x81694A88
|
||||
.sdata2 start:0x81694A80 end:0x81694A88
|
||||
|
||||
src/scene/memoryCard/iplMemoryCardManager.cpp:
|
||||
.text start:0x813CD034 end:0x813CE548
|
||||
@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
|
||||
.rodata start:0x81610608 end:0x81610918
|
||||
.data start:0x81654B38 end:0x81654F98
|
||||
.sdata2 start:0x81694B18 end:0x81694B60
|
||||
.sdata start:0x81696DD0 end:0x81696E30
|
||||
.sdata start:0x81696DD0 end:0x81696E40
|
||||
|
||||
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
|
||||
.text start:0x813E4BBC end:0x813E947C
|
||||
.rodata start:0x81610918 end:0x81610948
|
||||
.data start:0x81654F98 end:0x81655638
|
||||
.sdata2 start:0x81694B60 end:0x81694B88
|
||||
.sdata start:0x81696E30 end:0x81696EF0
|
||||
.sdata start:0x81696E40 end:0x81696EF0
|
||||
|
||||
src/scene/sdButton/iplSDButton.cpp:
|
||||
.text start:0x813E947C end:0x813EA88C
|
||||
@@ -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
|
||||
@@ -1055,7 +1054,7 @@ src/keyboard/tiNw4rManager.cpp:
|
||||
.data start:0x8165F818 end:0x8165F8F0
|
||||
.sdata2 start:0x81694E10 end:0x81694E28
|
||||
|
||||
src/keyboard/tiKeyboard.cpp:
|
||||
src/keyboard/tiManager.cpp:
|
||||
.text start:0x81437558 end:0x81439608
|
||||
.ctors start:0x8160D208 end:0x8160D20C
|
||||
.data start:0x8165F8F0 end:0x81660378
|
||||
@@ -1112,7 +1111,7 @@ src/keyboard/MyTiInputForm.cpp:
|
||||
|
||||
src/keyboard/MyTiLetterForm.cpp:
|
||||
.text start:0x81444730 end:0x814454D8
|
||||
.rodata start:0x816168B8 end:0x81616BC8
|
||||
.rodata start:0x816168B8 end:0x81616B88
|
||||
.data start:0x81668860 end:0x81668CD8
|
||||
.sdata2 start:0x81694EB0 end:0x81694ED0
|
||||
.sdata start:0x81697528 end:0x81697570
|
||||
@@ -1139,7 +1138,7 @@ src/keyboard/tiHKBManager.cpp:
|
||||
src/keyboard/tiHwKeyboard.cpp:
|
||||
.bss start:0x810C8940 end:0x810C8950
|
||||
.text start:0x81448AA4 end:0x81449C98
|
||||
.rodata start:0x81616BC8 end:0x81616C78
|
||||
.rodata start:0x81616B88 end:0x81616C78
|
||||
.data start:0x81668EF8 end:0x81669018
|
||||
.sdata2 start:0x81694EF8 end:0x81694F08
|
||||
.sdata start:0x81697570 end:0x81697578
|
||||
@@ -1406,7 +1405,7 @@ libs/RVLMiddleware/eZiText/src/clib/zikorean.c:
|
||||
extab start:0x81330748 end:0x81330760
|
||||
extabindex start:0x8133147C end:0x813314A0
|
||||
.text start:0x814813FC end:0x81482840
|
||||
.data start:0x8166B2B0 end:0x8166B3A8
|
||||
.data start:0x8166B2B0 end:0x8166B3D0
|
||||
|
||||
libs/RVLMiddleware/eZiText/src/clib/ziswordw.c:
|
||||
extab start:0x81330760 end:0x81330770
|
||||
@@ -1418,7 +1417,6 @@ libs/RVLMiddleware/eZiText/src/clib/zkokeyp.c:
|
||||
extab start:0x81330770 end:0x813307A8
|
||||
extabindex start:0x813314B8 end:0x8133150C
|
||||
.text start:0x8148302C end:0x8148447C
|
||||
.data start:0x8166B3A8 end:0x8166B3D0
|
||||
|
||||
libs/RVLMiddleware/eZiText/src/clib/zierror.c:
|
||||
.text start:0x8148447C end:0x81484484
|
||||
@@ -3552,12 +3550,12 @@ libs/RVL_SDK/src/bte/l2c_csm.c:
|
||||
|
||||
libs/RVL_SDK/src/bte/l2c_link.c:
|
||||
.text start:0x815AC630 end:0x815AD7BC
|
||||
.data start:0x8168E930 end:0x8168EBA0
|
||||
.data start:0x8168E930 end:0x8168EB68
|
||||
|
||||
libs/RVL_SDK/src/bte/l2c_main.c:
|
||||
.bss start:0x811725E0 end:0x81172DC8
|
||||
.text start:0x815AD7BC end:0x815AE7EC
|
||||
.data start:0x8168EBA0 end:0x8168EEA0
|
||||
.data start:0x8168EB68 end:0x8168EEA0
|
||||
|
||||
libs/RVL_SDK/src/bte/l2c_utils.c:
|
||||
.text start:0x815AE7EC end:0x815B06B0
|
||||
@@ -4194,11 +4192,11 @@ libs/RVL_SDK/src/fa/driver/nand_drv.c:
|
||||
.sbss start:0x816996C0 end:0x816996E0
|
||||
|
||||
libs/RVL_SDK/src/fa/driver/sd_drv.c:
|
||||
.bss start:0x811AF460 end:0x811AF6C0 align:32
|
||||
.bss start:0x811AF460 end:0x811AF6C0
|
||||
.text start:0x815EA41C end:0x815ED20C
|
||||
.rodata start:0x816329E8 end:0x81632B58
|
||||
.data start:0x81690D18 end:0x81691728
|
||||
.sbss start:0x816996E0 end:0x81699708 align:32
|
||||
.sbss start:0x816996E0 end:0x81699708
|
||||
|
||||
libs/RVL_SDK/src/fa/driver/pfd_cmn.c:
|
||||
.text start:0x815ED20C end:0x815ED324
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
114
configure.py
114
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", [
|
||||
@@ -772,7 +772,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("channelTitle", [
|
||||
Object(Matching, "scene/channelTitle/iplChannelTitle.cpp"),
|
||||
Object(Equivalent, "scene/channelTitle/iplChannelTitle.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("faceSelect", [
|
||||
@@ -812,11 +812,11 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("memoryCard", [
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCard.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCard.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardManager.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
|
||||
Object(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,15 +869,15 @@ 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(Matching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
]
|
||||
@@ -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"),
|
||||
]
|
||||
@@ -918,23 +918,23 @@ config.libs = [
|
||||
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
|
||||
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
|
||||
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiUtil.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiCpData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiSwData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiPkData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiLanguageIndependentData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "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"]),
|
||||
Object(NonMatching, "keyboard/tiKoreanInput.cpp", extra_cflags=["-O4,p"]), # for 4.3K
|
||||
@@ -987,9 +987,9 @@ config.libs = [
|
||||
Object(NonMatching, "clib/zi8alpha.c"),
|
||||
Object(Matching, "clib/zi8alts.c"),
|
||||
Object(NonMatching, "clib/zi8cgetc.c"),
|
||||
Object(Matching, "clib/zi8cinfo.c"),
|
||||
Object(NonMatching, "clib/zi8cinfo.c"),
|
||||
Object(Matching, "clib/zi8copy.c"),
|
||||
Object(Matching, "clib/zi8dawg.c"),
|
||||
Object(NonMatching, "clib/zi8dawg.c"),
|
||||
Object(Matching, "clib/zi8getc.c"),
|
||||
Object(NonMatching, "clib/zi8getc2.c"),
|
||||
Object(Matching, "clib/zi8getSW.c"),
|
||||
@@ -1004,8 +1004,8 @@ config.libs = [
|
||||
Object(Matching, "clib/zi8ver.c"),
|
||||
Object(Matching, "clib/zi8ZHuwd.c"),
|
||||
Object(NonMatching, "clib/zidawg1.c"),
|
||||
Object(Matching, "clib/zikorean.c"),
|
||||
Object(Matching, "clib/ziswordw.c"),
|
||||
Object(NonMatching, "clib/zikorean.c"),
|
||||
Object(NonMatching, "clib/ziswordw.c"),
|
||||
Object(NonMatching, "clib/zkokeyp.c"),
|
||||
Object(Matching, "clib/zierror.c"),
|
||||
Object(NonMatching, "clib/zmtkey.c"),
|
||||
@@ -1025,7 +1025,7 @@ config.libs = [
|
||||
Object(NonMatching, "cdb/CDBRecord.c"),
|
||||
Object(Matching, "cdb/CDBRecordFile.c"),
|
||||
Object(Matching, "cdb/CDBRecordKey.c"),
|
||||
Object(Matching, "cdb/CDBIntArray.c"),
|
||||
Object(NonMatching, "cdb/CDBIntArray.c"),
|
||||
Object(Matching, "cdb/CDBSystem.c"),
|
||||
Object(Matching, "cdb/CDBAttr.c"),
|
||||
Object(Matching, "cdb/CDBFBridge.c"),
|
||||
@@ -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,10 +1060,10 @@ 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(Matching, "nhttp/d_nhttp_private.c"),
|
||||
Object(NonMatching, "nhttp/NHTTP_thread.c"),
|
||||
Object(NonMatching, "nhttp/d_nhttp_private.c"),
|
||||
Object(Matching, "nhttp/d_nhttp.c"),
|
||||
Object(Matching, "nhttp/d_nhttp_common.c"),
|
||||
]
|
||||
@@ -1075,12 +1075,12 @@ config.libs = [
|
||||
Object(Matching, "nwc24/NWC24Utils.c"),
|
||||
Object(Matching, "nwc24/NWC24Manage.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgObj.c"),
|
||||
Object(Matching, "nwc24/NWC24MBoxCtrl.c"),
|
||||
Object(Matching, "nwc24/NWC24Mime.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MBoxCtrl.c"),
|
||||
Object(NonMatching, "nwc24/NWC24Mime.c"),
|
||||
Object(Matching, "nwc24/NWC24Stream.c"),
|
||||
Object(Matching, "nwc24/NWC24Parser.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgCommit.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgRead.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgCommit.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgRead.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgSubject.c"),
|
||||
Object(Matching, "nwc24/NWC24Schedule.c"),
|
||||
Object(NonMatching, "nwc24/NWC24DateParser.c"),
|
||||
@@ -1097,8 +1097,8 @@ config.libs = [
|
||||
RevoEXLib("so", [
|
||||
Object(Matching, "so/SOCommon.c"),
|
||||
Object(NonMatching, "so/SOBasic.c"),
|
||||
Object(Matching, "so/SOInformation.c"),
|
||||
Object(Matching, "so/SOOption.c"),
|
||||
Object(NonMatching, "so/SOInformation.c"),
|
||||
Object(NonMatching, "so/SOOption.c"),
|
||||
]
|
||||
),
|
||||
RevoEXLib("ssl", [
|
||||
@@ -1212,7 +1212,7 @@ config.libs = [
|
||||
Object(NonMatching, "exif/exif_parse.c"),
|
||||
|
||||
Object(Matching, "reschange/iqdec_resolution_change_a3.c"),
|
||||
Object(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,21 +1692,21 @@ 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(Matching, "fa/pf_entry_iterator.c"),
|
||||
Object(Matching, "fa/pf_fat.c"),
|
||||
Object(Matching, "fa/pf_fat12.c"),
|
||||
Object(Matching, "fa/pf_fat16.c"),
|
||||
Object(NonMatching, "fa/pf_entry_iterator.c"),
|
||||
Object(NonMatching, "fa/pf_fat.c"),
|
||||
Object(NonMatching, "fa/pf_fat12.c"),
|
||||
Object(NonMatching, "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(NonMatching, "fa/pf_cp932.c"),
|
||||
Object(Matching, "fa/pf_api_util.c"),
|
||||
Object(Matching, "fa/pf_attach.c"),
|
||||
Object(Matching, "fa/pf_buffering.c"),
|
||||
@@ -1800,7 +1800,7 @@ config.libs = [
|
||||
Object(Matching, "fa/pf_w_rmdir.c"),
|
||||
Object(Matching, "fa/pf_w_xdivide.c"),
|
||||
Object(Matching, "fa/pf_filelock.c"),
|
||||
Object(Matching, "fa/pf_stub.c"),
|
||||
Object(NonMatching, "fa/pf_stub.c"),
|
||||
Object(Matching, "fa/pf_system.c"),
|
||||
Object(Matching, "fa/pf_stub_standard.c"),
|
||||
Object(Matching, "fa/pfs_attach.c"),
|
||||
@@ -1851,16 +1851,16 @@ config.libs = [
|
||||
Object(Matching, "fa/api/FASetThreadPriority.c"),
|
||||
Object(Matching, "fa/api/FAUnmount.c"),
|
||||
|
||||
Object(Matching, "fa/kernel/pfk_api.c"),
|
||||
Object(NonMatching, "fa/kernel/pfk_api.c"),
|
||||
|
||||
Object(Matching, "fa/driver/nand_drv.c"),
|
||||
Object(NonMatching, "fa/driver/nand_drv.c"),
|
||||
Object(NonMatching, "fa/driver/sd_drv.c"),
|
||||
Object(Matching, "fa/driver/pfd_cmn.c"),
|
||||
Object(Matching, "fa/driver/msc_drv.c"),
|
||||
Object(NonMatching, "fa/driver/pfd_cmn.c"),
|
||||
Object(NonMatching, "fa/driver/msc_drv.c"),
|
||||
|
||||
Object(Matching, "fa/msc/puh_msc.c"),
|
||||
Object(Matching, "fa/msc/puh_msc_cmd.c"),
|
||||
Object(Matching, "fa/msc/puh_msc_blk.c"),
|
||||
Object(NonMatching, "fa/msc/puh_msc.c"),
|
||||
Object(NonMatching, "fa/msc/puh_msc_cmd.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", [
|
||||
|
||||
@@ -96,7 +96,7 @@ CHANSVmNativeClass* CHANSVmAddNativeClass(CHANSVm* vm, const char* clsName, CHAN
|
||||
/*** CHANS Image ***/
|
||||
/************************/
|
||||
|
||||
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm, vmPtr data);
|
||||
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm);
|
||||
typedef vmPtr (*CHANSVmImageAllocatorCallback)(CHANSVm* vm, u32 size);
|
||||
|
||||
void CHANSVmImageRegisterAllocator(CHANSVmImageAllocatorCallback allocCb, CHANSVmImageCtorCallback ctorCb);
|
||||
|
||||
@@ -75,7 +75,7 @@ namespace homebutton {
|
||||
|
||||
private:
|
||||
static bool sBatteryFlag[WPAD_MAX_CONTROLLERS];
|
||||
static bool sAlarmCreated[WPAD_MAX_CONTROLLERS];
|
||||
static bool lbl_816989BC[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
static OSAlarm sAlarm[WPAD_MAX_CONTROLLERS];
|
||||
static OSAlarm sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -35,8 +35,8 @@ namespace ext_ead {
|
||||
|
||||
class SurfaceManager {
|
||||
public:
|
||||
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* arcPath);
|
||||
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* param_10);
|
||||
static void DisposeManager();
|
||||
|
||||
static void RegisterArcFile(void* fileBuf);
|
||||
|
||||
@@ -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; }
|
||||
|
||||
@@ -187,19 +187,7 @@ namespace textinput {
|
||||
void SetFocusedText(s32 pane) { mnFocusedIdx = pane; }
|
||||
s32 GetFocusedText() { return mnFocusedIdx; }
|
||||
f32 GetWidthScale_() const { return 608.0f / mfScreenWidth; }
|
||||
#ifdef TI_CANDIDATEBOX_IMPLEMENTATION
|
||||
f32 GetMargin_() const {
|
||||
f32 margin;
|
||||
if (mfScreenWidth > 700.0f) {
|
||||
margin = 10.0f;
|
||||
} else {
|
||||
margin = 20.0f;
|
||||
}
|
||||
return margin;
|
||||
}
|
||||
#else
|
||||
f32 GetMargin_() const { return mfScreenWidth > 700.0f ? 10.0f : 20.0f; }
|
||||
#endif
|
||||
s32 GetNextPageIdx_(s32 page) const;
|
||||
s32 GetPrevPageIdx_(s32 page) const;
|
||||
s32 GetDispNum() const;
|
||||
|
||||
@@ -20,8 +20,6 @@ namespace textinput {
|
||||
public:
|
||||
void NotifyEvent(u8 down, u8 code);
|
||||
void Update();
|
||||
bool HasCurrentKey(u32 slot) const { return (current & (1 << slot)) != 0; }
|
||||
bool HadPreviousKey(u32 slot) const { return (previous & (1 << slot)) != 0; }
|
||||
void UpdateModState_();
|
||||
void Clear() {
|
||||
held = 0;
|
||||
@@ -109,23 +107,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);
|
||||
@@ -164,7 +149,6 @@ namespace textinput {
|
||||
void Update();
|
||||
|
||||
u32 GetModifierState() const;
|
||||
void SetCountry(u8 country);
|
||||
void SetModifierState(u32, u32);
|
||||
|
||||
#if defined(TI_CELLPHONE_HKB_KEYSET)
|
||||
|
||||
@@ -15,12 +15,12 @@ namespace textinput {
|
||||
#endif
|
||||
public:
|
||||
HWKeyboard(Manager *);
|
||||
#if defined(TIMANAGER_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
inline ~HWKeyboard();
|
||||
#else
|
||||
~HWKeyboard();
|
||||
#endif
|
||||
#if defined(TIMANAGER_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
void setLanguage(Destination destination, Language language);
|
||||
#endif
|
||||
|
||||
@@ -29,7 +29,7 @@ namespace textinput {
|
||||
wchar_t convertWCCode(wchar_t code) const;
|
||||
#endif
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
#else
|
||||
virtual void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
@@ -46,10 +46,9 @@ namespace textinput {
|
||||
bool updateTappingShift_(input::HKBManager&);
|
||||
#endif
|
||||
void updateShift(input::HKBManager& hkbManager);
|
||||
bool controlKeyTriggeredHandler(input::HKBManager&);
|
||||
void controlKeyTriggeredHandler(input::HKBManager);
|
||||
|
||||
Manager *mgr() { return mpManager; }
|
||||
const Manager *mgr() const { return mpManager; }
|
||||
|
||||
Manager* mpManager; // 0x10
|
||||
u8 field_0x14; // 0x14
|
||||
|
||||
@@ -133,11 +133,7 @@ namespace textinput {
|
||||
friend class Base;
|
||||
public:
|
||||
RowInfoManager(u16 maxLength) : mpInfo(NULL), mMaxLength(maxLength), mpAllocator(NULL) {}
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
void init() __attribute__((never_inline));
|
||||
#else
|
||||
void init();
|
||||
#endif
|
||||
~RowInfoManager();
|
||||
#endif
|
||||
private:
|
||||
@@ -149,7 +145,7 @@ namespace textinput {
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
bool isAtokActive() const;
|
||||
#endif
|
||||
#if defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
@@ -388,7 +384,7 @@ namespace textinput {
|
||||
virtual void setRootPaneScaleFor16x9();
|
||||
virtual void setRootPaneScaleFor4x3();
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
virtual void onSE(sound::SE seId);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -137,13 +135,8 @@ namespace textinput {
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
||||
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void* getSignKeyboard();
|
||||
virtual const void* getSignKeyboard() const;
|
||||
#else
|
||||
virtual void* getSignKeyboard() { return mpSignWindow; }
|
||||
virtual const void* getSignKeyboard() const { return mpSignWindow; }
|
||||
#endif
|
||||
|
||||
virtual candidatebox::LayoutByNW4R* getCandidateBox() { return mpCandidateBox; }
|
||||
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
|
||||
@@ -151,13 +144,8 @@ namespace textinput {
|
||||
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void* getPredictLanguageSelectDialog();
|
||||
virtual const void* getPredictLanguageSelectDialog() const;
|
||||
#else
|
||||
virtual void* getPredictLanguageSelectDialog() { return mpPredictLanguageDialog; }
|
||||
virtual const void* getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
|
||||
#endif
|
||||
|
||||
virtual inputform::EditBuffer* createEditBuffer();
|
||||
virtual keyboard::hwkey::HWKeyboard* createHWKeyboard();
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <nw4r/ut/CharWriter.h>
|
||||
#include <nw4r/ut/Rect.h>
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace textinput {
|
||||
} CursorPos;
|
||||
|
||||
typedef struct DrawInfo {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
nw4r::ut::Rect rect;
|
||||
wchar_t character;
|
||||
#else
|
||||
@@ -94,7 +94,7 @@ namespace textinput {
|
||||
virtual u32 getEndPos() const;
|
||||
|
||||
// todo
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
virtual void setDrawModifyScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void setDrawCacheScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void modifyCursorCache(s32 line, u32 position, f32 x, f32 y, f32 width, f32 height);
|
||||
@@ -103,12 +103,12 @@ namespace textinput {
|
||||
virtual void setDrawCacheScopeLine();
|
||||
virtual void modifyCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
virtual bool isEnableCursorCache() const;
|
||||
#else
|
||||
virtual void isEnableCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
virtual u32 getDrawModifyStartLine() const;
|
||||
virtual u32 getDrawModifyEndLine() const;
|
||||
#else
|
||||
@@ -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];
|
||||
|
||||
@@ -55,7 +55,7 @@ namespace textinput {
|
||||
public:
|
||||
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(MYTIMANAGER_IMPLEMENTATION)
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
||||
#else
|
||||
virtual void startAnm(AnimObserver*, f32, f32, f32, void*);
|
||||
|
||||
@@ -20,11 +20,7 @@ namespace gui {
|
||||
class Manager;
|
||||
class EventHandler;
|
||||
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) Interface {
|
||||
#else
|
||||
class Interface {
|
||||
#endif
|
||||
public:
|
||||
virtual void create() {} // 0x08 (0x02)
|
||||
|
||||
@@ -34,14 +30,14 @@ namespace gui {
|
||||
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
||||
virtual void draw() {} // 0x18 (0x06)
|
||||
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~Interface(); // 0x1C (0x07)
|
||||
#else
|
||||
virtual ~Interface() {} // 0x1C (0x07)
|
||||
#endif
|
||||
};
|
||||
|
||||
#if defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
class __declspec(novtable) EventHandler {
|
||||
#else
|
||||
class EventHandler {
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
mbDisableCon(bDisableCon) {}
|
||||
#endif
|
||||
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~PaneManager();
|
||||
#else
|
||||
virtual ~PaneManager() {}
|
||||
|
||||
@@ -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>
|
||||
@@ -110,7 +69,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
|
||||
T get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
@@ -122,11 +81,11 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(mStartTangent *
|
||||
(unkVal0 *
|
||||
(var_f27 +
|
||||
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -142,7 +101,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
@@ -150,8 +109,8 @@ namespace ipl {
|
||||
protected:
|
||||
T mStart;
|
||||
T mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
|
||||
template <>
|
||||
@@ -160,7 +119,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
|
||||
f32 speed = 1.0f);
|
||||
|
||||
f32 get() const {
|
||||
@@ -173,10 +132,10 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(mStartTangent *
|
||||
(unkVal0 *
|
||||
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -185,8 +144,8 @@ namespace ipl {
|
||||
protected:
|
||||
f32 mStart;
|
||||
f32 mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
|
||||
#pragma dont_instantiate HermiteIntp<float>
|
||||
@@ -196,12 +155,12 @@ namespace ipl {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
|
||||
mStartTangent = startTangent;
|
||||
mEndTangent = endTangent;
|
||||
unkVal0 = param_5;
|
||||
unkVal1 = param_6;
|
||||
}
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
@@ -217,9 +176,9 @@ namespace ipl {
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
f32 tangent = unkVal0 * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
unkVal1 * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
@@ -237,7 +196,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
|
||||
r = r + temp_f3;
|
||||
|
||||
@@ -254,55 +213,15 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
#endif
|
||||
|
||||
protected:
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
} // namespace math
|
||||
} // namespace ipl
|
||||
#include "math/iplMathTypes.h"
|
||||
namespace ipl {
|
||||
namespace math {
|
||||
template <>
|
||||
class HermiteIntp<VEC3> : public utility::FrameController {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
VEC3 get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
VEC3 result =
|
||||
(mStart * (1.0f + (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))))) -
|
||||
(mEnd * (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
return result;
|
||||
}
|
||||
protected:
|
||||
VEC3 mStart;
|
||||
VEC3 mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -162,14 +162,14 @@ namespace ipl {
|
||||
class {
|
||||
public:
|
||||
void init() {
|
||||
mAngleIdx = -1;
|
||||
unk_0x0C = -1;
|
||||
pos.x = 0.0f;
|
||||
pos.y = 0.0f;
|
||||
}
|
||||
|
||||
math::VEC2 pos; // pos
|
||||
int mStep;
|
||||
int mAngleIdx;
|
||||
int unk_0x08;
|
||||
int unk_0x0C;
|
||||
} mStandData; // 0xE4
|
||||
|
||||
picture mPicture; // 0xF4
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -309,8 +309,8 @@ namespace ipl {
|
||||
return mbArrowVisible[i];
|
||||
}
|
||||
|
||||
void setSuppressNewMailAnm(bool flag) {
|
||||
mbSuppressNewMailAnm = flag;
|
||||
void setUnk_0x105(bool flag) {
|
||||
unk_0x105 = flag;
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -354,7 +354,7 @@ namespace ipl {
|
||||
ANIM_MAX,
|
||||
};
|
||||
|
||||
int mAnimWait;
|
||||
int unk_0x54;
|
||||
|
||||
layout::Object* mpLayout; // 0x58
|
||||
nand::LayoutFile* mpLayoutFile; // 0x5C
|
||||
@@ -373,8 +373,8 @@ namespace ipl {
|
||||
|
||||
BOOL mbHovered[BTN_MAX]; // 0xD8
|
||||
|
||||
bool mbNewMailAnm;
|
||||
bool mbSuppressNewMailAnm;
|
||||
bool unk_0x104;
|
||||
bool unk_0x105;
|
||||
|
||||
utility::timer mTimer; // 0x108
|
||||
bool mbEnabled; // 0x110
|
||||
|
||||
@@ -95,9 +95,9 @@ namespace ipl {
|
||||
|
||||
public:
|
||||
nw4r::ut::List mDateList; // 0x84
|
||||
nw4r::ut::List mDrawList;
|
||||
nw4r::ut::List unk_0x90;
|
||||
bool mbScrolling; // 0x9C
|
||||
vBOOL mbSearchTaskRunning;
|
||||
vBOOL unk_0xA0;
|
||||
BOOL mbTaskCanceled; // 0xA4
|
||||
vBOOL mbBackToBoardAlt; // 0xA8
|
||||
bool mbAsian; // 0xAC
|
||||
|
||||
@@ -68,8 +68,8 @@ namespace ipl {
|
||||
vBOOL mbAppearMsg; // 0x0C
|
||||
|
||||
private:
|
||||
u32 mFocusState;
|
||||
int mPendingFocusCmd;
|
||||
u32 unk_0x10;
|
||||
int unk_0x14;
|
||||
layout::Object* mpLayout; // 0x18
|
||||
gui::PaneManager* mpGui; // 0x1C
|
||||
layout::PaneAnimator* mpCurrentPaneAnim; // 0x20
|
||||
@@ -77,7 +77,7 @@ namespace ipl {
|
||||
|
||||
public:
|
||||
utility::Date* mpDate; // 0x38
|
||||
u32 mPointCount;
|
||||
u32 unk_0x3C;
|
||||
|
||||
static const char* mscAnimPanes[ANIM_PANE_MAX];
|
||||
|
||||
|
||||
@@ -293,8 +293,8 @@ namespace ipl {
|
||||
LOCKED_DIALOG_ANIM_MAX,
|
||||
};
|
||||
|
||||
static void markTmdReadyTask(void* work);
|
||||
static void deleteTmpTitleContentTask(void* work);
|
||||
static void iplChannelTitle_813BA684(void* work);
|
||||
static void iplChannelTitle_813BA784(void* work);
|
||||
static void getTmdTask(void* work);
|
||||
static void getTicketLimitTask(void* work);
|
||||
static BOOL isTimeLimitedTicket(ESTicketView * ticket, u32* remainTime = NULL);
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class GCWindow : public MemoryBase, public MemCardEventListener {
|
||||
class GCWindow : public MemoryBase, public MemCardEventHandler {
|
||||
#ifdef IPL_MEMORY_CARD_CPP
|
||||
friend class MemoryCard;
|
||||
#endif
|
||||
@@ -48,25 +48,6 @@ private:
|
||||
void set_texture(const char*, const GXTexObj&);
|
||||
public:
|
||||
virtual void onMemEvent(long, u8);
|
||||
#ifdef IPL_GC_WINDOW_CPP
|
||||
virtual void on_wait_anim() = 0;
|
||||
virtual void on_exit() = 0;
|
||||
virtual void on_error() = 0;
|
||||
virtual void on_format() = 0;
|
||||
virtual void on_dialog_result() = 0;
|
||||
virtual void on_select_in() = 0;
|
||||
virtual void on_message_done() = 0;
|
||||
virtual void on_button_trig() = 0;
|
||||
#else
|
||||
virtual void on_wait_anim();
|
||||
virtual void on_exit();
|
||||
virtual void on_error();
|
||||
virtual void on_format();
|
||||
virtual void on_dialog_result();
|
||||
virtual void on_select_in();
|
||||
virtual void on_message_done();
|
||||
virtual void on_button_trig();
|
||||
#endif
|
||||
bool isProcess();
|
||||
void stop_wait_anim();
|
||||
|
||||
|
||||
@@ -35,11 +35,7 @@ namespace ipl {
|
||||
MemoryBase* mpBase; // 0x0C
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
class __declspec(novtable) MemoryBase {
|
||||
#else
|
||||
class MemoryBase {
|
||||
#endif
|
||||
public:
|
||||
class Anm {
|
||||
public:
|
||||
|
||||
@@ -12,61 +12,13 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class __declspec(novtable) MemCardEventListener {
|
||||
public:
|
||||
MemCardEventListener() {}
|
||||
|
||||
virtual ~MemCardEventListener() {}
|
||||
|
||||
virtual void onMemEvent(long event, u8 slot);
|
||||
};
|
||||
|
||||
class MemCardEventHandler : public MemCardEventListener {
|
||||
class MemCardEventHandler {
|
||||
public:
|
||||
MemCardEventHandler() {}
|
||||
|
||||
virtual ~MemCardEventHandler();
|
||||
|
||||
virtual void onMemEvent(long event, u8 slot);
|
||||
|
||||
virtual void onMount(u8 slot) = 0;
|
||||
virtual void onUnmount(u8 slot) = 0;
|
||||
virtual void onAttach(u8 slot) = 0;
|
||||
virtual void onDetach(u8 slot) = 0;
|
||||
virtual void onCheck(u8 slot) = 0;
|
||||
virtual void onFormat(u8 slot) = 0;
|
||||
virtual void onRepair(u8 slot) = 0;
|
||||
virtual void onRead(u8 slot) = 0;
|
||||
virtual void onWrite(u8 slot) = 0;
|
||||
virtual void onOpen(u8 slot) = 0;
|
||||
virtual void onClose(u8 slot) = 0;
|
||||
virtual void onCreate(u8 slot) = 0;
|
||||
virtual void onDelete(u8 slot) = 0;
|
||||
virtual void onCopy(u8 slot) = 0;
|
||||
virtual void onMove(u8 slot) = 0;
|
||||
virtual void onRename(u8 slot) = 0;
|
||||
virtual void onVerify(u8 slot) = 0;
|
||||
virtual void onCommit(u8 slot) = 0;
|
||||
virtual void onProbe(u8 slot) = 0;
|
||||
virtual void onMountAsync(u8 slot) = 0;
|
||||
virtual void onUnmountAsync(u8 slot) = 0;
|
||||
virtual void onCheckAsync(u8 slot) = 0;
|
||||
virtual void onFormatAsync(u8 slot) = 0;
|
||||
virtual void onReadAsync(u8 slot) = 0;
|
||||
virtual void onWriteAsync(u8 slot) = 0;
|
||||
virtual void onCreateAsync(u8 slot) = 0;
|
||||
virtual void onDeleteAsync(u8 slot) = 0;
|
||||
virtual void onCopyAsync(u8 slot) = 0;
|
||||
virtual void onMoveAsync(u8 slot) = 0;
|
||||
virtual void onRenameAsync(u8 slot) = 0;
|
||||
virtual void onVerifyAsync(u8 slot) = 0;
|
||||
virtual void onCommitAsync(u8 slot) = 0;
|
||||
virtual void onProbeAsync(u8 slot) = 0;
|
||||
virtual void onFreeBlocks(u8 slot) = 0;
|
||||
virtual void onGetLength(u8 slot) = 0;
|
||||
virtual void onSetAttrib(u8 slot) = 0;
|
||||
virtual void onGetAttrib(u8 slot) = 0;
|
||||
virtual void onSlotStatus(u8 slot) = 0;
|
||||
};
|
||||
|
||||
typedef struct MCFile {
|
||||
@@ -104,44 +56,6 @@ namespace ipl {
|
||||
}
|
||||
virtual ~MemoryCardManager();
|
||||
|
||||
virtual void onMount(u8 slot) = 0;
|
||||
virtual void onUnmount(u8 slot) = 0;
|
||||
virtual void onAttach(u8 slot) = 0;
|
||||
virtual void onDetach(u8 slot) = 0;
|
||||
virtual void onCheck(u8 slot) = 0;
|
||||
virtual void onFormat(u8 slot) = 0;
|
||||
virtual void onRepair(u8 slot) = 0;
|
||||
virtual void onRead(u8 slot) = 0;
|
||||
virtual void onWrite(u8 slot) = 0;
|
||||
virtual void onOpen(u8 slot) = 0;
|
||||
virtual void onClose(u8 slot) = 0;
|
||||
virtual void onCreate(u8 slot) = 0;
|
||||
virtual void onDelete(u8 slot) = 0;
|
||||
virtual void onCopy(u8 slot) = 0;
|
||||
virtual void onMove(u8 slot) = 0;
|
||||
virtual void onRename(u8 slot) = 0;
|
||||
virtual void onVerify(u8 slot) = 0;
|
||||
virtual void onCommit(u8 slot) = 0;
|
||||
virtual void onProbe(u8 slot) = 0;
|
||||
virtual void onMountAsync(u8 slot) = 0;
|
||||
virtual void onUnmountAsync(u8 slot) = 0;
|
||||
virtual void onCheckAsync(u8 slot) = 0;
|
||||
virtual void onFormatAsync(u8 slot) = 0;
|
||||
virtual void onReadAsync(u8 slot) = 0;
|
||||
virtual void onWriteAsync(u8 slot) = 0;
|
||||
virtual void onCreateAsync(u8 slot) = 0;
|
||||
virtual void onDeleteAsync(u8 slot) = 0;
|
||||
virtual void onCopyAsync(u8 slot) = 0;
|
||||
virtual void onMoveAsync(u8 slot) = 0;
|
||||
virtual void onRenameAsync(u8 slot) = 0;
|
||||
virtual void onVerifyAsync(u8 slot) = 0;
|
||||
virtual void onCommitAsync(u8 slot) = 0;
|
||||
virtual void onProbeAsync(u8 slot) = 0;
|
||||
virtual void onFreeBlocks(u8 slot) = 0;
|
||||
virtual void onGetLength(u8 slot) = 0;
|
||||
virtual void onSetAttrib(u8 slot) = 0;
|
||||
virtual void onGetAttrib(u8 slot) = 0;
|
||||
|
||||
void calc();
|
||||
|
||||
bool isSlotReady(u8 slot);
|
||||
@@ -182,7 +96,7 @@ namespace ipl {
|
||||
u16 getFreeBlocks(u8 slot);
|
||||
#endif
|
||||
|
||||
void setEventHandler(MemCardEventListener* eventHandler) {
|
||||
void setEventHandler(MemCardEventHandler* eventHandler) {
|
||||
mpEventHandler = eventHandler;
|
||||
}
|
||||
|
||||
@@ -193,7 +107,7 @@ namespace ipl {
|
||||
s32 mLastResult; // 0x16930
|
||||
s32 mLastCmd; // 0x16934
|
||||
u32 unk_0x16938; // 0x16938
|
||||
MemCardEventListener* mpEventHandler; // 0x1693C
|
||||
MemCardEventHandler* mpEventHandler; // 0x1693C
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -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);
|
||||
@@ -145,7 +150,7 @@ namespace ipl {
|
||||
ANIM_MAX,
|
||||
};
|
||||
|
||||
int mAnimWait;
|
||||
int unk_0x54;
|
||||
|
||||
layout::Object* mpLayout; // 0x58
|
||||
nand::LayoutFile* mpLayoutFile; // 0x5C
|
||||
|
||||
@@ -81,22 +81,22 @@ namespace ipl {
|
||||
void* mpThumbnailData;
|
||||
NandSDWorker::SDAppMetaEntry mAppMeta;
|
||||
};
|
||||
extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
EGG::ExpHeap* secondHeap);
|
||||
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane);
|
||||
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile);
|
||||
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool selected);
|
||||
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int enabled);
|
||||
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel);
|
||||
extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane);
|
||||
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile);
|
||||
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool selected);
|
||||
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int enabled);
|
||||
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel);
|
||||
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel);
|
||||
|
||||
union SDChannelSelectCommandArguments {
|
||||
u32 values[3];
|
||||
@@ -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);
|
||||
@@ -395,9 +395,9 @@ namespace ipl {
|
||||
NandSDWorker* mpSDWorker;
|
||||
ESTitleId32* mpSDTitleIds;
|
||||
SDChannelSelectTitleInfo* mpSDTitleInfo;
|
||||
mutable NandSDWorker::TitleUsage* mpNandTitleInfo;
|
||||
mutable s32 mFirstTitleCount;
|
||||
mutable s32 mSecondTitleCount;
|
||||
NandSDWorker::TitleUsage* mpNandTitleInfo;
|
||||
s32 mFirstTitleCount;
|
||||
s32 mSecondTitleCount;
|
||||
SDChannelObj* mpCurrentLoadedChannel;
|
||||
u32 mSDTitleCount;
|
||||
u32 mNandTitleCount;
|
||||
|
||||
@@ -62,17 +62,17 @@ namespace ipl {
|
||||
void start_left_event(const char* paneName);
|
||||
void start_trig_event(const char* paneName);
|
||||
|
||||
typedef struct CmdEntry {
|
||||
typedef struct Unk {
|
||||
int command; // 0x00
|
||||
u32 msgID; // 0x04
|
||||
} CmdEntry;
|
||||
} Unk;
|
||||
|
||||
CmdEntry mCmdQueue[64];
|
||||
Unk unk_0x64[64];
|
||||
|
||||
int mQueueCapacity;
|
||||
int mQueueCount;
|
||||
int mQueueRead;
|
||||
int mQueueWrite;
|
||||
int unk_0x264;
|
||||
int unk_0x268;
|
||||
int unk_0x26C;
|
||||
int unk_0x270;
|
||||
|
||||
int mSettingArg; // 0x274
|
||||
|
||||
|
||||
@@ -167,12 +167,12 @@ namespace ipl {
|
||||
|
||||
bool is_stopped_all_anm() const;
|
||||
|
||||
void calc_exit_sequence();
|
||||
void fn_81409864();
|
||||
|
||||
void prepare_exit_abort();
|
||||
void wait_decide_se();
|
||||
void start_exit_fade();
|
||||
void finish_exit_reboot();
|
||||
void fn_814098F4();
|
||||
void fn_unk_inline();
|
||||
void fn_81409988();
|
||||
void fn_814099EC();
|
||||
|
||||
int mState; // 0x60
|
||||
int mPrevState; // 0x64
|
||||
|
||||
@@ -14,8 +14,8 @@ namespace ipl {
|
||||
WAIT_UNTIL_FADE_IN = 15
|
||||
};
|
||||
|
||||
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& initialPos,
|
||||
f32 margin16x9 = 120.0f, f32 margin4x3 = 30.0f);
|
||||
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& unk2,
|
||||
f32 unk3 = 120.0f, f32 unk4 = 30.0f);
|
||||
~TextBalloon();
|
||||
|
||||
void calc();
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
void fadeout();
|
||||
void fadeoutForce();
|
||||
|
||||
void setPos(const math::VEC3& pos, bool use16x9X, int hAlign);
|
||||
void setPos(const math::VEC3& pos, bool unk0, int unk1);
|
||||
void updatePos(const math::VEC3& pos);
|
||||
|
||||
void set_translate(const math::VEC3& trans);
|
||||
@@ -50,7 +50,7 @@ namespace ipl {
|
||||
|
||||
undefined4 unk_0x00;
|
||||
undefined4 unk_0x04;
|
||||
BOOL mbWaitingFadeIn; // 0x08
|
||||
BOOL unk_0x08;
|
||||
|
||||
layout::Object* mpLayout; // 0x0C
|
||||
|
||||
@@ -60,10 +60,10 @@ namespace ipl {
|
||||
|
||||
u32 mTextLen; // 0x18
|
||||
math::VEC3 mBalloonPos; // 0x1C
|
||||
undefined4 mHAlign; // 0x28
|
||||
undefined mbUse16x9X; // 0x2C
|
||||
f32 mMargin16x9; // 0x30
|
||||
f32 mMargin4x3; // 0x34
|
||||
undefined4 unk_0x28;
|
||||
undefined unk_0x2C;
|
||||
f32 unk_0x30;
|
||||
f32 unk_0x34;
|
||||
|
||||
int mWaitUntilFadeIn; // 0x38
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace ipl {
|
||||
};
|
||||
|
||||
virtual BOOL isResetAcceptable() const {
|
||||
return mbResetAcceptable;
|
||||
return unk_0x7D;
|
||||
}
|
||||
|
||||
virtual void prepare();
|
||||
@@ -108,7 +108,7 @@ namespace ipl {
|
||||
static const int mToFace_Duration = 20;
|
||||
|
||||
bool mbClosing; // 0x7C
|
||||
bool mbResetAcceptable;
|
||||
bool unk_0x7D;
|
||||
|
||||
wchar_t* mWCString; // 0x80
|
||||
|
||||
|
||||
@@ -38,49 +38,21 @@ namespace ipl {
|
||||
int holdSE(const char* sndName);
|
||||
int holdSEwithPosDis(const char* sndName, f32 x, f32 y);
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void stopBGM(int unk = 0);
|
||||
#else
|
||||
int stopBGM(int unk = 0);
|
||||
#endif
|
||||
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
void stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
int stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
void stopAllSound(int unk = 0);
|
||||
|
||||
int resetAllSound();
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void muteOffBGM(int);
|
||||
#else
|
||||
int muteOffBGM(int);
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void muteOnBGM(int);
|
||||
#else
|
||||
int muteOnBGM(int);
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOnBGM();
|
||||
#else
|
||||
int pauseOnBGM();
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOffBGM();
|
||||
#else
|
||||
int pauseOffBGM();
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOnSE();
|
||||
#else
|
||||
int pauseOnSE();
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOffSE();
|
||||
#else
|
||||
int pauseOffSE();
|
||||
#endif
|
||||
|
||||
void setOutputMode(EAudioOutputMode mode);
|
||||
|
||||
@@ -99,7 +71,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
|
||||
|
||||
@@ -89,10 +89,10 @@ namespace ipl {
|
||||
|
||||
int mIPLState; // 0x04
|
||||
volatile BS2State mState; // 0x08
|
||||
bool mbTickEnabled; // 0x0C
|
||||
bool mbUpdateRequested; // 0x0D
|
||||
bool mbAbortRequested; // 0x0E
|
||||
bool mbRestartRequested; // 0x0F
|
||||
bool unk_0x0C;
|
||||
bool unk_0x0D;
|
||||
bool unk_0x0E;
|
||||
bool unk_0x0F;
|
||||
bool mbIsDiagDisc; // 0x10
|
||||
bool mbIncludesSeatTitles; // 0x11
|
||||
u8* mpBannerBuffer; // 0x14
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace ipl {
|
||||
void stt_wait_fns_msg();
|
||||
void stt_wait_terminate();
|
||||
|
||||
int getProgressPercent();
|
||||
int fn_8135B1C0();
|
||||
|
||||
void error_handling();
|
||||
|
||||
|
||||
@@ -336,19 +336,19 @@ namespace ipl {
|
||||
|
||||
BOOL nand_error_handling(int code);
|
||||
|
||||
SEntry* findEntryByTitleId(ESTitleId titleId);
|
||||
u32 getBannerCSIdx(ESTitleId titleId);
|
||||
u32 getSoundSize(ESTitleId titleId);
|
||||
BOOL needsNetSetting(ESTitleId titleId);
|
||||
BOOL usesAltSound(ESTitleId titleId);
|
||||
BOOL isMissingTicket(ESTitleId titleId);
|
||||
BOOL isNewsChannelV6Plus(ESTitleId titleId);
|
||||
BOOL isOperaChannel(ESTitleId titleId);
|
||||
nand::MetaFile* readBannerMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* readSoundMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* readBannerCSAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
void clearTmpChannel();
|
||||
void unloadBanner(ESTitleId titleId);
|
||||
SEntry* fn_8133A4E0(ESTitleId titleId);
|
||||
u32 fn_8133A57C(ESTitleId titleId);
|
||||
u32 fn_8133A5B8(ESTitleId titleId);
|
||||
BOOL fn_8133A5F0(ESTitleId titleId);
|
||||
BOOL fn_8133A634(ESTitleId titleId);
|
||||
BOOL fn_8133A678(ESTitleId titleId);
|
||||
BOOL fn_8133A6B8(ESTitleId titleId);
|
||||
BOOL fn_8133A73C(ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A7A4(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A85C(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* fn_8133A924(EGG::Heap* heap, ESTitleId titleId);
|
||||
void fn_8133A9F0();
|
||||
void fn_8133AA50(ESTitleId titleId);
|
||||
|
||||
BOOL isReady() { return mState == FINISH; }
|
||||
|
||||
|
||||
@@ -145,13 +145,6 @@ namespace ipl {
|
||||
mpCommonFile = commonFile;
|
||||
mpLangFile = langFile;
|
||||
}
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~LangFile() {}
|
||||
virtual void read() {}
|
||||
virtual bool isFinished() { return false; }
|
||||
virtual int checkData() { return 0; }
|
||||
virtual bool isFatalError() { return false; }
|
||||
#else
|
||||
virtual ~LangFile(); // 0x08
|
||||
|
||||
virtual void read(); // 0x0C
|
||||
@@ -159,7 +152,6 @@ namespace ipl {
|
||||
virtual bool isFinished(); // 0x14
|
||||
virtual int checkData(); // 0x18
|
||||
virtual bool isFatalError(); // 0x1C
|
||||
#endif
|
||||
|
||||
File* getCmnFile() const { return mpCommonFile; }
|
||||
File* getLangFile() const { return mpLangFile; }
|
||||
@@ -173,11 +165,7 @@ namespace ipl {
|
||||
public:
|
||||
LayoutFile(EGG::Heap* heap, const char* dirName, const char* fileName, ARCHandle* arc, bool bIsNandFile);
|
||||
LayoutFile(File* commonFile, File* langFile = NULL) : LangFile(commonFile, langFile) {}
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~LayoutFile() {} // 0x08
|
||||
#else
|
||||
virtual ~LayoutFile(); // 0x08
|
||||
#endif
|
||||
};
|
||||
} // namespace nand
|
||||
} // namespace ipl
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
void read_sd_app_location_async(ESTitleId32* titleIds);
|
||||
void check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks);
|
||||
void check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles);
|
||||
void check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC);
|
||||
void iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC);
|
||||
|
||||
void list_nand_apps_usage_async(void* ptrA, void* ptr);
|
||||
|
||||
@@ -152,7 +152,7 @@ namespace ipl {
|
||||
BOOL is_working();
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
void requestCancel() { mbCancel = true; }
|
||||
void requestCancel() { unk_0x04 = true; }
|
||||
#endif
|
||||
|
||||
WIISaveBannerFile* get_cached_nand_save_banner(ESTitleId titleId);
|
||||
@@ -514,7 +514,7 @@ namespace ipl {
|
||||
void do_check_for_sd_app_to_nand();
|
||||
void check_backup_fits();
|
||||
void do_list_nand_apps_usage();
|
||||
void do_check_sd_app_titles();
|
||||
void do_unk_8134C838();
|
||||
|
||||
void do_move_nand_app_to_sd();
|
||||
void do_move_sd_app_to_nand();
|
||||
@@ -531,7 +531,7 @@ namespace ipl {
|
||||
static void wad_backup_progress_callback(u32 completed, u32 total, BOOL done);
|
||||
|
||||
Work* myWork; // 0x00
|
||||
bool mbCancel; // 0x04
|
||||
bool unk_0x04; // 0x04
|
||||
|
||||
static const char* c_banner_file_name;
|
||||
static const char* c_nocopy_folder_name;
|
||||
|
||||
@@ -24,19 +24,7 @@ namespace ipl {
|
||||
class Manager;
|
||||
}
|
||||
namespace savedata {
|
||||
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||
|
||||
struct ChannelSlot {
|
||||
u8 valid; // 0x00 (primaryType)
|
||||
u8 pad[3]; // 0x01
|
||||
s32 titleId; // 0x04 (sceneID)
|
||||
u8 rest[8]; // 0x08
|
||||
};
|
||||
|
||||
struct ChannelPage {
|
||||
u8 pad[0x30];
|
||||
ChannelSlot slots[MAX_CHANNEL_INDEX]; // 0x30
|
||||
};
|
||||
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
|
||||
class Manager {
|
||||
public:
|
||||
@@ -99,7 +87,7 @@ namespace ipl {
|
||||
channel::SInfo& getChanInfo(int page, int index) { return mData.chanInfo[page][index]; }
|
||||
textinput::extend::savedata::MemoSetting getMemoSetting() { return mData.memoSetting; }
|
||||
|
||||
void pushTitleCache(ESTitleId titleId);
|
||||
void iplSavedata_813596B8(ESTitleId titleId);
|
||||
|
||||
private:
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_ACCESS
|
||||
@@ -196,7 +184,7 @@ namespace ipl {
|
||||
u8 unused_0x504[28];
|
||||
|
||||
friend class channel::Manager;
|
||||
friend BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||
friend BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
};
|
||||
} // namespace savedata
|
||||
} // namespace ipl
|
||||
|
||||
@@ -38,19 +38,6 @@ namespace EGG {
|
||||
|
||||
virtual void calc(); // 0x30
|
||||
|
||||
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x34
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x38
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x3C
|
||||
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x44
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x44
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x48
|
||||
|
||||
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x50
|
||||
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x50
|
||||
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x58
|
||||
#else
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x34
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x38
|
||||
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName) NO_INLINE {
|
||||
@@ -61,14 +48,10 @@ namespace EGG {
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.PrepareSound(pHandle, id); } // 0x44
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.PrepareSound(pHandle, id); } // 0x44
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, const char* pName) {
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
u32 id = changeNameToId(pName);
|
||||
#else
|
||||
u32 id = nw4r::snd::SoundArchive::INVALID_ID;
|
||||
if (mpArchive != NULL) {
|
||||
id = changeNameToId(pName);
|
||||
}
|
||||
#endif
|
||||
|
||||
return mSoundArchivePlayer.PrepareSound(pHandle, id);
|
||||
} // 0x48
|
||||
@@ -79,7 +62,6 @@ namespace EGG {
|
||||
u32 id = changeNameToId(pName);
|
||||
return mSoundArchivePlayer.HoldSound(pHandle, id);
|
||||
} // 0x58
|
||||
#endif
|
||||
|
||||
u32 changeNameToId(const char* pName) { return mpArchive->ConvertLabelStringToSoundId(pName); }
|
||||
const char* changeIdToName(u32 id) { return mpArchive->GetSoundLabelString(id); }
|
||||
|
||||
@@ -19,18 +19,10 @@ namespace EGG {
|
||||
|
||||
~SoundHeapMgr() { destroySoundHeap(); }
|
||||
|
||||
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
||||
virtual bool loadState(s32 id); // 0x08
|
||||
virtual s32 getCurrentLevel(); // 0x0C
|
||||
#else
|
||||
virtual bool loadState(s32 id) {
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
if (id > 0 && mHeap.GetCurrentLevel() >= id) {
|
||||
#else
|
||||
s32 level = mHeap.GetCurrentLevel();
|
||||
|
||||
if (id > 0 && level >= id) {
|
||||
#endif
|
||||
mHeap.LoadState(id);
|
||||
return true;
|
||||
}
|
||||
@@ -39,7 +31,6 @@ namespace EGG {
|
||||
} // 0x08
|
||||
|
||||
virtual s32 getCurrentLevel() { return mHeap.GetCurrentLevel(); } // 0x0C
|
||||
#endif
|
||||
|
||||
s32 saveState() { return mHeap.SaveState(); }
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
#define EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
||||
|
||||
#include <egg/core.h>
|
||||
|
||||
namespace EGG {
|
||||
|
||||
@@ -1120,7 +1120,6 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
case 's':
|
||||
if (format.argument_options == wchar_argument) {
|
||||
wchar_t* wcs_ptr = va_arg(args, wchar_t*);
|
||||
int wideLength;
|
||||
|
||||
if (wcs_ptr == NULL) {
|
||||
wcs_ptr = L"";
|
||||
@@ -1128,24 +1127,22 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
|
||||
|
||||
if (format.alternate_form) {
|
||||
wchar_t first = *wcs_ptr++;
|
||||
wideLength = (unsigned char)first;
|
||||
num_chars = (unsigned char)first;
|
||||
|
||||
if (format.precision_specified && wideLength > format.precision) {
|
||||
wideLength = format.precision;
|
||||
if (format.precision_specified && num_chars > format.precision) {
|
||||
num_chars = format.precision;
|
||||
}
|
||||
} else if (format.precision_specified) {
|
||||
wideLength = format.precision;
|
||||
num_chars = format.precision;
|
||||
|
||||
if ((string_end = wmemchr((wchar_t*)wcs_ptr, 0, wideLength)) != 0) {
|
||||
wideLength = string_end - wcs_ptr;
|
||||
if ((string_end = wmemchr((wchar_t*)wcs_ptr, 0, num_chars)) != 0) {
|
||||
num_chars = string_end - wcs_ptr;
|
||||
}
|
||||
|
||||
} else {
|
||||
wideLength = wcslen(wcs_ptr);
|
||||
num_chars = wcslen(wcs_ptr);
|
||||
}
|
||||
|
||||
num_chars = wideLength;
|
||||
|
||||
buff_ptr = wcs_ptr;
|
||||
break;
|
||||
} else {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -11,11 +11,7 @@ namespace nw4r {
|
||||
namespace snd {
|
||||
class SoundHandle : private ut::NonCopyable {
|
||||
public:
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
SoundHandle() NO_INLINE;
|
||||
#else
|
||||
SoundHandle() NO_INLINE : mSound(NULL) {}
|
||||
#endif
|
||||
~SoundHandle() { DetachSound(); }
|
||||
|
||||
void detail_AttachSound(detail::BasicSound* sound);
|
||||
|
||||
@@ -31,14 +31,7 @@ namespace nw4r {
|
||||
ut::detail::AutoLock<OSMutex> lock(mMutex);
|
||||
return mFrameHeap.SaveState();
|
||||
}
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void LoadState(int id) {
|
||||
ut::detail::AutoLock<OSMutex> lock(mMutex);
|
||||
mFrameHeap.LoadState(id);
|
||||
}
|
||||
#else
|
||||
void LoadState(int id);
|
||||
#endif
|
||||
|
||||
bool IsValid() { return mFrameHeap.IsValid(); }
|
||||
|
||||
|
||||
@@ -19,13 +19,8 @@ namespace nw4r {
|
||||
template <typename T>
|
||||
class AutoLock : private NonCopyable {
|
||||
public:
|
||||
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
|
||||
explicit AutoLock(T& rLockObj);
|
||||
~AutoLock();
|
||||
#else
|
||||
explicit AutoLock(T& rLockObj) : mLockObj(rLockObj) { Lock(rLockObj); }
|
||||
~AutoLock() { Unlock(mLockObj); }
|
||||
#endif
|
||||
|
||||
private:
|
||||
T& mLockObj; // 0x00
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace nw4r {
|
||||
Rect(f32 l, f32 t, f32 r, f32 b) : left(l), top(t), right(r), bottom(b) {}
|
||||
#endif
|
||||
|
||||
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
#ifndef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
|
||||
~Rect() {}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace nw4r {
|
||||
} // namespace detail
|
||||
|
||||
template <typename TDerived, typename TBase>
|
||||
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
#ifdef IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST
|
||||
TDerived DynamicCast(TBase* pPtr);
|
||||
#else
|
||||
inline TDerived DynamicCast(TBase* pPtr) {
|
||||
|
||||
@@ -301,9 +301,9 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
|
||||
u32 fpcsr = sException.FPCSR_COPY;
|
||||
fpcsr &= (((fpcsr & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((fpcsr & 0x20000000) != 0) {
|
||||
u32 uVar1 = sException.FPCSR_COPY;
|
||||
uVar1 &= (((uVar1 & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((uVar1 & 0x20000000) != 0) {
|
||||
Exception_Printf_(" FPE: Invalid operation\n");
|
||||
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
|
||||
Exception_Printf_(" SNaN\n");
|
||||
@@ -333,16 +333,16 @@ namespace nw4r {
|
||||
Exception_Printf_(" Invalid integer convert\n");
|
||||
}
|
||||
}
|
||||
if ((fpcsr & 0x10000000) != 0) {
|
||||
if ((uVar1 & 0x10000000) != 0) {
|
||||
Exception_Printf_(" FPE: Overflow\n");
|
||||
}
|
||||
if ((fpcsr & 0x8000000) != 0) {
|
||||
if ((uVar1 & 0x8000000) != 0) {
|
||||
Exception_Printf_(" FPE: Underflow\n");
|
||||
}
|
||||
if ((fpcsr & 0x4000000) != 0) {
|
||||
if ((uVar1 & 0x4000000) != 0) {
|
||||
Exception_Printf_(" FPE: Zero division\n");
|
||||
}
|
||||
if ((fpcsr & 0x2000000) != 0) {
|
||||
if ((uVar1 & 0x2000000) != 0) {
|
||||
Exception_Printf_(" FPE: Inexact result\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,31 +1,22 @@
|
||||
#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" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" const u8 lbl_81695550 = 255;
|
||||
extern "C" const u8 lbl_81695551 = 255;
|
||||
extern "C" const u8 lbl_81695552 = 255;
|
||||
extern "C" const u8 lbl_81695553 = 0;
|
||||
extern "C" char lbl_816719DC[] = "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), \
|
||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
||||
GXColor front = {*((volatile const u8*)&::lbl_81695550), *((volatile const u8*)&::lbl_81695551), \
|
||||
*((volatile const u8*)&::lbl_81695552), *((volatile const u8*)&::lbl_81695553)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::lbl_816719DC); \
|
||||
} \
|
||||
}
|
||||
|
||||
#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;
|
||||
|
||||
@@ -314,7 +314,7 @@ namespace nw4r {
|
||||
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader) {
|
||||
u32 glgrInnerLen;
|
||||
HeaderedGlyphGroups* pGlgr;
|
||||
const ArchiveFontBinaryLayout* font;
|
||||
ArchiveFontBinaryLayout* font;
|
||||
u8* glgrEnd;
|
||||
|
||||
u32 expectedMaxSize;
|
||||
@@ -337,7 +337,7 @@ namespace nw4r {
|
||||
|
||||
// Copy the glgr to work
|
||||
{
|
||||
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
|
||||
pGlgr = &font->glgr;
|
||||
glgrEnd = (u8*)pGlgr + (u32)ctx->mNextBlockHdr.size;
|
||||
|
||||
memcpy(pGlgr, &ctx->mNextBlockHdr, sizeof(BinaryBlockHeader));
|
||||
@@ -368,21 +368,21 @@ 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 = (HeaderedGlyphGroups*)&font->glgr;
|
||||
pGlgr = &font->glgr;
|
||||
ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize);
|
||||
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) {
|
||||
// return CONSTRUCT_STATE_FATAL_ERR;
|
||||
|
||||
@@ -64,8 +64,8 @@ typedef struct {
|
||||
u16 mcuYCount; // 0x10
|
||||
u16 mcuXCount2; // 0x12
|
||||
u32 unk_0x14;
|
||||
u8 remX; // 0x18
|
||||
u8 remY; // 0x19
|
||||
u8 unk_0x18;
|
||||
u8 unk_0x19;
|
||||
u8 compCount; // 0x1A
|
||||
u8 scanCompCount; // 0x1B
|
||||
u8 blockCount[4]; // 0x1C
|
||||
@@ -143,8 +143,8 @@ struct TMCCJPEGDecWork_t {
|
||||
u16 mcuYCount; // 0x1800
|
||||
u16 mcuXCount2; // 0x1802
|
||||
u32 unk_0x1804;
|
||||
u8 remX; // 0x1808
|
||||
u8 remY; // 0x1809
|
||||
u8 unk_0x1808;
|
||||
u8 unk_0x1809;
|
||||
u8 compCount; // 0x180A
|
||||
u8 scanCompCount; // 0x180B
|
||||
u8 blockCount[4]; // 0x180C
|
||||
|
||||
@@ -10,12 +10,14 @@ static TMCHuffmanEntry readHuffmanEntry(const TMCHuffmanEntry* entries, u32 inde
|
||||
return entries[index];
|
||||
}
|
||||
|
||||
static void readHuffmanLimit(const TMCHuffmanEntry* entries, TMCHuffmanEntry* limit) {
|
||||
limit->bitLength = entries->bitLength;
|
||||
limit->symbol = entries->symbol;
|
||||
static TMCHuffmanEntry readHuffmanLimit(const TMCHuffmanEntry* entries) {
|
||||
TMCHuffmanEntry limit;
|
||||
limit.bitLength = entries->bitLength;
|
||||
limit.symbol = entries->symbol;
|
||||
return limit;
|
||||
}
|
||||
|
||||
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
|
||||
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||
u32 bitData;
|
||||
u32 code;
|
||||
u32 length;
|
||||
@@ -49,21 +51,17 @@ static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table,
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
readHuffmanLimit(entry, limit);
|
||||
*decoded = *limit;
|
||||
if (code > (u32)decoded->bitLength) {
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
if (code > (u32)decoded.bitLength) {
|
||||
continue;
|
||||
}
|
||||
{
|
||||
u32 relativeCode = code - entry->bitLength;
|
||||
u32 symbolIndex = relativeCode + entry->symbol;
|
||||
return symbols[symbolIndex & 0xFF];
|
||||
}
|
||||
code = code - entry->bitLength + entry->symbol;
|
||||
return symbols[code & 0xFF];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
|
||||
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||
u32 bitData;
|
||||
u32 code;
|
||||
u32 length;
|
||||
@@ -96,41 +94,33 @@ static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, co
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
readHuffmanLimit(entry, limit);
|
||||
*decoded = *limit;
|
||||
if (code > (u32)decoded->bitLength) {
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
if (code > (u32)decoded.bitLength) {
|
||||
continue;
|
||||
}
|
||||
{
|
||||
u32 relativeCode = code - entry->bitLength;
|
||||
u32 symbolIndex = relativeCode + entry->symbol;
|
||||
return symbols[symbolIndex & 0xFF];
|
||||
}
|
||||
code = code - entry->bitLength + entry->symbol;
|
||||
return symbols[code & 0xFF];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_ptr, TMCCJPEGDecWork* work) {
|
||||
TMCHuffmanEntry dcEntry;
|
||||
TMCHuffmanEntry dcDecoded;
|
||||
TMCHuffmanEntry dcLimit;
|
||||
TMCHuffmanEntry acDecoded;
|
||||
TMCHuffmanEntry acLimit;
|
||||
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;
|
||||
@@ -145,19 +135,22 @@ 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;
|
||||
huff_tbl = work->pDCHuffTbl;
|
||||
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work, &dcLimit, &dcDecoded);
|
||||
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -217,7 +210,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
r = acEntry.symbol;
|
||||
} else {
|
||||
bit_pos = work->bitCount;
|
||||
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work, &acLimit, &acDecoded);
|
||||
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <tmc_jpeg_internal.h>
|
||||
|
||||
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work);
|
||||
static s32 refillJpegBuffer(TMCCJPEGDecWork* work);
|
||||
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work);
|
||||
static s32 TMCJPEG_814EB108(TMCCJPEGDecWork* work);
|
||||
|
||||
s32 TMCJPEGDEC_init_ptr_buff(TMCCJPEGDecWork* work, void* param) {
|
||||
u32 readSize;
|
||||
@@ -52,7 +52,7 @@ s32 TMCJPEGDEC_get_byte(u8* dst, TMCCJPEGDecWork* work) {
|
||||
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
s32 r = refillJpegBuffer(work);
|
||||
s32 r = TMCJPEG_814EB108(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -69,7 +69,7 @@ s32 TMCJPEGDEC_get_byte(u8* dst, TMCCJPEGDecWork* work) {
|
||||
|
||||
if (cur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
s32 r = refillJpegBuffer(work);
|
||||
s32 r = TMCJPEG_814EB108(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -92,7 +92,7 @@ s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
|
||||
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
r = TMCJPEG_814EB108(work);
|
||||
if (r < 0) {
|
||||
goto br;
|
||||
} else {
|
||||
@@ -119,7 +119,7 @@ s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
r = TMCJPEG_814EB108(work);
|
||||
if (r >= 0) {
|
||||
goto o1;
|
||||
}
|
||||
@@ -144,7 +144,7 @@ p2:
|
||||
goto r2;
|
||||
}
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
r = TMCJPEG_814EB108(work);
|
||||
if (r < 0)
|
||||
goto ez;
|
||||
else {
|
||||
@@ -166,7 +166,7 @@ r2:
|
||||
}
|
||||
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
r = TMCJPEG_814EB108(work);
|
||||
if (r < 0)
|
||||
goto ez;
|
||||
else {
|
||||
@@ -193,7 +193,7 @@ s32 TMCJPEGDEC_get_sbyte(u8* dst, u32 count, TMCCJPEGDecWork* work) {
|
||||
for (i = 0; i < count; i++) {
|
||||
if (work->pBufCur >= work->pBufEnd) {
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
r = TMCJPEG_814EB108(work);
|
||||
if (r < 0) {
|
||||
goto copy_byte;
|
||||
} else {
|
||||
@@ -214,7 +214,7 @@ s32 TMCJPEGDEC_get_sbyte(u8* dst, u32 count, TMCCJPEGDecWork* work) {
|
||||
goto r0;
|
||||
}
|
||||
if (work->remaining != 0) {
|
||||
r = refillJpegBuffer(work);
|
||||
r = TMCJPEG_814EB108(work);
|
||||
if (r >= 0) {
|
||||
goto r0;
|
||||
}
|
||||
@@ -251,7 +251,7 @@ lp:
|
||||
if (work->remaining == 0) {
|
||||
goto er1;
|
||||
}
|
||||
r = refillJpegBuffer(work);
|
||||
r = TMCJPEG_814EB108(work);
|
||||
if (r >= 0) {
|
||||
goto lc;
|
||||
}
|
||||
@@ -271,7 +271,7 @@ lc:
|
||||
if (work->remaining == 0) {
|
||||
goto er2;
|
||||
}
|
||||
r = refillJpegBuffer(work);
|
||||
r = TMCJPEG_814EB108(work);
|
||||
if (r >= 0) {
|
||||
goto ret0;
|
||||
}
|
||||
@@ -320,7 +320,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
|
||||
if (work->remaining == 0) {
|
||||
break;
|
||||
}
|
||||
r = refillJpegBufferAfterFF(work);
|
||||
r = TMCJPEG_814EAF50(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -345,7 +345,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
|
||||
if (work->remaining == 0) {
|
||||
break;
|
||||
}
|
||||
r = refillJpegBufferAfterFF(work);
|
||||
r = TMCJPEG_814EAF50(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -364,7 +364,7 @@ s32 TMCJPEGDEC_chk_possible_size(TMCCJPEGDecWork* work) {
|
||||
return work->pBufEnd - work->pBufCur;
|
||||
}
|
||||
|
||||
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work) {
|
||||
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work) {
|
||||
u8 marker;
|
||||
u32 readSize;
|
||||
u8* dest;
|
||||
@@ -410,7 +410,7 @@ static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static s32 refillJpegBuffer(TMCCJPEGDecWork* work) {
|
||||
static s32 TMCJPEG_814EB108(TMCCJPEGDecWork* work) {
|
||||
u8* end;
|
||||
u32 i, j;
|
||||
s32 readSize;
|
||||
|
||||
@@ -188,20 +188,20 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
oddHighSum = b1 + b7;
|
||||
b1 = b1 - b7;
|
||||
u = b6 + b2;
|
||||
b2 = t * 0xB5 >> 8;
|
||||
t = t * 0xB5 >> 8;
|
||||
x_factor = oddHighSum - oddLowSum;
|
||||
z_factor = b5 + b1;
|
||||
dcValue = *dst + 0x40000;
|
||||
a = dcValue - b4;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
d = dcValue + b4;
|
||||
u = b2 + u;
|
||||
v = a + b2;
|
||||
u = t + u;
|
||||
v = a + t;
|
||||
z_factor = z_factor * 0x62 >> 8;
|
||||
w = d + u;
|
||||
y = d - u;
|
||||
m_part = b1 * 0x14E >> 8;
|
||||
e = a - b2;
|
||||
e = a - t;
|
||||
m_part = m_part - z_factor;
|
||||
oddLowSum += m_part;
|
||||
n = oddHighSum + oddLowSum;
|
||||
|
||||
@@ -16,7 +16,7 @@ static u16 readU16(const u8* p, u16 byteOrder) {
|
||||
}
|
||||
|
||||
static u16 readExifU16(const u8* data, u16 byteOrder) {
|
||||
u16 value = data[0] | data[1] << 8;
|
||||
u32 value = data[0] | data[1] << 8;
|
||||
if (byteOrder == 0x4949) {
|
||||
return (u16)value;
|
||||
}
|
||||
@@ -246,9 +246,9 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
u32 ifdOffset;
|
||||
const u8* entries;
|
||||
u16 remaining;
|
||||
u16 index;
|
||||
s32 entriesSize;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
pInfo->thumbnailData = (u8*)data;
|
||||
pInfo->dataEnd = (u8*)data + size;
|
||||
pInfo->nextIfdOffset = 0;
|
||||
@@ -339,7 +339,7 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, const u8* entry) {
|
||||
s32 tag;
|
||||
u16 tag;
|
||||
u16 type;
|
||||
|
||||
tag = readU16(entry, byteOrder);
|
||||
|
||||
@@ -59,8 +59,8 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
|
||||
state->stepY = (state->scaleFactor + work->mcuXRem - 1) / state->scaleFactor;
|
||||
state->jpegWidth = ((s32)(work->frameWidth + state->scaleFactor) - 1) / state->scaleFactor;
|
||||
state->jpegHeight = (state->scaleFactor + work->frameHeight - 1) / state->scaleFactor;
|
||||
state->stepXExt = (state->scaleFactor + work->remX - 1) / state->scaleFactor;
|
||||
state->stepYExt = (state->scaleFactor + work->remY - 1) / state->scaleFactor;
|
||||
state->stepXExt = (state->scaleFactor + work->unk_0x1808 - 1) / state->scaleFactor;
|
||||
state->stepYExt = (state->scaleFactor + work->unk_0x1809 - 1) / state->scaleFactor;
|
||||
|
||||
state->dataSizeX = (state->stepXExt != 0) ? (state->maxX - 1) * state->stepX : (state->maxX + 1) * state->stepX;
|
||||
state->dataSizeY = (state->stepYExt != 0) ? (state->maxY - 1) * state->stepY : (state->maxY + 1) * state->stepY;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
extern void* memset(void* dest, s32 val, u32 count);
|
||||
|
||||
extern const u32 scJpegAanScale[64] = {
|
||||
extern const u32 lbl_8161E080[64] = {
|
||||
0x00000100, 0x000000B9, 0x000000C4, 0x000000DA, 0x00000100, 0x00000146, 0x000001D9, 0x000003A0, 0x000000B9, 0x00000085, 0x0000008D,
|
||||
0x0000009D, 0x000000B9, 0x000000EB, 0x00000155, 0x0000029D, 0x000000C4, 0x0000008D, 0x00000096, 0x000000A7, 0x000000C4, 0x000000F9,
|
||||
0x0000016A, 0x000002C6, 0x000000DA, 0x0000009D, 0x000000A7, 0x000000B9, 0x000000DA, 0x00000115, 0x00000192, 0x00000315, 0x00000100,
|
||||
@@ -562,8 +562,8 @@ s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work) {
|
||||
remX = p->frameWidth % p->mcuXCount;
|
||||
remY = p->frameHeight % p->mcuXRem;
|
||||
|
||||
p->remX = remX;
|
||||
p->remY = remY;
|
||||
p->unk_0x18 = remX;
|
||||
p->unk_0x19 = remY;
|
||||
|
||||
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
|
||||
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
|
||||
@@ -1411,22 +1411,131 @@ static s32 TMCJPEGDEC_parse_dht(s32 first, TMCCJPEGDecWork* work) {
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __MWERKS__
|
||||
static asm s32 TMCJPEGDEC_parse_dqt(register TMCCJPEGDecWork* work) {
|
||||
nofralloc
|
||||
|
||||
stwu r1, -0x130(r1)
|
||||
mflr r0
|
||||
lis r4, lbl_8161E080@ha
|
||||
stw r0, 0x134(r1)
|
||||
addi r4, r4, lbl_8161E080@l
|
||||
li r0, 0x20
|
||||
addi r6, r1, 0xc
|
||||
stmw r24, 0x110(r1)
|
||||
mr r30, r3
|
||||
addi r5, r4, -4
|
||||
mtctr r0
|
||||
|
||||
_parse_dqt_copy:
|
||||
lwz r4, 4(r5)
|
||||
lwzu r0, 8(r5)
|
||||
stw r4, 4(r6)
|
||||
stwu r0, 8(r6)
|
||||
bdnz _parse_dqt_copy
|
||||
|
||||
addi r31, r3, 0x58
|
||||
mr r4, r30
|
||||
addi r3, r1, 0xa
|
||||
bl TMCJPEGDEC_get_wbyte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_length
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_length:
|
||||
lhz r3, 0xa(r1)
|
||||
addi r29, r1, 0x10
|
||||
li r27, 1
|
||||
lis r28, TMCJPEGDEC_Zigzag_data@ha
|
||||
addi r0, r3, -2
|
||||
sth r0, 0xa(r1)
|
||||
|
||||
_parse_dqt_table:
|
||||
lhz r5, 0xa(r1)
|
||||
mr r4, r30
|
||||
addi r3, r1, 9
|
||||
addi r0, r5, -0x41
|
||||
sth r0, 0xa(r1)
|
||||
bl TMCJPEGDEC_get_byte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_qt_info
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_qt_info:
|
||||
lbz r0, 9(r1)
|
||||
cmplwi r0, 4
|
||||
ble _parse_dqt_valid_qt_info
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_valid_qt_info:
|
||||
add r3, r31, r0
|
||||
addi r26, r28, TMCJPEGDEC_Zigzag_data@l
|
||||
stb r27, 0x1790(r3)
|
||||
li r25, 0
|
||||
|
||||
_parse_dqt_coeff:
|
||||
lbz r24, 0(r26)
|
||||
cmpwi r24, 0x3f
|
||||
ble _parse_dqt_valid_coeff
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_valid_coeff:
|
||||
mr r4, r30
|
||||
addi r3, r1, 8
|
||||
bl TMCJPEGDEC_get_byte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_coeff
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_coeff:
|
||||
slwi r4, r24, 2
|
||||
lbz r3, 9(r1)
|
||||
add r0, r4, r31
|
||||
lbz r5, 8(r1)
|
||||
lwzx r4, r29, r4
|
||||
slwi r3, r3, 8
|
||||
mullw. r4, r5, r4
|
||||
stwx r4, r3, r0
|
||||
bne _parse_dqt_nonzero
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_nonzero:
|
||||
addi r25, r25, 1
|
||||
addi r26, r26, 1
|
||||
cmpwi r25, 0x40
|
||||
blt _parse_dqt_coeff
|
||||
lhz r0, 0xa(r1)
|
||||
cmpwi r0, 0
|
||||
bne _parse_dqt_table
|
||||
li r3, 0
|
||||
|
||||
_parse_dqt_return:
|
||||
lmw r24, 0x110(r1)
|
||||
lwz r0, 0x134(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x130
|
||||
blr
|
||||
}
|
||||
#else
|
||||
static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
typedef struct {
|
||||
u32 data[64];
|
||||
} CopyBlock64;
|
||||
|
||||
typedef struct { u32 coefficients[4][64]; } QuantizationTables;
|
||||
QuantizationTables* scaleInfo;
|
||||
u32 tblCopy[64];
|
||||
u8* scaleInfo;
|
||||
u32 tblCopy[65];
|
||||
u32* tblPtr;
|
||||
u32* d;
|
||||
u16 len;
|
||||
s32 r;
|
||||
|
||||
d = tblCopy;
|
||||
*(CopyBlock64*)d = *(CopyBlock64*)scJpegAanScale;
|
||||
*(CopyBlock64*)(d + 1) = *(CopyBlock64*)lbl_8161E080;
|
||||
|
||||
scaleInfo = (QuantizationTables*)&work->scaleFlag;
|
||||
scaleInfo = (u8*)work + 0x58;
|
||||
|
||||
r = TMCJPEGDEC_get_wbyte(&len, work);
|
||||
if (r < 0) {
|
||||
@@ -1434,6 +1543,8 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
len -= 2;
|
||||
|
||||
tblPtr = &tblCopy[1];
|
||||
|
||||
do {
|
||||
u8 qtInfo;
|
||||
const u8* zigPtr;
|
||||
@@ -1452,10 +1563,11 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
return -0x41;
|
||||
}
|
||||
|
||||
((TMCUnknownInfo*)scaleInfo)->quantTblFlag[qtInfo] = 1;
|
||||
scaleInfo[qtInfo + 0x1790] = 1; // quantTblFlag[0..3]
|
||||
|
||||
zigPtr = TMCJPEGDEC_Zigzag_data;
|
||||
for (zzIdx = 0; zzIdx < 64; zzIdx++) {
|
||||
u32 tmp;
|
||||
|
||||
zz = *zigPtr;
|
||||
if (zz > 0x3F) {
|
||||
@@ -1467,8 +1579,9 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
return r;
|
||||
}
|
||||
|
||||
val = (u32)byte * tblCopy[zz];
|
||||
scaleInfo->coefficients[qtInfo][zz] = val;
|
||||
tmp = (zz << 2) + ((u32)qtInfo << 8);
|
||||
val = (u32)byte * tblPtr[zz];
|
||||
*(u32*)(tmp + scaleInfo) = val;
|
||||
if (val == 0) {
|
||||
return -0x41;
|
||||
}
|
||||
@@ -1479,6 +1592,7 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __MWERKS__
|
||||
static asm s32 TMCJPEGDEC_parse_sof(register TMCCJPEGDecWork* work) {
|
||||
@@ -1919,8 +2033,8 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
|
||||
remX = fw - mcuCountX * mcuX;
|
||||
remY = fh - mcuCountY * mcuY;
|
||||
|
||||
work->remX = remX;
|
||||
work->remY = remY;
|
||||
work->unk_0x1808 = remX;
|
||||
work->unk_0x1809 = remY;
|
||||
|
||||
{
|
||||
u16 xr = (remX != 0) ? 1 : 0;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -14,138 +14,85 @@ static void TMCJPEGDEC_converterYUV444toRGB565edge(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEGDEC_converterYUV400toRGB565(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEGDEC_converterYUV400toRGB565edge(TMCCJPEGDecWork*, s32, s32);
|
||||
|
||||
s32 TMCJPEGDEC_set_converterRGB565(TMCCJPEGDecWork* work) {
|
||||
u8* buffer;
|
||||
s32 componentCount;
|
||||
TMCCJPEGDecState* state;
|
||||
|
||||
buffer = work->convBuf;
|
||||
componentCount = work->componentCount;
|
||||
state = work->pState;
|
||||
|
||||
switch (componentCount) {
|
||||
static inline s32 selectRGB565Converter(TMCCJPEGDecWork* work, u8* ob, s32 cc, TMCCJPEGDecState* st) {
|
||||
switch (cc) {
|
||||
case 0: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* thirdRow;
|
||||
u8* fourthRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
u8 mode = work->idctMode;
|
||||
u8* ptr = ob + 4;
|
||||
u8* p1 = ptr + mode;
|
||||
u8* p2 = p1 + mode;
|
||||
u8* p3 = p2 + mode;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
work->pConvRowPtrs[0] = (void*)ptr;
|
||||
work->pConvRowPtrs[1] = (void*)p1;
|
||||
work->pConvRowPtrs[2] = (void*)p2;
|
||||
work->pConvRowPtrs[3] = (void*)p3;
|
||||
work->pConvRowPtrs[5] = (void*)(ob + 0x104);
|
||||
work->pConvRowPtrs[6] = (void*)(ob + 0x144);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV411toRGB565;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV411toRGB565edge;
|
||||
secondRow = firstRow + mode;
|
||||
thirdRow = secondRow + mode;
|
||||
fourthRow = thirdRow + mode;
|
||||
cbBlock = buffer + 260;
|
||||
crBlock = buffer + 324;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[2] = thirdRow;
|
||||
work->pConvRowPtrs[3] = fourthRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 32;
|
||||
work->pitch = 0x20;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
u8 mode = work->idctMode;
|
||||
u8* ptr = ob + 4;
|
||||
work->pConvRowPtrs[0] = (void*)ptr;
|
||||
work->pConvRowPtrs[1] = (void*)(ptr + mode);
|
||||
work->pConvRowPtrs[5] = (void*)(ob + 0x84);
|
||||
work->pConvRowPtrs[6] = (void*)(ob + 0xc4);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV422toRGB565;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV422toRGB565edge;
|
||||
secondRow = firstRow + mode;
|
||||
cbBlock = buffer + 132;
|
||||
crBlock = buffer + 196;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 16;
|
||||
work->pitch = 0x10;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* thirdRow;
|
||||
u8* fourthRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
u8 mode = work->idctMode;
|
||||
u8* ptr = ob + 4;
|
||||
u8* p1 = ptr + mode;
|
||||
u8* p2 = ptr + mode * 16;
|
||||
u8* p3 = p2 + mode;
|
||||
work->pConvRowPtrs[0] = (void*)ptr;
|
||||
work->pConvRowPtrs[1] = (void*)p1;
|
||||
work->pConvRowPtrs[2] = (void*)p2;
|
||||
work->pConvRowPtrs[3] = (void*)p3;
|
||||
work->pConvRowPtrs[5] = (void*)(ob + 0x104);
|
||||
work->pConvRowPtrs[6] = (void*)(ob + 0x144);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV420toRGB565;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV420toRGB565edge;
|
||||
secondRow = firstRow + mode;
|
||||
thirdRow = firstRow + mode * 16;
|
||||
fourthRow = thirdRow + mode;
|
||||
cbBlock = buffer + 260;
|
||||
crBlock = buffer + 324;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[2] = thirdRow;
|
||||
work->pConvRowPtrs[3] = fourthRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 16;
|
||||
work->pitch = 0x10;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
u8 mode = work->idctMode;
|
||||
u8* ptr = ob + 4;
|
||||
work->pConvRowPtrs[0] = (void*)ptr;
|
||||
work->pConvRowPtrs[1] = (void*)(ptr + mode * 8);
|
||||
work->pConvRowPtrs[5] = (void*)(ob + 0x84);
|
||||
work->pConvRowPtrs[6] = (void*)(ob + 0xc4);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV211toRGB565;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV211toRGB565edge;
|
||||
secondRow = firstRow + mode * 8;
|
||||
cbBlock = buffer + 132;
|
||||
crBlock = buffer + 196;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 8;
|
||||
work->pitch = 0x08;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
TMCConverterFunc* converter;
|
||||
TMCConverterFunc* edgeConverter;
|
||||
converter = TMCJPEGDEC_converterYUV444toRGB565;
|
||||
edgeConverter = TMCJPEGDEC_converterYUV444toRGB565edge;
|
||||
work->pConvRowPtrs[0] = buffer + 4;
|
||||
work->pConvRowPtrs[5] = buffer + 0x44;
|
||||
work->pConvRowPtrs[6] = buffer + 0x84;
|
||||
work->pConverterFunc = converter;
|
||||
work->pConverterFuncEdge = edgeConverter;
|
||||
work->pConvRowPtrs[0] = (void*)(ob + 0x4);
|
||||
work->pConvRowPtrs[5] = (void*)(ob + 0x44);
|
||||
work->pConvRowPtrs[6] = (void*)(ob + 0x84);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV444toRGB565;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV444toRGB565edge;
|
||||
work->pitch = 0x08;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
TMCConverterFunc* converter;
|
||||
TMCConverterFunc* edgeConverter;
|
||||
converter = TMCJPEGDEC_converterYUV400toRGB565;
|
||||
edgeConverter = TMCJPEGDEC_converterYUV400toRGB565edge;
|
||||
work->pConvRowPtrs[0] = buffer + 4;
|
||||
work->pConverterFunc = converter;
|
||||
work->pConverterFuncEdge = edgeConverter;
|
||||
work->pConvRowPtrs[0] = (void*)(ob + 0x4);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV400toRGB565;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV400toRGB565edge;
|
||||
work->pitch = 0x08;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
@@ -156,15 +103,18 @@ s32 TMCJPEGDEC_set_converterRGB565(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
{
|
||||
s32 width = state->jpegWidth;
|
||||
s32 height = state->jpegHeight;
|
||||
state->convWidth = ((u32)width / 4 + (width % 4 != 0)) * 4;
|
||||
state->convHeight = ((u32)height / 4 + (height % 4 != 0)) * 4;
|
||||
|
||||
s32 width = st->jpegWidth;
|
||||
s32 height = st->jpegHeight;
|
||||
st->convWidth = ((u32)width / 4 + (width % 4 != 0)) * 4;
|
||||
st->convHeight = ((u32)height / 4 + (height % 4 != 0)) * 4;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 TMCJPEGDEC_set_converterRGB565(TMCCJPEGDecWork* work) {
|
||||
return selectRGB565Converter(work, work->convBuf, work->componentCount, work->pState);
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV411toRGB565(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u16* output;
|
||||
s32 lumaSkip;
|
||||
@@ -356,8 +306,8 @@ static void TMCJPEGDEC_converterYUV422toRGB565(TMCCJPEGDecWork* work, s32 x, s32
|
||||
lumaSkip = 16 - width;
|
||||
chromaSkip = lumaSkip >> 1;
|
||||
for (; y < yEnd; y++) {
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
tileRow = (y >> 2) * tileWidth;
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
for (column = x; column < xEnd; column += 2) {
|
||||
cbValue = (s8)*cb++;
|
||||
crValue = (s8)*cr++;
|
||||
@@ -398,28 +348,28 @@ static void TMCJPEGDEC_converterYUV422toRGB565(TMCCJPEGDecWork* work, s32 x, s32
|
||||
static void TMCJPEGDEC_converterYUV422toRGB565edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 lumaSkip;
|
||||
s32 chromaSkip;
|
||||
u16* output;
|
||||
s32 column;
|
||||
s32 tileRow;
|
||||
u8* texture;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 height;
|
||||
s32 cbValue;
|
||||
s32 yEnd;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 width;
|
||||
u32 tileWidth;
|
||||
s32 xEnd;
|
||||
s32 red;
|
||||
u16* output;
|
||||
s32 width;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 cbValue;
|
||||
u32 tileWidth;
|
||||
s32 redOffset;
|
||||
s32 value;
|
||||
s32 greenOffset;
|
||||
s8 crValue;
|
||||
s32 height;
|
||||
s32 blue;
|
||||
s32 blueOffset;
|
||||
s32 green;
|
||||
s32 value;
|
||||
s8 crValue;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[132];
|
||||
@@ -443,8 +393,8 @@ static void TMCJPEGDEC_converterYUV422toRGB565edge(TMCCJPEGDecWork* work, s32 x,
|
||||
chromaSkip = lumaSkip >> 1;
|
||||
ASSERTLINE((x & 1) == 0, __LINE__);
|
||||
for (; y < yEnd; y++) {
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
tileRow = (y >> 2) * tileWidth;
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
if ((column & 1) == 0) {
|
||||
cbValue = (s8)*cb++;
|
||||
@@ -563,29 +513,29 @@ static void TMCJPEGDEC_converterYUV420toRGB565(TMCCJPEGDecWork* work, s32 x, s32
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV420toRGB565edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u16* output;
|
||||
s8 crValue;
|
||||
s32 tileRow;
|
||||
u8* texture;
|
||||
s32 column;
|
||||
u8* luminance;
|
||||
s8* cb;
|
||||
s32 width;
|
||||
s8* cr;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s8 cbValue;
|
||||
s32 yEnd;
|
||||
s32 red;
|
||||
s32 blue;
|
||||
u32 tileWidth;
|
||||
s32 height;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 green;
|
||||
u32 tileWidth;
|
||||
u8* texture;
|
||||
s32 width;
|
||||
s32 height;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
s32 lumaSkip;
|
||||
s32 chromaSkip;
|
||||
s32 tileRow;
|
||||
u16* output;
|
||||
s32 cbValue;
|
||||
s32 crValue;
|
||||
s32 redOffset;
|
||||
s32 greenOffset;
|
||||
s32 blueOffset;
|
||||
s32 blue;
|
||||
s32 red;
|
||||
s32 green;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
cb = (s8*)&work->convBuf[260];
|
||||
@@ -609,8 +559,8 @@ static void TMCJPEGDEC_converterYUV420toRGB565edge(TMCCJPEGDecWork* work, s32 x,
|
||||
chromaSkip = lumaSkip >> 1;
|
||||
ASSERTLINE((x & 1) == 0, __LINE__);
|
||||
for (; y < yEnd; y++) {
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
tileRow = (y >> 2) * tileWidth;
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
if ((column & 1) == 0) {
|
||||
cbValue = *cb++;
|
||||
@@ -644,24 +594,24 @@ static void TMCJPEGDEC_converterYUV420toRGB565edge(TMCCJPEGDecWork* work, s32 x,
|
||||
static void TMCJPEGDEC_converterYUV211toRGB565(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u16* output;
|
||||
s32 lumaSkip;
|
||||
s32 tileRow;
|
||||
s32 yEnd;
|
||||
u8* texture;
|
||||
u8* luminance;
|
||||
s32 red;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 height;
|
||||
s32 width;
|
||||
u8* cr;
|
||||
u32 tileWidth;
|
||||
s32 greenOffset;
|
||||
s32 width;
|
||||
s8 crValue;
|
||||
s32 redOffset;
|
||||
s32 cbValue;
|
||||
s32 blueOffset;
|
||||
s8 crValue;
|
||||
s32 height;
|
||||
s32 xEnd;
|
||||
s32 value;
|
||||
s32 yEnd;
|
||||
u32 tileWidth;
|
||||
s32 tileRow;
|
||||
u8* cb;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 blue;
|
||||
s32 green;
|
||||
@@ -682,8 +632,8 @@ static void TMCJPEGDEC_converterYUV211toRGB565(TMCCJPEGDecWork* work, s32 x, s32
|
||||
lumaSkip = 8 - width;
|
||||
chromaSkip = lumaSkip >> 0;
|
||||
for (; y < yEnd; y++) {
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
tileRow = (y >> 2) * tileWidth;
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
|
||||
{
|
||||
@@ -721,24 +671,24 @@ static void TMCJPEGDEC_converterYUV211toRGB565(TMCCJPEGDecWork* work, s32 x, s32
|
||||
|
||||
static void TMCJPEGDEC_converterYUV211toRGB565edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 lumaSkip;
|
||||
u16* output;
|
||||
u8* cb;
|
||||
s32 tileRow;
|
||||
s32 greenOffset;
|
||||
u8* texture;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u32 tileWidth;
|
||||
s32 redOffset;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 width;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 xEnd;
|
||||
s32 column;
|
||||
s8 crValue;
|
||||
s32 value;
|
||||
s32 red;
|
||||
s32 blueOffset;
|
||||
s32 yEnd;
|
||||
u32 tileWidth;
|
||||
u16* output;
|
||||
s32 blue;
|
||||
s32 cbValue;
|
||||
s32 green;
|
||||
@@ -768,8 +718,8 @@ static void TMCJPEGDEC_converterYUV211toRGB565edge(TMCCJPEGDecWork* work, s32 x,
|
||||
lumaSkip = 8 - width;
|
||||
chromaSkip = lumaSkip >> 0;
|
||||
for (; y < yEnd; y++) {
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
tileRow = (y >> 2) * tileWidth;
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
|
||||
{
|
||||
|
||||
@@ -14,138 +14,85 @@ static void TMCJPEGDEC_converterYUV444toRGBA8edge(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEGDEC_converterYUV400toRGBA8(TMCCJPEGDecWork*, s32, s32);
|
||||
static void TMCJPEGDEC_converterYUV400toRGBA8edge(TMCCJPEGDecWork*, s32, s32);
|
||||
|
||||
s32 TMCJPEGDEC_set_converterRGBA8(TMCCJPEGDecWork* work) {
|
||||
u8* buffer;
|
||||
s32 componentCount;
|
||||
TMCCJPEGDecState* state;
|
||||
|
||||
buffer = work->convBuf;
|
||||
componentCount = work->componentCount;
|
||||
state = work->pState;
|
||||
|
||||
switch (componentCount) {
|
||||
static inline s32 selectRGBA8Converter(TMCCJPEGDecWork* work, u8* ob, s32 cc, TMCCJPEGDecState* st) {
|
||||
switch (cc) {
|
||||
case 0: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* thirdRow;
|
||||
u8* fourthRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
u8 mode = work->idctMode;
|
||||
u8* ptr = ob + 4;
|
||||
u8* p1 = ptr + mode;
|
||||
u8* p2 = p1 + mode;
|
||||
u8* p3 = p2 + mode;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
work->pConvRowPtrs[0] = (void*)ptr;
|
||||
work->pConvRowPtrs[1] = (void*)p1;
|
||||
work->pConvRowPtrs[2] = (void*)p2;
|
||||
work->pConvRowPtrs[3] = (void*)p3;
|
||||
work->pConvRowPtrs[5] = (void*)(ob + 0x104);
|
||||
work->pConvRowPtrs[6] = (void*)(ob + 0x144);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV411toRGBA8;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV411toRGBA8edge;
|
||||
secondRow = firstRow + mode;
|
||||
thirdRow = secondRow + mode;
|
||||
fourthRow = thirdRow + mode;
|
||||
cbBlock = buffer + 260;
|
||||
crBlock = buffer + 324;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[2] = thirdRow;
|
||||
work->pConvRowPtrs[3] = fourthRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 32;
|
||||
work->pitch = 0x20;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
u8 mode = work->idctMode;
|
||||
u8* ptr = ob + 4;
|
||||
work->pConvRowPtrs[0] = (void*)ptr;
|
||||
work->pConvRowPtrs[1] = (void*)(ptr + mode);
|
||||
work->pConvRowPtrs[5] = (void*)(ob + 0x84);
|
||||
work->pConvRowPtrs[6] = (void*)(ob + 0xC4);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV422toRGBA8;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV422toRGBA8edge;
|
||||
secondRow = firstRow + mode;
|
||||
cbBlock = buffer + 132;
|
||||
crBlock = buffer + 196;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 16;
|
||||
work->pitch = 0x10;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* thirdRow;
|
||||
u8* fourthRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
u8 mode = work->idctMode;
|
||||
u8* ptr = ob + 4;
|
||||
u8* p1 = ptr + mode;
|
||||
u8* p2 = ptr + mode * 16;
|
||||
u8* p3 = p2 + mode;
|
||||
work->pConvRowPtrs[0] = (void*)ptr;
|
||||
work->pConvRowPtrs[1] = (void*)p1;
|
||||
work->pConvRowPtrs[2] = (void*)p2;
|
||||
work->pConvRowPtrs[3] = (void*)p3;
|
||||
work->pConvRowPtrs[5] = (void*)(ob + 0x104);
|
||||
work->pConvRowPtrs[6] = (void*)(ob + 0x144);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV420toRGBA8;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV420toRGBA8edge;
|
||||
secondRow = firstRow + mode;
|
||||
thirdRow = firstRow + mode * 16;
|
||||
fourthRow = thirdRow + mode;
|
||||
cbBlock = buffer + 260;
|
||||
crBlock = buffer + 324;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[2] = thirdRow;
|
||||
work->pConvRowPtrs[3] = fourthRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 16;
|
||||
work->pitch = 0x10;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
u8 mode;
|
||||
u8* firstRow;
|
||||
u8* secondRow;
|
||||
u8* cbBlock;
|
||||
u8* crBlock;
|
||||
|
||||
mode = work->idctMode;
|
||||
firstRow = buffer + 4;
|
||||
u8 mode = work->idctMode;
|
||||
u8* ptr = ob + 4;
|
||||
work->pConvRowPtrs[0] = (void*)ptr;
|
||||
work->pConvRowPtrs[1] = (void*)(ptr + mode * 8);
|
||||
work->pConvRowPtrs[5] = (void*)(ob + 0x84);
|
||||
work->pConvRowPtrs[6] = (void*)(ob + 0xC4);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV211toRGBA8;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV211toRGBA8edge;
|
||||
secondRow = firstRow + mode * 8;
|
||||
cbBlock = buffer + 132;
|
||||
crBlock = buffer + 196;
|
||||
work->pConvRowPtrs[0] = firstRow;
|
||||
work->pConvRowPtrs[1] = secondRow;
|
||||
work->pConvRowPtrs[5] = cbBlock;
|
||||
work->pConvRowPtrs[6] = crBlock;
|
||||
work->pitch = 8;
|
||||
work->pitch = 0x08;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
TMCConverterFunc* converter;
|
||||
TMCConverterFunc* edgeConverter;
|
||||
converter = TMCJPEGDEC_converterYUV444toRGBA8;
|
||||
edgeConverter = TMCJPEGDEC_converterYUV444toRGBA8edge;
|
||||
work->pConvRowPtrs[0] = buffer + 4;
|
||||
work->pConvRowPtrs[5] = buffer + 0x44;
|
||||
work->pConvRowPtrs[6] = buffer + 0x84;
|
||||
work->pConverterFunc = converter;
|
||||
work->pConverterFuncEdge = edgeConverter;
|
||||
work->pConvRowPtrs[0] = (void*)(ob + 4);
|
||||
work->pConvRowPtrs[5] = (void*)(ob + 0x44);
|
||||
work->pConvRowPtrs[6] = (void*)(ob + 0x84);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV444toRGBA8;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV444toRGBA8edge;
|
||||
work->pitch = 0x08;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
TMCConverterFunc* converter;
|
||||
TMCConverterFunc* edgeConverter;
|
||||
converter = TMCJPEGDEC_converterYUV400toRGBA8;
|
||||
edgeConverter = TMCJPEGDEC_converterYUV400toRGBA8edge;
|
||||
work->pConvRowPtrs[0] = buffer + 4;
|
||||
work->pConverterFunc = converter;
|
||||
work->pConverterFuncEdge = edgeConverter;
|
||||
work->pConvRowPtrs[0] = (void*)(ob + 4);
|
||||
work->pConverterFunc = TMCJPEGDEC_converterYUV400toRGBA8;
|
||||
work->pConverterFuncEdge = TMCJPEGDEC_converterYUV400toRGBA8edge;
|
||||
work->pitch = 0x08;
|
||||
work->converterFlags = 0;
|
||||
break;
|
||||
@@ -156,33 +103,36 @@ s32 TMCJPEGDEC_set_converterRGBA8(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
{
|
||||
s32 width = state->jpegWidth;
|
||||
s32 height = state->jpegHeight;
|
||||
state->convWidth = ((u32)width / 4 + (width % 4 != 0)) * 4;
|
||||
state->convHeight = ((u32)height / 4 + (height % 4 != 0)) * 4;
|
||||
|
||||
s32 width = st->jpegWidth;
|
||||
s32 height = st->jpegHeight;
|
||||
st->convWidth = ((u32)width / 4 + (width % 4 != 0)) * 4;
|
||||
st->convHeight = ((u32)height / 4 + (height % 4 != 0)) * 4;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 TMCJPEGDEC_set_converterRGBA8(TMCCJPEGDecWork* work) {
|
||||
return selectRGBA8Converter(work, work->convBuf, work->componentCount, work->pState);
|
||||
}
|
||||
|
||||
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 +166,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;
|
||||
}
|
||||
{
|
||||
@@ -224,56 +174,60 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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;
|
||||
}
|
||||
red = (u8)red + 0x10000 - 0x100;
|
||||
output[(column & 3) + (((((column) >> 2) << 1) + tileRow) << 4)] = red;
|
||||
output[(column & 3) + (((((column) >> 2) << 1) + tileRow + 1) << 4)] = ((green & 255) << 8) + (blue & 255);
|
||||
output[(column & 3) + (((((column) >> 2) << 1) + tileRow) << 4)] =
|
||||
(u8)red + 0x10000 - 0x100;
|
||||
output[(column & 3) + (((((column) >> 2) << 1) + tileRow + 1) << 4)] =
|
||||
((green & 255) << 8) + (blue & 255);
|
||||
}
|
||||
{
|
||||
value = *luminance++;
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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;
|
||||
}
|
||||
red = (u8)red + 0x10000 - 0x100;
|
||||
output[(column + 1 & 3) + (((((column + 1) >> 2) << 1) + tileRow) << 4)] = red;
|
||||
output[(column + 1 & 3) + (((((column + 1) >> 2) << 1) + tileRow + 1) << 4)] = ((green & 255) << 8) + (blue & 255);
|
||||
output[(column + 1 & 3) + (((((column + 1) >> 2) << 1) + tileRow) << 4)] =
|
||||
(u8)red + 0x10000 - 0x100;
|
||||
output[(column + 1 & 3) + (((((column + 1) >> 2) << 1) + tileRow + 1) << 4)] =
|
||||
((green & 255) << 8) + (blue & 255);
|
||||
}
|
||||
{
|
||||
value = *luminance++;
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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;
|
||||
}
|
||||
red = (u8)red + 0x10000 - 0x100;
|
||||
output[(column + 2 & 3) + (((((column + 2) >> 2) << 1) + tileRow) << 4)] = red;
|
||||
output[(column + 2 & 3) + (((((column + 2) >> 2) << 1) + tileRow + 1) << 4)] = ((green & 255) << 8) + (blue & 255);
|
||||
output[(column + 2 & 3) + (((((column + 2) >> 2) << 1) + tileRow) << 4)] =
|
||||
(u8)red + 0x10000 - 0x100;
|
||||
output[(column + 2 & 3) + (((((column + 2) >> 2) << 1) + tileRow + 1) << 4)] =
|
||||
((green & 255) << 8) + (blue & 255);
|
||||
}
|
||||
{
|
||||
value = *luminance++;
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 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;
|
||||
}
|
||||
red = (u8)red + 0x10000 - 0x100;
|
||||
output[(column + 3 & 3) + (((((column + 3) >> 2) << 1) + tileRow) << 4)] = red;
|
||||
output[(column + 3 & 3) + (((((column + 3) >> 2) << 1) + tileRow + 1) << 4)] = ((green & 255) << 8) + (blue & 255);
|
||||
output[(column + 3 & 3) + (((((column + 3) >> 2) << 1) + tileRow) << 4)] =
|
||||
(u8)red + 0x10000 - 0x100;
|
||||
output[(column + 3 & 3) + (((((column + 3) >> 2) << 1) + tileRow + 1) << 4)] =
|
||||
((green & 255) << 8) + (blue & 255);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -285,20 +239,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;
|
||||
@@ -345,7 +299,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
red = blue + redOffset;
|
||||
green = blue + greenOffset;
|
||||
blue = blue + blueOffset;
|
||||
if ((green | red | blue) >> 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;
|
||||
@@ -366,11 +320,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 +333,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 +341,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;
|
||||
@@ -403,8 +357,8 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
lumaSkip = 16 - width;
|
||||
chromaSkip = lumaSkip >> 1;
|
||||
for (; y < yEnd; y++) {
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
tileRow = (y >> 2) * tileWidth;
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
for (column = x; column < xEnd; column += 2) {
|
||||
cbValue = (s8)*cb++;
|
||||
crValue = (s8)*cr++;
|
||||
@@ -415,7 +369,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((red | green | blue) >> 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 +380,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((red | green | blue) >> 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 +395,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 +417,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;
|
||||
@@ -488,8 +442,8 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
chromaSkip = lumaSkip >> 1;
|
||||
ASSERTLINE((x & 1) == 0, __LINE__);
|
||||
for (; y < yEnd; y++) {
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
tileRow = (y >> 2) * tileWidth;
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
if ((column & 1) == 0) {
|
||||
cbValue = (s8)*cb++;
|
||||
@@ -502,7 +456,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
green = value + greenOffset;
|
||||
if ((red | green | blue) >> 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 +471,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 +492,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 redOffset;
|
||||
u8* cb;
|
||||
u16* output;
|
||||
s32 blueOffset;
|
||||
s32 green;
|
||||
s32 red;
|
||||
s32 cbValue;
|
||||
|
||||
@@ -557,8 +511,8 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
lumaSkip = 16 - width;
|
||||
chromaSkip = lumaSkip >> 1;
|
||||
for (; y < yEnd; y++) {
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
tileRow = (y >> 2) * tileWidth;
|
||||
output = (u16*)(texture + ((y & 3) << 3));
|
||||
|
||||
for (column = x; column < xEnd; column += 2) {
|
||||
|
||||
@@ -578,7 +532,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
|
||||
|
||||
|
||||
if ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -593,7 +547,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((red | green | blue) >> 8) {
|
||||
if ((blue | green | red) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
@@ -620,11 +574,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;
|
||||
@@ -660,7 +614,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 green = value + greenOffset;
|
||||
s32 red = value + redOffset;
|
||||
s32 blue = value + blueOffset;
|
||||
if ((green | red | blue) >> 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;
|
||||
@@ -686,7 +640,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 +649,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 +696,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((red | green | blue) >> 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 +724,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 +737,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 +785,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
green = value + greenOffset;
|
||||
red = value + redOffset;
|
||||
blue = value + blueOffset;
|
||||
if ((red | green | blue) >> 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,25 +810,25 @@ 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 blue;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 crValue;
|
||||
s32 height;
|
||||
s32 width;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
s32 tileWidth;
|
||||
s32 row;
|
||||
s32 red;
|
||||
s32 width;
|
||||
s32 height;
|
||||
s32 rowSkip;
|
||||
s32 yEnd;
|
||||
u8* texture;
|
||||
s32 cbValue;
|
||||
s8 crValue;
|
||||
s32 red;
|
||||
s32 green;
|
||||
s32 blue;
|
||||
s32 xEnd;
|
||||
s32 value;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -899,7 +853,7 @@ static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
green = value + (-(cbValue * 88 + crValue * 183) >> 8);
|
||||
red = value + ((crValue * 359) >> 8);
|
||||
blue = value + ((cbValue * 454) >> 8);
|
||||
if ((red | green | blue) >> 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;
|
||||
@@ -203,8 +205,8 @@ static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
yEnd = y + height;
|
||||
rowSkip = 32 - width;
|
||||
for (; row < yEnd; row++) {
|
||||
output = lumaTexture + ((row & 3) << 3);
|
||||
tileRow = (row >> 2) * tileWidth;
|
||||
output = lumaTexture + ((row & 3) << 3);
|
||||
for (column = x; column < xEnd; column += 4) {
|
||||
(output + (column & 7))[(s32)(((column >> 3) + tileRow) << 5)] = luminance[0];
|
||||
(output + ((column + 1) & 7))[(s32)((((column + 1) >> 3) + tileRow) << 5)] = luminance[1];
|
||||
@@ -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;
|
||||
@@ -303,7 +306,9 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
s32 column;
|
||||
s32 chromaXEnd;
|
||||
s32 row;
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 width;
|
||||
s32 height;
|
||||
@@ -314,6 +319,7 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u8* cb;
|
||||
u32 tileWidth;
|
||||
u8* cr;
|
||||
s32 chromaRowSkip;
|
||||
|
||||
row = y;
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -338,22 +344,24 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
x = (u32)x >> 1;
|
||||
width = 8 / state->scaleFactor;
|
||||
height = 8 / state->scaleFactor;
|
||||
xEnd = x + width;
|
||||
chromaXEnd = x + width;
|
||||
chromaYEnd = y + height;
|
||||
tileWidth = state->chromaWidth >> 3;
|
||||
for (row = y; row < chromaYEnd; row++) {
|
||||
for (column = x; column < xEnd; column += 1) {
|
||||
(cbTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *cb + 128;
|
||||
chromaTileWidth = state->chromaWidth >> 3;
|
||||
chromaRowSkip = 8 - width;
|
||||
for (; y < chromaYEnd; y++) {
|
||||
for (column = x; column < chromaXEnd; column += 1) {
|
||||
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
|
||||
cb++;
|
||||
(crTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *cr + 128;
|
||||
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
|
||||
cr++;
|
||||
}
|
||||
cb += 8 - width;
|
||||
cb += chromaRowSkip;
|
||||
cr += 8 - width;
|
||||
}
|
||||
}
|
||||
|
||||
static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u32 chromaTileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* lumaTexture;
|
||||
u8* luminance;
|
||||
@@ -368,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;
|
||||
@@ -405,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;
|
||||
@@ -420,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;
|
||||
@@ -460,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;
|
||||
@@ -476,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;
|
||||
@@ -486,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;
|
||||
@@ -528,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;
|
||||
@@ -543,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;
|
||||
@@ -584,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;
|
||||
|
||||
@@ -142,9 +142,6 @@ typedef struct ziFuzzyZYPairs {
|
||||
int rANDn : 1;
|
||||
int bANDp : 1;
|
||||
int gANDk : 1;
|
||||
int dANDt : 1;
|
||||
|
||||
int reserved : 20;
|
||||
} ziFuzzyZYPairs;
|
||||
|
||||
typedef struct _ziGetParam {
|
||||
@@ -205,7 +202,7 @@ typedef struct _ziUwdNode {
|
||||
|
||||
struct __zi8_work_data_s {
|
||||
ziU8 unk_0x00;
|
||||
ziU8 countOnly; // 0x01
|
||||
ziU8 unk_0x01;
|
||||
ziU8 unk_0x02[2];
|
||||
ziLanguageEntry* langEntries; // 0x04
|
||||
ziU8 unk_0x08;
|
||||
@@ -215,11 +212,11 @@ struct __zi8_work_data_s {
|
||||
ziU32 unk_0x0C;
|
||||
ziU32 unk_0x10;
|
||||
ziU16 unk_0x14;
|
||||
ziU8 cangjieEnabled; // 0x16
|
||||
ziU8 unk_0x16;
|
||||
ziU8 unk_0x17;
|
||||
ziU8 subLanguage; // 0x18
|
||||
ziU8 unk_0x18;
|
||||
ziU8 unk_0x19;
|
||||
ziU16 separator; // 0x1A
|
||||
ziU16 unk_0x1A;
|
||||
ziU8 unk_0x1C[3];
|
||||
ziU8 unk_0x1F;
|
||||
ziU16 unk_0x20[0x40];
|
||||
@@ -258,7 +255,7 @@ struct __zi8_work_data_s {
|
||||
ziU8 unk_0x330[8];
|
||||
ziU32 unk_0x338;
|
||||
ziU8 unk_0x33C[0x1FC];
|
||||
ziU8 language; // 0x538
|
||||
ziU8 unk_0x538;
|
||||
ziU8 unk_0x539;
|
||||
ziU8 unk_0x53A[0x40];
|
||||
ziWChar unk_0x57A[0x641];
|
||||
@@ -283,7 +280,7 @@ struct __zi8_work_data_s {
|
||||
ziU16 unk_0x17EA;
|
||||
ziU8 unk_0x17EC;
|
||||
ziU8 unk_0x17ED[3];
|
||||
ziU8* dawgGroup; // 0x17F0
|
||||
ziU8* unk_0x17F0;
|
||||
ziWChar unk_0x17F4[0x40]; // 0x17F4..0x1874
|
||||
ziU16 unk_0x1874;
|
||||
ziU8 unk_0x1876;
|
||||
@@ -360,8 +357,8 @@ typedef struct ziMatchParam {
|
||||
ziWChar first2; // 0x68
|
||||
ziWChar comp; // 0x6A
|
||||
ziU8 nSeg; // 0x6C
|
||||
ziU8 segs1[16][12]; // 0x6D
|
||||
ziU8 segsD[16][12]; // 0x12D
|
||||
ziU8 segs1[0xC0]; // 0x6D
|
||||
ziU8 segsD[0xC0]; // 0x12D
|
||||
ziU8 pad_0x1ED; // 0x1ED
|
||||
} ziMatchParam;
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ ziU32 Zi8GetTableData(ziU8 lang, ziU8 tableIdx, ziU8 memberId ZI_NEED_WORK) {
|
||||
if (langIdx-- != 0) {
|
||||
tableData = ZI_WORK->langEntries[langIdx].tableData;
|
||||
if ((lang == ZI8_LANG_ZH) && (tableData[3] >= 4) &&
|
||||
((ZI_WORK->subLanguage == 1) || (ZI_WORK->subLanguage == 0x80) || (ZI_WORK->subLanguage == 0x40))) {
|
||||
((ZI_WORK->unk_0x18 == 1) || (ZI_WORK->unk_0x18 == 0x80) || (ZI_WORK->unk_0x18 == 0x40))) {
|
||||
offset = ((tableData[0x8B] << 0x10) + (tableData[0x8C] << 8) + tableData[0x8D]);
|
||||
if (offset != 0) {
|
||||
tableData += offset;
|
||||
|
||||
@@ -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;
|
||||
@@ -67,11 +67,12 @@ ziWChar Zi8ConvertUC2WC(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
return mapped[character - defaults->first];
|
||||
}
|
||||
ziChar Zi8ConvertWC2UC(ziWChar character, ziU8 language ZI_NEED_WORK) {
|
||||
ziU16 index, count, value, first, last;
|
||||
ziU8* cursor;
|
||||
ziU16 index, count, first, last, value;
|
||||
ziConversionTable* table;
|
||||
const ziConversionRangeTable* defaults;
|
||||
ziConversionRange* ranges;
|
||||
ziConversionEntry* entry;
|
||||
ziU8* cursor;
|
||||
if (character == 0) {
|
||||
Zi8LogError(0x133, __zi8_work_data);
|
||||
return 0;
|
||||
@@ -82,109 +83,94 @@ ziChar Zi8ConvertWC2UC(ziWChar character, ziU8 language ZI_NEED_WORK) {
|
||||
Zi8LogError(0x6AE, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
entry = (ziConversionEntry*)table;
|
||||
count = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
entry++;
|
||||
entry = table->entries;
|
||||
count = (ziU16)table->count[0] << 8 | table->count[1];
|
||||
for (index = 0; index < count; index++) {
|
||||
first = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
first = ((ziU16)entry->first[0] << 8 | entry->first[1]);
|
||||
last = (ziU16)entry->last[0] << 8 | entry->last[1];
|
||||
if (character < first || character > last) {
|
||||
entry++;
|
||||
continue;
|
||||
}
|
||||
value = (ziU16)entry->value[0] << 8 | entry->value[1];
|
||||
if (first == last) {
|
||||
if (first <= character && character <= last) {
|
||||
value = ((ziU16)entry->value[0] << 8 | entry->value[1]);
|
||||
if (first == last) {
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return value & 0xFF;
|
||||
}
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return value & 0xFF;
|
||||
return ((ziU8*)table->entries)[character + value - first];
|
||||
}
|
||||
entry = (ziConversionEntry*)((ziU8*)table + value + character - first + 8);
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return *(ziU8*)entry;
|
||||
entry++;
|
||||
}
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
return 0;
|
||||
} else {
|
||||
ranges = Zi8CvrtTables.reverse.entries;
|
||||
if (ranges == 0) {
|
||||
defaults = &Zi8CvrtTables.reverse;
|
||||
if (defaults == 0) {
|
||||
Zi8LogError(0x6AE, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
count = Zi8CvrtTables.reverse.count;
|
||||
for (index = 0; index < count; index++) {
|
||||
if (character >= ranges[index].first && character <= ranges[index].last) {
|
||||
ranges = defaults->entries;
|
||||
for (index = 0; index < defaults->count; index++) {
|
||||
if (ranges[index].first <= character && character <= ranges[index].last) {
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (ranges[index].first == ranges[index].last)
|
||||
return ranges[index].result.character & 0xFF;
|
||||
cursor = ranges[index].result.table;
|
||||
return cursor[character - ranges[index].first];
|
||||
if (ranges[index].first == ranges[index].last) return ranges[index].result.character & 0xFF;
|
||||
return ((ziU8*)ranges[index].result.table)[character - ranges[index].first];
|
||||
}
|
||||
}
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ziWChar Zi8ConvertUC2Key(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
ziU16 key = 0;
|
||||
ziU16 index, count, first, last;
|
||||
ziU16 count, index, first, last;
|
||||
ziU32 key = 0;
|
||||
ziConversionTable* table;
|
||||
ziWChar* mapped;
|
||||
const ziConversionRangeTable* defaults;
|
||||
ziConversionRange* ranges;
|
||||
ziConversionEntry* entry;
|
||||
ziU8* cursor;
|
||||
if (character == 0) {
|
||||
Zi8LogError(0x133, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
if (ZI_WORK->userKeys[language] != 0)
|
||||
return Zi8ConvertUC2UserKey(character, language, __zi8_work_data);
|
||||
if (ZI_WORK->userKeys[language] != 0) return Zi8ConvertUC2UserKey(character, language, __zi8_work_data);
|
||||
if (Zi8GetTableCount(language, 8, __zi8_work_data) != 0) {
|
||||
table = Zi8GetTableAddress(language, 8, __zi8_work_data);
|
||||
if (table == 0) {
|
||||
Zi8LogError(0x6B8, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
entry = (ziConversionEntry*)table;
|
||||
count = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
entry++;
|
||||
entry = table->entries;
|
||||
count = (ziU16)table->count[0] << 8 | table->count[1];
|
||||
for (index = 0; index < count; index++) {
|
||||
first = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
first = ((ziU16)entry->first[0] << 8 | entry->first[1]);
|
||||
last = (ziU16)entry->last[0] << 8 | entry->last[1];
|
||||
if (character < first || character > last) {
|
||||
entry++;
|
||||
continue;
|
||||
if (first <= character && character <= last) {
|
||||
key = ((ziU16)entry->value[0] << 8 | entry->value[1]);
|
||||
if (first != last) {
|
||||
cursor = (ziU8*)table->entries + key + (character - first) * 2;
|
||||
key = (ziU16)cursor[0] << 8 | cursor[1];
|
||||
}
|
||||
break;
|
||||
}
|
||||
key = (ziU16)entry->value[0] << 8 | entry->value[1];
|
||||
if (first == last) break;
|
||||
entry = (ziConversionEntry*)((ziU8*)table + key + (character - first) * 2);
|
||||
entry = (ziConversionEntry*)((ziU8*)entry + 8);
|
||||
key = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
break;
|
||||
entry++;
|
||||
}
|
||||
} else {
|
||||
ranges = Zi8CvrtTables.keys.entries;
|
||||
if (ranges == 0) {
|
||||
defaults = &Zi8CvrtTables.keys;
|
||||
if (defaults == 0) {
|
||||
Zi8LogError(0x6B8, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
count = Zi8CvrtTables.keys.count;
|
||||
for (index = 0; index < count; index++) {
|
||||
if (character >= ranges[index].first && character <= ranges[index].last) {
|
||||
if (ranges[index].first == ranges[index].last) {
|
||||
key = (ziU8)ranges[index].result.character;
|
||||
break;
|
||||
}
|
||||
mapped = ranges[index].result.table;
|
||||
key = mapped[character - ranges[index].first];
|
||||
ranges = defaults->entries;
|
||||
for (index = 0; index < defaults->count; index++) {
|
||||
if (ranges[index].first <= character && character <= ranges[index].last) {
|
||||
if (ranges[index].first == ranges[index].last) key = ranges[index].result.character & 0xFF;
|
||||
else key = ((ziWChar*)ranges[index].result.table)[character - ranges[index].first];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (key == 0) {
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
return 0xEFF1;
|
||||
} else {
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return key;
|
||||
}
|
||||
key = 0xEFF1;
|
||||
} else Zi8LogError(100, __zi8_work_data);
|
||||
return key;
|
||||
}
|
||||
ziWChar Zi8ConvertWC2Key(ziWChar character, ziU8 language ZI_NEED_WORK) {
|
||||
return Zi8ConvertUC2Key(Zi8ConvertWC2UC(character, language, __zi8_work_data), language, __zi8_work_data);
|
||||
|
||||
@@ -269,10 +269,10 @@ Zi8UInt Zi8SpellingZY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
|
||||
Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
{
|
||||
Zi8UInt length = 0;
|
||||
ziU16 initialIndex = (ziU16)(((key & 0xffff) >> 9) & 0x3f);
|
||||
ziU16 finalIndex = (ziU16)(((key & 0xffff) >> 3) & 0x3f);
|
||||
volatile ziU16 tone = (ziU16)(key & 7);
|
||||
ziU16 tone = (ziU16)(key & 7);
|
||||
Zi8UInt length = 0;
|
||||
|
||||
output[0] = zi8PYinitialSpelling[initialIndex][0];
|
||||
output[1] = zi8PYinitialSpelling[initialIndex][1];
|
||||
@@ -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;
|
||||
@@ -940,7 +940,8 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
for (tableIndex = 0; tableIndex < params->count;) {
|
||||
while (*output != 0) {
|
||||
if (*output != 0x27) {
|
||||
*output++ |= 0xf300;
|
||||
*output |= 0xf300;
|
||||
output++;
|
||||
} else {
|
||||
*output++ = 0xf360;
|
||||
}
|
||||
@@ -1000,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++;
|
||||
} else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
|
||||
if (candidateCount >= params->maxCandidates) goto finishSpelling;
|
||||
} else {
|
||||
|
||||
@@ -285,9 +285,9 @@ static ziBool ZiIsLetterHyphen(ziWChar character ZI_NEED_WORK) {
|
||||
else return ZI8_FALSE;
|
||||
}
|
||||
|
||||
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ZiAlphaWork* work) {
|
||||
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ziPtr work) {
|
||||
enum { LOWER_CASE, UPPER_CASE } upper = LOWER_CASE;
|
||||
if (work->caseMode == 3) {
|
||||
if (((ZiAlphaWork*)work)->caseMode == 3) {
|
||||
Zi8ChangeCharCase(1, word++, language, work);
|
||||
} else if (((ZiAlphaWork*)work)->caseMode == 1) {
|
||||
upper = UPPER_CASE;
|
||||
@@ -1074,7 +1074,7 @@ filterVowelCandidate:
|
||||
(((ZiAlphaWork*)workData)->dictionaries[language] == 0)))))) {
|
||||
if (language != ((ZiAlphaWork*)workData)->language) break;
|
||||
index = ((ZiAlphaWork*)workData)->dictionaryKinds[dictionaryIndex + 1];
|
||||
if (index == 0xc || (index < 9 && index >= 5)) {
|
||||
if ((index == 0xc) || (((index < 0xc && (index < 9)) && (4 < index)))) {
|
||||
if (Zi8getKeyLayout(language,0xeff1,&punctuationBuffer[0],1,workData) == 0) {
|
||||
punctuationBuffer[0] = 0;
|
||||
}
|
||||
@@ -1101,7 +1101,7 @@ filterVowelCandidate:
|
||||
punctuationCursor = &punctuationBuffer[0];
|
||||
dictionaryKind = 0xb;
|
||||
}
|
||||
else if (((ZiAlphaOptions*)optionData)->minWordLength <= wordLength) {
|
||||
else if ((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->minWordLength <= (int)wordLength) {
|
||||
if (prefixVowelRestriction) {
|
||||
if (*wordCursor >= 0x30 && *wordCursor <= 0x39) goto retryDictionary;
|
||||
if (language == 0x2f) {
|
||||
@@ -1116,15 +1116,15 @@ filterVowelCandidate:
|
||||
{
|
||||
prepareCandidate:
|
||||
if (((elementCount == 1) && (dictionaryKind != 10)) &&
|
||||
((*wordCursor >= 0xeff1 && *wordCursor <= 0xf010))) {
|
||||
((0xeff0 < *wordCursor && (*wordCursor < 0xf011)))) {
|
||||
punctuationCandidate = ZI8_TRUE;
|
||||
break;
|
||||
}
|
||||
wordCursor[wordLength] = 0;
|
||||
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)wordLength > (int)elementCount))
|
||||
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)elementCount < (int)wordLength))
|
||||
{
|
||||
wordLength = elementCount;
|
||||
wordCursor[wordLength] = 0;
|
||||
wordCursor[elementCount] = 0;
|
||||
}
|
||||
wordLength = (ziU16)Zi8DeTokenization(wordCursor,wordLength & 0xffff,wordCapacity & 0xffff,language);
|
||||
if (((phoneticInput) && ((unsigned int)parameters->elementCount < (wordLength & 0xff))) &&
|
||||
@@ -1136,39 +1136,35 @@ prepareCandidate:
|
||||
((Zi8ZHCheckSpelling(wordCursor,parameters->elements,parameters->elementCount,
|
||||
workData)) != '\0')) {
|
||||
if ((((ZiAlphaWork*)workData)->caseMode != '\0') && ((!phoneticInput && (!phoneticSeparator)))) {
|
||||
Zi8ChangeWordCase(wordCursor - prefixCount,language,workData);
|
||||
Zi8ChangeWordCase(wordCursor + -prefixCount,language,workData);
|
||||
}
|
||||
if ((((ZiAlphaOptions*)optionData)->suffixOnly != '\0') &&
|
||||
((int)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount))) {
|
||||
wordLength = ((ZiAlphaOptions*)optionData)->maxWordLength - prefixCount;
|
||||
((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount))) {
|
||||
wordLength = (ziU8)((ZiAlphaOptions*)optionData)->maxWordLength - prefixCount;
|
||||
wordCursor[wordLength] = 0;
|
||||
}
|
||||
if (((int)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount)) ||
|
||||
((Zi8IsDupWordW(wordCursor - prefixCount,wordLength + prefixCount & 0xff,
|
||||
if (((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount)) ||
|
||||
((Zi8IsDupWordW(wordCursor + -prefixCount,wordLength + prefixCount & 0xff,
|
||||
workData)) != '\0')) {
|
||||
if ((prefixCount != 0) && (((ZiAlphaOptions*)optionData)->maxWordLength <= prefixCount)) break;
|
||||
if ((prefixCount != 0) && ((ziU8)((ZiAlphaOptions*)optionData)->maxWordLength <= prefixCount)) break;
|
||||
}
|
||||
else {
|
||||
|
||||
if ((((keyLayoutCount == 0) || (((ZiAlphaOptions*)optionData)->lookupMode != '\0')) ||
|
||||
((int)(wordLength + prefixCount) <= 1)) ||
|
||||
((int)(wordLength + prefixCount) < 2)) ||
|
||||
(0x40 < (int)(wordLength + prefixCount))) goto emitCandidate;
|
||||
switch (dictionaryKind) {
|
||||
case 5:
|
||||
case 1:
|
||||
case 9:
|
||||
if (dictionaryKind == 5) {
|
||||
checkKeyLayout:
|
||||
keyLayoutCursor = keyLayout;
|
||||
candidateCharacterCount = wordLength + prefixCount;
|
||||
for (index = 0; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
|
||||
if (*keyLayoutCursor < candidateCharacterCount) {
|
||||
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
|
||||
} else {
|
||||
if (*keyLayoutCursor++ > candidateCharacterCount) {
|
||||
if (candidateCharacterCount <= *keyLayoutCursor) {
|
||||
if (candidateCharacterCount < *keyLayoutCursor++) {
|
||||
index = (unsigned int)keyLayoutCount;
|
||||
}
|
||||
break;
|
||||
}
|
||||
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
|
||||
}
|
||||
if ((int)index < (int)(unsigned int)keyLayoutCount) {
|
||||
for (elementIndex = 0; (int)elementIndex < (int)(unsigned int)candidateCharacterCount;
|
||||
@@ -1176,31 +1172,32 @@ checkKeyLayout:
|
||||
candidateBytes[elementIndex] = Zi8ConvertWC2UC(wordCursor[elementIndex - prefixCount],language,workData);
|
||||
}
|
||||
for (; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
|
||||
elementIndex = 0;
|
||||
while (elementIndex < candidateCharacterCount) {
|
||||
if (candidateBytes[elementIndex] != keyLayoutCursor[elementIndex]) break;
|
||||
elementIndex++;
|
||||
for (elementIndex = 0;
|
||||
((int)elementIndex < (int)(unsigned int)candidateCharacterCount &&
|
||||
(candidateBytes[elementIndex] == keyLayoutCursor[elementIndex]));
|
||||
elementIndex = elementIndex + 1) {
|
||||
}
|
||||
if (elementIndex == candidateCharacterCount) {
|
||||
wordCursor[-prefixCount] = 0;
|
||||
goto retryDictionary;
|
||||
}
|
||||
keyLayoutCursor += candidateCharacterCount;
|
||||
if (*keyLayoutCursor++ > candidateCharacterCount) break;
|
||||
if (candidateCharacterCount < *keyLayoutCursor++) break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
else if (dictionaryKind < 5) {
|
||||
if (dictionaryKind == 1) goto checkKeyLayout;
|
||||
}
|
||||
else if (dictionaryKind == 9) goto checkKeyLayout;
|
||||
emitCandidate:
|
||||
if (firstCandidate == 0) {
|
||||
if (((ZiAlphaOptions*)optionData)->countOnly != '\0') {
|
||||
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
|
||||
if ((int)((ZiAlphaOptions*)optionData)->shortestWord > (int)(wordLength + prefixCount)) {
|
||||
if ((int)(wordLength + prefixCount) < (int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->shortestWord) {
|
||||
((ZiAlphaOptions*)optionData)->shortestWord = wordLength + prefixCount;
|
||||
}
|
||||
if ((int)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
|
||||
if ((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
|
||||
((ZiAlphaOptions*)optionData)->longestWord = wordLength + prefixCount;
|
||||
}
|
||||
}
|
||||
@@ -1224,17 +1221,23 @@ emitCandidate:
|
||||
} else {
|
||||
if (((((ZiAlphaWork*)workData)->suffixMode == '\0') && (wordCursor[1] == 0)) &&
|
||||
(candidateCount == 0)) {
|
||||
if (*wordCursor >= 0xeff1 && *wordCursor <= 0xf010) {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = 0;
|
||||
}
|
||||
else {
|
||||
if ((*wordCursor < 0xeff1) || (0xf010 < *wordCursor)) {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = *wordCursor;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = 0;
|
||||
}
|
||||
}
|
||||
if (dictionaryExact != 0 &&
|
||||
parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount &&
|
||||
(parameters->maxCandidates == 1 ||
|
||||
(candidateCount == 0 && parameters->firstCandidate == 0))) {
|
||||
if (((dictionaryExact == 0) || (parameters->elementCount != ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
|| ((parameters->maxCandidates != 1 &&
|
||||
((candidateCount != 0 || (parameters->firstCandidate != 0)))))) {
|
||||
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
&& ((parameters->maxCandidates == 1 ||
|
||||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
|
||||
}
|
||||
}
|
||||
else {
|
||||
for (index = 0; (int)index < (int)prefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[index]
|
||||
= wordCursor[index - prefixCount];
|
||||
@@ -1245,13 +1248,6 @@ emitCandidate:
|
||||
}
|
||||
((ZiAlphaWork*)workData)->rememberedWord[index + prefixCount] = 0;
|
||||
}
|
||||
else {
|
||||
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
&& ((parameters->maxCandidates == 1 ||
|
||||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
|
||||
}
|
||||
}
|
||||
if ((((ZiAlphaWork*)workData)->suffixMode == '\0') &&
|
||||
((((((dictionaryKind == 1 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 1) != 0)) ||
|
||||
((dictionaryKind == 3 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 2) != 0)))) ||
|
||||
@@ -1314,7 +1310,7 @@ emitCandidate:
|
||||
}
|
||||
else {
|
||||
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
|
||||
wordCursor = wordCursor - prefixCount;
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
wordLength += prefixCount;
|
||||
for (index = 0; parameters->elementCount + index < wordLength; index++) {
|
||||
@@ -1436,7 +1432,7 @@ finishDictionaryPass:;
|
||||
if ((completionAllowed) &&
|
||||
((((((ZiAlphaWork*)workData)->suffixMode == '\0' && (2 < (int)elementCount)) &&
|
||||
(elements[elementCount - 2] == 0xeff1)) &&
|
||||
((int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
|
||||
((unsigned int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
|
||||
((ZiAlphaWork*)workData)->prefixElementCount = ((ZiAlphaWork*)workData)->prefixCount + '\x01';
|
||||
((ZiAlphaWork*)workData)->suffixMode = 1;
|
||||
}
|
||||
@@ -1444,58 +1440,19 @@ finishDictionaryPass:;
|
||||
prefixPrepared = ZI8_TRUE;
|
||||
goto preparePrefix;
|
||||
}
|
||||
if (!((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
|
||||
if ((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
|
||||
((((ZiAlphaWork*)workData)->suffixLocked == '\0' && (2 < (int)elementCount)))) &&
|
||||
(((elements[elementCount - 2] == 0xeff1 &&
|
||||
((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
|
||||
(((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
|
||||
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0'))))))) {
|
||||
tryAlternatePrefix:
|
||||
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
|
||||
if (language == parameters->language) {
|
||||
if (primaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
else if (secondaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
prefixPrepared = ZI8_FALSE;
|
||||
((ZiAlphaWork*)workData)->suffixMode = 0;
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 0;
|
||||
((ZiAlphaWork*)workData)->suffixCount = 0;
|
||||
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->prefix[index] =
|
||||
((ZiAlphaWork*)workData)->alternatePrefix[index];
|
||||
}
|
||||
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
|
||||
if (((ZiAlphaWork*)workData)->language == parameters->language) {
|
||||
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->language = parameters->language;
|
||||
}
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
|
||||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
|
||||
goto finishCandidates;
|
||||
if (completionAllowed) goto checkPrefixPunctuation;
|
||||
} else {
|
||||
((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
|
||||
(((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
|
||||
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0')))))) {
|
||||
if ((((ZiAlphaWork*)workData)->prefixEnabled == '\0') || (elements[elementCount - 1] != 0xeff1)) {
|
||||
if ((!primaryMatched) && (!secondaryMatched)) {
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 1;
|
||||
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount - 1;
|
||||
if (prefixCount != 0) {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
elements = elements + -prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
@@ -1520,8 +1477,8 @@ checkPrefixPunctuation:
|
||||
((((Zi8GetTableCount(language,0x1f,workData)) & 8) == 0 &&
|
||||
(parameters->elements[parameters->elementCount - 1] != 0xEFF1)))))) {
|
||||
if (prefixPrepared) {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
elements = elements + -prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
@@ -1529,7 +1486,7 @@ checkPrefixPunctuation:
|
||||
if (((ZiAlphaWork*)workData)->suffixLocked != '\0') {
|
||||
((ZiAlphaWork*)workData)->previousSuffixCount = ((ZiAlphaWork*)workData)->suffixElementCount;
|
||||
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount;
|
||||
elementIndex = (int)((ZiAlphaWork*)workData)->prefixCount + (int)((ZiAlphaWork*)workData)->suffixCount;
|
||||
elementIndex = (unsigned int)((ZiAlphaWork*)workData)->prefixCount + (unsigned int)((ZiAlphaWork*)workData)->suffixCount;
|
||||
if (elements[elementIndex] != 0xEFF1 && Zi8IsAlphaPunct(elements[elementIndex]) != 0) {
|
||||
((ZiAlphaWork*)workData)->suffix[((ZiAlphaWork*)workData)->suffixCount++] = elements[elementIndex];
|
||||
} else {
|
||||
@@ -1559,6 +1516,46 @@ checkPrefixPunctuation:
|
||||
goto preparePrefix;
|
||||
}
|
||||
}
|
||||
else {
|
||||
tryAlternatePrefix:
|
||||
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
|
||||
if (language == parameters->language) {
|
||||
if (primaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
else if (secondaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
elements = elements + -prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
prefixPrepared = ZI8_FALSE;
|
||||
((ZiAlphaWork*)workData)->suffixMode = 0;
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 0;
|
||||
((ZiAlphaWork*)workData)->suffixCount = 0;
|
||||
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->prefix[index] =
|
||||
((ZiAlphaWork*)workData)->alternatePrefix[index];
|
||||
}
|
||||
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
|
||||
if (((ZiAlphaWork*)workData)->language == parameters->language) {
|
||||
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->language = parameters->language;
|
||||
}
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
|
||||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
|
||||
goto finishCandidates;
|
||||
if (completionAllowed) goto checkPrefixPunctuation;
|
||||
}
|
||||
if (!completionAllowed && ((ZiAlphaWork*)workData)->suffixMode == 0 && ((ZiAlphaWork*)workData)->prefixCount != 0 &&
|
||||
elementCount > 2 && ((ZiAlphaWork*)workData)->prefixCount == elementCount - 1 &&
|
||||
Zi8IsAlphaPunct(parameters->elements[((ZiAlphaWork*)workData)->prefixCount - 1]) != 0) goto checkPrefixFields;
|
||||
@@ -1618,7 +1615,7 @@ finishCandidates:
|
||||
} else {
|
||||
wordCursor = 0;
|
||||
}
|
||||
if (wordCursor) {
|
||||
if (wordCursor != (ziU16 *)0x0) {
|
||||
Zi8SetHighlightedWordW(wordCursor,parameters->language,parameters->subLanguage,workData);
|
||||
}
|
||||
}
|
||||
@@ -1634,7 +1631,8 @@ finishCandidates:
|
||||
countIndex = ((ZiAlphaWork*)workData)->dictionaryCount - 1;
|
||||
}
|
||||
for (; countIndex >= 1; countIndex = countIndex - 1) {
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] -=
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] =
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] -
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex - 1];
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -643,7 +643,7 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
|
||||
{
|
||||
int strokeIndex;
|
||||
int outputCount;
|
||||
volatile int extraCount;
|
||||
int extraCount;
|
||||
|
||||
outputCount = 0;
|
||||
Zi8LogError(100, work);
|
||||
@@ -660,7 +660,8 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
|
||||
goto lowStroke;
|
||||
}
|
||||
badStroke:
|
||||
outputBuffer[(ziU8)--outputCount] = 0;
|
||||
outputCount--;
|
||||
outputBuffer[(ziU8)outputCount] = 0;
|
||||
return outputCount;
|
||||
lowStroke:
|
||||
outputBuffer[(ziU8)outputCount] = zi8StrokeCode(strokes[strokeIndex] & 0xf, work);
|
||||
|
||||
@@ -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) {
|
||||
@@ -306,7 +307,7 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
} else {
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x17EC = 0;
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
} else if (ZI_WORK->unk_0x17EC != 0) {
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
goto finish_match;
|
||||
@@ -316,30 +317,30 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK);
|
||||
} else {
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) break;
|
||||
status = 0;
|
||||
if (count <= 1 && language == 0x36) break;
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
}
|
||||
}
|
||||
if ((ziU8)result == 0 && status == 0 && mode == 1 && count == 1 && capacity >= 1) {
|
||||
mode = 0;
|
||||
ZI_WORK->unk_0x17EC = 1;
|
||||
if (tableSize != 0) {
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
acceptPrefix, ZI_WORK) != 0) {
|
||||
*output = *elements;
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
}
|
||||
} else {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
|
||||
@@ -164,7 +164,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||
parameters->letters = length;
|
||||
if ((parameters->getOptions & 0x80) == 0) {
|
||||
ZI_WORK->language = parameters->language;
|
||||
ZI_WORK->unk_0x538 = parameters->language;
|
||||
parameters->candidates[0] = 0xfff0;
|
||||
output = (ziWChar*)&ZI_WORK->unk_0x338;
|
||||
}
|
||||
@@ -339,11 +339,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
if ((parameters->elementCount == 1) && (parameters->firstCandidate == 0)) {
|
||||
switch (parameters->language) {
|
||||
case 1:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEF04) {
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
@@ -400,11 +400,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
break;
|
||||
case 0x11:
|
||||
default:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEFF2) {
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
@@ -490,8 +490,8 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
ZI_WORK->unk_0x00 = '\0';
|
||||
}
|
||||
}
|
||||
ZI_WORK->subLanguage = parameters->subLanguage;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||
ZI_WORK->unk_0x18 = parameters->subLanguage;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||
options->maxCount = ZI_WORK->unk_0x10;
|
||||
options->maxWordLength = ZI_WORK->unk_0x0A;
|
||||
ZI_WORK->unk_0x0A = -1;
|
||||
@@ -558,7 +558,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
}
|
||||
else if ((parameters->language == 1) &&
|
||||
((((parameters->getMode == 7 || (parameters->getMode == 8)) || (parameters->getMode == 10)) || (parameters->getMode == 9)))) {
|
||||
if (ZI_WORK->cangjieEnabled != '\0') {
|
||||
if (ZI_WORK->unk_0x16 != '\0') {
|
||||
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
|
||||
} else {
|
||||
error = 0x708;
|
||||
@@ -582,7 +582,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
}
|
||||
}
|
||||
else {
|
||||
ZI_WORK->language = parameters->language;
|
||||
ZI_WORK->unk_0x538 = parameters->language;
|
||||
if ((parameters->getOptions & 0x80) == 0) {
|
||||
saved.restoreCandidates = 1;
|
||||
saved.savedOptions = parameters->getOptions;
|
||||
|
||||
@@ -21,7 +21,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
ZI_WORK->unk_0x0A = 0xFF;
|
||||
ZI_WORK->unk_0x10 = 0x64;
|
||||
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
|
||||
ZI_WORK->separator = 0x20;
|
||||
ZI_WORK->unk_0x1A = 0x20;
|
||||
ZI_WORK->unk_0x1C[2] = 0;
|
||||
ZI_WORK->unk_0x1B30 = 0;
|
||||
ZI_WORK->unk_0x1B3A = 0;
|
||||
@@ -42,13 +42,13 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
return 0;
|
||||
}
|
||||
ZI_WORK->unk_0x1874 = 0x2D;
|
||||
ZI_WORK->language = 0;
|
||||
ZI_WORK->unk_0x538 = 0;
|
||||
ZI_WORK->unk_0x1C[3] = 0;
|
||||
ZI_WORK->unk_0x141A = 0x100;
|
||||
Zi8SetLatinSearchOrder(0, 0, ZI_WORK);
|
||||
ZADP_Zi8SetPDremoveOpt(1, ZI_WORK);
|
||||
ZI_WORK->unk_0x17 = 5;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, ZI_WORK) & 2;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, ZI_WORK) & 2;
|
||||
ZI_WORK->unk_0x1B28.bits.msb = 1;
|
||||
ZI_WORK->unk_0x1B2C.bits.msb = 1;
|
||||
zyFuzzy = ZI_WORK->unk_0x1B2C.word;
|
||||
|
||||
@@ -24,17 +24,17 @@ ziU8 Zi8GetZHCharSet(ziPtr workData) {
|
||||
return 0;
|
||||
}
|
||||
if (Zi8GetTableCount(1, 10, workData) != 0) {
|
||||
bak = ((struct __zi8_work_data_s*)workData)->subLanguage;
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = 1;
|
||||
bak = ((struct __zi8_work_data_s*)workData)->unk_0x18;
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = 1;
|
||||
addr = Zi8GetTableAddress(1, 10, workData);
|
||||
p = (ziU8*)addr;
|
||||
v0 = (ziU16)((ziU16)p[0] | ((ziU16)p[1] << 8));
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = 0;
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = 0;
|
||||
addr = Zi8GetTableAddress(1, 10, workData);
|
||||
p = (ziU8*)addr;
|
||||
v1 = (ziU16)((ziU16)p[2] | ((ziU16)p[3] << 8));
|
||||
v2 = (ziU16)((ziU16)p[4] | ((ziU16)p[5] << 8));
|
||||
((struct __zi8_work_data_s*)workData)->subLanguage = bak;
|
||||
((struct __zi8_work_data_s*)workData)->unk_0x18 = bak;
|
||||
if (v0 != 0) {
|
||||
if (v0 > 0x4E20) {
|
||||
charSet |= 8;
|
||||
|
||||
@@ -139,7 +139,7 @@ ziU32 Zi8SecMatchChar(ziPtr nodeAddress, ziU8* dictionaryAddress, ziMatchParam*
|
||||
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, ZI_WORK);
|
||||
data += ((ziU8*)nodeAddress)[0xB] + (((ziU8*)nodeAddress)[0xA] << 8) + ((((ziU8*)nodeAddress)[9] & 0xF) << 16);
|
||||
if (ZI_WORK->cangjieEnabled != 0) {
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
switch (data[0] & 7) {
|
||||
case 2:
|
||||
data += 2;
|
||||
@@ -346,7 +346,7 @@ match_code:
|
||||
traversal.soundIndex = initialCode;
|
||||
}
|
||||
sound = (ziU8*)(tableAddress + ((node[9] & 0xF) * 0x10000 + (node[0xB] + node[0xA] * 0x100)));
|
||||
if (ZI_WORK->cangjieEnabled != 0) {
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
switch (sound[0] & 7) {
|
||||
case 2:
|
||||
sound += 2;
|
||||
|
||||
@@ -37,7 +37,7 @@ ziU16 Zi8Uni2Ptr(ziU16 ch, ziE12* buf ZI_NEED_WORK) {
|
||||
p = (ziU8*)(table2 +
|
||||
(((e[9] & 0xF) << 16) |
|
||||
(e[0xB] | (e[0xA] << 8))));
|
||||
if (WORKP->cangjieEnabled != 0) {
|
||||
if (WORKP->unk_0x16 != 0) {
|
||||
switch (p[0] & 7) {
|
||||
case 2:
|
||||
p += 2;
|
||||
@@ -65,7 +65,7 @@ ziU16 Zi8Uni2Ptr(ziU16 ch, ziE12* buf ZI_NEED_WORK) {
|
||||
}
|
||||
}
|
||||
e = (ziU8*)table;
|
||||
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->subLanguage) {
|
||||
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->unk_0x18) {
|
||||
if ((ziU16)ch >= WORKP->unk_0x1B1C && (ziU16)ch <= WORKP->unk_0x1B1E) {
|
||||
i = (ziU16)(ch - WORKP->unk_0x1B1C);
|
||||
goto map;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -92,100 +89,89 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
|
||||
ZI_WORK->unk_0x310 = (ziU32)table + section->offset[0] * 0x100 + section->offset[1];
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
for (;;) {
|
||||
word = (ziU8*)ZI_WORK->unk_0x310;
|
||||
if (word == 0) {
|
||||
Zi8LogError(0x4B3, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
while ((entry = (ziU8*)ZI_WORK->unk_0x310) != 0) {
|
||||
while ((ziS32)ZI_WORK->unk_0x318 < (ziS32)ZI_WORK->unk_0x314) {
|
||||
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;
|
||||
}
|
||||
Zi8LogError(0x4B3, __zi8_work_data);
|
||||
return 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) {
|
||||
continuation = 0;
|
||||
} else {
|
||||
__zi8_work_data->pudCount = 1;
|
||||
if ((ZI_WORK->pudCount = ZI_WORK->pudCount + 1) > 16) {
|
||||
ZI_WORK->pudCount = 1;
|
||||
break;
|
||||
}
|
||||
continuation = 0;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ ziU8 Zi8ZHaddSpace(ziWChar* src, ziU8 count, ziWChar* dst,
|
||||
}
|
||||
if (pdst[k - 1] != 0xF360 &&
|
||||
(pdst[k - 1] < 0xF331 || pdst[k - 1] > 0xF335)) {
|
||||
pdst[k++] = ZI_WORK->separator;
|
||||
pdst[k++] = ZI_WORK->unk_0x1A;
|
||||
}
|
||||
psrc += i;
|
||||
n -= i;
|
||||
|
||||
@@ -15,11 +15,11 @@ void Zi8Memset(ziPtr, ziU32, ziU32);
|
||||
|
||||
ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
ziU8 length;
|
||||
ziU8 position;
|
||||
ziUwdNode* previous;
|
||||
ziUwdNode* current;
|
||||
ziUwdNode* added;
|
||||
ziUserWord* candidate;
|
||||
ziU8 position;
|
||||
if (ZI_WORK->uwdCount >= 32) {
|
||||
Zi8LogError(0x19D, __zi8_work_data);
|
||||
return 0;
|
||||
@@ -41,11 +41,11 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
current = ZI_WORK->uwdList;
|
||||
while (current != 0) {
|
||||
candidate = (ziUserWord*)current->word;
|
||||
if (ZI_WORK->unk_0x12E == 1 && candidate->priority < word->priority) break;
|
||||
if (ZI_WORK->unk_0x12E == 1 && word->priority > candidate->priority) break;
|
||||
if (candidate->length == length) {
|
||||
position = 0;
|
||||
while (position < length) {
|
||||
if (candidate->text[position] != word->text[position]) break;
|
||||
if ((ziU8)candidate->text[position] != (ziU8)word->text[position]) break;
|
||||
position++;
|
||||
}
|
||||
if (position == length) {
|
||||
@@ -56,7 +56,9 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
previous = current;
|
||||
current = current->next;
|
||||
}
|
||||
added = &ZI_WORK->uwdNodes[ZI_WORK->uwdCount++];
|
||||
length = ZI_WORK->uwdCount;
|
||||
ZI_WORK->uwdCount = length + 1;
|
||||
added = &ZI_WORK->uwdNodes[length];
|
||||
if (previous == 0) {
|
||||
ZI_WORK->uwdList = added;
|
||||
added->next = current;
|
||||
@@ -86,65 +88,42 @@ 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 position, prefixLength, previousOffset;
|
||||
ziU32 size, entryLanguage, 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)) {
|
||||
if (!(ZI_WORK->unk_0x138 < 3 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
|
||||
Zi8ReplaceLastError(0x19C, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
|
||||
if (continuation != 0) {
|
||||
text = (ziU8*)Zi8_814803F4(__zi8_work_data);
|
||||
entryLength = 0;
|
||||
if (text != 0) {
|
||||
language = ((ziUserWord*)text)->language;
|
||||
entryLength = ((ziUserWord*)text)->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;
|
||||
}
|
||||
{
|
||||
if (continuation == 0) {
|
||||
Zi8_8148047C(__zi8_work_data);
|
||||
ZI_WORK->unk_0x13C = 0;
|
||||
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
|
||||
else {
|
||||
prefixLength = 0;
|
||||
for (position = currentLength - 2; position >= 0;) {
|
||||
if (currentWord[position] == 0x20) break;
|
||||
position--;
|
||||
prefixLength++;
|
||||
}
|
||||
position++;
|
||||
for (position = currentLength - 2; position >= 0 && currentWord[position] != 0x20; position--) prefixLength++;
|
||||
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
|
||||
else {
|
||||
ZI_WORK->unk_0x140 = 1;
|
||||
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 (; ++position, prefixLength > 0; prefixLength--) {
|
||||
folded = currentWord[position];
|
||||
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = 0;
|
||||
@@ -152,60 +131,53 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data)) Zi8ChangeCharCase(0, &folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
}
|
||||
if (ZI_WORK->unk_0x141[previousOffset++] == 0) {
|
||||
if (ZI_WORK->unk_0x141[previousOffset] == 0) {
|
||||
ZI_WORK->unk_0x140 = 0;
|
||||
previousOffset++;
|
||||
break;
|
||||
}
|
||||
prefixLength--;
|
||||
position++;
|
||||
previousOffset++;
|
||||
}
|
||||
}
|
||||
}
|
||||
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;
|
||||
if (begin < boundary) firstSegment = 1;
|
||||
else firstSegment = 0;
|
||||
while ((cursor < boundary && firstSegment) || (cursor < end && !firstSegment)) {
|
||||
cursor = begin;
|
||||
firstSegment = begin < boundary;
|
||||
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 +185,23 @@ next:
|
||||
visited = 0;
|
||||
goto rescan;
|
||||
}
|
||||
if (length == 1 && complete != 0 && continuation == 0) {
|
||||
if (complete != 0 && length == 1) {
|
||||
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,10 @@ 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 + 2) + ((*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000);
|
||||
} 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,49 +41,40 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
return node;
|
||||
}
|
||||
|
||||
typedef struct ziDawgLongOffset {
|
||||
ziU8 flags;
|
||||
ziU8 middle;
|
||||
ziU8 low;
|
||||
} ziDawgLongOffset;
|
||||
typedef char ziDawgLongOffsetSizeCheck[(sizeof(ziDawgLongOffset) == 3) ? 1 : -1];
|
||||
|
||||
ziU8* ZiDAWGGetSibling(ziU8* cursor) {
|
||||
ziS32 depth;
|
||||
ziU8* node;
|
||||
ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
ziU16 header;
|
||||
ziU8* cursor;
|
||||
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 {
|
||||
cursor = node;
|
||||
if ((header & 8) != 0) {
|
||||
if ((cursor[0] & 0xf) == 0xf) {
|
||||
cursor += 2;
|
||||
if ((node[0] & 0xf) == 0xf) {
|
||||
cursor = node + 2;
|
||||
} else {
|
||||
cursor += 1;
|
||||
cursor = node + 1;
|
||||
}
|
||||
|
||||
if ((header & 2) != 0) {
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
} else {
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
} else {
|
||||
cursor += 3;
|
||||
}
|
||||
}
|
||||
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
node += (((const ziDawgLongOffset*)cursor)->flags & 0x7f) * 0x10000 +
|
||||
(((ziU32)(ziU16)cursor[1] << 8) +
|
||||
((const ziDawgLongOffset*)cursor)->low) + 0x8000;
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
node += (ziU32)cursor[1] + (ziU32)*cursor * 0x100;
|
||||
} else {
|
||||
node = cursor[1] + (node + (ziU16)*cursor * 0x100);
|
||||
node += (*cursor & 0x7f) * 0x10000 + (ziU32)cursor[1] * 0x100 +
|
||||
0x8000 + (ziU32)cursor[2];
|
||||
}
|
||||
return node;
|
||||
} else {
|
||||
do {
|
||||
header = nodeHeaderTable[cursor[0] >> 4];
|
||||
@@ -96,44 +87,43 @@ 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 += 2;
|
||||
offset += 2;
|
||||
} else {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
}
|
||||
}
|
||||
|
||||
if ((header & 4) == 0) {
|
||||
depth--;
|
||||
} else if ((header & 8) != 0) {
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
} else {
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
} else {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
}
|
||||
depth--;
|
||||
}
|
||||
} 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;
|
||||
|
||||
@@ -143,15 +133,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;
|
||||
}
|
||||
@@ -164,56 +154,69 @@ 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) {
|
||||
return 0;
|
||||
pair = (((ziU16)entry[0] << 8) + entry[1]);
|
||||
if (pair != 0) {
|
||||
goto graph_invalid;
|
||||
}
|
||||
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) {
|
||||
goto graph_valid;
|
||||
}
|
||||
graph_invalid:
|
||||
result = 0;
|
||||
goto graph_done;
|
||||
graph_valid:
|
||||
end = (ziU32)(entry + (((ziU16)entry[4] << 8) + entry[5] + 1) * 10);
|
||||
entry += 10;
|
||||
depth = 0;
|
||||
while ((depth < 2) && (*keys != 0)) {
|
||||
if ((*keys < 0xeff1) || (0xf010 < *keys)) {
|
||||
break;
|
||||
}
|
||||
|
||||
while (1) {
|
||||
if (*keys == (ziS32)(((ziU16)entry[2] << 8) + entry[3])) {
|
||||
if (*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8))) {
|
||||
break;
|
||||
}
|
||||
entry += (((ziU16)entry[0] << 8) + entry[1]) * 10 + 10;
|
||||
checkEntry:
|
||||
if (((ziU32)entry >= end) ||
|
||||
(*keys == (ziS32)(((ziU16)entry[2] << 8) + entry[3]))) {
|
||||
entry += (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10;
|
||||
if ((end <= (ziU32)entry) ||
|
||||
(*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8)))) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return 0;
|
||||
|
||||
if (end <= (ziU32)entry) {
|
||||
result = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
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 ((entry[1] + ((ziU16)entry[0] << 8)) == 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
end = (ziU32)(entry + (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10);
|
||||
entry += 10;
|
||||
depth++;
|
||||
keys++;
|
||||
}
|
||||
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
if ((((ziU16)entry[0] << 8) + entry[1]) == 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
end = (((ziU16)entry[0] << 8) + entry[1]) * 10 + ((ziU32)entry + 10);
|
||||
entry += 10;
|
||||
depth++;
|
||||
keys++;
|
||||
}
|
||||
|
||||
graph_done:
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
ziU32 Zi8GetTableAddress(ziU8 lang, ziU8 tableIdx, ziPtr workData);
|
||||
ziU16 Zi8GetTableCount(ziU8 lang, ziU8 tableIdx, ziPtr workData);
|
||||
|
||||
ziU8 Zi8LookupKoreanChar(ziWChar character, ziU8* result, ziU16* index, ziPtr workData) {
|
||||
ziU8 Zi8_814813FC(ziWChar character, ziU8* result, ziU16* index, ziPtr workData) {
|
||||
ziU16 i;
|
||||
ziU8* table;
|
||||
|
||||
@@ -23,7 +23,7 @@ ziU8 Zi8LookupKoreanChar(ziWChar character, ziU8* result, ziU16* index, ziPtr wo
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
|
||||
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
|
||||
|
||||
ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
ziPtr workData) {
|
||||
@@ -97,9 +97,9 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
|
||||
result = 0;
|
||||
for (currentCharacter = 0; currentCharacter < state.elementIndex; currentCharacter++) {
|
||||
if (Zi8LookupKoreanChar(buffer[currentCharacter], &state.characterIndex,
|
||||
if (Zi8_814813FC(buffer[currentCharacter], &state.characterIndex,
|
||||
&state.inputIndex, workData) != 0) {
|
||||
state.matched = Zi8MatchKoreanSequence(&state.nextIndex,
|
||||
state.matched = Zi8_81481E6C(&state.nextIndex,
|
||||
buffer + currentCharacter + 1,
|
||||
state.characterIndex,
|
||||
(state.elementIndex - currentCharacter) - 1,
|
||||
@@ -235,7 +235,7 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
return result;
|
||||
}
|
||||
|
||||
ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData) {
|
||||
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData) {
|
||||
ziU16 nestedScratch;
|
||||
ziU16 nestedIndexStorage;
|
||||
ziU16 index1;
|
||||
@@ -375,8 +375,8 @@ ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 c
|
||||
}
|
||||
if ((index3 >= tableCount) || (firstCharacter != (table + index3 * 4)[2]) ||
|
||||
(input[1] != (table + index3 * 4)[1]) || (input[0] != table[index3 * 4])) {
|
||||
if ((Zi8LookupKoreanChar(input[1], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 2, mappedCharacter, 1, workData) != 0)) {
|
||||
if ((Zi8_814813FC(input[1], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8_81481E6C(&nestedIndexStorage, input + 2, mappedCharacter, 1, workData) != 0)) {
|
||||
*resultIndex = index1;
|
||||
return 1;
|
||||
}
|
||||
@@ -397,8 +397,8 @@ ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 c
|
||||
if ((index4 >= tableCount) || (firstCharacter != (table + index4 * 4)[3]) ||
|
||||
(input[2] != (table + index4 * 4)[2]) || (input[1] != (table + index4 * 4)[1]) ||
|
||||
(input[0] != table[index4 * 4])) {
|
||||
if ((Zi8LookupKoreanChar(input[2], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 3, mappedCharacter, 1, workData) != 0)) {
|
||||
if ((Zi8_814813FC(input[2], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8_81481E6C(&nestedIndexStorage, input + 3, mappedCharacter, 1, workData) != 0)) {
|
||||
*resultIndex = index2;
|
||||
return 2;
|
||||
}
|
||||
@@ -409,8 +409,8 @@ ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 c
|
||||
*resultIndex = index4;
|
||||
return 4;
|
||||
}
|
||||
if ((Zi8LookupKoreanChar(input[3], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 4, mappedCharacter, 1, workData) != 0)) {
|
||||
if ((Zi8_814813FC(input[3], &mappedCharacter, &nestedScratch, workData) != 0) &&
|
||||
(Zi8_81481E6C(&nestedIndexStorage, input + 4, mappedCharacter, 1, workData) != 0)) {
|
||||
*resultIndex = index3;
|
||||
return 3;
|
||||
}
|
||||
|
||||
@@ -17,57 +17,54 @@ typedef struct ziUserKeys {
|
||||
typedef struct ziChineseEntry {
|
||||
ziU8 data[9];
|
||||
ziU8 offsetHigh;
|
||||
ziU8 offsetLow[2];
|
||||
ziU16 offsetLow;
|
||||
} 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);
|
||||
|
||||
typedef struct ziEncodedOrdinal {
|
||||
ziU8 low;
|
||||
ziU8 high;
|
||||
} ziEncodedOrdinal;
|
||||
typedef char ziEncodedOrdinalSizeCheck[(sizeof(ziEncodedOrdinal) == 2) ? 1 : -1];
|
||||
|
||||
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziChineseEntry* table = 0;
|
||||
ziU8* baseData = 0;
|
||||
ziU8 group = 0;
|
||||
ziU8 remaining = 0;
|
||||
ziU8 remaining, group;
|
||||
ziU16 value = 0;
|
||||
ziWChar* cursor;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziSearchState search;
|
||||
ziGetParam request;
|
||||
ziWChar ordinals[65];
|
||||
int count;
|
||||
int countLeft;
|
||||
ziChineseEntry* entry;
|
||||
ziWChar* cursor;
|
||||
ziU8* data;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
ziSearchState search = {0};
|
||||
int length, count, offset;
|
||||
int unmatched;
|
||||
ziChineseEntry* entry;
|
||||
ziU8* data;
|
||||
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] > 0xEFF0 || 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;
|
||||
@@ -84,70 +81,50 @@ 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 (count-- == 1) return 1;
|
||||
if (language == 1) {
|
||||
length = 0;
|
||||
do {
|
||||
if (word[length] == 0) {
|
||||
count = length - 1;
|
||||
if (length == 1) return 1;
|
||||
ordinals[count] |= 0x8000;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||
table = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data);
|
||||
entry = table + ordinals[0];
|
||||
baseData = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data);
|
||||
baseData += ((entry->offsetHigh & 15) << 16 | (entry->offsetLow[1] | (entry->offsetLow[0] << 8)));
|
||||
data = baseData;
|
||||
if (ZI_WORK->cangjieEnabled != 0) {
|
||||
switch (*data & 7) {
|
||||
case 2:
|
||||
countLeft = 2;
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
countLeft = 3;
|
||||
break;
|
||||
case 5:
|
||||
countLeft = 4;
|
||||
break;
|
||||
default:
|
||||
countLeft = 1;
|
||||
break;
|
||||
}
|
||||
data += countLeft;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | entry->offsetLow);
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
group = *data & 7;
|
||||
if (group == 5) offset = 4;
|
||||
else if (group < 5) {
|
||||
if (group == 2) offset = 2;
|
||||
else if (group < 2) offset = 1;
|
||||
else offset = 3;
|
||||
} else offset = 1;
|
||||
data += offset;
|
||||
}
|
||||
if ((*data & 0x80) != 0) {
|
||||
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 = ((ziU32)(ziU16)data[1] << 8) |
|
||||
((const ziEncodedOrdinal*)data)->low;
|
||||
while (unmatched > 0) {
|
||||
value = data[0] | (data[1] << 8);
|
||||
data += 2;
|
||||
if (value != *++cursor) break;
|
||||
countLeft--;
|
||||
cursor++;
|
||||
if (value != *cursor) break;
|
||||
unmatched--;
|
||||
if (value & 0x8000) break;
|
||||
}
|
||||
if (countLeft == 0) return 1;
|
||||
if (unmatched == 0) return 1;
|
||||
if (!(value & 0x8000)) {
|
||||
data++;
|
||||
while (!(*data & 0x80)) data += 2;
|
||||
@@ -157,8 +134,12 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
Zi8LogError(0x2BD, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
|
||||
if (ordinals[length] == 0xFFFF) return 0;
|
||||
length++;
|
||||
} while (length != 64);
|
||||
} else Zi8ReplaceLastError(0x26C, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
@@ -175,9 +156,10 @@ ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
}
|
||||
found:
|
||||
if (key >= 32) return 0;
|
||||
if (key == 0) return 0xEFFA;
|
||||
if (key >= 1 && key <= 9) return key + 0xEFF0;
|
||||
if (key <= 31) return key + 0xEFF1;
|
||||
if (key < 32) {
|
||||
if (key == 0) return 0xEFFA;
|
||||
if (key >= 1 && key <= 9) return key + 0xEFF0;
|
||||
if (key <= 31) return key + 0xEFF1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ ziU16 Zi8GetTableCount(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
|
||||
ziU32 Zi8GetTableAddress(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
|
||||
ziU8 Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data);
|
||||
|
||||
ziBool Zi8MapKeyCode(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
|
||||
ziBool Zi8_81484484(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
|
||||
if (character == 0xeffa) {
|
||||
*output = 0;
|
||||
} else if ((character >= 0xeff1) && (character <= 0xeff9)) {
|
||||
@@ -44,12 +44,13 @@ static ziU8 ziNumKeysWithChars(ziU8 language, ziPtr __zi8_work_data) {
|
||||
}
|
||||
|
||||
ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data) {
|
||||
ziU16 tableCount;
|
||||
ziU8 numKeys;
|
||||
ziU16 tableCount;
|
||||
ziU8* dataAddress;
|
||||
ziUserKeyMap* customTable;
|
||||
ziU32 totalCharacters;
|
||||
ziU16 charCount;
|
||||
ziU16 keyIndex;
|
||||
ziU32 keyIndex;
|
||||
ziWChar* keyChars;
|
||||
|
||||
dataAddress = 0;
|
||||
@@ -58,7 +59,7 @@ ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, zi
|
||||
*chars = 0;
|
||||
if (ZI_WORK->userKeys[language] != 0) {
|
||||
customTable = ZI_WORK->userKeys[language];
|
||||
if (!Zi8MapKeyCode(key, &key, __zi8_work_data)) {
|
||||
if (!Zi8_81484484(key, &key, __zi8_work_data)) {
|
||||
return 0;
|
||||
}
|
||||
keyChars = customTable->lower[key];
|
||||
@@ -87,20 +88,20 @@ tables_ready:
|
||||
Zi8ReplaceLastError(0x962, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
if (!Zi8MapKeyCode(key, &key, __zi8_work_data) || (key >= numKeys)) {
|
||||
if (!Zi8_81484484(key, &key, __zi8_work_data) || (key >= numKeys)) {
|
||||
Zi8ReplaceLastError(300, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
|
||||
tableCount = 0;
|
||||
keyIndex = tableCount;
|
||||
totalCharacters = 0;
|
||||
keyIndex = totalCharacters;
|
||||
for (; (ziU16)keyIndex < key; keyIndex++) {
|
||||
tableCount += dataAddress[(ziU16)keyIndex];
|
||||
totalCharacters += dataAddress[(ziU16)keyIndex];
|
||||
}
|
||||
if ((charCount = (ziU8)dataAddress[key]) == 0) {
|
||||
return 0;
|
||||
}
|
||||
dataAddress = dataAddress + numKeys + (tableCount * 2);
|
||||
dataAddress = dataAddress + numKeys + ((totalCharacters & 0xffff) * 2);
|
||||
keyIndex = 0;
|
||||
for (; (ziU16)keyIndex < charCount; keyIndex++) {
|
||||
chars[(ziU16)keyIndex] = (ziU16)dataAddress[(ziU16)keyIndex * 2] |
|
||||
|
||||
@@ -23,59 +23,48 @@ ziU8 Zi8DetachOEMdata(ziU8 id ZI_NEED_WORK) {
|
||||
}
|
||||
ziU8 Zi8MatchOEMdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* word, ziU16 capacity, ziBool complete, ziBool continuation ZI_NEED_WORK) {
|
||||
ziWChar folded;
|
||||
ziS32 index;
|
||||
ziU8 fallback = 0;
|
||||
ziU32 index;
|
||||
ziU32 position;
|
||||
ziU32 fallback = 0;
|
||||
if (!continuation) ZI_WORK->oemIdx = 0;
|
||||
index = ZI_WORK->oemIdx;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
|
||||
if (ZI_WORK->oemMatch == 0) goto failed;
|
||||
if ((ziS32)length >= (ziS32)--capacity) {
|
||||
failed:
|
||||
return 0;
|
||||
}
|
||||
if ((ziS32)index >= ZI_WORK->oemLen || ZI_WORK->oemMatch == 0) goto noMatch;
|
||||
capacity--;
|
||||
if (length >= capacity) goto noMatch;
|
||||
word[capacity] = 0;
|
||||
if (complete) word[length] = 1; else word[length] = 0;
|
||||
goto matchRetry;
|
||||
posEntry:
|
||||
position = 0;
|
||||
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
|
||||
for (; (ziS32)position < length; position++) {
|
||||
if (pattern[position] >= 0xEFF1 && pattern[position] <= 0xF37F) {
|
||||
if (pattern[position] == Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) continue;
|
||||
break;
|
||||
} else if (word[position] != pattern[position]) {
|
||||
if (!ZI_WORK->unk_0x1F || language == 1) break;
|
||||
folded = pattern[position];
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
|
||||
word[length] = complete ? 1 : 0;
|
||||
for (;;) {
|
||||
if ((ziS32)index >= ZI_WORK->oemLen || !ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) {
|
||||
if (length != 1 || !complete || continuation) goto noMatch;
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
index = 0;
|
||||
continue;
|
||||
}
|
||||
position = 0;
|
||||
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
|
||||
for (; (ziS32)position < length; position++) {
|
||||
if (pattern[position] < 0xEFF1 || pattern[position] > 0xF37F) {
|
||||
if (word[position] != pattern[position]) {
|
||||
if (!ZI_WORK->unk_0x1F || language == 1) break;
|
||||
folded = pattern[position];
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
|
||||
}
|
||||
} else if (pattern[position] != Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((ziS32)position < length) {
|
||||
if (complete) word[length] = 1; else word[length] = 0;
|
||||
if ((ziS32)position >= length) {
|
||||
if (fallback) {
|
||||
*word = *pattern;
|
||||
return 1;
|
||||
}
|
||||
ZI_WORK->oemIdx = index + 1;
|
||||
while (word[position] != 0) position++;
|
||||
return position;
|
||||
}
|
||||
word[length] = complete ? 1 : 0;
|
||||
index++;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
|
||||
goto matchRetry;
|
||||
}
|
||||
if (fallback) {
|
||||
index = 0;
|
||||
*word = *pattern;
|
||||
return 1;
|
||||
}
|
||||
index++;
|
||||
ZI_WORK->oemIdx = index;
|
||||
while (word[position] != 0) position++;
|
||||
return position;
|
||||
matchRetry:
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
|
||||
if (!ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) goto oemFailed;
|
||||
goto posEntry;
|
||||
oemFailed:
|
||||
if (length != 1 || !complete || continuation) goto tail0;
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
index = 0;
|
||||
goto matchRetry;
|
||||
tail0:
|
||||
noMatch:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -457,7 +457,7 @@ void bta_dm_signal_strength(tBTA_DM_MSG *p_data);
|
||||
|
||||
void bta_dm_acl_change(tBTA_DM_MSG *p_data);
|
||||
|
||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr);
|
||||
BOOLEAN bta_sys_check_compress(int, UINT8 app_id, BD_ADDR peer_addr);
|
||||
|
||||
void bta_dm_keep_acl(tBTA_DM_MSG *p_data);
|
||||
void bta_dm_immediate_disable(void);
|
||||
|
||||
@@ -151,7 +151,7 @@ UINT8 L2CA_SetTraceLevel(UINT8 new_level);
|
||||
UINT8 L2CA_SetDesireRole(UINT8 new_role);
|
||||
BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority);
|
||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
||||
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||
UINT8 enable);
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *, signed);
|
||||
UINT8 L2CA_Flush(UINT16 cid);
|
||||
|
||||
@@ -42,7 +42,7 @@ typedef struct UHF_MSC_MESSAGE {
|
||||
} UHF_MSC_MESSAGE;
|
||||
|
||||
extern UHF_MSC_DEVICE uhg_msc_blk_device_tbl[8];
|
||||
extern s32 uhg_msc_memid;
|
||||
extern s32 uhg_msc_memid_8169971C;
|
||||
s32 uhf_ker_set_priority(s32 task_id, s32 priority);
|
||||
void* uhf_ker_get_memory_block(s32 pool, u32 size, u32 alignment);
|
||||
s32 uhf_ker_release_memory_block(s32 pool, void* block);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <revolution/types.h>
|
||||
|
||||
s32 uhf_ker_create_sem(u32 initCount, int flags);
|
||||
s32 uhf_ker_create_sem(u32 param_1, int param_2);
|
||||
s32 uhf_ker_delete_sem(int sem);
|
||||
|
||||
s32 uhf_ker_get_sem(int sem);
|
||||
|
||||
@@ -16,24 +16,24 @@ typedef s32 CXStreamingResult;
|
||||
#define CX_STREAMING_ERR_BAD_FILE_TABLE -5
|
||||
|
||||
typedef struct CXUncompContextRL {
|
||||
u8* outData; // 0x00
|
||||
int outDataLen; // 0x04
|
||||
u8* unk_0x00; // 0x00
|
||||
int unk_0x04; // 0x04
|
||||
u32 size; // 0x08
|
||||
u16 length; // 0x0C
|
||||
u8 flags; // 0x0E
|
||||
u8 hdrLen; // 0x0F
|
||||
u16 unk_0x0C; // 0x0C
|
||||
u8 unk_0x0e; // 0x0E
|
||||
u8 unk_0x0f; // 0x0F
|
||||
} CXUncompContextRL;
|
||||
|
||||
typedef struct CXUncompContextLZ {
|
||||
u8* outData; // 0x00
|
||||
int outDataLen; // 0x04
|
||||
u8* unk_0x00; // 0x00
|
||||
int unk_0x04; // 0x04
|
||||
u32 size; // 0x08
|
||||
int length; // 0x0C
|
||||
u8 lengthBytesLeft; // 0x10
|
||||
u8 flags; // 0x11
|
||||
u8 flagsLeft; // 0x12
|
||||
u8 hdrLen; // 0x13
|
||||
u8 lzType; // 0x14
|
||||
int unk_0x0C; // 0x0C
|
||||
u8 unk_0x10; // 0x10
|
||||
u8 unk_0x11; // 0x11
|
||||
u8 unk_0x12; // 0x12
|
||||
u8 unk_0x13; // 0x13
|
||||
u8 unk_0x14; // 0x14
|
||||
u8 padding[3];
|
||||
} CXUncompContextLZ;
|
||||
|
||||
@@ -52,19 +52,19 @@ typedef struct CXUncompContextHuffman {
|
||||
u32 size; // 0x08
|
||||
CXHuffmanDecodeTableEntry* decodeTable; // 0x0C
|
||||
u32 bits; // 0x10
|
||||
u32 wordBuffer; // 0x14
|
||||
u32 unk_0x14; // 0x14
|
||||
s16 decodeTableSize; // 0x18
|
||||
u8 bitsLeft; // 0x1A
|
||||
u8 wordBits; // 0x1B
|
||||
u8 unk_0x1b; // 0x1B
|
||||
u8 depth; // 0x1C
|
||||
u8 hdrLen; // 0x1D
|
||||
u8 padding[2]; // 0x1E
|
||||
CXHuffmanDecodeTableEntry decodeTableData[0x200]; // 0x20
|
||||
} CXUncompContextHuffman;
|
||||
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data);
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
|
||||
|
||||
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
|
||||
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -68,7 +68,7 @@ void KPADInit();
|
||||
s32 KPADRead(s32 chan, KPADStatus* status, u32 length);
|
||||
|
||||
void KPADSetSensorHeight(s32 chan, f32 sensorHeight);
|
||||
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* rect, f32 scale);
|
||||
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* param_3, f32 param_4);
|
||||
|
||||
void KPADSetPosParam(s32 chan, f32 x, f32 y);
|
||||
void KPADSetBtnRepeat(s32 chan, f32, f32);
|
||||
|
||||
@@ -40,7 +40,7 @@ ISD_Error ISD_ProbeCard(u32 slot);
|
||||
ISD_Error ISD_MountCard(u32 slot, SDDev** dev);
|
||||
ISD_Error ISD_UnmountCard(SDDev* dev);
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) NO_INLINE;
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) NO_INLINE;
|
||||
|
||||
ISD_Error ISD_ReadBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
ISD_Error ISD_WriteBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
|
||||
@@ -20,8 +20,8 @@ typedef void (*USBKBDEventCallback)(void*, char*);
|
||||
typedef void (*USBKBDCmdLEDCallback)(BOOL success, void* cbarg);
|
||||
|
||||
typedef struct USBKBDCmdLED {
|
||||
vu32 device; // 0x00
|
||||
vu8 ledBits; // 0x04
|
||||
vu32 unk_0x00;
|
||||
vu8 unk_0x04;
|
||||
} USBKBDCmdLED;
|
||||
|
||||
typedef struct USBKBDCmdLEDAsync {
|
||||
@@ -33,8 +33,8 @@ typedef struct USBKBDCmdLEDAsync {
|
||||
|
||||
USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback detachCb);
|
||||
|
||||
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd);
|
||||
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
||||
USBKBDErr USBKBDSetLED(u32, u8, USBKBDCmdLED* cmd);
|
||||
USBKBDErr USBKBDSetLEDAsync(u32, u8, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
||||
|
||||
USBKBDErr USBKBDRegisterEventCallback(USBKBDEventCallback cb);
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user