mirror of
https://github.com/wiiu-env/RPXLoadingModule.git
synced 2024-05-29 00:18:51 +02:00
Compare commits
92 Commits
RPXLoading
...
main
Author | SHA1 | Date | |
---|---|---|---|
|
5239704327 | ||
|
176b1c06c4 | ||
|
2fb721d6d5 | ||
|
a0913ed652 | ||
|
b6d28a891f | ||
|
9eed09d8bf | ||
|
bafc8b69bf | ||
|
a31646fbfe | ||
|
77c7db4ed9 | ||
|
626704d06f | ||
|
a3eb1a27a6 | ||
|
49c938e7c9 | ||
|
92df19d02e | ||
|
6850128812 | ||
|
4e8c32aaf4 | ||
|
a387ba9f1e | ||
|
63caa85ec8 | ||
|
bc3b6315c3 | ||
|
32e9a29a54 | ||
|
3acecfcae2 | ||
|
746934442c | ||
|
b396aa892a | ||
|
275eb604c6 | ||
|
8f2cbfb72e | ||
|
d50e438024 | ||
|
40688d9275 | ||
|
fe9c74708d | ||
|
3eb40b1eef | ||
|
afeb29f81b | ||
|
7ffde9961b | ||
|
ba1ea768e4 | ||
|
7ee7d4f404 | ||
|
1422cec156 | ||
|
bade403102 | ||
|
a26aa080b2 | ||
|
8e3c2ae982 | ||
|
905f712cd8 | ||
|
85fb2c141e | ||
|
9b04ae206b | ||
|
59fafb0cd9 | ||
|
74ade220f1 | ||
|
cd6630b0ca | ||
|
5ebee36b7f | ||
|
3ceb7c8dfc | ||
|
a0724c276b | ||
|
ca7d54bd22 | ||
|
c4050b3090 | ||
|
58fbfc270b | ||
|
0eab0261b1 | ||
|
5ab425132d | ||
|
e5a74b6649 | ||
|
7a37b2da2d | ||
|
554339a6ce | ||
|
bfa3301218 | ||
|
59a78fc3cf | ||
|
425fd82646 | ||
|
ebe901ebdc | ||
|
533c25d6bf | ||
|
4e8f62248b | ||
|
9c8e69003d | ||
|
3d0c1151d7 | ||
|
3baca0a5c2 | ||
|
a0def8f4b4 | ||
|
c6a700bf51 | ||
|
5e53161cb1 | ||
|
83c1cef208 | ||
|
142aa827d2 | ||
|
91f77ed210 | ||
|
671f207ebe | ||
|
16d5d734c7 | ||
|
7ad9df8a8c | ||
|
cceda5e231 | ||
|
032459d809 | ||
|
1365eff9fc | ||
|
136da033f4 | ||
|
b5aa508339 | ||
|
8b7c2bb145 | ||
|
9665b48d9a | ||
|
0ac1752560 | ||
|
7fe0fce93d | ||
|
70c996811f | ||
|
112c14498a | ||
|
91b7686e2e | ||
|
b00a566726 | ||
|
bff0f823f0 | ||
|
a18a28091b | ||
|
cf61f8ce0f | ||
|
85838b1a42 | ||
|
0797cb9b9a | ||
|
05120c8934 | ||
|
661a79e116 | ||
|
0806de46b0 |
67
.clang-format
Normal file
67
.clang-format
Normal file
|
@ -0,0 +1,67 @@
|
|||
# Generated from CLion C/C++ Code Style settings
|
||||
BasedOnStyle: LLVM
|
||||
AccessModifierOffset: -4
|
||||
AlignAfterOpenBracket: Align
|
||||
AlignConsecutiveAssignments: Consecutive
|
||||
AlignConsecutiveMacros: AcrossEmptyLinesAndComments
|
||||
AlignOperands: Align
|
||||
AllowAllArgumentsOnNextLine: false
|
||||
AllowAllConstructorInitializersOnNextLine: false
|
||||
AllowAllParametersOfDeclarationOnNextLine: false
|
||||
AllowShortBlocksOnASingleLine: Always
|
||||
AllowShortCaseLabelsOnASingleLine: false
|
||||
AllowShortFunctionsOnASingleLine: All
|
||||
AllowShortIfStatementsOnASingleLine: Always
|
||||
AllowShortLambdasOnASingleLine: All
|
||||
AllowShortLoopsOnASingleLine: true
|
||||
AlwaysBreakAfterReturnType: None
|
||||
AlwaysBreakTemplateDeclarations: Yes
|
||||
BreakBeforeBraces: Custom
|
||||
BraceWrapping:
|
||||
AfterCaseLabel: false
|
||||
AfterClass: false
|
||||
AfterControlStatement: Never
|
||||
AfterEnum: false
|
||||
AfterFunction: false
|
||||
AfterNamespace: false
|
||||
AfterUnion: false
|
||||
BeforeCatch: false
|
||||
BeforeElse: false
|
||||
IndentBraces: false
|
||||
SplitEmptyFunction: false
|
||||
SplitEmptyRecord: true
|
||||
BreakBeforeBinaryOperators: None
|
||||
BreakBeforeTernaryOperators: true
|
||||
BreakConstructorInitializers: BeforeColon
|
||||
BreakInheritanceList: BeforeColon
|
||||
ColumnLimit: 0
|
||||
CompactNamespaces: false
|
||||
ContinuationIndentWidth: 8
|
||||
IndentCaseLabels: true
|
||||
IndentPPDirectives: None
|
||||
IndentWidth: 4
|
||||
KeepEmptyLinesAtTheStartOfBlocks: true
|
||||
MaxEmptyLinesToKeep: 2
|
||||
NamespaceIndentation: All
|
||||
ObjCSpaceAfterProperty: false
|
||||
ObjCSpaceBeforeProtocolList: true
|
||||
PointerAlignment: Right
|
||||
ReflowComments: false
|
||||
SpaceAfterCStyleCast: true
|
||||
SpaceAfterLogicalNot: false
|
||||
SpaceAfterTemplateKeyword: false
|
||||
SpaceBeforeAssignmentOperators: true
|
||||
SpaceBeforeCpp11BracedList: false
|
||||
SpaceBeforeCtorInitializerColon: true
|
||||
SpaceBeforeInheritanceColon: true
|
||||
SpaceBeforeParens: ControlStatements
|
||||
SpaceBeforeRangeBasedForLoopColon: true
|
||||
SpaceInEmptyParentheses: false
|
||||
SpacesBeforeTrailingComments: 1
|
||||
SpacesInAngles: false
|
||||
SpacesInCStyleCastParentheses: false
|
||||
SpacesInContainerLiterals: false
|
||||
SpacesInParentheses: false
|
||||
SpacesInSquareBrackets: false
|
||||
TabWidth: 4
|
||||
UseTab: Never
|
10
.github/dependabot.yml
vendored
Normal file
10
.github/dependabot.yml
vendored
Normal file
|
@ -0,0 +1,10 @@
|
|||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "docker"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "daily"
|
||||
- package-ecosystem: "github-actions"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "daily"
|
49
.github/workflows/ci.yml
vendored
49
.github/workflows/ci.yml
vendored
|
@ -6,10 +6,25 @@ on:
|
|||
- main
|
||||
|
||||
jobs:
|
||||
build-binary:
|
||||
runs-on: ubuntu-18.04
|
||||
clang-format:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
- name: clang-format
|
||||
run: |
|
||||
docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src
|
||||
build-binary:
|
||||
runs-on: ubuntu-22.04
|
||||
needs: clang-format
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: create version.h
|
||||
run: |
|
||||
git_hash=$(git rev-parse --short "$GITHUB_SHA")
|
||||
cat <<EOF > ./src/version.h
|
||||
#pragma once
|
||||
#define VERSION_EXTRA " (nightly-$git_hash)"
|
||||
EOF
|
||||
- name: build binary
|
||||
run: |
|
||||
docker build . -t builder
|
||||
|
@ -20,7 +35,7 @@ jobs:
|
|||
path: "*.wms"
|
||||
deploy-binary:
|
||||
needs: build-binary
|
||||
runs-on: ubuntu-18.04
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Get environment variables
|
||||
id: get_repository_name
|
||||
|
@ -30,29 +45,15 @@ jobs:
|
|||
- uses: actions/download-artifact@master
|
||||
with:
|
||||
name: binary
|
||||
path: wiiu/modules
|
||||
- name: zip artifact
|
||||
run: zip -r ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip wiiu
|
||||
run: zip -r ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip *.wms
|
||||
- name: Create Release
|
||||
id: create_release
|
||||
uses: actions/create-release@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
uses: "softprops/action-gh-release@v2"
|
||||
with:
|
||||
tag_name: ${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
|
||||
release_name: Nightly-${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
|
||||
draft: false
|
||||
prerelease: true
|
||||
body: |
|
||||
Not a stable release:
|
||||
${{ github.event.head_commit.message }}
|
||||
- name: Upload Release Asset
|
||||
id: upload-release-asset
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
|
||||
asset_path: ./${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
|
||||
asset_name: ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
|
||||
asset_content_type: application/unknown
|
||||
generate_release_notes: true
|
||||
name: Nightly-${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
|
||||
files: |
|
||||
./${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
|
32
.github/workflows/pr.yml
vendored
32
.github/workflows/pr.yml
vendored
|
@ -3,10 +3,36 @@ name: CI-PR
|
|||
on: [pull_request]
|
||||
|
||||
jobs:
|
||||
build-binary:
|
||||
runs-on: ubuntu-18.04
|
||||
clang-format:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
- name: clang-format
|
||||
run: |
|
||||
docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src
|
||||
check-build-with-logging:
|
||||
runs-on: ubuntu-22.04
|
||||
needs: clang-format
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: build binary with logging
|
||||
run: |
|
||||
docker build . -t builder
|
||||
docker run --rm -v ${PWD}:/project builder make DEBUG=VERBOSE
|
||||
docker run --rm -v ${PWD}:/project builder make clean
|
||||
docker run --rm -v ${PWD}:/project builder make DEBUG=1
|
||||
build-binary:
|
||||
runs-on: ubuntu-22.04
|
||||
needs: clang-format
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: create version.h
|
||||
run: |
|
||||
git_hash=$(git rev-parse --short "${{ github.event.pull_request.head.sha }}")
|
||||
cat <<EOF > ./src/version.h
|
||||
#pragma once
|
||||
#define VERSION_EXTRA " (nightly-$git_hash)"
|
||||
EOF
|
||||
- name: build binary
|
||||
run: |
|
||||
docker build . -t builder
|
||||
|
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -8,3 +8,4 @@ build/
|
|||
cmake-build-debug/
|
||||
CMakeLists.txt
|
||||
*.wms
|
||||
*.zip
|
||||
|
|
15
Dockerfile
15
Dockerfile
|
@ -1,8 +1,11 @@
|
|||
FROM wiiuenv/devkitppc:20210101
|
||||
FROM ghcr.io/wiiu-env/devkitppc:20240505
|
||||
|
||||
COPY --from=wiiuenv/librpxloader:20210406 /artifacts $DEVKITPRO
|
||||
COPY --from=wiiuenv/libfunctionpatcher:20210109 /artifacts $DEVKITPRO
|
||||
COPY --from=wiiuenv/wiiumodulesystem:20210313 /artifacts $DEVKITPRO
|
||||
COPY --from=wiiuenv/libromfs_wiiu:20210110 /artifacts $DEVKITPRO
|
||||
COPY --from=ghcr.io/wiiu-env/librpxloader:20240425 /artifacts $DEVKITPRO
|
||||
COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
|
||||
COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO
|
||||
COPY --from=ghcr.io/wiiu-env/libwuhbutils:20230621 /artifacts $DEVKITPRO
|
||||
COPY --from=ghcr.io/wiiu-env/libcontentredirection:20240424 /artifacts $DEVKITPRO
|
||||
COPY --from=ghcr.io/wiiu-env/libromfs_wiiu:20240505 /artifacts $DEVKITPRO
|
||||
COPY --from=ghcr.io/wiiu-env/libmocha:20231127 /artifacts $DEVKITPRO
|
||||
|
||||
WORKDIR project
|
||||
WORKDIR project
|
||||
|
|
674
LICENSE
Normal file
674
LICENSE
Normal file
|
@ -0,0 +1,674 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
{one line to give the program's name and a brief idea of what it does.}
|
||||
Copyright (C) {year} {name of author}
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
{project} Copyright (C) {year} {fullname}
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<http://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
30
Makefile
30
Makefile
|
@ -22,6 +22,7 @@ WUT_ROOT := $(DEVKITPRO)/wut
|
|||
TARGET := RPXLoadingModule
|
||||
BUILD := build
|
||||
SOURCES := src \
|
||||
src/data \
|
||||
src/utils
|
||||
DATA := data
|
||||
INCLUDES := src
|
||||
|
@ -29,17 +30,27 @@ INCLUDES := src
|
|||
#-------------------------------------------------------------------------------
|
||||
# options for code generation
|
||||
#-------------------------------------------------------------------------------
|
||||
CFLAGS := -g -Wall -Wextra -O2 -ffunction-sections\
|
||||
CFLAGS := -Wall -Wextra -Os -ffunction-sections\
|
||||
$(MACHDEP)
|
||||
|
||||
CFLAGS += $(INCLUDE) -D__WIIU__ -D__WUT__
|
||||
|
||||
CXXFLAGS := $(CFLAGS) -std=c++17
|
||||
CXXFLAGS := $(CFLAGS) -std=c++20
|
||||
|
||||
ASFLAGS := -g $(ARCH)
|
||||
LDFLAGS = -g $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map) -T$(WUMS_ROOT)/share/libfunctionpatcher.ld $(WUMSSPECS)
|
||||
LDFLAGS = -g $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map) $(WUMSSPECS)
|
||||
|
||||
LIBS := -lwums -lwut -lfunctionpatcher -lromfs -lz
|
||||
ifeq ($(DEBUG),1)
|
||||
CXXFLAGS += -DDEBUG -g
|
||||
CFLAGS += -DDEBUG -g
|
||||
endif
|
||||
|
||||
ifeq ($(DEBUG),VERBOSE)
|
||||
CXXFLAGS += -DDEBUG -DVERBOSE_DEBUG -g
|
||||
CFLAGS += -DDEBUG -DVERBOSE_DEBUG -g
|
||||
endif
|
||||
|
||||
LIBS := -lwums -lwut -lfunctionpatcher -lcontentredirection -lwuhbutils -lmocha -lromfs
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# list of directories containing libraries, this must be the top level
|
||||
|
@ -99,13 +110,13 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
|
|||
all: $(BUILD)
|
||||
|
||||
$(BUILD):
|
||||
@[ -d $@ ] || mkdir -p $@
|
||||
@$(shell [ ! -d $(BUILD) ] && mkdir -p $(BUILD))
|
||||
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
clean:
|
||||
@echo clean ...
|
||||
@rm -fr $(BUILD) $(TARGET).rpx $(TARGET).elf
|
||||
@rm -fr $(BUILD) $(TARGET).wms $(TARGET).elf
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
else
|
||||
|
@ -123,11 +134,14 @@ $(OUTPUT).elf : $(OFILES)
|
|||
|
||||
$(OFILES_SRC) : $(HFILES_BIN)
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# you need a rule like this for each extension you use as binary data
|
||||
#-------------------------------------------------------------------------------
|
||||
%.bin.o %_bin.h : %.bin
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%_bin.h %.bin.o : %.bin
|
||||
#---------------------------------------------------------------------------------
|
||||
@echo $(notdir $<)
|
||||
@$(bin2o)
|
||||
|
||||
|
|
26
README.md
26
README.md
|
@ -1,3 +1,25 @@
|
|||
[![CI-Release](https://github.com/wiiu-env/RPXLoadingModule/actions/workflows/ci.yml/badge.svg)](https://github.com/wiiu-env/RPXLoadingModule/actions/workflows/ci.yml)
|
||||
|
||||
## Usage
|
||||
(`[ENVIRONMENT]` is a placeholder for the actual environment name.)
|
||||
|
||||
1. Copy the file `RPXLoadingModule.wms` into `sd:/wiiu/environments/[ENVIRONMENT]/modules`.
|
||||
2. Requires the [WUMSLoader](https://github.com/wiiu-env/WUMSLoader) in `sd:/wiiu/environments/[ENVIRONMENT]/modules/setup`.
|
||||
3. Requires the [ContentRedirectionModule](https://github.com/wiiu-env/ContentRedirectionModule) in `sd:/wiiu/environments/[ENVIRONMENT]/modules`.
|
||||
4. Requires the [WUHBUtilsModule](https://github.com/wiiu-env/WUHBUtilsModule) in `sd:/wiiu/environments/[ENVIRONMENT]/modules`.
|
||||
5. Use [librpxloading](https://github.com/wiiu-env/librpxloader)
|
||||
|
||||
## Buildflags
|
||||
|
||||
### Logging
|
||||
Building via `make` only logs errors (via OSReport). To enable logging via the [LoggingModule](https://github.com/wiiu-env/LoggingModule) set `DEBUG` to `1` or `VERBOSE`.
|
||||
|
||||
`make` Logs errors only (via OSReport).
|
||||
`make DEBUG=1` Enables information and error logging via [LoggingModule](https://github.com/wiiu-env/LoggingModule).
|
||||
`make DEBUG=VERBOSE` Enables verbose information and error logging via [LoggingModule](https://github.com/wiiu-env/LoggingModule).
|
||||
|
||||
If the [LoggingModule](https://github.com/wiiu-env/LoggingModule) is not present, it'll fallback to UDP (Port 4405) and [CafeOS](https://github.com/wiiu-env/USBSerialLoggingModule) logging.
|
||||
|
||||
## Building using the Dockerfile
|
||||
|
||||
It's possible to use a docker image for building. This way you don't need anything installed on your host system.
|
||||
|
@ -12,3 +34,7 @@ docker run -it --rm -v ${PWD}:/project rpxloadingmodule-builder make
|
|||
# make clean
|
||||
docker run -it --rm -v ${PWD}:/project rpxloadingmodule-builder make clean
|
||||
```
|
||||
|
||||
## Format the code via docker
|
||||
|
||||
`docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src -i`
|
||||
|
|
|
@ -1,169 +0,0 @@
|
|||
#include "FSDirReplacements.h"
|
||||
#include <coreinit/filesystem.h>
|
||||
#include <coreinit/cache.h>
|
||||
#include "utils/logger.h"
|
||||
#include "globals.h"
|
||||
#include "FSWrapper.h"
|
||||
#include "FileUtils.h"
|
||||
|
||||
#define SYNC_RESULT_HANDLER [](FSStatus res) -> FSStatus { \
|
||||
return res; \
|
||||
}
|
||||
|
||||
#define ASYNC_RESULT_HANDLER [client, block, asyncData](FSStatus res) -> FSStatus { \
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("Result was %d", res); \
|
||||
return send_result_async(client, block, asyncData, res);\
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSOpenDir, FSClient *client, FSCmdBlock *block, char *path, FSDirectoryHandle *handle, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s", path);
|
||||
FSStatus result = FSOpenDirWrapper(path, handle, errorMask,
|
||||
[client, block, handle, errorMask]
|
||||
(char *_path) -> FSStatus {
|
||||
return real_FSOpenDir(client, block, _path, handle, errorMask);
|
||||
},
|
||||
SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("Result was %d", result);
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSOpenDir(client, block, path, handle, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSOpenDirAsync, FSClient *client, FSCmdBlock *block, char *path, FSDirectoryHandle *handle, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s", path);
|
||||
FSStatus result = FSOpenDirWrapper(path, handle, errorMask,
|
||||
[client, block, handle, errorMask, asyncData]
|
||||
(char *_path) -> FSStatus {
|
||||
return real_FSOpenDirAsync(client, block, _path, handle, errorMask, asyncData);
|
||||
},
|
||||
ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSOpenDirAsync(client, block, path, handle, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSReadDir, FSClient *client, FSCmdBlock *block, FSDirectoryHandle handle, FSDirectoryEntry *entry, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE();
|
||||
FSStatus result = FSReadDirWrapper(handle, entry, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSReadDir(client, block, handle, entry, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSReadDirAsync, FSClient *client, FSCmdBlock *block, FSDirectoryHandle handle, FSDirectoryEntry *entry, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE();
|
||||
FSStatus result = FSReadDirWrapper(handle, entry, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSReadDirAsync(client, block, handle, entry, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSCloseDir, FSClient *client, FSCmdBlock *block, FSDirectoryHandle handle, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE();
|
||||
FSStatus result = FSCloseDirWrapper(handle, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSCloseDir(client, block, handle, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSCloseDirAsync, FSClient *client, FSCmdBlock *block, FSDirectoryHandle handle, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE();
|
||||
FSStatus result = FSCloseDirWrapper(handle, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSCloseDirAsync(client, block, handle, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSRewindDir, FSClient *client, FSCmdBlock *block, FSDirectoryHandle handle, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE();
|
||||
FSStatus result = FSRewindDirWrapper(handle, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSRewindDir(client, block, handle, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSRewindDirAsync, FSClient *client, FSCmdBlock *block, FSDirectoryHandle handle, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE();
|
||||
FSStatus result = FSRewindDirWrapper(handle, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSRewindDirAsync(client, block, handle, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSMakeDir, FSClient *client, FSCmdBlock *block, char *path, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s", path);
|
||||
FSStatus result = FSMakeDirWrapper(path, errorMask,
|
||||
[client, block, errorMask]
|
||||
(char *_path) -> FSStatus {
|
||||
return real_FSMakeDir(client, block, _path, errorMask);
|
||||
},
|
||||
SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSMakeDir(client, block, path, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSMakeDirAsync, FSClient *client, FSCmdBlock *block, char *path, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s", path);
|
||||
FSStatus result = FSMakeDirWrapper(path, errorMask,
|
||||
[client, block, errorMask, asyncData]
|
||||
(char *_path) -> FSStatus {
|
||||
return real_FSMakeDirAsync(client, block, _path, errorMask, asyncData);
|
||||
},
|
||||
ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
return real_FSMakeDirAsync(client, block, path, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSChangeDirAsync, FSClient *client, FSCmdBlock *block, const char *path, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("FSChangeDirAsync %s", path);
|
||||
snprintf(gReplacementInfo.contentReplacementInfo.workingDir, sizeof(gReplacementInfo.contentReplacementInfo.workingDir), "%s", path);
|
||||
int len = strlen(gReplacementInfo.contentReplacementInfo.workingDir);
|
||||
if (len > 0 && gReplacementInfo.contentReplacementInfo.workingDir[len - 1] != '/') {
|
||||
gReplacementInfo.contentReplacementInfo.workingDir[len - 1] = '/';
|
||||
gReplacementInfo.contentReplacementInfo.workingDir[len] = 0;
|
||||
}
|
||||
DCFlushRange(gReplacementInfo.contentReplacementInfo.workingDir, sizeof(gReplacementInfo.contentReplacementInfo.workingDir));
|
||||
return real_FSChangeDirAsync(client, block, path, errorMask, asyncData);
|
||||
}
|
||||
|
||||
function_replacement_data_t fs_dir_function_replacements[] = {
|
||||
REPLACE_FUNCTION(FSOpenDir, LIBRARY_COREINIT, FSOpenDir),
|
||||
REPLACE_FUNCTION(FSOpenDirAsync, LIBRARY_COREINIT, FSOpenDirAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSReadDir, LIBRARY_COREINIT, FSReadDir),
|
||||
REPLACE_FUNCTION(FSReadDirAsync, LIBRARY_COREINIT, FSReadDirAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSCloseDir, LIBRARY_COREINIT, FSCloseDir),
|
||||
REPLACE_FUNCTION(FSCloseDirAsync, LIBRARY_COREINIT, FSCloseDirAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSRewindDir, LIBRARY_COREINIT, FSRewindDir),
|
||||
REPLACE_FUNCTION(FSRewindDirAsync, LIBRARY_COREINIT, FSRewindDirAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSMakeDir, LIBRARY_COREINIT, FSMakeDir),
|
||||
REPLACE_FUNCTION(FSMakeDirAsync, LIBRARY_COREINIT, FSMakeDirAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSChangeDirAsync, LIBRARY_COREINIT, FSChangeDirAsync),
|
||||
};
|
||||
|
||||
uint32_t fs_dir_function_replacements_size = sizeof(fs_dir_function_replacements) / sizeof(function_replacement_data_t);
|
|
@ -1,16 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include <function_patcher/function_patching.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern function_replacement_data_t fs_dir_function_replacements[];
|
||||
extern uint32_t fs_dir_function_replacements_size;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,396 +0,0 @@
|
|||
#include "FSFileReplacements.h"
|
||||
#include "globals.h"
|
||||
|
||||
#include <coreinit/dynload.h>
|
||||
#include <coreinit/cache.h>
|
||||
#include <wums.h>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
|
||||
#include <coreinit/filesystem.h>
|
||||
#include "utils/logger.h"
|
||||
#include "FileUtils.h"
|
||||
#include "utils/utils.h"
|
||||
#include "utils/StringTools.h"
|
||||
#include "FSWrapper.h"
|
||||
|
||||
#define SYNC_RESULT_HANDLER [](FSStatus res) -> FSStatus { \
|
||||
return res; \
|
||||
}
|
||||
|
||||
#define ASYNC_RESULT_HANDLER [client, block, asyncData](FSStatus res) -> FSStatus { \
|
||||
return send_result_async(client, block, asyncData, res);\
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSOpenFile, FSClient *client, FSCmdBlock *block, char *path, const char *mode, FSFileHandle *handle, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s", path);
|
||||
FSStatus result = FSOpenFileWrapper(path, mode, handle, errorMask,
|
||||
[client, block, mode, handle, errorMask]
|
||||
(char *_path) -> FSStatus {
|
||||
return real_FSOpenFile(client, block, _path, mode, handle, errorMask);
|
||||
},
|
||||
SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
FSStatus res = real_FSOpenFile(client, block, path, mode, handle, errorMask);
|
||||
return res;
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSOpenFileAsync, FSClient *client, FSCmdBlock *block, char *path, const char *mode, FSFileHandle *handle, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s", path);
|
||||
FSStatus result = FSOpenFileWrapper(path, mode, handle, errorMask,
|
||||
[client, block, mode, handle, errorMask, asyncData]
|
||||
(char *_path) -> FSStatus {
|
||||
return real_FSOpenFileAsync(client, block, _path, mode, handle, errorMask, asyncData);
|
||||
},
|
||||
ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSOpenFileAsync(client, block, path, mode, handle, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSCloseFile, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSCloseFileWrapper(handle, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
FSStatus res = real_FSCloseFile(client, block, handle, errorMask);
|
||||
return res;
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSCloseFileAsync, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSCloseFileWrapper(handle, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSCloseFileAsync(client, block, handle, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSGetStat, FSClient *client, FSCmdBlock *block, char *path, FSStat *stats, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s", path);
|
||||
FSStatus result = FSGetStatWrapper(path, stats, errorMask,
|
||||
[client, block, stats, errorMask](char *_path) -> FSStatus {
|
||||
return real_FSGetStat(client, block, _path, stats, errorMask);
|
||||
},
|
||||
SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
return real_FSGetStat(client, block, path, stats, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSGetStatAsync, FSClient *client, FSCmdBlock *block, char *path, FSStat *stats, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s", path);
|
||||
FSStatus result = FSGetStatWrapper(path, stats, errorMask,
|
||||
[client, block, stats, errorMask, asyncData](char *_path) -> FSStatus {
|
||||
return real_FSGetStatAsync(client, block, _path, stats, errorMask, asyncData);
|
||||
},
|
||||
ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
return real_FSGetStatAsync(client, block, path, stats, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSGetStatFile, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSStat *stats, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSGetStatFileWrapper(handle, stats, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSGetStatFile(client, block, handle, stats, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSGetStatFileAsync, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSStat *stats, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSGetStatFileWrapper(handle, stats, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSGetStatFileAsync(client, block, handle, stats, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(int32_t, FSReadFile, FSClient *client, FSCmdBlock *block, void *buffer, uint32_t size, uint32_t count, FSFileHandle handle, uint32_t unk1, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSReadFileWrapper(buffer, size, count, handle, unk1, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSReadFile(client, block, buffer, size, count, handle, unk1, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(int32_t, FSReadFileAsync, FSClient *client, FSCmdBlock *block, void *buffer, uint32_t size, uint32_t count, FSFileHandle handle, uint32_t unk1, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSReadFileWrapper(buffer, size, count, handle, unk1, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return send_result_async(client, block, asyncData, result);
|
||||
}
|
||||
|
||||
return real_FSReadFileAsync(client, block, buffer, size, count, handle, unk1, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSReadFileWithPos, FSClient *client, FSCmdBlock *block, void *buffer, uint32_t size, uint32_t count, uint32_t pos, FSFileHandle handle, uint32_t unk1, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSReadFileWithPosWrapper(buffer, size, count, pos, handle, unk1, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%d", size * count);
|
||||
|
||||
FSStatus res = real_FSReadFileWithPos(client, block, buffer, size, count, pos, handle, unk1, errorMask);
|
||||
return res;
|
||||
}
|
||||
|
||||
DECL_FUNCTION(int32_t, FSReadFileWithPosAsync, FSClient *client, FSCmdBlock *block, void *buffer, uint32_t size, uint32_t count, uint32_t pos, FSFileHandle handle, int32_t unk1, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSReadFileWithPosWrapper(buffer, size, count, pos, handle, unk1, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSReadFileWithPosAsync(client, block, buffer, size, count, pos, handle, unk1, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSSetPosFile, FSClient *client, FSCmdBlock *block, FSFileHandle handle, uint32_t pos, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSSetPosFileWrapper(handle, pos, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
return real_FSSetPosFile(client, block, handle, pos, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSSetPosFileAsync, FSClient *client, FSCmdBlock *block, FSFileHandle handle, uint32_t pos, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSSetPosFileWrapper(handle, pos, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSSetPosFileAsync(client, block, handle, pos, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSGetPosFile, FSClient *client, FSCmdBlock *block, FSFileHandle handle, uint32_t *pos, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSGetPosFileWrapper(handle, pos, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
return real_FSGetPosFile(client, block, handle, pos, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSGetPosFileAsync, FSClient *client, FSCmdBlock *block, FSFileHandle handle, uint32_t *pos, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSGetPosFileWrapper(handle, pos, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSGetPosFileAsync(client, block, handle, pos, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSIsEof, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSIsEofWrapper(handle, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
return real_FSIsEof(client, block, handle, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSIsEofAsync, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSIsEofWrapper(handle, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
return real_FSIsEofAsync(client, block, handle, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSWriteFile, FSClient *client, FSCmdBlock *block, uint8_t *buffer, uint32_t size, uint32_t count, FSFileHandle handle, uint32_t unk1, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSWriteFileWrapper(buffer, size, count, handle, unk1, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSWriteFile(client, block, buffer, size, count, handle, unk1, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSWriteFileAsync, FSClient *client, FSCmdBlock *block, uint8_t *buffer, uint32_t size, uint32_t count, FSFileHandle handle, uint32_t unk1, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSWriteFileWrapper(buffer, size, count, handle, unk1, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSWriteFileAsync(client, block, buffer, size, count, handle, unk1, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSTruncateFile, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSTruncateFileWrapper(handle, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSTruncateFile(client, block, handle, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSTruncateFileAsync, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSTruncateFileWrapper(handle, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSTruncateFileAsync(client, block, handle, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSRemove, FSClient *client, FSCmdBlock *block, char *path, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s", path);
|
||||
FSStatus result = FSRemoveWrapper(path, errorMask,
|
||||
[client, block, errorMask](char *_path) -> FSStatus {
|
||||
return real_FSRemove(client, block, _path, errorMask);
|
||||
},
|
||||
SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSRemove(client, block, path, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSRemoveAsync, FSClient *client, FSCmdBlock *block, char *path, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s", path);
|
||||
FSStatus result = FSRemoveWrapper(path, errorMask,
|
||||
[client, block, errorMask, asyncData](char *_path) -> FSStatus {
|
||||
return real_FSRemoveAsync(client, block, _path, errorMask, asyncData);
|
||||
},
|
||||
ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSRemoveAsync(client, block, path, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSRename, FSClient *client, FSCmdBlock *block, char *oldPath, char *newPath, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s %s", oldPath, newPath);
|
||||
FSStatus result = FSRenameWrapper(oldPath, newPath, errorMask,
|
||||
[client, block, errorMask](char *_oldOath, char *_newPath) -> FSStatus {
|
||||
return real_FSRename(client, block, _oldOath, _newPath, errorMask);
|
||||
},
|
||||
SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSRename(client, block, oldPath, newPath, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSRenameAsync, FSClient *client, FSCmdBlock *block, char *oldPath, char *newPath, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s %s", oldPath, newPath);
|
||||
FSStatus result = FSRenameWrapper(oldPath, newPath, errorMask,
|
||||
[client, block, errorMask, asyncData](char *_oldOath, char *_newPath) -> FSStatus {
|
||||
return real_FSRenameAsync(client, block, _oldOath, _newPath, errorMask, asyncData);
|
||||
},
|
||||
ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSRenameAsync(client, block, oldPath, newPath, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSFlushFile, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSErrorFlag errorMask) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSFlushFileWrapper(handle, errorMask, SYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSFlushFile(client, block, handle, errorMask);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSFlushFileAsync, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("");
|
||||
FSStatus result = FSFlushFileWrapper(handle, errorMask, ASYNC_RESULT_HANDLER);
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
return real_FSFlushFileAsync(client, block, handle, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSChangeModeAsync, FSClient *client, FSCmdBlock *block, char *path, FSMode mode, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("FSChangeModeAsync %s", path);
|
||||
return real_FSChangeModeAsync(client, block, path, mode, errorMask, asyncData);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, FSGetFreeSpaceSizeAsync, FSClient *client, FSCmdBlock *block, char *path, uint64_t *outSize, FSErrorFlag errorMask, FSAsyncData *asyncData) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("FSGetFreeSpaceSizeAsync %s", path);
|
||||
return real_FSGetFreeSpaceSizeAsync(client, block, path, outSize, errorMask, asyncData);
|
||||
}
|
||||
|
||||
|
||||
function_replacement_data_t fs_file_function_replacements[] = {
|
||||
REPLACE_FUNCTION(FSOpenFile, LIBRARY_COREINIT, FSOpenFile),
|
||||
REPLACE_FUNCTION(FSOpenFileAsync, LIBRARY_COREINIT, FSOpenFileAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSCloseFile, LIBRARY_COREINIT, FSCloseFile),
|
||||
REPLACE_FUNCTION(FSCloseFileAsync, LIBRARY_COREINIT, FSCloseFileAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSGetStat, LIBRARY_COREINIT, FSGetStat),
|
||||
REPLACE_FUNCTION(FSGetStatAsync, LIBRARY_COREINIT, FSGetStatAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSGetStatFile, LIBRARY_COREINIT, FSGetStatFile),
|
||||
REPLACE_FUNCTION(FSGetStatFileAsync, LIBRARY_COREINIT, FSGetStatFileAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSReadFile, LIBRARY_COREINIT, FSReadFile),
|
||||
REPLACE_FUNCTION(FSReadFileAsync, LIBRARY_COREINIT, FSReadFileAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSReadFileWithPos, LIBRARY_COREINIT, FSReadFileWithPos),
|
||||
REPLACE_FUNCTION(FSReadFileWithPosAsync, LIBRARY_COREINIT, FSReadFileWithPosAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSSetPosFile, LIBRARY_COREINIT, FSSetPosFile),
|
||||
REPLACE_FUNCTION(FSSetPosFileAsync, LIBRARY_COREINIT, FSSetPosFileAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSGetPosFile, LIBRARY_COREINIT, FSGetPosFile),
|
||||
REPLACE_FUNCTION(FSGetPosFileAsync, LIBRARY_COREINIT, FSGetPosFileAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSIsEof, LIBRARY_COREINIT, FSIsEof),
|
||||
REPLACE_FUNCTION(FSIsEofAsync, LIBRARY_COREINIT, FSIsEofAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSWriteFile, LIBRARY_COREINIT, FSWriteFile),
|
||||
REPLACE_FUNCTION(FSWriteFileAsync, LIBRARY_COREINIT, FSWriteFileAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSTruncateFile, LIBRARY_COREINIT, FSTruncateFile),
|
||||
REPLACE_FUNCTION(FSTruncateFileAsync, LIBRARY_COREINIT, FSTruncateFileAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSRemove, LIBRARY_COREINIT, FSRemove),
|
||||
REPLACE_FUNCTION(FSRemoveAsync, LIBRARY_COREINIT, FSRemoveAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSRename, LIBRARY_COREINIT, FSRename),
|
||||
REPLACE_FUNCTION(FSRenameAsync, LIBRARY_COREINIT, FSRenameAsync),
|
||||
|
||||
REPLACE_FUNCTION(FSFlushFile, LIBRARY_COREINIT, FSFlushFile),
|
||||
REPLACE_FUNCTION(FSFlushFileAsync, LIBRARY_COREINIT, FSFlushFileAsync),
|
||||
|
||||
//REPLACE_FUNCTION(FSChangeModeAsync, LIBRARY_COREINIT, FSChangeModeAsync),
|
||||
|
||||
//REPLACE_FUNCTION(FSGetFreeSpaceSizeAsync, LIBRARY_COREINIT, FSGetFreeSpaceSizeAsync),
|
||||
};
|
||||
|
||||
uint32_t fs_file_function_replacements_size = sizeof(fs_file_function_replacements) / sizeof(function_replacement_data_t);
|
|
@ -1,16 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include <function_patcher/function_patching.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern function_replacement_data_t fs_file_function_replacements[];
|
||||
extern uint32_t fs_file_function_replacements_size;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,866 +0,0 @@
|
|||
#include "FSWrapper.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <cstring>
|
||||
#include <mutex>
|
||||
#include <coreinit/cache.h>
|
||||
#include <coreinit/debug.h>
|
||||
#include "utils/logger.h"
|
||||
#include "FileUtils.h"
|
||||
#include "globals.h"
|
||||
|
||||
dirMagic_t dir_handles[DIR_HANDLES_LENGTH];
|
||||
fileMagic_t file_handles[FILE_HANDLES_LENGTH];
|
||||
|
||||
std::mutex dir_handle_mutex;
|
||||
std::mutex file_handle_mutex;
|
||||
|
||||
static inline void replaceContentPath(char *pathForCheck, int pathForCheckSize, int replaceLen, char *replaceWith);
|
||||
|
||||
inline void getFullPath(char *pathForCheck, int pathSize, char *path) {
|
||||
if (path[0] != '/' && path[0] != '\\') {
|
||||
snprintf(pathForCheck, pathSize, "%s%s", gReplacementInfo.contentReplacementInfo.workingDir, path);
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("Real path is %s", path);
|
||||
} else {
|
||||
pathForCheck[0] = '\0';
|
||||
strncat(pathForCheck, path, pathSize - 1);
|
||||
}
|
||||
|
||||
for(int i = 0; i < strlen(pathForCheck);i++){
|
||||
if(pathForCheck[i] == '\\'){
|
||||
pathForCheck[i] = '/';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline bool checkForSave(char *pathForCheck, int pathSize, char *path) {
|
||||
if (!gReplacementInfo.contentReplacementInfo.replaceSave) {
|
||||
return false;
|
||||
}
|
||||
if (strncmp(path, "/vol/save", 9) == 0) {
|
||||
int copyLen = strlen(path);
|
||||
char copy[copyLen + 1];
|
||||
memcpy(copy, path, copyLen);
|
||||
copy[copyLen] = 0;
|
||||
memset(pathForCheck, 0, pathSize);
|
||||
snprintf(pathForCheck, pathSize, "%s%s", gReplacementInfo.contentReplacementInfo.savePath, ©[9]);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
int getNewFileHandleIndex() {
|
||||
file_handle_mutex.lock();
|
||||
int32_t handle_id = -1;
|
||||
for (int i = 0; i < FILE_HANDLES_LENGTH; i++) {
|
||||
if (!file_handles[i].in_use) {
|
||||
handle_id = i;
|
||||
if (!file_handles[i].mutex) {
|
||||
file_handles[i].mutex = (OSMutex *) malloc(sizeof(OSMutex));
|
||||
OSInitMutex(file_handles[i].mutex);
|
||||
if (!file_handles[i].mutex) {
|
||||
OSFatal("Failed to alloc memory for mutex");
|
||||
}
|
||||
DCFlushRange(file_handles[i].mutex, sizeof(OSMutex));
|
||||
DCFlushRange(&file_handles[i], sizeof(fileMagic_t));
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
file_handle_mutex.unlock();
|
||||
return handle_id;
|
||||
}
|
||||
|
||||
bool isValidDirHandle(int32_t handle) {
|
||||
return (handle & HANDLE_INDICATOR_MASK) == DIR_HANDLE_MAGIC;
|
||||
}
|
||||
|
||||
bool isValidFileHandle(int32_t handle) {
|
||||
return (handle & HANDLE_INDICATOR_MASK) == FILE_HANDLE_MAGIC;
|
||||
}
|
||||
|
||||
int32_t getNewDirHandleIndex() {
|
||||
dir_handle_mutex.lock();
|
||||
int32_t handle_id;
|
||||
for (int i = 0; i < DIR_HANDLES_LENGTH; i++) {
|
||||
if (!dir_handles[i].in_use) {
|
||||
handle_id = i;
|
||||
if (!dir_handles[i].mutex) {
|
||||
dir_handles[i].mutex = (OSMutex *) malloc(sizeof(OSMutex));
|
||||
OSInitMutex(dir_handles[i].mutex);
|
||||
if (!dir_handles[i].mutex) {
|
||||
OSFatal("Failed to alloc memory for mutex");
|
||||
}
|
||||
DCFlushRange(dir_handles[i].mutex, sizeof(OSMutex));
|
||||
DCFlushRange(&dir_handles[i], sizeof(dirMagic_t));
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
dir_handle_mutex.unlock();
|
||||
return handle_id;
|
||||
}
|
||||
|
||||
void freeFileHandle(uint32_t handle) {
|
||||
if (handle >= FILE_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return;
|
||||
}
|
||||
file_handle_mutex.lock();
|
||||
file_handles[handle].in_use = false;
|
||||
if (file_handles[handle].mutex) {
|
||||
free(file_handles[handle].mutex);
|
||||
file_handles[handle].mutex = nullptr;
|
||||
}
|
||||
DCFlushRange(&file_handles[handle], sizeof(fileMagic_t));
|
||||
file_handle_mutex.unlock();
|
||||
}
|
||||
|
||||
void freeDirHandle(uint32_t handle) {
|
||||
if (handle >= DIR_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return;
|
||||
}
|
||||
dir_handle_mutex.lock();
|
||||
dir_handles[handle].in_use = false;
|
||||
if (dir_handles[handle].mutex) {
|
||||
free(dir_handles[handle].mutex);
|
||||
dir_handles[handle].mutex = nullptr;
|
||||
}
|
||||
memset(&dir_handles[handle], 0, sizeof(dirMagic_t));
|
||||
DCFlushRange(&dir_handles[handle], sizeof(dirMagic_t));
|
||||
dir_handle_mutex.unlock();
|
||||
}
|
||||
|
||||
FSStatus FSOpenDirWrapper(char *path,
|
||||
FSDirectoryHandle *handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_path)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
char pathForCheck[256];
|
||||
|
||||
getFullPath(pathForCheck, sizeof(pathForCheck), path);
|
||||
|
||||
if (checkForSave(pathForCheck, sizeof(pathForCheck), pathForCheck)) {
|
||||
DEBUG_FUNCTION_LINE("Redirect save to %s", pathForCheck);
|
||||
return fallback_function(pathForCheck);
|
||||
}
|
||||
if (handle == nullptr) {
|
||||
DEBUG_FUNCTION_LINE("Invalid args");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
if (strncmp(pathForCheck, "/vol/content", 12) == 0) {
|
||||
replaceContentPath(pathForCheck, sizeof(pathForCheck), 12, gReplacementInfo.contentReplacementInfo.replacementPath);
|
||||
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s -> %s", path, pathForCheck);
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
|
||||
int handle_index = getNewDirHandleIndex();
|
||||
|
||||
if (handle_index >= 0) {
|
||||
DIR *dir;
|
||||
if ((dir = opendir(pathForCheck))) {
|
||||
OSLockMutex(dir_handles[handle_index].mutex);
|
||||
dir_handles[handle_index].handle = DIR_HANDLE_MAGIC | handle_index;
|
||||
*handle = dir_handles[handle_index].handle;
|
||||
dir_handles[handle_index].dir = dir;
|
||||
dir_handles[handle_index].in_use = true;
|
||||
|
||||
dir_handles[handle_index].path[0] = '\0';
|
||||
strncat(dir_handles[handle_index].path, pathForCheck, sizeof(dir_handles[handle_index].path) - 1);
|
||||
|
||||
DCFlushRange(&dir_handles[handle_index], sizeof(dirMagic_t));
|
||||
OSUnlockMutex(dir_handles[handle_index].mutex);
|
||||
} else {
|
||||
DEBUG_FUNCTION_LINE("Dir not found %s", pathForCheck);
|
||||
if (gReplacementInfo.contentReplacementInfo.fallbackOnError) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
if (errorMask & FS_ERROR_FLAG_NOT_FOUND) {
|
||||
result = FS_STATUS_NOT_FOUND;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (errorMask & FS_ERROR_FLAG_MAX) {
|
||||
result = FS_STATUS_MAX;
|
||||
}
|
||||
}
|
||||
return result_handler(result);
|
||||
}
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
FSStatus FSReadDirWrapper(FSDirectoryHandle handle,
|
||||
FSDirectoryEntry *entry,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidDirHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
uint32_t handle_index = handle & HANDLE_MASK;
|
||||
if (handle_index >= DIR_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return result_handler(FS_STATUS_FATAL_ERROR);
|
||||
}
|
||||
|
||||
OSLockMutex(dir_handles[handle_index].mutex);
|
||||
DIR *dir = dir_handles[handle_index].dir;
|
||||
|
||||
struct dirent *entry_ = readdir(dir);
|
||||
FSStatus result = FS_STATUS_END;
|
||||
if (entry_) {
|
||||
entry->name[0] = '\0';
|
||||
strncat(entry->name, entry_->d_name, sizeof(entry->name)-1);
|
||||
entry->info.mode = (FSMode) FS_MODE_READ_OWNER;
|
||||
if (entry_->d_type == DT_DIR) {
|
||||
entry->info.flags = (FSStatFlags) ((uint32_t) FS_STAT_DIRECTORY);
|
||||
entry->info.size = 0;
|
||||
} else {
|
||||
entry->info.flags = (FSStatFlags) 0;
|
||||
if (strcmp(entry_->d_name, ".") == 0 || strcmp(entry_->d_name, "..") == 0) {
|
||||
entry->info.size = 0;
|
||||
} else {
|
||||
struct stat sb{};
|
||||
int strLen = strlen(dir_handles[handle_index].path) + 1 + strlen(entry_->d_name) + 1;
|
||||
char path[strLen];
|
||||
snprintf(path, sizeof(path), "%s/%s", dir_handles[handle_index].path, entry_->d_name);
|
||||
if (stat(path, &sb) >= 0) {
|
||||
entry->info.size = sb.st_size;
|
||||
entry->info.flags = (FSStatFlags) 0;
|
||||
entry->info.owner = sb.st_uid;
|
||||
entry->info.group = sb.st_gid;
|
||||
}
|
||||
}
|
||||
}
|
||||
result = FS_STATUS_OK;
|
||||
}
|
||||
|
||||
OSUnlockMutex(dir_handles[handle_index].mutex);
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSCloseDirWrapper(FSDirectoryHandle handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidDirHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
uint32_t handle_index = handle & HANDLE_MASK;
|
||||
if (handle_index >= DIR_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
OSLockMutex(dir_handles[handle_index].mutex);
|
||||
|
||||
DIR *dir = dir_handles[handle_index].dir;
|
||||
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
if (closedir(dir) != 0) {
|
||||
result = FS_STATUS_MEDIA_ERROR;
|
||||
}
|
||||
|
||||
OSUnlockMutex(dir_handles[handle_index].mutex);
|
||||
freeDirHandle(handle_index);
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSRewindDirWrapper(FSDirectoryHandle handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidDirHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
uint32_t handle_index = handle & HANDLE_MASK;
|
||||
if (handle_index >= DIR_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
uint32_t real_handle = handle & HANDLE_MASK;
|
||||
OSLockMutex(dir_handles[handle_index].mutex);
|
||||
|
||||
DIR *dir = dir_handles[real_handle].dir;
|
||||
rewinddir(dir);
|
||||
OSUnlockMutex(dir_handles[handle_index].mutex);
|
||||
return result_handler(FS_STATUS_OK);
|
||||
}
|
||||
|
||||
FSStatus FSMakeDirWrapper(char *path,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_path)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
char pathForCheck[256];
|
||||
|
||||
getFullPath(pathForCheck, sizeof(pathForCheck), path);
|
||||
|
||||
if (checkForSave(pathForCheck, sizeof(pathForCheck), pathForCheck)) {
|
||||
DEBUG_FUNCTION_LINE("Redirect save to %s", pathForCheck);
|
||||
return fallback_function(pathForCheck);
|
||||
}
|
||||
|
||||
if (strncmp(pathForCheck, "/vol/content", 12) == 0) {
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
if (errorMask & FS_ERROR_FLAG_ACCESS_ERROR) {
|
||||
result = FS_STATUS_ACCESS_ERROR;
|
||||
}
|
||||
return result_handler(result);
|
||||
}
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
FSStatus FSOpenFileWrapper(char *path,
|
||||
const char *mode,
|
||||
FSFileHandle *handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_path)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
if (path == nullptr) {
|
||||
OSFATAL_FUNCTION_LINE("Invalid args");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
char pathForCheck[256];
|
||||
|
||||
getFullPath(pathForCheck, sizeof(pathForCheck), path);
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s -> %s", path, pathForCheck);
|
||||
|
||||
if (checkForSave(pathForCheck, sizeof(pathForCheck), pathForCheck)) {
|
||||
DEBUG_FUNCTION_LINE("Redirect save to %s", pathForCheck);
|
||||
return fallback_function(pathForCheck);
|
||||
}
|
||||
if (mode == nullptr || handle == nullptr) {
|
||||
DEBUG_FUNCTION_LINE("Invalid args");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
if (strncmp(pathForCheck, "/vol/content", 12) == 0) {
|
||||
replaceContentPath(pathForCheck, sizeof(pathForCheck), 12, gReplacementInfo.contentReplacementInfo.replacementPath);
|
||||
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("%s -> %s", path, pathForCheck);
|
||||
int handle_index = getNewFileHandleIndex();
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
if (handle_index >= 0) {
|
||||
OSLockMutex(file_handles[handle_index].mutex);
|
||||
int _mode = 0;
|
||||
// Map flags to open modes
|
||||
if (strcmp(mode, "r") == 0 || strcmp(mode, "rb") == 0) {
|
||||
_mode = 0x000;
|
||||
} else if (strcmp(mode, "r+") == 0) {
|
||||
_mode = 0x002;
|
||||
} else if (strcmp(mode, "w") == 0) {
|
||||
_mode = 0x601;
|
||||
} else if (strcmp(mode, "w+") == 0) {
|
||||
_mode = 0x602;
|
||||
} else if (strcmp(mode, "a") == 0) {
|
||||
_mode = 0x209;
|
||||
} else if (strcmp(mode, "a+") == 0) {
|
||||
_mode = 0x20A;
|
||||
} else {
|
||||
//DEBUG_FUNCTION_LINE("%s", mode);
|
||||
if (errorMask & FS_ERROR_FLAG_ACCESS_ERROR) {
|
||||
result = FS_STATUS_ACCESS_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
int32_t fd = open(pathForCheck, _mode);
|
||||
if (fd >= 0) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("opened file successfully %d", fd);
|
||||
|
||||
file_handles[handle_index].handle = FILE_HANDLE_MAGIC + handle_index;
|
||||
//DEBUG_FUNCTION_LINE("handle %08X", file_handles[handle_index].handle);
|
||||
*handle = file_handles[handle_index].handle;
|
||||
file_handles[handle_index].fd = fd;
|
||||
file_handles[handle_index].in_use = true;
|
||||
DCFlushRange(&file_handles[handle_index], sizeof(fileMagic_t));
|
||||
} else {
|
||||
DEBUG_FUNCTION_LINE("File not found %s", pathForCheck);
|
||||
if (gReplacementInfo.contentReplacementInfo.fallbackOnError) {
|
||||
result = FS_STATUS_USE_REAL_OS;
|
||||
} else if (errorMask & FS_ERROR_FLAG_NOT_FOUND) {
|
||||
result = FS_STATUS_NOT_FOUND;
|
||||
}
|
||||
}
|
||||
OSUnlockMutex(file_handles[handle_index].mutex);
|
||||
} else {
|
||||
if (gReplacementInfo.contentReplacementInfo.fallbackOnError) {
|
||||
result = FS_STATUS_USE_REAL_OS;
|
||||
} else if (errorMask & FS_ERROR_FLAG_MAX) {
|
||||
result = FS_STATUS_MAX;
|
||||
}
|
||||
}
|
||||
if (result != FS_STATUS_USE_REAL_OS) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("return error %d", result);
|
||||
return result_handler(result);
|
||||
}
|
||||
}
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
FSStatus FSCloseFileWrapper(FSFileHandle handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidFileHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
uint32_t handle_index = handle & HANDLE_MASK;
|
||||
|
||||
if (handle_index >= FILE_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
OSLockMutex(file_handles[handle_index].mutex);
|
||||
|
||||
int real_fd = file_handles[handle_index].fd;
|
||||
file_handles[handle_index].in_use = false;
|
||||
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("closing %d", real_fd);
|
||||
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
if (close(real_fd) != 0) {
|
||||
result = FS_STATUS_MEDIA_ERROR;
|
||||
}
|
||||
OSUnlockMutex(file_handles[handle_index].mutex);
|
||||
|
||||
freeFileHandle(handle_index);
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSGetStatWrapper(char *path, FSStat *stats, FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_path)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
if (path == nullptr) {
|
||||
OSFATAL_FUNCTION_LINE("Invalid args");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
char pathForCheck[256];
|
||||
|
||||
getFullPath(pathForCheck, sizeof(pathForCheck), path);
|
||||
|
||||
if (checkForSave(pathForCheck, sizeof(pathForCheck), pathForCheck)) {
|
||||
DEBUG_FUNCTION_LINE("Redirect save to %s", pathForCheck);
|
||||
return fallback_function(pathForCheck);
|
||||
}
|
||||
if (strncmp(pathForCheck, "/vol/content", 12) == 0) {
|
||||
replaceContentPath(pathForCheck, sizeof(pathForCheck), 12, gReplacementInfo.contentReplacementInfo.replacementPath);
|
||||
DEBUG_FUNCTION_LINE("%s -> %s", path, pathForCheck);
|
||||
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
if (stats == nullptr) {
|
||||
if (gReplacementInfo.contentReplacementInfo.fallbackOnError) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
DEBUG_FUNCTION_LINE("Invalid args");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
} else {
|
||||
struct stat path_stat{};
|
||||
memset(&path_stat, 0, sizeof(path_stat));
|
||||
if (stat(pathForCheck, &path_stat) < 0) {
|
||||
if (gReplacementInfo.contentReplacementInfo.fallbackOnError) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
} else if (errorMask & FS_ERROR_FLAG_NOT_FOUND) {
|
||||
DEBUG_FUNCTION_LINE("Path not found %s", pathForCheck);
|
||||
result = FS_STATUS_NOT_FOUND;
|
||||
}
|
||||
} else {
|
||||
memset(&(stats->flags), 0, sizeof(stats->flags));
|
||||
if (S_ISDIR(path_stat.st_mode)) {
|
||||
stats->flags = (FSStatFlags) ((uint32_t) FS_STAT_DIRECTORY);
|
||||
} else {
|
||||
stats->size = path_stat.st_size;
|
||||
stats->mode = (FSMode) FS_MODE_READ_OWNER;
|
||||
stats->flags = (FSStatFlags) 0;
|
||||
stats->owner = path_stat.st_uid;
|
||||
stats->group = path_stat.st_gid;
|
||||
}
|
||||
//DEBUG_FUNCTION_LINE("stats file for %s, size %016lLX", path, stats->size);
|
||||
}
|
||||
}
|
||||
return result_handler(result);
|
||||
}
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
static inline void replaceContentPath(char *pathForCheck, int pathForCheckSize, int skipLen, char *replaceWith) {
|
||||
int subStrLen = strlen(pathForCheck) - skipLen;
|
||||
if (subStrLen <= 0) {
|
||||
pathForCheck[0] = '\0';
|
||||
strncat(pathForCheck, replaceWith, sizeof(pathForCheck) - 1);
|
||||
} else {
|
||||
char pathCopy[subStrLen+1];
|
||||
pathCopy[0] = '\0';
|
||||
strncat(pathCopy, &pathForCheck[skipLen], sizeof(pathCopy) - 1);
|
||||
snprintf(pathForCheck, pathForCheckSize, "%s%s", replaceWith, pathCopy);
|
||||
}
|
||||
}
|
||||
|
||||
FSStatus FSGetStatFileWrapper(FSFileHandle handle,
|
||||
FSStat *stats,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidFileHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
uint32_t handle_index = handle & HANDLE_MASK;
|
||||
|
||||
if (handle_index >= FILE_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
OSLockMutex(file_handles[handle_index].mutex);
|
||||
|
||||
int real_fd = file_handles[handle_index].fd;
|
||||
//DEBUG_FUNCTION_LINE("FSGetStatFileAsync real_fd %d", real_fd);
|
||||
|
||||
struct stat path_stat{};
|
||||
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
if (fstat(real_fd, &path_stat) < 0) {
|
||||
result = FS_STATUS_MEDIA_ERROR;
|
||||
} else {
|
||||
memset(&(stats->flags), 0, sizeof(stats->flags));
|
||||
|
||||
stats->size = path_stat.st_size;
|
||||
stats->mode = (FSMode) FS_MODE_READ_OWNER;
|
||||
stats->flags = (FSStatFlags) 0;
|
||||
stats->owner = path_stat.st_uid;
|
||||
stats->group = path_stat.st_gid;
|
||||
}
|
||||
|
||||
OSUnlockMutex(file_handles[handle_index].mutex);
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSReadFileWrapper(void *buffer,
|
||||
uint32_t size,
|
||||
uint32_t count,
|
||||
FSFileHandle handle,
|
||||
uint32_t unk1,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidFileHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
uint32_t handle_index = handle & HANDLE_MASK;
|
||||
|
||||
if (handle_index >= FILE_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
if (size * count == 0) {
|
||||
return result_handler(FS_STATUS_OK);
|
||||
}
|
||||
if (buffer == nullptr && (size * count != 0)) {
|
||||
DEBUG_FUNCTION_LINE("Fatal read FSErrorFlag errorMask, buffer is null but size*count is not");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
FSStatus result;
|
||||
|
||||
OSLockMutex(file_handles[handle_index].mutex);
|
||||
|
||||
int real_fd = file_handles[handle_index].fd;
|
||||
|
||||
int32_t read = readIntoBuffer(real_fd, buffer, size, count);
|
||||
|
||||
if (read < 0) {
|
||||
DEBUG_FUNCTION_LINE("Failed to read from handle");
|
||||
result = FS_STATUS_MEDIA_ERROR;
|
||||
} else {
|
||||
result = (FSStatus) (read / size);
|
||||
}
|
||||
|
||||
OSUnlockMutex(file_handles[handle_index].mutex);
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSReadFileWithPosWrapper(void *buffer,
|
||||
uint32_t size,
|
||||
uint32_t count,
|
||||
uint32_t pos,
|
||||
FSFileHandle handle,
|
||||
int32_t unk1,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidFileHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
FSStatus result;
|
||||
if ((result = FSSetPosFileWrapper(handle, pos, errorMask,
|
||||
[](FSStatus res) -> FSStatus { return res; })
|
||||
) != FS_STATUS_OK) {
|
||||
return result;
|
||||
}
|
||||
|
||||
result = FSReadFileWrapper(buffer, size, count, handle, unk1, errorMask,
|
||||
[](FSStatus res) -> FSStatus { return res; }
|
||||
);
|
||||
if (result != FS_STATUS_USE_REAL_OS && result != FS_STATUS_FATAL_ERROR) {
|
||||
return result_handler(result);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
FSStatus FSSetPosFileWrapper(FSFileHandle handle,
|
||||
uint32_t pos,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidFileHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
uint32_t handle_index = handle & HANDLE_MASK;
|
||||
|
||||
if (handle_index >= FILE_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
OSLockMutex(file_handles[handle_index].mutex);
|
||||
|
||||
int real_fd = file_handles[handle_index].fd;
|
||||
|
||||
if (lseek(real_fd, (off_t) pos, SEEK_SET) != pos) {
|
||||
DEBUG_FUNCTION_LINE("Seek failed");
|
||||
result = FS_STATUS_MEDIA_ERROR;
|
||||
}
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("pos set to %d ", pos, real_fd);
|
||||
|
||||
OSUnlockMutex(file_handles[handle_index].mutex);
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSGetPosFileWrapper(FSFileHandle handle,
|
||||
uint32_t *pos,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidFileHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
uint32_t handle_index = handle & HANDLE_MASK;
|
||||
|
||||
if (handle_index >= FILE_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
OSLockMutex(file_handles[handle_index].mutex);
|
||||
|
||||
int real_fd = file_handles[handle_index].fd;
|
||||
|
||||
off_t currentPos = lseek(real_fd, (off_t) 0, SEEK_CUR);
|
||||
if (currentPos == -1) {
|
||||
DEBUG_FUNCTION_LINE("Failed to get current pos");
|
||||
result = FS_STATUS_MEDIA_ERROR;
|
||||
} else {
|
||||
*pos = currentPos;
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("result was %d for %d", *pos, real_fd);
|
||||
}
|
||||
|
||||
OSUnlockMutex(file_handles[handle_index].mutex);
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSIsEofWrapper(FSFileHandle handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidFileHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
uint32_t handle_index = handle & HANDLE_MASK;
|
||||
|
||||
if (handle_index >= FILE_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
OSLockMutex(file_handles[handle_index].mutex);
|
||||
|
||||
int real_fd = file_handles[handle_index].fd;
|
||||
|
||||
off_t currentPos = lseek(real_fd, (off_t) 0, SEEK_CUR);
|
||||
off_t endPos = lseek(real_fd, (off_t) 0, SEEK_END);
|
||||
|
||||
if (currentPos == endPos) {
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("FSIsEof END for %d\n", real_fd);
|
||||
result = FS_STATUS_END;
|
||||
} else {
|
||||
lseek(real_fd, currentPos, SEEK_CUR);
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("FSIsEof OK for %d\n", real_fd);
|
||||
result = FS_STATUS_OK;
|
||||
}
|
||||
|
||||
OSUnlockMutex(file_handles[handle_index].mutex);
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSTruncateFileWrapper(FSFileHandle handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidFileHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
uint32_t handle_index = handle & HANDLE_MASK;
|
||||
|
||||
if (handle_index >= FILE_HANDLES_LENGTH) {
|
||||
DEBUG_FUNCTION_LINE("Invalid handle");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
if (errorMask & FS_ERROR_FLAG_ACCESS_ERROR) {
|
||||
result = FS_STATUS_ACCESS_ERROR;
|
||||
}
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSWriteFileWrapper(uint8_t *buffer,
|
||||
uint32_t size,
|
||||
uint32_t count,
|
||||
FSFileHandle handle,
|
||||
uint32_t unk1,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) ||
|
||||
!isValidFileHandle(handle)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
if (errorMask & FS_ERROR_FLAG_ACCESS_ERROR) {
|
||||
result = FS_STATUS_ACCESS_ERROR;
|
||||
}
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSRemoveWrapper(char *path,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_path)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
if (path == nullptr) {
|
||||
OSFATAL_FUNCTION_LINE("Invalid args");
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
char pathForCheck[256];
|
||||
|
||||
getFullPath(pathForCheck, sizeof(pathForCheck), path);
|
||||
|
||||
if (checkForSave(pathForCheck, sizeof(pathForCheck), pathForCheck)) {
|
||||
DEBUG_FUNCTION_LINE("Redirect save to %s", pathForCheck);
|
||||
return fallback_function(pathForCheck);
|
||||
}
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
if (errorMask & FS_ERROR_FLAG_ACCESS_ERROR) {
|
||||
result = FS_STATUS_ACCESS_ERROR;
|
||||
}
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSRenameWrapper(char *oldPath,
|
||||
char *newPath,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_oldPath, char *_newPath)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
|
||||
char pathForCheck1[256];
|
||||
char pathForCheck2[256];
|
||||
|
||||
getFullPath(pathForCheck1, sizeof(pathForCheck1), oldPath);
|
||||
getFullPath(pathForCheck2, sizeof(pathForCheck2), newPath);
|
||||
|
||||
if (checkForSave(pathForCheck1, sizeof(pathForCheck1), pathForCheck1)) {
|
||||
if (checkForSave(pathForCheck2, sizeof(pathForCheck2), pathForCheck2)) {
|
||||
DEBUG_FUNCTION_LINE("Redirect save to %s/%s", pathForCheck1, pathForCheck2);
|
||||
return fallback_function(pathForCheck1, pathForCheck2);
|
||||
}
|
||||
}
|
||||
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
|
||||
if (errorMask & FS_ERROR_FLAG_ACCESS_ERROR) {
|
||||
result = FS_STATUS_ACCESS_ERROR;
|
||||
}
|
||||
|
||||
return result_handler(result);
|
||||
}
|
||||
|
||||
FSStatus FSFlushFileWrapper(FSFileHandle handle, FSErrorFlag errorMask, std::function<FSStatus(FSStatus)> result_handler) {
|
||||
if ((gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_NONE) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) ||
|
||||
(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE && !gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted)) {
|
||||
return FS_STATUS_USE_REAL_OS;
|
||||
}
|
||||
FSStatus result = FS_STATUS_OK;
|
||||
|
||||
if (errorMask & FS_ERROR_FLAG_ACCESS_ERROR) {
|
||||
result = FS_STATUS_ACCESS_ERROR;
|
||||
}
|
||||
|
||||
return result_handler(result);
|
||||
}
|
147
src/FSWrapper.h
147
src/FSWrapper.h
|
@ -1,147 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <dirent.h>
|
||||
#include <functional>
|
||||
#include <coreinit/filesystem.h>
|
||||
#include <coreinit/mutex.h>
|
||||
|
||||
typedef struct dirMagic {
|
||||
uint32_t handle;
|
||||
DIR *dir;
|
||||
bool in_use;
|
||||
char path[256];
|
||||
OSMutex *mutex;
|
||||
} dirMagic_t;
|
||||
|
||||
typedef struct fileMagic {
|
||||
uint32_t handle;
|
||||
bool in_use;
|
||||
int fd;
|
||||
OSMutex *mutex;
|
||||
} fileMagic_t;
|
||||
|
||||
#define HANDLE_INDICATOR_MASK 0xFFFFFF00
|
||||
#define HANDLE_MASK (0x000000FF)
|
||||
#define DIR_HANDLE_MAGIC 0x30000000
|
||||
#define FILE_HANDLE_MAGIC 0x30000100
|
||||
|
||||
#define FILE_HANDLES_LENGTH 64
|
||||
#define DIR_HANDLES_LENGTH 64
|
||||
|
||||
#define FS_STATUS_USE_REAL_OS (FSStatus) 0xFFFF0000
|
||||
|
||||
extern dirMagic_t dir_handles[DIR_HANDLES_LENGTH];
|
||||
extern fileMagic_t file_handles[FILE_HANDLES_LENGTH];
|
||||
|
||||
FSStatus FSOpenDirWrapper(char *path,
|
||||
FSDirectoryHandle *handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_path)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSReadDirWrapper(FSDirectoryHandle handle,
|
||||
FSDirectoryEntry *entry,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSCloseDirWrapper(FSDirectoryHandle handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSRewindDirWrapper(FSDirectoryHandle handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSMakeDirWrapper(char *path,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_path)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSOpenFileWrapper(char *path,
|
||||
const char *mode,
|
||||
FSFileHandle *handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_path)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSCloseFileWrapper(FSFileHandle handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSGetStatWrapper(char *path,
|
||||
FSStat *stats,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_path)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSGetStatFileWrapper(FSFileHandle handle,
|
||||
FSStat *stats,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSReadFileWrapper(void *buffer,
|
||||
uint32_t size,
|
||||
uint32_t count,
|
||||
FSFileHandle handle,
|
||||
uint32_t unk1,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSReadFileWithPosWrapper(void *buffer,
|
||||
uint32_t size,
|
||||
uint32_t count,
|
||||
uint32_t pos,
|
||||
FSFileHandle handle,
|
||||
int32_t unk1,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSSetPosFileWrapper(FSFileHandle handle,
|
||||
uint32_t pos,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSGetPosFileWrapper(FSFileHandle handle,
|
||||
uint32_t *pos,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSIsEofWrapper(FSFileHandle handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSTruncateFileWrapper(FSFileHandle handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSWriteFileWrapper(uint8_t *buffer,
|
||||
uint32_t size,
|
||||
uint32_t count,
|
||||
FSFileHandle handle,
|
||||
uint32_t unk1,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSRemoveWrapper(char *path,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_path)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSRenameWrapper(char *oldPath,
|
||||
char *newPath,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(char *_oldPath, char *_newPath)> fallback_function,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
FSStatus FSFlushFileWrapper(FSFileHandle handle,
|
||||
FSErrorFlag errorMask,
|
||||
std::function<FSStatus(FSStatus)> result_handler);
|
||||
|
||||
int32_t getNewDirHandleIndex();
|
||||
|
||||
int32_t getNewFileHandleIndex();
|
||||
|
||||
bool isValidDirHandle(int32_t handle);
|
||||
|
||||
bool isValidFileHandle(int32_t handle);
|
|
@ -1,102 +1,14 @@
|
|||
#include "FileUtils.h"
|
||||
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <mutex>
|
||||
|
||||
#include <coreinit/debug.h>
|
||||
#include <map>
|
||||
#include <coreinit/thread.h>
|
||||
#include <dirent.h>
|
||||
#include <coreinit/cache.h>
|
||||
#include "utils/StringTools.h"
|
||||
#include "utils/utils.h"
|
||||
#include "utils/logger.h"
|
||||
#include <coreinit/cache.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
extern "C" OSMessageQueue *OSGetDefaultAppIOQueue();
|
||||
|
||||
FSCmdBlockBody *fsCmdBlockGetBody(FSCmdBlock *cmdBlock) {
|
||||
if (!cmdBlock) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
auto body = (FSCmdBlockBody *) (ROUNDUP((uint32_t) cmdBlock, 0x40));
|
||||
return body;
|
||||
}
|
||||
|
||||
std::mutex sendMutex;
|
||||
|
||||
FSStatus send_result_async(FSClient *client, FSCmdBlock *block, FSAsyncData *asyncData, FSStatus status) {
|
||||
if (asyncData->callback != nullptr) {
|
||||
if (asyncData->ioMsgQueue != nullptr) {
|
||||
//OSFatal("ERROR: callback and ioMsgQueue both set.");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
// userCallbacks are called in the DefaultAppIOQueue.
|
||||
asyncData->ioMsgQueue = OSGetDefaultAppIOQueue();
|
||||
//DEBUG_FUNCTION_LINE("Force to OSGetDefaultAppIOQueue (%08X)", asyncData->ioMsgQueue);
|
||||
}
|
||||
|
||||
if (asyncData->ioMsgQueue != nullptr) {
|
||||
FSAsyncResult *result = &(fsCmdBlockGetBody(block)->asyncResult);
|
||||
//DEBUG_FUNCTION_LINE("Send result %d to ioMsgQueue (%08X)", status, asyncData->ioMsgQueue);
|
||||
result->asyncData.callback = asyncData->callback;
|
||||
result->asyncData.param = asyncData->param;
|
||||
result->asyncData.ioMsgQueue = asyncData->ioMsgQueue;
|
||||
memset(&result->ioMsg, 0, sizeof(result->ioMsg));
|
||||
result->ioMsg.data = result;
|
||||
result->ioMsg.type = OS_FUNCTION_TYPE_FS_CMD_ASYNC;
|
||||
result->client = client;
|
||||
result->block = block;
|
||||
result->status = status;
|
||||
|
||||
while (!OSSendMessage(asyncData->ioMsgQueue, (OSMessage *) &(result->ioMsg), OS_MESSAGE_FLAGS_NONE)) {
|
||||
DEBUG_FUNCTION_LINE("Failed to send message");
|
||||
}
|
||||
}
|
||||
return FS_STATUS_OK;
|
||||
}
|
||||
|
||||
int32_t readIntoBuffer(int32_t handle, void *buffer, size_t size, size_t count) {
|
||||
int32_t sizeToRead = size * count;
|
||||
/*
|
||||
// https://github.com/decaf-emu/decaf-emu/blob/131aeb14fccff8461a5fd9f2aa5c040ba3880ef5/src/libdecaf/src/cafe/libraries/coreinit/coreinit_fs_cmd.cpp#L2346
|
||||
if (sizeToRead > 0x100000) {
|
||||
sizeToRead = 0x100000;
|
||||
}*/
|
||||
void *newBuffer = buffer;
|
||||
int32_t curResult = -1;
|
||||
int32_t totalSize = 0;
|
||||
int32_t toRead = 0;
|
||||
while (sizeToRead > 0) {
|
||||
curResult = read(handle, newBuffer, sizeToRead);
|
||||
if (curResult < 0) {
|
||||
int errsv = errno;
|
||||
DEBUG_FUNCTION_LINE("Error: Reading %08X bytes from handle %08X. result %08X errno: %d ", size * count, handle, curResult, errsv);
|
||||
return -1;
|
||||
}
|
||||
if (curResult == 0) {
|
||||
//DEBUG_FUNCTION_LINE("EOF");
|
||||
break;
|
||||
}
|
||||
newBuffer = (void *) (((uint32_t) newBuffer) + curResult);
|
||||
totalSize += curResult;
|
||||
sizeToRead -= curResult;
|
||||
if (sizeToRead > 0) {
|
||||
//DEBUG_FUNCTION_LINE("Reading. missing %08X bytes\n", sizeToRead);
|
||||
}
|
||||
}
|
||||
//DEBUG_FUNCTION_LINE("Success: Read %08X bytes from handle %08X. result %08X \n", size * count, handle, totalSize);
|
||||
return totalSize;
|
||||
}
|
||||
|
||||
int32_t CheckFile(const char * filepath) {
|
||||
int32_t CheckFile(const char *filepath) {
|
||||
if (!filepath) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct stat filestat{};
|
||||
struct stat filestat {};
|
||||
|
||||
char dirnoslash[strlen(filepath) + 2];
|
||||
snprintf(dirnoslash, sizeof(dirnoslash), "%s", filepath);
|
||||
|
@ -117,33 +29,33 @@ int32_t CheckFile(const char * filepath) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int32_t CreateSubfolder(const char * fullpath) {
|
||||
if(!fullpath)
|
||||
int32_t CreateSubfolder(const char *fullpath) {
|
||||
if (!fullpath)
|
||||
return 0;
|
||||
|
||||
int32_t result = 0;
|
||||
|
||||
char dirnoslash[strlen(fullpath)+1];
|
||||
char dirnoslash[strlen(fullpath) + 1];
|
||||
strcpy(dirnoslash, fullpath);
|
||||
|
||||
int32_t pos = strlen(dirnoslash)-1;
|
||||
while(dirnoslash[pos] == '/') {
|
||||
int32_t pos = strlen(dirnoslash) - 1;
|
||||
while (dirnoslash[pos] == '/') {
|
||||
dirnoslash[pos] = '\0';
|
||||
pos--;
|
||||
}
|
||||
|
||||
if(CheckFile(dirnoslash)) {
|
||||
if (CheckFile(dirnoslash)) {
|
||||
return 1;
|
||||
} else {
|
||||
char parentpath[strlen(dirnoslash)+2];
|
||||
char parentpath[strlen(dirnoslash) + 2];
|
||||
strcpy(parentpath, dirnoslash);
|
||||
char * ptr = strrchr(parentpath, '/');
|
||||
char *ptr = strrchr(parentpath, '/');
|
||||
|
||||
if(!ptr) {
|
||||
if (!ptr) {
|
||||
//!Device root directory (must be with '/')
|
||||
strcat(parentpath, "/");
|
||||
struct stat filestat{};
|
||||
if (stat(parentpath, &filestat) == 0){
|
||||
struct stat filestat {};
|
||||
if (stat(parentpath, &filestat) == 0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -165,40 +77,4 @@ int32_t CreateSubfolder(const char * fullpath) {
|
|||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
int32_t getRPXInfoForPath(const std::string &path, romfs_fileInfo *info) {
|
||||
if (romfsMount("rcc", path.c_str(), RomfsSource_FileDescriptor_CafeOS) < 0) {
|
||||
return -1;
|
||||
}
|
||||
DIR *dir;
|
||||
struct dirent *entry;
|
||||
|
||||
if (!(dir = opendir("rcc:/code/"))) {
|
||||
romfsUnmount("rcc");
|
||||
return -2;
|
||||
}
|
||||
bool found = false;
|
||||
int res = -3;
|
||||
while ((entry = readdir(dir)) != nullptr) {
|
||||
if (StringTools::EndsWith(entry->d_name, ".rpx")) {
|
||||
if (romfsGetFileInfoPerPath("rcc", (std::string("code/") + entry->d_name).c_str(), info) >= 0) {
|
||||
found = true;
|
||||
res = 0;
|
||||
}else{
|
||||
DEBUG_FUNCTION_LINE("Failed to get info for %s", entry->d_name);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
closedir(dir);
|
||||
|
||||
romfsUnmount("rcc");
|
||||
|
||||
if (!found) {
|
||||
return -4;
|
||||
}
|
||||
return res;
|
||||
}
|
|
@ -1,26 +1,13 @@
|
|||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <coreinit/filesystem.h>
|
||||
#include <functional>
|
||||
#include <romfs_dev.h>
|
||||
|
||||
struct WUT_PACKED FSCmdBlockBody {//! FSAsyncResult object used for this command.
|
||||
|
||||
WUT_UNKNOWN_BYTES(0x96C);
|
||||
FSAsyncResult asyncResult;
|
||||
|
||||
};
|
||||
WUT_CHECK_OFFSET(FSCmdBlockBody, 0x96C, asyncResult);
|
||||
WUT_CHECK_SIZE(FSCmdBlockBody, 0x96C + 0x28);
|
||||
|
||||
FSCmdBlockBody *fsCmdBlockGetBody(FSCmdBlock *cmdBlock);
|
||||
|
||||
FSStatus send_result_async(FSClient *client, FSCmdBlock *block, FSAsyncData *asyncData, FSStatus result);
|
||||
|
||||
int32_t readIntoBuffer(int32_t handle, void *buffer, size_t size, size_t count);
|
||||
#include <string>
|
||||
|
||||
int32_t CreateSubfolder(const char *fullpath);
|
||||
|
||||
int32_t getRPXInfoForPath(const std::string &path, romfs_fileInfo *info);
|
||||
|
||||
int32_t CheckFile(const char * filepath);
|
||||
int32_t CheckFile(const char *filepath);
|
||||
|
||||
int32_t LoadFileToMem(const char *filepath, uint8_t **inbuffer, uint32_t *size);
|
|
@ -1,21 +1,31 @@
|
|||
#include <string>
|
||||
#include <coreinit/cache.h>
|
||||
#include <coreinit/ios.h>
|
||||
#include <romfs_dev.h>
|
||||
#include "utils/logger.h"
|
||||
#include "RPXLoading.h"
|
||||
#include "data/defaultIcon.h"
|
||||
#include "globals.h"
|
||||
#include "FileUtils.h"
|
||||
#include <nn/acp/title.h>
|
||||
#include <memory>
|
||||
#include <algorithm>
|
||||
#include "utils/FileReader.h"
|
||||
#include "utils/FileReaderCompressed.h"
|
||||
#include "utils/StringTools.h"
|
||||
#include "utils/ini.h"
|
||||
#include "utils/logger.h"
|
||||
#include <coreinit/cache.h>
|
||||
#include <coreinit/debug.h>
|
||||
#include <coreinit/ios.h>
|
||||
#include <coreinit/title.h>
|
||||
#include <cstring>
|
||||
#include <rpxloader.h>
|
||||
#include <mocha/mocha.h>
|
||||
#include <mutex>
|
||||
#include <nn/acp/title.h>
|
||||
#include <romfs_dev.h>
|
||||
#include <rpxloader/rpxloader.h>
|
||||
#include <string>
|
||||
#include <sysapp/title.h>
|
||||
#include <wuhb_utils/utils.h>
|
||||
|
||||
std::mutex fileReaderListMutex;
|
||||
std::forward_list<std::unique_ptr<FileReader>> openFileReaders;
|
||||
|
||||
void RPXLoadingCleanUp() {
|
||||
const std::lock_guard<std::mutex> lock(fileReaderListMutex);
|
||||
openFileReaders.clear();
|
||||
}
|
||||
|
||||
/*
|
||||
* Patch the meta xml for the home menu
|
||||
|
@ -25,11 +35,12 @@ DECL_FUNCTION(int32_t, HBM_NN_ACP_ACPGetTitleMetaXmlByDevice, uint32_t titleid_u
|
|||
memset(&metaxml->longname_ja, 0, 0x338C - 0x38C); // clear all names
|
||||
|
||||
snprintf(metaxml->longname_en, sizeof(metaxml->longname_en), "%s", gReplacementInfo.rpxReplacementInfo.metaInformation.longname);
|
||||
snprintf(metaxml->shortname_en, sizeof(metaxml->shortname_en), "%s", gReplacementInfo.rpxReplacementInfo.metaInformation.longname);
|
||||
snprintf(metaxml->publisher_en, sizeof(metaxml->publisher_en), "%s", gReplacementInfo.rpxReplacementInfo.metaInformation.longname);
|
||||
snprintf(metaxml->shortname_en, sizeof(metaxml->shortname_en), "%s", gReplacementInfo.rpxReplacementInfo.metaInformation.shortname);
|
||||
snprintf(metaxml->publisher_en, sizeof(metaxml->publisher_en), "%s", gReplacementInfo.rpxReplacementInfo.metaInformation.author);
|
||||
|
||||
// Disbale the emanual
|
||||
metaxml->e_manual = 0;
|
||||
// Disable the emanual
|
||||
metaxml->e_manual = 0;
|
||||
metaxml->closing_msg = 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -37,53 +48,72 @@ DECL_FUNCTION(int32_t, HBM_NN_ACP_ACPGetTitleMetaXmlByDevice, uint32_t titleid_u
|
|||
return result;
|
||||
}
|
||||
|
||||
DECL_FUNCTION(int, RPX_FSOpenFile, FSClient *client, FSCmdBlock *block, char *path, const char *mode, int *handle, int error) {
|
||||
const char *iconTex = "iconTex.tga";
|
||||
if (StringTools::EndsWith(path, iconTex)) {
|
||||
if (gReplacementInfo.rpxReplacementInfo.isRPXReplaced) {
|
||||
if (StringTools::EndsWith(path, iconTex)) {
|
||||
auto *reader = new FileReader(reinterpret_cast<uint8_t *>(gReplacementInfo.rpxReplacementInfo.iconCache), sizeof(gReplacementInfo.rpxReplacementInfo.iconCache));
|
||||
*handle = (uint32_t) reader;
|
||||
return FS_STATUS_OK;
|
||||
}
|
||||
DECL_FUNCTION(int, RPX_FSOpenFile, FSClient *client, FSCmdBlock *block, char *path, const char *mode, uint32_t *handle, int error) {
|
||||
const char *iconTex = "iconTex.tga";
|
||||
std::string_view pathView = path;
|
||||
if (gReplacementInfo.rpxReplacementInfo.isRPXReplaced && pathView.ends_with(iconTex)) {
|
||||
const std::lock_guard<std::mutex> lock(fileReaderListMutex);
|
||||
auto reader = make_unique_nothrow<FileReader>(reinterpret_cast<uint8_t *>(gReplacementInfo.rpxReplacementInfo.iconCache), ICON_SIZE);
|
||||
if (!reader) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to allocate memory for the FileReader");
|
||||
return FS_STATUS_FATAL_ERROR;
|
||||
}
|
||||
*handle = reader->getHandle();
|
||||
openFileReaders.push_front(std::move(reader));
|
||||
return FS_STATUS_OK;
|
||||
}
|
||||
int result = real_RPX_FSOpenFile(client, block, path, mode, handle, error);
|
||||
return result;
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, RPX_FSReadFile, FSClient *client, FSCmdBlock *block, uint8_t *buffer, uint32_t size, uint32_t count, FSFileHandle handle, uint32_t unk1, uint32_t flags) {
|
||||
// We check if the handle is part of our heap (the MemoryMapping Module allocates to 0x80000000)
|
||||
if ((handle & 0xF0000000) == 0x80000000) {
|
||||
auto reader = (FileReader *) handle;
|
||||
return (FSStatus) reader->read(buffer, size * count);
|
||||
|
||||
if (gReplacementInfo.rpxReplacementInfo.isRPXReplaced) {
|
||||
const std::lock_guard<std::mutex> lock(fileReaderListMutex);
|
||||
for (auto &reader : openFileReaders) {
|
||||
if ((uint32_t) reader->getHandle() == (uint32_t) handle) {
|
||||
return (FSStatus) (reader->read(buffer, size * count) / size);
|
||||
}
|
||||
}
|
||||
}
|
||||
FSStatus result = real_RPX_FSReadFile(client, block, buffer, size, count, handle, unk1, flags);
|
||||
return result;
|
||||
return real_RPX_FSReadFile(client, block, buffer, size, count, handle, unk1, flags);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(FSStatus, RPX_FSCloseFile, FSClient *client, FSCmdBlock *block, FSFileHandle handle, uint32_t flags) {
|
||||
// We check if the handle is part of our heap (the MemoryMapping Module allocates to 0x80000000)
|
||||
if ((handle & 0xF0000000) == 0x80000000) {
|
||||
auto reader = (FileReader *) handle;
|
||||
delete reader;
|
||||
return FS_STATUS_OK;
|
||||
if (gReplacementInfo.rpxReplacementInfo.isRPXReplaced) {
|
||||
if (remove_locked_first_if(fileReaderListMutex, openFileReaders, [handle](auto &cur) { return cur->getHandle() == (uint32_t) handle; })) {
|
||||
return FS_STATUS_OK;
|
||||
}
|
||||
}
|
||||
|
||||
return real_RPX_FSCloseFile(client, block, handle, flags);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(void, Loader_ReportWarn) {
|
||||
return;
|
||||
RPXLoaderStatus RL_PrepareLaunchFromSD(const char *bundle_path);
|
||||
|
||||
DECL_FUNCTION(void, OSRestartGame, int argc, char *argv[]) {
|
||||
if (OSGetTitleID() == _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_HEALTH_AND_SAFETY) &&
|
||||
strlen(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath) == 0) {
|
||||
RL_PrepareLaunchFromSD(gReplacementInfo.lastFileLoaded);
|
||||
}
|
||||
real_OSRestartGame(argc, argv);
|
||||
}
|
||||
|
||||
DECL_FUNCTION(void, _SYSLaunchTitleWithStdArgsInNoSplash, uint64_t titleId, void *u1) {
|
||||
if (titleId == _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_HEALTH_AND_SAFETY) &&
|
||||
titleId == OSGetTitleID() &&
|
||||
strlen(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath) == 0) {
|
||||
RL_PrepareLaunchFromSD(gReplacementInfo.lastFileLoaded);
|
||||
}
|
||||
real__SYSLaunchTitleWithStdArgsInNoSplash(titleId, u1);
|
||||
}
|
||||
|
||||
function_replacement_data_t rpx_utils_function_replacements[] = {
|
||||
REPLACE_FUNCTION_VIA_ADDRESS(Loader_ReportWarn, 0x32002f74, 0x01002f74),
|
||||
REPLACE_FUNCTION_VIA_ADDRESS_FOR_PROCESS(HBM_NN_ACP_ACPGetTitleMetaXmlByDevice, 0x2E36CE44, 0x0E36CE44, FP_TARGET_PROCESS_HOME_MENU),
|
||||
REPLACE_FUNCTION_FOR_PROCESS(RPX_FSOpenFile, LIBRARY_COREINIT, FSOpenFile, FP_TARGET_PROCESS_HOME_MENU),
|
||||
REPLACE_FUNCTION_FOR_PROCESS(RPX_FSReadFile, LIBRARY_COREINIT, FSReadFile, FP_TARGET_PROCESS_HOME_MENU),
|
||||
REPLACE_FUNCTION_FOR_PROCESS(RPX_FSCloseFile, LIBRARY_COREINIT, FSCloseFile, FP_TARGET_PROCESS_HOME_MENU),
|
||||
REPLACE_FUNCTION(OSRestartGame, LIBRARY_COREINIT, OSRestartGame),
|
||||
REPLACE_FUNCTION(_SYSLaunchTitleWithStdArgsInNoSplash, LIBRARY_SYSAPP, _SYSLaunchTitleWithStdArgsInNoSplash),
|
||||
};
|
||||
|
||||
uint32_t rpx_utils_function_replacements_size = sizeof(rpx_utils_function_replacements) / sizeof(function_replacement_data_t);
|
||||
|
@ -102,76 +132,86 @@ static int parseINIhandler(void *user, const char *section, const char *name,
|
|||
fInfo->author[0] = '\0';
|
||||
strncat(fInfo->author, value, sizeof(fInfo->author) - 1);
|
||||
} else {
|
||||
return 0; /* unknown section/name, error */
|
||||
return 0; /* unknown section/name, error */
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
bool RL_LoadFromSDOnNextLaunch(const char *bundle_path) {
|
||||
LOAD_REQUEST request;
|
||||
RPXLoaderStatus RL_PrepareLaunchFromSD(const char *bundle_path) {
|
||||
MochaRPXLoadInfo request;
|
||||
memset(&request, 0, sizeof(request));
|
||||
|
||||
request.command = 0xFC; // IPC_CUSTOM_LOAD_CUSTOM_RPX;
|
||||
request.target = 0; // LOAD_FILE_TARGET_SD_CARD
|
||||
request.filesize = 0; // unknown filesize
|
||||
request.fileoffset = 0; //
|
||||
request.target = LOAD_RPX_TARGET_SD_CARD; // LOAD_FILE_TARGET_SD_CARD
|
||||
request.filesize = 0; // unknown filesize
|
||||
request.fileoffset = 0; //
|
||||
|
||||
romfs_fileInfo info;
|
||||
WUHBRPXInfo fileInfo;
|
||||
|
||||
bool metaLoaded = false;
|
||||
|
||||
std::string completePath = std::string("/vol/external01/") + bundle_path;
|
||||
int res = getRPXInfoForPath(completePath, &info);
|
||||
std::string completePath = std::string("/vol/external01/") + bundle_path;
|
||||
std::string completeNewLibPath = std::string("fs:/vol/external01/") + bundle_path;
|
||||
|
||||
struct stat st {};
|
||||
if (stat(completeNewLibPath.c_str(), &st) < 0) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to prepare launch from SD, file (%s) not found.", bundle_path);
|
||||
return RPX_LOADER_RESULT_NOT_FOUND;
|
||||
}
|
||||
|
||||
bool isBundle = false;
|
||||
if (res >= 0) {
|
||||
isBundle = true;
|
||||
request.filesize = ((uint32_t *) &info.length)[1];
|
||||
request.fileoffset = ((uint32_t *) &info.offset)[1];
|
||||
auto rpxInfo = WUHBUtils_GetRPXInfo(completePath.c_str(), BundleSource_FileDescriptor_CafeOS, &fileInfo);
|
||||
if (rpxInfo == WUHB_UTILS_RESULT_SUCCESS) {
|
||||
isBundle = true;
|
||||
request.filesize = ((uint32_t *) &fileInfo.length)[1];
|
||||
request.fileoffset = ((uint32_t *) &fileInfo.offset)[1];
|
||||
auto res = -1;
|
||||
|
||||
if (romfsMount("rcc", completePath.c_str(), RomfsSource_FileDescriptor_CafeOS) == 0) {
|
||||
if (ini_parse("rcc:/meta/meta.ini", parseINIhandler, &gReplacementInfo.rpxReplacementInfo.metaInformation) < 0) {
|
||||
DEBUG_FUNCTION_LINE("Failed to load and parse meta.ini");
|
||||
if (WUHBUtils_MountBundle("rcc", completePath.c_str(), BundleSource_FileDescriptor_CafeOS, &res) == WUHB_UTILS_RESULT_SUCCESS && res == 0) {
|
||||
uint8_t *buffer;
|
||||
uint32_t bufferSize;
|
||||
if (WUHBUtils_ReadWholeFile("rcc:/meta/meta.ini", &buffer, &bufferSize) == WUHB_UTILS_RESULT_SUCCESS) {
|
||||
buffer[bufferSize - 1] = '\0';
|
||||
if (ini_parse_string((const char *) buffer, parseINIhandler, &gReplacementInfo.rpxReplacementInfo.metaInformation) < 0) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to load and parse meta.ini");
|
||||
} else {
|
||||
metaLoaded = true;
|
||||
}
|
||||
free(buffer);
|
||||
} else {
|
||||
metaLoaded = true;
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to read whole file meta.ini");
|
||||
}
|
||||
FileReader *reader = nullptr;
|
||||
buffer = nullptr;
|
||||
bufferSize = 0;
|
||||
|
||||
if (CheckFile("rcc:/meta/iconTex.tga")) {
|
||||
std::string path = "rcc:/meta/iconTex.tga";
|
||||
reader = new FileReader(path);
|
||||
} else if (CheckFile("rcc:/meta/iconTex.tga.gz")) {
|
||||
std::string path = "rcc:/meta/iconTex.tga.gz";
|
||||
reader = new FileReaderCompressed(path);
|
||||
}
|
||||
if (reader) {
|
||||
uint32_t alreadyRead = 0;
|
||||
uint32_t toRead = sizeof(gReplacementInfo.rpxReplacementInfo.iconCache);
|
||||
do {
|
||||
int read = reader->read(reinterpret_cast<uint8_t *>(&gReplacementInfo.rpxReplacementInfo.iconCache[alreadyRead]), toRead);
|
||||
if (read <= 0) {
|
||||
break;
|
||||
}
|
||||
alreadyRead += read;
|
||||
toRead -= read;
|
||||
} while (alreadyRead < sizeof(gReplacementInfo.rpxReplacementInfo.iconCache));
|
||||
delete reader;
|
||||
if (WUHBUtils_ReadWholeFile("rcc:/meta/iconTex.tga", &buffer, &bufferSize) == WUHB_UTILS_RESULT_SUCCESS) {
|
||||
uint32_t cpySize = ICON_SIZE;
|
||||
if (bufferSize < cpySize) {
|
||||
cpySize = bufferSize;
|
||||
memset(gReplacementInfo.rpxReplacementInfo.iconCache, 0, ICON_SIZE);
|
||||
}
|
||||
memcpy(gReplacementInfo.rpxReplacementInfo.iconCache, buffer, cpySize);
|
||||
free(buffer);
|
||||
} else {
|
||||
memset(gReplacementInfo.rpxReplacementInfo.iconCache, 0, sizeof(gReplacementInfo.rpxReplacementInfo.iconCache));
|
||||
memcpy(gReplacementInfo.rpxReplacementInfo.iconCache, defaultIconTexTGA, ICON_SIZE);
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to read iconTex.tga");
|
||||
}
|
||||
|
||||
auto outRes = 0;
|
||||
if (WUHBUtils_UnmountBundle("rcc", &outRes) != WUHB_UTILS_RESULT_SUCCESS || outRes != WUHB_UTILS_RESULT_SUCCESS) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to unmount bundle");
|
||||
}
|
||||
romfsUnmount("rcc");
|
||||
}
|
||||
} else {
|
||||
if (!(gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE &&
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted)) {
|
||||
memset(gReplacementInfo.rpxReplacementInfo.iconCache, 0, sizeof(gReplacementInfo.rpxReplacementInfo.iconCache));
|
||||
if (!gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) {
|
||||
memcpy(gReplacementInfo.rpxReplacementInfo.iconCache, defaultIconTexTGA, ICON_SIZE);
|
||||
}
|
||||
}
|
||||
|
||||
if (!metaLoaded) {
|
||||
gReplacementInfo.rpxReplacementInfo.metaInformation.author[0] = '\0';
|
||||
gReplacementInfo.rpxReplacementInfo.metaInformation.author[0] = '\0';
|
||||
gReplacementInfo.rpxReplacementInfo.metaInformation.shortname[0] = '\0';
|
||||
gReplacementInfo.rpxReplacementInfo.metaInformation.longname[0] = '\0';
|
||||
gReplacementInfo.rpxReplacementInfo.metaInformation.longname[0] = '\0';
|
||||
|
||||
strncat(gReplacementInfo.rpxReplacementInfo.metaInformation.author, bundle_path, sizeof(gReplacementInfo.rpxReplacementInfo.metaInformation.author) - 1);
|
||||
strncat(gReplacementInfo.rpxReplacementInfo.metaInformation.shortname, bundle_path, sizeof(gReplacementInfo.rpxReplacementInfo.metaInformation.shortname) - 1);
|
||||
|
@ -181,134 +221,202 @@ bool RL_LoadFromSDOnNextLaunch(const char *bundle_path) {
|
|||
request.path[0] = '\0';
|
||||
strncat(request.path, bundle_path, sizeof(request.path) - 1);
|
||||
|
||||
DCFlushRange(&request, sizeof(LOAD_REQUEST));
|
||||
|
||||
int success = false;
|
||||
int mcpFd = IOS_Open("/dev/mcp", (IOSOpenMode) 0);
|
||||
if (mcpFd >= 0) {
|
||||
int out = 0;
|
||||
IOS_Ioctl(mcpFd, 100, &request, sizeof(request), &out, sizeof(out));
|
||||
if (out > 0) {
|
||||
success = true;
|
||||
}
|
||||
|
||||
IOS_Close(mcpFd);
|
||||
OSMemoryBarrier();
|
||||
bool success = false;
|
||||
MochaUtilsStatus res;
|
||||
if ((res = Mocha_PrepareRPXLaunch(&request)) == MOCHA_RESULT_SUCCESS) {
|
||||
success = true;
|
||||
} else {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to prepare rpx launch: %s", Mocha_GetStatusStr(res));
|
||||
}
|
||||
|
||||
DCFlushRange(&gReplacementInfo, sizeof(gReplacementInfo));
|
||||
|
||||
if (!success) {
|
||||
request.target = LOAD_RPX_TARGET_EXTRA_REVERT_PREPARE;
|
||||
Mocha_PrepareRPXLaunch(&request);
|
||||
|
||||
gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced = false;
|
||||
DEBUG_FUNCTION_LINE("Failed to load %s on next restart", request.path);
|
||||
return false;
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to load %s on next restart", request.path);
|
||||
return RPX_LOADER_RESULT_UNKNOWN_ERROR;
|
||||
} else {
|
||||
gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced = true;
|
||||
}
|
||||
|
||||
DEBUG_FUNCTION_LINE("Launch %s on next restart [size: %08X offset: %08X]", request.path, request.filesize, request.fileoffset);
|
||||
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath[0] = '\0';
|
||||
if (isBundle) {
|
||||
DEBUG_FUNCTION_LINE("Loaded file is a .wuhb bundle");
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath[0] = '\0';
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("Loaded file is a .wuhb bundle");
|
||||
strncat(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath,
|
||||
completePath.c_str(),
|
||||
sizeof(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath) - 1);
|
||||
gReplacementInfo.contentReplacementInfo.mode = CONTENTREDIRECT_FROM_WUHB_BUNDLE;
|
||||
} else {
|
||||
DEBUG_FUNCTION_LINE("Loaded file is no bundle");
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("Loaded file is no bundle");
|
||||
gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced = true;
|
||||
|
||||
if (gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE &&
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) {
|
||||
if (gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) {
|
||||
// keep the old /vol/content mounted, this way you can reload just the rpx via wiiload
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath[0] = '\0';
|
||||
strncat(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath,
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.mountedPath,
|
||||
sizeof(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath) - 1);
|
||||
sizeof(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath) - 2);
|
||||
}
|
||||
}
|
||||
|
||||
DCFlushRange(&gReplacementInfo, sizeof(gReplacementInfo));
|
||||
strncpy(gReplacementInfo.lastFileLoaded, bundle_path, sizeof(gReplacementInfo.lastFileLoaded) - 2);
|
||||
|
||||
return true;
|
||||
OSMemoryBarrier();
|
||||
|
||||
return RPX_LOADER_RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
int32_t RL_MountBundle(const char *name, const char *path, BundleSource source) {
|
||||
return romfsMount(name, path, (RomfsSource) source);
|
||||
RPXLoaderStatus RL_LaunchPreparedHomebrew() {
|
||||
// Request to launch the homebrew wrapper (H&S or Daily Log)
|
||||
auto res = Mocha_LaunchHomebrewWrapper();
|
||||
if (res != MOCHA_RESULT_SUCCESS) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Launch failed: %s", Mocha_GetStatusStr(res));
|
||||
}
|
||||
if (res == MOCHA_RESULT_NOT_FOUND) {
|
||||
return RPX_LOADER_RESULT_NOT_FOUND;
|
||||
} else if (res != MOCHA_RESULT_SUCCESS) {
|
||||
return RPX_LOADER_RESULT_UNKNOWN_ERROR;
|
||||
}
|
||||
return RPX_LOADER_RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
int32_t RL_UnmountBundle(const char *name) {
|
||||
return romfsUnmount(name);
|
||||
}
|
||||
RPXLoaderStatus RL_LaunchHomebrew(const char *bundle_path) {
|
||||
RPXLoaderStatus res = RPX_LOADER_RESULT_SUCCESS;
|
||||
// Tell iosu which .rpx to launch and prepare the content redirection.
|
||||
if ((res = RL_PrepareLaunchFromSD(bundle_path)) != RPX_LOADER_RESULT_SUCCESS) {
|
||||
return res;
|
||||
}
|
||||
// Request to launch the homebrew wrapper (H&S or Daily Log)
|
||||
if ((res = RL_LaunchPreparedHomebrew()) != RPX_LOADER_RESULT_SUCCESS) {
|
||||
// If we fail to launch the correct application, we revert the .rpx redirection.
|
||||
MochaRPXLoadInfo loadInfoRevert;
|
||||
loadInfoRevert.target = LOAD_RPX_TARGET_EXTRA_REVERT_PREPARE;
|
||||
|
||||
int32_t RL_FileOpen(const char *name, uint32_t *handle) {
|
||||
if (handle == nullptr) {
|
||||
return -1;
|
||||
if (MochaUtilsStatus mochaRes = Mocha_PrepareRPXLaunch(&loadInfoRevert); mochaRes != MOCHA_RESULT_SUCCESS) {
|
||||
DEBUG_FUNCTION_LINE_WARN("Revert Mocha_PrepareRPXLaunch failed: %s [%d]", Mocha_GetStatusStr(mochaRes), mochaRes);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
FileReader *reader = nullptr;
|
||||
std::string path = std::string(name);
|
||||
std::string pathGZ = path + ".gz";
|
||||
return res;
|
||||
}
|
||||
|
||||
if (CheckFile(path.c_str())) {
|
||||
reader = new FileReader(path);
|
||||
} else if (CheckFile(pathGZ.c_str())) {
|
||||
reader = new FileReaderCompressed(pathGZ);
|
||||
std::mutex mutex;
|
||||
|
||||
RPXLoaderStatus RL_DisableContentRedirection() {
|
||||
std::lock_guard<std::mutex> lock(mutex);
|
||||
if (contentLayerHandle != 0) {
|
||||
if (ContentRedirection_SetActive(contentLayerHandle, false) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
|
||||
return RPX_LOADER_RESULT_UNKNOWN_ERROR;
|
||||
}
|
||||
}
|
||||
if (saveLayerHandle != 0) {
|
||||
if (ContentRedirection_SetActive(saveLayerHandle, false) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
|
||||
ContentRedirection_SetActive(contentLayerHandle, true);
|
||||
return RPX_LOADER_RESULT_UNKNOWN_ERROR;
|
||||
}
|
||||
}
|
||||
return RPX_LOADER_RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
RPXLoaderStatus RL_EnableContentRedirection() {
|
||||
std::lock_guard<std::mutex> lock(mutex);
|
||||
if (contentLayerHandle != 0) {
|
||||
if (ContentRedirection_SetActive(contentLayerHandle, true) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
|
||||
return RPX_LOADER_RESULT_UNKNOWN_ERROR;
|
||||
}
|
||||
}
|
||||
if (saveLayerHandle != 0) {
|
||||
if (ContentRedirection_SetActive(saveLayerHandle, true) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
|
||||
ContentRedirection_SetActive(contentLayerHandle, false);
|
||||
return RPX_LOADER_RESULT_UNKNOWN_ERROR;
|
||||
}
|
||||
}
|
||||
return RPX_LOADER_RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
RPXLoaderStatus RL_UnmountCurrentRunningBundle() {
|
||||
std::lock_guard<std::mutex> lock(mutex);
|
||||
if (gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted == false) {
|
||||
return RPX_LOADER_RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
int outRes = -1;
|
||||
if (ContentRedirection_RemoveDevice(WUHB_ROMFS_PATH, &outRes) == CONTENT_REDIRECTION_RESULT_SUCCESS) {
|
||||
if (outRes < 0) {
|
||||
DEBUG_FUNCTION_LINE_ERR("RemoveDevice \"%s\" failed for ContentRedirection Module", WUHB_ROMFS_NAME);
|
||||
OSFatal("RL_UnmountCurrentRunningBundle: RemoveDevice \"" WUHB_ROMFS_NAME "\" failed for ContentRedirection Module");
|
||||
}
|
||||
} else {
|
||||
return -2;
|
||||
DEBUG_FUNCTION_LINE_ERR("ContentRedirection_RemoveDevice failed");
|
||||
OSFatal("RL_UnmountCurrentRunningBundle: ContentRedirection_RemoveDevice failed");
|
||||
}
|
||||
if (reader == nullptr) {
|
||||
return -3;
|
||||
|
||||
RPXLoaderStatus res = RPX_LOADER_RESULT_SUCCESS;
|
||||
|
||||
if (contentLayerHandle != 0) {
|
||||
if (ContentRedirection_RemoveFSLayer(contentLayerHandle) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
|
||||
res = RPX_LOADER_RESULT_UNKNOWN_ERROR;
|
||||
}
|
||||
contentLayerHandle = 0;
|
||||
}
|
||||
*handle = (uint32_t) reader;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t RL_FileRead(uint32_t handle, uint8_t *buffer, uint32_t size) {
|
||||
auto reader = (FileReader *) handle;
|
||||
return reader->read(buffer, size);
|
||||
}
|
||||
|
||||
int32_t RL_FileClose(uint32_t handle) {
|
||||
auto reader = (FileReader *) handle;
|
||||
delete reader;
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool RL_FileExists(const char *name) {
|
||||
std::string checkgz = std::string(name) + ".gz";
|
||||
return CheckFile(name) || CheckFile(checkgz.c_str());
|
||||
}
|
||||
|
||||
bool RL_RedirectContentWithFallback(const char * newContentPath) {
|
||||
auto dirHandle = opendir(newContentPath);
|
||||
if (dirHandle == nullptr) {
|
||||
return false;
|
||||
if (saveLayerHandle != 0) {
|
||||
if (ContentRedirection_RemoveFSLayer(saveLayerHandle) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
|
||||
res = RPX_LOADER_RESULT_UNKNOWN_ERROR;
|
||||
}
|
||||
saveLayerHandle = 0;
|
||||
}
|
||||
closedir(dirHandle);
|
||||
|
||||
gReplacementInfo.contentReplacementInfo.replacementPath[0] = '\0';
|
||||
strncat(gReplacementInfo.contentReplacementInfo.replacementPath, newContentPath, sizeof(gReplacementInfo.contentReplacementInfo.replacementPath) - 1);
|
||||
gReplacementInfo.contentReplacementInfo.mode = CONTENTREDIRECT_FROM_PATH;
|
||||
gReplacementInfo.contentReplacementInfo.fallbackOnError = true;
|
||||
gReplacementInfo.contentReplacementInfo.replaceSave = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool RL_DisableContentRedirection() {
|
||||
if (gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) {
|
||||
gReplacementInfo.contentReplacementInfo.mode = CONTENTREDIRECT_NONE;
|
||||
return true;
|
||||
if (romfsUnmount(WUHB_ROMFS_NAME) < 0) {
|
||||
DEBUG_FUNCTION_LINE_WARN("Failed to unmount romfs \"%s\"", WUHB_ROMFS_NAME);
|
||||
}
|
||||
return false;
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted = false;
|
||||
OSMemoryBarrier();
|
||||
return res;
|
||||
}
|
||||
|
||||
WUMS_EXPORT_FUNCTION(RL_LoadFromSDOnNextLaunch);
|
||||
WUMS_EXPORT_FUNCTION(RL_MountBundle);
|
||||
WUMS_EXPORT_FUNCTION(RL_UnmountBundle);
|
||||
WUMS_EXPORT_FUNCTION(RL_FileOpen);
|
||||
WUMS_EXPORT_FUNCTION(RL_FileRead);
|
||||
WUMS_EXPORT_FUNCTION(RL_FileClose);
|
||||
WUMS_EXPORT_FUNCTION(RL_FileExists);
|
||||
WUMS_EXPORT_FUNCTION(RL_RedirectContentWithFallback);
|
||||
WUMS_EXPORT_FUNCTION(RL_DisableContentRedirection);
|
||||
RPXLoaderStatus RL_GetVersion(RPXLoaderVersion *outVersion) {
|
||||
if (!outVersion) {
|
||||
return RPX_LOADER_RESULT_INVALID_ARGUMENT;
|
||||
}
|
||||
*outVersion = 3;
|
||||
return RPX_LOADER_RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
RPXLoaderStatus RL_GetPathOfRunningExecutable(char *outBuffer, uint32_t outSize) {
|
||||
if (outBuffer == nullptr || outSize == 0) {
|
||||
return RPX_LOADER_RESULT_INVALID_ARGUMENT;
|
||||
}
|
||||
if (strlen(gReplacementInfo.lastFileLoaded) > 0) {
|
||||
strncpy(outBuffer, gReplacementInfo.lastFileLoaded, outSize - 1);
|
||||
return RPX_LOADER_RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
return RPX_LOADER_RESULT_NOT_AVAILABLE;
|
||||
}
|
||||
|
||||
RPXLoaderStatus RL_GetPathOfSaveRedirection(char *outBuffer, uint32_t outSize) {
|
||||
if (outBuffer == nullptr || outSize == 0) {
|
||||
return RPX_LOADER_RESULT_INVALID_ARGUMENT;
|
||||
}
|
||||
if (saveLayerHandle != 0 && !gActiveSaveRedirectionPath.empty()) {
|
||||
strncpy(outBuffer, gActiveSaveRedirectionPath.c_str(), outSize - 1);
|
||||
return RPX_LOADER_RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
return RPX_LOADER_RESULT_NOT_AVAILABLE;
|
||||
}
|
||||
|
||||
WUMS_EXPORT_FUNCTION(RL_PrepareLaunchFromSD);
|
||||
WUMS_EXPORT_FUNCTION(RL_LaunchPreparedHomebrew);
|
||||
WUMS_EXPORT_FUNCTION(RL_LaunchHomebrew);
|
||||
|
||||
WUMS_EXPORT_FUNCTION(RL_GetVersion);
|
||||
WUMS_EXPORT_FUNCTION(RL_EnableContentRedirection);
|
||||
WUMS_EXPORT_FUNCTION(RL_DisableContentRedirection);
|
||||
WUMS_EXPORT_FUNCTION(RL_UnmountCurrentRunningBundle);
|
||||
WUMS_EXPORT_FUNCTION(RL_GetPathOfRunningExecutable);
|
||||
WUMS_EXPORT_FUNCTION(RL_GetPathOfSaveRedirection);
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
#include <function_patcher/function_patching.h>
|
||||
#include <cstdint>
|
||||
#include <function_patcher/function_patching.h>
|
||||
#include <rpxloader/rpxloader.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -18,8 +19,9 @@ typedef struct __attribute((packed)) {
|
|||
extern function_replacement_data_t rpx_utils_function_replacements[];
|
||||
extern uint32_t rpx_utils_function_replacements_size;
|
||||
|
||||
void RPXLoadingCleanUp();
|
||||
RPXLoaderStatus RL_UnmountCurrentRunningBundle();
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
|
5468
src/data/defaultIcon.c
Normal file
5468
src/data/defaultIcon.c
Normal file
File diff suppressed because it is too large
Load Diff
3
src/data/defaultIcon.h
Normal file
3
src/data/defaultIcon.h
Normal file
|
@ -0,0 +1,3 @@
|
|||
#include <stdint.h>
|
||||
|
||||
extern uint8_t defaultIconTexTGA[];
|
|
@ -1,3 +1,6 @@
|
|||
#include "globals.h"
|
||||
|
||||
RPXLoader_ReplacementInformation gReplacementInfo __attribute__((section(".data")));
|
||||
#include "globals.h"
|
||||
|
||||
RPXLoader_ReplacementInformation gReplacementInfo = {};
|
||||
CRLayerHandle contentLayerHandle = 0;
|
||||
CRLayerHandle saveLayerHandle = 0;
|
||||
std::string gActiveSaveRedirectionPath;
|
|
@ -1,51 +1,57 @@
|
|||
#include <wums.h>
|
||||
#include "utils/utils.h"
|
||||
#include <content_redirection/redirection.h>
|
||||
#include <coreinit/filesystem.h>
|
||||
#include <coreinit/mutex.h>
|
||||
#include <wums.h>
|
||||
#include <wut.h>
|
||||
|
||||
typedef struct MetaInformation_t {
|
||||
#define WUHB_ROMFS_NAME "wuhbrom"
|
||||
#define WUHB_ROMFS_PATH WUHB_ROMFS_NAME ":"
|
||||
#define WUHB_ROMFS_CONTENT_PATH WUHB_ROMFS_PATH "/content"
|
||||
|
||||
typedef struct WUT_PACKED MetaInformation_t {
|
||||
char shortname[64];
|
||||
char longname[64];
|
||||
char author[64];
|
||||
} MetaInformation;
|
||||
WUT_CHECK_SIZE(MetaInformation_t, 0xC0);
|
||||
|
||||
typedef struct BundleMountInformation_t {
|
||||
typedef struct ContentRedirectionInformation_t {
|
||||
bool isMounted;
|
||||
char toMountPath[255];
|
||||
char mountedPath[255];
|
||||
} BundleMountInformation;
|
||||
|
||||
typedef struct RPXReplacementInfo_t {
|
||||
#define ICON_SIZE 65580
|
||||
|
||||
typedef struct WUT_PACKED RPXReplacementInfo_t {
|
||||
bool willRPXBeReplaced;
|
||||
bool isRPXReplaced;
|
||||
MetaInformation metaInformation;
|
||||
char iconCache[65580];
|
||||
WUT_UNKNOWN_BYTES(0x3E);
|
||||
char iconCache[ROUNDUP(ICON_SIZE, 0x040)];
|
||||
} RPXReplacementInfo;
|
||||
|
||||
typedef enum ContentRedirect_Mode {
|
||||
CONTENTREDIRECT_NONE,
|
||||
CONTENTREDIRECT_FROM_WUHB_BUNDLE,
|
||||
CONTENTREDIRECT_FROM_PATH,
|
||||
} ContentRedirect_Mode;
|
||||
// make sure the iconCache is aligned to 0x40
|
||||
WUT_CHECK_OFFSET(RPXReplacementInfo, 0x100, iconCache);
|
||||
|
||||
typedef struct ContentReplacementInfo_t {
|
||||
ContentRedirect_Mode mode;
|
||||
|
||||
BundleMountInformation bundleMountInformation;
|
||||
|
||||
char workingDir[255];
|
||||
|
||||
char replacementPath[255];
|
||||
|
||||
bool replaceSave;
|
||||
|
||||
char savePath[255];
|
||||
|
||||
bool fallbackOnError;
|
||||
char replacementPath[0x280];
|
||||
} ContentReplacementInfo;
|
||||
|
||||
typedef struct ContentReplacementWithFallback_t {
|
||||
char replacementPath[0x280];
|
||||
} ContentReplacementWithFallback;
|
||||
|
||||
typedef struct RPXLoader_ReplacementInformation_t {
|
||||
RPXReplacementInfo rpxReplacementInfo;
|
||||
ContentReplacementInfo contentReplacementInfo;
|
||||
ContentReplacementWithFallback contentReplacementWithFallbackInfo;
|
||||
char lastFileLoaded[0x280];
|
||||
} RPXLoader_ReplacementInformation;
|
||||
|
||||
extern RPXLoader_ReplacementInformation gReplacementInfo;
|
||||
|
||||
extern RPXLoader_ReplacementInformation gReplacementInfo;
|
||||
extern CRLayerHandle contentLayerHandle;
|
||||
extern CRLayerHandle saveLayerHandle;
|
||||
extern std::string gActiveSaveRedirectionPath;
|
215
src/main.cpp
215
src/main.cpp
|
@ -1,49 +1,78 @@
|
|||
#include <wums.h>
|
||||
#include <cstring>
|
||||
#include <whb/log_udp.h>
|
||||
#include "FileUtils.h"
|
||||
#include "RPXLoading.h"
|
||||
#include "globals.h"
|
||||
#include "utils/StringTools.h"
|
||||
#include "utils/logger.h"
|
||||
#include "version.h"
|
||||
#include <content_redirection/redirection.h>
|
||||
#include <coreinit/cache.h>
|
||||
#include <coreinit/debug.h>
|
||||
#include <coreinit/title.h>
|
||||
#include <sysapp/title.h>
|
||||
#include <string>
|
||||
#include "utils/logger.h"
|
||||
#include "utils/StringTools.h"
|
||||
#include "FSFileReplacements.h"
|
||||
#include "globals.h"
|
||||
#include "FileUtils.h"
|
||||
#include "FSDirReplacements.h"
|
||||
#include "RPXLoading.h"
|
||||
|
||||
#include <romfs_dev.h>
|
||||
#include <coreinit/cache.h>
|
||||
#include <mocha/mocha.h>
|
||||
#include <nn/act.h>
|
||||
#include <romfs_dev.h>
|
||||
#include <string>
|
||||
#include <sysapp/title.h>
|
||||
#include <wuhb_utils/utils.h>
|
||||
#include <wums.h>
|
||||
|
||||
#define VERSION "v0.3.4"
|
||||
|
||||
WUMS_MODULE_EXPORT_NAME("homebrew_rpx_loader");
|
||||
WUMS_USE_WUT_DEVOPTAB();
|
||||
|
||||
WUMS_DEPENDS_ON(homebrew_content_redirection);
|
||||
WUMS_DEPENDS_ON(homebrew_wuhb_utils);
|
||||
WUMS_DEPENDS_ON(homebrew_functionpatcher);
|
||||
|
||||
WUMS_INITIALIZE() {
|
||||
WHBLogUdpInit();
|
||||
DEBUG_FUNCTION_LINE("Patch functions");
|
||||
// we only patch static functions, we don't need re-patch them and every launch
|
||||
FunctionPatcherPatchFunction(fs_file_function_replacements, fs_file_function_replacements_size);
|
||||
FunctionPatcherPatchFunction(fs_dir_function_replacements, fs_dir_function_replacements_size);
|
||||
FunctionPatcherPatchFunction(rpx_utils_function_replacements, rpx_utils_function_replacements_size);
|
||||
DEBUG_FUNCTION_LINE("Patch functions finished");
|
||||
gReplacementInfo = {};
|
||||
}
|
||||
initLogging();
|
||||
|
||||
|
||||
WUMS_APPLICATION_ENDS() {
|
||||
if (gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) {
|
||||
gReplacementInfo.contentReplacementInfo.mode = CONTENTREDIRECT_NONE;
|
||||
if (FunctionPatcher_InitLibrary() != FUNCTION_PATCHER_RESULT_SUCCESS) {
|
||||
OSFatal("homebrew_rpx_loader: FunctionPatcher_InitLibrary failed");
|
||||
}
|
||||
if (gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE) {
|
||||
if (gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted) {
|
||||
DEBUG_FUNCTION_LINE("Unmount /vol/content");
|
||||
romfsUnmount("rom");
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted = false;
|
||||
DCFlushRange(&gReplacementInfo, sizeof(gReplacementInfo));
|
||||
|
||||
DEBUG_FUNCTION_LINE("Patch functions");
|
||||
for (uint32_t i = 0; i < rpx_utils_function_replacements_size; i++) {
|
||||
bool wasPatched = false;
|
||||
if (FunctionPatcher_AddFunctionPatch(&rpx_utils_function_replacements[i], nullptr, &wasPatched) != FUNCTION_PATCHER_RESULT_SUCCESS || !wasPatched) {
|
||||
OSFatal("homebrew_rpx_loader: Failed to patch function");
|
||||
}
|
||||
}
|
||||
DEBUG_FUNCTION_LINE("Patch functions finished");
|
||||
gReplacementInfo = {};
|
||||
|
||||
ContentRedirectionStatus error;
|
||||
if ((error = ContentRedirection_InitLibrary()) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to init ContentRedirection. Error %d", error);
|
||||
OSFatal("Failed to init ContentRedirection.");
|
||||
}
|
||||
|
||||
WUHBUtilsStatus error2;
|
||||
if ((error2 = WUHBUtils_InitLibrary()) != WUHB_UTILS_RESULT_SUCCESS) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to init WUHBUtils. Error %d", error2);
|
||||
OSFatal("Failed to init WUHBUtils.");
|
||||
}
|
||||
|
||||
|
||||
// Init libmocha
|
||||
MochaUtilsStatus error3;
|
||||
if ((error3 = Mocha_InitLibrary()) != MOCHA_RESULT_SUCCESS) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to init libmocha. Error %s", Mocha_GetStatusStr(error3));
|
||||
OSFatal("Failed to init libmocha. Make sure to use the latest version of MochaPayload");
|
||||
}
|
||||
|
||||
deinitLogging();
|
||||
}
|
||||
|
||||
WUMS_APPLICATION_ENDS() {
|
||||
RL_UnmountCurrentRunningBundle();
|
||||
|
||||
gReplacementInfo.rpxReplacementInfo.isRPXReplaced = false;
|
||||
|
||||
RPXLoadingCleanUp();
|
||||
|
||||
deinitLogging();
|
||||
}
|
||||
|
||||
WUMS_APPLICATION_STARTS() {
|
||||
|
@ -51,62 +80,96 @@ WUMS_APPLICATION_STARTS() {
|
|||
if (upid != 2 && upid != 15) {
|
||||
return;
|
||||
}
|
||||
OSReport("Running RPXLoadingModule " VERSION VERSION_EXTRA "\n");
|
||||
initLogging();
|
||||
if (gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced) {
|
||||
gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced = false;
|
||||
gReplacementInfo.rpxReplacementInfo.isRPXReplaced = true;
|
||||
}
|
||||
WHBLogUdpInit();
|
||||
if (gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) {
|
||||
return;
|
||||
gReplacementInfo.rpxReplacementInfo.isRPXReplaced = true;
|
||||
}
|
||||
|
||||
if (_SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_HEALTH_AND_SAFETY) != OSGetTitleID()) {
|
||||
DEBUG_FUNCTION_LINE("Set gTryToReplaceOnNextLaunch, gReplacedRPX and gIsMounted to FALSE");
|
||||
gReplacementInfo.contentReplacementInfo.mode = CONTENTREDIRECT_NONE;
|
||||
DCFlushRange(&gReplacementInfo, sizeof(gReplacementInfo));
|
||||
} else {
|
||||
if (gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_WUHB_BUNDLE) {
|
||||
uint32_t currentHash = StringTools::hash(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath);
|
||||
gReplacementInfo.lastFileLoaded[0] = '\0';
|
||||
}
|
||||
|
||||
nn::act::Initialize();
|
||||
nn::act::PersistentId slot = nn::act::GetPersistentId();
|
||||
nn::act::Finalize();
|
||||
gActiveSaveRedirectionPath.clear();
|
||||
|
||||
std::string basePath = StringTools::strfmt("/vol/external01/wiiu/apps/save/%08X", currentHash);
|
||||
std::string common = StringTools::strfmt("fs:/vol/external01/wiiu/apps/save/%08X/common", currentHash);
|
||||
std::string user = StringTools::strfmt("fs:/vol/external01/wiiu/apps/save/%08X/%08X", currentHash, 0x80000000 | slot);
|
||||
if (_SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_HEALTH_AND_SAFETY) == OSGetTitleID() &&
|
||||
strlen(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath) > 0) {
|
||||
uint32_t currentHash = StringTools::hash(gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath);
|
||||
std::string shortNameSanitized = sanitizeName(gReplacementInfo.rpxReplacementInfo.metaInformation.shortname);
|
||||
|
||||
gReplacementInfo.contentReplacementInfo.savePath[0] = '\0';
|
||||
strncat(gReplacementInfo.contentReplacementInfo.savePath,
|
||||
basePath.c_str(),
|
||||
sizeof(gReplacementInfo.contentReplacementInfo.savePath) - 1);
|
||||
nn::act::Initialize();
|
||||
nn::act::PersistentId persistentId = nn::act::GetPersistentId();
|
||||
nn::act::Finalize();
|
||||
|
||||
memset(gReplacementInfo.contentReplacementInfo.workingDir, 0, sizeof(gReplacementInfo.contentReplacementInfo.workingDir));
|
||||
std::string relativePath = string_format("wiiu/apps/save/%08X", currentHash);
|
||||
if (!shortNameSanitized.empty()) {
|
||||
relativePath += string_format(" (%s)", shortNameSanitized.c_str());
|
||||
}
|
||||
std::string basePath = "fs:/vol/external01/" + relativePath;
|
||||
|
||||
CreateSubfolder(common.c_str());
|
||||
CreateSubfolder(user.c_str());
|
||||
DEBUG_FUNCTION_LINE("Created %s and %s", common.c_str(), user.c_str());
|
||||
if (romfsMount("rom", gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath, RomfsSource_FileDescriptor_CafeOS) == 0) {
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.mountedPath[0] = '\0';
|
||||
strncat(gReplacementInfo.contentReplacementInfo.bundleMountInformation.mountedPath,
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath,
|
||||
sizeof(gReplacementInfo.contentReplacementInfo.bundleMountInformation.mountedPath) - 1);
|
||||
std::string common = basePath + "/common";
|
||||
std::string user = basePath + string_format("/%08X", 0x80000000 | persistentId);
|
||||
|
||||
CreateSubfolder(common.c_str());
|
||||
CreateSubfolder(user.c_str());
|
||||
DEBUG_FUNCTION_LINE("Created %s and %s", common.c_str(), user.c_str());
|
||||
|
||||
gReplacementInfo.contentReplacementInfo.replacementPath[0] = '\0';
|
||||
strncat(gReplacementInfo.contentReplacementInfo.replacementPath,
|
||||
"rom:/content",
|
||||
sizeof(gReplacementInfo.contentReplacementInfo.replacementPath) - 1);
|
||||
|
||||
DEBUG_FUNCTION_LINE("Mounted %s to /vol/content", gReplacementInfo.contentReplacementInfo.bundleMountInformation.mountedPath);
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted = true;
|
||||
} else {
|
||||
DEBUG_FUNCTION_LINE("Failed to mount %s", gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath);
|
||||
if (romfsMount(WUHB_ROMFS_NAME, gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath, RomfsSource_FileDescriptor_CafeOS) == 0) {
|
||||
auto device = GetDeviceOpTab(WUHB_ROMFS_PATH);
|
||||
if (device == nullptr || strcmp(device->name, WUHB_ROMFS_NAME) != 0) {
|
||||
romfsUnmount(WUHB_ROMFS_NAME);
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted = false;
|
||||
DEBUG_FUNCTION_LINE_ERR("DeviceOpTab for %s not found.", WUHB_ROMFS_PATH);
|
||||
return;
|
||||
}
|
||||
int outRes = -1;
|
||||
if (ContentRedirection_AddDevice(device, &outRes) != CONTENT_REDIRECTION_RESULT_SUCCESS || outRes < 0) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to AddDevice to ContentRedirection");
|
||||
romfsUnmount(WUHB_ROMFS_NAME);
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted = false;
|
||||
return;
|
||||
}
|
||||
auto res = ContentRedirection_AddFSLayer(&contentLayerHandle,
|
||||
"WUHB Content",
|
||||
WUHB_ROMFS_CONTENT_PATH,
|
||||
FS_LAYER_TYPE_CONTENT_REPLACE);
|
||||
if (res == CONTENT_REDIRECTION_RESULT_SUCCESS) {
|
||||
res = ContentRedirection_AddFSLayer(&saveLayerHandle,
|
||||
"WUHB Save",
|
||||
basePath.c_str(),
|
||||
FS_LAYER_TYPE_SAVE_REPLACE);
|
||||
if (res == CONTENT_REDIRECTION_RESULT_SUCCESS) {
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.mountedPath[0] = '\0';
|
||||
strncpy(gReplacementInfo.contentReplacementInfo.bundleMountInformation.mountedPath,
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath,
|
||||
sizeof(gReplacementInfo.contentReplacementInfo.bundleMountInformation.mountedPath));
|
||||
DEBUG_FUNCTION_LINE_VERBOSE("Mounted %s to /vol/content", gReplacementInfo.contentReplacementInfo.bundleMountInformation.mountedPath);
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted = true;
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath[0] = '\0';
|
||||
|
||||
gActiveSaveRedirectionPath = relativePath;
|
||||
|
||||
OSMemoryBarrier();
|
||||
return;
|
||||
} else {
|
||||
if (contentLayerHandle != 0) {
|
||||
ContentRedirection_RemoveFSLayer(contentLayerHandle);
|
||||
contentLayerHandle = 0;
|
||||
}
|
||||
DEBUG_FUNCTION_LINE_ERR("ContentRedirection_AddFSLayer had failed for save");
|
||||
}
|
||||
} else {
|
||||
int outRes = -1;
|
||||
if (ContentRedirection_RemoveDevice(WUHB_ROMFS_PATH, &outRes) != CONTENT_REDIRECTION_RESULT_SUCCESS || res < 0) {
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to remove device");
|
||||
}
|
||||
romfsUnmount(WUHB_ROMFS_PATH);
|
||||
DEBUG_FUNCTION_LINE_ERR("ContentRedirection_AddFSLayer had failed for content");
|
||||
}
|
||||
}
|
||||
|
||||
DCFlushRange(&gReplacementInfo, sizeof(gReplacementInfo));
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to mount %s", gReplacementInfo.contentReplacementInfo.bundleMountInformation.toMountPath);
|
||||
gReplacementInfo.contentReplacementInfo.bundleMountInformation.isMounted = false;
|
||||
OSMemoryBarrier();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#include "logger.h"
|
||||
#include <cstring>
|
||||
|
||||
int FileReader::read(uint8_t *buffer, uint32_t size) {
|
||||
int64_t FileReader::read(uint8_t *buffer, uint32_t size) {
|
||||
if (isReadFromBuffer) {
|
||||
if (input_buffer == nullptr) {
|
||||
return -1;
|
||||
|
@ -14,7 +14,7 @@ int FileReader::read(uint8_t *buffer, uint32_t size) {
|
|||
if (toRead == 0) {
|
||||
return 0;
|
||||
}
|
||||
memcpy(buffer, input_buffer + input_pos, toRead);
|
||||
memcpy(buffer, &input_buffer[input_pos], toRead);
|
||||
input_pos += toRead;
|
||||
return toRead;
|
||||
} else if (isReadFromFile) {
|
||||
|
@ -25,13 +25,13 @@ int FileReader::read(uint8_t *buffer, uint32_t size) {
|
|||
}
|
||||
|
||||
FileReader::FileReader(std::string &path) {
|
||||
int fd = -1;
|
||||
int fd;
|
||||
if ((fd = open(path.c_str(), O_RDONLY)) >= 0) {
|
||||
this->isReadFromFile = true;
|
||||
this->isReadFromFile = true;
|
||||
this->isReadFromBuffer = false;
|
||||
this->file_fd = fd;
|
||||
this->file_fd = fd;
|
||||
} else {
|
||||
DEBUG_FUNCTION_LINE("Failed to open file %s", path.c_str());
|
||||
DEBUG_FUNCTION_LINE_ERR("Failed to open file %s", path.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -42,9 +42,9 @@ FileReader::~FileReader() {
|
|||
}
|
||||
|
||||
FileReader::FileReader(uint8_t *buffer, uint32_t size) {
|
||||
this->input_buffer = buffer;
|
||||
this->input_size = size;
|
||||
this->input_pos = 0;
|
||||
this->input_buffer = buffer;
|
||||
this->input_size = size;
|
||||
this->input_pos = 0;
|
||||
this->isReadFromBuffer = true;
|
||||
this->isReadFromFile = false;
|
||||
this->isReadFromFile = false;
|
||||
}
|
||||
|
|
|
@ -1,27 +1,32 @@
|
|||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <string>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
class FileReader {
|
||||
|
||||
public:
|
||||
FileReader(uint8_t *buffer, uint32_t size);
|
||||
|
||||
explicit FileReader(std::string &path);
|
||||
|
||||
virtual ~FileReader();
|
||||
|
||||
virtual int read(uint8_t *buffer, uint32_t size) ;
|
||||
virtual int64_t read(uint8_t *buffer, uint32_t size);
|
||||
|
||||
uint32_t getHandle() {
|
||||
return (uint32_t) this;
|
||||
}
|
||||
|
||||
private:
|
||||
bool isReadFromBuffer = false;
|
||||
uint8_t *input_buffer = nullptr;
|
||||
uint32_t input_size = 0;
|
||||
uint32_t input_pos = 0;
|
||||
uint32_t input_size = 0;
|
||||
uint32_t input_pos = 0;
|
||||
|
||||
bool isReadFromFile = false;
|
||||
int file_fd = 0;
|
||||
int file_fd = -1;
|
||||
};
|
||||
|
|
|
@ -1,86 +0,0 @@
|
|||
#include "FileReaderCompressed.h"
|
||||
|
||||
int FileReaderCompressed::read(uint8_t *buffer, uint32_t size) {
|
||||
int startValue = this->strm.total_out;
|
||||
uint32_t newSize = 0;
|
||||
int ret = 0;
|
||||
do {
|
||||
uint32_t nextOut = BUFFER_SIZE;
|
||||
if (nextOut > size) {
|
||||
nextOut = size;
|
||||
}
|
||||
if (this->strm.avail_in == 0) {
|
||||
int read_res = FileReader::read(this->zlib_in_buf, BUFFER_SIZE);
|
||||
if (read_res <= 0) {
|
||||
break;
|
||||
}
|
||||
this->strm.avail_in = read_res;
|
||||
this->strm.next_in = this->zlib_in_buf;
|
||||
}
|
||||
/* run inflate() on input until output buffer not full */
|
||||
do {
|
||||
if (nextOut > size - newSize) {
|
||||
nextOut = size - newSize;
|
||||
}
|
||||
|
||||
this->strm.avail_out = nextOut;
|
||||
this->strm.next_out = buffer + newSize;
|
||||
ret = inflate(&this->strm, Z_NO_FLUSH);
|
||||
|
||||
if (ret == Z_STREAM_ERROR) {
|
||||
DEBUG_FUNCTION_LINE("Z_STREAM_ERROR");
|
||||
return 0;
|
||||
}
|
||||
|
||||
switch (ret) {
|
||||
case Z_NEED_DICT:
|
||||
DEBUG_FUNCTION_LINE("Z_NEED_DICT");
|
||||
ret = Z_DATA_ERROR;
|
||||
[[fallthrough]]; /* and fall through */
|
||||
case Z_DATA_ERROR:
|
||||
case Z_MEM_ERROR:
|
||||
DEBUG_FUNCTION_LINE("Z_MEM_ERROR or Z_DATA_ERROR");
|
||||
(void) inflateEnd(&this->strm);
|
||||
return ret;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
newSize = this->strm.total_out - startValue;
|
||||
if (newSize == size) {
|
||||
break;
|
||||
}
|
||||
nextOut = BUFFER_SIZE;
|
||||
if (newSize + nextOut >= (size)) {
|
||||
nextOut = (size) - newSize;
|
||||
}
|
||||
} while (this->strm.avail_out == 0 && newSize < (size));
|
||||
|
||||
/* done when inflate() says it's done */
|
||||
} while (ret != Z_STREAM_END && newSize < size);
|
||||
|
||||
return newSize;
|
||||
}
|
||||
|
||||
FileReaderCompressed::FileReaderCompressed(std::string &file) : FileReader(file) {
|
||||
this->initCompressedData();
|
||||
}
|
||||
|
||||
void FileReaderCompressed::initCompressedData() {
|
||||
/* allocate inflate state */
|
||||
this->strm.zalloc = Z_NULL;
|
||||
this->strm.zfree = Z_NULL;
|
||||
this->strm.opaque = Z_NULL;
|
||||
this->strm.avail_in = 0;
|
||||
this->strm.next_in = Z_NULL;
|
||||
int ret = inflateInit2(&this->strm, MAX_WBITS | 16); //gzip
|
||||
if (ret != Z_OK) {
|
||||
DEBUG_FUNCTION_LINE("inflateInit2 failed");
|
||||
return;
|
||||
}
|
||||
initDone = true;
|
||||
}
|
||||
|
||||
FileReaderCompressed::FileReaderCompressed(uint8_t *buffer, uint32_t size) : FileReader(buffer, size) {
|
||||
this->initCompressedData();
|
||||
}
|
|
@ -1,27 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include <zlib.h>
|
||||
#include "FileReader.h"
|
||||
#include "logger.h"
|
||||
|
||||
#define BUFFER_SIZE 0x20000
|
||||
|
||||
class FileReaderCompressed : public FileReader {
|
||||
public:
|
||||
FileReaderCompressed(uint8_t *buffer, uint32_t size);
|
||||
|
||||
explicit FileReaderCompressed(std::string &file);
|
||||
|
||||
~FileReaderCompressed() override{
|
||||
DEBUG_FUNCTION_LINE("");
|
||||
}
|
||||
|
||||
int read(uint8_t *buffer, uint32_t size) override;
|
||||
|
||||
private:
|
||||
bool initDone = false;
|
||||
uint8_t zlib_in_buf[BUFFER_SIZE]{};
|
||||
z_stream strm{};
|
||||
|
||||
void initCompressedData();
|
||||
};
|
|
@ -1,122 +0,0 @@
|
|||
/**
|
||||
* The contents of this file are based on the article posted at the
|
||||
* following location:
|
||||
*
|
||||
* http://crascit.com/2015/06/03/on-leaving-scope-part-2/
|
||||
*
|
||||
* The material in that article has some commonality with the code made
|
||||
* available as part of Facebook's folly library at:
|
||||
*
|
||||
* https://github.com/facebook/folly/blob/master/folly/ScopeGuard.h
|
||||
*
|
||||
* Furthermore, similar material is currently part of a draft proposal
|
||||
* to the C++ standards committee, referencing the same work by Andrei
|
||||
* Alexandresu that led to the folly implementation. The draft proposal
|
||||
* can be found at:
|
||||
*
|
||||
* http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189.pdf
|
||||
*
|
||||
* With the above in mind, the content below is made available under
|
||||
* the same license terms as folly to minimize any legal concerns.
|
||||
* Should there be ambiguity over copyright ownership between Facebook
|
||||
* and myself for any material included in this file, it should be
|
||||
* interpreted that Facebook is the copyright owner for the ambiguous
|
||||
* section of code concerned.
|
||||
*
|
||||
* Craig Scott
|
||||
* 3rd June 2015
|
||||
*
|
||||
* ----------------------------------------------------------------------
|
||||
*
|
||||
* Copyright 2015 Craig Scott
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef CRASCIT_ONLEAVINGSCOPE_H
|
||||
#define CRASCIT_ONLEAVINGSCOPE_H
|
||||
|
||||
#include <utility>
|
||||
#include <type_traits>
|
||||
|
||||
|
||||
/**
|
||||
* This class is intended to be used only to create a local object on the
|
||||
* stack. It accepts a function object in its constructor and will invoke
|
||||
* that function object in its destructor. The class provides a move
|
||||
* constructor so it can be used with the onLeavingScope factory function,
|
||||
* but it cannot be copied.
|
||||
*
|
||||
* Do no use this function directly, use the onLeavingScope() factory
|
||||
* function instead.
|
||||
*/
|
||||
template<typename Func>
|
||||
class OnLeavingScope
|
||||
{
|
||||
public:
|
||||
// Prevent copying
|
||||
OnLeavingScope(const OnLeavingScope&) = delete;
|
||||
OnLeavingScope& operator=(const OnLeavingScope&) = delete;
|
||||
|
||||
// Allow moving
|
||||
OnLeavingScope(OnLeavingScope&& other) :
|
||||
m_func(std::move(other.m_func)),
|
||||
m_owner(other.m_owner)
|
||||
{
|
||||
other.m_owner = false;
|
||||
}
|
||||
|
||||
OnLeavingScope(const Func& f) :
|
||||
m_func(f),
|
||||
m_owner(true)
|
||||
{
|
||||
}
|
||||
OnLeavingScope(Func&& f) :
|
||||
m_func(std::move(f)),
|
||||
m_owner(true)
|
||||
{
|
||||
}
|
||||
~OnLeavingScope()
|
||||
{
|
||||
if (m_owner)
|
||||
m_func();
|
||||
}
|
||||
|
||||
private:
|
||||
Func m_func;
|
||||
bool m_owner;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Factory function for creating an OnLeavingScope object. It is intended
|
||||
* to be used like so:
|
||||
*
|
||||
* auto cleanup = onLeavingScope(...);
|
||||
*
|
||||
* where the ... could be a lambda function, function object or pointer to
|
||||
* a free function to be invoked when the cleanup object goes out of scope.
|
||||
* The function object must take no function arguments, but can return any
|
||||
* type (the return value is ignored).
|
||||
*
|
||||
* The \a Func template parameter would rarely, if ever, be manually
|
||||
* specified. Normally, it would be deduced automatically by the compiler
|
||||
* from the object passed as the function argument.
|
||||
*/
|
||||
template<typename Func>
|
||||
OnLeavingScope<typename std::decay<Func>::type> onLeavingScope(Func&& f)
|
||||
{
|
||||
return OnLeavingScope<typename std::decay<Func>::type>(std::forward<Func>(f));
|
||||
}
|
||||
|
||||
#endif // CRASCIT_ONLEAVINGSCOPE_H
|
|
@ -1,305 +1,14 @@
|
|||
/***************************************************************************
|
||||
* Copyright (C) 2010
|
||||
* by Dimok
|
||||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty. In no event will the authors be held liable for any
|
||||
* damages arising from the use of this software.
|
||||
*
|
||||
* Permission is granted to anyone to use this software for any
|
||||
* purpose, including commercial applications, and to alter it and
|
||||
* redistribute it freely, subject to the following restrictions:
|
||||
*
|
||||
* 1. The origin of this software must not be misrepresented; you
|
||||
* must not claim that you wrote the original software. If you use
|
||||
* this software in a product, an acknowledgment in the product
|
||||
* documentation would be appreciated but is not required.
|
||||
*
|
||||
* 2. Altered source versions must be plainly marked as such, and
|
||||
* must not be misrepresented as being the original software.
|
||||
*
|
||||
* 3. This notice may not be removed or altered from any source
|
||||
* distribution.
|
||||
*
|
||||
* for WiiXplorer 2010
|
||||
***************************************************************************/
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <wchar.h>
|
||||
#include <strings.h>
|
||||
#include <wut_types.h>
|
||||
#include <stdio.h>
|
||||
#include <utils/StringTools.h>
|
||||
|
||||
|
||||
BOOL StringTools::EndsWith(const std::string &a, const std::string &b) {
|
||||
if (b.size() > a.size())
|
||||
return false;
|
||||
return std::equal(a.begin() + a.size() - b.size(), a.end(), b.begin());
|
||||
}
|
||||
|
||||
const char *StringTools::byte_to_binary(int32_t x) {
|
||||
static char b[9];
|
||||
b[0] = '\0';
|
||||
|
||||
int32_t z;
|
||||
for (z = 128; z > 0; z >>= 1) {
|
||||
strcat(b, ((x & z) == z) ? "1" : "0");
|
||||
}
|
||||
|
||||
return b;
|
||||
}
|
||||
|
||||
std::string StringTools::removeCharFromString(std::string &input, char toBeRemoved) {
|
||||
std::string output = input;
|
||||
size_t position;
|
||||
while (1) {
|
||||
position = output.find(toBeRemoved);
|
||||
if (position == std::string::npos)
|
||||
break;
|
||||
output.erase(position, 1);
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
const char *StringTools::fmt(const char *format, ...) {
|
||||
static char strChar[512];
|
||||
strChar[0] = 0;
|
||||
|
||||
va_list va;
|
||||
va_start(va, format);
|
||||
if ((vsprintf(strChar, format, va) >= 0)) {
|
||||
va_end(va);
|
||||
return (const char *) strChar;
|
||||
}
|
||||
va_end(va);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const wchar_t *StringTools::wfmt(const char *format, ...) {
|
||||
static char tmp[512];
|
||||
static wchar_t strWChar[512];
|
||||
strWChar[0] = 0;
|
||||
tmp[0] = 0;
|
||||
|
||||
if (!format)
|
||||
return (const wchar_t *) strWChar;
|
||||
|
||||
if (strcmp(format, "") == 0)
|
||||
return (const wchar_t *) strWChar;
|
||||
|
||||
va_list va;
|
||||
va_start(va, format);
|
||||
if ((vsprintf(tmp, format, va) >= 0)) {
|
||||
int bt;
|
||||
int32_t strlength = strlen(tmp);
|
||||
bt = mbstowcs(strWChar, tmp, (strlength < 512) ? strlength : 512);
|
||||
|
||||
if (bt > 0) {
|
||||
strWChar[bt] = 0;
|
||||
return (const wchar_t *) strWChar;
|
||||
}
|
||||
}
|
||||
va_end(va);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int32_t StringTools::strprintf(std::string &str, const char *format, ...) {
|
||||
static char tmp[512];
|
||||
tmp[0] = 0;
|
||||
int32_t result = 0;
|
||||
|
||||
va_list va;
|
||||
va_start(va, format);
|
||||
if ((vsprintf(tmp, format, va) >= 0)) {
|
||||
str = tmp;
|
||||
result = str.size();
|
||||
}
|
||||
va_end(va);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
std::string StringTools::strfmt(const char *format, ...) {
|
||||
std::string str;
|
||||
static char tmp[512];
|
||||
tmp[0] = 0;
|
||||
|
||||
va_list va;
|
||||
va_start(va, format);
|
||||
if ((vsprintf(tmp, format, va) >= 0)) {
|
||||
str = tmp;
|
||||
}
|
||||
va_end(va);
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
BOOL StringTools::char2wchar_t(const char *strChar, wchar_t *dest) {
|
||||
if (!strChar || !dest)
|
||||
return false;
|
||||
|
||||
int bt;
|
||||
bt = mbstowcs(dest, strChar, strlen(strChar));
|
||||
if (bt > 0) {
|
||||
dest[bt] = 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
int32_t StringTools::strtokcmp(const char *string, const char *compare, const char *separator) {
|
||||
if (!string || !compare)
|
||||
return -1;
|
||||
|
||||
char TokCopy[512];
|
||||
strncpy(TokCopy, compare, sizeof(TokCopy));
|
||||
TokCopy[511] = '\0';
|
||||
|
||||
char *strTok = strtok(TokCopy, separator);
|
||||
|
||||
while (strTok != NULL) {
|
||||
if (strcasecmp(string, strTok) == 0) {
|
||||
return 0;
|
||||
}
|
||||
strTok = strtok(NULL, separator);
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
int32_t StringTools::strextcmp(const char *string, const char *extension, char seperator) {
|
||||
if (!string || !extension)
|
||||
return -1;
|
||||
|
||||
char *ptr = strrchr(string, seperator);
|
||||
if (!ptr)
|
||||
return -1;
|
||||
|
||||
return strcasecmp(ptr + 1, extension);
|
||||
}
|
||||
|
||||
|
||||
std::vector<std::string> StringTools::stringSplit(const std::string &inValue, const std::string &splitter) {
|
||||
std::string value = inValue;
|
||||
std::vector<std::string> result;
|
||||
while (true) {
|
||||
uint32_t index = value.find(splitter);
|
||||
if (index == std::string::npos) {
|
||||
result.push_back(value);
|
||||
break;
|
||||
}
|
||||
std::string first = value.substr(0, index);
|
||||
result.push_back(first);
|
||||
if (index + splitter.size() == value.length()) {
|
||||
result.push_back("");
|
||||
break;
|
||||
}
|
||||
if (index + splitter.size() > value.length()) {
|
||||
break;
|
||||
}
|
||||
value = value.substr(index + splitter.size(), value.length());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
const char *StringTools::FullpathToFilename(const char *path) {
|
||||
if (!path)
|
||||
return path;
|
||||
|
||||
const char *ptr = path;
|
||||
const char *Filename = ptr;
|
||||
|
||||
while (*ptr != '\0') {
|
||||
if (ptr[0] == '/' && ptr[1] != '\0')
|
||||
Filename = ptr + 1;
|
||||
|
||||
++ptr;
|
||||
}
|
||||
|
||||
return Filename;
|
||||
}
|
||||
|
||||
void StringTools::RemoveDoubleSlashs(std::string &str) {
|
||||
uint32_t length = str.size();
|
||||
|
||||
//! clear path of double slashes
|
||||
for (uint32_t i = 1; i < length; ++i) {
|
||||
if (str[i - 1] == '/' && str[i] == '/') {
|
||||
str.erase(i, 1);
|
||||
i--;
|
||||
length--;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// You must free the result if result is non-NULL.
|
||||
char *StringTools::str_replace(char *orig, char *rep, char *with) {
|
||||
char *result; // the return string
|
||||
char *ins; // the next insert point
|
||||
char *tmp; // varies
|
||||
int len_rep; // length of rep (the string to remove)
|
||||
int len_with; // length of with (the string to replace rep with)
|
||||
int len_front; // distance between rep and end of last rep
|
||||
int count; // number of replacements
|
||||
|
||||
// sanity checks and initialization
|
||||
if (!orig || !rep)
|
||||
return nullptr;
|
||||
len_rep = strlen(rep);
|
||||
if (len_rep == 0)
|
||||
return nullptr; // empty rep causes infinite loop during count
|
||||
if (!with)
|
||||
with = "";
|
||||
len_with = strlen(with);
|
||||
|
||||
// count the number of replacements needed
|
||||
ins = orig;
|
||||
for (count = 0; (tmp = strstr(ins, rep)); ++count) {
|
||||
ins = tmp + len_rep;
|
||||
}
|
||||
|
||||
tmp = result = (char *) malloc(strlen(orig) + (len_with - len_rep) * count + 1);
|
||||
|
||||
if (!result)
|
||||
return NULL;
|
||||
|
||||
// first time through the loop, all the variable are set correctly
|
||||
// from here on,
|
||||
// tmp points to the end of the result string
|
||||
// ins points to the next occurrence of rep in orig
|
||||
// orig points to the remainder of orig after "end of rep"
|
||||
while (count--) {
|
||||
ins = strstr(orig, rep);
|
||||
len_front = ins - orig;
|
||||
tmp = strncpy(tmp, orig, len_front) + len_front;
|
||||
tmp = strcpy(tmp, with) + len_with;
|
||||
orig += len_front + len_rep; // move to next "end of rep"
|
||||
}
|
||||
strcpy(tmp, orig);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* hash: compute hash value of string */
|
||||
uint32_t StringTools::hash(char *str) {
|
||||
unsigned int h;
|
||||
unsigned char *p;
|
||||
|
||||
h = 0;
|
||||
for (p = (unsigned char *) str; *p != '\0'; p++) {
|
||||
h = 37 * h + *p;
|
||||
}
|
||||
return h; // or, h % ARRAY_SIZE;
|
||||
}
|
||||
|
||||
#include <stdint.h>
|
||||
#include <utils/StringTools.h>
|
||||
|
||||
/* hash: compute hash value of string */
|
||||
uint32_t StringTools::hash(char *str) {
|
||||
unsigned int h;
|
||||
unsigned char *p;
|
||||
|
||||
h = 0;
|
||||
for (p = (unsigned char *) str; *p != '\0'; p++) {
|
||||
h = 37 * h + *p;
|
||||
}
|
||||
return h; // or, h % ARRAY_SIZE;
|
||||
}
|
||||
|
|
|
@ -1,67 +1,27 @@
|
|||
/***************************************************************************
|
||||
* Copyright (C) 2010
|
||||
* by Dimok
|
||||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty. In no event will the authors be held liable for any
|
||||
* damages arising from the use of this software.
|
||||
*
|
||||
* Permission is granted to anyone to use this software for any
|
||||
* purpose, including commercial applications, and to alter it and
|
||||
* redistribute it freely, subject to the following restrictions:
|
||||
*
|
||||
* 1. The origin of this software must not be misrepresented; you
|
||||
* must not claim that you wrote the original software. If you use
|
||||
* this software in a product, an acknowledgment in the product
|
||||
* documentation would be appreciated but is not required.
|
||||
*
|
||||
* 2. Altered source versions must be plainly marked as such, and
|
||||
* must not be misrepresented as being the original software.
|
||||
*
|
||||
* 3. This notice may not be removed or altered from any source
|
||||
* distribution.
|
||||
*
|
||||
* for WiiXplorer 2010
|
||||
***************************************************************************/
|
||||
#ifndef __STRING_TOOLS_H
|
||||
#define __STRING_TOOLS_H
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <wut_types.h>
|
||||
|
||||
class StringTools {
|
||||
public:
|
||||
static BOOL EndsWith(const std::string &a, const std::string &b);
|
||||
|
||||
static const char *byte_to_binary(int32_t x);
|
||||
|
||||
static std::string removeCharFromString(std::string &input, char toBeRemoved);
|
||||
|
||||
static const char *fmt(const char *format, ...);
|
||||
|
||||
static const wchar_t *wfmt(const char *format, ...);
|
||||
|
||||
static int32_t strprintf(std::string &str, const char *format, ...);
|
||||
|
||||
static std::string strfmt(const char *format, ...);
|
||||
|
||||
static BOOL char2wchar_t(const char *src, wchar_t *dest);
|
||||
|
||||
static int32_t strtokcmp(const char *string, const char *compare, const char *separator);
|
||||
|
||||
static int32_t strextcmp(const char *string, const char *extension, char seperator);
|
||||
|
||||
static char *str_replace(char *orig, char *rep, char *with);
|
||||
|
||||
static const char *FullpathToFilename(const char *path);
|
||||
|
||||
static void RemoveDoubleSlashs(std::string &str);
|
||||
|
||||
static std::vector<std::string> stringSplit(const std::string &value, const std::string &splitter);
|
||||
|
||||
static uint32_t hash(char *str);
|
||||
};
|
||||
|
||||
#endif /* __STRING_TOOLS_H */
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "logger.h"
|
||||
#include "utils.h"
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <wut_types.h>
|
||||
|
||||
template<typename... Args>
|
||||
std::string string_format(const std::string &format, Args... args) {
|
||||
int size_s = std::snprintf(nullptr, 0, format.c_str(), args...) + 1; // Extra space for '\0'
|
||||
auto size = static_cast<size_t>(size_s);
|
||||
auto buf = make_unique_nothrow<char[]>(size);
|
||||
if (!buf) {
|
||||
DEBUG_FUNCTION_LINE_ERR("string_format failed, not enough memory");
|
||||
OSFatal("string_format failed, not enough memory");
|
||||
return std::string("");
|
||||
}
|
||||
std::snprintf(buf.get(), size, format.c_str(), args...);
|
||||
return std::string(buf.get(), buf.get() + size - 1); // We don't want the '\0' inside
|
||||
}
|
||||
|
||||
class StringTools {
|
||||
public:
|
||||
static uint32_t hash(char *str);
|
||||
};
|
|
@ -1,12 +1,16 @@
|
|||
/* inih -- simple .INI file parser
|
||||
|
||||
SPDX-License-Identifier: BSD-3-Clause
|
||||
|
||||
Copyright (C) 2009-2020, Ben Hoyt
|
||||
|
||||
inih is released under the New BSD license (see LICENSE.txt). Go to the project
|
||||
home page for more info:
|
||||
|
||||
https://github.com/benhoyt/inih
|
||||
|
||||
*/
|
||||
|
||||
// clang-format off
|
||||
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
#endif
|
||||
|
@ -18,7 +22,17 @@ https://github.com/benhoyt/inih
|
|||
#include "ini.h"
|
||||
|
||||
#if !INI_USE_STACK
|
||||
#if INI_CUSTOM_ALLOCATOR
|
||||
#include <stddef.h>
|
||||
void* ini_malloc(size_t size);
|
||||
void ini_free(void* ptr);
|
||||
void* ini_realloc(void* ptr, size_t size);
|
||||
#else
|
||||
#include <stdlib.h>
|
||||
#define ini_malloc malloc
|
||||
#define ini_free free
|
||||
#define ini_realloc realloc
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define MAX_SECTION 50
|
||||
|
@ -48,7 +62,7 @@ static char* lskip(const char* s)
|
|||
}
|
||||
|
||||
/* Return pointer to first char (of chars) or inline comment in given string,
|
||||
or pointer to null at end of string if neither found. Inline comment must
|
||||
or pointer to NUL at end of string if neither found. Inline comment must
|
||||
be prefixed by a whitespace character to register as a comment. */
|
||||
static char* find_chars_or_comment(const char* s, const char* chars)
|
||||
{
|
||||
|
@ -67,14 +81,15 @@ static char* find_chars_or_comment(const char* s, const char* chars)
|
|||
return (char*)s;
|
||||
}
|
||||
|
||||
/* Version of strncpy that ensures dest (size bytes) is null-terminated. */
|
||||
/* Similar to strncpy, but ensures dest (size bytes) is
|
||||
NUL-terminated, and doesn't pad with NULs. */
|
||||
static char* strncpy0(char* dest, const char* src, size_t size)
|
||||
{
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wstringop-truncation"
|
||||
strncpy(dest, src, size - 1);
|
||||
#pragma GCC diagnostic pop
|
||||
dest[size - 1] = '\0';
|
||||
/* Could use strncpy internally, but it causes gcc warnings (see issue #91) */
|
||||
size_t i;
|
||||
for (i = 0; i < size - 1 && src[i]; i++)
|
||||
dest[i] = src[i];
|
||||
dest[i] = '\0';
|
||||
return dest;
|
||||
}
|
||||
|
||||
|
@ -88,11 +103,11 @@ int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
|
|||
int max_line = INI_MAX_LINE;
|
||||
#else
|
||||
char* line;
|
||||
int max_line = INI_INITIAL_ALLOC;
|
||||
size_t max_line = INI_INITIAL_ALLOC;
|
||||
#endif
|
||||
#if INI_ALLOW_REALLOC
|
||||
#if INI_ALLOW_REALLOC && !INI_USE_STACK
|
||||
char* new_line;
|
||||
int offset;
|
||||
size_t offset;
|
||||
#endif
|
||||
char section[MAX_SECTION] = "";
|
||||
char prev_name[MAX_NAME] = "";
|
||||
|
@ -105,7 +120,7 @@ int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
|
|||
int error = 0;
|
||||
|
||||
#if !INI_USE_STACK
|
||||
line = (char*)malloc(INI_INITIAL_ALLOC);
|
||||
line = (char*)ini_malloc(INI_INITIAL_ALLOC);
|
||||
if (!line) {
|
||||
return -2;
|
||||
}
|
||||
|
@ -118,20 +133,20 @@ int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
|
|||
#endif
|
||||
|
||||
/* Scan through stream line by line */
|
||||
while (reader(line, max_line, stream) != NULL) {
|
||||
#if INI_ALLOW_REALLOC
|
||||
while (reader(line, (int)max_line, stream) != NULL) {
|
||||
#if INI_ALLOW_REALLOC && !INI_USE_STACK
|
||||
offset = strlen(line);
|
||||
while (offset == max_line - 1 && line[offset - 1] != '\n') {
|
||||
max_line *= 2;
|
||||
if (max_line > INI_MAX_LINE)
|
||||
max_line = INI_MAX_LINE;
|
||||
new_line = realloc(line, max_line);
|
||||
new_line = ini_realloc(line, max_line);
|
||||
if (!new_line) {
|
||||
free(line);
|
||||
ini_free(line);
|
||||
return -2;
|
||||
}
|
||||
line = new_line;
|
||||
if (reader(line + offset, max_line - offset, stream) == NULL)
|
||||
if (reader(line + offset, (int)(max_line - offset), stream) == NULL)
|
||||
break;
|
||||
if (max_line >= INI_MAX_LINE)
|
||||
break;
|
||||
|
@ -169,6 +184,10 @@ int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
|
|||
*end = '\0';
|
||||
strncpy0(section, start + 1, sizeof(section));
|
||||
*prev_name = '\0';
|
||||
#if INI_CALL_HANDLER_ON_NEW_SECTION
|
||||
if (!HANDLER(user, section, NULL, NULL) && !error)
|
||||
error = lineno;
|
||||
#endif
|
||||
}
|
||||
else if (!error) {
|
||||
/* No ']' found on section line */
|
||||
|
@ -197,7 +216,14 @@ int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
|
|||
}
|
||||
else if (!error) {
|
||||
/* No '=' or ':' found on name[=:]value line */
|
||||
#if INI_ALLOW_NO_VALUE
|
||||
*end = '\0';
|
||||
name = rstrip(start);
|
||||
if (!HANDLER(user, section, name, NULL) && !error)
|
||||
error = lineno;
|
||||
#else
|
||||
error = lineno;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -208,7 +234,7 @@ int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
|
|||
}
|
||||
|
||||
#if !INI_USE_STACK
|
||||
free(line);
|
||||
ini_free(line);
|
||||
#endif
|
||||
|
||||
return error;
|
||||
|
|
|
@ -1,14 +1,18 @@
|
|||
/* inih -- simple .INI file parser
|
||||
|
||||
SPDX-License-Identifier: BSD-3-Clause
|
||||
|
||||
Copyright (C) 2009-2020, Ben Hoyt
|
||||
|
||||
inih is released under the New BSD license (see LICENSE.txt). Go to the project
|
||||
home page for more info:
|
||||
|
||||
https://github.com/benhoyt/inih
|
||||
|
||||
*/
|
||||
|
||||
#ifndef __INI_H__
|
||||
#define __INI_H__
|
||||
// clang-format off
|
||||
#ifndef INI_H
|
||||
#define INI_H
|
||||
|
||||
/* Make this header file easier to include in C++ code */
|
||||
#ifdef __cplusplus
|
||||
|
@ -73,7 +77,7 @@ int ini_parse_string(const char* string, ini_handler handler, void* user);
|
|||
#endif
|
||||
|
||||
/* Nonzero to allow a UTF-8 BOM sequence (0xEF 0xBB 0xBF) at the start of
|
||||
the file. See http://code.google.com/p/inih/issues/detail?id=21 */
|
||||
the file. See https://github.com/benhoyt/inih/issues/21 */
|
||||
#ifndef INI_ALLOW_BOM
|
||||
#define INI_ALLOW_BOM 1
|
||||
#endif
|
||||
|
@ -96,7 +100,7 @@ int ini_parse_string(const char* string, ini_handler handler, void* user);
|
|||
|
||||
/* Nonzero to use stack for line buffer, zero to use heap (malloc/free). */
|
||||
#ifndef INI_USE_STACK
|
||||
#define INI_USE_STACK 1
|
||||
#define INI_USE_STACK 0
|
||||
#endif
|
||||
|
||||
/* Maximum line length for any line in INI file (stack or heap). Note that
|
||||
|
@ -109,7 +113,7 @@ int ini_parse_string(const char* string, ini_handler handler, void* user);
|
|||
fixed-size buffer of INI_MAX_LINE bytes. Only applies if INI_USE_STACK is
|
||||
zero. */
|
||||
#ifndef INI_ALLOW_REALLOC
|
||||
#define INI_ALLOW_REALLOC 0
|
||||
#define INI_ALLOW_REALLOC 1
|
||||
#endif
|
||||
|
||||
/* Initial size in bytes for heap line buffer. Only applies if INI_USE_STACK
|
||||
|
@ -123,8 +127,31 @@ int ini_parse_string(const char* string, ini_handler handler, void* user);
|
|||
#define INI_STOP_ON_FIRST_ERROR 0
|
||||
#endif
|
||||
|
||||
/* Nonzero to call the handler at the start of each new section (with
|
||||
name and value NULL). Default is to only call the handler on
|
||||
each name=value pair. */
|
||||
#ifndef INI_CALL_HANDLER_ON_NEW_SECTION
|
||||
#define INI_CALL_HANDLER_ON_NEW_SECTION 0
|
||||
#endif
|
||||
|
||||
/* Nonzero to allow a name without a value (no '=' or ':' on the line) and
|
||||
call the handler with value NULL in this case. Default is to treat
|
||||
no-value lines as an error. */
|
||||
#ifndef INI_ALLOW_NO_VALUE
|
||||
#define INI_ALLOW_NO_VALUE 0
|
||||
#endif
|
||||
|
||||
/* Nonzero to use custom ini_malloc, ini_free, and ini_realloc memory
|
||||
allocation functions (INI_USE_STACK must also be 0). These functions must
|
||||
have the same signatures as malloc/free/realloc and behave in a similar
|
||||
way. ini_realloc is only needed if INI_ALLOW_REALLOC is set. */
|
||||
#ifndef INI_CUSTOM_ALLOCATOR
|
||||
#define INI_CUSTOM_ALLOCATOR 0
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __INI_H__ */
|
||||
#endif /* INI_H */
|
||||
|
|
36
src/utils/logger.c
Normal file
36
src/utils/logger.c
Normal file
|
@ -0,0 +1,36 @@
|
|||
#ifdef DEBUG
|
||||
#include <stdint.h>
|
||||
#include <whb/log_cafe.h>
|
||||
#include <whb/log_module.h>
|
||||
#include <whb/log_udp.h>
|
||||
|
||||
uint32_t moduleLogInit = false;
|
||||
uint32_t cafeLogInit = false;
|
||||
uint32_t udpLogInit = false;
|
||||
#endif // DEBUG
|
||||
|
||||
void initLogging() {
|
||||
#ifdef DEBUG
|
||||
if (!(moduleLogInit = WHBLogModuleInit())) {
|
||||
cafeLogInit = WHBLogCafeInit();
|
||||
udpLogInit = WHBLogUdpInit();
|
||||
}
|
||||
#endif // DEBUG
|
||||
}
|
||||
|
||||
void deinitLogging() {
|
||||
#ifdef DEBUG
|
||||
if (moduleLogInit) {
|
||||
WHBLogModuleDeinit();
|
||||
moduleLogInit = false;
|
||||
}
|
||||
if (cafeLogInit) {
|
||||
WHBLogCafeDeinit();
|
||||
cafeLogInit = false;
|
||||
}
|
||||
if (udpLogInit) {
|
||||
WHBLogUdpDeinit();
|
||||
udpLogInit = false;
|
||||
}
|
||||
#endif // DEBUG
|
||||
}
|
|
@ -1,32 +1,59 @@
|
|||
#pragma once
|
||||
|
||||
#include <coreinit/debug.h>
|
||||
#include <string.h>
|
||||
#include <whb/log.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
#include <whb/log.h>
|
||||
#include "utils.h"
|
||||
#define LOG_APP_TYPE "M"
|
||||
#define LOG_APP_NAME "rpxloading"
|
||||
|
||||
#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
|
||||
#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
|
||||
#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
|
||||
#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
|
||||
|
||||
#define DEBUG_FUNCTION_LINE(FMT, ARGS...)do { \
|
||||
WHBLogPrintf("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
|
||||
} while (0);
|
||||
#define LOG(LOG_FUNC, FMT, ARGS...) LOG_EX(LOG_FUNC, "", "", FMT, ##ARGS)
|
||||
|
||||
#define OSFATAL_FUNCTION_LINE(FMT, ARGS...)do { \
|
||||
OSFatal_printf("[%s]%s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
|
||||
#define LOG_EX(LOG_FUNC, LOG_LEVEL, LINE_END, FMT, ARGS...) \
|
||||
do { \
|
||||
LOG_FUNC("[(%s)%18s][%23s]%30s@L%04d: " LOG_LEVEL "" FMT "" LINE_END, LOG_APP_TYPE, LOG_APP_NAME, __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \
|
||||
} while (0)
|
||||
|
||||
#ifdef DEBUG
|
||||
|
||||
#ifdef VERBOSE_DEBUG
|
||||
#define DEBUG_FUNCTION_LINE_VERBOSE(FMT, ARGS...) LOG(WHBLogPrintf, FMT, ##ARGS)
|
||||
#else
|
||||
#define DEBUG_FUNCTION_LINE_VERBOSE(FMT, ARGS...) while (0)
|
||||
#endif
|
||||
|
||||
//#define DEBUG_FUNCTION_LINE_VERBOSE(FMT, ARGS...) DEBUG_FUNCTION_LINE(FMT, ##ARGS)
|
||||
#define DEBUG_FUNCTION_LINE_VERBOSE(FMT, ARGS...)
|
||||
#define DEBUG_FUNCTION_LINE(FMT, ARGS...) LOG(WHBLogPrintf, FMT, ##ARGS)
|
||||
|
||||
#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)do { \
|
||||
WHBLogWritef("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
|
||||
} while (0);
|
||||
#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...) LOG(WHBLogWritef, FMT, ##ARGS)
|
||||
|
||||
#define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...) LOG_EX(WHBLogPrintf, "##ERROR## ", "", FMT, ##ARGS)
|
||||
|
||||
#define DEBUG_FUNCTION_LINE_WARN(FMT, ARGS...) LOG_EX(WHBLogPrintf, "##WARN ## ", "", FMT, ##ARGS)
|
||||
|
||||
#else
|
||||
|
||||
#define DEBUG_FUNCTION_LINE_VERBOSE(FMT, ARGS...) while (0)
|
||||
|
||||
#define DEBUG_FUNCTION_LINE(FMT, ARGS...) while (0)
|
||||
|
||||
#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...) while (0)
|
||||
|
||||
#define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...) LOG_EX(OSReport, "##ERROR## ", "\n", FMT, ##ARGS)
|
||||
|
||||
#define DEBUG_FUNCTION_LINE_WARN(FMT, ARGS...) LOG_EX(OSReport, "##WARN ## ", "\n", FMT, ##ARGS)
|
||||
|
||||
#endif
|
||||
|
||||
void initLogging();
|
||||
|
||||
void deinitLogging();
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
@ -1,69 +1,71 @@
|
|||
#include <string.h>
|
||||
#include <stddef.h>
|
||||
#include <whb/log.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <coreinit/debug.h>
|
||||
#include "utils/logger.h"
|
||||
|
||||
#define PRINTF_BUFFER_LENGTH 2048
|
||||
|
||||
// https://gist.github.com/ccbrown/9722406
|
||||
void dumpHex(const void *data, size_t size) {
|
||||
char ascii[17];
|
||||
size_t i, j;
|
||||
ascii[16] = '\0';
|
||||
DEBUG_FUNCTION_LINE("0x%08X (0x0000): ", data);
|
||||
for (i = 0; i < size; ++i) {
|
||||
WHBLogWritef("%02X ", ((unsigned char *) data)[i]);
|
||||
if (((unsigned char *) data)[i] >= ' ' && ((unsigned char *) data)[i] <= '~') {
|
||||
ascii[i % 16] = ((unsigned char *) data)[i];
|
||||
} else {
|
||||
ascii[i % 16] = '.';
|
||||
}
|
||||
if ((i + 1) % 8 == 0 || i + 1 == size) {
|
||||
WHBLogWritef(" ");
|
||||
if ((i + 1) % 16 == 0) {
|
||||
WHBLogPrintf("| %s ", ascii);
|
||||
if (i + 1 < size) {
|
||||
DEBUG_FUNCTION_LINE("0x%08X (0x%04X); ", data + i + 1, i + 1);
|
||||
}
|
||||
} else if (i + 1 == size) {
|
||||
ascii[(i + 1) % 16] = '\0';
|
||||
if ((i + 1) % 16 <= 8) {
|
||||
WHBLogWritef(" ");
|
||||
}
|
||||
for (j = (i + 1) % 16; j < 16; ++j) {
|
||||
WHBLogWritef(" ");
|
||||
}
|
||||
WHBLogPrintf("| %s ", ascii);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
BOOL OSFatal_printf(const char *fmt, ...) {
|
||||
char *buf1 = memalign(4,PRINTF_BUFFER_LENGTH);
|
||||
char *buf2 = memalign(4,PRINTF_BUFFER_LENGTH);
|
||||
va_list va;
|
||||
|
||||
if (!buf1) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (!buf2) {
|
||||
free(buf1);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
va_start(va, fmt);
|
||||
|
||||
vsnprintf(buf1, PRINTF_BUFFER_LENGTH, fmt, va);
|
||||
snprintf(buf2, PRINTF_BUFFER_LENGTH, "%s\n", buf1);
|
||||
OSFatal(buf2);
|
||||
|
||||
free(buf1);
|
||||
free(buf2);
|
||||
va_end(va);
|
||||
return TRUE;
|
||||
#include "utils/logger.h"
|
||||
#include <string.h>
|
||||
#include <string>
|
||||
#include <whb/log.h>
|
||||
|
||||
std::string sanitizeName(const std::string &input) {
|
||||
if (input.empty() || input.starts_with(' ')) {
|
||||
return "";
|
||||
}
|
||||
std::string result = input;
|
||||
std::string illegalChars = "\\/:?\"<>|@=;`_^][";
|
||||
for (auto it = result.begin(); it < result.end(); ++it) {
|
||||
if (*it < '0' || *it > 'z') {
|
||||
*it = ' ';
|
||||
}
|
||||
}
|
||||
for (auto it = result.begin(); it < result.end(); ++it) {
|
||||
bool found = illegalChars.find(*it) != std::string::npos;
|
||||
if (found) {
|
||||
*it = ' ';
|
||||
}
|
||||
}
|
||||
uint32_t length = result.length();
|
||||
for (uint32_t i = 1; i < length; ++i) {
|
||||
if (result[i - 1] == ' ' && result[i] == ' ') {
|
||||
result.erase(i, 1);
|
||||
i--;
|
||||
length--;
|
||||
}
|
||||
}
|
||||
if (result.size() == 1 && result[0] == ' ') {
|
||||
result.clear();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
#define PRINTF_BUFFER_LENGTH 2048
|
||||
// https://gist.github.com/ccbrown/9722406
|
||||
void dumpHex(const void *data, size_t size) {
|
||||
char ascii[17];
|
||||
size_t i, j;
|
||||
ascii[16] = '\0';
|
||||
DEBUG_FUNCTION_LINE("0x%08X (0x0000): ", data);
|
||||
for (i = 0; i < size; ++i) {
|
||||
WHBLogWritef("%02X ", ((unsigned char *) data)[i]);
|
||||
if (((unsigned char *) data)[i] >= ' ' && ((unsigned char *) data)[i] <= '~') {
|
||||
ascii[i % 16] = ((unsigned char *) data)[i];
|
||||
} else {
|
||||
ascii[i % 16] = '.';
|
||||
}
|
||||
if ((i + 1) % 8 == 0 || i + 1 == size) {
|
||||
WHBLogWritef(" ");
|
||||
if ((i + 1) % 16 == 0) {
|
||||
WHBLogPrintf("| %s ", ascii);
|
||||
if (i + 1 < size) {
|
||||
DEBUG_FUNCTION_LINE("0x%08X (0x%04X); ", ((uint32_t) data) + i + 1, i + 1);
|
||||
}
|
||||
} else if (i + 1 == size) {
|
||||
ascii[(i + 1) % 16] = '\0';
|
||||
if ((i + 1) % 16 <= 8) {
|
||||
WHBLogWritef(" ");
|
||||
}
|
||||
for (j = (i + 1) % 16; j < 16; ++j) {
|
||||
WHBLogWritef(" ");
|
||||
}
|
||||
WHBLogPrintf("| %s ", ascii);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,38 +1,42 @@
|
|||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <forward_list>
|
||||
#include <malloc.h>
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
template<class T, class... Args>
|
||||
std::unique_ptr<T> make_unique_nothrow(Args &&...args) noexcept(noexcept(T(std::forward<Args>(args)...))) {
|
||||
return std::unique_ptr<T>(new (std::nothrow) T(std::forward<Args>(args)...));
|
||||
}
|
||||
|
||||
#define LIMIT(x, min, max) \
|
||||
({ \
|
||||
typeof( x ) _x = x; \
|
||||
typeof( min ) _min = min; \
|
||||
typeof( max ) _max = max; \
|
||||
( ( ( _x ) < ( _min ) ) ? ( _min ) : ( ( _x ) > ( _max ) ) ? ( _max) : ( _x ) ); \
|
||||
})
|
||||
template<typename T>
|
||||
inline typename std::unique_ptr<T> make_unique_nothrow(size_t num) noexcept {
|
||||
return std::unique_ptr<T>(new (std::nothrow) std::remove_extent_t<T>[num]());
|
||||
}
|
||||
|
||||
#define DegToRad(a) ( (a) * 0.01745329252f )
|
||||
#define RadToDeg(a) ( (a) * 57.29577951f )
|
||||
template<class T, class... Args>
|
||||
std::shared_ptr<T> make_shared_nothrow(Args &&...args) noexcept(noexcept(T(std::forward<Args>(args)...))) {
|
||||
return std::shared_ptr<T>(new (std::nothrow) T(std::forward<Args>(args)...));
|
||||
}
|
||||
|
||||
#define ALIGN4(x) (((x) + 3) & ~3)
|
||||
#define ALIGN32(x) (((x) + 31) & ~31)
|
||||
template<typename T, class Allocator, class Predicate>
|
||||
bool remove_locked_first_if(std::mutex &mutex, std::forward_list<T, Allocator> &list, Predicate pred) {
|
||||
std::lock_guard<std::mutex> lock(mutex);
|
||||
auto oit = list.before_begin(), it = std::next(oit);
|
||||
while (it != list.end()) {
|
||||
if (pred(*it)) {
|
||||
list.erase_after(oit);
|
||||
return true;
|
||||
}
|
||||
oit = it++;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string sanitizeName(const std::string &input);
|
||||
|
||||
// those work only in powers of 2
|
||||
#define ROUNDDOWN(val, align) ((val) & ~(align-1))
|
||||
#define ROUNDUP(val, align) ROUNDDOWN(((val) + (align-1)), align)
|
||||
|
||||
|
||||
#define le16(i) ((((uint16_t) ((i) & 0xFF)) << 8) | ((uint16_t) (((i) & 0xFF00) >> 8)))
|
||||
#define le32(i) ((((uint32_t)le16((i) & 0xFFFF)) << 16) | ((uint32_t)le16(((i) & 0xFFFF0000) >> 16)))
|
||||
#define le64(i) ((((uint64_t)le32((i) & 0xFFFFFFFFLL)) << 32) | ((uint64_t)le32(((i) & 0xFFFFFFFF00000000LL) >> 32)))
|
||||
|
||||
//Needs to have log_init() called beforehand.
|
||||
void dumpHex(const void *data, size_t size);
|
||||
BOOL OSFatal_printf(const char *fmt, ...);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#define ROUNDDOWN(val, align) ((val) & ~(align - 1))
|
||||
#define ROUNDUP(val, align) ROUNDDOWN(((val) + (align - 1)), align)
|
2
src/version.h
Normal file
2
src/version.h
Normal file
|
@ -0,0 +1,2 @@
|
|||
#pragma once
|
||||
#define VERSION_EXTRA ""
|
Loading…
Reference in New Issue
Block a user