Switch order of interface parameters

This commit is contained in:
Matt Nadareski
2022-03-14 22:51:17 -07:00
parent a7e9164f4f
commit ceae505f4d
54 changed files with 60 additions and 60 deletions

View File

@@ -146,7 +146,7 @@ namespace BurnOutSharp.FileType
bool foundProtection = false;
// Check using custom content checks first
string protection = contentCheckClass.CheckNEContents(file, scanner.IncludeDebug, nex);
string protection = contentCheckClass.CheckNEContents(file, nex, scanner.IncludeDebug);
foundProtection |= !string.IsNullOrWhiteSpace(protection);
if (ShouldAddProtection(contentCheckClass, scanner, protection))
Utilities.AppendToDictionary(protections, file, protection);
@@ -173,7 +173,7 @@ namespace BurnOutSharp.FileType
bool foundProtection = false;
// Check using custom content checks first
string protection = contentCheckClass.CheckPEContents(file, scanner.IncludeDebug, pex);
string protection = contentCheckClass.CheckPEContents(file, pex, scanner.IncludeDebug);
foundProtection |= !string.IsNullOrWhiteSpace(protection);
if (ShouldAddProtection(contentCheckClass, scanner, protection))
Utilities.AppendToDictionary(protections, file, protection);

View File

@@ -9,9 +9,9 @@ namespace BurnOutSharp
/// Check a path for protections based on file contents
/// </summary>
/// <param name="file">File to check for protection indicators</param>
/// <param name="includeDebug">True to include debug data, false otherwise</param>
/// <param name="nex">NewExecutable representing the read-in file</param>
/// <param name="includeDebug">True to include debug data, false otherwise</param>
/// <returns>String containing any protections found in the file</returns>
string CheckNEContents(string file, bool includeDebug, NewExecutable nex);
string CheckNEContents(string file, NewExecutable nex, bool includeDebug);
}
}

View File

@@ -12,6 +12,6 @@ namespace BurnOutSharp
/// <param name="includeDebug">True to include debug data, false otherwise</param>
/// <param name="pex">PortableExecutable representing the read-in file</param>
/// <returns>String containing any protections found in the file</returns>
string CheckPEContents(string file, bool includeDebug, PortableExecutable pex);
string CheckPEContents(string file, PortableExecutable pex, bool includeDebug);
}
}

View File

