ldn: Add and stub lp2p:sys lp2p:app INetworkServiceMonitor INetworkService

CMakeLists.txt

@@ -13,11 +13,11 @@ project(yuzu)
 option(ENABLE_SDL2 "Enable the SDL2 frontend" ON)
 CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON "ENABLE_SDL2;MSVC" OFF)
 # On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion
-option(YUZU_ALLOW_SYSTEM_SDL2 "Try using system SDL2 before fallling back to one from externals" OFF)
+CMAKE_DEPENDENT_OPTION(YUZU_ALLOW_SYSTEM_SDL2 "Try using system SDL2 before fallling back to one from externals" NOT UNIX "ENABLE_SDL2" OFF)
 
 option(ENABLE_QT "Enable the Qt frontend" ON)
 option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
-CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
+CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" ON "ENABLE_QT;MSVC" OFF)
 
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
 
@@ -240,7 +240,6 @@ yuzu_find_packages()
 
 # Qt5 requires that we find components, so it doesn't fit our pretty little find package function
 if(ENABLE_QT)
-    set(QT_VERSION 5.12)
     # We want to load the generated conan qt config so that we get the QT_ROOT var so that we can use the official
     # Qt5Config inside the root folder instead of the conan generated one.
     if(EXISTS ${CMAKE_BINARY_DIR}/qtConfig.cmake)
@@ -248,40 +247,22 @@ if(ENABLE_QT)
         list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}")
         list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}")
     endif()
-
-    # Check for system Qt on Linux, fallback to bundled Qt
-    if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-        if (NOT YUZU_USE_BUNDLED_QT)
-            find_package(Qt5 ${QT_VERSION} COMPONENTS Widgets QUIET)
-            if (NOT Qt5_FOUND)
-                set(YUZU_USE_BUNDLED_QT ON CACHE BOOL "Download bundled Qt" FORCE)
-            endif()
-        endif()
-        if (YUZU_USE_BUNDLED_QT)
-            # Binary package currently does not support Qt webengine, so make sure it's disabled
-            set(YUZU_USE_QT_WEB_ENGINE OFF CACHE BOOL "Use Qt Webengine" FORCE)
-        endif()
-    endif()
-
     # Workaround for an issue where conan tries to build Qt from scratch instead of download prebuilt binaries
     set(QT_PREFIX_HINT)
-
     if(YUZU_USE_BUNDLED_QT)
         if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64)
-            set(QT_BUILD qt-5.12.8-msvc2017_64)
-        elseif ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") AND NOT MINGW AND ARCHITECTURE_x86_64)
-            set(QT_BUILD qt5_5_15_2)
+            set(QT_VER qt-5.12.8-msvc2017_64)
         else()
             message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.")
         endif()
 
-        if (DEFINED QT_BUILD)
-            download_bundled_external("qt/" ${QT_BUILD} QT_PREFIX)
+        if (DEFINED QT_VER)
+            download_bundled_external("qt/" ${QT_VER} QT_PREFIX)
         endif()
 
         set(QT_PREFIX_HINT HINTS "${QT_PREFIX}")
     endif()
-    find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets ${QT_PREFIX_HINT} NO_CMAKE_SYSTEM_PATH)
+    find_package(Qt5 5.9 COMPONENTS Widgets ${QT_PREFIX_HINT})
     if (YUZU_USE_QT_WEB_ENGINE)
         find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets)
     endif()
@@ -290,7 +271,6 @@ if(ENABLE_QT)
         find_package(Qt5 REQUIRED COMPONENTS LinguistTools ${QT_PREFIX_HINT})
     endif()
 endif()
-
 # find SDL2 exports a bunch of variables that are needed, so its easier to do this outside of the yuzu_find_package
 if (ENABLE_SDL2)
     if (YUZU_USE_BUNDLED_SDL2)
@@ -399,7 +379,7 @@ if (CONAN_REQUIRED_LIBS)
     if(ENABLE_QT)
         list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}")
         list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}")
-        find_package(Qt5 5.12 REQUIRED COMPONENTS Widgets)
+        find_package(Qt5 5.9 REQUIRED COMPONENTS Widgets)
         if (YUZU_USE_QT_WEB_ENGINE)
             find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets)
         endif()

CMakeModules/CopyYuzuQt5Deps.cmake

@@ -1,111 +1,52 @@
 function(copy_yuzu_Qt5_deps target_dir)
     include(WindowsCopyFiles)
-    if (MSVC)
-        set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
-        set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
-    else()
-        set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/")
-        set(Qt5_DLL_DIR "${Qt5_DIR}/../../../lib/")
-    endif()
+    set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
+    set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
     set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
-    set(Qt5_PLATFORMTHEMES_DIR "${Qt5_DIR}/../../../plugins/platformthemes/")
-    set(Qt5_PLATFORMINPUTCONTEXTS_DIR "${Qt5_DIR}/../../../plugins/platforminputcontexts/")
-    set(Qt5_XCBGLINTEGRATIONS_DIR "${Qt5_DIR}/../../../plugins/xcbglintegrations/")
     set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/")
     set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/")
     set(Qt5_RESOURCES_DIR "${Qt5_DIR}/../../../resources/")
     set(PLATFORMS ${DLL_DEST}plugins/platforms/)
     set(STYLES ${DLL_DEST}plugins/styles/)
     set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/)
