From d3f11c4dd7928014e0e960e0c1a628c0fcde2add Mon Sep 17 00:00:00 2001 From: chaoticgd <43898262+chaoticgd@users.noreply.github.com> Date: Sat, 13 Dec 2025 15:00:42 +0000 Subject: [PATCH] Patch: Remove type aliases that obfuscate ownership --- pcsx2/ImGui/FullscreenUI.cpp | 8 ++--- pcsx2/Patch.cpp | 60 +++++++++++++++++------------------- pcsx2/Patch.h | 4 +-- 3 files changed, 33 insertions(+), 39 deletions(-) diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index 55e8333ebd..d35d895159 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -630,9 +630,9 @@ namespace FullscreenUI static std::unique_ptr s_game_settings_entry; static std::vector> s_game_list_directories_cache; static std::vector s_graphics_adapter_list_cache; - static Patch::PatchInfoList s_game_patch_list; + static std::vector s_game_patch_list; static std::vector s_enabled_game_patch_cache; - static Patch::PatchInfoList s_game_cheats_list; + static std::vector s_game_cheats_list; static std::vector s_enabled_game_cheat_cache; static u32 s_game_cheat_unlabelled_count = 0; static std::vector s_hotkey_list_cache; @@ -3581,7 +3581,7 @@ void FullscreenUI::PopulateGameListDirectoryCache(SettingsInterface* si) void FullscreenUI::PopulatePatchesAndCheatsList(const std::string_view serial, u32 crc) { - constexpr auto sort_patches = [](Patch::PatchInfoList& list) { + constexpr auto sort_patches = [](std::vector& list) { std::sort(list.begin(), list.end(), [](const Patch::PatchInfo& lhs, const Patch::PatchInfo& rhs) { return lhs.name < rhs.name; }); }; @@ -6631,7 +6631,7 @@ void FullscreenUI::DrawPatchesOrCheatsSettingsPage(bool cheats) { SettingsInterface* bsi = GetEditingSettingsInterface(); - const Patch::PatchInfoList& patch_list = cheats ? s_game_cheats_list : s_game_patch_list; + const std::vector& patch_list = cheats ? s_game_cheats_list : s_game_patch_list; std::vector& enable_list = cheats ? s_enabled_game_cheat_cache : s_enabled_game_patch_cache; const char* section = cheats ? Patch::CHEATS_CONFIG_SECTION : Patch::PATCHES_CONFIG_SECTION; const bool master_enable = cheats ? GetEffectiveBoolSetting(bsi, "EmuCore", "EnableCheats", false) : true; diff --git a/pcsx2/Patch.cpp b/pcsx2/Patch.cpp index 4c0a847622..fb58d099f8 100644 --- a/pcsx2/Patch.cpp +++ b/pcsx2/Patch.cpp @@ -125,10 +125,6 @@ namespace Patch void (*func)(PatchGroup* group, const std::string_view cmd, const std::string_view param); }; - using PatchList = std::vector; - using ActivePatchList = std::vector; - using EnablePatchList = std::vector; - namespace PatchFunc { static void patch(PatchGroup* group, const std::string_view cmd, const std::string_view param); @@ -141,23 +137,23 @@ namespace Patch static int PatchTableExecute(PatchGroup* group, const std::string_view lhs, const std::string_view rhs, const std::span& Table); static void LoadPatchLine(PatchGroup* group, const std::string_view line); - static u32 LoadPatchesFromString(PatchList* patch_list, const std::string& patch_file); + static u32 LoadPatchesFromString(std::vector* patch_list, const std::string& patch_file); static bool OpenPatchesZip(); static std::string GetPnachTemplate( const std::string_view serial, u32 crc, bool include_serial, bool add_wildcard, bool all_crcs); static std::vector FindPatchFilesOnDisk( const std::string_view serial, u32 crc, bool cheats, bool all_crcs); - static bool ContainsPatchName(const PatchInfoList& patches, const std::string_view patchName); - static bool ContainsPatchName(const PatchList& patches, const std::string_view patchName); + static bool ContainsPatchName(const std::vector& patches, const std::string_view patchName); + static bool ContainsPatchName(const std::vector& patches, const std::string_view patchName); template static void EnumeratePnachFiles(const std::string_view serial, u32 crc, bool cheats, bool for_ui, const F& f); static bool PatchStringHasUnlabelledPatch(const std::string& pnach_data); - static void ExtractPatchInfo(PatchInfoList* dst, const std::string& pnach_data, u32* num_unlabelled_patches); + static void ExtractPatchInfo(std::vector* dst, const std::string& pnach_data, u32* num_unlabelled_patches); static void ReloadEnabledLists(); - static u32 EnablePatches(const PatchList& patches, const EnablePatchList& enable_list, const EnablePatchList& enable_immediately_list); + static u32 EnablePatches(const std::vector& patches, const std::vector& enable_list, const std::vector& enable_immediately_list); static void ApplyPatch(const PatchCommand* p); static void ApplyDynaPatch(const DynamicPatch& patch, u32 address); @@ -175,21 +171,21 @@ namespace Patch const char* PATCH_DISABLE_CONFIG_KEY = "Disable"; static zip_t* s_patches_zip; - static PatchList s_gamedb_patches; - static PatchList s_game_patches; - static PatchList s_cheat_patches; + static std::vector s_gamedb_patches; + static std::vector s_game_patches; + static std::vector s_cheat_patches; static u32 s_gamedb_counts = 0; static u32 s_patches_counts = 0; static u32 s_cheats_counts = 0; - static ActivePatchList s_active_patches; + static std::vector s_active_patches; static std::vector s_active_gamedb_dynamic_patches; static std::vector s_active_pnach_dynamic_patches; - static EnablePatchList s_enabled_cheats; - static EnablePatchList s_enabled_patches; - static EnablePatchList s_just_enabled_cheats; - static EnablePatchList s_just_enabled_patches; + static std::vector s_enabled_cheats; + static std::vector s_enabled_patches; + static std::vector s_just_enabled_cheats; + static std::vector s_just_enabled_patches; static u32 s_patches_crc; static std::optional s_override_aspect_ratio; static std::optional s_override_interlace_mode; @@ -218,7 +214,7 @@ void Patch::TrimPatchLine(std::string& buffer) buffer.erase(pos); } -bool Patch::ContainsPatchName(const PatchList& patch_list, const std::string_view patch_name) +bool Patch::ContainsPatchName(const std::vector& patch_list, const std::string_view patch_name) { return std::find_if(patch_list.begin(), patch_list.end(), [&patch_name](const PatchGroup& patch) { return patch.name == patch_name; @@ -253,7 +249,7 @@ void Patch::LoadPatchLine(PatchGroup* group, const std::string_view line) PatchTableExecute(group, key, value, s_patch_commands); } -u32 Patch::LoadPatchesFromString(PatchList* patch_list, const std::string& patch_file) +u32 Patch::LoadPatchesFromString(std::vector* patch_list, const std::string& patch_file) { const size_t before = patch_list->size(); @@ -264,7 +260,7 @@ u32 Patch::LoadPatchesFromString(PatchList* patch_list, const std::string& patch // Ungrouped/legacy patches should merge with other ungrouped patches. if (current_patch_group.name.empty()) { - const PatchList::iterator ungrouped_patch = std::find_if(patch_list->begin(), patch_list->end(), + const std::vector::iterator ungrouped_patch = std::find_if(patch_list->begin(), patch_list->end(), [](const PatchGroup& pg) { return pg.name.empty(); }); if (ungrouped_patch != patch_list->end()) { @@ -407,7 +403,7 @@ std::vector Patch::FindPatchFilesOnDisk(const std::string_view seri return ret; } -bool Patch::ContainsPatchName(const PatchInfoList& patches, const std::string_view patchName) +bool Patch::ContainsPatchName(const std::vector& patches, const std::string_view patchName) { return std::find_if(patches.begin(), patches.end(), [&patchName](const PatchInfo& patch) { return patch.name == patchName; @@ -491,7 +487,7 @@ bool Patch::PatchStringHasUnlabelledPatch(const std::string& pnach_data) return false; } -void Patch::ExtractPatchInfo(PatchInfoList* dst, const std::string& pnach_data, u32* num_unlabelled_patches) +void Patch::ExtractPatchInfo(std::vector* dst, const std::string& pnach_data, u32* num_unlabelled_patches) { std::istringstream ss(pnach_data); std::string line; @@ -570,9 +566,9 @@ std::string_view Patch::PatchInfo::GetNameParentPart() const return ret; } -Patch::PatchInfoList Patch::GetPatchInfo(const std::string_view serial, u32 crc, bool cheats, bool showAllCRCS, u32* num_unlabelled_patches) +std::vector Patch::GetPatchInfo(const std::string_view serial, u32 crc, bool cheats, bool showAllCRCS, u32* num_unlabelled_patches) { - PatchInfoList ret; + std::vector ret; if (num_unlabelled_patches) *num_unlabelled_patches = 0; @@ -592,14 +588,14 @@ std::string Patch::GetPnachFilename(const std::string_view serial, u32 crc, bool void Patch::ReloadEnabledLists() { - const EnablePatchList prev_enabled_cheats = std::move(s_enabled_cheats); + const std::vector prev_enabled_cheats = std::move(s_enabled_cheats); if (EmuConfig.EnableCheats && !Achievements::IsHardcoreModeActive()) s_enabled_cheats = Host::GetStringListSetting(CHEATS_CONFIG_SECTION, PATCH_ENABLE_CONFIG_KEY); else s_enabled_cheats = {}; - const EnablePatchList prev_enabled_patches = std::exchange(s_enabled_patches, Host::GetStringListSetting(PATCHES_CONFIG_SECTION, PATCH_ENABLE_CONFIG_KEY)); - const EnablePatchList disabled_patches = Host::GetStringListSetting(PATCHES_CONFIG_SECTION, PATCH_DISABLE_CONFIG_KEY); + const std::vector prev_enabled_patches = std::exchange(s_enabled_patches, Host::GetStringListSetting(PATCHES_CONFIG_SECTION, PATCH_ENABLE_CONFIG_KEY)); + const std::vector disabled_patches = Host::GetStringListSetting(PATCHES_CONFIG_SECTION, PATCH_DISABLE_CONFIG_KEY); // Name based matching for widescreen/NI settings. if (EmuConfig.EnableWideScreenPatches) @@ -649,9 +645,9 @@ void Patch::ReloadEnabledLists() } } -u32 Patch::EnablePatches(const PatchList& patches, const EnablePatchList& enable_list, const EnablePatchList& enable_immediately_list) +u32 Patch::EnablePatches(const std::vector& patches, const std::vector& enable_list, const std::vector& enable_immediately_list) { - ActivePatchList patches_to_apply_immediately; + std::vector patches_to_apply_immediately; u32 count = 0; for (const PatchGroup& p : patches) @@ -762,19 +758,19 @@ void Patch::UpdateActivePatches(bool reload_enabled_list, bool verbose, bool ver u32 gp_count = 0; if (EmuConfig.EnablePatches) { - gp_count = EnablePatches(s_gamedb_patches, EnablePatchList(), EnablePatchList()); + gp_count = EnablePatches(s_gamedb_patches, std::vector(), std::vector()); s_gamedb_counts = gp_count; if (gp_count > 0) message.append(TRANSLATE_PLURAL_STR("Patch", "%n GameDB patches are active.", "OSD Message", gp_count)); } - const u32 p_count = EnablePatches(s_game_patches, s_enabled_patches, apply_new_patches ? s_just_enabled_patches : EnablePatchList()); + const u32 p_count = EnablePatches(s_game_patches, s_enabled_patches, apply_new_patches ? s_just_enabled_patches : std::vector()); s_patches_counts = p_count; if (p_count > 0) message.append_format("{}{}", message.empty() ? "" : "\n", TRANSLATE_PLURAL_STR("Patch", "%n game patches are active.", "OSD Message", p_count)); - const u32 c_count = EmuConfig.EnableCheats ? EnablePatches(s_cheat_patches, s_enabled_cheats, apply_new_patches ? s_just_enabled_cheats : EnablePatchList()) : 0; + const u32 c_count = EmuConfig.EnableCheats ? EnablePatches(s_cheat_patches, s_enabled_cheats, apply_new_patches ? s_just_enabled_cheats : std::vector()) : 0; s_cheats_counts = c_count; if (c_count > 0) message.append_format("{}{}", message.empty() ? "" : "\n", diff --git a/pcsx2/Patch.h b/pcsx2/Patch.h index 5ff2c0e2c0..f44486e6f6 100644 --- a/pcsx2/Patch.h +++ b/pcsx2/Patch.h @@ -59,8 +59,6 @@ namespace Patch std::string_view GetNameParentPart() const; }; - using PatchInfoList = std::vector; - struct DynamicPatchEntry { u32 offset; @@ -79,7 +77,7 @@ namespace Patch extern const char* PATCH_ENABLE_CONFIG_KEY; extern const char* PATCH_DISABLE_CONFIG_KEY; - extern PatchInfoList GetPatchInfo(const std::string_view serial, u32 crc, bool cheats, bool showAllCRCS, u32* num_unlabelled_patches); + extern std::vector GetPatchInfo(const std::string_view serial, u32 crc, bool cheats, bool showAllCRCS, u32* num_unlabelled_patches); /// Returns the path to a new cheat/patch pnach for the specified serial and CRC. extern std::string GetPnachFilename(const std::string_view serial, u32 crc, bool cheats);