From e513a856b7999012a4abba678d53c39696afdbe5 Mon Sep 17 00:00:00 2001
From: feos <feykomylce@gmail.com>
Date: Thu, 29 May 2025 17:30:29 +0300
Subject: [PATCH] release dosbox and add dos/doom to paths alphabetize
 _displayNameLookup

---
 .../config/PathEntryCollection.cs             | 76 ++++++++++---------
 .../Computers/DOS/DOSBox.cs                   |  3 +-
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/BizHawk.Client.Common/config/PathEntryCollection.cs b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
index 11cc7d608c..33259e9863 100644
--- a/src/BizHawk.Client.Common/config/PathEntryCollection.cs
+++ b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
@@ -21,48 +21,52 @@ namespace BizHawk.Client.Common
 		private static readonly Dictionary<string, string> _displayNameLookup = new()
 		{
 			[GLOBAL] = "Global",
-			[VSystemID.Raw.Amiga] = "Amiga",
-			[VSystemID.Raw.Arcade] = "Arcade",
-			[VSystemID.Raw.INTV] = "Intellivision",
-			[VSystemID.Raw.NES] = "NES",
-			[VSystemID.Raw.SNES] = "SNES",
-			[VSystemID.Raw.GBA] = "GBA",
-			[VSystemID.Raw.SMS] = "SMS",
-			[VSystemID.Raw.GG] = "GG",
-			[VSystemID.Raw.SG] = "SG",
-			[VSystemID.Raw.GEN] = "Genesis",
-			[COMBINED_SYSIDS_PCE] = "PC Engine",
 			[COMBINED_SYSIDS_GB] = "Gameboy",
-			[VSystemID.Raw.GBL] = "Gameboy Link",
-			[VSystemID.Raw.TI83] = "TI83",
+			[COMBINED_SYSIDS_PCE] = "PC Engine",
+			[VSystemID.Raw.Amiga] = "Amiga",
+			[VSystemID.Raw.AmstradCPC] = "Amstrad CPC",
+			[VSystemID.Raw.AppleII] = "Apple II",
+			[VSystemID.Raw.Arcade] = "Arcade",
 			[VSystemID.Raw.A26] = "Atari 2600",
 			[VSystemID.Raw.A78] = "Atari 7800",
 			[VSystemID.Raw.C64] = "Commodore 64",
-			[VSystemID.Raw.ZXSpectrum] = "Sinclair ZX Spectrum",
-			[VSystemID.Raw.AmstradCPC] = "Amstrad CPC",
-			[VSystemID.Raw.PSX] = "Playstation",
-			[VSystemID.Raw.Coleco] = "Coleco",
-			[VSystemID.Raw.N64] = "N64",
-			[VSystemID.Raw.SAT] = "Saturn",
-			[VSystemID.Raw.WSWAN] = "WonderSwan",
-			[VSystemID.Raw.Jaguar] = "Jaguar",
-			[VSystemID.Raw.Lynx] = "Lynx",
-			[VSystemID.Raw.AppleII] = "Apple II",
-			[VSystemID.Raw.Libretro] = "Libretro",
-			[VSystemID.Raw.VB] = "VB",
-			[VSystemID.Raw.NGP] = "NGP",
-			[VSystemID.Raw.PCFX] = "PCFX",
 			[VSystemID.Raw.ChannelF] = "Fairchild Channel F",
-			[VSystemID.Raw.VEC] = "VEC",
-			[VSystemID.Raw.O2] = "O2",
+			[VSystemID.Raw.Coleco] = "Coleco",
+			[VSystemID.Raw.Doom] = "Doom",
+			[VSystemID.Raw.DOS] = "DOS",
+			[VSystemID.Raw.Coleco] = "Coleco",
+			[VSystemID.Raw.GBA] = "GBA",
+			[VSystemID.Raw.GBL] = "Gameboy Link",
+			[VSystemID.Raw.GEN] = "Genesis",
+			[VSystemID.Raw.GG] = "GG",
+			[VSystemID.Raw.GGL] = "Dual Game Gear",
+			[VSystemID.Raw.INTV] = "Intellivision",
+			[VSystemID.Raw.Jaguar] = "Jaguar",
+			[VSystemID.Raw.Libretro] = "Libretro",
+			[VSystemID.Raw.Lynx] = "Lynx",
 			[VSystemID.Raw.MSX] = "MSX",
+			[VSystemID.Raw.N3DS] = "3DS",
+			[VSystemID.Raw.N64] = "N64",
+			[VSystemID.Raw.NDS] = "NDS",
+			[VSystemID.Raw.NES] = "NES",
+			[VSystemID.Raw.NGP] = "NGP",
+			[VSystemID.Raw.O2] = "O2",
+			[VSystemID.Raw.Panasonic3DO] = "3DO",
+			[VSystemID.Raw.PCFX] = "PCFX",
+			[VSystemID.Raw.PSX] = "Playstation",
+			[VSystemID.Raw.SAT] = "Saturn",
+			[VSystemID.Raw.Satellaview] = "Satellaview",
+			[VSystemID.Raw.Sega32X] = "Sega 32X",
+			[VSystemID.Raw.SG] = "SG",
+			[VSystemID.Raw.SMS] = "SMS",
+			[VSystemID.Raw.SNES] = "SNES",
+			[VSystemID.Raw.TI83] = "TI83",
 			[VSystemID.Raw.TIC80] = "TIC80",
 			[VSystemID.Raw.UZE] = "UZE",
-			[VSystemID.Raw.NDS] = "NDS",
-			[VSystemID.Raw.Sega32X] = "Sega 32X",
-			[VSystemID.Raw.GGL] = "Dual Game Gear",
-			[VSystemID.Raw.Satellaview] = "Satellaview",
-			[VSystemID.Raw.N3DS] = "3DS",
+			[VSystemID.Raw.VB] = "VB",
+			[VSystemID.Raw.VEC] = "VEC",
+			[VSystemID.Raw.WSWAN] = "WonderSwan",
+			[VSystemID.Raw.ZXSpectrum] = "Sinclair ZX Spectrum",
 		};
 
 		private static PathEntry BaseEntryFor(string sysID, string path)