-    if (MSVC)
-        windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
-            icudt*.dll
-            icuin*.dll
-            icuuc*.dll
-            Qt5Core$<$<CONFIG:Debug>:d>.*
-            Qt5Gui$<$<CONFIG:Debug>:d>.*
-            Qt5Widgets$<$<CONFIG:Debug>:d>.*
+    windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
+        icudt*.dll
+        icuin*.dll
+        icuuc*.dll
+        Qt5Core$<$<CONFIG:Debug>:d>.*
+        Qt5Gui$<$<CONFIG:Debug>:d>.*
+        Qt5Widgets$<$<CONFIG:Debug>:d>.*
+    )
+
+    if (YUZU_USE_QT_WEB_ENGINE)
+        windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} 
+            Qt5Network$<$<CONFIG:Debug>:d>.*
+            Qt5Positioning$<$<CONFIG:Debug>:d>.*
+            Qt5PrintSupport$<$<CONFIG:Debug>:d>.*
+            Qt5Qml$<$<CONFIG:Debug>:d>.*
+            Qt5Quick$<$<CONFIG:Debug>:d>.*
+            Qt5QuickWidgets$<$<CONFIG:Debug>:d>.*
+            Qt5WebChannel$<$<CONFIG:Debug>:d>.*
+            Qt5WebEngine$<$<CONFIG:Debug>:d>.*
+            Qt5WebEngineCore$<$<CONFIG:Debug>:d>.*
+            Qt5WebEngineWidgets$<$<CONFIG:Debug>:d>.*
+            QtWebEngineProcess$<$<CONFIG:Debug>:d>.*
         )
 
-        if (YUZU_USE_QT_WEB_ENGINE)
-            windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
-                Qt5Network$<$<CONFIG:Debug>:d>.*
-                Qt5Positioning$<$<CONFIG:Debug>:d>.*
-                Qt5PrintSupport$<$<CONFIG:Debug>:d>.*
-                Qt5Qml$<$<CONFIG:Debug>:d>.*
-                Qt5Quick$<$<CONFIG:Debug>:d>.*
-                Qt5QuickWidgets$<$<CONFIG:Debug>:d>.*
-                Qt5WebChannel$<$<CONFIG:Debug>:d>.*
-                Qt5WebEngine$<$<CONFIG:Debug>:d>.*
-                Qt5WebEngineCore$<$<CONFIG:Debug>:d>.*
-                Qt5WebEngineWidgets$<$<CONFIG:Debug>:d>.*
-                QtWebEngineProcess$<$<CONFIG:Debug>:d>.*
-            )
-
-            windows_copy_files(${target_dir} ${Qt5_RESOURCES_DIR} ${DLL_DEST}
-                qtwebengine_resources.pak
-                qtwebengine_devtools_resources.pak
-                qtwebengine_resources_100p.pak
-                qtwebengine_resources_200p.pak
-                icudtl.dat
-            )
-        endif ()
-        windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
-        windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*)
-        windows_copy_files(yuzu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS}
-            qjpeg$<$<CONFIG:Debug>:d>.*
-            qgif$<$<CONFIG:Debug>:d>.*
-            )
-    else()
-        set(Qt5_DLLS
-            "${Qt5_DLL_DIR}libQt5Core.so.5"
-            "${Qt5_DLL_DIR}libQt5DBus.so.5"
-            "${Qt5_DLL_DIR}libQt5Gui.so.5"
-            "${Qt5_DLL_DIR}libQt5Widgets.so.5"
-            "${Qt5_DLL_DIR}libQt5XcbQpa.so.5"
-            "${Qt5_DLL_DIR}libicudata.so.60"
-            "${Qt5_DLL_DIR}libicui18n.so.60"
-            "${Qt5_DLL_DIR}libicuuc.so.60"
-            )
-        set(Qt5_IMAGEFORMAT_DLLS
-            "${Qt5_IMAGEFORMATS_DIR}libqjpeg.so"
-            "${Qt5_IMAGEFORMATS_DIR}libqgif.so"
-            "${Qt5_IMAGEFORMATS_DIR}libqico.so"
-            )
-        set(Qt5_PLATFORMTHEME_DLLS
-            "${Qt5_PLATFORMTHEMES_DIR}libqgtk3.so"
-            "${Qt5_PLATFORMTHEMES_DIR}libqxdgdesktopportal.so"
-            )
-        set(Qt5_PLATFORM_DLLS
-            "${Qt5_PLATFORMS_DIR}libqxcb.so"
-            )
-        set(Qt5_PLATFORMINPUTCONTEXT_DLLS
-            "${Qt5_PLATFORMINPUTCONTEXTS_DIR}libcomposeplatforminputcontextplugin.so"
-            "${Qt5_PLATFORMINPUTCONTEXTS_DIR}libibusplatforminputcontextplugin.so"
-            )
-        set(Qt5_XCBGLINTEGRATION_DLLS
-            "${Qt5_XCBGLINTEGRATIONS_DIR}libqxcb-glx-integration.so"
-            )
-        foreach(LIB ${Qt5_DLLS})
-            file(COPY ${LIB} DESTINATION "${DLL_DEST}/lib" FOLLOW_SYMLINK_CHAIN)
-        endforeach()
-        foreach(LIB ${Qt5_IMAGEFORMAT_DLLS})
-            file(COPY ${LIB} DESTINATION "${DLL_DEST}plugins/imageformats/" FOLLOW_SYMLINK_CHAIN)
-        endforeach()
-        foreach(LIB ${Qt5_PLATFORMTHEME_DLLS})
-            file(COPY ${LIB} DESTINATION "${DLL_DEST}plugins/platformthemes/" FOLLOW_SYMLINK_CHAIN)
-        endforeach()
-        foreach(LIB ${Qt5_PLATFORM_DLLS})
-            file(COPY ${LIB} DESTINATION "${DLL_DEST}plugins/platforms/" FOLLOW_SYMLINK_CHAIN)
-        endforeach()
-        foreach(LIB ${Qt5_PLATFORMINPUTCONTEXT_DLLS})
-            file(COPY ${LIB} DESTINATION "${DLL_DEST}plugins/platforminputcontexts/" FOLLOW_SYMLINK_CHAIN)
-        endforeach()
-        foreach(LIB ${Qt5_XCBGLINTEGRATION_DLLS})
-            file(COPY ${LIB} DESTINATION "${DLL_DEST}plugins/xcbglintegrations/" FOLLOW_SYMLINK_CHAIN)
-        endforeach()
-
-    endif()
+        windows_copy_files(${target_dir} ${Qt5_RESOURCES_DIR} ${DLL_DEST}
+            qtwebengine_resources.pak
+            qtwebengine_devtools_resources.pak
+            qtwebengine_resources_100p.pak
+            qtwebengine_resources_200p.pak
+            icudtl.dat
+        )
+    endif ()
+    windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
+    windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*)
+    windows_copy_files(yuzu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS}
+        qjpeg$<$<CONFIG:Debug>:d>.*
+        qgif$<$<CONFIG:Debug>:d>.*
+        )
     # Create an empty qt.conf file. Qt will detect that this file exists, and use the folder that its in as the root folder.
     # This way it'll look for plugins in the root/plugins/ folder
     add_custom_command(TARGET yuzu POST_BUILD

src/common/fs/file.h

@@ -117,7 +117,7 @@ template <typename Path>
 }
 #endif
 
