Reverting changes to gui

Author: SergioMartin86

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

@@ -954,12 +954,9 @@ private void Ti83PaletteMenuItem_Click(object sender, EventArgs e)
 				_ => DialogResult.None,
 			};
 			if (result.IsOk()) AddOnScreenMessage("Palette settings saved");
-		}
-
-		private static readonly FilesystemFilterSet DOSBoxHDDImageFilterSet = new(new FilesystemFilter("DOSBox HDD Images", new[] { "bin" }))
-		{
-			AppendAllFilesEntry = false,
-		};
+		}
+
+
 
 		private static readonly FilesystemFilterSet ZXStateFilesFSFilterSet = new(new FilesystemFilter("ZX-State files", new[] { "szx" }))
 		{
@@ -1197,12 +1194,9 @@ ToolStripMenuItemEx CreateCoreSubmenu(VSystemCategory cat, string coreName, para
 			items.Add(CreateCoreSubmenu(VSystemCategory.Handhelds, CoreNames.Cygne, CreateGenericCoreConfigItem<WonderSwan>(CoreNames.Cygne)));
 
 			// DOSBox
-			var dosboxExportHDDItem = CreateSettingsItem("Export Hard Disk Drive...", N64CircularAnalogRangeMenuItem_Click);
-			var dosboxSubmenu = CreateCoreSubmenu(VSystemCategory.PCs, CoreNames.DOSBox, CreateGenericCoreConfigItem<DOSBox>(CoreNames.DOSBox));
-			dosboxSubmenu.DropDownOpened += (_, _) => dosboxExportHDDItem.Checked = true;
-			items.Add(dosboxSubmenu);
-
-			// DSDA-Doom
+			items.Add(CreateCoreSubmenu(VSystemCategory.PCs, CoreNames.DOSBox, CreateGenericCoreConfigItem<DOSBox>(CoreNames.DOSBox)));
+
+			// DSDA-Doom
 			items.Add(CreateCoreSubmenu(VSystemCategory.Other, CoreNames.DSDA, CreateGenericCoreConfigItem<DSDA>(CoreNames.DSDA)));
 
 			// Emu83

src/BizHawk.Client.EmuHawk/MainForm.cs

@@ -35,12 +35,13 @@
 using BizHawk.Emulation.Cores.Nintendo.NES;
 using BizHawk.Emulation.Cores.Nintendo.SNES;
 
+using BizHawk.Emulation.DiscSystem;
+
 using BizHawk.Client.EmuHawk.ToolExtensions;
 using BizHawk.Client.EmuHawk.CoreExtensions;
 using BizHawk.Client.EmuHawk.CustomControls;
 using BizHawk.Common.CollectionExtensions;
 using BizHawk.WinForms.Controls;
-using BizHawk.Emulation.Cores.Computers.SinclairSpectrum;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -69,17 +70,6 @@ private void MainForm_Load(object sender, EventArgs e)
 		{
 			UpdateWindowTitle();
 
-			Slot1StatusButton.Tag = SelectSlot1MenuItem.Tag = 1;
-			Slot2StatusButton.Tag = SelectSlot2MenuItem.Tag = 2;
-			Slot3StatusButton.Tag = SelectSlot3MenuItem.Tag = 3;
-			Slot4StatusButton.Tag = SelectSlot4MenuItem.Tag = 4;
-			Slot5StatusButton.Tag = SelectSlot5MenuItem.Tag = 5;
-			Slot6StatusButton.Tag = SelectSlot6MenuItem.Tag = 6;
-			Slot7StatusButton.Tag = SelectSlot7MenuItem.Tag = 7;
-			Slot8StatusButton.Tag = SelectSlot8MenuItem.Tag = 8;
-			Slot9StatusButton.Tag = SelectSlot9MenuItem.Tag = 9;
-			Slot0StatusButton.Tag = SelectSlot0MenuItem.Tag = 10;
-
 			{
 				for (int i = 1; i <= WINDOW_SCALE_MAX; i++)
 				{
@@ -2881,12 +2871,6 @@ private void ToggleCaptureMouse()
 			AddOnScreenMessage($"Capture Mouse {(Config.CaptureMouse ? "enabled" : "disabled")}");
 		}
 
-		private void ToggleStayOnTop()
-		{
-			TopMost = Config.MainFormStayOnTop = !Config.MainFormStayOnTop;
-			AddOnScreenMessage($"Stay on Top {(Config.MainFormStayOnTop ? "enabled" : "disabled")}");
-		}
-
 		private void VsyncMessage()
 		{
 			AddOnScreenMessage($"Display Vsync set to {(Config.VSync ? "on" : "off")}");
@@ -4798,11 +4782,7 @@ private void StartSingleInstanceServer()
 			}
 
 			// Create pipe and start the async connection wait
-#if NET5_0_OR_GREATER
-			_singleInstanceServer = NamedPipeServerStreamAcl.Create(
-#else
 			_singleInstanceServer = new NamedPipeServerStream(
-#endif
 					"pipe-{84125ACB-F570-4458-9748-321F887FE795}",
 					PipeDirection.In,
 					1,
@@ -4906,33 +4886,6 @@ private void OpenRetroAchievements()
 		private bool _hasXFixes;
 		private readonly IntPtr[] _pointerBarriers = new IntPtr[4];
 
-		private void dOSToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-
-		}
-
-		private void exportHDDImageToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			try
-			{
-				var result = this.ShowFileSaveDialog(
-					discardCWDChange: true,
-					fileExt: "bin",
-					filter: DOSBoxHDDImageFilterSet,
-					initDir: Config.PathEntries.ToolsAbsolutePath());
-				if (result is not null)
-				{
-					var speccy = (DOSBox) Emulator;
-					var snap = speccy.getHDDContents();
-					File.WriteAllBytes(result, snap);
-				}
-			}
-			catch (Exception)
-			{
-				// ignored
-			}
-		}
-
 #if false
 		private delegate void CaptureWithConfineDelegate(Control control, Control confineWindow);
 
@@ -4954,23 +4907,13 @@ private void CaptureMouse(bool wantCapture)
 				_presentationPanel.Control.Cursor = Properties.Resources.BlankCursor;
 				_cursorHidden = true;
 				BringToFront();
-
-				if (Config.MainFormMouseCaptureForcesTopmost)
-				{
-					TopMost = true;
-				}
 			}
 			else
 			{
 				Cursor.Clip = Rectangle.Empty;
 				Cursor.Show();
 				_presentationPanel.Control.Cursor = Cursors.Default;
 				_cursorHidden = false;
-
-				if (Config.MainFormMouseCaptureForcesTopmost)
-				{
-					TopMost = Config.MainFormStayOnTop;
-				}
 			}
 
 			// Cursor.Clip is a no-op on Linux, so we need this too

src/BizHawk.Emulation.Cores/Computers/DOS/DOSBox.cs

@@ -75,7 +75,7 @@ public DOSBox(CoreLoadParameters<object, SyncSettings> lp)
 			// Parsing rom files
 			foreach (var file in _romAssets)
 			{
-				switch (Path.GetExtension(file.RomPath))
+				switch (file.Extension.ToLowerInvariant())
 				{
 					case ".ima":
 					case ".img":
@@ -107,7 +107,10 @@ public DOSBox(CoreLoadParameters<object, SyncSettings> lp)
 			// If no formatted hard disk size provided, check if provided as ROM
 			if (_hardDiskImageFileSize == 0 && _hardDiskImageFile != null)
 				_hardDiskImageFileSize = (ulong) _hardDiskImageFile.FileData.Length;
-		    
+
+
+			uint hddRequiredMemory = (uint) ((_hardDiskImageFileSize) / 1024ul);
+			Console.WriteLine($"Allocating {_hardDiskImageFileSize} bytes = {hddRequiredMemory}kb to host the HDD");
 
 			_CDReadCallback = CDRead;
 			_libDOSBox = PreInit<LibDOSBox>(new WaterboxOptions
@@ -303,6 +306,9 @@ public DOSBox(CoreLoadParameters<object, SyncSettings> lp)
 				throw new InvalidOperationException("Core rejected the rom!");
 			}
 
+			// Closing HDD read only file now, if opened
+			if (_hardDiskImageFileSize > 0) _exe.RemoveReadonlyFile(FileNames.HDD);
+
 			// Setting framerate, if forced; otherwise, use the default.
 			// The default is necessary because DOSBox does not populate framerate value on init. Only after the first frame run
 			if (_syncSettings.forceFPSNumerator > 0 && _syncSettings.forceFPSDenominator > 0)
@@ -604,14 +610,5 @@ private static class FileNames
 			public const string HDD = "HardDiskDrive";
 		}
 
-		public byte[] getHDDContents()
-		{
-			if (_hardDiskImageFileSize == 0) throw new Exception($"Trying to export HDD contents but no HDD was defined");
-
-			var hddSize = _libDOSBox.get_hdd_size();
-			byte[] hddArray = new byte[hddSize];
-			_libDOSBox.get_hdd(hddArray);
-			return hddArray;
-		}
 	}
 }