From a44bdf9013ac27dbf4e0b145c307d62273cd2b59 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sun, 1 May 2022 17:23:00 -0700 Subject: [PATCH] Reorder inherited interfaces --- BurnOutSharp/ProtectionType/CDDVDCops.cs | 2 +- BurnOutSharp/ProtectionType/CDLock.cs | 2 +- BurnOutSharp/ProtectionType/CactusDataShield.cs | 2 +- BurnOutSharp/ProtectionType/GFWL.cs | 2 +- BurnOutSharp/ProtectionType/ImpulseReactor.cs | 2 +- BurnOutSharp/ProtectionType/LaserLok.cs | 2 +- BurnOutSharp/ProtectionType/MediaMaxCD3.cs | 2 +- BurnOutSharp/ProtectionType/Origin.cs | 2 +- BurnOutSharp/ProtectionType/SafeDisc.cs | 2 +- BurnOutSharp/ProtectionType/SecuROM.cs | 2 +- BurnOutSharp/ProtectionType/SmartE.cs | 2 +- BurnOutSharp/ProtectionType/SolidShield.cs | 2 +- BurnOutSharp/ProtectionType/StarForce.cs | 2 +- BurnOutSharp/ProtectionType/Steam.cs | 2 +- BurnOutSharp/ProtectionType/Tages.cs | 2 +- BurnOutSharp/ProtectionType/Uplay.cs | 2 +- BurnOutSharp/ProtectionType/WTMCDProtect.cs | 2 +- BurnOutSharp/ProtectionType/XCP.cs | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/BurnOutSharp/ProtectionType/CDDVDCops.cs b/BurnOutSharp/ProtectionType/CDDVDCops.cs index 96970692..96c6f8a9 100644 --- a/BurnOutSharp/ProtectionType/CDDVDCops.cs +++ b/BurnOutSharp/ProtectionType/CDDVDCops.cs @@ -8,7 +8,7 @@ using BurnOutSharp.Matching; namespace BurnOutSharp.ProtectionType { - public class CDDVDCops : IContentCheck, INewExecutableCheck, IPortableExecutableCheck, IPathCheck + public class CDDVDCops : IContentCheck, INewExecutableCheck, IPathCheck, IPortableExecutableCheck { /// public string CheckContents(string file, byte[] fileContent, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/CDLock.cs b/BurnOutSharp/ProtectionType/CDLock.cs index 7f9e3e71..d72fb479 100644 --- a/BurnOutSharp/ProtectionType/CDLock.cs +++ b/BurnOutSharp/ProtectionType/CDLock.cs @@ -5,7 +5,7 @@ using BurnOutSharp.Matching; namespace BurnOutSharp.ProtectionType { - public class CDLock : IPortableExecutableCheck, IPathCheck + public class CDLock : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/CactusDataShield.cs b/BurnOutSharp/ProtectionType/CactusDataShield.cs index 0e32a012..be0a2955 100644 --- a/BurnOutSharp/ProtectionType/CactusDataShield.cs +++ b/BurnOutSharp/ProtectionType/CactusDataShield.cs @@ -9,7 +9,7 @@ using BurnOutSharp.Matching; namespace BurnOutSharp.ProtectionType { - public class CactusDataShield : IContentCheck, IPortableExecutableCheck, IPathCheck + public class CactusDataShield : IContentCheck, IPathCheck, IPortableExecutableCheck { /// public string CheckContents(string file, byte[] fileContent, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/GFWL.cs b/BurnOutSharp/ProtectionType/GFWL.cs index f00360a5..b020e93c 100644 --- a/BurnOutSharp/ProtectionType/GFWL.cs +++ b/BurnOutSharp/ProtectionType/GFWL.cs @@ -7,7 +7,7 @@ using BurnOutSharp.Tools; namespace BurnOutSharp.ProtectionType { - public class GFWL : IPortableExecutableCheck, IPathCheck + public class GFWL : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/ImpulseReactor.cs b/BurnOutSharp/ProtectionType/ImpulseReactor.cs index 703834d1..845fd07f 100644 --- a/BurnOutSharp/ProtectionType/ImpulseReactor.cs +++ b/BurnOutSharp/ProtectionType/ImpulseReactor.cs @@ -8,7 +8,7 @@ namespace BurnOutSharp.ProtectionType { // Note that this set of checks also contains "Stardock Product Activation" // This is intentional, as that protection is highly related to Impulse Reactor - public class ImpulseReactor : IPortableExecutableCheck, IPathCheck + public class ImpulseReactor : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/LaserLok.cs b/BurnOutSharp/ProtectionType/LaserLok.cs index a81bf593..204cfbbc 100644 --- a/BurnOutSharp/ProtectionType/LaserLok.cs +++ b/BurnOutSharp/ProtectionType/LaserLok.cs @@ -9,7 +9,7 @@ using BurnOutSharp.Tools; namespace BurnOutSharp.ProtectionType { - public class LaserLok : IPortableExecutableCheck, IPathCheck + public class LaserLok : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/MediaMaxCD3.cs b/BurnOutSharp/ProtectionType/MediaMaxCD3.cs index 73b3c5c5..810b6c8c 100644 --- a/BurnOutSharp/ProtectionType/MediaMaxCD3.cs +++ b/BurnOutSharp/ProtectionType/MediaMaxCD3.cs @@ -5,7 +5,7 @@ using BurnOutSharp.Matching; namespace BurnOutSharp.ProtectionType { - public class MediaMaxCD3 : IPortableExecutableCheck, IPathCheck + public class MediaMaxCD3 : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/Origin.cs b/BurnOutSharp/ProtectionType/Origin.cs index f77398da..4f5f3f8d 100644 --- a/BurnOutSharp/ProtectionType/Origin.cs +++ b/BurnOutSharp/ProtectionType/Origin.cs @@ -6,7 +6,7 @@ using BurnOutSharp.Matching; namespace BurnOutSharp.ProtectionType { - public class Origin : IPortableExecutableCheck, IPathCheck + public class Origin : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/SafeDisc.cs b/BurnOutSharp/ProtectionType/SafeDisc.cs index 42975489..ba37442a 100644 --- a/BurnOutSharp/ProtectionType/SafeDisc.cs +++ b/BurnOutSharp/ProtectionType/SafeDisc.cs @@ -10,7 +10,7 @@ namespace BurnOutSharp.ProtectionType { // TODO: Figure out how to properly distinguish SafeDisc and SafeCast since both use // the same generic BoG_ string. The current combination check doesn't seem consistent - public class SafeDisc : IPortableExecutableCheck, IPathCheck + public class SafeDisc : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/SecuROM.cs b/BurnOutSharp/ProtectionType/SecuROM.cs index dbc3b6ab..68b0d0da 100644 --- a/BurnOutSharp/ProtectionType/SecuROM.cs +++ b/BurnOutSharp/ProtectionType/SecuROM.cs @@ -10,7 +10,7 @@ using BurnOutSharp.Tools; namespace BurnOutSharp.ProtectionType { // TODO: Investigate SecuROM for Macintosh - public class SecuROM : IPortableExecutableCheck, IPathCheck + public class SecuROM : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/SmartE.cs b/BurnOutSharp/ProtectionType/SmartE.cs index 45f5bf1f..0a86ef50 100644 --- a/BurnOutSharp/ProtectionType/SmartE.cs +++ b/BurnOutSharp/ProtectionType/SmartE.cs @@ -7,7 +7,7 @@ using BurnOutSharp.Matching; namespace BurnOutSharp.ProtectionType { - public class SmartE : IPortableExecutableCheck, IPathCheck + public class SmartE : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/SolidShield.cs b/BurnOutSharp/ProtectionType/SolidShield.cs index aa7dd9b2..6330f8ba 100644 --- a/BurnOutSharp/ProtectionType/SolidShield.cs +++ b/BurnOutSharp/ProtectionType/SolidShield.cs @@ -10,7 +10,7 @@ namespace BurnOutSharp.ProtectionType { // TODO: Not matching all SolidShield Wrapper v1 (See JackKeane) // TODO: Not matching all SolidShield Wrapper v1 (See NFS11) - public class SolidShield : IPortableExecutableCheck, IPathCheck + public class SolidShield : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/StarForce.cs b/BurnOutSharp/ProtectionType/StarForce.cs index 8fb3608e..97434a9e 100644 --- a/BurnOutSharp/ProtectionType/StarForce.cs +++ b/BurnOutSharp/ProtectionType/StarForce.cs @@ -7,7 +7,7 @@ using BurnOutSharp.Tools; namespace BurnOutSharp.ProtectionType { - public class StarForce : IPortableExecutableCheck, IPathCheck + public class StarForce : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/Steam.cs b/BurnOutSharp/ProtectionType/Steam.cs index eb96b888..ffd6a16e 100644 --- a/BurnOutSharp/ProtectionType/Steam.cs +++ b/BurnOutSharp/ProtectionType/Steam.cs @@ -6,7 +6,7 @@ using BurnOutSharp.Tools; namespace BurnOutSharp.ProtectionType { - public class Steam : IPortableExecutableCheck, IPathCheck + public class Steam : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/Tages.cs b/BurnOutSharp/ProtectionType/Tages.cs index ca328ba1..a0711483 100644 --- a/BurnOutSharp/ProtectionType/Tages.cs +++ b/BurnOutSharp/ProtectionType/Tages.cs @@ -8,7 +8,7 @@ using BurnOutSharp.Tools; namespace BurnOutSharp.ProtectionType { - public class TAGES : IPortableExecutableCheck, IPathCheck + public class TAGES : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/Uplay.cs b/BurnOutSharp/ProtectionType/Uplay.cs index a4fda610..5070cded 100644 --- a/BurnOutSharp/ProtectionType/Uplay.cs +++ b/BurnOutSharp/ProtectionType/Uplay.cs @@ -6,7 +6,7 @@ using BurnOutSharp.Matching; namespace BurnOutSharp.ProtectionType { // Got renamed to Ubisoft Connect / Ubisoft Game Launcher - public class Uplay : IPortableExecutableCheck, IPathCheck + public class Uplay : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/WTMCDProtect.cs b/BurnOutSharp/ProtectionType/WTMCDProtect.cs index 9ba148c6..1c2fdda2 100644 --- a/BurnOutSharp/ProtectionType/WTMCDProtect.cs +++ b/BurnOutSharp/ProtectionType/WTMCDProtect.cs @@ -5,7 +5,7 @@ using BurnOutSharp.Matching; namespace BurnOutSharp.ProtectionType { - public class WTMCDProtect : IPortableExecutableCheck, IPathCheck + public class WTMCDProtect : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) diff --git a/BurnOutSharp/ProtectionType/XCP.cs b/BurnOutSharp/ProtectionType/XCP.cs index 7cadd138..ed399137 100644 --- a/BurnOutSharp/ProtectionType/XCP.cs +++ b/BurnOutSharp/ProtectionType/XCP.cs @@ -10,7 +10,7 @@ using BurnOutSharp.Matching; namespace BurnOutSharp.ProtectionType { // TODO: Figure out how to use path check framework here - public class XCP : IPortableExecutableCheck, IPathCheck + public class XCP : IPathCheck, IPortableExecutableCheck { /// public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)