Merge pull request #5 from mnadareski/master

Combine IBM PC-CD options, misc fixes
Update README.md
2026-02-04 21:30:11 +00:00 · 2018-05-14 13:42:34 -04:00 · 2018-05-14 13:35:30 -04:00 · 2018-05-14 10:28:35 -07:00 · 2018-05-14 10:27:28 -07:00 · 2018-05-14 10:26:25 -07:00
7 changed files with 196 additions and 86 deletions
--- a/DICUI.csproj
+++ b/DICUI.csproj
@@ -62,8 +62,9 @@
    <GenerateManifests>true</GenerateManifests>
  </PropertyGroup>
  <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
  </PropertyGroup>
+  <PropertyGroup />
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Data" />
--- a/DICUI.sln
+++ b/DICUI.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2036
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI", "DICUI.csproj", "{7B1B75EB-8940-466F-BD51-76471A57F9BE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7B1B75EB-8940-466F-BD51-76471A57F9BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B1B75EB-8940-466F-BD51-76471A57F9BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B1B75EB-8940-466F-BD51-76471A57F9BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B1B75EB-8940-466F-BD51-76471A57F9BE}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {73C62E6A-6584-4D93-83B5-ECB1FBDB469B}
+	EndGlobalSection
+EndGlobal
--- a/Downloads/DICUI_1.0.zip
+++ b/Downloads/DICUI_1.0.zip
--- a/Downloads/DICUI_1.01b.zip
+++ b/Downloads/DICUI_1.01b.zip
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -49,34 +49,36 @@
                <ComboBoxItem Content="Bandai / Apple Pippin"/>
                <ComboBoxItem Content="Commodore Amiga CD / CD32 / CDTV"/>
                <ComboBoxItem Content="Mattel HyperScan"/>
-                <ComboBoxItem Content="NEC PC-FX / PC-Engine / TurboGrafx CD"/>
+                <ComboBoxItem Content="Microsoft XBOX One"/>
+                <ComboBoxItem Content="NEC PC-Engine / TurboGrafx CD"/>
+                <ComboBoxItem Content="NEC PC-FX / PC-FXGA"/>
                <ComboBoxItem Content="Panasonic 3DO"/>
                <ComboBoxItem Content="Philips CD-i"/>
-                <ComboBoxItem Content="Sega CD / Mega CD / Saturn"/>
+                <ComboBoxItem Content="Sega CD / Mega CD"/>
+                <ComboBoxItem Content="Sega Saturn"/>
                <ComboBoxItem Content="SNK Neo Geo CD"/>
                <ComboBoxItem Content="Sony PlayStation"/>
                <ComboBoxItem Content="Sony PlayStation 2 (CD-Rom)"/>
                <ComboBoxItem Content="Sony PlayStation 2 (DVD-Rom)"/>
                <ComboBoxItem Content="Sony PlayStation 4"/>
                <ComboBoxItem Content="VTech V.Flash - V.Smile Pro"/>
-                <ComboBoxItem Content="XBOX ONE"/>
                <ComboBoxItem Content="---------- Computers ----------" IsEnabled="False"/>
                <ComboBoxItem Content="Apple Macintosh (CD-Rom)"/>
                <ComboBoxItem Content="Apple Macintosh (DVD-Rom)"/>
-                <ComboBoxItem Content="FM Towns series"/>
-                <ComboBoxItem Content="IBM PC Compatible (CD-Rom) SecuROM"/>
-                <ComboBoxItem Content="IBM PC Compatible (CD-Rom) Detectable Protection"/>
-                <ComboBoxItem Content="IBM PC Compatible (CD-Rom) C2 Error Protection"/>
-                <ComboBoxItem Content="IBM PC Compatible(CD - Rom) No Copy Protection"/>
+                <ComboBoxItem Content="Fujitsu FM Towns series"/>
+                <ComboBoxItem Content="IBM PC Compatible (CD-Rom)"/>
                <ComboBoxItem Content="IBM PC Compatible (DVD-Rom)"/>
-                <ComboBoxItem Content="NEC PC-88 / PC-98"/>
+                <ComboBoxItem Content="NEC PC-88"/>
+                <ComboBoxItem Content="NEC PC-98"/>
+                <ComboBoxItem Content="---------- Arcade ----------" IsEnabled="False"/>
+                <ComboBoxItem Content="Sega Lindbergh"/>
                <ComboBoxItem Content="---------- Others ----------" IsEnabled="False"/>
                <ComboBoxItem Content="Audio CD"/>
                <ComboBoxItem Content="BD-Video"/>
