Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
feebdc97
There was an error fetching the commit references. Please try again later.
Commit
feebdc97
authored
1 year ago
by
Charles Lombardo
Browse files
Options
Downloads
Patches
Plain Diff
Qt: Remove ability to install xci files
parent
a29e2620
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/yuzu/main.cpp
+4
-7
4 additions, 7 deletions
src/yuzu/main.cpp
src/yuzu/main.h
+1
-1
1 addition, 1 deletion
src/yuzu/main.h
with
5 additions
and
8 deletions
src/yuzu/main.cpp
+
4
−
7
View file @
feebdc97
...
@@ -3113,10 +3113,9 @@ void GMainWindow::OnMenuInstallToNAND() {
...
@@ -3113,10 +3113,9 @@ void GMainWindow::OnMenuInstallToNAND() {
QFuture
<
InstallResult
>
future
;
QFuture
<
InstallResult
>
future
;
InstallResult
result
;
InstallResult
result
;
if
(
file
.
endsWith
(
QStringLiteral
(
"xci"
),
Qt
::
CaseInsensitive
)
||
if
(
file
.
endsWith
(
QStringLiteral
(
"nsp"
),
Qt
::
CaseInsensitive
))
{
file
.
endsWith
(
QStringLiteral
(
"nsp"
),
Qt
::
CaseInsensitive
))
{
future
=
QtConcurrent
::
run
([
this
,
&
file
]
{
return
InstallNSP
XCI
(
file
);
});
future
=
QtConcurrent
::
run
([
this
,
&
file
]
{
return
InstallNSP
(
file
);
});
while
(
!
future
.
isFinished
())
{
while
(
!
future
.
isFinished
())
{
QCoreApplication
::
processEvents
();
QCoreApplication
::
processEvents
();
...
@@ -3175,7 +3174,7 @@ void GMainWindow::OnMenuInstallToNAND() {
...
@@ -3175,7 +3174,7 @@ void GMainWindow::OnMenuInstallToNAND() {
ui
->
action_Install_File_NAND
->
setEnabled
(
true
);
ui
->
action_Install_File_NAND
->
setEnabled
(
true
);
}
}
InstallResult
GMainWindow
::
InstallNSP
XCI
(
const
QString
&
filename
)
{
InstallResult
GMainWindow
::
InstallNSP
(
const
QString
&
filename
)
{
const
auto
qt_raw_copy
=
[
this
](
const
FileSys
::
VirtualFile
&
src
,
const
auto
qt_raw_copy
=
[
this
](
const
FileSys
::
VirtualFile
&
src
,
const
FileSys
::
VirtualFile
&
dest
,
std
::
size_t
block_size
)
{
const
FileSys
::
VirtualFile
&
dest
,
std
::
size_t
block_size
)
{
if
(
src
==
nullptr
||
dest
==
nullptr
)
{
if
(
src
==
nullptr
||
dest
==
nullptr
)
{
...
@@ -3209,9 +3208,7 @@ InstallResult GMainWindow::InstallNSPXCI(const QString& filename) {
...
@@ -3209,9 +3208,7 @@ InstallResult GMainWindow::InstallNSPXCI(const QString& filename) {
return
InstallResult
::
Failure
;
return
InstallResult
::
Failure
;
}
}
}
else
{
}
else
{
const
auto
xci
=
std
::
make_shared
<
FileSys
::
XCI
>
(
return
InstallResult
::
Failure
;
vfs
->
OpenFile
(
filename
.
toStdString
(),
FileSys
::
Mode
::
Read
));
nsp
=
xci
->
GetSecurePartitionNSP
();
}
}
if
(
nsp
->
GetStatus
()
!=
Loader
::
ResultStatus
::
Success
)
{
if
(
nsp
->
GetStatus
()
!=
Loader
::
ResultStatus
::
Success
)
{
...
...
This diff is collapsed.
Click to expand it.
src/yuzu/main.h
+
1
−
1
View file @
feebdc97
...
@@ -387,7 +387,7 @@ private:
...
@@ -387,7 +387,7 @@ private:
void
RemoveCacheStorage
(
u64
program_id
);
void
RemoveCacheStorage
(
u64
program_id
);
bool
SelectRomFSDumpTarget
(
const
FileSys
::
ContentProvider
&
,
u64
program_id
,
bool
SelectRomFSDumpTarget
(
const
FileSys
::
ContentProvider
&
,
u64
program_id
,
u64
*
selected_title_id
,
u8
*
selected_content_record_type
);
u64
*
selected_title_id
,
u8
*
selected_content_record_type
);
InstallResult
InstallNSP
XCI
(
const
QString
&
filename
);
InstallResult
InstallNSP
(
const
QString
&
filename
);
InstallResult
InstallNCA
(
const
QString
&
filename
);
InstallResult
InstallNCA
(
const
QString
&
filename
);
void
MigrateConfigFiles
();
void
MigrateConfigFiles
();
void
UpdateWindowTitle
(
std
::
string_view
title_name
=
{},
std
::
string_view
title_version
=
{},
void
UpdateWindowTitle
(
std
::
string_view
title_name
=
{},
std
::
string_view
title_version
=
{},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment