summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.ci/yuzu-mainline-step1.yml3
-rw-r--r--.ci/yuzu-patreon-step1.yml3
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt11
-rw-r--r--externals/CMakeLists.txt7
-rw-r--r--externals/find-modules/Findlibzip.cmake72
-rw-r--r--externals/libzip/CMakeLists.txt564
m---------externals/libzip/libzip0
-rw-r--r--src/common/settings.cpp2
-rw-r--r--src/common/settings.h2
-rw-r--r--src/core/CMakeLists.txt16
-rw-r--r--src/core/core.cpp13
-rw-r--r--src/core/core.h12
-rw-r--r--src/core/file_sys/vfs_libzip.cpp88
-rw-r--r--src/core/file_sys/vfs_libzip.h13
-rw-r--r--src/core/hle/service/am/am.cpp4
-rw-r--r--src/core/hle/service/bcat/backend/boxcat.cpp548
-rw-r--r--src/core/hle/service/bcat/backend/boxcat.h64
-rw-r--r--src/core/hle/service/bcat/bcat_module.cpp7
-rw-r--r--src/core/network/network.cpp2
-rw-r--r--src/input_common/sdl/sdl_impl.cpp18
-rw-r--r--src/yuzu/CMakeLists.txt4
-rw-r--r--src/yuzu/applets/qt_web_browser.cpp3
-rw-r--r--src/yuzu/bootmanager.cpp5
-rw-r--r--src/yuzu/bootmanager.h4
-rw-r--r--src/yuzu/configuration/config.cpp4
-rw-r--r--src/yuzu/configuration/configure_network.cpp117
-rw-r--r--src/yuzu/configuration/configure_network.h5
-rw-r--r--src/yuzu/configuration/configure_network.ui86
-rw-r--r--src/yuzu/main.cpp7
-rw-r--r--src/yuzu/main.h1
-rw-r--r--src/yuzu_cmd/config.cpp4
-rw-r--r--src/yuzu_cmd/default_ini.h5
33 files changed, 70 insertions, 1627 deletions
diff --git a/.ci/yuzu-mainline-step1.yml b/.ci/yuzu-mainline-step1.yml
index 3fd33d75a..6b6acb5c6 100644
--- a/.ci/yuzu-mainline-step1.yml
+++ b/.ci/yuzu-mainline-step1.yml
@@ -1,6 +1,9 @@
1trigger: 1trigger:
2- master 2- master
3 3
4pool:
5 vmImage: 'ubuntu-latest'
6
4stages: 7stages:
5- stage: merge 8- stage: merge
6 displayName: 'merge' 9 displayName: 'merge'
diff --git a/.ci/yuzu-patreon-step1.yml b/.ci/yuzu-patreon-step1.yml
index cf30397cd..c63d7a066 100644
--- a/.ci/yuzu-patreon-step1.yml
+++ b/.ci/yuzu-patreon-step1.yml
@@ -1,6 +1,9 @@
1trigger: 1trigger:
2- master 2- master
3 3
4pool:
5 vmImage: 'ubuntu-latest'
6
4stages: 7stages:
5- stage: merge 8- stage: merge
6 displayName: 'merge' 9 displayName: 'merge'
diff --git a/.gitmodules b/.gitmodules
index 749cd0408..dc6ed500f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,9 +28,6 @@
28[submodule "mbedtls"] 28[submodule "mbedtls"]
29 path = externals/mbedtls 29 path = externals/mbedtls
30 url = https://github.com/yuzu-emu/mbedtls 30 url = https://github.com/yuzu-emu/mbedtls
31[submodule "libzip"]
32 path = externals/libzip/libzip
33 url = https://github.com/nih-at/libzip.git
34[submodule "xbyak"] 31[submodule "xbyak"]
35 path = externals/xbyak 32 path = externals/xbyak
36 url = https://github.com/herumi/xbyak.git 33 url = https://github.com/herumi/xbyak.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7ea86d8a..bd0f6b978 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,16 +29,10 @@ option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}")
29 29
30option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) 30option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
31 31
32option(YUZU_ENABLE_BOXCAT "Enable the Boxcat service, a yuzu high-level implementation of BCAT" ON)
33
34option(ENABLE_CUBEB "Enables the cubeb audio backend" ON) 32option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
35 33
36option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) 34option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
37 35
38if (NOT ENABLE_WEB_SERVICE)
39 set(YUZU_ENABLE_BOXCAT OFF)
40endif()
41
42# Default to a Release build 36# Default to a Release build
43get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) 37get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
44if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE) 38if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)
@@ -422,11 +416,6 @@ if (CONAN_REQUIRED_LIBS)
422 endif() 416 endif()
423 include(${CMAKE_BINARY_DIR}/conan.cmake) 417 include(${CMAKE_BINARY_DIR}/conan.cmake)
424 418
425 set(CONAN_LIB_OPTIONS
426 libzip:with_openssl=False
427 libzip:enable_windows_crypto=False
428 )
429
430 conan_check(VERSION 1.24.0 REQUIRED) 419 conan_check(VERSION 1.24.0 REQUIRED)
431 420
432 # Manually add iconv to fix a dep conflict between qt and sdl2 421 # Manually add iconv to fix a dep conflict between qt and sdl2
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 0c2c059a9..a76a3d800 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -93,13 +93,6 @@ endif()
93# Sirit 93# Sirit
94add_subdirectory(sirit) 94add_subdirectory(sirit)
95 95
96# libzip
97find_package(libzip 1.5)
98if (NOT libzip_FOUND)
99 message(STATUS "libzip 1.5 or newer not found, falling back to externals")
100 add_subdirectory(libzip EXCLUDE_FROM_ALL)
101endif()
102
103if (ENABLE_WEB_SERVICE) 96if (ENABLE_WEB_SERVICE)
104 find_package(OpenSSL 1.1) 97 find_package(OpenSSL 1.1)
105 if (OPENSSL_FOUND) 98 if (OPENSSL_FOUND)
diff --git a/externals/find-modules/Findlibzip.cmake b/externals/find-modules/Findlibzip.cmake
deleted file mode 100644
index 8934de3b8..000000000
--- a/externals/find-modules/Findlibzip.cmake
+++ /dev/null
@@ -1,72 +0,0 @@
1
2find_package(PkgConfig QUIET)
3pkg_check_modules(PC_libzip QUIET libzip)
4
5find_path(libzip_INCLUDE_DIR
6 NAMES zip.h
7 PATHS ${PC_libzip_INCLUDE_DIRS}
8 "$ENV{LIB_DIR}/include"
9 "$ENV{INCLUDE}"
10 /usr/local/include
11 /usr/include
12)
13find_path(libzip_INCLUDE_DIR_ZIPCONF
14 NAMES zipconf.h
15 HINTS ${PC_libzip_INCLUDE_DIRS}
16 "$ENV{LIB_DIR}/include"
17 "$ENV{LIB_DIR}/lib/libzip/include"
18 "$ENV{LIB}/lib/libzip/include"
19 /usr/local/lib/libzip/include
20 /usr/lib/libzip/include
21 /usr/local/include
22 /usr/include
23 "$ENV{INCLUDE}"
24)
25find_library(libzip_LIBRARY
26 NAMES zip
27 PATHS ${PC_libzip_LIBRARY_DIRS}
28 "$ENV{LIB_DIR}/lib" "$ENV{LIB}" /usr/local/lib /usr/lib
29)
30
31if (libzip_INCLUDE_DIR_ZIPCONF)
32 FILE(READ "${libzip_INCLUDE_DIR_ZIPCONF}/zipconf.h" _libzip_VERSION_CONTENTS)
33 if (_libzip_VERSION_CONTENTS)
34 STRING(REGEX REPLACE ".*#define LIBZIP_VERSION \"([0-9.]+)\".*" "\\1" libzip_VERSION "${_libzip_VERSION_CONTENTS}")
35 endif()
36 unset(_libzip_VERSION_CONTENTS)
37endif()
38
39set(libzip_VERSION ${libzip_VERSION} CACHE STRING "Version number of libzip")
40
41include(FindPackageHandleStandardArgs)
42find_package_handle_standard_args(libzip
43 FOUND_VAR libzip_FOUND
44 REQUIRED_VARS
45 libzip_LIBRARY
46 libzip_INCLUDE_DIR
47 libzip_INCLUDE_DIR_ZIPCONF
48 libzip_VERSION
49 VERSION_VAR libzip_VERSION
50)
51
52if(libzip_FOUND)
53 set(libzip_LIBRARIES ${libzip_LIBRARY})
54 set(libzip_INCLUDE_DIRS ${libzip_INCLUDE_DIR})
55 set(libzip_DEFINITIONS ${PC_libzip_CFLAGS_OTHER})
56endif()
57
58if(libzip_FOUND AND NOT TARGET libzip::libzip)
59 add_library(libzip::libzip UNKNOWN IMPORTED)
60 set_target_properties(libzip::libzip PROPERTIES
61 IMPORTED_LOCATION "${libzip_LIBRARY}"
62 INTERFACE_COMPILE_OPTIONS "${PC_libzip_CFLAGS_OTHER}"
63 INTERFACE_INCLUDE_DIRECTORIES "${libzip_INCLUDE_DIR}"
64 )
65endif()
66
67mark_as_advanced(
68 libzip_INCLUDE_DIR
69 libzip_INCLUDE_DIR_ZIPCONF
70 libzip_LIBRARY
71 libzip_VERSION
72)
diff --git a/externals/libzip/CMakeLists.txt b/externals/libzip/CMakeLists.txt
deleted file mode 100644
index ea5329fa0..000000000
--- a/externals/libzip/CMakeLists.txt
+++ /dev/null
@@ -1,564 +0,0 @@
1# TODO:
2# create usable libtool .la file
3
4CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)
5
6LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libzip")
7
8PROJECT(libzip C)
9
10OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON)
11OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON)
12OPTION(ENABLE_MBEDTLS "Enable use of mbed TLS" ON)
13OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
14OPTION(ENABLE_WINDOWS_CRYPTO "Enable use of Windows cryptography libraries" ON)
15
16OPTION(ENABLE_BZIP2 "Enable use of BZip2" OFF)
17OPTION(ENABLE_LZMA "Enable use of LZMA" OFF)
18
19INCLUDE(CheckFunctionExists)
20INCLUDE(CheckIncludeFiles)
21INCLUDE(CheckSymbolExists)
22INCLUDE(CheckTypeSize)
23INCLUDE(CheckCSourceRuns)
24INCLUDE(CheckCSourceCompiles)
25INCLUDE(CheckStructHasMember)
26INCLUDE(TestBigEndian)
27INCLUDE(GNUInstallDirs)
28IF(ENABLE_COMMONCRYPTO)
29 CHECK_INCLUDE_FILES(CommonCrypto/CommonCrypto.h COMMONCRYPTO_FOUND)
30ELSE()
31 SET(COMMONCRYPTO_FOUND FALSE)
32ENDIF()
33IF(ENABLE_GNUTLS)
34 INCLUDE(FindNettle)
35 INCLUDE(FindGnuTLS)
36ELSE()
37 SET(GNUTLS_FOUND FALSE)
38ENDIF()
39IF(ENABLE_MBEDTLS)
40 FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h)
41 FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto)
42ELSE()
43 SET(MBEDTLS_LIBRARIES FALSE)
44ENDIF()
45IF(ENABLE_OPENSSL)
46 INCLUDE(FindOpenSSL)
47ELSE()
48 SET(OPENSSL_FOUND FALSE)
49ENDIF()
50IF(WIN32)
51 IF(ENABLE_WINDOWS_CRYPTO)
52 SET(WINDOWS_CRYPTO_FOUND TRUE)
53 ENDIF()
54ELSE()
55 SET(WINDOWS_CRYPTO_FOUND FALSE)
56ENDIF()
57
58OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
59OPTION(SHARED_LIB_VERSIONNING "Add SO version in .so build" ON)
60
61SET(PACKAGE "libzip")
62SET(PACKAGE_NAME ${PACKAGE})
63SET(PACKAGE_VERSION_MAJOR "1")
64SET(PACKAGE_VERSION_MINOR "5")
65SET(PACKAGE_VERSION_MICRO "2a")
66#SET(VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}")
67SET(VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_MICRO}")
68SET(PACKAGE_VERSION ${VERSION})
69SET(LIBZIP_VERSION ${PACKAGE_VERSION})
70SET(LIBZIP_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR})
71SET(LIBZIP_VERSION_MINOR ${PACKAGE_VERSION_MINOR})
72SET(LIBZIP_VERSION_MICRO ${PACKAGE_VERSION_MICRO})
73SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
74
75SET(ARCHIVE_NAME ${PACKAGE_NAME}-${PACKAGE_VERSION})
76IF(NOT TARGET dist)
77ADD_CUSTOM_TARGET(dist
78 COMMAND git config tar.tar.xz.command "xz -c"
79 COMMAND git archive --prefix=${ARCHIVE_NAME}/ -o ${ARCHIVE_NAME}.tar.gz HEAD
80 COMMAND git archive --prefix=${ARCHIVE_NAME}/ -o ${ARCHIVE_NAME}.tar.xz HEAD
81 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
82 )
83ADD_CUSTOM_TARGET(distcheck
84 COMMAND chmod -R u+w ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest 2>/dev/null || true
85 COMMAND rm -rf ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest
86 COMMAND cmake -E tar xf ${ARCHIVE_NAME}.tar.gz
87 COMMAND chmod -R u-w ${ARCHIVE_NAME}
88 COMMAND mkdir ${ARCHIVE_NAME}-build
89 COMMAND mkdir ${ARCHIVE_NAME}-dest
90 COMMAND cd ${ARCHIVE_NAME}-build && cmake -DCMAKE_INSTALL_PREFIX=../${ARCHIVE_NAME}-dest ../${ARCHIVE_NAME}
91 COMMAND cd ${ARCHIVE_NAME}-build && make -j4
92 COMMAND cd ${ARCHIVE_NAME}-build && make test
93 COMMAND cd ${ARCHIVE_NAME}-build && make install
94# COMMAND cd ${ARCHIVE_NAME}-build && make uninstall
95# COMMAND if [ `find ${ARCHIVE_NAME}-dest ! -type d | wc -l` -ne 0 ]; then echo leftover files in ${ARCHIVE_NAME}-dest; false; fi
96 COMMAND cd ${ARCHIVE_NAME}-build && make clean
97 COMMAND chmod -R u+w ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest
98 COMMAND rm -rf ${ARCHIVE_NAME} ${ARCHIVE_NAME}-build ${ARCHIVE_NAME}-dest
99 COMMAND echo "${ARCHIVE_NAME}.tar.gz is ready for distribution."
100 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
101 )
102ADD_DEPENDENCIES(distcheck dist)
103ENDIF(NOT TARGET dist)
104
105IF(BUILD_SHARED_LIBS)
106 SET(HAVE_SHARED TRUE)
107ELSE()
108 SET(ZIP_STATIC TRUE)
109ENDIF()
110
111# Checks
112
113CHECK_FUNCTION_EXISTS(_chmod HAVE__CHMOD)
114CHECK_FUNCTION_EXISTS(_close HAVE__CLOSE)
115CHECK_FUNCTION_EXISTS(_dup HAVE__DUP)
116CHECK_FUNCTION_EXISTS(_fdopen HAVE__FDOPEN)
117CHECK_FUNCTION_EXISTS(_fileno HAVE__FILENO)
118CHECK_FUNCTION_EXISTS(_open HAVE__OPEN)
119CHECK_FUNCTION_EXISTS(_setmode HAVE__SETMODE)
120CHECK_FUNCTION_EXISTS(_snprintf HAVE__SNPRINTF)
121CHECK_FUNCTION_EXISTS(_strdup HAVE__STRDUP)
122CHECK_FUNCTION_EXISTS(_stricmp HAVE__STRICMP)
123CHECK_FUNCTION_EXISTS(_strtoi64 HAVE__STRTOI64)
124CHECK_FUNCTION_EXISTS(_strtoui64 HAVE__STRTOUI64)
125CHECK_FUNCTION_EXISTS(_unlink HAVE__UNLINK)
126CHECK_FUNCTION_EXISTS(arc4random HAVE_ARC4RANDOM)
127CHECK_FUNCTION_EXISTS(clonefile HAVE_CLONEFILE)
128CHECK_FUNCTION_EXISTS(explicit_bzero HAVE_EXPLICIT_BZERO)
129CHECK_FUNCTION_EXISTS(explicit_memset HAVE_EXPLICIT_MEMSET)
130CHECK_FUNCTION_EXISTS(fileno HAVE_FILENO)
131CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
132CHECK_FUNCTION_EXISTS(ftello HAVE_FTELLO)
133CHECK_FUNCTION_EXISTS(getprogname HAVE_GETPROGNAME)
134CHECK_FUNCTION_EXISTS(localtime_r HAVE_LOCALTIME_R)
135CHECK_FUNCTION_EXISTS(open HAVE_OPEN)
136CHECK_FUNCTION_EXISTS(setmode HAVE_SETMODE)
137CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF)
138CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP)
139CHECK_FUNCTION_EXISTS(strdup HAVE_STRDUP)
140CHECK_FUNCTION_EXISTS(stricmp HAVE_STRICMP)
141CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL)
142CHECK_FUNCTION_EXISTS(strtoull HAVE_STRTOULL)
143
144CHECK_INCLUDE_FILES("sys/types.h;sys/stat.h;fts.h" HAVE_FTS_H)
145CHECK_INCLUDE_FILES(stdbool.h HAVE_STDBOOL_H)
146CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H)
147CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
148
149CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H_LIBZIP)
150CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H_LIBZIP)
151CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H_LIBZIP)
152
153# TODO: fix test
154# this test does not find __progname even when it exists
155#CHECK_SYMBOL_EXISTS(__progname stdlib.h HAVE___PROGNAME)
156
157CHECK_TYPE_SIZE(__int8 __INT8_LIBZIP)
158CHECK_TYPE_SIZE(int8_t INT8_T_LIBZIP)
159CHECK_TYPE_SIZE(uint8_t UINT8_T_LIBZIP)
160CHECK_TYPE_SIZE(__int16 __INT16_LIBZIP)
161CHECK_TYPE_SIZE(int16_t INT16_T_LIBZIP)
162CHECK_TYPE_SIZE(uint16_t UINT16_T_LIBZIP)
163CHECK_TYPE_SIZE(__int32 __INT32_LIBZIP)
164CHECK_TYPE_SIZE(int32_t INT32_T_LIBZIP)
165CHECK_TYPE_SIZE(uint32_t UINT32_T_LIBZIP)
166CHECK_TYPE_SIZE(__int64 __INT64_LIBZIP)
167CHECK_TYPE_SIZE(int64_t INT64_T_LIBZIP)
168CHECK_TYPE_SIZE(uint64_t UINT64_T_LIBZIP)
169CHECK_TYPE_SIZE("short" SHORT_LIBZIP)
170CHECK_TYPE_SIZE("int" INT_LIBZIP)
171CHECK_TYPE_SIZE("long" LONG_LIBZIP)
172CHECK_TYPE_SIZE("long long" LONG_LONG_LIBZIP)
173CHECK_TYPE_SIZE("off_t" SIZEOF_OFF_T)
174CHECK_TYPE_SIZE("size_t" SIZE_T_LIBZIP)
175CHECK_TYPE_SIZE("ssize_t" SSIZE_T_LIBZIP)
176
177CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
178#include <linux/fs.h>
179int main(int argc, char *argv[]) { unsigned long x = FICLONERANGE; }" HAVE_FICLONERANGE)
180
181CHECK_C_SOURCE_COMPILES("
182int foo(char * _Nullable bar);
183int main(int argc, char *argv[]) { }" HAVE_NULLABLE)
184
185TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
186
187#FIND_PACKAGE(ZLIB 1.1.2 REQUIRED)
188INCLUDE_DIRECTORIES(../zlib/zlib)
189SET(CMAKE_REQUIRED_INCLUDES ../zlib/zlib)
190
191IF(ENABLE_BZIP2)
192 FIND_PACKAGE(BZip2)
193 IF(BZIP2_FOUND)
194 SET (HAVE_LIBBZ2 1)
195
196 INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
197 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${BZIP2_LIBRARIES})
198 ELSE()
199 MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled")
200 ENDIF(BZIP2_FOUND)
201ENDIF(ENABLE_BZIP2)
202
203IF(ENABLE_LZMA)
204 FIND_PACKAGE(LibLZMA)
205 IF(LIBLZMA_FOUND)
206 SET (HAVE_LIBLZMA 1)
207
208 INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIR})
209 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${LIBLZMA_LIBRARY})
210 ELSE()
211 MESSAGE(WARNING "-- lzma library not found; lzma support disabled")
212 ENDIF(LIBLZMA_FOUND)
213ENDIF(ENABLE_LZMA)
214
215
216IF (COMMONCRYPTO_FOUND)
217 SET (HAVE_CRYPTO 1)
218 SET (HAVE_COMMONCRYPTO 1)
219ELSEIF (WINDOWS_CRYPTO_FOUND)
220 SET (HAVE_CRYPTO 1)
221 SET (HAVE_WINDOWS_CRYPTO 1)
222ELSEIF (GNUTLS_FOUND AND NETTLE_FOUND)
223 SET (HAVE_CRYPTO 1)
224 SET (HAVE_GNUTLS 1)
225 INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIR} ${NETTLE_INCLUDE_DIR})
226 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${GNUTLS_LIBRARY} ${NETTLE_LIBRARY})
227ELSEIF (OPENSSL_FOUND)
228 SET (HAVE_CRYPTO 1)
229 SET (HAVE_OPENSSL 1)
230 INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
231 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${OPENSSL_LIBRARIES})
232ELSEIF (MBEDTLS_LIBRARIES)
233 SET (HAVE_CRYPTO 1)
234 SET (HAVE_MBEDTLS 1)
235 INCLUDE_DIRECTORIES(${MBEDTLS_INCLUDE_DIR})
236 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} ${MBEDTLS_LIBRARIES})
237ENDIF()
238
239IF (NOT HAVE_CRYPTO)
240 MESSAGE(WARNING "-- neither Common Crypto, GnuTLS, mbed TLS, OpenSSL, nor Windows Cryptography found; AES support disabled")
241ENDIF()
242
243IF(MSVC)
244ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS")
245ADD_DEFINITIONS("-D_CRT_NONSTDC_NO_DEPRECATE")
246ENDIF(MSVC)
247
248if(WIN32)
249 if(HAVE_WINDOWS_CRYPTO)
250 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} bcrypt)
251 endif()
252 if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
253 ADD_DEFINITIONS(-DMS_UWP)
254 else(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
255 SET (OPTIONAL_LIBRARY ${OPTIONAL_LIBRARY} advapi32)
256 endif(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
257endif(WIN32)
258
259ADD_DEFINITIONS("-DHAVE_CONFIG_H")
260
261# rpath handling: use rpath in installed binaries
262IF(NOT CMAKE_SYSTEM_NAME MATCHES Linux)
263 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
264 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
265ENDIF()
266
267# fixed size integral types
268
269IF(HAVE_INTTYPES_H_LIBZIP)
270 SET(LIBZIP_TYPES_INCLUDE "#define __STDC_FORMAT_MACROS 1
271#include <inttypes.h>")
272ELSEIF(HAVE_STDINT_H_LIBZIP)
273 SET(LIBZIP_TYPES_INCLUDE "#include <stdint.h>")
274ELSEIF(HAVE_SYS_TYPES_H_LIBZIP)
275 SET(LIBZIP_TYPES_INCLUDE "#include <sys/types.h>")
276ENDIF()
277
278IF(HAVE_INT8_T_LIBZIP)
279 SET(ZIP_INT8_T int8_t)
280ELSEIF(HAVE___INT8_LIBZIP)
281 SET(ZIP_INT8_T __int8)
282ELSE()
283 SET(ZIP_INT8_T "signed char")
284ENDIF()
285
286IF(HAVE_UINT8_T_LIBZIP)
287 SET(ZIP_UINT8_T uint8_t)
288ELSEIF(HAVE___INT8_LIBZIP)
289 SET(ZIP_UINT8_T "unsigned __int8")
290ELSE()
291 SET(ZIP_UINT8_T "unsigned char")
292ENDIF()
293
294IF(HAVE_INT16_T_LIBZIP)
295 SET(ZIP_INT16_T int16_t)
296ELSEIF(HAVE___INT16_LIBZIP)
297 SET(INT16_T_LIBZIP __int16)
298ELSEIF(SHORT_LIBZIP EQUAL 2)
299 SET(INT16_T_LIBZIP short)
300ENDIF()
301
302IF(HAVE_UINT16_T_LIBZIP)
303 SET(ZIP_UINT16_T uint16_t)
304ELSEIF(HAVE___INT16_LIBZIP)
305 SET(UINT16_T_LIBZIP "unsigned __int16")
306ELSEIF(SHORT_LIBZIP EQUAL 2)
307 SET(UINT16_T_LIBZIP "unsigned short")
308ENDIF()
309
310IF(HAVE_INT32_T_LIBZIP)
311 SET(ZIP_INT32_T int32_t)
312ELSEIF(HAVE___INT32_LIBZIP)
313 SET(ZIP_INT32_T __int32)
314ELSEIF(INT_LIBZIP EQUAL 4)
315 SET(ZIP_INT32_T int)
316ELSEIF(LONG_LIBZIP EQUAL 4)
317 SET(ZIP_INT32_T long)
318ENDIF()
319
320IF(HAVE_UINT32_T_LIBZIP)
321SET(ZIP_UINT32_T uint32_t)
322ELSEIF(HAVE___INT32_LIBZIP)
323SET(ZIP_UINT32_T "unsigned __int32")
324ELSEIF(INT_LIBZIP EQUAL 4)
325SET(ZIP_UINT32_T "unsigned int")
326ELSEIF(LONG_LIBZIP EQUAL 4)
327SET(ZIP_UINT32_T "unsigned long")
328ENDIF()
329
330IF(HAVE_INT64_T_LIBZIP)
331 SET(ZIP_INT64_T int64_t)
332ELSEIF(HAVE___INT64_LIBZIP)
333 SET(ZIP_INT64_T __int64)
334ELSEIF(LONG_LIBZIP EQUAL 8)
335 SET(ZIP_INT64_T long)
336ELSEIF(LONG_LONG_LIBZIP EQUAL 8)
337 SET(ZIP_INT64_T "long long")
338ENDIF()
339
340IF(HAVE_UINT64_T_LIBZIP)
341 SET(ZIP_UINT64_T uint64_t)
342ELSEIF(HAVE___INT64_LIBZIP)
343 SET(ZIP_UINT64_T "unsigned __int64")
344ELSEIF(LONG_LIBZIP EQUAL 8)
345 SET(ZIP_UINT64_T "unsigned long")
346ELSEIF(LONG_LONG_LIBZIP EQUAL 8)
347 SET(ZIP_UINT64_T "unsigned long long")
348ENDIF()
349
350IF(HAVE_NULLABLE)
351 SET(ZIP_NULLABLE_DEFINES)
352ELSE()
353 SET(ZIP_NULLABLE_DEFINES "#define _Nullable
354#define _Nonnull")
355ENDIF()
356
357# write out config file
358CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libzip/cmake-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/libzip/config.h)
359CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libzip/cmake-zipconf.h.in ${CMAKE_CURRENT_BINARY_DIR}/libzip/zipconf.h)
360
361# installation
362INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip/zipconf.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
363INSTALL(FILES libzip/lib/zip.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
364
365SET(CMAKE_C_VISIBILITY_PRESET hidden)
366
367ADD_LIBRARY(zip
368 libzip/lib/zip_add.c
369 libzip/lib/zip_add_dir.c
370 libzip/lib/zip_add_entry.c
371 libzip/lib/zip_algorithm_deflate.c
372 libzip/lib/zip_buffer.c
373 libzip/lib/zip_close.c
374 libzip/lib/zip_delete.c
375 libzip/lib/zip_dir_add.c
376 libzip/lib/zip_dirent.c
377 libzip/lib/zip_discard.c
378 libzip/lib/zip_entry.c
379 libzip/lib/zip_err_str.c
380 libzip/lib/zip_error.c
381 libzip/lib/zip_error_clear.c
382 libzip/lib/zip_error_get.c
383 libzip/lib/zip_error_get_sys_type.c
384 libzip/lib/zip_error_strerror.c
385 libzip/lib/zip_error_to_str.c
386 libzip/lib/zip_extra_field.c
387 libzip/lib/zip_extra_field_api.c
388 libzip/lib/zip_fclose.c
389 libzip/lib/zip_fdopen.c
390 libzip/lib/zip_file_add.c
391 libzip/lib/zip_file_error_clear.c
392 libzip/lib/zip_file_error_get.c
393 libzip/lib/zip_file_get_comment.c
394 libzip/lib/zip_file_get_external_attributes.c
395 libzip/lib/zip_file_get_offset.c
396 libzip/lib/zip_file_rename.c
397 libzip/lib/zip_file_replace.c
398 libzip/lib/zip_file_set_comment.c
399 libzip/lib/zip_file_set_encryption.c
400 libzip/lib/zip_file_set_external_attributes.c
401 libzip/lib/zip_file_set_mtime.c
402 libzip/lib/zip_file_strerror.c
403 libzip/lib/zip_filerange_crc.c
404 libzip/lib/zip_fopen.c
405 libzip/lib/zip_fopen_encrypted.c
406 libzip/lib/zip_fopen_index.c
407 libzip/lib/zip_fopen_index_encrypted.c
408 libzip/lib/zip_fread.c
409 libzip/lib/zip_fseek.c
410 libzip/lib/zip_ftell.c
411 libzip/lib/zip_get_archive_comment.c
412 libzip/lib/zip_get_archive_flag.c
413 libzip/lib/zip_get_encryption_implementation.c
414 libzip/lib/zip_get_file_comment.c
415 libzip/lib/zip_get_name.c
416 libzip/lib/zip_get_num_entries.c
417 libzip/lib/zip_get_num_files.c
418 libzip/lib/zip_hash.c
419 libzip/lib/zip_io_util.c
420 libzip/lib/zip_libzip_version.c
421 libzip/lib/zip_memdup.c
422 libzip/lib/zip_name_locate.c
423 libzip/lib/zip_new.c
424 libzip/lib/zip_open.c
425 libzip/lib/zip_progress.c
426 libzip/lib/zip_rename.c
427 libzip/lib/zip_replace.c
428 libzip/lib/zip_set_archive_comment.c
429 libzip/lib/zip_set_archive_flag.c
430 libzip/lib/zip_set_default_password.c
431 libzip/lib/zip_set_file_comment.c
432 libzip/lib/zip_set_file_compression.c
433 libzip/lib/zip_set_name.c
434 libzip/lib/zip_source_accept_empty.c
435 libzip/lib/zip_source_begin_write.c
436 libzip/lib/zip_source_begin_write_cloning.c
437 libzip/lib/zip_source_buffer.c
438 libzip/lib/zip_source_call.c
439 libzip/lib/zip_source_close.c
440 libzip/lib/zip_source_commit_write.c
441 libzip/lib/zip_source_compress.c
442 libzip/lib/zip_source_crc.c
443 libzip/lib/zip_source_error.c
444 libzip/lib/zip_source_filep.c
445 libzip/lib/zip_source_free.c
446 libzip/lib/zip_source_function.c
447 libzip/lib/zip_source_get_compression_flags.c
448 libzip/lib/zip_source_is_deleted.c
449 libzip/lib/zip_source_layered.c
450 libzip/lib/zip_source_open.c
451 libzip/lib/zip_source_pkware.c
452 libzip/lib/zip_source_read.c
453 libzip/lib/zip_source_remove.c
454 libzip/lib/zip_source_rollback_write.c
455 libzip/lib/zip_source_seek.c
456 libzip/lib/zip_source_seek_write.c
457 libzip/lib/zip_source_stat.c
458 libzip/lib/zip_source_supports.c
459 libzip/lib/zip_source_tell.c
460 libzip/lib/zip_source_tell_write.c
461 libzip/lib/zip_source_window.c
462 libzip/lib/zip_source_write.c
463 libzip/lib/zip_source_zip.c
464 libzip/lib/zip_source_zip_new.c
465 libzip/lib/zip_stat.c
466 libzip/lib/zip_stat_index.c
467 libzip/lib/zip_stat_init.c
468 libzip/lib/zip_strerror.c
469 libzip/lib/zip_string.c
470 libzip/lib/zip_unchange.c
471 libzip/lib/zip_unchange_all.c
472 libzip/lib/zip_unchange_archive.c
473 libzip/lib/zip_unchange_data.c
474 libzip/lib/zip_utf-8.c
475)
476
477IF(WIN32)
478 target_sources(zip PRIVATE
479 libzip/lib/zip_source_win32handle.c
480 libzip/lib/zip_source_win32utf8.c
481 libzip/lib/zip_source_win32w.c
482 )
483 IF(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
484 ELSE()
485 target_sources(zip PRIVATE libzip/lib/zip_source_win32a.c)
486 ENDIF()
487ELSE()
488 target_sources(zip PRIVATE
489 libzip/lib/zip_mkstempm.c
490 libzip/lib/zip_source_file.c
491 libzip/lib/zip_random_unix.c
492 )
493ENDIF()
494
495IF(HAVE_LIBBZ2)
496 target_sources(zip PRIVATE libzip/lib/zip_algorithm_bzip2.c)
497ENDIF()
498
499IF(HAVE_LIBLZMA)
500 target_sources(zip PRIVATE libzip/lib/zip_algorithm_xz.c)
501ENDIF()
502
503IF(HAVE_COMMONCRYPTO)
504 target_sources(zip PRIVATE libzip/lib/zip_crypto_commoncrypto.c)
505ELSEIF(HAVE_WINDOWS_CRYPTO)
506 target_sources(zip PRIVATE libzip/lib/zip_crypto_win.c)
507ELSEIF(HAVE_GNUTLS)
508 target_sources(zip PRIVATE libzip/lib/zip_crypto_gnutls.c)
509ELSEIF(HAVE_OPENSSL)
510 target_sources(zip PRIVATE libzip/lib/zip_crypto_openssl.c)
511ELSEIF(HAVE_MBEDTLS)
512 target_sources(zip PRIVATE libzip/lib/zip_crypto_mbedtls.c)
513ENDIF()
514
515IF(HAVE_CRYPTO)
516 target_sources(zip PRIVATE
517 libzip/lib/zip_winzip_aes.c
518 libzip/lib/zip_source_winzip_aes_decode.c
519 libzip/lib/zip_source_winzip_aes_encode.c
520 )
521ENDIF()
522
523target_include_directories(zip
524PUBLIC
525 libzip/lib
526 ${CMAKE_CURRENT_BINARY_DIR}/libzip
527)
528
529# pkgconfig file
530SET(prefix ${CMAKE_INSTALL_PREFIX})
531SET(exec_prefix \${prefix})
532SET(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR})
533SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
534SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
535IF(CMAKE_SYSTEM_NAME MATCHES BSD)
536 SET(PKG_CONFIG_RPATH "-Wl,-R\${libdir}")
537ENDIF(CMAKE_SYSTEM_NAME MATCHES BSD)
538get_target_property(LIBS_PRIVATE zip LINK_LIBRARIES)
539foreach(LIB ${LIBS_PRIVATE})
540 if(LIB MATCHES "^/")
541 get_filename_component(LIB ${LIB} NAME_WE)
542 string(REGEX REPLACE "^lib" "" LIB ${LIB})
543 endif()
544 set(LIBS "${LIBS} -l${LIB}")
545endforeach()
546CONFIGURE_FILE(libzip/libzip.pc.in libzip/libzip.pc @ONLY)
547INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
548
549ADD_CUSTOM_TARGET(update_zip_err_str
550 COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/libzip/lib/make_zip_err_str.sh ${CMAKE_CURRENT_SOURCE_DIR}/libzip/lib/zip.h ${CMAKE_CURRENT_SOURCE_DIR}/libzip/lib/zip_err_str.c
551 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libzip/lib/zip.h ${CMAKE_CURRENT_SOURCE_DIR}/libzip/lib/make_zip_err_str.sh
552)
553
554IF(SHARED_LIB_VERSIONNING)
555SET_TARGET_PROPERTIES(zip PROPERTIES VERSION 5.0 SOVERSION 5)
556ENDIF()
557
558TARGET_LINK_LIBRARIES(zip ${ZLIB_LIBRARIES} ${OPTIONAL_LIBRARY})
559INSTALL(TARGETS zip
560 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
561 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
562 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
563)
564
diff --git a/externals/libzip/libzip b/externals/libzip/libzip
deleted file mode 160000
Subproject 89bd6d63bdea9da7627695f6c82e54f16d368b5
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 69f0bd8c0..9dd5e3efb 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -69,8 +69,6 @@ void LogSettings() {
69 log_path("DataStorage_NANDDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir)); 69 log_path("DataStorage_NANDDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir));
70 log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir)); 70 log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir));
71 log_setting("Debugging_ProgramArgs", values.program_args.GetValue()); 71 log_setting("Debugging_ProgramArgs", values.program_args.GetValue());
72 log_setting("Services_BCATBackend", values.bcat_backend.GetValue());
73 log_setting("Services_BCATBoxcatLocal", values.bcat_boxcat_local.GetValue());
74 log_setting("Input_EnableMotion", values.motion_enabled.GetValue()); 72 log_setting("Input_EnableMotion", values.motion_enabled.GetValue());
75 log_setting("Input_EnableVibration", values.vibration_enabled.GetValue()); 73 log_setting("Input_EnableVibration", values.vibration_enabled.GetValue());
76 log_setting("Input_EnableRawInput", values.enable_raw_input.GetValue()); 74 log_setting("Input_EnableRawInput", values.enable_raw_input.GetValue());
diff --git a/src/common/settings.h b/src/common/settings.h
index c53d5acc3..402339443 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -568,8 +568,6 @@ struct Values {
568 BasicSetting<bool> use_dev_keys{false, "use_dev_keys"}; 568 BasicSetting<bool> use_dev_keys{false, "use_dev_keys"};
569 569
570 // Network 570 // Network
571 BasicSetting<std::string> bcat_backend{"none", "bcat_backend"};
572 BasicSetting<bool> bcat_boxcat_local{false, "bcat_boxcat_local"};
573 BasicSetting<std::string> network_interface{std::string(), "network_interface"}; 571 BasicSetting<std::string> network_interface{std::string(), "network_interface"};
574 572
575 // WebService 573 // WebService
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 7140d0db8..aa3b26628 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -106,8 +106,6 @@ add_library(core STATIC
106 file_sys/vfs_concat.h 106 file_sys/vfs_concat.h
107 file_sys/vfs_layered.cpp 107 file_sys/vfs_layered.cpp
108 file_sys/vfs_layered.h 108 file_sys/vfs_layered.h
109 file_sys/vfs_libzip.cpp
110 file_sys/vfs_libzip.h
111 file_sys/vfs_offset.cpp 109 file_sys/vfs_offset.cpp
112 file_sys/vfs_offset.h 110 file_sys/vfs_offset.h
113 file_sys/vfs_real.cpp 111 file_sys/vfs_real.cpp
@@ -653,13 +651,6 @@ add_library(core STATIC
653 tools/freezer.h 651 tools/freezer.h
654) 652)
655 653
656if (YUZU_ENABLE_BOXCAT)
657 target_sources(core PRIVATE
658 hle/service/bcat/backend/boxcat.cpp
659 hle/service/bcat/backend/boxcat.h
660 )
661endif()
662
663if (MSVC) 654if (MSVC)
664 target_compile_options(core PRIVATE 655 target_compile_options(core PRIVATE
665 /we4242 # 'identifier': conversion from 'type1' to 'type2', possible loss of data 656 /we4242 # 'identifier': conversion from 'type1' to 'type2', possible loss of data
@@ -690,12 +681,7 @@ endif()
690create_target_directory_groups(core) 681create_target_directory_groups(core)
691 682
692target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) 683target_link_libraries(core PUBLIC common PRIVATE audio_core video_core)
693target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus zip) 684target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus)
694
695if (YUZU_ENABLE_BOXCAT)
696 target_compile_definitions(core PRIVATE -DYUZU_ENABLE_BOXCAT)
697 target_link_libraries(core PRIVATE httplib nlohmann_json::nlohmann_json)
698endif()
699 685
700if (ENABLE_WEB_SERVICE) 686if (ENABLE_WEB_SERVICE)
701 target_compile_definitions(core PRIVATE -DENABLE_WEB_SERVICE) 687 target_compile_definitions(core PRIVATE -DENABLE_WEB_SERVICE)
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 50d5dab4b..bb268a319 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -421,6 +421,7 @@ struct System::Impl {
421 bool is_async_gpu{}; 421 bool is_async_gpu{};
422 422
423 ExecuteProgramCallback execute_program_callback; 423 ExecuteProgramCallback execute_program_callback;
424 ExitCallback exit_callback;
424 425
425 std::array<u64, Core::Hardware::NUM_CPU_CORES> dynarmic_ticks{}; 426 std::array<u64, Core::Hardware::NUM_CPU_CORES> dynarmic_ticks{};
426 std::array<MicroProfileToken, Core::Hardware::NUM_CPU_CORES> microprofile_dynarmic{}; 427 std::array<MicroProfileToken, Core::Hardware::NUM_CPU_CORES> microprofile_dynarmic{};
@@ -798,6 +799,18 @@ void System::ExecuteProgram(std::size_t program_index) {
798 } 799 }
799} 800}
800 801
802void System::RegisterExitCallback(ExitCallback&& callback) {
803 impl->exit_callback = std::move(callback);
804}
805
806void System::Exit() {
807 if (impl->exit_callback) {
808 impl->exit_callback();
809 } else {
810 LOG_CRITICAL(Core, "exit_callback must be initialized by the frontend");
811 }
812}
813
801void System::ApplySettings() { 814void System::ApplySettings() {
802 if (IsPoweredOn()) { 815 if (IsPoweredOn()) {
803 Renderer().RefreshBaseSettings(); 816 Renderer().RefreshBaseSettings();
diff --git a/src/core/core.h b/src/core/core.h
index 715ab88e7..a796472b2 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -387,6 +387,18 @@ public:
387 */ 387 */
388 void ExecuteProgram(std::size_t program_index); 388 void ExecuteProgram(std::size_t program_index);
389 389
390 /// Type used for the frontend to designate a callback for System to exit the application.
391 using ExitCallback = std::function<void()>;
392
393 /**
394 * Registers a callback from the frontend for System to exit the application.
395 * @param callback Callback from the frontend to exit the application.
396 */
397 void RegisterExitCallback(ExitCallback&& callback);
398
399 /// Instructs the frontend to exit the application.
400 void Exit();
401
390 /// Applies any changes to settings to this core instance. 402 /// Applies any changes to settings to this core instance.
391 void ApplySettings(); 403 void ApplySettings();
392 404
diff --git a/src/core/file_sys/vfs_libzip.cpp b/src/core/file_sys/vfs_libzip.cpp
deleted file mode 100644
index 00e256779..000000000
--- a/src/core/file_sys/vfs_libzip.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
1// Copyright 2019 yuzu emulator team
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#include <string>
6
7#ifdef __GNUC__
8#pragma GCC diagnostic push
9#pragma GCC diagnostic ignored "-Wshadow"
10#endif
11#include <zip.h>
12#ifdef __GNUC__
13#pragma GCC diagnostic pop
14#endif
15
16#include "common/fs/path_util.h"
17#include "core/file_sys/vfs.h"
18#include "core/file_sys/vfs_libzip.h"
19#include "core/file_sys/vfs_vector.h"
20
21namespace FileSys {
22
23VirtualDir ExtractZIP(VirtualFile file) {
24 zip_error_t error{};
25
26 const auto data = file->ReadAllBytes();
27 std::unique_ptr<zip_source_t, decltype(&zip_source_close)> src{
28 zip_source_buffer_create(data.data(), data.size(), 0, &error), zip_source_close};
29 if (src == nullptr)
30 return nullptr;
31
32 std::unique_ptr<zip_t, decltype(&zip_close)> zip{zip_open_from_source(src.get(), 0, &error),
33 zip_close};
34 if (zip == nullptr)
35 return nullptr;
36
37 std::shared_ptr<VectorVfsDirectory> out = std::make_shared<VectorVfsDirectory>();
38
39 const auto num_entries = static_cast<std::size_t>(zip_get_num_entries(zip.get(), 0));
40
41 zip_stat_t stat{};
42 zip_stat_init(&stat);
43
44 for (std::size_t i = 0; i < num_entries; ++i) {
45 const auto stat_res = zip_stat_index(zip.get(), i, 0, &stat);
46 if (stat_res == -1)
47 return nullptr;
48
49 const std::string name(stat.name);
50 if (name.empty())
51 continue;
52
53 if (name.back() != '/') {
54 std::unique_ptr<zip_file_t, decltype(&zip_fclose)> file2{
55 zip_fopen_index(zip.get(), i, 0), zip_fclose};
56
57 std::vector<u8> buf(stat.size);
58 if (zip_fread(file2.get(), buf.data(), buf.size()) != s64(buf.size()))
59 return nullptr;
60
61 const auto parts = Common::FS::SplitPathComponents(stat.name);
62 const auto new_file = std::make_shared<VectorVfsFile>(buf, parts.back());
63
64 std::shared_ptr<VectorVfsDirectory> dtrv = out;
65 for (std::size_t j = 0; j < parts.size() - 1; ++j) {
66 if (dtrv == nullptr)
67 return nullptr;
68 const auto subdir = dtrv->GetSubdirectory(parts[j]);
69 if (subdir == nullptr) {
70 const auto temp = std::make_shared<VectorVfsDirectory>(
71 std::vector<VirtualFile>{}, std::vector<VirtualDir>{}, parts[j]);
72 dtrv->AddDirectory(temp);
73 dtrv = temp;
74 } else {
75 dtrv = std::dynamic_pointer_cast<VectorVfsDirectory>(subdir);
76 }
77 }
78
79 if (dtrv == nullptr)
80 return nullptr;
81 dtrv->AddFile(new_file);
82 }
83 }
84
85 return out;
86}
87
88} // namespace FileSys
diff --git a/src/core/file_sys/vfs_libzip.h b/src/core/file_sys/vfs_libzip.h
deleted file mode 100644
index f68af576a..000000000
--- a/src/core/file_sys/vfs_libzip.h
+++ /dev/null
@@ -1,13 +0,0 @@
1// Copyright 2019 yuzu emulator team
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#pragma once
6
7#include "core/file_sys/vfs_types.h"
8
9namespace FileSys {
10
11VirtualDir ExtractZIP(VirtualFile zip);
12
13} // namespace FileSys
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 8c2e2f920..49e9787a4 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -332,10 +332,10 @@ ISelfController::~ISelfController() = default;
332void ISelfController::Exit(Kernel::HLERequestContext& ctx) { 332void ISelfController::Exit(Kernel::HLERequestContext& ctx) {
333 LOG_DEBUG(Service_AM, "called"); 333 LOG_DEBUG(Service_AM, "called");
334 334
335 system.Shutdown();
336
337 IPC::ResponseBuilder rb{ctx, 2}; 335 IPC::ResponseBuilder rb{ctx, 2};
338 rb.Push(ResultSuccess); 336 rb.Push(ResultSuccess);
337
338 system.Exit();
339} 339}
340 340
341void ISelfController::LockExit(Kernel::HLERequestContext& ctx) { 341void ISelfController::LockExit(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/bcat/backend/boxcat.cpp b/src/core/hle/service/bcat/backend/boxcat.cpp
deleted file mode 100644
index 7ca7f2aac..000000000
--- a/src/core/hle/service/bcat/backend/boxcat.cpp
+++ /dev/null
@@ -1,548 +0,0 @@
1// Copyright 2019 yuzu emulator team
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#include <fmt/ostream.h>
6
7#ifdef __GNUC__
8#pragma GCC diagnostic push
9#pragma GCC diagnostic ignored "-Wshadow"
10#ifndef __clang__
11#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
12#endif
13#endif
14#include <httplib.h>
15#include <mbedtls/sha256.h>
16#include <nlohmann/json.hpp>
17#ifdef __GNUC__
18#pragma GCC diagnostic pop
19#endif
20
21#include "common/fs/file.h"
22#include "common/fs/fs.h"
23#include "common/fs/path_util.h"
24#include "common/hex_util.h"
25#include "common/logging/log.h"
26#include "common/settings.h"
27#include "core/core.h"
28#include "core/file_sys/vfs.h"
29#include "core/file_sys/vfs_libzip.h"
30#include "core/file_sys/vfs_vector.h"
31#include "core/frontend/applets/error.h"
32#include "core/hle/service/am/applets/applets.h"
33#include "core/hle/service/bcat/backend/boxcat.h"
34
35namespace Service::BCAT {
36namespace {
37
38// Prevents conflicts with windows macro called CreateFile
39FileSys::VirtualFile VfsCreateFileWrap(FileSys::VirtualDir dir, std::string_view name) {
40 return dir->CreateFile(name);
41}
42
43// Prevents conflicts with windows macro called DeleteFile
44bool VfsDeleteFileWrap(FileSys::VirtualDir dir, std::string_view name) {
45 return dir->DeleteFile(name);
46}
47
48constexpr ResultCode ERROR_GENERAL_BCAT_FAILURE{ErrorModule::BCAT, 1};
49
50constexpr char BOXCAT_HOSTNAME[] = "api.yuzu-emu.org";
51
52// Formatted using fmt with arg[0] = hex title id
53constexpr char BOXCAT_PATHNAME_DATA[] = "/game-assets/{:016X}/boxcat";
54constexpr char BOXCAT_PATHNAME_LAUNCHPARAM[] = "/game-assets/{:016X}/launchparam";
55
56constexpr char BOXCAT_PATHNAME_EVENTS[] = "/game-assets/boxcat/events";
57
58constexpr char BOXCAT_API_VERSION[] = "1";
59constexpr char BOXCAT_CLIENT_TYPE[] = "yuzu";
60
61// HTTP status codes for Boxcat
62enum class ResponseStatus {
63 Ok = 200, ///< Operation completed successfully.
64 BadClientVersion = 301, ///< The Boxcat-Client-Version doesn't match the server.
65 NoUpdate = 304, ///< The digest provided would match the new data, no need to update.
66 NoMatchTitleId = 404, ///< The title ID provided doesn't have a boxcat implementation.
67 NoMatchBuildId = 406, ///< The build ID provided is blacklisted (potentially because of format
68 ///< issues or whatnot) and has no data.
69};
70
71enum class DownloadResult {
72 Success = 0,
73 NoResponse,
74 GeneralWebError,
75 NoMatchTitleId,
76 NoMatchBuildId,
77 InvalidContentType,
78 GeneralFSError,
79 BadClientVersion,
80};
81
82constexpr std::array<const char*, 8> DOWNLOAD_RESULT_LOG_MESSAGES{
83 "Success",
84 "There was no response from the server.",
85 "There was a general web error code returned from the server.",
86 "The title ID of the current game doesn't have a boxcat implementation. If you believe an "
87 "implementation should be added, contact yuzu support.",
88 "The build ID of the current version of the game is marked as incompatible with the current "
89 "BCAT distribution. Try upgrading or downgrading your game version or contacting yuzu support.",
90 "The content type of the web response was invalid.",
91 "There was a general filesystem error while saving the zip file.",
92 "The server is either too new or too old to serve the request. Try using the latest version of "
93 "an official release of yuzu.",
94};
95
96std::ostream& operator<<(std::ostream& os, DownloadResult result) {
97 return os << DOWNLOAD_RESULT_LOG_MESSAGES.at(static_cast<std::size_t>(result));
98}
99
100constexpr u32 PORT = 443;
101constexpr u32 TIMEOUT_SECONDS = 30;
102[[maybe_unused]] constexpr u64 VFS_COPY_BLOCK_SIZE = 1ULL << 24; // 4MB
103
104std::filesystem::path GetBINFilePath(u64 title_id) {
105 return Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / "bcat" /
106 fmt::format("{:016X}/launchparam.bin", title_id);
107}
108
109std::filesystem::path GetZIPFilePath(u64 title_id) {
110 return Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir) / "bcat" /
111 fmt::format("{:016X}/data.zip", title_id);
112}
113
114// If the error is something the user should know about (build ID mismatch, bad client version),
115// display an error.
116void HandleDownloadDisplayResult(const AM::Applets::AppletManager& applet_manager,
117 DownloadResult res) {
118 if (res == DownloadResult::Success || res == DownloadResult::NoResponse ||
119 res == DownloadResult::GeneralWebError || res == DownloadResult::GeneralFSError ||
120 res == DownloadResult::NoMatchTitleId || res == DownloadResult::InvalidContentType) {
121 return;
122 }
123
124 const auto& frontend{applet_manager.GetAppletFrontendSet()};
125 frontend.error->ShowCustomErrorText(
126 ResultUnknown, "There was an error while attempting to use Boxcat.",
127 DOWNLOAD_RESULT_LOG_MESSAGES[static_cast<std::size_t>(res)], [] {});
128}
129
130bool VfsRawCopyProgress(FileSys::VirtualFile src, FileSys::VirtualFile dest,
131 std::string_view dir_name, ProgressServiceBackend& progress,
132 std::size_t block_size = 0x1000) {
133 if (src == nullptr || dest == nullptr || !src->IsReadable() || !dest->IsWritable())
134 return false;
135 if (!dest->Resize(src->GetSize()))
136 return false;
137
138 progress.StartDownloadingFile(dir_name, src->GetName(), src->GetSize());
139
140 std::vector<u8> temp(std::min(block_size, src->GetSize()));
141 for (std::size_t i = 0; i < src->GetSize(); i += block_size) {
142 const auto read = std::min(block_size, src->GetSize() - i);
143
144 if (src->Read(temp.data(), read, i) != read) {
145 return false;
146 }
147
148 if (dest->Write(temp.data(), read, i) != read) {
149 return false;
150 }
151
152 progress.UpdateFileProgress(i);
153 }
154
155 progress.FinishDownloadingFile();
156
157 return true;
158}
159
160bool VfsRawCopyDProgressSingle(FileSys::VirtualDir src, FileSys::VirtualDir dest,
161 ProgressServiceBackend& progress, std::size_t block_size = 0x1000) {
162 if (src == nullptr || dest == nullptr || !src->IsReadable() || !dest->IsWritable())
163 return false;
164
165 for (const auto& file : src->GetFiles()) {
166 const auto out_file = VfsCreateFileWrap(dest, file->GetName());
167 if (!VfsRawCopyProgress(file, out_file, src->GetName(), progress, block_size)) {
168 return false;
169 }
170 }
171 progress.CommitDirectory(src->GetName());
172
173 return true;
174}
175
176bool VfsRawCopyDProgress(FileSys::VirtualDir src, FileSys::VirtualDir dest,
177 ProgressServiceBackend& progress, std::size_t block_size = 0x1000) {
178 if (src == nullptr || dest == nullptr || !src->IsReadable() || !dest->IsWritable())
179 return false;
180
181 for (const auto& dir : src->GetSubdirectories()) {
182 const auto out = dest->CreateSubdirectory(dir->GetName());
183 if (!VfsRawCopyDProgressSingle(dir, out, progress, block_size)) {
184 return false;
185 }
186 }
187
188 return true;
189}
190
191} // Anonymous namespace
192
193class Boxcat::Client {
194public:
195 Client(std::filesystem::path path_, u64 title_id_, u64 build_id_)
196 : path(std::move(path_)), title_id(title_id_), build_id(build_id_) {}
197
198 DownloadResult DownloadDataZip() {
199 return DownloadInternal(fmt::format(BOXCAT_PATHNAME_DATA, title_id), TIMEOUT_SECONDS,
200 "application/zip");
201 }
202
203 DownloadResult DownloadLaunchParam() {
204 return DownloadInternal(fmt::format(BOXCAT_PATHNAME_LAUNCHPARAM, title_id),
205 TIMEOUT_SECONDS / 3, "application/octet-stream");
206 }
207
208private:
209 DownloadResult DownloadInternal(const std::string& resolved_path, u32 timeout_seconds,
210 const std::string& content_type_name) {
211 if (client == nullptr) {
212 client = std::make_unique<httplib::SSLClient>(BOXCAT_HOSTNAME, PORT);
213 client->set_connection_timeout(timeout_seconds);
214 client->set_read_timeout(timeout_seconds);
215 client->set_write_timeout(timeout_seconds);
216 }
217
218 httplib::Headers headers{
219 {std::string("Game-Assets-API-Version"), std::string(BOXCAT_API_VERSION)},
220 {std::string("Boxcat-Client-Type"), std::string(BOXCAT_CLIENT_TYPE)},
221 {std::string("Game-Build-Id"), fmt::format("{:016X}", build_id)},
222 };
223
224 if (Common::FS::Exists(path)) {
225 Common::FS::IOFile file{path, Common::FS::FileAccessMode::Read,
226 Common::FS::FileType::BinaryFile};
227 if (file.IsOpen()) {
228 std::vector<u8> bytes(file.GetSize());
229 void(file.Read(bytes));
230 const auto digest = DigestFile(bytes);
231 headers.insert({std::string("If-None-Match"), Common::HexToString(digest, false)});
232 }
233 }
234
235 const auto response = client->Get(resolved_path.c_str(), headers);
236 if (response == nullptr)
237 return DownloadResult::NoResponse;
238
239 if (response->status == static_cast<int>(ResponseStatus::NoUpdate))
240 return DownloadResult::Success;
241 if (response->status == static_cast<int>(ResponseStatus::BadClientVersion))
242 return DownloadResult::BadClientVersion;
243 if (response->status == static_cast<int>(ResponseStatus::NoMatchTitleId))
244 return DownloadResult::NoMatchTitleId;
245 if (response->status == static_cast<int>(ResponseStatus::NoMatchBuildId))
246 return DownloadResult::NoMatchBuildId;
247 if (response->status != static_cast<int>(ResponseStatus::Ok))
248 return DownloadResult::GeneralWebError;
249
250 const auto content_type = response->headers.find("content-type");
251 if (content_type == response->headers.end() ||
252 content_type->second.find(content_type_name) == std::string::npos) {
253 return DownloadResult::InvalidContentType;
254 }
255
256 if (!Common::FS::CreateDirs(path)) {
257 return DownloadResult::GeneralFSError;
258 }
259
260 Common::FS::IOFile file{path, Common::FS::FileAccessMode::Append,
261 Common::FS::FileType::BinaryFile};
262 if (!file.IsOpen()) {
263 return DownloadResult::GeneralFSError;
264 }
265
266 if (!file.SetSize(response->body.size())) {
267 return DownloadResult::GeneralFSError;
268 }
269
270 if (file.Write(response->body) != response->body.size()) {
271 return DownloadResult::GeneralFSError;
272 }
273
274 return DownloadResult::Success;
275 }
276
277 using Digest = std::array<u8, 0x20>;
278 static Digest DigestFile(std::vector<u8> bytes) {
279 Digest out{};
280 mbedtls_sha256_ret(bytes.data(), bytes.size(), out.data(), 0);
281 return out;
282 }
283
284 std::unique_ptr<httplib::SSLClient> client;
285 std::filesystem::path path;
286 u64 title_id;
287 u64 build_id;
288};
289
290Boxcat::Boxcat(AM::Applets::AppletManager& applet_manager_, DirectoryGetter getter)
291 : Backend(std::move(getter)), applet_manager{applet_manager_} {}
292
293Boxcat::~Boxcat() = default;
294
295void SynchronizeInternal(AM::Applets::AppletManager& applet_manager, DirectoryGetter dir_getter,
296 TitleIDVersion title, ProgressServiceBackend& progress,
297 std::optional<std::string> dir_name = {}) {
298 progress.SetNeedHLELock(true);
299
300 if (Settings::values.bcat_boxcat_local) {
301 LOG_INFO(Service_BCAT, "Boxcat using local data by override, skipping download.");
302 const auto dir = dir_getter(title.title_id);
303 if (dir)
304 progress.SetTotalSize(dir->GetSize());
305 progress.FinishDownload(ResultSuccess);
306 return;
307 }
308
309 const auto zip_path = GetZIPFilePath(title.title_id);
310 Boxcat::Client client{zip_path, title.title_id, title.build_id};
311
312 progress.StartConnecting();
313
314 const auto res = client.DownloadDataZip();
315 if (res != DownloadResult::Success) {
316 LOG_ERROR(Service_BCAT, "Boxcat synchronization failed with error '{}'!", res);
317
318 if (res == DownloadResult::NoMatchBuildId || res == DownloadResult::NoMatchTitleId) {
319 Common::FS::RemoveFile(zip_path);
320 }
321
322 HandleDownloadDisplayResult(applet_manager, res);
323 progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
324 return;
325 }
326
327 progress.StartProcessingDataList();
328
329 Common::FS::IOFile zip{zip_path, Common::FS::FileAccessMode::Read,
330 Common::FS::FileType::BinaryFile};
331 const auto size = zip.GetSize();
332 std::vector<u8> bytes(size);
333 if (!zip.IsOpen() || size == 0 || zip.Read(bytes) != bytes.size()) {
334 LOG_ERROR(Service_BCAT, "Boxcat failed to read ZIP file at path '{}'!",
335 Common::FS::PathToUTF8String(zip_path));
336 progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
337 return;
338 }
339
340 const auto extracted = FileSys::ExtractZIP(std::make_shared<FileSys::VectorVfsFile>(bytes));
341 if (extracted == nullptr) {
342 LOG_ERROR(Service_BCAT, "Boxcat failed to extract ZIP file!");
343 progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
344 return;
345 }
346
347 if (dir_name == std::nullopt) {
348 progress.SetTotalSize(extracted->GetSize());
349
350 const auto target_dir = dir_getter(title.title_id);
351 if (target_dir == nullptr || !VfsRawCopyDProgress(extracted, target_dir, progress)) {
352 LOG_ERROR(Service_BCAT, "Boxcat failed to copy extracted ZIP to target directory!");
353 progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
354 return;
355 }
356 } else {
357 const auto target_dir = dir_getter(title.title_id);
358 if (target_dir == nullptr) {
359 LOG_ERROR(Service_BCAT, "Boxcat failed to get directory for title ID!");
360 progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
361 return;
362 }
363
364 const auto target_sub = target_dir->GetSubdirectory(*dir_name);
365 const auto source_sub = extracted->GetSubdirectory(*dir_name);
366
367 progress.SetTotalSize(source_sub->GetSize());
368
369 std::vector<std::string> filenames;
370 {
371 const auto files = target_sub->GetFiles();
372 std::transform(files.begin(), files.end(), std::back_inserter(filenames),
373 [](const auto& vfile) { return vfile->GetName(); });
374 }
375
376 for (const auto& filename : filenames) {
377 VfsDeleteFileWrap(target_sub, filename);
378 }
379
380 if (target_sub == nullptr || source_sub == nullptr ||
381 !VfsRawCopyDProgressSingle(source_sub, target_sub, progress)) {
382 LOG_ERROR(Service_BCAT, "Boxcat failed to copy extracted ZIP to target directory!");
383 progress.FinishDownload(ERROR_GENERAL_BCAT_FAILURE);
384 return;
385 }
386 }
387
388 progress.FinishDownload(ResultSuccess);
389}
390
391bool Boxcat::Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) {
392 is_syncing.exchange(true);
393
394 std::thread([this, title, &progress] {
395 SynchronizeInternal(applet_manager, dir_getter, title, progress);
396 }).detach();
397
398 return true;
399}
400
401bool Boxcat::SynchronizeDirectory(TitleIDVersion title, std::string name,
402 ProgressServiceBackend& progress) {
403 is_syncing.exchange(true);
404
405 std::thread([this, title, name, &progress] {
406 SynchronizeInternal(applet_manager, dir_getter, title, progress, name);
407 }).detach();
408
409 return true;
410}
411
412bool Boxcat::Clear(u64 title_id) {
413 if (Settings::values.bcat_boxcat_local) {
414 LOG_INFO(Service_BCAT, "Boxcat using local data by override, skipping clear.");
415 return true;
416 }
417
418 const auto dir = dir_getter(title_id);
419
420 std::vector<std::string> dirnames;
421
422 for (const auto& subdir : dir->GetSubdirectories())
423 dirnames.push_back(subdir->GetName());
424
425 for (const auto& subdir : dirnames) {
426 if (!dir->DeleteSubdirectoryRecursive(subdir))
427 return false;
428 }
429
430 return true;
431}
432
433void Boxcat::SetPassphrase(u64 title_id, const Passphrase& passphrase) {
434 LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase={}", title_id,
435 Common::HexToString(passphrase));
436}
437
438std::optional<std::vector<u8>> Boxcat::GetLaunchParameter(TitleIDVersion title) {
439 const auto bin_file_path = GetBINFilePath(title.title_id);
440
441 if (Settings::values.bcat_boxcat_local) {
442 LOG_INFO(Service_BCAT, "Boxcat using local data by override, skipping download.");
443 } else {
444 Client launch_client{bin_file_path, title.title_id, title.build_id};
445
446 const auto res = launch_client.DownloadLaunchParam();
447 if (res != DownloadResult::Success) {
448 LOG_ERROR(Service_BCAT, "Boxcat synchronization failed with error '{}'!", res);
449
450 if (res == DownloadResult::NoMatchBuildId || res == DownloadResult::NoMatchTitleId) {
451 Common::FS::RemoveFile(bin_file_path);
452 }
453
454 HandleDownloadDisplayResult(applet_manager, res);
455 return std::nullopt;
456 }
457 }
458
459 Common::FS::IOFile bin{bin_file_path, Common::FS::FileAccessMode::Read,
460 Common::FS::FileType::BinaryFile};
461 const auto size = bin.GetSize();
462 std::vector<u8> bytes(size);
463 if (!bin.IsOpen() || size == 0 || bin.Read(bytes) != bytes.size()) {
464 LOG_ERROR(Service_BCAT, "Boxcat failed to read launch parameter binary at path '{}'!",
465 Common::FS::PathToUTF8String(bin_file_path));
466 return std::nullopt;
467 }
468
469 return bytes;
470}
471
472Boxcat::StatusResult Boxcat::GetStatus(std::optional<std::string>& global,
473 std::map<std::string, EventStatus>& games) {
474 httplib::SSLClient client{BOXCAT_HOSTNAME, static_cast<int>(PORT)};
475 client.set_connection_timeout(static_cast<int>(TIMEOUT_SECONDS));
476 client.set_read_timeout(static_cast<int>(TIMEOUT_SECONDS));
477 client.set_write_timeout(static_cast<int>(TIMEOUT_SECONDS));
478
479 httplib::Headers headers{
480 {std::string("Game-Assets-API-Version"), std::string(BOXCAT_API_VERSION)},
481 {std::string("Boxcat-Client-Type"), std::string(BOXCAT_CLIENT_TYPE)},
482 };
483
484 if (!client.is_valid()) {
485 LOG_ERROR(Service_BCAT, "Client is invalid, going offline!");
486 return StatusResult::Offline;
487 }
488
489 if (!client.is_socket_open()) {
490 LOG_ERROR(Service_BCAT, "Failed to open socket, going offline!");
491 return StatusResult::Offline;
492 }
493
494 const auto response = client.Get(BOXCAT_PATHNAME_EVENTS, headers);
495 if (response == nullptr)
496 return StatusResult::Offline;
497
498 if (response->status == static_cast<int>(ResponseStatus::BadClientVersion))
499 return StatusResult::BadClientVersion;
500
501 try {
502 nlohmann::json json = nlohmann::json::parse(response->body);
503
504 if (!json["online"].get<bool>())
505 return StatusResult::Offline;
506
507 if (json["global"].is_null())
508 global = std::nullopt;
509 else
510 global = json["global"].get<std::string>();
511
512 if (json["games"].is_array()) {
513 for (const auto& object : json["games"]) {
514 if (object.is_object() && object.find("name") != object.end()) {
515 EventStatus detail{};
516 if (object["header"].is_string()) {
517 detail.header = object["header"].get<std::string>();
518 } else {
519 detail.header = std::nullopt;
520 }
521
522 if (object["footer"].is_string()) {
523 detail.footer = object["footer"].get<std::string>();
524 } else {
525 detail.footer = std::nullopt;
526 }
527
528 if (object["events"].is_array()) {
529 for (const auto& event : object["events"]) {
530 if (!event.is_string())
531 continue;
532 detail.events.push_back(event.get<std::string>());
533 }
534 }
535
536 games.insert_or_assign(object["name"], std::move(detail));
537 }
538 }
539 }
540
541 return StatusResult::Success;
542 } catch (const nlohmann::json::parse_error& error) {
543 LOG_ERROR(Service_BCAT, "{}", error.what());
544 return StatusResult::ParseError;
545 }
546}
547
548} // namespace Service::BCAT
diff --git a/src/core/hle/service/bcat/backend/boxcat.h b/src/core/hle/service/bcat/backend/boxcat.h
deleted file mode 100644
index d65b42e58..000000000
--- a/src/core/hle/service/bcat/backend/boxcat.h
+++ /dev/null
@@ -1,64 +0,0 @@
1// Copyright 2019 yuzu emulator team
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#pragma once
6
7#include <atomic>
8#include <map>
9#include <optional>
10#include "core/hle/service/bcat/backend/backend.h"
11
12namespace Service::AM::Applets {
13class AppletManager;
14}
15
16namespace Service::BCAT {
17
18struct EventStatus {
19 std::optional<std::string> header;
20 std::optional<std::string> footer;
21 std::vector<std::string> events;
22};
23
24/// Boxcat is yuzu's custom backend implementation of Nintendo's BCAT service. It is free to use and
25/// doesn't require a switch or nintendo account. The content is controlled by the yuzu team.
26class Boxcat final : public Backend {
27 friend void SynchronizeInternal(AM::Applets::AppletManager& applet_manager,
28 DirectoryGetter dir_getter, TitleIDVersion title,
29 ProgressServiceBackend& progress,
30 std::optional<std::string> dir_name);
31
32public:
33 explicit Boxcat(AM::Applets::AppletManager& applet_manager_, DirectoryGetter getter);
34 ~Boxcat() override;
35
36 bool Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) override;
37 bool SynchronizeDirectory(TitleIDVersion title, std::string name,
38 ProgressServiceBackend& progress) override;
39
40 bool Clear(u64 title_id) override;
41
42 void SetPassphrase(u64 title_id, const Passphrase& passphrase) override;
43
44 std::optional<std::vector<u8>> GetLaunchParameter(TitleIDVersion title) override;
45
46 enum class StatusResult {
47 Success,
48 Offline,
49 ParseError,
50 BadClientVersion,
51 };
52
53 static StatusResult GetStatus(std::optional<std::string>& global,
54 std::map<std::string, EventStatus>& games);
55
56private:
57 std::atomic_bool is_syncing{false};
58
59 class Client;
60 std::unique_ptr<Client> client;
61 AM::Applets::AppletManager& applet_manager;
62};
63
64} // namespace Service::BCAT
diff --git a/src/core/hle/service/bcat/bcat_module.cpp b/src/core/hle/service/bcat/bcat_module.cpp
index 72294eb2e..701f634f8 100644
--- a/src/core/hle/service/bcat/bcat_module.cpp
+++ b/src/core/hle/service/bcat/bcat_module.cpp
@@ -4,7 +4,6 @@
4 4
5#include <cctype> 5#include <cctype>
6#include <mbedtls/md5.h> 6#include <mbedtls/md5.h>
7#include "backend/boxcat.h"
8#include "common/hex_util.h" 7#include "common/hex_util.h"
9#include "common/logging/log.h" 8#include "common/logging/log.h"
10#include "common/settings.h" 9#include "common/settings.h"
@@ -578,12 +577,6 @@ void Module::Interface::CreateDeliveryCacheStorageServiceWithApplicationId(
578 577
579std::unique_ptr<Backend> CreateBackendFromSettings([[maybe_unused]] Core::System& system, 578std::unique_ptr<Backend> CreateBackendFromSettings([[maybe_unused]] Core::System& system,
580 DirectoryGetter getter) { 579 DirectoryGetter getter) {
581#ifdef YUZU_ENABLE_BOXCAT
582 if (Settings::values.bcat_backend.GetValue() == "boxcat") {
583 return std::make_unique<Boxcat>(system.GetAppletManager(), std::move(getter));
584 }
585#endif
586
587 return std::make_unique<NullBackend>(std::move(getter)); 580 return std::make_unique<NullBackend>(std::move(getter));
588} 581}
589 582
diff --git a/src/core/network/network.cpp b/src/core/network/network.cpp
index 72eea52f0..a3e0664b9 100644
--- a/src/core/network/network.cpp
+++ b/src/core/network/network.cpp
@@ -366,8 +366,6 @@ std::optional<IPv4Address> GetHostIPv4Address() {
366 if (res != network_interfaces.end()) { 366 if (res != network_interfaces.end()) {
367 char ip_addr[16] = {}; 367 char ip_addr[16] = {};
368 ASSERT(inet_ntop(AF_INET, &res->ip_address, ip_addr, sizeof(ip_addr)) != nullptr); 368 ASSERT(inet_ntop(AF_INET, &res->ip_address, ip_addr, sizeof(ip_addr)) != nullptr);
369 LOG_INFO(Network, "IP address: {}", ip_addr);
370
371 return TranslateIPv4(res->ip_address); 369 return TranslateIPv4(res->ip_address);
372 } else { 370 } else {
373 LOG_ERROR(Network, "Couldn't find selected interface \"{}\"", selected_network_interface); 371 LOG_ERROR(Network, "Couldn't find selected interface \"{}\"", selected_network_interface);
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp
index 03888b7cb..ab6211b29 100644
--- a/src/input_common/sdl/sdl_impl.cpp
+++ b/src/input_common/sdl/sdl_impl.cpp
@@ -254,11 +254,25 @@ public:
254 } 254 }
255 255
256 bool IsJoyconLeft() const { 256 bool IsJoyconLeft() const {
257 return std::strstr(GetControllerName().c_str(), "Joy-Con Left") != nullptr; 257 const std::string controller_name = GetControllerName();
258 if (std::strstr(controller_name.c_str(), "Joy-Con Left") != nullptr) {
259 return true;
260 }
261 if (std::strstr(controller_name.c_str(), "Joy-Con (L)") != nullptr) {
262 return true;
263 }
264 return false;
258 } 265 }
259 266
260 bool IsJoyconRight() const { 267 bool IsJoyconRight() const {
261 return std::strstr(GetControllerName().c_str(), "Joy-Con Right") != nullptr; 268 const std::string controller_name = GetControllerName();
269 if (std::strstr(controller_name.c_str(), "Joy-Con Right") != nullptr) {
270 return true;
271 }
272 if (std::strstr(controller_name.c_str(), "Joy-Con (R)") != nullptr) {
273 return true;
274 }
275 return false;
262 } 276 }
263 277
264 std::string GetControllerName() const { 278 std::string GetControllerName() const {
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index b6dda283d..402be6a78 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -290,10 +290,6 @@ if (YUZU_USE_QT_WEB_ENGINE)
290 target_compile_definitions(yuzu PRIVATE -DYUZU_USE_QT_WEB_ENGINE) 290 target_compile_definitions(yuzu PRIVATE -DYUZU_USE_QT_WEB_ENGINE)
291endif () 291endif ()
292 292
293if (YUZU_ENABLE_BOXCAT)
294 target_compile_definitions(yuzu PRIVATE -DYUZU_ENABLE_BOXCAT)
295endif ()
296
297if(UNIX AND NOT APPLE) 293if(UNIX AND NOT APPLE)
298 install(TARGETS yuzu RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") 294 install(TARGETS yuzu RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
299endif() 295endif()
diff --git a/src/yuzu/applets/qt_web_browser.cpp b/src/yuzu/applets/qt_web_browser.cpp
index 652d99570..7d433ca50 100644
--- a/src/yuzu/applets/qt_web_browser.cpp
+++ b/src/yuzu/applets/qt_web_browser.cpp
@@ -54,6 +54,9 @@ QtNXWebEngineView::QtNXWebEngineView(QWidget* parent, Core::System& system,
54 input_interpreter(std::make_unique<InputInterpreter>(system)), 54 input_interpreter(std::make_unique<InputInterpreter>(system)),
55 default_profile{QWebEngineProfile::defaultProfile()}, 55 default_profile{QWebEngineProfile::defaultProfile()},
56 global_settings{QWebEngineSettings::globalSettings()} { 56 global_settings{QWebEngineSettings::globalSettings()} {
57 default_profile->setPersistentStoragePath(QString::fromStdString(Common::FS::PathToUTF8String(
58 Common::FS::GetYuzuPath(Common::FS::YuzuPath::YuzuDir) / "qtwebengine")));
59
57 QWebEngineScript gamepad; 60 QWebEngineScript gamepad;
58 QWebEngineScript window_nx; 61 QWebEngineScript window_nx;
59 62
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index 1519a46ed..8b9e186b0 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -302,12 +302,17 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,
302 connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete); 302 connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete);
303 connect(this, &GRenderWindow::ExecuteProgramSignal, parent, &GMainWindow::OnExecuteProgram, 303 connect(this, &GRenderWindow::ExecuteProgramSignal, parent, &GMainWindow::OnExecuteProgram,
304 Qt::QueuedConnection); 304 Qt::QueuedConnection);
305 connect(this, &GRenderWindow::ExitSignal, parent, &GMainWindow::OnExit, Qt::QueuedConnection);
305} 306}
306 307
307void GRenderWindow::ExecuteProgram(std::size_t program_index) { 308void GRenderWindow::ExecuteProgram(std::size_t program_index) {
308 emit ExecuteProgramSignal(program_index); 309 emit ExecuteProgramSignal(program_index);
309} 310}
310 311
312void GRenderWindow::Exit() {
313 emit ExitSignal();
314}
315
311GRenderWindow::~GRenderWindow() { 316GRenderWindow::~GRenderWindow() {
312 input_subsystem->Shutdown(); 317 input_subsystem->Shutdown();
313} 318}
diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h
index 402dd2ee1..54c4e2142 100644
--- a/src/yuzu/bootmanager.h
+++ b/src/yuzu/bootmanager.h
@@ -181,6 +181,9 @@ public:
181 */ 181 */
182 void ExecuteProgram(std::size_t program_index); 182 void ExecuteProgram(std::size_t program_index);
183 183
184 /// Instructs the window to exit the application.
185 void Exit();
186
184public slots: 187public slots:
185 void OnEmulationStarting(EmuThread* emu_thread); 188 void OnEmulationStarting(EmuThread* emu_thread);
186 void OnEmulationStopping(); 189 void OnEmulationStopping();
@@ -191,6 +194,7 @@ signals:
191 void Closed(); 194 void Closed();
192 void FirstFrameDisplayed(); 195 void FirstFrameDisplayed();
193 void ExecuteProgramSignal(std::size_t program_index); 196 void ExecuteProgramSignal(std::size_t program_index);
197 void ExitSignal();
194 void MouseActivity(); 198 void MouseActivity();
195 199
196private: 200private:
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index b5796a8fc..eb941ce02 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -709,8 +709,6 @@ void Config::ReadDebuggingValues() {
709 709
710void Config::ReadServiceValues() { 710void Config::ReadServiceValues() {
711 qt_config->beginGroup(QStringLiteral("Services")); 711 qt_config->beginGroup(QStringLiteral("Services"));
712 ReadBasicSetting(Settings::values.bcat_backend);
713 ReadBasicSetting(Settings::values.bcat_boxcat_local);
714 ReadBasicSetting(Settings::values.network_interface); 712 ReadBasicSetting(Settings::values.network_interface);
715 qt_config->endGroup(); 713 qt_config->endGroup();
716} 714}
@@ -1269,8 +1267,6 @@ void Config::SaveDebuggingValues() {
1269void Config::SaveNetworkValues() { 1267void Config::SaveNetworkValues() {
1270 qt_config->beginGroup(QStringLiteral("Services")); 1268 qt_config->beginGroup(QStringLiteral("Services"));
1271 1269
1272 WriteBasicSetting(Settings::values.bcat_backend);
1273 WriteBasicSetting(Settings::values.bcat_boxcat_local);
1274 WriteBasicSetting(Settings::values.network_interface); 1270 WriteBasicSetting(Settings::values.network_interface);
1275 1271
1276 qt_config->endGroup(); 1272 qt_config->endGroup();
diff --git a/src/yuzu/configuration/configure_network.cpp b/src/yuzu/configuration/configure_network.cpp
index ae22f1018..cc15d36c2 100644
--- a/src/yuzu/configuration/configure_network.cpp
+++ b/src/yuzu/configuration/configure_network.cpp
@@ -6,64 +6,25 @@
6#include <QtConcurrent/QtConcurrent> 6#include <QtConcurrent/QtConcurrent>
7#include "common/settings.h" 7#include "common/settings.h"
8#include "core/core.h" 8#include "core/core.h"
9#include "core/hle/service/bcat/backend/boxcat.h"
10#include "core/network/network_interface.h" 9#include "core/network/network_interface.h"
11#include "ui_configure_network.h" 10#include "ui_configure_network.h"
12#include "yuzu/configuration/configure_network.h" 11#include "yuzu/configuration/configure_network.h"
13 12
14#ifdef YUZU_ENABLE_BOXCAT
15namespace {
16QString FormatEventStatusString(const Service::BCAT::EventStatus& status) {
17 QString out;
18
19 if (status.header.has_value()) {
20 out += QStringLiteral("<i>%1</i><br>").arg(QString::fromStdString(*status.header));
21 }
22
23 if (status.events.size() == 1) {
24 out += QStringLiteral("%1<br>").arg(QString::fromStdString(status.events.front()));
25 } else {
26 for (const auto& event : status.events) {
27 out += QStringLiteral("- %1<br>").arg(QString::fromStdString(event));
28 }
29 }
30
31 if (status.footer.has_value()) {
32 out += QStringLiteral("<i>%1</i><br>").arg(QString::fromStdString(*status.footer));
33 }
34
35 return out;
36}
37} // Anonymous namespace
38#endif
39
40ConfigureNetwork::ConfigureNetwork(QWidget* parent) 13ConfigureNetwork::ConfigureNetwork(QWidget* parent)
41 : QWidget(parent), ui(std::make_unique<Ui::ConfigureNetwork>()) { 14 : QWidget(parent), ui(std::make_unique<Ui::ConfigureNetwork>()) {
42 ui->setupUi(this); 15 ui->setupUi(this);
43 16
44 ui->bcat_source->addItem(QStringLiteral("None"));
45 ui->bcat_empty_label->setHidden(true);
46 ui->bcat_empty_header->setHidden(true);
47
48#ifdef YUZU_ENABLE_BOXCAT
49 ui->bcat_source->addItem(QStringLiteral("Boxcat"), QStringLiteral("boxcat"));
50#endif
51
52 ui->network_interface->addItem(tr("None")); 17 ui->network_interface->addItem(tr("None"));
53 for (const auto& iface : Network::GetAvailableNetworkInterfaces()) { 18 for (const auto& iface : Network::GetAvailableNetworkInterfaces()) {
54 ui->network_interface->addItem(QString::fromStdString(iface.name)); 19 ui->network_interface->addItem(QString::fromStdString(iface.name));
55 } 20 }
56 21
57 connect(ui->bcat_source, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
58 &ConfigureNetwork::OnBCATImplChanged);
59
60 this->SetConfiguration(); 22 this->SetConfiguration();
61} 23}
62 24
63ConfigureNetwork::~ConfigureNetwork() = default; 25ConfigureNetwork::~ConfigureNetwork() = default;
64 26
65void ConfigureNetwork::ApplyConfiguration() { 27void ConfigureNetwork::ApplyConfiguration() {
66 Settings::values.bcat_backend = ui->bcat_source->currentText().toLower().toStdString();
67 Settings::values.network_interface = ui->network_interface->currentText().toStdString(); 28 Settings::values.network_interface = ui->network_interface->currentText().toStdString();
68} 29}
69 30
@@ -74,86 +35,8 @@ void ConfigureNetwork::RetranslateUi() {
74void ConfigureNetwork::SetConfiguration() { 35void ConfigureNetwork::SetConfiguration() {
75 const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn(); 36 const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn();
76 37
77 const int index =
78 ui->bcat_source->findData(QString::fromStdString(Settings::values.bcat_backend.GetValue()));
79 ui->bcat_source->setCurrentIndex(index == -1 ? 0 : index);
80
81 const std::string& network_interface = Settings::values.network_interface.GetValue(); 38 const std::string& network_interface = Settings::values.network_interface.GetValue();
82 39
83 ui->network_interface->setCurrentText(QString::fromStdString(network_interface)); 40 ui->network_interface->setCurrentText(QString::fromStdString(network_interface));
84 ui->network_interface->setEnabled(runtime_lock); 41 ui->network_interface->setEnabled(runtime_lock);
85} 42}
86
87std::pair<QString, QString> ConfigureNetwork::BCATDownloadEvents() {
88#ifdef YUZU_ENABLE_BOXCAT
89 std::optional<std::string> global;
90 std::map<std::string, Service::BCAT::EventStatus> map;
91 const auto res = Service::BCAT::Boxcat::GetStatus(global, map);
92
93 switch (res) {
94 case Service::BCAT::Boxcat::StatusResult::Success:
95 break;
96 case Service::BCAT::Boxcat::StatusResult::Offline:
97 return {QString{},
98 tr("The boxcat service is offline or you are not connected to the internet.")};
99 case Service::BCAT::Boxcat::StatusResult::ParseError:
100 return {QString{},
101 tr("There was an error while processing the boxcat event data. Contact the yuzu "
102 "developers.")};
103 case Service::BCAT::Boxcat::StatusResult::BadClientVersion:
104 return {QString{},
105 tr("The version of yuzu you are using is either too new or too old for the server. "
106 "Try updating to the latest official release of yuzu.")};
107 }
108
109 if (map.empty()) {
110 return {QStringLiteral("Current Boxcat Events"),
111 tr("There are currently no events on boxcat.")};
112 }
113
114 QString out;
115
116 if (global.has_value()) {
117 out += QStringLiteral("%1<br>").arg(QString::fromStdString(*global));
118 }
119
120 for (const auto& [key, value] : map) {
121 out += QStringLiteral("%1<b>%2</b><br>%3")
122 .arg(out.isEmpty() ? QString{} : QStringLiteral("<br>"))
123 .arg(QString::fromStdString(key))
124 .arg(FormatEventStatusString(value));
125 }
126 return {tr("Current Boxcat Events"), std::move(out)};
127#else
128 return {tr("Current Boxcat Events"), tr("There are currently no events on boxcat.")};
129#endif
130}
131
132void ConfigureNetwork::OnBCATImplChanged() {
133#ifdef YUZU_ENABLE_BOXCAT
134 const auto boxcat = ui->bcat_source->currentText() == QStringLiteral("Boxcat");
135 ui->bcat_empty_header->setHidden(!boxcat);
136 ui->bcat_empty_label->setHidden(!boxcat);
137 ui->bcat_empty_header->setText(QString{});
138 ui->bcat_empty_label->setText(tr("Yuzu is retrieving the latest boxcat status..."));
139
140 if (!boxcat)
141 return;
142
143 const auto future = QtConcurrent::run([this] { return BCATDownloadEvents(); });
144
145 watcher.setFuture(future);
146 connect(&watcher, &QFutureWatcher<std::pair<QString, QString>>::finished, this,
147 [this] { OnUpdateBCATEmptyLabel(watcher.result()); });
148#endif
149}
150
151void ConfigureNetwork::OnUpdateBCATEmptyLabel(std::pair<QString, QString> string) {
152#ifdef YUZU_ENABLE_BOXCAT
153 const auto boxcat = ui->bcat_source->currentText() == QStringLiteral("Boxcat");
154 if (boxcat) {
155 ui->bcat_empty_header->setText(string.first);
156 ui->bcat_empty_label->setText(string.second);
157 }
158#endif
159}
diff --git a/src/yuzu/configuration/configure_network.h b/src/yuzu/configuration/configure_network.h
index 442b68e6b..028fd4acc 100644
--- a/src/yuzu/configuration/configure_network.h
+++ b/src/yuzu/configuration/configure_network.h
@@ -25,10 +25,5 @@ public:
25private: 25private:
26 void SetConfiguration(); 26 void SetConfiguration();
27 27
28 std::pair<QString, QString> BCATDownloadEvents();
29 void OnBCATImplChanged();
30 void OnUpdateBCATEmptyLabel(std::pair<QString, QString> string);
31
32 std::unique_ptr<Ui::ConfigureNetwork> ui; 28 std::unique_ptr<Ui::ConfigureNetwork> ui;
33 QFutureWatcher<std::pair<QString, QString>> watcher{this};
34}; 29};
diff --git a/src/yuzu/configuration/configure_network.ui b/src/yuzu/configuration/configure_network.ui
index 5f9b7e97b..9a79262f0 100644
--- a/src/yuzu/configuration/configure_network.ui
+++ b/src/yuzu/configuration/configure_network.ui
@@ -35,92 +35,6 @@
35 </layout> 35 </layout>
36 </widget> 36 </widget>
37 </item> 37 </item>
38 <item>
39 <widget class="QGroupBox" name="groupBox">
40 <property name="title">
41 <string>BCAT</string>
42 </property>
43 <layout class="QGridLayout" name="gridLayout">
44 <item row="3" column="0">
45 <widget class="QLabel" name="bcat_empty_header">
46 <property name="text">
47 <string/>
48 </property>
49 <property name="alignment">
50 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
51 </property>
52 <property name="wordWrap">
53 <bool>true</bool>
54 </property>
55 </widget>
56 </item>
57 <item row="0" column="0">
58 <widget class="QLabel" name="label">
59 <property name="maximumSize">
60 <size>
61 <width>16777215</width>
62 <height>16777215</height>
63 </size>
64 </property>
65 <property name="text">
66 <string>BCAT Backend</string>
67 </property>
68 </widget>
69 </item>
70 <item row="1" column="1" colspan="2">
71 <widget class="QLabel" name="label_2">
72 <property name="maximumSize">
73 <size>
74 <width>260</width>
75 <height>16777215</height>
76 </size>
77 </property>
78 <property name="text">
79 <string>BCAT is Nintendo's way of sending data to games to engage its community and unlock additional content.</string>
80 </property>
81 <property name="wordWrap">
82 <bool>true</bool>
83 </property>
84 </widget>
85 </item>
86 <item row="2" column="1" colspan="2">
87 <widget class="QLabel" name="label_3">
88 <property name="text">
89 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://yuzu-emu.org/help/feature/boxcat&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Learn more about BCAT, Boxcat, and Current Events&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
90 </property>
91 <property name="openExternalLinks">
92 <bool>true</bool>
93 </property>
94 </widget>
95 </item>
96 <item row="0" column="1" colspan="2">
97 <widget class="QComboBox" name="bcat_source"/>
98 </item>
99 <item row="3" column="1" colspan="2">
100 <widget class="QLabel" name="bcat_empty_label">
101 <property name="enabled">
102 <bool>true</bool>
103 </property>
104 <property name="maximumSize">
105 <size>
106 <width>260</width>
107 <height>16777215</height>
108 </size>
109 </property>
110 <property name="text">
111 <string/>
112 </property>
113 <property name="alignment">
114 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
115 </property>
116 <property name="wordWrap">
117 <bool>true</bool>
118 </property>
119 </widget>
120 </item>
121 </layout>
122 </widget>
123 </item>
124 </layout> 38 </layout>
125 </item> 39 </item>
126 <item> 40 <item>
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 7eec8f5bb..552c2cc63 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1384,6 +1384,9 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t
1384 system.RegisterExecuteProgramCallback( 1384 system.RegisterExecuteProgramCallback(
1385 [this](std::size_t program_index) { render_window->ExecuteProgram(program_index); }); 1385 [this](std::size_t program_index) { render_window->ExecuteProgram(program_index); });
1386 1386
1387 // Register an Exit callback such that Core can exit the currently running application.
1388 system.RegisterExitCallback([this]() { render_window->Exit(); });
1389
1387 connect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame); 1390 connect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame);
1388 connect(render_window, &GRenderWindow::MouseActivity, this, &GMainWindow::OnMouseActivity); 1391 connect(render_window, &GRenderWindow::MouseActivity, this, &GMainWindow::OnMouseActivity);
1389 // BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views 1392 // BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views
@@ -2469,6 +2472,10 @@ void GMainWindow::OnExecuteProgram(std::size_t program_index) {
2469 BootGame(last_filename_booted, 0, program_index); 2472 BootGame(last_filename_booted, 0, program_index);
2470} 2473}
2471 2474
2475void GMainWindow::OnExit() {
2476 OnStopGame();
2477}
2478
2472void GMainWindow::ErrorDisplayDisplayError(QString error_code, QString error_text) { 2479void GMainWindow::ErrorDisplayDisplayError(QString error_code, QString error_text) {
2473 OverlayDialog dialog(render_window, Core::System::GetInstance(), error_code, error_text, 2480 OverlayDialog dialog(render_window, Core::System::GetInstance(), error_code, error_text,
2474 QString{}, tr("OK"), Qt::AlignLeft | Qt::AlignVCenter); 2481 QString{}, tr("OK"), Qt::AlignLeft | Qt::AlignVCenter);
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 36eed6103..60ce01471 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -153,6 +153,7 @@ signals:
153public slots: 153public slots:
154 void OnLoadComplete(); 154 void OnLoadComplete();
155 void OnExecuteProgram(std::size_t program_index); 155 void OnExecuteProgram(std::size_t program_index);
156 void OnExit();
156 void ControllerSelectorReconfigureControllers( 157 void ControllerSelectorReconfigureControllers(
157 const Core::Frontend::ControllerParameters& parameters); 158 const Core::Frontend::ControllerParameters& parameters);
158 void SoftwareKeyboardInitialize( 159 void SoftwareKeyboardInitialize(
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index d74eb7e2b..434518d53 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -518,10 +518,6 @@ void Config::ReadValues() {
518 ReadSetting("WebService", Settings::values.web_api_url); 518 ReadSetting("WebService", Settings::values.web_api_url);
519 ReadSetting("WebService", Settings::values.yuzu_username); 519 ReadSetting("WebService", Settings::values.yuzu_username);
520 ReadSetting("WebService", Settings::values.yuzu_token); 520 ReadSetting("WebService", Settings::values.yuzu_token);
521
522 // Services
523 ReadSetting("Services", Settings::values.bcat_backend);
524 ReadSetting("Services", Settings::values.bcat_boxcat_local);
525} 521}
526 522
527void Config::Reload() { 523void Config::Reload() {
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index 72f3213fb..8119a50d8 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -428,11 +428,6 @@ web_api_url = https://api.yuzu-emu.org
428yuzu_username = 428yuzu_username =
429yuzu_token = 429yuzu_token =
430 430
431[Services]
432# The name of the backend to use for BCAT
433# If this is set to 'boxcat' boxcat will be used, otherwise a null implementation will be used
434bcat_backend =
435
436[AddOns] 431[AddOns]
437# Used to disable add-ons 432# Used to disable add-ons
438# List of title IDs of games that will have add-ons disabled (separated by '|'): 433# List of title IDs of games that will have add-ons disabled (separated by '|'):
HIC SVNT DRACONES