+                <ComboBoxItem Content="DVD-Video"/>
                <ComboBoxItem Content="PalmOS"/>
                <ComboBoxItem Content="Photo CD"/>
                <ComboBoxItem Content="PlayStation GameShark Updates"/>
-                <ComboBoxItem Content="Sega Lindbergh"/>
                <ComboBoxItem Content="Tomy Kiss-Site"/>
                <ComboBoxItem Content="Video CD"/>
            </ComboBox>
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -65,10 +65,11 @@ namespace DICUI

            switch (Convert.ToString(CB_DiscType.Text))
            {
+                #region Consoles
+
                case "Bandai Playdia Quick Interactive System":
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
-                    
                    break;
                case "Bandai / Apple Pippin":
                    VAR_Type = "cd";
@@ -82,10 +83,34 @@ namespace DICUI
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
-                case "NEC PC-FX / PC-Engine / TurboGrafx CD":
+                case "Microsoft XBOX":
+                    // Placeholder for later use
+                    break;
+                case "Microsoft XBOX 360":
+                    // Placeholder for later use
+                    break;
+                case "Microsoft XBOX One":
+                    VAR_Type = "bd";
+                    VAR_Switches = "";
+                    VAR_IsXBOXorPS4 = true;
+                    break;
+                case "NEC PC-Engine / TurboGrafx CD":
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
+                case "NEC PC-FX / PC-FXGA":
+                    VAR_Type = "cd";
+                    VAR_Switches = "/c2";
+                    break;
+                case "Nintendo GameCube":
+                    // Placeholder for later use
+                    break;
+                case "Nintendo Wii":
+                    // Placeholder for later use
+                    break;
+                case "Nintendo Wii U":
+                    // Placeholder for later use
+                    break;
                case "Panasonic 3DO":
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
@@ -94,7 +119,14 @@ namespace DICUI
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
-                case "Sega CD / Mega CD / Saturn":
+                case "Sega CD / Mega CD":
+                    VAR_Type = "cd";
+                    VAR_Switches = "/c2";
+                    break;
+                case "Sega Dreamcast":
+                    // Placeholder for later use
+                    break;
+                case "Sega Saturn":
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
@@ -102,34 +134,130 @@ namespace DICUI
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
+                case "Sony PlayStation":
+                    VAR_Type = "cd";
+                    VAR_Switches = "/c2";
+                    VAR_IsPSX = true;
+                    break;
                case "Sony PlayStation 2 (CD-Rom)":
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
+                case "Sony PlayStation 2 (DVD-Rom)":
+                    VAR_Type = "dvd";
+                    VAR_Switches = "";
+                    break;
+                case "Sony PlayStation 3":
+                    // Placeholder for later use
+                    break;
+                case "Sony PlayStation 4":
+                    VAR_Type = "bd";
+                    VAR_Switches = "";
+                    VAR_IsXBOXorPS4 = true;
+                    break;
+                case "Sony PlayStation Portable":
+                    // No-op - PSP can't be dumped with DIC
+                    break;
+                case "VM Labs NUON":
+                    // Placeholder for later use
+                    break;
                case "VTech V.Flash - V.Smile Pro":
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
+                case "ZAPiT Games Game Wave Family Entertainment System":
+                    // Placeholder for later use
+                    break;
+
+                #endregion
+
+                #region Computers
+
+                case "Acorn Archimedes":
+                    // Placeholder for later use
+                    break;
                case "Apple Macintosh (CD-Rom)":
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
-                case "FM Towns series":
+                case "Apple Macintosh (DVD-Rom)":
+                    VAR_Type = "dvd";
+                    VAR_Switches = "";
+                    break;
+                case "Fujitsu FM Towns series":
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
-                case "NEC PC-88 / PC-98":
+                case "IBM PC Compatible (CD-Rom)":
+                    VAR_Type = "cd";
+                    VAR_Switches = "/c2 /ns /sf /ss";
+                    break;
+                case "IBM PC Compatible (DVD-Rom)":
+                    VAR_Type = "dvd";
+                    VAR_Switches = "";
+                    break;
+                case "NEC PC-88":
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
+                case "NEC PC-98":
+                    VAR_Type = "cd";
+                    VAR_Switches = "/c2";
+                    break;
+                case "Sharp X68000":
+                    // Placeholder for later use
+                    break;
+
+                #endregion
+
+                #region Arcade
+
+                case "Namco / Sega / Nintendo Triforce":
+                    // Placeholder for later use
+                    break;
+                case "Sega Chihiro":
+                    // Placeholder for later use
+                    break;
+                case "Sega Lindbergh":
+                    VAR_Type = "cd";
+                    VAR_Switches = "/c2";
+                    break;
+                case "Sega Naomi":
+                    // Placeholder for later use
+                    break;
+                case "Sega Naomi 2":
+                    // Placeholder for later use
+                    break;
+                case "TAB-Austria Quizard":
+                    // Placeholder for later use
+                    break;
+
+                case "Tandy / Memorex Visual Information System":
+                    // Placeholder for later use
+                    break;
+
+                #endregion
+
+                #region Others
+
                case "Audio CD":
-                    VAR_Type = "audio";
+                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
+                case "BD-Video":
+                    VAR_Type = "bd";
+                    VAR_Switches = "";
+                    break;
+                case "DVD-Video":
+                    VAR_Type = "dvd";
+                    break;
                case "PalmOS":
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
+                case "Philips CD-i Digital Video":
+                    // Placeholder for later use
+                    break;
                case "Photo CD":
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
@@ -138,9 +266,8 @@ namespace DICUI
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
-                case "Sega Lindbergh":
-                    VAR_Type = "cd";
-                    VAR_Switches = "/c2";
+                case "Tao iKTV":
+                    // Placeholder for later use
                    break;
                case "Tomy Kiss-Site":
                    VAR_Type = "cd";
@@ -150,53 +277,11 @@ namespace DICUI
                    VAR_Type = "cd";
                    VAR_Switches = "/c2";
                    break;
-                case "Sony PlayStation 2 (DVD-Rom)":
-                    VAR_Type = "dvd";
-                    VAR_Switches = "";
-                    break;
-                case "Apple Macintosh (DVD-Rom)":
-                    VAR_Type = "dvd";
-                    VAR_Switches = "";
-                    break;
-                case "IBM PC Compatible (DVD-Rom)":
-                    VAR_Type = "dvd";
-                    VAR_Switches = "";
-                    break;
-                case "IBM PC Compatible(CD - Rom) No Copy Protection":
-                    VAR_Type = "dvd";
-                    VAR_Switches = "/c2";
-                    break;
-                case "BD-Video":
-                    VAR_Switches = "";
-                    break;
-                case "Sony PlayStation":
-                    VAR_Type = "cd";
-                    VAR_Switches = "/c2";
-                    VAR_IsPSX = true;
-                    break;
-                case "Sony PlayStation 4":
-                    VAR_Type = "bd";
-                    VAR_Switches = "";
-                    VAR_IsXBOXorPS4 = true;
-                    break;
-                case "XBOX ONE":
-                    VAR_Type = "bd";
-                    VAR_Switches = "";
-                    VAR_IsXBOXorPS4 = true;
-                    break;
-                case "IBM PC Compatible (CD-Rom) SecuROM":
-                    VAR_Type = "cd";
-                    VAR_Switches = "/c2 /ns";
-                    break;
-                case "IBM PC Compatible (CD-Rom) Detectable Protection":
-                    VAR_Type = "cd";
-                    VAR_Switches = "/c2 /sf";
-                    break;
-                case "IBM PC Compatible (CD-Rom) C2 Error Protection":
-                    VAR_Type = "cd";
-                    VAR_Switches = "/c2 /ss";
-                    break;
+
+                #endregion
+
                case "Unknown":
+                default:
                    VAR_Type = "";
                    VAR_Switches = "";
                    break;
@@ -207,7 +292,7 @@ namespace DICUI
                {
                    Process process = new Process();
                    process.StartInfo.FileName = "Release_ANSI\\DiscImageCreator.exe";
-                    process.StartInfo.Arguments = VAR_Type + " " + VAR_DriveLetter + " " + VAR_OutputDirectory + "\\" + VAR_OutputFilename + " " + VAR_DriveSpeed + " " + VAR_Switches;
+                    process.StartInfo.Arguments = VAR_Type + " " + VAR_DriveLetter + " \"" + VAR_OutputDirectory + "\\" + VAR_OutputFilename + "\" " + VAR_DriveSpeed + " " + VAR_Switches;
                    Console.WriteLine(process.StartInfo.Arguments);
                    process.Start();
                    process.WaitForExit();
@@ -228,14 +313,14 @@ namespace DICUI
            {
                using (StreamWriter writetext = new StreamWriter("PSX.bat"))
                {
-                    writetext.WriteLine("edccchk" + " " + "\"" + VAR_OutputDirectory + VAR_OutputFilename + ".bin" + "\" > " + "\"" + VAR_OutputDirectory + "edccchk1.txt");
-                    writetext.WriteLine("edccchk" + " " + "\"" + VAR_OutputDirectory + VAR_OutputFilename + " (Track 1).bin" + "\" > " + "\"" + VAR_OutputDirectory + "edccchk1.txt");
-                    writetext.WriteLine("edccchk" + " " + "\"" + VAR_OutputDirectory + VAR_OutputFilename + " (Track 01).bin" + "\" > " + "\"" + VAR_OutputDirectory + "edccchk1.txt");
-                    writetext.WriteLine("psxt001z" + " " + "\"" + VAR_OutputDirectory + VAR_OutputFilename + ".bin" + "\" > " + "\"" + VAR_OutputDirectory + "psxt001z1.txt");
-                    writetext.WriteLine("psxt001z" + " " + "\"" + VAR_OutputDirectory + VAR_OutputFilename + " (Track 1).bin" + "\" > " + "\"" + VAR_OutputDirectory + "psxt001z2.txt");
-                    writetext.WriteLine("psxt001z" + " " + "\"" + VAR_OutputDirectory + VAR_OutputFilename + " (Track 01).bin" + "\" > " + "\"" + VAR_OutputDirectory + "psxt001z3.txt");
-                    writetext.WriteLine("psxt001z" + " " + "--libcrypt " + "\"" + VAR_OutputDirectory + VAR_OutputFilename + ".sub\" > " + "\"" + VAR_OutputDirectory + "libcrypt.txt");
-                    writetext.WriteLine("psxt001z" + " " + "--libcryptdrvfast " + VAR_DriveLetter + " > " + "\"" + VAR_OutputDirectory + "libcryptdrv.log");
+                    writetext.WriteLine("edccchk" + " " + "\"" + VAR_OutputDirectory + "\\" + VAR_OutputFilename + ".bin" + "\" > " + "\"" + VAR_OutputDirectory + "\\" + "edccchk1.txt");
+                    writetext.WriteLine("edccchk" + " " + "\"" + VAR_OutputDirectory + "\\" + VAR_OutputFilename + " (Track 1).bin" + "\" > " + "\"" + VAR_OutputDirectory + "\\" + "edccchk1.txt");
+                    writetext.WriteLine("edccchk" + " " + "\"" + VAR_OutputDirectory + "\\" + VAR_OutputFilename + " (Track 01).bin" + "\" > " + "\"" + VAR_OutputDirectory + "\\" + "edccchk1.txt");
+                    writetext.WriteLine("psxt001z" + " " + "\"" + VAR_OutputDirectory + "\\" + VAR_OutputFilename + ".bin" + "\" > " + "\"" + VAR_OutputDirectory + "\\" + "psxt001z1.txt");
+                    writetext.WriteLine("psxt001z" + " " + "\"" + VAR_OutputDirectory + "\\" + VAR_OutputFilename + " (Track 1).bin" + "\" > " + "\"" + VAR_OutputDirectory + "\\" + "psxt001z2.txt");
+                    writetext.WriteLine("psxt001z" + " " + "\"" + VAR_OutputDirectory + "\\" + VAR_OutputFilename + " (Track 01).bin" + "\" > " + "\"" + VAR_OutputDirectory + "\\" + "psxt001z3.txt");
+                    writetext.WriteLine("psxt001z" + " " + "--libcrypt " + "\"" + VAR_OutputDirectory + "\\" + VAR_OutputFilename + ".sub\" > " + "\"" + VAR_OutputDirectory + "\\" + "libcrypt.txt");
+                    writetext.WriteLine("psxt001z" + " " + "--libcryptdrvfast " + VAR_DriveLetter + " > " + "\"" + VAR_OutputDirectory + "\\" + "libcryptdrv.log");
                }
                Process processpsx = new Process();
                processpsx.StartInfo.FileName = "PSX.bat";
--- a/README.md
+++ b/README.md
@@ -8,19 +8,16 @@ I would like this project to be a community project, so if you have some time an
 Currently working on the project:
 
 ReignStumble - Lead Developer
- 
+
+darksabre76 - Contributer
+
+NHellFire - Contributer
+
 Dizzzy - Concept/Ideas/Beta tester

 
 
-2018-05-12
- 
-----------Initial Build V.1.0-------------
- 
-Download here: https://github.com/reignstumble/DICUI/blob/master/Downloads/DICUI_1.0.zip
+2018-05-14

-2018-05-13
- 
-----------Latest Build V.1.01b-------------
-
-Download here: https://github.com/reignstumble/DICUI/blob/master/Downloads/DICUI_1.01b.zip
+Version 1.01c released:
+https://github.com/reignstumble/DICUI/releases
Author	SHA1	Message	Date
reignstumble	13a5f02082	Merge pull request #5 from mnadareski/master Combine IBM PC-CD options, misc fixes	2018-05-14 13:42:34 -04:00
reignstumble	a188cad6ee	Update README.md	2018-05-14 13:35:30 -04:00
Matt Nadareski	039cbf6de4	Merge branch 'master' into master	2018-05-14 10:28:35 -07:00
Matt Nadareski	c0cf207776	Ensure tabbing stays the same with source	2018-05-14 10:27:28 -07:00
Matt Nadareski	16ae5e1c66	Fix automatic merge issues	2018-05-14 10:26:25 -07:00
Matt Nadareski	bfca66951d	Merge branch 'master' of https://github.com/mnadareski/DICUI	2018-05-14 10:24:52 -07:00
Matt Nadareski	5b777c3bb5	Combine IBM PC-CD options, fix "no copy protection" Previously, the "No Copy Protection" variant was using the wrong "type" of dumping. This would have caused issues in the long run. This change also consolidates all of the variants previously used for IBM PC into a single option that can accurately capture all of the previous ones. This will reduce new user confusion about what choice to make given a disc.	2018-05-14 10:23:48 -07:00
reignstumble	4b840ebe4f	Update README.md	2018-05-14 12:08:51 -04:00
reignstumble	d38c5cd051	Update README.md	2018-05-14 12:08:35 -04:00
reignstumble	7fa9c5c296	Update README.md	2018-05-14 12:07:30 -04:00
ReignStumble	3a28bc798a	Cleanup	2018-05-14 12:06:27 -04:00
ReignStumble	e88df626b7	Missing break; for Audio CD	2018-05-14 10:29:31 -04:00
reignstumble	ff7355de6e	Merge pull request #2 from mnadareski/master Bring list to parity with Redump known types	2018-05-14 09:45:58 -04:00
reignstumble	3ed267d751	Merge branch 'master' into master	2018-05-14 09:45:46 -04:00
reignstumble	25a60ef9dd	Merge pull request #4 from NHellFire/patch-1 Fix a few issues	2018-05-14 09:44:48 -04:00
Nathan Rennie-Waldock	eb664cebba	Make sure output directory has a trailing backslash for PSX commands	2018-05-14 12:08:37 +01:00
Nathan Rennie-Waldock	da4d9fbf67	Quote output path as it may contain spaces	2018-05-14 11:56:30 +01:00
Nathan Rennie-Waldock	d21a5c8495	Fix PC CD (no copy protection) arguments	2018-05-14 11:54:10 +01:00
Matt Nadareski	e305ea1fdb	Enable building on all machines	2018-05-13 22:09:37 -07:00
Matt Nadareski	ea82e42601	Bring list to parity with Redump known types This change adds all remaining consoles and disc-based devices that are currently listed in Redump as valid devices. This also does some minor renames and splits that bring this to parity as well. One minor TODO note was added possibly for future ease-of-use for dumping IBM PC software.	2018-05-13 22:02:44 -07:00
reignstumble	c2c42a1acd	Merge pull request #1 from mnadareski/master Add a solution file for easier access	2018-05-14 00:17:44 -04:00
Matt Nadareski	a0fceee153	Add a solution file for easier access	2018-05-13 21:15:15 -07:00
reignstumble	aa9e6d3025	Delete DICUI_1.0.zip	2018-05-13 23:54:05 -04:00
reignstumble	677eb710fe	Delete DICUI-1.01b.zip	2018-05-13 23:53:58 -04:00
reignstumble	3ef246384f	Delete DICUI_1.01b.zip	2018-05-13 23:49:40 -04:00
reignstumble	76c15e585c	Add files via upload	2018-05-13 23:49:26 -04:00