-class IOFile final {
+class IOFile final : NonCopyable {
 public:
     IOFile();
 
@@ -142,10 +142,7 @@ public:
                     FileType type = FileType::BinaryFile,
                     FileShareFlag flag = FileShareFlag::ShareReadOnly);
 
-    ~IOFile();
-
-    IOFile(const IOFile&) = delete;
-    IOFile& operator=(const IOFile&) = delete;
+    virtual ~IOFile();
 
     IOFile(IOFile&& other) noexcept;
     IOFile& operator=(IOFile&& other) noexcept;
@@ -444,8 +441,8 @@ public:
 
 private:
     std::filesystem::path file_path;
-    FileAccessMode file_access_mode{};
-    FileType file_type{};
+    FileAccessMode file_access_mode;
+    FileType file_type;
 
     std::FILE* file = nullptr;
 };

src/core/arm/arm_interface.h

@@ -159,6 +159,8 @@ public:
      */
     virtual void SetTPIDR_EL0(u64 value) = 0;
 
+    virtual void ChangeProcessorID(std::size_t new_core_id) = 0;
+
     virtual void SaveContext(ThreadContext32& ctx) = 0;
     virtual void SaveContext(ThreadContext64& ctx) = 0;
     virtual void LoadContext(const ThreadContext32& ctx) = 0;

src/core/arm/dynarmic/arm_dynarmic_32.cpp

@@ -255,6 +255,10 @@ void ARM_Dynarmic_32::SetTPIDR_EL0(u64 value) {
     cp15->uprw = static_cast<u32>(value);
 }
 
+void ARM_Dynarmic_32::ChangeProcessorID(std::size_t new_core_id) {
+    jit->ChangeProcessorID(new_core_id);
+}
+
 void ARM_Dynarmic_32::SaveContext(ThreadContext32& ctx) {
     Dynarmic::A32::Context context;
     jit->SaveContext(context);

src/core/arm/dynarmic/arm_dynarmic_32.h

@@ -48,6 +48,7 @@ public:
     void SetTlsAddress(VAddr address) override;
     void SetTPIDR_EL0(u64 value) override;
     u64 GetTPIDR_EL0() const override;
+    void ChangeProcessorID(std::size_t new_core_id) override;
 
     bool IsInThumbMode() const {
         return (GetPSTATE() & 0x20) != 0;

src/core/arm/dynarmic/arm_dynarmic_64.cpp

@@ -296,6 +296,10 @@ void ARM_Dynarmic_64::SetTPIDR_EL0(u64 value) {
     cb->tpidr_el0 = value;
 }
 
+void ARM_Dynarmic_64::ChangeProcessorID(std::size_t new_core_id) {
+    jit->ChangeProcessorID(new_core_id);
+}
+
 void ARM_Dynarmic_64::SaveContext(ThreadContext64& ctx) {
     ctx.cpu_registers = jit->GetRegisters();
     ctx.sp = jit->GetSP();

src/core/arm/dynarmic/arm_dynarmic_64.h

@@ -45,6 +45,7 @@ public:
     void SetTlsAddress(VAddr address) override;
     void SetTPIDR_EL0(u64 value) override;
     u64 GetTPIDR_EL0() const override;
+    void ChangeProcessorID(std::size_t new_core_id) override;
 
     void SaveContext(ThreadContext32& ctx) override {}
     void SaveContext(ThreadContext64& ctx) override;

src/core/hle/kernel/k_client_port.h

@@ -22,7 +22,7 @@ class KClientPort final : public KSynchronizationObject {
 
 public:
     explicit KClientPort(KernelCore& kernel_);
-    ~KClientPort() override;
+    virtual ~KClientPort() override;
 
     void Initialize(KPort* parent_, s32 max_sessions_, std::string&& name_);
     void OnSessionFinalized();
@@ -49,8 +49,8 @@ public:
     bool IsServerClosed() const;
 
     // Overridden virtual functions.
-    void Destroy() override;
-    bool IsSignaled() const override;
+    virtual void Destroy() override;
+    virtual bool IsSignaled() const override;
 
     ResultCode CreateSession(KClientSession** out);
 

src/core/hle/kernel/k_client_session.h

@@ -34,7 +34,7 @@ class KClientSession final
 
 public:
     explicit KClientSession(KernelCore& kernel_);
-    ~KClientSession() override;
+    virtual ~KClientSession();
 
     void Initialize(KSession* parent_, std::string&& name_) {
         // Set member variables.
@@ -42,7 +42,7 @@ public:
         name = std::move(name_);
     }
 
-    void Destroy() override;
+    virtual void Destroy() override;
     static void PostDestroy([[maybe_unused]] uintptr_t arg) {}
 
     KSession* GetParent() const {

src/core/hle/kernel/k_event.h

@@ -20,21 +20,23 @@ class KEvent final : public KAutoObjectWithSlabHeapAndContainer<KEvent, KAutoObj
 
 public:
     explicit KEvent(KernelCore& kernel_);
-    ~KEvent() override;
+    virtual ~KEvent();
 
     void Initialize(std::string&& name);
 
-    void Finalize() override;
+    virtual void Finalize() override;
 
-    bool IsInitialized() const override {
+    virtual bool IsInitialized() const override {
         return initialized;
     }
 
-    uintptr_t GetPostDestroyArgument() const override {
+    virtual uintptr_t GetPostDestroyArgument() const override {
         return reinterpret_cast<uintptr_t>(owner);
     }
 
-    KProcess* GetOwner() const override {
+    static void PostDestroy(uintptr_t arg);
+
+    virtual KProcess* GetOwner() const override {
         return owner;
     }
 
@@ -46,8 +48,6 @@ public:
         return writable_event;
     }
 
-    static void PostDestroy(uintptr_t arg);
-
 private:
     KReadableEvent readable_event;
     KWritableEvent writable_event;

src/core/hle/kernel/k_port.h

@@ -22,7 +22,7 @@ class KPort final : public KAutoObjectWithSlabHeapAndContainer<KPort, KAutoObjec
 
 public:
     explicit KPort(KernelCore& kernel_);
-    ~KPort() override;
+    virtual ~KPort();
 
     static void PostDestroy([[maybe_unused]] uintptr_t arg) {}
 
@@ -59,6 +59,7 @@ private:
         ServerClosed = 3,
     };
 
+private:
     KServerPort server;
     KClientPort client;
     State state{State::Invalid};

src/core/hle/kernel/k_process.h

@@ -331,19 +331,19 @@ public:
 
     void LoadModule(CodeSet code_set, VAddr base_addr);
 
-    bool IsInitialized() const override {
+    virtual bool IsInitialized() const override {
         return is_initialized;
     }
 
     static void PostDestroy([[maybe_unused]] uintptr_t arg) {}
 
-    void Finalize() override;
+    virtual void Finalize();
 
-    u64 GetId() const override {
+    virtual u64 GetId() const override final {
         return GetProcessID();
     }
 
-    bool IsSignaled() const override;
+    virtual bool IsSignaled() const override;
 
     void PinCurrentThread();
     void UnpinCurrentThread();

src/core/hle/kernel/k_readable_event.h

@@ -31,8 +31,8 @@ public:
         return parent;
     }
 
-    bool IsSignaled() const override;
-    void Destroy() override;
+    virtual bool IsSignaled() const override;
+    virtual void Destroy() override;
 
     ResultCode Signal();
     ResultCode Clear();

src/core/hle/kernel/k_resource_limit.h

@@ -37,10 +37,10 @@ class KResourceLimit final
 
 public:
     explicit KResourceLimit(KernelCore& kernel_);
-    ~KResourceLimit() override;
+    virtual ~KResourceLimit();
 
     void Initialize(const Core::Timing::CoreTiming* core_timing_);
-    void Finalize() override;
+    virtual void Finalize() override;
 
     s64 GetLimitValue(LimitableResource which) const;
     s64 GetCurrentValue(LimitableResource which) const;

src/core/hle/kernel/k_server_port.h

@@ -25,9 +25,12 @@ class SessionRequestHandler;
 class KServerPort final : public KSynchronizationObject {
     KERNEL_AUTOOBJECT_TRAITS(KServerPort, KSynchronizationObject);
 
+private:
+    using SessionList = boost::intrusive::list<KServerSession>;
+
 public:
     explicit KServerPort(KernelCore& kernel_);
-    ~KServerPort() override;
+    virtual ~KServerPort() override;
 
     void Initialize(KPort* parent_, std::string&& name_);
 
@@ -60,14 +63,13 @@ public:
     bool IsLight() const;
 
     // Overridden virtual functions.
-    void Destroy() override;
-    bool IsSignaled() const override;
+    virtual void Destroy() override;
+    virtual bool IsSignaled() const override;
 
 private:
-    using SessionList = boost::intrusive::list<KServerSession>;
-
     void CleanupSessions();
 
+private:
     SessionList session_list;
     SessionRequestHandlerPtr session_handler;
     KPort* parent{};

src/core/hle/kernel/k_server_session.h

@@ -42,9 +42,9 @@ class KServerSession final : public KSynchronizationObject,
 
 public:
     explicit KServerSession(KernelCore& kernel_);
-    ~KServerSession() override;
+    virtual ~KServerSession() override;
 
-    void Destroy() override;
+    virtual void Destroy() override;
 
     void Initialize(KSession* parent_, std::string&& name_);
 
@@ -56,7 +56,7 @@ public:
         return parent;
     }
 
-    bool IsSignaled() const override;
+    virtual bool IsSignaled() const override;
 
     void OnClientClosed();
 

src/core/hle/kernel/k_session.h

@@ -18,17 +18,17 @@ class KSession final : public KAutoObjectWithSlabHeapAndContainer<KSession, KAut
 
 public:
     explicit KSession(KernelCore& kernel_);
-    ~KSession() override;
+    virtual ~KSession() override;
 
     void Initialize(KClientPort* port_, const std::string& name_);
 
-    void Finalize() override;
+    virtual void Finalize() override;
 
-    bool IsInitialized() const override {
+    virtual bool IsInitialized() const override {
         return initialized;
     }
 
-    uintptr_t GetPostDestroyArgument() const override {
+    virtual uintptr_t GetPostDestroyArgument() const override {
         return reinterpret_cast<uintptr_t>(process);
     }
 
@@ -78,6 +78,7 @@ private:
         ServerClosed = 3,
     };
 
+private:
     void SetState(State state) {
         atomic_state = static_cast<u8>(state);
     }
@@ -86,6 +87,7 @@ private:
         return static_cast<State>(atomic_state.load(std::memory_order_relaxed));
     }
 
+private:
     KServerSession server;
     KClientSession client;
     std::atomic<std::underlying_type_t<State>> atomic_state{

src/core/hle/kernel/k_shared_memory.h

@@ -68,9 +68,9 @@ public:
         return device_memory->GetPointer(physical_address + offset);
     }
 
-    void Finalize() override;
+    virtual void Finalize() override;
 
-    bool IsInitialized() const override {
+    virtual bool IsInitialized() const override {
         return is_initialized;
     }
     static void PostDestroy([[maybe_unused]] uintptr_t arg) {}

src/core/hle/kernel/k_synchronization_object.h

@@ -29,7 +29,7 @@ public:
                                          KSynchronizationObject** objects, const s32 num_objects,
                                          s64 timeout);
 
-    void Finalize() override;
+    virtual void Finalize() override;
 
     [[nodiscard]] virtual bool IsSignaled() const = 0;
 
@@ -37,7 +37,7 @@ public:
 
 protected:
     explicit KSynchronizationObject(KernelCore& kernel);
-    ~KSynchronizationObject() override;
+    virtual ~KSynchronizationObject();
 
     virtual void OnFinalizeSynchronizationObject() {}
 

src/core/hle/kernel/k_thread.h

@@ -358,21 +358,21 @@ public:
         return termination_requested || GetRawState() == ThreadState::Terminated;
     }
 
-    [[nodiscard]] u64 GetId() const override {
+    [[nodiscard]] virtual u64 GetId() const override final {
         return this->GetThreadID();
     }
 
-    [[nodiscard]] bool IsInitialized() const override {
+    [[nodiscard]] virtual bool IsInitialized() const override {
         return initialized;
     }
 
-    [[nodiscard]] uintptr_t GetPostDestroyArgument() const override {
+    [[nodiscard]] virtual uintptr_t GetPostDestroyArgument() const override {
         return reinterpret_cast<uintptr_t>(parent) | (resource_limit_release_hint ? 1 : 0);
     }
 
-    void Finalize() override;
+    virtual void Finalize() override;
 
-    [[nodiscard]] bool IsSignaled() const override;
+    [[nodiscard]] virtual bool IsSignaled() const override;
 
     static void PostDestroy(uintptr_t arg);
 

src/core/hle/kernel/k_transfer_memory.h

@@ -27,23 +27,23 @@ class KTransferMemory final
 
 public:
     explicit KTransferMemory(KernelCore& kernel_);
-    ~KTransferMemory() override;
+    virtual ~KTransferMemory() override;
 
     ResultCode Initialize(VAddr address_, std::size_t size_, Svc::MemoryPermission owner_perm_);
 
-    void Finalize() override;
+    virtual void Finalize() override;
 
-    bool IsInitialized() const override {
+    virtual bool IsInitialized() const override {
         return is_initialized;
     }
 
-    uintptr_t GetPostDestroyArgument() const override {
+    virtual uintptr_t GetPostDestroyArgument() const override {
         return reinterpret_cast<uintptr_t>(owner);
     }
 
     static void PostDestroy(uintptr_t arg);
 
-    KProcess* GetOwner() const override {
+    KProcess* GetOwner() const {
         return owner;
     }
 

src/core/hle/kernel/k_writable_event.h

@@ -21,7 +21,7 @@ public:
     explicit KWritableEvent(KernelCore& kernel_);
     ~KWritableEvent() override;
 
-    void Destroy() override;
+    virtual void Destroy() override;
 
     static void PostDestroy([[maybe_unused]] uintptr_t arg) {}
 

src/core/hle/service/ldn/ldn.cpp

@@ -215,10 +215,151 @@ public:
     }
 };
 
+class INetworkService final : public ServiceFramework<INetworkService> {
+public:
+    explicit INetworkService(Core::System& system_) : ServiceFramework{system_, "INetworkService"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "Initialize"},
+            {256, nullptr, "AttachNetworkInterfaceStateChangeEvent"},
+            {264, nullptr, "GetNetworkInterfaceLastError"},
+            {272, nullptr, "GetRole"},
+            {280, nullptr, "GetAdvertiseData"},
+            {288, nullptr, "GetGroupInfo"},
+            {296, nullptr, "GetGroupInfo2"},
+            {304, nullptr, "GetGroupOwner"},
+            {312, nullptr, "GetIpConfig"},
+            {320, nullptr, "GetLinkLevel"},
+            {512, nullptr, "Scan"},
+            {768, nullptr, "CreateGroup"},
+            {776, nullptr, "DestroyGroup"},
+            {784, nullptr, "SetAdvertiseData"},
+            {1536, nullptr, "SendToOtherGroup"},
+            {1544, nullptr, "RecvFromOtherGroup"},
+            {1552, nullptr, "AddAcceptableGroupId"},
+            {1560, nullptr, "ClearAcceptableGroupId"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+};
+
+class INetworkServiceMonitor final : public ServiceFramework<INetworkServiceMonitor> {
+public:
+    explicit INetworkServiceMonitor(Core::System& system_)
+        : ServiceFramework{system_, "INetworkServiceMonitor"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &INetworkServiceMonitor::Initialize, "Initialize"},
+            {256, nullptr, "AttachNetworkInterfaceStateChangeEvent"},
+            {264, nullptr, "GetNetworkInterfaceLastError"},
+            {272, nullptr, "GetRole"},
+            {280, nullptr, "GetAdvertiseData"},
+            {281, nullptr, "GetAdvertiseData2"},
+            {288, nullptr, "GetGroupInfo"},
+            {296, nullptr, "GetGroupInfo2"},
+            {304, nullptr, "GetGroupOwner"},
+            {312, nullptr, "GetIpConfig"},
+            {320, nullptr, "GetLinkLevel"},
+            {328, nullptr, "AttachJoinEvent"},
+            {336, nullptr, "GetMembers"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+
+    void Initialize(Kernel::HLERequestContext& ctx) {
+        LOG_WARNING(Service_LDN, "(STUBBED) called");
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ERROR_DISABLED);
+    }
+};
+
+class LP2PAPP final : public ServiceFramework<LP2PAPP> {
+public:
+    explicit LP2PAPP(Core::System& system_) : ServiceFramework{system_, "lp2p:app"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &LP2PAPP::CreateMonitorService, "CreateNetworkService"},
+            {8, &LP2PAPP::CreateMonitorService, "CreateNetworkServiceMonitor"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+
+    void CreateNetworkervice(Kernel::HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const u64 reserved_input = rp.Pop<u64>();
+        const u32 input = rp.Pop<u32>();
+
+        LOG_WARNING(Service_LDN, "(STUBBED) called reserved_input={} input={}", reserved_input,
+                    input);
+
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(RESULT_SUCCESS);
+        rb.PushIpcInterface<INetworkService>(system);
+    }
+
+    void CreateMonitorService(Kernel::HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const u64 reserved_input = rp.Pop<u64>();
+
+        LOG_WARNING(Service_LDN, "(STUBBED) called reserved_input={}", reserved_input);
+
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(RESULT_SUCCESS);
+        rb.PushIpcInterface<INetworkServiceMonitor>(system);
+    }
+};
+
+class LP2PSYS final : public ServiceFramework<LP2PSYS> {
+public:
+    explicit LP2PSYS(Core::System& system_) : ServiceFramework{system_, "lp2p:sys"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &LP2PSYS::CreateMonitorService, "CreateNetworkService"},
+            {8, &LP2PSYS::CreateMonitorService, "CreateNetworkServiceMonitor"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+
+    void CreateNetworkervice(Kernel::HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const u64 reserved_input = rp.Pop<u64>();
+        const u32 input = rp.Pop<u32>();
+
+        LOG_WARNING(Service_LDN, "(STUBBED) called reserved_input={} input={}", reserved_input,
+                    input);
+
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(RESULT_SUCCESS);
+        rb.PushIpcInterface<INetworkService>(system);
+    }
+
+    void CreateMonitorService(Kernel::HLERequestContext& ctx) {
+        IPC::RequestParser rp{ctx};
+        const u64 reserved_input = rp.Pop<u64>();
+
+        LOG_WARNING(Service_LDN, "(STUBBED) called reserved_input={}", reserved_input);
+
+        IPC::ResponseBuilder rb{ctx, 2, 0, 1};
+        rb.Push(RESULT_SUCCESS);
+        rb.PushIpcInterface<INetworkServiceMonitor>(system);
+    }
+};
+
 void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) {
     std::make_shared<LDNM>(system)->InstallAsService(sm);
     std::make_shared<LDNS>(system)->InstallAsService(sm);
     std::make_shared<LDNU>(system)->InstallAsService(sm);
+    std::make_shared<LP2PAPP>(system)->InstallAsService(sm);
+    std::make_shared<LP2PSYS>(system)->InstallAsService(sm);
 }
 
 } // namespace Service::LDN

src/video_core/rasterizer_accelerated.cpp

@@ -18,10 +18,10 @@ RasterizerAccelerated::~RasterizerAccelerated() = default;
 void RasterizerAccelerated::UpdatePagesCachedCount(VAddr addr, u64 size, int delta) {
     const auto page_end = Common::DivCeil(addr + size, Core::Memory::PAGE_SIZE);
     for (auto page = addr >> Core::Memory::PAGE_BITS; page != page_end; ++page) {
-        auto& count = cached_pages.at(page >> 2).Count(page);
+        auto& count = cached_pages.at(page >> 3).Count(page);
 
         if (delta > 0) {
-            ASSERT_MSG(count < UINT16_MAX, "Count may overflow!");
+            ASSERT_MSG(count < UINT8_MAX, "Count may overflow!");
         } else if (delta < 0) {
             ASSERT_MSG(count > 0, "Count may underflow!");
         } else {
@@ -29,7 +29,7 @@ void RasterizerAccelerated::UpdatePagesCachedCount(VAddr addr, u64 size, int del
         }
 
         // Adds or subtracts 1, as count is a unsigned 8-bit value
-        count += static_cast<u16>(delta);
+        count += static_cast<u8>(delta);
 
         // Assume delta is either -1 or 1
         if (count == 0) {

src/video_core/rasterizer_accelerated.h

@@ -29,20 +29,20 @@ private:
     public:
         CacheEntry() = default;
 
-        std::atomic_uint16_t& Count(std::size_t page) {
-            return values[page & 3];
+        std::atomic_uint8_t& Count(std::size_t page) {
+            return values[page & 7];
         }
 
-        const std::atomic_uint16_t& Count(std::size_t page) const {
-            return values[page & 3];
+        const std::atomic_uint8_t& Count(std::size_t page) const {
+            return values[page & 7];
         }
 
     private:
-        std::array<std::atomic_uint16_t, 4> values{};
+        std::array<std::atomic_uint8_t, 8> values{};
     };
     static_assert(sizeof(CacheEntry) == 8, "CacheEntry should be 8 bytes!");
 
-    std::array<CacheEntry, 0x1000000> cached_pages;
+    std::array<CacheEntry, 0x800000> cached_pages;
     Core::Memory::Memory& cpu_memory;
 };
 

src/yuzu/CMakeLists.txt

@@ -4,12 +4,6 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
 
-# Set the RPATH for Qt Libraries
-# This must be done before the `yuzu` target is created
-if (YUZU_USE_BUNDLED_QT AND (${CMAKE_SYSTEM_NAME} STREQUAL "Linux"))
-    set(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/bin/lib/")
-endif()
-
 add_executable(yuzu
     Info.plist
     about_dialog.cpp
@@ -284,14 +278,11 @@ if(UNIX AND NOT APPLE)
     install(TARGETS yuzu RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
 endif()
 
-if (YUZU_USE_BUNDLED_QT)
-    include(CopyYuzuQt5Deps)
-    copy_yuzu_Qt5_deps(yuzu)
-endif()
-
 if (MSVC)
+    include(CopyYuzuQt5Deps)
     include(CopyYuzuSDLDeps)
     include(CopyYuzuFFmpegDeps)
+    copy_yuzu_Qt5_deps(yuzu)
     copy_yuzu_SDL_deps(yuzu)
     copy_yuzu_FFmpeg_deps(yuzu)
 endif()

src/yuzu/configuration/configure_dialog.cpp

@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <QAbstractButton>
-#include <QDialogButtonBox>
 #include <QHash>
 #include <QListWidgetItem>
-#include <QPushButton>
 #include <QSignalBlocker>
 #include "common/settings.h"
 #include "core/core.h"
@@ -34,12 +31,6 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry,
     connect(ui->selectorList, &QListWidget::itemSelectionChanged, this,
             &ConfigureDialog::UpdateVisibleTabs);
 
-    if (Core::System::GetInstance().IsPoweredOn()) {
-        QPushButton* apply_button = ui->buttonBox->addButton(QDialogButtonBox::Apply);
-        connect(apply_button, &QAbstractButton::clicked, this,
-                &ConfigureDialog::HandleApplyButtonClicked);
-    }
-
     adjustSize();
     ui->selectorList->setCurrentRow(0);
 }
@@ -89,11 +80,6 @@ void ConfigureDialog::RetranslateUI() {
     ui->tabWidget->setCurrentIndex(old_index);
 }
 
-void ConfigureDialog::HandleApplyButtonClicked() {
-    UISettings::values.configuration_applied = true;
-    ApplyConfiguration();
-}
-
 Q_DECLARE_METATYPE(QList<QWidget*>);
 
 void ConfigureDialog::PopulateSelectionList() {

src/yuzu/configuration/configure_dialog.h

@@ -35,9 +35,8 @@ signals:
 
 private:
     void changeEvent(QEvent* event) override;
-    void RetranslateUI();
 
-    void HandleApplyButtonClicked();
+    void RetranslateUI();
 
     void SetConfiguration();
     void UpdateVisibleTabs();

src/yuzu/configuration/configure_per_game.cpp

@@ -6,12 +6,9 @@
 #include <memory>
 #include <utility>
 
-#include <QAbstractButton>
 #include <QCheckBox>
-#include <QDialogButtonBox>
 #include <QHeaderView>
 #include <QMenu>
-#include <QPushButton>
 #include <QStandardItemModel>
 #include <QString>
 #include <QTimer>
@@ -45,12 +42,6 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id)
     scene = new QGraphicsScene;
     ui->icon_view->setScene(scene);
 
-    if (Core::System::GetInstance().IsPoweredOn()) {
-        QPushButton* apply_button = ui->buttonBox->addButton(QDialogButtonBox::Apply);
-        connect(apply_button, &QAbstractButton::clicked, this,
-                &ConfigurePerGame::HandleApplyButtonClicked);
-    }
-
     LoadConfiguration();
 }
 
@@ -83,11 +74,6 @@ void ConfigurePerGame::RetranslateUI() {
     ui->retranslateUi(this);
 }
 
-void ConfigurePerGame::HandleApplyButtonClicked() {
-    UISettings::values.configuration_applied = true;
-    ApplyConfiguration();
-}
-
 void ConfigurePerGame::LoadFromFile(FileSys::VirtualFile file) {
     this->file = std::move(file);
     LoadConfiguration();

src/yuzu/configuration/configure_per_game.h

@@ -39,8 +39,6 @@ private:
     void changeEvent(QEvent* event) override;
     void RetranslateUI();
 
-    void HandleApplyButtonClicked();
-
     void LoadConfiguration();
 
     std::unique_ptr<Ui::ConfigurePerGame> ui;

src/yuzu/main.cpp

@@ -2587,12 +2587,12 @@ void GMainWindow::OnConfigure() {
             &GMainWindow::OnLanguageChanged);
 
     const auto result = configure_dialog.exec();
-    if (result != QDialog::Accepted && !UISettings::values.configuration_applied) {
+    if (result != QDialog::Accepted) {
         return;
-    } else if (result == QDialog::Accepted) {
-        configure_dialog.ApplyConfiguration();
-        controller_dialog->refreshConfiguration();
     }
+
+    configure_dialog.ApplyConfiguration();
+    controller_dialog->refreshConfiguration();
     InitializeHotkeys();
     if (UISettings::values.theme != old_theme) {
         UpdateUITheme();
@@ -2607,8 +2607,6 @@ void GMainWindow::OnConfigure() {
         game_list->PopulateAsync(UISettings::values.game_dirs);
     }
 
-    UISettings::values.configuration_applied = false;
-
     config->Save();
 
     if ((UISettings::values.hide_mouse || Settings::values.mouse_panning) && emulation_running) {
@@ -2638,27 +2636,23 @@ void GMainWindow::OpenPerGameConfiguration(u64 title_id, const std::string& file
     ConfigurePerGame dialog(this, title_id);
     dialog.LoadFromFile(v_file);
     const auto result = dialog.exec();
-
-    if (result != QDialog::Accepted && !UISettings::values.configuration_applied) {
-        Settings::RestoreGlobalState(system.IsPoweredOn());
-        return;
-    } else if (result == QDialog::Accepted) {
+    if (result == QDialog::Accepted) {
         dialog.ApplyConfiguration();
-    }
 
-    const auto reload = UISettings::values.is_game_list_reload_pending.exchange(false);
-    if (reload) {
-        game_list->PopulateAsync(UISettings::values.game_dirs);
-    }
+        const auto reload = UISettings::values.is_game_list_reload_pending.exchange(false);
+        if (reload) {
+            game_list->PopulateAsync(UISettings::values.game_dirs);
+        }
 
-    // Do not cause the global config to write local settings into the config file
-    const bool is_powered_on = system.IsPoweredOn();
-    Settings::RestoreGlobalState(is_powered_on);
+        // Do not cause the global config to write local settings into the config file
+        const bool is_powered_on = system.IsPoweredOn();
+        Settings::RestoreGlobalState(is_powered_on);
 
-    UISettings::values.configuration_applied = false;
-
-    if (!is_powered_on) {
-        config->Save();
+        if (!is_powered_on) {
+            config->Save();
+        }
+    } else {
+        Settings::RestoreGlobalState(system.IsPoweredOn());
     }
 }
 

src/yuzu/uisettings.h

@@ -95,8 +95,6 @@ struct Values {
     uint8_t row_2_text_id;
     std::atomic_bool is_game_list_reload_pending{false};
     bool cache_game_list;
-
-    bool configuration_applied;
 };
 
 extern Values values;