ChdFileReader: Migrate libchdr patch into PCSX2

Added function didn't need to be in libchdr

.github/workflows/cron_update_controller_db.yml

@@ -22,7 +22,7 @@ jobs:
         uses: peter-evans/create-pull-request@v7
         with:
           title: "PAD: Update to latest controller database"
-          commit-message: "PAD: Update to latest controller database."
+          commit-message: "[ci skip] PAD: Update to latest controller database."
           committer: "PCSX2 Bot <PCSX2Bot@users.noreply.github.com>"
           author: "PCSX2 Bot <PCSX2Bot@users.noreply.github.com>"
           body: "Weekly automatic update of SDL Controller DB."

3rdparty/libchdr/include/libchdr/chd.h

@@ -407,7 +407,6 @@ CHD_EXPORT const chd_header *chd_get_header(chd_file *chd);
 CHD_EXPORT chd_error chd_read_header_core_file(core_file *file, chd_header *header);
 CHD_EXPORT chd_error chd_read_header_file(FILE *file, chd_header *header);
 CHD_EXPORT chd_error chd_read_header(const char *filename, chd_header *header);
-CHD_EXPORT bool chd_is_matching_parent(const chd_header* header, const chd_header* parent_header);
 
 
 

3rdparty/libchdr/src/libchdr_chd.c

@@ -2281,27 +2281,6 @@ CHD_EXPORT chd_error chd_read_header(const char *filename, chd_header *header)
 	return err;
 }
 
-CHD_EXPORT bool chd_is_matching_parent(const chd_header* header, const chd_header* parent_header)
-{
-  /* check MD5 if it isn't empty */
-  if (memcmp(nullmd5, header->parentmd5, sizeof(header->parentmd5)) != 0 &&
-      memcmp(nullmd5, parent_header->md5, sizeof(parent_header->md5)) != 0 &&
-      memcmp(parent_header->md5, header->parentmd5, sizeof(header->parentmd5)) != 0)
-	{
-		return false;
-	}
-
-  /* check SHA1 if it isn't empty */
-  if (memcmp(nullsha1, header->parentsha1, sizeof(header->parentsha1)) != 0 &&
-      memcmp(nullsha1, parent_header->sha1, sizeof(parent_header->sha1)) != 0 &&
-      memcmp(parent_header->sha1, header->parentsha1, sizeof(header->parentsha1)) != 0)
-	{
-		return false;
-	}
-
-	return true;
-}
-
 /***************************************************************************
     CORE DATA READ/WRITE
 ***************************************************************************/

pcsx2-qt/Settings/GraphicsSettingsWidget.cpp

@@ -88,8 +88,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.interlacing, "EmuCore/GS", "deinterlace_mode", DEFAULT_INTERLACE_MODE);
 	SettingWidgetBinder::BindWidgetToIntSetting(
 		sif, m_ui.bilinearFiltering, "EmuCore/GS", "linear_present_mode", static_cast<int>(GSPostBilinearMode::BilinearSmooth));
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.widescreenPatches, "EmuCore", "EnableWideScreenPatches", false);
-	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.noInterlacingPatches, "EmuCore", "EnableNoInterlacingPatches", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.integerScaling, "EmuCore/GS", "IntegerScaling", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.PCRTCOffsets, "EmuCore/GS", "pcrtc_offsets", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.PCRTCOverscan, "EmuCore/GS", "pcrtc_overscan", false);
@@ -321,24 +319,22 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
 	}
 #endif
 
