Unification of modal dialogs for errors and such (#2579)

* Pass IDialogParent to IVideoWriter impls via ctor instead of param

* Refactor IDialogController/Parent, moving some of it to Client.Common

tl;dr: MessageBoxButtons.OK => ShowMessageBox/ModalMessageBox,
MessageBoxButtons.YesNo or .OKCancel => ShowMessageBox2/ModalMessageBox2,
MessageBoxButtons.YesNoCancel => ShowMessageBox3/ModalMessageBox3.

Possible breaking change: Cheats had `Owner ?? this` as its "self", which I
think parented any modals it opened to MainForm instead of the Cheats window.
The Cheats window will be their parent now regardless. Other than that, all the
icons and stuff for all the other dialogs should be exactly the same.

* Remove WinForms dep from AV classes where possible

* Cleanup CoreFileProvider init, passing MainForm as IDialogParent

* Pass MainForm as IDialogParent to MovieSession

* Pass IDialogController through to one MovieZone ctor

* Use MessageBox helpers in RecordMovie

* Implement IDialogParent on misc. Forms to use MessageBox helpers

* Use MessageBox helper in misc. config Forms

* Pass IDialogController through to misc. Forms for MessageBox helpers

src/BizHawk.Client.Common/CoreFileProvider.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using BizHawk.Common.PathExtensions;
 using BizHawk.Emulation.Common;
@@ -9,20 +8,19 @@ namespace BizHawk.Client.Common
 	public class CoreFileProvider : ICoreFileProvider
 	{
 		private readonly FirmwareManager _firmwareManager;
-		private readonly Action<string> _showWarning;
+		private readonly IDialogParent _dialogParent;
 		private readonly PathEntryCollection _pathEntries;
 		private readonly IDictionary<string, string> _firmwareUserSpecifications;
 
 		public CoreFileProvider(
-			Action<string> showWarning,
+			IDialogParent dialogParent,
 			FirmwareManager firmwareManager,
 			PathEntryCollection pathEntries,
 			IDictionary<string, string> firmwareUserSpecifications)
 		{
-			_showWarning = showWarning;
+			_dialogParent = dialogParent;
 			_firmwareManager = firmwareManager;
 			_pathEntries = pathEntries;
-			_firmwareManager = firmwareManager;
 			_firmwareUserSpecifications = firmwareUserSpecifications;
 		}
 
@@ -47,7 +45,7 @@ namespace BizHawk.Client.Common
 			if (msg != null)
 			{
 				var fullMsg = $"Couldn't find firmware {id}.  Will attempt to continue: {msg}";
-				_showWarning(fullMsg);
+				_dialogParent.ModalMessageBox(fullMsg, "Warning", EMsgBoxIcon.Warning);
 			}
 		}
 

src/BizHawk.Client.Common/DialogControllerExtensions.cs

@@ -0,0 +1,96 @@
+#nullable enable
+
+using System;
+
+namespace BizHawk.Client.Common
+{
+	public static class DialogControllerExtensions
+	{
+		public static void DoWithTempMute(this IDialogController dialogController, Action action)
+		{
+			dialogController.StopSound();
+			action();
+			dialogController.StartSound();
+		}
+
+		public static T DoWithTempMute<T>(this IDialogController dialogController, Func<T> action)
+		{
+			dialogController.StopSound();
+			var ret = action();
+			dialogController.StartSound();
+			return ret;
+		}
+
+		/// <summary>
+		/// Creates and shows a <c>System.Windows.Forms.MessageBox</c> or equivalent with the receiver (<paramref name="dialogParent"/>) as its parent, with the given <paramref name="text"/>,
+		/// and with the given <paramref name="caption"/> and <paramref name="icon"/> if they're specified.
+		/// </summary>
+		public static void ModalMessageBox(
+			this IDialogParent dialogParent,
+			string text,
+			string? caption = null,
+			EMsgBoxIcon? icon = null)
+				=> dialogParent.DialogController.ShowMessageBox(owner: dialogParent, text: text, caption: caption, icon: icon);
+
+		/// <summary>
+		/// Creates and shows a <c>System.Windows.Forms.MessageBox</c> or equivalent with the receiver (<paramref name="dialogParent"/>) as its parent, with the given <paramref name="text"/>,
+		/// and with the given <paramref name="caption"/> and <paramref name="icon"/> if they're specified.
+		/// </summary>
+		/// <returns><see langword="true"/> iff "Yes"/"OK" was chosen</returns>
+		public static bool ModalMessageBox2(
+			this IDialogParent dialogParent,
+			string text,
+			string? caption = null,
+			EMsgBoxIcon? icon = null,
+			bool useOKCancel = false)
+				=> dialogParent.DialogController.ShowMessageBox2(owner: dialogParent, text: text, caption: caption, icon: icon, useOKCancel: useOKCancel);
+
+		/// <summary>
+		/// Creates and shows a <c>System.Windows.Forms.MessageBox</c> or equivalent with the receiver (<paramref name="dialogParent"/>) as its parent, with the given <paramref name="text"/>,
+		/// and with the given <paramref name="caption"/> and <paramref name="icon"/> if they're specified.
+		/// </summary>
+		/// <returns><see langword="true"/> if "Yes" was chosen, <see langword="false"/> if "No" was chosen, or <see langword="null"/> if "Cancel" was chosen</returns>
+		public static bool? ModalMessageBox3(
+			this IDialogParent dialogParent,
+			string text,
+			string? caption = null,
+			EMsgBoxIcon? icon = null)
+				=> dialogParent.DialogController.ShowMessageBox3(owner: dialogParent, text: text, caption: caption, icon: icon);
+
+		/// <summary>
+		/// Creates and shows a <c>System.Windows.Forms.MessageBox</c> or equivalent without a parent, with the given <paramref name="text"/>,
+		/// and with the given <paramref name="caption"/> and <paramref name="icon"/> if they're specified.
+		/// </summary>
+		public static void ShowMessageBox(
+			this IDialogController dialogController,
+			string text,
+			string? caption = null,
+			EMsgBoxIcon? icon = null)
+				=> dialogController.ShowMessageBox(owner: null, text: text, caption: caption, icon: icon);
+
+		/// <summary>
+		/// Creates and shows a <c>System.Windows.Forms.MessageBox</c> or equivalent without a parent, with the given <paramref name="text"/>,
+		/// and with the given <paramref name="caption"/> and <paramref name="icon"/> if they're specified.
+		/// </summary>
+		/// <returns><see langword="true"/> iff "Yes"/"OK" was chosen</returns>
+		public static bool ShowMessageBox2(
+			this IDialogController dialogController,
+			string text,
+			string? caption = null,
+			EMsgBoxIcon? icon = null,
+			bool useOKCancel = false)
+				=> dialogController.ShowMessageBox2(owner: null, text: text, caption: caption, icon: icon, useOKCancel: useOKCancel);
+
+		/// <summary>
+		/// Creates and shows a <c>System.Windows.Forms.MessageBox</c> or equivalent without a parent, with the given <paramref name="text"/>,
+		/// and with the given <paramref name="caption"/> and <paramref name="icon"/> if they're specified.
+		/// </summary>
+		/// <returns><see langword="true"/> if "Yes" was chosen, <see langword="false"/> if "No" was chosen, or <see langword="null"/> if "Cancel" was chosen</returns>
+		public static bool? ShowMessageBox3(
+			this IDialogController dialogController,
+			string text,
+			string? caption = null,
+			EMsgBoxIcon? icon = null)
+				=> dialogController.ShowMessageBox3(owner: null, text: text, caption: caption, icon: icon);
+	}
+}

src/BizHawk.Client.Common/EMsgBoxIcon.cs

@@ -0,0 +1,14 @@
+#nullable enable
+
+namespace BizHawk.Client.Common
+{
+	/// <remarks>based on <c>System.Windows.Forms.MessageBoxIcon</c></remarks>
+	public enum EMsgBoxIcon : int
+	{
+		None = 0,
+		Error = 1,
+		Question = 2,
+		Warning = 3,
+		Info = 4,
+	}
+}

src/BizHawk.Client.Common/IDialogController.cs

@@ -0,0 +1,44 @@
+#nullable enable
+
+namespace BizHawk.Client.Common
+{
+	public interface IDialogController
+	{
+		/// <summary>
+		/// Creates and shows a <c>System.Windows.Forms.MessageBox</c> or equivalent with the given <paramref name="text"/>,
+		/// and with the given <paramref name="owner"/>, <paramref name="caption"/>, and <paramref name="icon"/> if they're specified.
+		/// </summary>
+		void ShowMessageBox(
+			IDialogParent? owner,
+			string text,
+			string? caption = null,
+			EMsgBoxIcon? icon = null);
+
+		/// <summary>
+		/// Creates and shows a <c>System.Windows.Forms.MessageBox</c> or equivalent with the given <paramref name="text"/>,
+		/// and with the given <paramref name="owner"/>, <paramref name="caption"/>, and <paramref name="icon"/> if they're specified.
+		/// </summary>
+		/// <returns><see langword="true"/> iff "Yes"/"OK" was chosen</returns>
+		bool ShowMessageBox2(
+			IDialogParent? owner,
+			string text,
+			string? caption = null,
+			EMsgBoxIcon? icon = null,
+			bool useOKCancel = false);
+
+		/// <summary>
+		/// Creates and shows a <c>System.Windows.Forms.MessageBox</c> or equivalent with the given <paramref name="text"/>,
+		/// and with the given <paramref name="owner"/>, <paramref name="caption"/>, and <paramref name="icon"/> if they're specified.
+		/// </summary>
+		/// <returns><see langword="true"/> if "Yes" was chosen, <see langword="false"/> if "No" was chosen, or <see langword="null"/> if "Cancel" was chosen</returns>
+		bool? ShowMessageBox3(
+			IDialogParent? owner,
+			string text,
+			string? caption = null,
+			EMsgBoxIcon? icon = null);
+
+		void StartSound();
+
+		void StopSound();
+	}
+}

src/BizHawk.Client.Common/IDialogParent.cs

@@ -0,0 +1,10 @@
+#nullable enable
+
+namespace BizHawk.Client.Common
+{
+	/// <remarks>In a WinForms app, inheritors must also inherit <c>System.Windows.Forms.IWin32Window</c>.</remarks>
+	public interface IDialogParent
+	{
+		IDialogController DialogController { get; }
+	}
+}

src/BizHawk.Client.Common/movie/MovieSession.cs

@@ -12,25 +12,26 @@ namespace BizHawk.Client.Common
 
 	public class MovieSession : IMovieSession
 	{
+		private readonly IDialogParent _dialogParent;
+
 		private readonly Action _pauseCallback;
 		private readonly Action _modeChangedCallback;
 		private readonly Action<string> _messageCallback;
-		private readonly Action<string> _popupCallback;
 
 		private IMovie _queuedMovie;
 
 		public MovieSession(
 			IMovieConfig settings,
 			string backDirectory,
+			IDialogParent dialogParent,
 			Action<string> messageCallback,
-			Action<string> popupCallback,
 			Action pauseCallback,
 			Action modeChangedCallback)
 		{
 			Settings = settings;
 			BackupDirectory = backDirectory;
 			_messageCallback = messageCallback;
-			_popupCallback = popupCallback;
+			_dialogParent = dialogParent;
 			_pauseCallback = pauseCallback
 				?? throw new ArgumentNullException($"{nameof(pauseCallback)} cannot be null.");
 			_modeChangedCallback = modeChangedCallback
@@ -316,10 +317,7 @@ namespace BizHawk.Client.Common
 			return new Bk2Movie(this, path);
 		}
 
-		public void PopupMessage(string message)
-		{
-			_popupCallback?.Invoke(message);
-		}
+		public void PopupMessage(string message) => _dialogParent.ModalMessageBox(message, "Warning", EMsgBoxIcon.Warning);
 
 		private void Output(string message)
 		{

src/BizHawk.Client.EmuHawk/AVOut/AVSync.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Windows.Forms;
+
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 
@@ -247,9 +247,9 @@ namespace BizHawk.Client.EmuHawk
 			W.AddSamples(samples);
 		}
 
-		public IDisposable AcquireVideoCodecToken(IDialogParent parent, Config config)
+		public IDisposable AcquireVideoCodecToken(Config config)
 		{
-			return W.AcquireVideoCodecToken(parent, config);
+			return W.AcquireVideoCodecToken(config);
 		}
 
 		public void SetMovieParameters(int fpsNum, int fpsDen)

src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 using BizHawk.Common;
@@ -19,8 +18,13 @@ namespace BizHawk.Client.EmuHawk
 	{
 		private CodecToken _currVideoCodecToken = null;
 		private AviWriterSegment _currSegment;
+
+		private readonly IDialogParent _dialogParent;
+
 		private IEnumerator<string> _nameProvider;
 
+		public AviWriter(IDialogParent dialogParent) => _dialogParent = dialogParent;
+
 		public void SetFrame(int frame)
 		{
 		}
@@ -99,7 +103,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			catch (Exception e)
 			{
-				MessageBox.Show($"AVIFIL32 Thread died:\n\n{e}");
+				_dialogParent.DialogController.ShowMessageBox($"AVIFIL32 Thread died:\n\n{e}");
 			}
 		}
 
@@ -261,7 +265,7 @@ namespace BizHawk.Client.EmuHawk
 		/// Acquires a video codec configuration from the user. you may save it for future use, but you must dispose of it when you're done with it.
 		/// returns null if the user canceled the dialog
 		/// </summary>
-		public IDisposable AcquireVideoCodecToken(IDialogParent parent, Config config)
+		public IDisposable AcquireVideoCodecToken(Config config)
 		{
 			var tempParams = new Parameters
 			{
@@ -278,7 +282,7 @@ namespace BizHawk.Client.EmuHawk
 			File.Delete(tempfile);
 			tempfile = Path.ChangeExtension(tempfile, "avi");
 			temp.OpenFile(tempfile, tempParams, null);
-			var ret = temp.AcquireVideoCodecToken(parent.SelfAsHandle.Handle, _currVideoCodecToken);
+			var ret = temp.AcquireVideoCodecToken(_dialogParent.AsWinFormsHandle().Handle, _currVideoCodecToken);
 			CodecToken token = (CodecToken)ret;
 			config.AviCodecToken = token?.Serialize();
 			temp.CloseFile();

src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Diagnostics;
-using System.Windows.Forms;
+
 using BizHawk.Client.Common;
 using BizHawk.Common;
 using BizHawk.Common.PathExtensions;
@@ -17,6 +17,8 @@ namespace BizHawk.Client.EmuHawk
 	[VideoWriter("ffmpeg", "FFmpeg writer", "Uses an external FFMPEG process to encode video and audio.  Various formats supported.  Splits on resolution change.")]
 	public class FFmpegWriter : IVideoWriter
 	{
+		private readonly IDialogParent _dialogParent;
+
 		/// <summary>
 		/// handle to external ffmpeg process
 		/// </summary>
@@ -62,6 +64,8 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		private string _ext;
 
+		public FFmpegWriter(IDialogParent dialogParent) => _dialogParent = dialogParent;
+
 		public void SetFrame(int frame)
 		{
 		}
@@ -199,7 +203,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			catch
 			{
-				MessageBox.Show($"Exception! ffmpeg history:\n{FfmpegGetError()}");
+				_dialogParent.DialogController.ShowMessageBox($"Exception! ffmpeg history:\n{FfmpegGetError()}");
 				throw;
 			}
 
@@ -207,15 +211,15 @@ namespace BizHawk.Client.EmuHawk
 			//ffmpeg.StandardInput.BaseStream.Write(b, 0, b.Length);
 		}
 
-		public IDisposable AcquireVideoCodecToken(IDialogParent parent, Config config)
+		public IDisposable AcquireVideoCodecToken(Config config)
 		{
 			if (!FFmpegService.QueryServiceAvailable())
 			{
 				using var form = new FFmpegDownloaderForm();
-				parent.ShowDialogWithTempMute(form);
+				_dialogParent.ShowDialogWithTempMute(form);
 				if (!FFmpegService.QueryServiceAvailable()) return null;
 			}
-			return FFmpegWriterForm.DoFFmpegWriterDlg(parent.SelfAsHandle, config);
+			return FFmpegWriterForm.DoFFmpegWriterDlg(_dialogParent.AsWinFormsHandle(), config);
 		}
 
 		/// <exception cref="ArgumentException"><paramref name="token"/> does not inherit <see cref="FFmpegWriterForm.FormatPreset"/></exception>
@@ -293,7 +297,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			catch
 			{
-				MessageBox.Show($"Exception! ffmpeg history:\n{FfmpegGetError()}");
+				_dialogParent.DialogController.ShowMessageBox($"Exception! ffmpeg history:\n{FfmpegGetError()}");
 				throw;
 			}
 		}

src/BizHawk.Client.EmuHawk/AVOut/GifWriter.cs

@@ -82,8 +82,12 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private readonly IDialogParent _dialogParent;
+
 		private GifToken _token;
 
+		public GifWriter(IDialogParent dialogParent) => _dialogParent = dialogParent;
+
 		/// <exception cref="ArgumentException"><paramref name="token"/> does not inherit <see cref="GifWriter.GifToken"/></exception>
 		public void SetVideoCodecToken(IDisposable token)
 		{
@@ -196,9 +200,9 @@ namespace BizHawk.Client.EmuHawk
 			// ignored
 		}
 
-		public IDisposable AcquireVideoCodecToken(IDialogParent parent, Config config)
+		public IDisposable AcquireVideoCodecToken(Config config)
 		{
-			return GifWriterForm.DoTokenForm(parent.SelfAsHandle, config);
+			return GifWriterForm.DoTokenForm(_dialogParent.AsWinFormsHandle(), config);
 		}
 
 		private void CalcDelay()

src/BizHawk.Client.EmuHawk/AVOut/IVideoWriter.cs

@@ -63,9 +63,8 @@ namespace BizHawk.Client.EmuHawk
 		/// obtain a set of recording compression parameters
 		/// return null on user cancel
 		/// </summary>
-		/// <param name="parent">parent for if the user is shown config dialog</param>
 		/// <returns>codec token, dispose of it when you're done with it</returns>
-		IDisposable AcquireVideoCodecToken(IDialogParent parent, Config config);
+		IDisposable AcquireVideoCodecToken(Config config);
 
 		/// <summary>
 		/// set framerate to fpsNum/fpsDen (assumed to be unchanging over the life of the stream)
@@ -118,6 +117,8 @@ namespace BizHawk.Client.EmuHawk
 
 	public class VideoWriterInfo
 	{
+		private static readonly Type[] CTOR_TYPES_A = { typeof(IDialogParent) };
+
 		public VideoWriterAttribute Attribs { get; }
 		private readonly Type _type;
 
@@ -127,7 +128,11 @@ namespace BizHawk.Client.EmuHawk
 			Attribs = attribs;
 		}
 
-		public IVideoWriter Create() => (IVideoWriter)Activator.CreateInstance(_type);
+		/// <param name="dialogParent">parent for if the user is shown config dialog</param>
+		public IVideoWriter Create(IDialogParent dialogParent) => (IVideoWriter) (
+			_type.GetConstructor(CTOR_TYPES_A)
+				?.Invoke(new object[] { dialogParent })
+				?? Activator.CreateInstance(_type));
 
 		public override string ToString() => Attribs.Name;
 	}
@@ -159,10 +164,11 @@ namespace BizHawk.Client.EmuHawk
 		/// <summary>
 		/// find an IVideoWriter by its short name
 		/// </summary>
-		public static IVideoWriter GetVideoWriter(string name)
+		/// <param name="dialogParent">parent for if the user is shown config dialog</param>
+		public static IVideoWriter GetVideoWriter(string name, IDialogParent dialogParent)
 		{
 			return VideoWriters.TryGetValue(name, out var ret)
-				? ret.Create()
+				? ret.Create(dialogParent)
 				: null;
 		}
 	}

src/BizHawk.Client.EmuHawk/AVOut/ImageSequenceWriter.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Drawing.Imaging;
-using System.Windows.Forms;
 
 using BizHawk.Bizware.BizwareGL;
 using BizHawk.Client.Common;
@@ -73,7 +72,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public IDisposable AcquireVideoCodecToken(IDialogParent parent, Config config)
+		public IDisposable AcquireVideoCodecToken(Config config)
 		{
 			return new CodecToken();
 		}

src/BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs

@@ -5,7 +5,7 @@ using System.IO;
 using System.IO.Compression;
 using System.Text;
 using System.Threading;
-using System.Windows.Forms;
+
 using BizHawk.Client.Common;
 
 using BizHawk.Emulation.Common;
@@ -70,6 +70,8 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private readonly IDialogParent _dialogParent;
+
 		// stores compression parameters
 		private CodecToken _token;
 
@@ -512,8 +514,10 @@ namespace BizHawk.Client.EmuHawk
 		/// <summary>
 		/// sets default (probably wrong) parameters
 		/// </summary>
-		public JmdWriter()
+		public JmdWriter(IDialogParent dialogParent)
 		{
+			_dialogParent = dialogParent;
+
 			_fpsNum = 25;
 			_fpsDen = 1;
 			_audioSampleRate = 22050;
@@ -542,7 +546,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public IDisposable AcquireVideoCodecToken(IDialogParent parent, Config config)
+		public IDisposable AcquireVideoCodecToken(Config config)
 		{
 			var ret = new CodecToken();
 
@@ -551,7 +555,7 @@ namespace BizHawk.Client.EmuHawk
 
 			int c = Math.Min(Math.Max(config.JmdCompression, NO_COMPRESSION), BEST_COMPRESSION);
 
-			if (!JmdForm.DoCompressionDlg(ref t, ref c, 1, 6, NO_COMPRESSION, BEST_COMPRESSION, parent.SelfAsHandle))
+			if (!JmdForm.DoCompressionDlg(ref t, ref c, 1, 6, NO_COMPRESSION, BEST_COMPRESSION, _dialogParent.AsWinFormsHandle()))
 				return null;
 
 			config.JmdThreads = ret.NumThreads = t;
@@ -662,7 +666,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			catch (Exception e)
 			{
-				MessageBox.Show($"JMD Worker Thread died:\n\n{e}");
+				_dialogParent.DialogController.ShowMessageBox($"JMD Worker Thread died:\n\n{e}");
 			}
 		}
 

src/BizHawk.Client.EmuHawk/AVOut/NutWriter.cs

@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using System.Windows.Forms;
+
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
 
@@ -29,7 +29,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			// ignored
 		}
-		public IDisposable AcquireVideoCodecToken(IDialogParent parent, Config config)
+		public IDisposable AcquireVideoCodecToken(Config config)
 		{
 			return new NutWriterToken();
 		}

src/BizHawk.Client.EmuHawk/AVOut/SynclessRecorder.cs

@@ -3,7 +3,6 @@ using System.IO;
 using System.Collections.Generic;
 using System.Drawing.Imaging;
 using System.Text;
-using System.Windows.Forms;
 
 using BizHawk.Emulation.Common;
 using BizHawk.Bizware.BizwareGL;
@@ -83,7 +82,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public IDisposable AcquireVideoCodecToken(IDialogParent parent, Config config)
+		public IDisposable AcquireVideoCodecToken(Config config)
 		{
 			return new DummyDisposable();
 		}

src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs

@@ -21,8 +21,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public IDialogController DialogController { get; }
 
-		public IWin32Window SelfAsHandle => this;
-
 		public SynclessRecordingTools(Config config, IGameInfo game, IDialogController dialogController)
 		{
 			_config = config;
@@ -124,11 +122,11 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			using var avw = new AviWriter();
+			using var avw = new AviWriter(this);
 			avw.SetAudioParameters(44100, 2, 16); // hacky
 			avw.SetMovieParameters(60, 1); // hacky
 			avw.SetVideoParameters(width, height);
-			var token = avw.AcquireVideoCodecToken(this, _config);
+			var token = avw.AcquireVideoCodecToken(_config);
 			avw.SetVideoCodecToken(token);
 			avw.OpenFile(sfd.FileName);
 			foreach (var fi in _mFrameInfos)

src/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs

@@ -10,13 +10,17 @@ namespace BizHawk.Client.EmuHawk
 	/// <summary>
 	/// implements a simple dialog which chooses an IVideoWriter to record with
 	/// </summary>
-	public partial class VideoWriterChooserForm : Form
+	public partial class VideoWriterChooserForm : Form, IDialogParent
 	{
 		private readonly int _captureWidth = 640;
 		private readonly int _captureHeight = 480;
 
+		public IDialogController DialogController { get; }
+
 		private VideoWriterChooserForm(IMainFormForTools mainForm, IEmulator emulator, Config config)
 		{
+			DialogController = mainForm;
+
 			InitializeComponent();
 
 			// TODO: do we want to use virtual w/h?
@@ -53,15 +57,16 @@ namespace BizHawk.Client.EmuHawk
 		/// <param name="owner">parent window</param>
 		/// <param name="emulator">The current emulator</param>
 		/// <returns>user choice, or null on Cancel\Close\invalid</returns>
-		public static IVideoWriter DoVideoWriterChooserDlg(
+		public static IVideoWriter DoVideoWriterChooserDlg<T>(
 			IEnumerable<VideoWriterInfo> list,
-			IMainFormForTools owner,
+			T owner,
 			IEmulator emulator,
 			Config config,
 			out int resizeW,
 			out int resizeH,
 			out bool pad,
 			ref bool audioSync)
+				where T : IMainFormForTools, IDialogParent
 		{
 			var dlg = new VideoWriterChooserForm(owner, emulator, config)
 			{
@@ -98,7 +103,7 @@ namespace BizHawk.Client.EmuHawk
 			if (result == DialogResult.OK && dlg.listBox1.SelectedIndex != -1)
 			{
 				var vwi = (VideoWriterInfo)dlg.listBox1.SelectedItem;
-				ret = vwi.Create();
+				ret = vwi.Create(owner);
 				config.VideoWriter = vwi.Attribs.ShortName;
 			}
 			else
@@ -153,13 +158,13 @@ namespace BizHawk.Client.EmuHawk
 				{
 					if (numericTextBoxW.IntValue < 1 || numericTextBoxH.IntValue < 1)
 					{
-						MessageBox.Show(this, "Size must be positive!");
+						this.ModalMessageBox("Size must be positive!");
 						DialogResult = DialogResult.None;
 					}
 				}
 				catch (FormatException)
 				{
-					MessageBox.Show(this, "Size must be numeric!");
+					this.ModalMessageBox("Size must be numeric!");
 					DialogResult = DialogResult.None;
 				}
 			}

src/BizHawk.Client.EmuHawk/AVOut/WavWriter.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
-using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 using BizHawk.Common.IOExtensions;
@@ -229,7 +228,7 @@ namespace BizHawk.Client.EmuHawk
 			public void Dispose() { }
 		}
 
-		public IDisposable AcquireVideoCodecToken(IDialogParent parent, Config config)
+		public IDisposable AcquireVideoCodecToken(Config config)
 		{
 			// don't care
 			return new WavWriterVToken();

src/BizHawk.Client.EmuHawk/DialogControllerWinFormsExtensions.cs

@@ -0,0 +1,49 @@
+#nullable enable
+
+using System;
+using System.Windows.Forms;
+
+using BizHawk.Client.Common;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public static class DialogControllerWinFormsExtensions
+	{
+		public static IWin32Window AsWinFormsHandle(this IDialogParent dialogParent) => (IWin32Window) dialogParent;
+
+		public static DialogResult ShowDialogAsChild(this IDialogParent dialogParent, CommonDialog dialog)
+			=> dialog.ShowDialog(dialogParent.AsWinFormsHandle());
+
+		public static DialogResult ShowDialogAsChild(this IDialogParent dialogParent, Form dialog)
+			=> dialog.ShowDialog(dialogParent.AsWinFormsHandle());
+
+		public static DialogResult ShowDialogWithTempMute(this IDialogParent dialogParent, CommonDialog dialog)
+			=> dialogParent.DialogController.DoWithTempMute(() => dialog.ShowDialog(dialogParent.AsWinFormsHandle()));
+
+		public static DialogResult ShowDialogWithTempMute(this IDialogParent dialogParent, Form dialog)
+			=> dialogParent.DialogController.DoWithTempMute(() => dialog.ShowDialog(dialogParent.AsWinFormsHandle()));
+
+		public static DialogResult ShowMessageBox(
+			this IDialogController mainForm,
+			IDialogParent? owner,
+			string text,
+			string? caption,
+			MessageBoxButtons buttons,
+			EMsgBoxIcon? icon)
+				=> MessageBox.Show(
+					owner?.AsWinFormsHandle(),
+					text,
+					caption ?? string.Empty,
+					buttons,
+					icon switch
+					{
+						null => MessageBoxIcon.None,
+						EMsgBoxIcon.None => MessageBoxIcon.None,
+						EMsgBoxIcon.Error => MessageBoxIcon.Error,
+						EMsgBoxIcon.Question => MessageBoxIcon.Question,
+						EMsgBoxIcon.Warning => MessageBoxIcon.Warning,
+						EMsgBoxIcon.Info => MessageBoxIcon.Information,
+						_ => throw new ArgumentException(message: "not a valid enum member", paramName: nameof(icon))
+					});
+	}
+}

src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs

@@ -139,70 +139,6 @@ namespace BizHawk.Client.EmuHawk
 		}
 	}
 
-	public static class FormExtensions
-	{
-		public static void DoWithTempMute(this IDialogController dialogController, Action action)
-		{
-			dialogController.StopSound();
-			action();
-			dialogController.StartSound();
-		}
-
-		public static T DoWithTempMute<T>(this IDialogController dialogController, Func<T> action)
-		{
-			dialogController.StopSound();
-			var ret = action();
-			dialogController.StartSound();
-			return ret;
-		}
-
-		/// <summary>
-		/// Creates a <see cref="MessageBox"/> with the receiver (<paramref name="dialogParent"/>) as its parent, with the given <paramref name="text"/>,
-		/// and with the given <paramref name="caption"/>, <paramref name="buttons"/>, and <paramref name="icon"/> if they're specified.
-		/// </summary>
-		public static DialogResult ModalMessageBox(
-			this IDialogParent dialogParent,
-			string text,
-			string? caption = null,
-			MessageBoxButtons? buttons = null,
-			MessageBoxIcon? icon = null)
-				=> dialogParent.DialogController.ShowMessageBox(
-					owner: dialogParent,
-					text: text,
-					caption: caption,
-					buttons: buttons,
-					icon: icon);
-
-		public static DialogResult ShowDialogAsChild(this IDialogParent dialogParent, CommonDialog dialog)
-			=> dialog.ShowDialog(dialogParent.SelfAsHandle);
-
-		public static DialogResult ShowDialogAsChild(this IDialogParent dialogParent, Form dialog)
-			=> dialog.ShowDialog(dialogParent.SelfAsHandle);
-
-		public static DialogResult ShowDialogWithTempMute(this IDialogParent dialogParent, CommonDialog dialog)
-			=> dialogParent.DialogController.DoWithTempMute(() => dialog.ShowDialog(dialogParent.SelfAsHandle));
-
-		public static DialogResult ShowDialogWithTempMute(this IDialogParent dialogParent, Form dialog)
-			=> dialogParent.DialogController.DoWithTempMute(() => dialog.ShowDialog(dialogParent.SelfAsHandle));
-
-		/// <summary>
-		/// Creates a <see cref="MessageBox"/> without a parent, with the given <paramref name="text"/>,
-		/// and with the given <paramref name="caption"/>, <paramref name="buttons"/>, and <paramref name="icon"/> if they're specified.
-		/// </summary>
-		public static DialogResult ShowMessageBox(
-			this IDialogController dialogController,
-			string text,
-			string? caption = null,
-			MessageBoxButtons? buttons = null,
-			MessageBoxIcon? icon = null)
-				=> dialogController.ShowMessageBox(
-					owner: null,
-					text: text,
-					caption: caption,
-					buttons: buttons,
-					icon: icon);
-	}
-
 	public static class ListViewExtensions
 	{
 		/// <summary>

src/BizHawk.Client.EmuHawk/Extensions/ToolExtensions.cs

@@ -218,7 +218,7 @@ namespace BizHawk.Client.EmuHawk.ToolExtensions
 			{
 				if (recent.Frozen)
 				{
-					mainForm.ShowMessageBox($"Could not open {path}", "File not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					mainForm.ShowMessageBox($"Could not open {path}", "File not found", EMsgBoxIcon.Error);
 				}
 				else
 				{

src/BizHawk.Client.EmuHawk/IDialogController.cs

@@ -1,24 +0,0 @@
-#nullable enable
-
-using System.Windows.Forms;
-
-namespace BizHawk.Client.EmuHawk
-{
-	public interface IDialogController
-	{
-		/// <summary>
-		/// Creates a <see cref="MessageBox"/> with the given <paramref name="text"/>,
-		/// and with the given <paramref name="owner"/>, <paramref name="caption"/>, <paramref name="buttons"/>, and <paramref name="icon"/> if they're specified.
-		/// </summary>
-		DialogResult ShowMessageBox(
-			IDialogParent? owner,
-			string text,
-			string? caption = null,
-			MessageBoxButtons? buttons = null,
-			MessageBoxIcon? icon = null);
-
-		void StartSound();
-
-		void StopSound();
-	}
-}

src/BizHawk.Client.EmuHawk/IDialogParent.cs

@@ -1,13 +0,0 @@
-#nullable enable
-
-using System.Windows.Forms;
-
-namespace BizHawk.Client.EmuHawk
-{
-	public interface IDialogParent
-	{
-		IDialogController DialogController { get; }
-
-		IWin32Window SelfAsHandle { get; }
-	}
-}

src/BizHawk.Client.EmuHawk/IMainFormForConfig.cs

@@ -3,7 +3,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public interface IMainFormForConfig : IDialogController, IDialogParent
+	public interface IMainFormForConfig : IDialogParent
 	{
 		/// <remarks>only referenced from <see cref="GenericCoreConfig"/></remarks>
 		IEmulator Emulator { get; }

src/BizHawk.Client.EmuHawk/IMainFormForTools.cs

@@ -6,7 +6,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public interface IMainFormForTools : IDialogController, IDialogParent
+	public interface IMainFormForTools : IDialogController
 	{
 		CheatCollection CheatList { get; }
 

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

@@ -247,7 +247,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void OpenAdvancedMenuItem_Click(object sender, EventArgs e)
 		{
-			using var oac = new OpenAdvancedChooser(Config, CreateCoreComm, Game, RunLibretroCoreChooser);
+			using var oac = new OpenAdvancedChooser(this, Config, CreateCoreComm, Game, RunLibretroCoreChooser);
 			if (this.ShowDialogWithTempMute(oac) == DialogResult.Cancel) return;
 
 			if (oac.Result == AdvancedRomLoaderType.LibretroLaunchNoGame)
@@ -393,15 +393,14 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (!Emulator.Attributes().Released)
 			{
-				var result = this.ModalMessageBox(
+				var result = this.ModalMessageBox2(
 					"Thanks for using BizHawk!  The emulation core you have selected "
 						+ "is currently BETA-status.  We appreciate your help in testing BizHawk. "
 						+ "You can record a movie on this core if you'd like to, but expect to "
 						+ "encounter bugs and sync problems.  Continue?",
-					"BizHawk",
-					MessageBoxButtons.YesNo);
+					"BizHawk");
 
-				if (result != DialogResult.Yes)
+				if (!result)
 				{
 					return;
 				}
@@ -847,7 +846,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ControllersMenuItem_Click(object sender, EventArgs e)
 		{
-			using var controller = new ControllerConfig(Emulator, Config);
+			using var controller = new ControllerConfig(this, Emulator, Config);
 			if (controller.ShowDialog().IsOk())
 			{
 				AddOnScreenMessage("Controller settings saved");
@@ -914,7 +913,7 @@ namespace BizHawk.Client.EmuHawk
 				ESoundOutputMethod.OpenAL => OpenALSoundOutput.GetDeviceNames(),
 				_ => Enumerable.Empty<string>()
 			};
-			using var form = new SoundConfig(Config, GetDeviceNamesCallback);
+			using var form = new SoundConfig(this, Config, GetDeviceNamesCallback);
 			if (!form.ShowDialog().IsOk())
 			{
 				AddOnScreenMessage("Sound config aborted");
@@ -1303,7 +1302,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void BatchRunnerMenuItem_Click(object sender, EventArgs e)
 		{
-			using var form = new BatchRun(Config, CreateCoreComm);
+			using var form = new BatchRun(this, Config, CreateCoreComm);
 			form.ShowDialog();
 		}
 
@@ -1523,13 +1522,7 @@ namespace BizHawk.Client.EmuHawk
 						var message =
 							$"Invalid file format. Reason: {ex.Message} \nForce transfer? This may cause the calculator to crash.";
 
-						if (ShowMessageBox(
-							owner: null,
-							message,
-							"Upload Failed",
-							MessageBoxButtons.YesNoCancel,
-							MessageBoxIcon.Question)
-								== DialogResult.Yes)
+						if (this.ShowMessageBox3(owner: null, message, "Upload Failed", EMsgBoxIcon.Question) == true)
 						{
 							ti83.LinkPort.SendFileToCalc(File.OpenRead(ofd.FileName), false);
 						}
@@ -2327,7 +2320,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (MovieSession.Movie.IsActive())
 			{
-				using var form = new EditSubtitlesForm(MovieSession.Movie, MovieSession.ReadOnly);
+				using var form = new EditSubtitlesForm(this, MovieSession.Movie, MovieSession.ReadOnly);
 				form.ShowDialog();
 			}
 		}
@@ -2478,14 +2471,13 @@ namespace BizHawk.Client.EmuHawk
 		private void UpdateNotification_Click(object sender, EventArgs e)
 		{
 			Sound.StopSound();
-			var result = this.ModalMessageBox(
+			var result = this.ModalMessageBox3(
 				$"Version {Config.UpdateLatestVersion} is now available. Would you like to open the BizHawk homepage?\r\n\r\nClick \"No\" to hide the update notification for this version.",
 				"New Version Available",
-				MessageBoxButtons.YesNoCancel,
-				MessageBoxIcon.Question);
+				EMsgBoxIcon.Question);
 			Sound.StartSound();
 
-			if (result == DialogResult.Yes)
+			if (result == true)
 			{
 				System.Threading.ThreadPool.QueueUserWorkItem(s =>
 				{
@@ -2494,7 +2486,7 @@ namespace BizHawk.Client.EmuHawk
 					}
 				});
 			}
-			else if (result == DialogResult.No)
+			else if (result == false)
 			{
 				UpdateChecker.GlobalConfig = Config;
 				UpdateChecker.IgnoreNewVersion();

src/BizHawk.Client.EmuHawk/MainForm.cs

@@ -164,7 +164,7 @@ namespace BizHawk.Client.EmuHawk
 		public CoreComm CreateCoreComm()
 		{
 			var cfp = new CoreFileProvider(
-				ShowMessageCoreComm,
+				this,
 				FirmwareManager,
 				Config.PathEntries,
 				Config.FirmwareUserSpecifications);
@@ -172,7 +172,11 @@ namespace BizHawk.Client.EmuHawk
 			if (Config.SkipWaterboxIntegrityChecks)
 				prefs = CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck;
 
-			return new CoreComm(ShowMessageCoreComm, AddOnScreenMessage, cfp, prefs);
+			return new CoreComm(
+				message => this.ModalMessageBox(message, "Warning", EMsgBoxIcon.Warning),
+				AddOnScreenMessage,
+				cfp,
+				prefs);
 		}
 
 		private void SetImages()
@@ -318,8 +322,8 @@ namespace BizHawk.Client.EmuHawk
 			movieSession = MovieSession = new MovieSession(
 				Config.Movies,
 				Config.PathEntries.MovieBackupsAbsolutePath(),
+				this,
 				AddOnScreenMessage,
-				ShowMessageCoreComm,
 				PauseEmulator,
 				SetMainformMovieInfo);
 
@@ -461,7 +465,7 @@ namespace BizHawk.Client.EmuHawk
 					message = "Couldn't initialize DirectSound! Things may go poorly for you. Try changing your sound driver to 44.1khz instead of 48khz in mmsys.cpl.";
 				}
 
-				ShowMessageBox(owner: null, message, "Initialization Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				ShowMessageBox(owner: null, message, "Initialization Error", EMsgBoxIcon.Error);
 
 				Config.SoundOutputMethod = ESoundOutputMethod.Dummy;
 				Sound = new Sound(Handle, Config, () => Emulator.VsyncRate());
@@ -2317,8 +2321,7 @@ namespace BizHawk.Client.EmuHawk
 							owner: null,
 							"No sync settings found, using currently configured settings for this core.",
 							"No sync settings found",
-							MessageBoxButtons.OK,
-							MessageBoxIcon.Warning);
+							EMsgBoxIcon.Warning);
 					}
 				}
 			}
@@ -3195,7 +3198,7 @@ namespace BizHawk.Client.EmuHawk
 			_dumpaudiosync = Config.VideoWriterAudioSync;
 			if (unattended && !string.IsNullOrEmpty(videoWriterName))
 			{
-				aw = VideoWriterInventory.GetVideoWriter(videoWriterName);
+				aw = VideoWriterInventory.GetVideoWriter(videoWriterName, this);
 			}
 			else
 			{
@@ -3258,7 +3261,7 @@ namespace BizHawk.Client.EmuHawk
 						aw.SetDefaultVideoCodecToken(Config);
 					}
 
-					var token = aw.AcquireVideoCodecToken(this, Config);
+					var token = aw.AcquireVideoCodecToken(Config);
 					if (token == null)
 					{
 						AddOnScreenMessage("A/V capture canceled.");
@@ -3534,22 +3537,16 @@ namespace BizHawk.Client.EmuHawk
 			return Path.Combine(pathEntry, name);
 		}
 
-		private void ShowMessageCoreComm(string message)
-		{
-			this.ModalMessageBox(message, "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-		}
-
 		private void ShowLoadError(object sender, RomLoader.RomErrorArgs e)
 		{
 			if (e.Type == RomLoader.LoadErrorType.MissingFirmware)
 			{
-				var result = ShowMessageBox(
+				var result = ShowMessageBox2(
 					owner: null,
 					"You are missing the needed firmware files to load this Rom\n\nWould you like to open the firmware manager now and configure your firmwares?",
 					e.Message,
-					MessageBoxButtons.YesNo,
-					MessageBoxIcon.Error);
-				if (result == DialogResult.Yes)
+					EMsgBoxIcon.Error);
+				if (result)
 				{
 					FirmwaresMenuItem_Click(null, e);
 					if (e.Retry)
@@ -3569,7 +3566,7 @@ namespace BizHawk.Client.EmuHawk
 					title = $"{e.AttemptedCoreLoad} load error";
 				}
 
-				this.ModalMessageBox(e.Message, title, MessageBoxButtons.OK, MessageBoxIcon.Error);
+				this.ModalMessageBox(e.Message, title, EMsgBoxIcon.Error);
 			}
 		}
 
@@ -3935,14 +3932,13 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (!FlushSaveRAM())
 				{
-					var msgRes = ShowMessageBox(
+					var msgRes = ShowMessageBox2(
 						owner: null,
 						"Failed flushing the game's Save RAM to your disk.\nClose without flushing Save RAM?",
 						"Directory IO Error",
-						MessageBoxButtons.YesNo,
-						MessageBoxIcon.Error);
+						EMsgBoxIcon.Error);
 
-					if (msgRes != DialogResult.Yes)
+					if (!msgRes)
 					{
 						return;
 					}
@@ -4002,7 +3998,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (result.Errors.Any())
 			{
-				ShowMessageBox(owner: null, string.Join("\n", result.Errors), "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				ShowMessageBox(owner: null, string.Join("\n", result.Errors), "Conversion error", EMsgBoxIcon.Error);
 			}
 
 			if (result.Warnings.Any())
@@ -4545,20 +4541,52 @@ namespace BizHawk.Client.EmuHawk
 
 		public IDialogController DialogController => this;
 
-		public IWin32Window SelfAsHandle => this;
-
-		public DialogResult ShowMessageBox(
+		public void ShowMessageBox(
 			IDialogParent/*?*/ owner,
 			string text,
 			string/*?*/ caption = null,
-			MessageBoxButtons? buttons = null,
-			MessageBoxIcon? icon = null)
-				=> MessageBox.Show(
-					owner?.SelfAsHandle,
-					text,
-					caption ?? string.Empty,
-					buttons ?? MessageBoxButtons.OK,
-					icon ?? MessageBoxIcon.None);
+			EMsgBoxIcon? icon = null)
+				=> this.ShowMessageBox(
+					owner: owner,
+					text: text,
+					caption: caption,
+					buttons: MessageBoxButtons.OK,
+					icon: icon);
+
+		public bool ShowMessageBox2(
+			IDialogParent/*?*/ owner,
+			string text,
+			string/*?*/ caption = null,
+			EMsgBoxIcon? icon = null,
+			bool useOKCancel = false)
+				=> this.ShowMessageBox(
+					owner: owner,
+					text: text,
+					caption: caption,
+					buttons: useOKCancel ? MessageBoxButtons.OKCancel : MessageBoxButtons.YesNo,
+					icon: icon) switch
+				{
+					DialogResult.OK => true,
+					DialogResult.Yes => true,
+					_ => false
+				};
+
+		public bool? ShowMessageBox3(
+			IDialogParent/*?*/ owner,
+			string text,
+			string/*?*/ caption = null,
+			EMsgBoxIcon? icon = null)
+				=> this.ShowMessageBox(
+					owner: owner,
+					text: text,
+					caption: caption,
+					buttons: MessageBoxButtons.YesNoCancel,
+					icon: icon) switch
+				{
+					DialogResult.Yes => true,
+					DialogResult.No => false,
+					_ => null
+				};
 
 		public void StartSound() => Sound.StartSound();
 		public void StopSound() => Sound.StopSound();

src/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs

@@ -34,16 +34,19 @@ namespace BizHawk.Client.EmuHawk
 
 		private readonly Func<bool> _libretroCoreChooserCallback;
 
+		public IDialogController DialogController { get; }
+
 		public AdvancedRomLoaderType Result;
 
 		public string SuggestedExtensionFilter;
 
-		public OpenAdvancedChooser(Config config, Func<CoreComm> createCoreComm, IGameInfo game, Func<bool> libretroCoreChooserCallback)
+		public OpenAdvancedChooser(IDialogController dialogController, Config config, Func<CoreComm> createCoreComm, IGameInfo game, Func<bool> libretroCoreChooserCallback)
 		{
 			_config = config;
 			_createCoreComm = createCoreComm;
 			_game = game;
 			_libretroCoreChooserCallback = libretroCoreChooserCallback;
+			DialogController = dialogController;
 
 			InitializeComponent();
 
@@ -101,7 +104,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (!bootstrap)
 				{
-					MessageBox.Show($"Couldn't load the selected Libretro core for analysis. It won't be available.\n\nError:\n\n{ex}");
+					DialogController.ShowMessageBox($"Couldn't load the selected Libretro core for analysis. It won't be available.\n\nError:\n\n{ex}");
 				}
 			}
 		}

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

@@ -11,12 +11,14 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class ControllerConfig : Form
+	public partial class ControllerConfig : Form, IDialogParent
 	{
 		private static readonly Dictionary<string, Lazy<Bitmap>> ControllerImages = new Dictionary<string, Lazy<Bitmap>>();
 		private readonly IEmulator _emulator;
 		private readonly Config _config;
 
+		public IDialogController DialogController { get; }
+
 		static ControllerConfig()
 		{
 			ControllerImages.Add("NES Controller", Properties.Resources.NesController);
@@ -176,11 +178,13 @@ namespace BizHawk.Client.EmuHawk
 		}
 
 		public ControllerConfig(
+			IDialogController dialogController,
 			IEmulator emulator,
 			Config config)
 		{
 			_emulator = emulator;
 			_config = config;
+			DialogController = dialogController;
 			
 			InitializeComponent();
 
@@ -430,8 +434,8 @@ namespace BizHawk.Client.EmuHawk
 		{
 			// this doesn't work anymore, as it stomps out any defaults for buttons that aren't currently active on the console
 			// there are various ways to fix it, each with its own semantic problems
-			var result = MessageBox.Show(this, "OK to overwrite defaults for current control scheme?", "Save Defaults", MessageBoxButtons.YesNo);
-			if (result == DialogResult.Yes)
+			var result = this.ModalMessageBox2("OK to overwrite defaults for current control scheme?", "Save Defaults");
+			if (result)
 			{
 				var cd = ConfigService.Load<DefaultControls>(Config.ControlDefaultPath);
 				cd.AllTrollers[_emulator.ControllerDefinition.Name] = new Dictionary<string, string>();

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

@@ -26,7 +26,7 @@ using BizHawk.Emulation.Common;
 // TODO - display some kind if [!] if you have a user-specified file which is known but defined as incompatible by the firmware DB
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class FirmwaresConfig : Form
+	public partial class FirmwaresConfig : Form, IDialogParent
 	{
 		private readonly IDictionary<string, string> _firmwareUserSpecifications;
 
@@ -36,6 +36,8 @@ namespace BizHawk.Client.EmuHawk
 
 		private readonly PathEntryCollection _pathEntries;
 
+		public IDialogController DialogController => _mainForm.DialogController;
+
 		private readonly FirmwareManager Manager;
 
 		// friendlier names than the system Ids
@@ -365,7 +367,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void TbbOrganize_Click(object sender, EventArgs e)
 		{
-			if (MessageBox.Show(this, "This is going to move/rename every automatically-selected firmware file under your configured firmwares directory to match our recommended organizational scheme (which is not super great right now). Proceed?", "Firmwares Organization Confirm", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+			if (!this.ModalMessageBox2("This is going to move/rename every automatically-selected firmware file under your configured firmwares directory to match our recommended organizational scheme (which is not super great right now). Proceed?", "Firmwares Organization Confirm", useOKCancel: true))
 			{
 				return;
 			}
@@ -478,8 +480,8 @@ namespace BizHawk.Client.EmuHawk
 							// check whether this file is currently outside of the global firmware directory
 							if (_currSelectorDir != firmwarePath)
 							{
-								var askMoveResult = MessageBox.Show(this, "The selected custom firmware does not reside in the root of the global firmware directory.\nDo you want to copy it there?", "Import Custom Firmware", MessageBoxButtons.YesNo);
-								if (askMoveResult == DialogResult.Yes)
+								var askMoveResult = this.ModalMessageBox2("The selected custom firmware does not reside in the root of the global firmware directory.\nDo you want to copy it there?", "Import Custom Firmware");
+								if (askMoveResult)
 								{
 									try
 									{
@@ -489,7 +491,7 @@ namespace BizHawk.Client.EmuHawk
 									}
 									catch (Exception ex)
 									{
-										MessageBox.Show(this, $"There was an issue copying the file. The customization has NOT been set.\n\n{ex.StackTrace}");
+										this.ModalMessageBox($"There was an issue copying the file. The customization has NOT been set.\n\n{ex.StackTrace}");
 										continue;
 									}
 								}
@@ -501,7 +503,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				catch (Exception ex)
 				{
-					MessageBox.Show(this, $"There was an issue during the process. The customization has NOT been set.\n\n{ex.StackTrace}");
+					this.ModalMessageBox($"There was an issue during the process. The customization has NOT been set.\n\n{ex.StackTrace}");
 					return;
 				}
 
@@ -602,7 +604,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (Owner is PathConfig)
 			{
-				MessageBox.Show("C-C-C-Combo Breaker!", "Nice try, but");
+				DialogController.ShowMessageBox("C-C-C-Combo Breaker!", "Nice try, but");
 				return;
 			}
 
@@ -725,7 +727,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (!string.IsNullOrEmpty(errors))
 			{
-				MessageBox.Show(errors, "Error importing these files");
+				DialogController.ShowMessageBox(errors, "Error importing these files");
 			}
 
 			if (didSomething)

src/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs

@@ -2,6 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Nintendo.Gameboy;
 
 namespace BizHawk.Client.EmuHawk
@@ -116,11 +117,11 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public static void DoCGBColorChooserFormDialog(IWin32Window parent, Gameboy.GambatteSettings s)
+		public static void DoCGBColorChooserFormDialog(IDialogParent parent, Gameboy.GambatteSettings s)
 		{
 			using var dlg = new CGBColorChooserForm();
 			dlg.LoadType(s);
-			var result = dlg.ShowDialog(parent);
+			var result = parent.ShowDialogAsChild(dlg);
 			if (result == DialogResult.OK)
 			{
 				s.CGBColors = dlg._type;

src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs

@@ -10,15 +10,18 @@ using BizHawk.Emulation.Cores.Nintendo.Gameboy;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class ColorChooserForm : Form
+	public partial class ColorChooserForm : Form, IDialogParent
 	{
 		private readonly Config _config;
 		private readonly IGameInfo _game;
 
-		private ColorChooserForm(Config config, IGameInfo game)
+		public IDialogController DialogController { get; }
+
+		private ColorChooserForm(IDialogController dialogController, Config config, IGameInfo game)
 		{
 			_config = config;
 			_game = game;
+			DialogController = dialogController;
 			InitializeComponent();
 			Icon = Properties.Resources.GambatteIcon;
 		}
@@ -236,13 +239,13 @@ namespace BizHawk.Client.EmuHawk
 			RefreshAllBackdrops();
 		}
 
-		public static void DoColorChooserFormDialog(IWin32Window parent, Config config, IGameInfo game, Gameboy.GambatteSettings s)
+		public static void DoColorChooserFormDialog(IDialogParent parent, Config config, IGameInfo game, Gameboy.GambatteSettings s)
 		{
-			using var dlg = new ColorChooserForm(config, game);
+			using var dlg = new ColorChooserForm(parent.DialogController, config, game);
 
 			dlg.SetAllColors(s.GBPalette);
 
-			var result = dlg.ShowDialog(parent);
+			var result = parent.ShowDialogAsChild(dlg);
 			if (result.IsOk())
 			{
 				int[] colors = new int[12];
@@ -272,7 +275,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (alert)
 				{
-					MessageBox.Show(this, "Error loading .pal file!");
+					this.ModalMessageBox("Error loading .pal file!");
 				}
 			}
 		}
@@ -293,7 +296,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			catch
 			{
-				MessageBox.Show(this, "Error saving .pal file!");
+				this.ModalMessageBox("Error saving .pal file!");
 			}
 		}
 

src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs

@@ -5,18 +5,23 @@ using BizHawk.Emulation.Cores.Nintendo.Gameboy;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class DGBPrefs : Form
+	public partial class DGBPrefs : Form, IDialogParent
 	{
 		private readonly Config _config;
 		private readonly IGameInfo _game;
 		private readonly IMovieSession _movieSession;
 
-		private DGBPrefs(Config config, IGameInfo game, IMovieSession movieSession)
+		public IDialogController DialogController { get; }
+
+		private DGBPrefs(IDialogController dialogController, Config config, IGameInfo game, IMovieSession movieSession)
 		{
 			_config = config;
 			_game = game;
 			_movieSession = movieSession;
+			DialogController = dialogController;
 			InitializeComponent();
+			gbPrefControl1.DialogParent = this;
+			gbPrefControl2.DialogParent = this;
 			Icon = Properties.Resources.DualIcon;
 		}
 
@@ -42,7 +47,7 @@ namespace BizHawk.Client.EmuHawk
 			var s = gambatte.GetSettings();
 			var ss = gambatte.GetSyncSettings();
 
-			using var dlg = new DGBPrefs(config, game, movieSession);
+			using var dlg = new DGBPrefs(mainForm.DialogController, config, game, movieSession);
 			dlg.PutSettings(s, ss);
 
 			dlg.gbPrefControl1.ColorGameBoy = gambatte.IsCGBMode(false);

src/BizHawk.Client.EmuHawk/config/GB/GBPrefControl.cs

@@ -22,6 +22,10 @@ namespace BizHawk.Client.EmuHawk
 		[Browsable(false)]
 		public bool ColorGameBoy { get; set; }
 
+		/// <remarks>TODO <see cref="UserControl">UserControls</see> can be <see cref="IDialogParent">IDialogParents</see> too, the modal should still be tied to the parent <see cref="Form"/> if used that way</remarks>
+		[Browsable(false)]
+		public IDialogParent DialogParent { private get; set; }
+
 		[Browsable(false)]
 		public bool SyncSettingsChanged { get; private set; }
 
@@ -62,11 +66,11 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (ColorGameBoy)
 			{
-				CGBColorChooserForm.DoCGBColorChooserFormDialog(ParentForm, _s);
+				CGBColorChooserForm.DoCGBColorChooserFormDialog(DialogParent, _s);
 			}
 			else
 			{
-				ColorChooserForm.DoColorChooserFormDialog(ParentForm, _config, _game, _s);
+				ColorChooserForm.DoColorChooserFormDialog(DialogParent, _config, _game, _s);
 			}
 		}
 

src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs

@@ -5,11 +5,15 @@ using BizHawk.Emulation.Cores.Nintendo.Gameboy;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class GBPrefs : Form
+	public partial class GBPrefs : Form, IDialogParent
 	{
-		private GBPrefs()
+		public IDialogController DialogController { get; }
+
+		private GBPrefs(IDialogController dialogController)
 		{
+			DialogController = dialogController;
 			InitializeComponent();
+			gbPrefControl1.DialogParent = this;
 			Icon = Properties.Resources.GambatteIcon;
 		}
 
@@ -18,7 +22,7 @@ namespace BizHawk.Client.EmuHawk
 			var s = gb.GetSettings();
 			var ss = gb.GetSyncSettings();
 
-			using var dlg = new GBPrefs();
+			using var dlg = new GBPrefs(mainForm.DialogController);
 			dlg.gbPrefControl1.PutSettings(config, game, movieSession, s, ss);
 			dlg.gbPrefControl1.ColorGameBoy = gb.IsCGBMode();
 			if (mainForm.ShowDialogAsChild(dlg).IsOk())

src/BizHawk.Client.EmuHawk/config/NDS/NdsSyncSettings.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Windows.Forms;
+
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
 
 namespace BizHawk.Client.EmuHawk
@@ -80,7 +82,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void DefaultBtn_Click(object sender, EventArgs e)
 		{
-			if (MessageBox.Show("Revert to and save default settings?", "default settings", MessageBoxButtons.OKCancel).IsOk())
+			if (_mainForm.DialogController.ShowMessageBox2("Revert to and save default settings?", "default settings", useOKCancel: true))
 			{
 				_mainForm.PutCoreSyncSettings(new MelonDS.MelonSyncSettings());
 				DialogResult = DialogResult.OK;

src/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs

@@ -3,16 +3,20 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Nintendo.NES;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class NESSyncSettingsForm : Form
+	public partial class NESSyncSettingsForm : Form, IDialogParent
 	{
 		private readonly IMainFormForConfig _mainForm;
 		private readonly DataTableDictionaryBind<string, string> _dataTableDictionary;
 		private readonly NES.NESSyncSettings _syncSettings;
 
+		public IDialogController DialogController { get; }
+
 		public NESSyncSettingsForm(
 			IMainFormForConfig mainForm,
 			NES.NESSyncSettings syncSettings,
@@ -20,6 +24,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			_mainForm = mainForm;
 			_syncSettings = syncSettings;
+			DialogController = mainForm.DialogController;
 			InitializeComponent();
 			HelpBtn.Image = Properties.Resources.Help;
 
@@ -93,12 +98,10 @@ namespace BizHawk.Client.EmuHawk
 
 		private void HelpBtn_Click(object sender, EventArgs e)
 		{
-			MessageBox.Show(
-				this,
+			this.ModalMessageBox(
 				"Board Properties are special per-mapper system settings.  They are only useful to advanced users creating Tool Assisted Superplays.  No support will be provided if you break something with them.",
 				"Help",
-				MessageBoxButtons.OK,
-				MessageBoxIcon.Information);
+				EMsgBoxIcon.Info);
 		}
 	}
 }

src/BizHawk.Client.EmuHawk/config/PSX/PSXOptions.cs

@@ -73,7 +73,7 @@ namespace BizHawk.Client.EmuHawk
 		private void BtnNiceDisplayConfig_Click(object sender, EventArgs e)
 		{
 			_dispSettingsSet = true;
-			MessageBox.Show("Finetuned Display Options will take effect if you OK from PSX Options");
+			_mainForm.DialogController.ShowMessageBox("Finetuned Display Options will take effect if you OK from PSX Options");
 		}
 
 		public static DialogResult DoSettingsDialog(IMainFormForConfig mainForm, Config config, Octoshock psx)
@@ -187,7 +187,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void LinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
 		{
-			MessageBox.Show($@"These options control BizHawk's Display Options to make it act quite a lot like Mednafen:
+			_mainForm.DialogController.ShowMessageBox($@"These options control BizHawk's Display Options to make it act quite a lot like Mednafen:
 
 {nameof(_config.DispManagerAR)} = System (Use emulator-recommended AR)
 {nameof(_config.DispFixAspectRatio)} = true (Maintain aspect ratio [letterbox main window as needed])

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

@@ -146,7 +146,7 @@ namespace BizHawk.Client.EmuHawk
 						{
 							if (Owner is FirmwaresConfig)
 							{
-								MessageBox.Show("C-C-C-Combo Breaker!", "Nice try, but");
+								_mainForm.DialogController.ShowMessageBox("C-C-C-Combo Breaker!", "Nice try, but");
 								return;
 							}
 

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

@@ -17,10 +17,13 @@ namespace BizHawk.Client.EmuHawk
 
 		public bool ApplyNewSoundDevice { get; private set; }
 
-		public SoundConfig(Config config, Func<ESoundOutputMethod, IEnumerable<string>> getDeviceNamesCallback)
+		public IDialogController DialogController { get; }
+
+		public SoundConfig(IDialogController dialogController, Config config, Func<ESoundOutputMethod, IEnumerable<string>> getDeviceNamesCallback)
 		{
 			_config = config;
 			_getDeviceNamesCallback = getDeviceNamesCallback;
+			DialogController = dialogController;
 			InitializeComponent();
 		}
 
@@ -68,7 +71,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (rbOutputMethodDirectSound.Checked && (int)BufferSizeNumeric.Value < 60)
 			{
-				MessageBox.Show("Buffer size must be at least 60 milliseconds for DirectSound.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				DialogController.ShowMessageBox("Buffer size must be at least 60 milliseconds for DirectSound.", "Error", EMsgBoxIcon.Error);
 				return;
 			}
 			var oldOutputMethod = _config.SoundOutputMethod;

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

@@ -1,6 +1,8 @@
 using System;
 using System.Linq;
 using System.Windows.Forms;
+
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Computers.SinclairSpectrum;
 
 namespace BizHawk.Client.EmuHawk
@@ -108,7 +110,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
-					MessageBox.Show("Invalid joystick configuration. \nDuplicates have automatically been changed to NULL.\n\nPlease review the configuration");
+					_mainForm.DialogController.ShowMessageBox("Invalid joystick configuration. \nDuplicates have automatically been changed to NULL.\n\nPlease review the configuration");
 				}
 			}
 			else

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

@@ -15,10 +15,13 @@ namespace BizHawk.Client.EmuHawk
 		private readonly IMovie _selectedMovie;
 		private readonly bool _readOnly;
 
-		public EditSubtitlesForm(IMovie movie, bool readOnly)
+		public IDialogController DialogController { get; }
+
+		public EditSubtitlesForm(IDialogController dialogController, IMovie movie, bool readOnly)
 		{
 			_selectedMovie = movie;
 			_readOnly = readOnly;
+			DialogController = dialogController;
 			InitializeComponent();
 			Icon = Properties.Resources.TAStudioIcon;
 		}
@@ -75,7 +78,7 @@ namespace BizHawk.Client.EmuHawk
 			var c = SubGrid.Rows[row].Cells[column];
 			var error = $"Unable to parse value: {c.Value}";
 			var caption = $"Parse Error Row {row} Column {column}";
-			MessageBox.Show(error, caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+			DialogController.ShowMessageBox(error, caption, EMsgBoxIcon.Error);
 		}
 
 		private void Ok_Click(object sender, EventArgs e)
@@ -222,11 +225,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			catch
 			{
-				MessageBox.Show(
-					"Could not determine movie fps, export failed.",
-					"Error",
-					MessageBoxButtons.OK,
-					MessageBoxIcon.Error);
+				DialogController.ShowMessageBox( "Could not determine movie fps, export failed.", "Error", EMsgBoxIcon.Error);
 
 				return;
 			}
@@ -236,7 +235,7 @@ namespace BizHawk.Client.EmuHawk
 			File.WriteAllText(fileName, str);
 
 			// Display success
-			MessageBox.Show($"Subtitles successfully exported to {fileName}.", "Success");
+			DialogController.ShowMessageBox($"Subtitles successfully exported to {fileName}.", "Success");
 		}
 
 		private void SubGrid_DefaultValuesNeeded(object sender, DataGridViewRowEventArgs e)

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

@@ -31,8 +31,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public IDialogController DialogController => _mainForm;
 
-		public IWin32Window SelfAsHandle => this;
-
 		public PlayMovie(
 			IMainFormForTools mainForm,
 			Config config,
@@ -498,7 +496,7 @@ namespace BizHawk.Client.EmuHawk
 			var indices = MovieView.SelectedIndices;
 			if (indices.Count > 0)
 			{
-				var s = new EditSubtitlesForm(_movieList[MovieView.SelectedIndices[0]], true);
+				var s = new EditSubtitlesForm(DialogController, _movieList[MovieView.SelectedIndices[0]], true);
 				s.Show();
 			}
 		}

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

@@ -20,8 +20,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public IDialogController DialogController => _mainForm;
 
-		public IWin32Window SelfAsHandle => this;
-
 		public RecordMovie(
 			IMainFormForTools mainForm,
 			Config config,
@@ -93,8 +91,8 @@ namespace BizHawk.Client.EmuHawk
 				var test = new FileInfo(path);
 				if (test.Exists)
 				{
-					var result = MessageBox.Show($"{path} already exists, overwrite?", "Confirm overwrite", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
-					if (result == DialogResult.Cancel)
+					var result = DialogController.ShowMessageBox2($"{path} already exists, overwrite?", "Confirm overwrite", EMsgBoxIcon.Warning, useOKCancel: true);
+					if (!result)
 					{
 						return;
 					}
@@ -157,7 +155,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else
 			{
-				MessageBox.Show("Please select a movie to record", "File selection error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				DialogController.ShowMessageBox("Please select a movie to record", "File selection error", EMsgBoxIcon.Error);
 			}
 		}
 

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

@@ -20,10 +20,13 @@ namespace BizHawk.Client.EmuHawk
 
 		private Thread _thread;
 
-		public BatchRun(Config config, Func<CoreComm> createCoreComm)
+		public IDialogController DialogController { get; }
+
+		public BatchRun(IDialogController dialogController, Config config, Func<CoreComm> createCoreComm)
 		{
 			_config = config;
 			_createCoreComm = createCoreComm;
+			DialogController = dialogController;
 			InitializeComponent();
 		}
 
@@ -57,13 +60,13 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (_thread != null)
 			{
-				MessageBox.Show("Old one still running!");
+				DialogController.ShowMessageBox("Old one still running!");
 			}
 			else
 			{
 				if (listBox1.Items.Count == 0)
 				{
-					MessageBox.Show("No files!");
+					DialogController.ShowMessageBox("No files!");
 				}
 				else
 				{
@@ -99,7 +102,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			catch (Exception e)
 			{
-				MessageBox.Show(e.ToString(), "The Whole Thing Died!");
+				DialogController.ShowMessageBox(e.ToString(), "The Whole Thing Died!");
 				this.Invoke(() => label3.Text = "Deaded!");
 			}
 			this.Invoke(() => _thread = null);
@@ -115,7 +118,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (_thread != null)
 			{
-				MessageBox.Show("Can't close while task is running!");
+				DialogController.ShowMessageBox("Can't close while task is running!");
 				e.Cancel = true;
 			}
 		}
@@ -137,7 +140,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else
 			{
-				MessageBox.Show("No results to save!");
+				DialogController.ShowMessageBox("No results to save!");
 			}
 		}
 	}

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

@@ -216,8 +216,8 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			// TODO - I don't like this system. It's hard to figure out how to use it. It should be done in multiple passes.
-			var result = DialogController.ShowMessageBox("Save changes to CDL session?", "CDL Auto Save", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-			if (result == DialogResult.No)
+			var result = DialogController.ShowMessageBox2("Save changes to CDL session?", "CDL Auto Save", EMsgBoxIcon.Question);
+			if (!result)
 			{
 				ShutdownCDL();
 				return true;
@@ -312,9 +312,8 @@ namespace BizHawk.Client.EmuHawk
 			//take care not to clobber an existing CDL
 			if (_cdl != null)
 			{
-				var result = this.ModalMessageBox("OK to create new CDL?", "Query", MessageBoxButtons.YesNo);
-				if (result != DialogResult.Yes)
-					return;
+				var result = this.ModalMessageBox2("OK to create new CDL?", "Query");
+				if (!result) return;
 			}
 
 			NewFileLogic();
@@ -334,9 +333,8 @@ namespace BizHawk.Client.EmuHawk
 			//take care not to clobber an existing CDL
 			if (_cdl != null)
 			{
-				var result = this.ModalMessageBox("OK to load new CDL?", "Query", MessageBoxButtons.YesNo);
-				if (result != DialogResult.Yes)
-					return;
+				var result = this.ModalMessageBox2("OK to load new CDL?", "Query");
+				if (!result) return;
 			}
 
 			LoadFile(file.FullName);
@@ -435,8 +433,8 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else
 			{
-				var result = this.ModalMessageBox("OK to clear CDL?", "Query", MessageBoxButtons.YesNo);
-				if (result == DialogResult.Yes)
+				var result = this.ModalMessageBox2("OK to clear CDL?", "Query");
+				if (result)
 				{
 					_cdl.ClearData();
 					UpdateDisplay(true);

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

@@ -29,8 +29,6 @@ namespace BizHawk.Client.EmuHawk
 		private string _sortedColumn;
 		private bool _sortReverse;
 
-		public override IWin32Window SelfAsHandle => Owner ?? this; //TODO necessary? --yoshi
-
 		protected override string WindowTitleStatic => "Cheats";
 
 		public Cheats()

src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs

@@ -22,8 +22,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public IDialogController DialogController => MainForm;
 
-		public IWin32Window SelfAsHandle => this;
-
 		public BreakpointControl()
 		{
 			InitializeComponent();

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

@@ -1,5 +1,5 @@
 using System;
-using System.Windows.Forms;
+
 using BizHawk.Emulation.Common;
 using BizHawk.Client.Common;
 using BizHawk.Client.Common.cheats;
@@ -50,12 +50,12 @@ namespace BizHawk.Client.EmuHawk
 					}
 					else
 					{
-						DialogController.ShowMessageBox(result.Error, "Input Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+						DialogController.ShowMessageBox(result.Error, "Input Error", EMsgBoxIcon.Error);
 					}
 				}
 				catch (Exception ex)
 				{
-					DialogController.ShowMessageBox($"An Error occured: {ex.GetType()}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					DialogController.ShowMessageBox($"An Error occured: {ex.GetType()}", "Error", EMsgBoxIcon.Error);
 				}
 			}
 
@@ -66,8 +66,8 @@ namespace BizHawk.Client.EmuHawk
 		private void BtnClear_Click(object sender, EventArgs e)
 		{
 			// Clear old Inputs
-			var result = DialogController.ShowMessageBox("Are you sure you want to clear this form?", "Clear Form", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-			if (result == DialogResult.Yes)
+			var result = DialogController.ShowMessageBox2("Are you sure you want to clear this form?", "Clear Form", EMsgBoxIcon.Question);
+			if (result)
 			{
 				txtDescription.Clear();
 				txtCheat.Clear();

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

@@ -1679,7 +1679,7 @@ namespace BizHawk.Client.EmuHawk
 						Common.WatchDisplayType.Hex,
 						BigEndian));
 
-				using var poke = new RamPoke(watches, MainForm.CheatList)
+				using var poke = new RamPoke(DialogController, watches, MainForm.CheatList)
 				{
 					InitialLocation = this.ChildPointToScreen(AddressLabel),
 					ParentTool = this

src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs

@@ -98,13 +98,13 @@ namespace BizHawk.Client.EmuHawk
 				return true;
 			}
 
-			DialogResult result = DialogController.ShowMessageBox("You have unsaved macro(s). Do you wish to save them?", "Save?", MessageBoxButtons.YesNoCancel);
-			if (result == DialogResult.Cancel)
+			var result = DialogController.ShowMessageBox3("You have unsaved macro(s). Do you wish to save them?", "Save?");
+			if (result == null)
 			{
 				return false;
 			}
 
-			if (result == DialogResult.No)
+			if (result == false)
 			{
 				return true;
 			}
@@ -250,7 +250,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void DummyLoadMacro(string path)
 		{
-			MovieZone loadZone = new MovieZone(path, Emulator, MovieSession, Tools);
+			MovieZone loadZone = new MovieZone(path, MainForm, Emulator, MovieSession, Tools);
 			_zones.Add(loadZone);
 			ZonesList.Items.Add($"{loadZone.Name} - length: {loadZone.Length}");
 		}
@@ -307,7 +307,7 @@ namespace BizHawk.Client.EmuHawk
 			if (this.ShowDialogWithTempMute(dialog) != DialogResult.OK) return null;
 
 			Config.RecentMacros.Add(dialog.FileName);
-			return new MovieZone(dialog.FileName, emulator ?? Emulator, MovieSession, tools ?? Tools);
+			return new MovieZone(dialog.FileName, MainForm, emulator ?? Emulator, MovieSession, tools ?? Tools);
 		}
 	}
 }

src/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs

@@ -223,7 +223,7 @@ namespace BizHawk.Client.EmuHawk
 			File.AppendAllLines(fileName, _log);
 		}
 
-		public MovieZone(string fileName, IEmulator emulator, IMovieSession movieSession, ToolManager tools)
+		public MovieZone(string fileName, IDialogController dialogController, IEmulator emulator, IMovieSession movieSession, ToolManager tools)
 			: this(emulator, tools, movieSession)
 		{
 			if (!File.Exists(fileName))
@@ -246,7 +246,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (!emuKeys.Contains(macro))
 				{
-					System.Windows.Forms.MessageBox.Show($"The selected macro is not compatible with the current emulator core.\nMacro controller: {readText[1]}\nMacro player count: {readText[2]}", "Error");
+					dialogController.ShowMessageBox($"The selected macro is not compatible with the current emulator core.\nMacro controller: {readText[1]}\nMacro player count: {readText[2]}", "Error");
 					return;
 				}
 			}

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

@@ -84,8 +84,8 @@ namespace BizHawk.Client.EmuHawk
 			fileInfo = new FileInfo(NameBox.Text);
 			if (fileInfo.Exists)
 			{
-				var result = this.ModalMessageBox("File already exists, overwrite?", "File exists", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
-				if (result != DialogResult.OK)
+				var result = this.ModalMessageBox2("File already exists, overwrite?", "File exists", EMsgBoxIcon.Warning, useOKCancel: true);
+				if (!result)
 				{
 					return false;
 				}

src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskFileSelector.cs

@@ -15,8 +15,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public IDialogController DialogController { get; }
 
-		public IWin32Window SelfAsHandle => this;
-
 		public string SystemString { get; set; } = "";
 
 		public string Path

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

@@ -47,8 +47,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public IDialogController DialogController => Tastudio.MainForm;
 
-		public IWin32Window SelfAsHandle => this;
-
 		public BookmarksBranchesBox()
 		{
 			InitializeComponent();

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

@@ -11,8 +11,11 @@ namespace BizHawk.Client.EmuHawk
 		private ZwinderStateManagerSettings _settings;
 		private readonly bool _isDefault;
 
-		public GreenzoneSettings(ZwinderStateManagerSettings settings, Action<ZwinderStateManagerSettings, bool> saveSettings, bool isDefault)
+		public IDialogController DialogController { get; }
+
+		public GreenzoneSettings(IDialogController dialogController, ZwinderStateManagerSettings settings, Action<ZwinderStateManagerSettings, bool> saveSettings, bool isDefault)
 		{
+			DialogController = dialogController;
 			InitializeComponent();
 			Icon = Properties.Resources.TAStudioIcon;
 
@@ -31,9 +34,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void OkBtn_Click(object sender, EventArgs e)
 		{
-			bool keep = false;
-			if (!_isDefault)
-				keep = (MessageBox.Show("Attempt to keep old states?", "Keep old states?", MessageBoxButtons.YesNo) == DialogResult.Yes);
+			var keep = !_isDefault && DialogController.ShowMessageBox2("Attempt to keep old states?", "Keep old states?");
 			_saveSettings(_settings, keep);
 			Close();
 		}

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

@@ -17,8 +17,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public IDialogController DialogController => Tastudio.MainForm;
 
-		public IWin32Window SelfAsHandle => this;
-
 		public MarkerControl()
 		{
 			InitializeComponent();

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

@@ -132,8 +132,8 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else if (filename.EndsWith(MovieService.StandardMovieExtension))
 			{
-				var result1 = DialogController.ShowMessageBox("This is a regular movie, a new project must be created from it to use in TAStudio\nProceed?", "Convert movie", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
-				if (result1.IsOk())
+				var result1 = DialogController.ShowMessageBox2("This is a regular movie, a new project must be created from it to use in TAStudio\nProceed?", "Convert movie", EMsgBoxIcon.Question, useOKCancel: true);
+				if (result1)
 				{
 					_initializing = true; // Starting a new movie causes a core reboot
 					WantsToControlReboot = false;
@@ -150,7 +150,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else
 			{
-				DialogController.ShowMessageBox("This is not a BizHawk movie!", "Movie load error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				DialogController.ShowMessageBox("This is not a BizHawk movie!", "Movie load error", EMsgBoxIcon.Error);
 			}
 		}
 
@@ -284,7 +284,7 @@ namespace BizHawk.Client.EmuHawk
 				|| Emulator is Emulation.Cores.Nintendo.Gameboy.Gameboy
 				|| Emulator is Emulation.Cores.Nintendo.SubGBHawk.SubGBHawk)
 			{
-				DialogController.ShowMessageBox("This core requires emulation to be on the last frame when writing the movie, otherwise movie length will appear incorrect.\nTAStudio can't handle this, so Export BK2, play it to the end, and then Save Movie.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				DialogController.ShowMessageBox("This core requires emulation to be on the last frame when writing the movie, otherwise movie length will appear incorrect.\nTAStudio can't handle this, so Export BK2, play it to the end, and then Save Movie.", "Warning", EMsgBoxIcon.Warning);
 			}
 
 			var bk2 = CurrentTasMovie.ToBk2();
@@ -740,8 +740,8 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (TasView.SelectedRows.Count() > 50)
 			{
-				var result = DialogController.ShowMessageBox("Are you sure you want to add more than 50 markers?", "Add markers", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
-				if (result != DialogResult.OK)
+				var result = DialogController.ShowMessageBox2("Are you sure you want to add more than 50 markers?", "Add markers", EMsgBoxIcon.Question, useOKCancel: true);
+				if (!result)
 				{
 					return;
 				}
@@ -775,7 +775,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (!Emulator.DeterministicEmulation)
 			{
-				if (DialogController.ShowMessageBox("The emulator is not deterministic. It might fail even if the difference isn't enough to cause a desync.\nContinue with check?", "Not Deterministic", MessageBoxButtons.YesNo) == DialogResult.No)
+				if (!DialogController.ShowMessageBox2("The emulator is not deterministic. It might fail even if the difference isn't enough to cause a desync.\nContinue with check?", "Not Deterministic"))
 				{
 					return;
 				}
@@ -795,7 +795,7 @@ namespace BizHawk.Client.EmuHawk
 
 					if (!state.SequenceEqual(greenZone))
 					{
-						if (DialogController.ShowMessageBox($"Bad data between frames {lastState} and {Emulator.Frame}. Save the relevant state (raw data)?", "Integrity Failed!", MessageBoxButtons.YesNo) == DialogResult.Yes)
+						if (DialogController.ShowMessageBox2($"Bad data between frames {lastState} and {Emulator.Frame}. Save the relevant state (raw data)?", "Integrity Failed!"))
 						{
 							var sfd = new SaveFileDialog { FileName = "integrity.fresh" };
 							if (sfd.ShowDialog().IsOk())
@@ -849,7 +849,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				catch
 				{
-					DialogController.ShowMessageBox("Invalid Entry.", "Input Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					DialogController.ShowMessageBox("Invalid Entry.", "Input Error", EMsgBoxIcon.Error);
 				}
 
 				if (val > 0)
@@ -1035,6 +1035,7 @@ namespace BizHawk.Client.EmuHawk
 		private void StateHistorySettingsMenuItem_Click(object sender, EventArgs e)
 		{
 			new GreenzoneSettings(
+				DialogController,
 				new ZwinderStateManagerSettings(CurrentTasMovie.TasStateManager.Settings),
 				(s, k) => { CurrentTasMovie.TasStateManager.UpdateSettings(s, k); },
 				false)
@@ -1052,13 +1053,14 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SubtitlesMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = new EditSubtitlesForm(CurrentTasMovie, false);
+			var form = new EditSubtitlesForm(DialogController, CurrentTasMovie, false);
 			form.ShowDialog();
 		}
 
 		private void DefaultStateSettingsMenuItem_Click(object sender, EventArgs e)
 		{
 			new GreenzoneSettings(
+				DialogController,
 				new ZwinderStateManagerSettings(Config.Movies.DefaultTasStateManagerSettings),
 				(s, k) => { Config.Movies.DefaultTasStateManagerSettings = s; },
 				true)

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

@@ -216,16 +216,15 @@ namespace BizHawk.Client.EmuHawk
 				{
 					changesString = "The current movie has unsaved changes. Would you like to save before closing it?";
 				}
-				var result = DialogController.ShowMessageBox(
+				var result = DialogController.ShowMessageBox3(
 					"TAStudio will create a new project file from the current movie.\n\n" + changesString,
 					"Convert movie",
-					MessageBoxButtons.YesNoCancel,
-					MessageBoxIcon.Question);
-				if (result.Equals(DialogResult.Yes))
+					EMsgBoxIcon.Question);
+				if (result == true)
 				{
 					MovieSession.Movie.Save();
 				}
-				else if (result.Equals(DialogResult.Cancel))
+				else if (result == null)
 				{
 					return false;
 				}
@@ -731,7 +730,7 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			var loadZone = new MovieZone(path, Emulator, MovieSession, Tools)
+			var loadZone = new MovieZone(path, MainForm, Emulator, MovieSession, Tools)
 			{
 				Start = TasView.FirstSelectedIndex.Value
 			};

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

@@ -25,8 +25,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public IDialogController DialogController => MainForm;
 
-		public virtual IWin32Window SelfAsHandle => this;
-
 		public virtual bool AskSaveChanges() => true;
 
 		public virtual void Restart() {}

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

@@ -634,12 +634,10 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (!skipExtToolWarning)
 				{
-					if (_owner.ShowMessageBox(
+					if (!_owner.ShowMessageBox2(
 						"Are you sure want to load this external tool?\r\nAccept ONLY if you trust the source and if you know what you're doing. In any other case, choose no.",
 						"Confirm loading",
-						MessageBoxButtons.YesNo,
-						MessageBoxIcon.Question)
-							!= DialogResult.Yes)
+						EMsgBoxIcon.Question))
 					{
 						return null;
 					}
@@ -650,18 +648,18 @@ namespace BizHawk.Client.EmuHawk
 					tool = Activator.CreateInstanceFrom(dllPath, toolTypeName ?? "BizHawk.Client.EmuHawk.CustomMainForm").Unwrap() as IExternalToolForm;
 					if (tool == null)
 					{
-						_owner.ShowMessageBox($"It seems that the object CustomMainForm does not implement {nameof(IExternalToolForm)}. Please review the code.", "No, no, no. Wrong Way !", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+						_owner.ShowMessageBox($"It seems that the object CustomMainForm does not implement {nameof(IExternalToolForm)}. Please review the code.", "No, no, no. Wrong Way !", EMsgBoxIcon.Warning);
 						return null;
 					}
 				}
 				catch (MissingMethodException)
 				{
-					_owner.ShowMessageBox("It seems that the object CustomMainForm does not have a public default constructor. Please review the code.", "No, no, no. Wrong Way !", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+					_owner.ShowMessageBox("It seems that the object CustomMainForm does not have a public default constructor. Please review the code.", "No, no, no. Wrong Way !", EMsgBoxIcon.Warning);
 					return null;
 				}
 				catch (TypeLoadException)
 				{
-					_owner.ShowMessageBox("It seems that the object CustomMainForm does not exists. Please review the code.", "No, no, no. Wrong Way !", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+					_owner.ShowMessageBox("It seems that the object CustomMainForm does not exists. Please review the code.", "No, no, no. Wrong Way !", EMsgBoxIcon.Warning);
 					return null;
 				}
 			}

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

@@ -13,14 +13,18 @@ namespace BizHawk.Client.EmuHawk
 	{
 		private readonly List<Watch> _watchList;
 		private readonly CheatCollection _cheats;
+
+		public IDialogController DialogController { get; }
+
 		public Point InitialLocation { get; set; } = new Point(0, 0);
 
-		public RamPoke(IEnumerable<Watch> watches, CheatCollection cheats)
+		public RamPoke(IDialogController dialogController, IEnumerable<Watch> watches, CheatCollection cheats)
 		{
 			_watchList = watches
 				.Where(w => !w.IsSeparator) // Weed out separators just in case
 				.ToList();
 			_cheats = cheats;
+			DialogController = dialogController;
 			InitializeComponent();
 			Icon = Properties.Resources.PokeIcon;
 		}
@@ -29,7 +33,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void UnSupportedConfiguration()
 		{
-			MessageBox.Show("RAM Poke does not support mixed types", "Unsupported Options", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			DialogController.ShowMessageBox("RAM Poke does not support mixed types", "Unsupported Options", EMsgBoxIcon.Error);
 			Close();
 		}
 

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

@@ -863,7 +863,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (SelectedIndices.Any())
 			{
-				var poke = new RamPoke(SelectedIndices.Select(t => _searches[t]), MainForm.CheatList)
+				var poke = new RamPoke(DialogController, SelectedIndices.Select(t => _searches[t]), MainForm.CheatList)
 				{
 					InitialLocation = this.ChildPointToScreen(WatchListView)
 				};

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

@@ -771,7 +771,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (SelectedWatches.Any())
 			{
-				var poke = new RamPoke(SelectedWatches, MainForm.CheatList)
+				var poke = new RamPoke(DialogController, SelectedWatches, MainForm.CheatList)
 				{
 					InitialLocation = this.ChildPointToScreen(WatchListView)
 				};