@@ -8,7 +8,7 @@ namespace BurnOutSharp.PackerType
public class AdvancedInstaller : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -10,7 +10,7 @@ namespace BurnOutSharp.PackerType
public class Armadillo : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -36,7 +36,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -16,7 +16,7 @@ namespace BurnOutSharp.PackerType
public bool ShouldScan(byte[] magic) => true;
/// <inheritdoc/>
public string CheckNEContents(string file, bool includeDebug, NewExecutable nex)
public string CheckNEContents(string file, NewExecutable nex, bool includeDebug)
{
// Get the DOS stub from the executable, if possible
var stub = nex?.DOSStubHeader;
@@ -37,7 +37,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -12,7 +12,7 @@ namespace BurnOutSharp.PackerType
public bool ShouldScan(byte[] magic) => true;
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -13,7 +13,7 @@ namespace BurnOutSharp.PackerType
//TODO: Add exact version detection for Windows builds, make sure versions before 3.X are detected as well, and detect the Mac builds.
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -8,7 +8,7 @@ namespace BurnOutSharp.PackerType
public class IntelInstallationFramework : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -15,7 +15,7 @@ namespace BurnOutSharp.PackerType
public bool ShouldScan(byte[] magic) => true;
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -8,7 +8,7 @@ namespace BurnOutSharp.PackerType
public class NSIS : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -6,7 +6,7 @@ namespace BurnOutSharp.PackerType
public class PECompact : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -5,7 +5,7 @@ namespace BurnOutSharp.PackerType
public class PEtite : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -12,7 +12,7 @@ namespace BurnOutSharp.PackerType
public bool ShouldScan(byte[] magic) => true;
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -8,7 +8,7 @@ namespace BurnOutSharp.PackerType
public class UPX : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -16,7 +16,7 @@ namespace BurnOutSharp.PackerType
public bool ShouldScan(byte[] magic) => true;
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -18,7 +18,7 @@ namespace BurnOutSharp.PackerType
public bool ShouldScan(byte[] magic) => true;
/// <inheritdoc/>
public string CheckNEContents(string file, bool includeDebug, NewExecutable nex)
public string CheckNEContents(string file, NewExecutable nex, bool includeDebug)
{
// Get the DOS stub from the executable, if possible
var stub = nex?.DOSStubHeader;
@@ -37,7 +37,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -16,7 +16,7 @@ namespace BurnOutSharp.PackerType
public bool ShouldScan(byte[] magic) => true;
/// <inheritdoc/>
public string CheckNEContents(string file, bool includeDebug, NewExecutable nex)
public string CheckNEContents(string file, NewExecutable nex, bool includeDebug)
{
// Get the DOS stub from the executable, if possible
var stub = nex?.DOSStubHeader;
@@ -35,7 +35,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -7,7 +7,7 @@ namespace BurnOutSharp.PackerType
public class dotFuscator : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -32,7 +32,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -14,7 +14,7 @@ namespace BurnOutSharp.ProtectionType
public class AlphaROM : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -7,7 +7,7 @@ namespace BurnOutSharp.ProtectionType
public class CDCheck : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -41,7 +41,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckNEContents(string file, bool includeDebug, NewExecutable nex)
public string CheckNEContents(string file, NewExecutable nex, bool includeDebug)
{
// Get the DOS stub from the executable, if possible
var stub = nex?.DOSStubHeader;
@@ -67,7 +67,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -7,7 +7,7 @@ namespace BurnOutSharp.ProtectionType
public class CDKey : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType
public class CDLock : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -7,7 +7,7 @@ namespace BurnOutSharp.ProtectionType
public class CDSHiELDSE : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -36,7 +36,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -5,7 +5,7 @@ namespace BurnOutSharp.ProtectionType
public class CengaProtectDVD : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -32,7 +32,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -15,7 +15,7 @@ namespace BurnOutSharp.ProtectionType
public class ElectronicArts : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -10,7 +10,7 @@ namespace BurnOutSharp.ProtectionType
public class GFWL : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -11,7 +11,7 @@ namespace BurnOutSharp.ProtectionType
public class ImpulseReactor : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -22,7 +22,7 @@ namespace BurnOutSharp.ProtectionType
*/
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -12,7 +12,7 @@ namespace BurnOutSharp.ProtectionType
public class JoWood : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -9,7 +9,7 @@ namespace BurnOutSharp.ProtectionType
public class Key2AudioXS : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -12,7 +12,7 @@ namespace BurnOutSharp.ProtectionType
public class LaserLok : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// TODO: Additional checks that may or may not be useful with the below
//

View File

@@ -9,7 +9,7 @@ namespace BurnOutSharp.ProtectionType
public class MediaMaxCD3 : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -7,7 +7,7 @@ namespace BurnOutSharp.ProtectionType
public class OnlineRegistration : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -10,7 +10,7 @@ namespace BurnOutSharp.ProtectionType
public class Origin : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -10,7 +10,7 @@ namespace BurnOutSharp.ProtectionType
public class ProtectDISC : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -47,7 +47,7 @@ namespace BurnOutSharp.ProtectionType
};
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -15,7 +15,7 @@ namespace BurnOutSharp.ProtectionType
public class SecuROM : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -10,7 +10,7 @@ namespace BurnOutSharp.ProtectionType
public class SmartE : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -13,7 +13,7 @@ namespace BurnOutSharp.ProtectionType
public class SolidShield : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -10,7 +10,7 @@ namespace BurnOutSharp.ProtectionType
public class StarForce : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -9,7 +9,7 @@ namespace BurnOutSharp.ProtectionType
public class Steam : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -9,7 +9,7 @@ namespace BurnOutSharp.ProtectionType
public class Sysiphus : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -40,7 +40,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -5,7 +5,7 @@ namespace BurnOutSharp.ProtectionType
public class ThreePLock : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -6,7 +6,7 @@ namespace BurnOutSharp.ProtectionType
public class ThreeTwoOneStudios : IPEContentCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -10,7 +10,7 @@ namespace BurnOutSharp.ProtectionType
public class Uplay : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -9,7 +9,7 @@ namespace BurnOutSharp.ProtectionType
public class WTMCDProtect : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;

View File

@@ -13,7 +13,7 @@ namespace BurnOutSharp.ProtectionType
public class XCP : IPEContentCheck, IPathCheck
{
/// <inheritdoc/>
public string CheckPEContents(string file, bool includeDebug, PortableExecutable pex)
public string CheckPEContents(string file, PortableExecutable pex, bool includeDebug)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;