-	// Get rid of widescreen/no-interlace checkboxes from per-game settings, unless the user previously had them set.
-	if (m_dialog->isPerGameSettings())
+	// Prompt user to get rid of widescreen/no-interlace config from the ini if the user has enabled them before.
+	if ((m_dialog->getBoolValue("EmuCore", "EnableWideScreenPatches", false) == true ||
+		m_dialog->getBoolValue("EmuCore", "EnableWideScreenPatches", false) == true) &&
+		!m_dialog->containsSettingValue("UI", "UserHasDeniedWSPatchWarning"))
 	{
-		if ((m_dialog->containsSettingValue("EmuCore", "EnableWideScreenPatches") || m_dialog->containsSettingValue("EmuCore", "EnableNoInterlacingPatches")) &&
-			QMessageBox::question(QtUtils::GetRootWidget(this), tr("Remove Unsupported Settings"),
-				tr("You currently have the <strong>Enable Widescreen Patches</strong> or <strong>Enable No-Interlacing Patches</strong> options enabled for this game.<br><br>"
-				   "We no longer support these options, instead <strong>you should select the \"Patches\" section, and explicitly enable the patches you want.</strong><br><br>"
-				   "Do you want to remove these options from your game configuration now?"),
+		if (QMessageBox::question(QtUtils::GetRootWidget(this), tr("Remove Unsupported Settings"),
+				tr("You previously had the <strong>Enable Widescreen Patches</strong> or <strong>Enable No-Interlacing Patches</strong> options enabled.<br><br>"
+				   "We no longer provide these options, instead <strong>you should go to the \"Patches\" section on the per-game settings, and explicitly enable the patches that you want.</strong><br><br>"
+				   "Do you want to remove these options from your configuration now?"),
 				QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
 		{
 			m_dialog->removeSettingValue("EmuCore", "EnableWideScreenPatches");
 			m_dialog->removeSettingValue("EmuCore", "EnableNoInterlacingPatches");
 		}
-
-		m_ui.displayGridLayout->removeWidget(m_ui.widescreenPatches);
-		m_ui.displayGridLayout->removeWidget(m_ui.noInterlacingPatches);
-		safe_delete(m_ui.widescreenPatches);
-		safe_delete(m_ui.noInterlacingPatches);
+		else
+			m_dialog->setBoolSettingValue("UI", "UserHasDeniedWSPatchWarning", true);
 	}
 
 	// Hide advanced options by default.
@@ -350,10 +346,13 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
 		m_ui.advancedTab = nullptr;
 		m_ui.gsDownloadMode = nullptr;
 		m_ui.gsDumpCompression = nullptr;
+		m_ui.texturePreloading = nullptr;
 		m_ui.exclusiveFullscreenControl = nullptr;
 		m_ui.useBlitSwapChain = nullptr;
 		m_ui.disableMailboxPresentation = nullptr;
 		m_ui.extendedUpscales = nullptr;
+		m_ui.spinCPUDuringReadbacks = nullptr;
+		m_ui.spinGPUDuringReadbacks = nullptr;
 		m_ui.skipPresentingDuplicateFrames = nullptr;
 		m_ui.overrideTextureBarriers = nullptr;
 		m_ui.disableFramebufferFetch = nullptr;
@@ -428,12 +427,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
 
 	// Display tab
 	{
-		dialog->registerWidgetHelp(m_ui.widescreenPatches, tr("Enable Widescreen Patches"), tr("Unchecked"),
-			tr("Automatically loads and applies widescreen patches on game start. Can cause issues."));
-
-		dialog->registerWidgetHelp(m_ui.noInterlacingPatches, tr("Enable No-Interlacing Patches"), tr("Unchecked"),
-			tr("Automatically loads and applies no-interlacing patches on game start. Can cause issues."));
-
 		dialog->registerWidgetHelp(m_ui.DisableInterlaceOffset, tr("Disable Interlace Offset"), tr("Unchecked"),
 			tr("Disables interlacing offset which may reduce blurring in some situations."));
 

pcsx2-qt/Settings/GraphicsSettingsWidget.ui

@@ -404,28 +404,28 @@
        </item>
        <item row="8" column="0" colspan="2">
         <layout class="QGridLayout" name="displayGridLayout">
-         <item row="1" column="1">
+         <item row="0" column="1">
           <widget class="QCheckBox" name="integerScaling">
            <property name="text">
             <string>Integer Scaling</string>
            </property>
           </widget>
          </item>
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="widescreenPatches">
+         <item row="2" column="0">
+          <widget class="QCheckBox" name="PCRTCOverscan">
            <property name="text">
-            <string>Apply Widescreen Patches</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QCheckBox" name="noInterlacingPatches">
-           <property name="text">
-            <string>Apply No-Interlacing Patches</string>
+            <string>Show Overscan</string>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
+          <widget class="QCheckBox" name="PCRTCOffsets">
+           <property name="text">
+            <string>Screen Offsets</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
           <widget class="QCheckBox" name="PCRTCAntiBlur">
            <property name="text">
             <string>Anti-Blur</string>
@@ -435,27 +435,13 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="1">
+         <item row="1" column="1">
           <widget class="QCheckBox" name="DisableInterlaceOffset">
            <property name="text">
             <string>Disable Interlace Offset</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="0">
-          <widget class="QCheckBox" name="PCRTCOffsets">
-           <property name="text">
-            <string>Screen Offsets</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QCheckBox" name="PCRTCOverscan">
-           <property name="text">
-            <string>Show Overscan</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
       </layout>
@@ -2125,7 +2111,7 @@
            </widget>
           </item>
           <item row="10" column="0" colspan="2">
-           <layout class="QGridLayout" name="gridLayout_9">
+           <layout class="QGridLayout" name="advancedOptionsGrid">
             <item row="2" column="0">
              <widget class="QCheckBox" name="disableMailboxPresentation">
               <property name="text">

pcsx2/CDVD/ChdFileReader.cpp

@@ -95,6 +95,30 @@ ChdFileReader::~ChdFileReader()
 	pxAssert(!ChdFile);
 }
 
+static bool IsHeaderParentCHD(const chd_header& header, const chd_header& parent_header)
+{
+	static const u8 nullmd5[CHD_MD5_BYTES]{};
+	static const u8 nullsha1[CHD_SHA1_BYTES]{};
+
+	// Check MD5 if it isn't empty.
+	if (std::memcmp(nullmd5, header.parentmd5, CHD_MD5_BYTES) != 0 &&
+		std::memcmp(nullmd5, parent_header.md5, CHD_MD5_BYTES) != 0 &&
+		std::memcmp(parent_header.md5, header.parentmd5, CHD_MD5_BYTES) != 0)
+	{
+		return false;
+	}
+
+	// Check SHA1 if it isn't empty.
+	if (std::memcmp(nullsha1, header.parentsha1, CHD_SHA1_BYTES) != 0 &&
+		std::memcmp(nullsha1, parent_header.sha1, CHD_SHA1_BYTES) != 0 &&
+		std::memcmp(parent_header.sha1, header.parentsha1, CHD_SHA1_BYTES) != 0)
+	{
+		return false;
+	}
+
+	return true;
+}
+
 static chd_file* OpenCHD(const std::string& filename, FileSystem::ManagedCFilePtr fp, Error* error, u32 recursion_level)
 {
 	chd_file* chd;
@@ -144,14 +168,14 @@ static chd_file* OpenCHD(const std::string& filename, FileSystem::ManagedCFilePt
 		if (!StringUtil::compareNoCase(parent_dir, Path::GetDirectory(it->first)))
 			continue;
 
-		if (!chd_is_matching_parent(&header, &it->second))
+		if (!IsHeaderParentCHD(header, it->second))
 			continue;
 
 		// Re-check the header, it might have changed since we last opened.
 		chd_header parent_header;
 		auto parent_fp = FileSystem::OpenManagedSharedCFile(it->first.c_str(), "rb", FileSystem::FileShareMode::DenyWrite);
 		if (parent_fp && chd_read_header_file(parent_fp.get(), &parent_header) == CHDERR_NONE &&
-			chd_is_matching_parent(&header, &parent_header))
+			IsHeaderParentCHD(header, parent_header))
 		{
 			// Need to take a copy of the string, because the parent might add to the list and invalidate the iterator.
 			const std::string filename_to_open = it->first;
@@ -192,7 +216,7 @@ static chd_file* OpenCHD(const std::string& filename, FileSystem::ManagedCFilePt
 			else
 				s_chd_hash_cache.emplace_back(fd.FileName, parent_header);
 
-			if (!chd_is_matching_parent(&header, &parent_header))
+			if (!IsHeaderParentCHD(header, parent_header))
 				continue;
 
 			// Match! Open this one.

pcsx2/Config.h

@@ -1268,8 +1268,6 @@ struct Pcsx2Config
 		EnablePatches : 1, // enables patch detection and application
 		EnableCheats : 1, // enables cheat detection and application
 		EnablePINE : 1, // enables inter-process communication
-		EnableWideScreenPatches : 1,
-		EnableNoInterlacingPatches : 1,
 		EnableFastBoot : 1,
 		EnableFastBootFastForward : 1,
 		EnableThreadPinning : 1,

pcsx2/ImGui/FullscreenUI.cpp

@@ -3705,15 +3705,6 @@ void FullscreenUI::DrawGraphicsSettingsPage(SettingsInterface* bsi, bool show_ad
 		"EmuCore/GS", "StretchY", 100, 10, 300, FSUI_CSTR("%d%%"));
 	DrawIntRectSetting(bsi, FSUI_CSTR("Crop"), FSUI_CSTR("Crops the image, while respecting aspect ratio."), "EmuCore/GS", "CropLeft", 0,
 		"CropTop", 0, "CropRight", 0, "CropBottom", 0, 0, 720, 1, FSUI_CSTR("%dpx"));
-
-	if (!IsEditingGameSettings(bsi))
-	{
-		DrawToggleSetting(bsi, FSUI_CSTR("Enable Widescreen Patches"), FSUI_CSTR("Enables loading widescreen patches from pnach files."),
-			"EmuCore", "EnableWideScreenPatches", false);
-		DrawToggleSetting(bsi, FSUI_CSTR("Enable No-Interlacing Patches"),
-			FSUI_CSTR("Enables loading no-interlacing patches from pnach files."), "EmuCore", "EnableNoInterlacingPatches", false);
-	}
-
 	DrawIntListSetting(bsi, FSUI_CSTR("Bilinear Upscaling"), FSUI_CSTR("Smooths out the image when upscaling the console to the screen."),
 		"EmuCore/GS", "linear_present_mode", static_cast<int>(GSPostBilinearMode::BilinearSharp), s_bilinear_present_options,
 		std::size(s_bilinear_present_options), true);

pcsx2/ImGui/ImGuiOverlays.cpp

@@ -397,10 +397,9 @@ __ri void ImGuiManager::DrawSettingsOverlay(float scale, float margin, float spa
 		EmuConfig.Cpu.Recompiler.GetEEClampMode(), static_cast<unsigned>(EmuConfig.Cpu.VU0FPCR.GetRoundMode()),
 		EmuConfig.Cpu.Recompiler.GetVUClampMode(), EmuConfig.GS.VsyncQueueSize);
 
-	if (EmuConfig.EnableCheats || EmuConfig.EnableWideScreenPatches || EmuConfig.EnableNoInterlacingPatches)
+	if (EmuConfig.EnableCheats)
 	{
-		APPEND("C={}{}{} ", EmuConfig.EnableCheats ? "C" : "", EmuConfig.EnableWideScreenPatches ? "W" : "",
-			EmuConfig.EnableNoInterlacingPatches ? "N" : "");
+		APPEND("CHT ");
 	}
 
 	if (GSIsHardwareRenderer())

pcsx2/Patch.cpp

@@ -163,9 +163,6 @@ namespace Patch
 	static void writeCheat();
 	static void handle_extended_t(const PatchCommand* p);
 
-	// Name of patches which will be auto-enabled based on global options.
-	static constexpr std::string_view WS_PATCH_NAME = "Widescreen 16:9";
-	static constexpr std::string_view NI_PATCH_NAME = "No-Interlacing";
 	static constexpr std::string_view PATCHES_ZIP_NAME = "patches.zip";
 
 	const char* PATCHES_CONFIG_SECTION = "Patches";
@@ -588,24 +585,6 @@ void Patch::ReloadEnabledLists()
 		s_enabled_cheats = {};
 
 	s_enabled_patches = Host::GetStringListSetting(PATCHES_CONFIG_SECTION, PATCH_ENABLE_CONFIG_KEY);
-
-	// Name based matching for widescreen/NI settings.
-	if (EmuConfig.EnableWideScreenPatches)
-	{
-		if (std::none_of(s_enabled_patches.begin(), s_enabled_patches.end(),
-				[](const std::string& it) { return (it == WS_PATCH_NAME); }))
-		{
-			s_enabled_patches.emplace_back(WS_PATCH_NAME);
-		}
-	}
-	if (EmuConfig.EnableNoInterlacingPatches)
-	{
-		if (std::none_of(s_enabled_patches.begin(), s_enabled_patches.end(),
-				[](const std::string& it) { return (it == NI_PATCH_NAME); }))
-		{
-			s_enabled_patches.emplace_back(NI_PATCH_NAME);
-		}
-	}
 }
 
 u32 Patch::EnablePatches(const PatchList& patches, const EnablePatchList& enable_list)

pcsx2/Patch.h

@@ -4,18 +4,16 @@
 #pragma once
 
 // Note about terminology:
-// "patch" in pcsx2 terminology is a single pnach style patch line, e.g. patch=1,EE,001110e0,word,00000000
+// "Patch" in PCSX2 terminology refers to a single pnach style patch line, e.g. `patch=1,EE,001110e0,word,00000000`
 // Such patches can appear in several places:
-// - At <CRC>.pnach files where each file could have several such patches:
-//   - At the "cheats" folder
-//     - UI name: "Cheats", controlled via system -> enable cheats
-//   - At the "cheats_ws" folder or inside "cheats_ws.zip" (the zip also called "widescreen cheats DB")
-//     - the latter is searched if the former is not found for a CRC
-//     - UI name: "Widescreen hacks/patches", controlled via system -> enable widescreen patches
-// - At GameIndex.yaml inside a [patches] section
-//   - UI name: "Patches", controlled via system -> enable automatic game fixes
-//   - note that automatic game fixes also controls automatic config changes from GameIndex.dbf (UI name: "fixes")
-//
+//  - At the "patches" folder or on the "patches.zip file inside the 'resources' folder
+//    - UI name: "Patch", Controlled via Per-Game Settings -> Patches
+//  - At the "cheats" folder
+//    - UI name: "Cheats", Controlled via Per-Game Settings -> Cheats -> Enable Cheat
+//  - At GameIndex.yaml inside a [patches] section
+//    - UI name: "Enable Compatibility Patches", controlled via Advanced section -> Enable compatability settings
+// Note: The file name has to be exactly "<Serial>_<CRC>.pnach" (For example "SLPS-25399_CD62245A.pnach")
+// Note #2: the old sytle of cheats are also supported but arent supported by the UI
 
 #include "Config.h"
 

pcsx2/Pcsx2Config.cpp

@@ -1922,8 +1922,6 @@ void Pcsx2Config::LoadSaveCore(SettingsWrapper& wrap)
 	SettingsWrapBitBool(EnablePatches);
 	SettingsWrapBitBool(EnableCheats);
 	SettingsWrapBitBool(EnablePINE);
-	SettingsWrapBitBool(EnableWideScreenPatches);
-	SettingsWrapBitBool(EnableNoInterlacingPatches);
 	SettingsWrapBitBool(EnableFastBoot);
 	SettingsWrapBitBool(EnableFastBootFastForward);
 	SettingsWrapBitBool(EnableThreadPinning);

pcsx2/VMManager.cpp

@@ -2885,8 +2885,6 @@ void VMManager::CheckForEmulationSpeedConfigChanges(const Pcsx2Config& old_confi
 void VMManager::CheckForPatchConfigChanges(const Pcsx2Config& old_config)
 {
 	if (EmuConfig.EnableCheats == old_config.EnableCheats &&
-		EmuConfig.EnableWideScreenPatches == old_config.EnableWideScreenPatches &&
-		EmuConfig.EnableNoInterlacingPatches == old_config.EnableNoInterlacingPatches &&
 		EmuConfig.EnablePatches == old_config.EnablePatches)
 	{
 		return;