Add missing `: IDialogParent`, remove unnecessary `IMainForm*` params

src/BizHawk.Client.EmuHawk/MainForm.Events.cs

@@ -863,13 +863,19 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (e is RomLoader.RomErrorArgs args)
 			{
-				using var configForm = new FirmwaresConfig(FirmwareManager, Config.FirmwareUserSpecifications, this, Config.PathEntries, retryLoadRom: true, reloadRomPath: args.RomPath);
+				using var configForm = new FirmwaresConfig(
+					this,
+					FirmwareManager,
+					Config.FirmwareUserSpecifications,
+					Config.PathEntries,
+					retryLoadRom: true,
+					reloadRomPath: args.RomPath);
 				var result = configForm.ShowDialog();
 				args.Retry = result == DialogResult.Retry;
 			}
 			else
 			{
-				using var configForm = new FirmwaresConfig(FirmwareManager, Config.FirmwareUserSpecifications, this, Config.PathEntries);
+				using var configForm = new FirmwaresConfig(this, FirmwareManager, Config.FirmwareUserSpecifications, Config.PathEntries);
 				configForm.ShowDialog();
 			}
 		}
@@ -1877,7 +1883,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (Emulator is ZXSpectrum speccy)
 			{
-				using var form = new ZxSpectrumPokeMemory(this, speccy);
+				using var form = new ZxSpectrumPokeMemory(speccy);
 				form.ShowDialog();
 			}
 		}
@@ -2006,7 +2012,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (Emulator is AmstradCPC cpc)
 			{
-				using var form = new AmstradCpcPokeMemory(this, cpc);
+				using var form = new AmstradCpcPokeMemory(cpc);
 				form.ShowDialog();
 			}
 		}

src/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs

@@ -22,7 +22,7 @@ namespace BizHawk.Client.EmuHawk
 		MameLaunchGame
 	}
 
-	public partial class OpenAdvancedChooser : Form
+	public partial class OpenAdvancedChooser : Form, IDialogParent
 	{
 		private readonly Config _config;
 

src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCPokeMemory.cs

@@ -7,12 +7,10 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class AmstradCpcPokeMemory : Form
 	{
-		private readonly IMainFormForConfig _mainForm;
 		private readonly AmstradCPC _cpc;
 
-		public AmstradCpcPokeMemory(IMainFormForConfig mainForm, AmstradCPC cpc)
+		public AmstradCpcPokeMemory(AmstradCPC cpc)
 		{
-			_mainForm = mainForm;
 			_cpc = cpc;
 			InitializeComponent();
 			Icon = Properties.Resources.GameControllerIcon;

src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs

@@ -30,11 +30,9 @@ namespace BizHawk.Client.EmuHawk
 	{
 		private readonly IDictionary<string, string> _firmwareUserSpecifications;
 
-		private readonly IMainFormForConfig _mainForm;
-
 		private readonly PathEntryCollection _pathEntries;
 
-		public IDialogController DialogController => _mainForm.DialogController;
+		public IDialogController DialogController { get; }
 
 		private readonly FirmwareManager Manager;
 
@@ -102,16 +100,16 @@ namespace BizHawk.Client.EmuHawk
 		private readonly ListViewSorter _listViewSorter;
 
 		public FirmwaresConfig(
+			IDialogController dialogController,
 			FirmwareManager firmwareManager,
 			IDictionary<string, string> firmwareUserSpecifications,
-			IMainFormForConfig mainForm,
 			PathEntryCollection pathEntries,
 			bool retryLoadRom = false,
 			string reloadRomPath = null)
 		{
 			_firmwareUserSpecifications = firmwareUserSpecifications;
-			_mainForm = mainForm;
 			_pathEntries = pathEntries;
+			DialogController = dialogController;
 			Manager = firmwareManager;
 
 			InitializeComponent();

src/BizHawk.Client.EmuHawk/config/SoundConfig.cs

@@ -7,7 +7,7 @@ using BizHawk.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class SoundConfig : Form
+	public partial class SoundConfig : Form, IDialogParent
 	{
 		private readonly Config _config;
 

src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumPokeMemory.cs

@@ -6,13 +6,10 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class ZxSpectrumPokeMemory : Form
 	{
-		private readonly IMainFormForConfig _mainForm;
 		private readonly ZXSpectrum _speccy;
-		public ZxSpectrumPokeMemory(
-			IMainFormForConfig mainForm,
-			ZXSpectrum speccy)
+
+		public ZxSpectrumPokeMemory(ZXSpectrum speccy)
 		{
-			_mainForm = mainForm;
 			_speccy = speccy;
 
 			InitializeComponent();

src/BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs

@@ -9,7 +9,7 @@ using BizHawk.Common.NumberExtensions;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class EditSubtitlesForm : Form
+	public partial class EditSubtitlesForm : Form, IDialogParent
 	{
 		
 		private readonly IMovie _selectedMovie;

src/BizHawk.Client.EmuHawk/tools/BatchRun.cs

@@ -10,7 +10,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class BatchRun : Form
+	public partial class BatchRun : Form, IDialogParent
 	{
 		private readonly Config _config;
 

src/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs

@@ -5,7 +5,7 @@ using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class GreenzoneSettings : Form
+	public partial class GreenzoneSettings : Form, IDialogParent
 	{
 		private readonly Action<ZwinderStateManagerSettings, bool> _saveSettings;
 		private ZwinderStateManagerSettings _settings;

src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs

@@ -9,7 +9,7 @@ using BizHawk.Client.Common;
 namespace BizHawk.Client.EmuHawk
 {
 	// TODO: don't use textboxes as labels
-	public partial class RamPoke : Form
+	public partial class RamPoke : Form, IDialogParent
 	{
 		private readonly List<Watch> _watchList;
 		private readonly CheatCollection _cheats;