diff --git a/CHANGELIST.md b/CHANGELIST.md
index 4db1c1b2..798ff258 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -57,6 +57,7 @@
- Update hardware information pull from redumper (fuzz6001)
- Add MCD/SS header support for Redumper
- Fix MCD region(s) parsing
+- Update to DIC 20230606
### 2.5 (2023-03-12)
diff --git a/MPF.Modules/DiscImageCreator/Constants.cs b/MPF.Modules/DiscImageCreator/Constants.cs
index f9e73277..35d13347 100644
--- a/MPF.Modules/DiscImageCreator/Constants.cs
+++ b/MPF.Modules/DiscImageCreator/Constants.cs
@@ -26,6 +26,7 @@ namespace MPF.Modules.DiscImageCreator
public const string Sub = "sub";
public const string Swap = "swap";
public const string Tape = "tape";
+ public const string Version = "/v";
public const string XBOX = "xbox";
public const string XBOXSwap = "xboxswap";
public const string XGD2Swap = "xgd2swap";
@@ -51,7 +52,6 @@ namespace MPF.Modules.DiscImageCreator
public const string Fix = "/fix";
public const string ForceUnitAccess = "/f";
public const string MultiSectorRead = "/mr";
- public const string MultiSession = "/ms";
public const string NoFixSubP = "/np";
public const string NoFixSubQ = "/nq";
public const string NoFixSubQLibCrypt = "/nl";
@@ -59,6 +59,7 @@ namespace MPF.Modules.DiscImageCreator
public const string NoFixSubQSecuROM = "/ns";
public const string NoSkipSS = "/nss";
public const string PadSector = "/ps";
+ public const string Range = "/ra";
public const string Raw = "/raw";
public const string Resume = "/re";
public const string Reverse = "/r";
diff --git a/MPF.Modules/DiscImageCreator/Parameters.cs b/MPF.Modules/DiscImageCreator/Parameters.cs
index 20f5355b..e9dd9834 100644
--- a/MPF.Modules/DiscImageCreator/Parameters.cs
+++ b/MPF.Modules/DiscImageCreator/Parameters.cs
@@ -128,7 +128,7 @@ namespace MPF.Modules.DiscImageCreator
///
/// Set the pad sector flag value (default 0)
///
- public int? PadSectorValue { get; set; }
+ public byte? PadSectorValue { get; set; }
///
/// Set the reverse End LBA value (required for DVD)
@@ -300,6 +300,10 @@ namespace MPF.Modules.DiscImageCreator
if (!File.Exists($"{basePath}_subIntention.txt"))
missingFiles.Add($"{basePath}_subIntention.txt");
+ // Not guaranteed output
+ if (File.Exists($"{basePath}_suppl.dat"))
+ missingFiles.Add($"{basePath}_suppl.dat");
+
// Not guaranteed output (at least PCE)
if (!File.Exists($"{basePath}.toc"))
missingFiles.Add($"{basePath}.toc");
@@ -338,6 +342,14 @@ namespace MPF.Modules.DiscImageCreator
// Not guaranteed output
if (File.Exists($"{basePath}_CSSKey.txt"))
missingFiles.Add($"{basePath}_CSSKey.txt");
+
+ // Only output for some parameters
+ if (File.Exists($"{basePath}.raw"))
+ missingFiles.Add($"{basePath}.raw");
+
+ // Not guaranteed output
+ if (File.Exists($"{basePath}_suppl.dat"))
+ missingFiles.Add($"{basePath}_suppl.dat");
}
break;
@@ -1135,13 +1147,6 @@ namespace MPF.Modules.DiscImageCreator
}
}
- // Multi-Session
- if (IsFlagSupported(FlagStrings.MultiSession))
- {
- if (this[FlagStrings.MultiSession] == true)
- parameters.Add(FlagStrings.MultiSession);
- }
-
// Not fix SubP
if (IsFlagSupported(FlagStrings.NoFixSubP))
{
@@ -1199,6 +1204,13 @@ namespace MPF.Modules.DiscImageCreator
}
}
+ // Range
+ if (IsFlagSupported(FlagStrings.Range))
+ {
+ if (this[FlagStrings.Range] == true)
+ parameters.Add(FlagStrings.Range);
+ }
+
// Raw read (2064 byte/sector)
if (IsFlagSupported(FlagStrings.Raw))
{
@@ -1358,7 +1370,6 @@ namespace MPF.Modules.DiscImageCreator
FlagStrings.DatExpand,
FlagStrings.DisableBeep,
FlagStrings.ForceUnitAccess,
- FlagStrings.MultiSession,
FlagStrings.NoFixSubP,
FlagStrings.NoFixSubQ,
FlagStrings.NoFixSubRtoW,
@@ -1396,7 +1407,6 @@ namespace MPF.Modules.DiscImageCreator
FlagStrings.ExtractMicroSoftCabFile,
FlagStrings.ForceUnitAccess,
FlagStrings.MultiSectorRead,
- FlagStrings.MultiSession,
FlagStrings.NoFixSubP,
FlagStrings.NoFixSubQ,
FlagStrings.NoFixSubQLibCrypt,
@@ -1420,7 +1430,6 @@ namespace MPF.Modules.DiscImageCreator
FlagStrings.DatExpand,
FlagStrings.DisableBeep,
FlagStrings.ForceUnitAccess,
- FlagStrings.MultiSession,
FlagStrings.NoFixSubP,
FlagStrings.NoFixSubQ,
FlagStrings.NoFixSubRtoW,
@@ -1441,6 +1450,7 @@ namespace MPF.Modules.DiscImageCreator
FlagStrings.Fix,
FlagStrings.ForceUnitAccess,
FlagStrings.PadSector,
+ FlagStrings.Range,
FlagStrings.Raw,
FlagStrings.Resume,
FlagStrings.Reverse,
@@ -1520,7 +1530,6 @@ namespace MPF.Modules.DiscImageCreator
FlagStrings.DatExpand,
FlagStrings.DisableBeep,
FlagStrings.ForceUnitAccess,
- FlagStrings.MultiSession,
FlagStrings.NoFixSubP,
FlagStrings.NoFixSubQ,
FlagStrings.NoFixSubQLibCrypt,
@@ -1540,6 +1549,10 @@ namespace MPF.Modules.DiscImageCreator
{
},
+ [CommandStrings.Version] = new List()
+ {
+ },
+
[CommandStrings.XBOX] = new List()
{
FlagStrings.DatExpand,
@@ -2242,6 +2255,12 @@ namespace MPF.Modules.DiscImageCreator
break;
+ case CommandStrings.Version:
+ if (parts.Count != 1)
+ return false;
+
+ break;
+
case CommandStrings.XBOX:
if (parts.Count < 4)
return false;
@@ -2302,6 +2321,7 @@ namespace MPF.Modules.DiscImageCreator
for (int i = index; i < parts.Count; i++)
{
// Flag read-out values
+ byte? byteValue = null;
int? intValue = null;
string stringValue = null;
@@ -2387,9 +2407,6 @@ namespace MPF.Modules.DiscImageCreator
if (intValue != null && intValue != Int32.MinValue && intValue >= 0)
MultiSectorReadValue = intValue;
- // Multi-Session
- ProcessFlagParameter(parts, FlagStrings.MultiSession, ref i);
-
// NoFixSubP
ProcessFlagParameter(parts, FlagStrings.NoFixSubP, ref i);
@@ -2411,9 +2428,9 @@ namespace MPF.Modules.DiscImageCreator
NoSkipSecuritySectorValue = intValue;
// PadSector
- intValue = ProcessInt32Parameter(parts, FlagStrings.PadSector, ref i, missingAllowed: true);
- if (intValue != null && intValue != Int32.MinValue && intValue >= 0)
- PadSectorValue = intValue;
+ byteValue = ProcessUInt8Parameter(parts, FlagStrings.PadSector, ref i, missingAllowed: true);
+ if (byteValue != null)
+ PadSectorValue = byteValue;
// Raw
ProcessFlagParameter(parts, FlagStrings.Raw, ref i);
diff --git a/appveyor.yml b/appveyor.yml
index 9c259820..da21acda 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -60,12 +60,12 @@ after_build:
- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\DD *
# DiscImageCreator
-- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/11222268/DiscImageCreator_20230413.zip
-- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net48\publish\Programs\Creator Release_ANSI\*
-- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Creator Release_ANSI\*
-- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Creator Release_ANSI\*
-- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Creator Release_ANSI\*
-- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Creator Release_ANSI\*
+- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/11660558/DiscImageCreator_20230606.zip
+- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net48\publish\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Creator Release_ANSI\*
# Redumper
- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_151/redumper-2023.05.18_build151-win64.zip