@@ -212,6 +216,10 @@ namespace BizHawk.Client.Common
 
 			CommonEntriesFor(VSystemID.Raw.Coleco, basePath: Path.Combine(".", "Coleco"), omitSaveRAM: true),
 
+			CommonEntriesFor(VSystemID.Raw.Doom, basePath: Path.Combine(".", "Doom"), omitSaveRAM: true),
+
+			CommonEntriesFor(VSystemID.Raw.DOS, basePath: Path.Combine(".", "DOS")),
+
 			CommonEntriesFor(VSystemID.Raw.GBL, basePath: Path.Combine(".", "Gameboy Link")),
 			new[] {
 				PalettesEntryFor(VSystemID.Raw.GBL),
diff --git a/src/BizHawk.Emulation.Cores/Computers/DOS/DOSBox.cs b/src/BizHawk.Emulation.Cores/Computers/DOS/DOSBox.cs
index 0091dca4c5..e3ff96b01a 100644
--- a/src/BizHawk.Emulation.Cores/Computers/DOS/DOSBox.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/DOS/DOSBox.cs
@@ -18,8 +18,7 @@ namespace BizHawk.Emulation.Cores.Computers.DOS
 		name: CoreNames.DOSBox,
 		author: "Jonathan Campbell et al.",
 		portedVersion: "2025.02.01 (324193b)",
-		portedUrl: "https://github.com/joncampbell123/dosbox-x",
-		isReleased: false)]
+		portedUrl: "https://github.com/joncampbell123/dosbox-x")]
 	public sealed partial class DOSBox : WaterboxCore
 	{
 		private static readonly Configuration DefaultConfig = new Configuration