Skip to content

Reorganization and Update #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Oct 1, 2019
Merged

Reorganization and Update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5500867
Separate protections into their own classes
mnadareski Sep 28, 2019
5a2755d
Consistent comments
mnadareski Sep 28, 2019
2938033
Remove unused class
mnadareski Sep 28, 2019
c109ace
Update nuspec
mnadareski Sep 28, 2019
ca0d695
Else-If causes some issues
mnadareski Sep 28, 2019
5ffaedc
Keep path scanning on individual files, for now
mnadareski Sep 29, 2019
fd86646
Fix test program output
mnadareski Sep 29, 2019
4b1cae2
Filename is no longer expected
mnadareski Sep 30, 2019
392f9da
Fix build
mnadareski Sep 30, 2019
cfcb608
Update all to 4.7.2
mnadareski Sep 30, 2019
44922a1
Fix encoding issue, add note
mnadareski Sep 30, 2019
b8bbc0b
Update packages
mnadareski Sep 30, 2019
9422ba0
Remove backups
mnadareski Sep 30, 2019
c7a9485
Update all
mnadareski Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions BurnOutSharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2026
# Visual Studio Version 16
VisualStudioVersion = 16.0.29306.81
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BurnOutSharp", "BurnOutSharp\BurnOutSharp.csproj", "{1DA4212E-6071-4951-B45D-BB74A7838246}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{88735BA2-778D-4192-8EB2-FFF6843719E2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{68D10531-99CB-40B1-8912-73FA286C9433}"
ProjectSection(SolutionItems) = preProject
README.md = README.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
81 changes: 21 additions & 60 deletions BurnOutSharp/BurnOutSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,66 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1DA4212E-6071-4951-B45D-BB74A7838246}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BurnOutSharp</RootNamespace>
<AssemblyName>BurnOutSharp</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworks>net462;net472;netcoreapp3.0</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="LessIO, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LessIO.0.5.0\lib\net40\LessIO.dll</HintPath>
</Reference>
<Reference Include="libmspackn, Version=0.8.0.0, Culture=neutral, processorArchitecture=x86">
<HintPath>..\packages\libmspack4n.0.8.0\lib\net40\libmspackn.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="UnshieldSharp, Version=1.4.2.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UnshieldSharp.1.4.2.2\lib\net461\UnshieldSharp.dll</HintPath>
</Reference>
<Reference Include="zlib.net, Version=1.0.3.0, Culture=neutral, PublicKeyToken=47d7877cb3620160">
<HintPath>..\packages\zlib.net.1.0.4.0\lib\zlib.net.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
<Compile Include="CaseInsensitiveDictionary.cs" />
<Compile Include="EVORE.cs" />
<Compile Include="FileProtection.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ProtectionFind.cs" />
<None Include="BurnOutSharp.nuspec" />
</ItemGroup>

<ItemGroup>
<None Include="BurnOutSharp.nuspec" />
<None Include="packages.config" />
<PackageReference Include="LessIO">
<Version>0.6.16</Version>
</PackageReference>
<PackageReference Include="libmspack4n">
<Version>0.9.10</Version>
</PackageReference>
<PackageReference Include="UnshieldSharp">
<Version>1.4.2.3</Version>
</PackageReference>
<PackageReference Include="zlib.net">
<Version>1.0.4</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

</Project>
14 changes: 9 additions & 5 deletions BurnOutSharp/BurnOutSharp.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,28 @@
<package >
<metadata>
<id>BurnOutSharp</id>
<version>1.03.7.1</version>
<version>1.03.8.0</version>
<title>BurnOutSharp</title>
<authors>Matt Nadareski, Gernot Knippen</authors>
<owners>Matt Nadareski, Gernot Knippen</owners>
<licenseUrl>https://www.gnu.org/licenses/gpl-3.0.txt</licenseUrl>
<projectUrl>https://github.com/mnadareski/BurnOutSharp</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Port of BurnOut to C#, with additions</description>
<copyright>Copyright (c)2005-2010 Gernot Knippen, Copyright (c)2018 Matt Nadareski</copyright>
<copyright>Copyright (c)2005-2010 Gernot Knippen, Copyright (c)2018-2019 Matt Nadareski</copyright>
<tags>protection scan burnout</tags>
<dependencies>
<dependency id="LessIO" version="0.5.0" />
<dependency id="libmspack4n" version="0.8.0" />
<dependency id="UnshieldSharp" version="1.4.2.2" />
<dependency id="UnshieldSharp" version="1.4.2.3" />
</dependencies>
</metadata>
<files>
<file src="bin\Debug\BurnOutSharp.dll" target="lib\net461\BurnOutSharp.dll" />
<file src="bin\Debug\BurnOutSharp.pdb" target="lib\net461\BurnOutSharp.pdb" />
<file src="bin\Debug\net462\BurnOutSharp.dll" target="lib\net462\BurnOutSharp.dll" />
<file src="bin\Debug\net462\BurnOutSharp.pdb" target="lib\net462\BurnOutSharp.pdb" />
<file src="bin\Debug\net472\BurnOutSharp.dll" target="lib\net472\BurnOutSharp.dll" />
<file src="bin\Debug\net472\BurnOutSharp.pdb" target="lib\net472\BurnOutSharp.pdb" />
<file src="bin\Debug\netcoreapp3.0\BurnOutSharp.dll" target="lib\netcoreapp3.0\BurnOutSharp.dll" />
<file src="bin\Debug\netcoreapp3.0\BurnOutSharp.pdb" target="lib\netcoreapp3.0\BurnOutSharp.pdb" />
</files>
</package>
95 changes: 0 additions & 95 deletions BurnOutSharp/CaseInsensitiveDictionary.cs
View file
Open in desktop

This file was deleted.

21 changes: 21 additions & 0 deletions BurnOutSharp/EVORE.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ private struct Section

private static Process StartSafe(string file)
{
if (file == null)
return null;

Process startingprocess = new Process();
startingprocess.StartInfo.FileName = file;
startingprocess.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
Expand All @@ -56,6 +59,9 @@ private static Process StartSafe(string file)

private static string MakeTempFile(string file, string sExtension = ".exe")
{
if (file == null)
return string.Empty;

FileInfo filei = new FileInfo(file);
try
{
Expand All @@ -69,6 +75,9 @@ private static string MakeTempFile(string file, string sExtension = ".exe")

private static bool IsEXE(string file)
{
if (file == null)
return false;

BinaryReader breader = new BinaryReader(File.OpenRead(file));
breader.ReadBytes(60);
int PEHeaderOffset = breader.ReadInt32();
Expand All @@ -85,6 +94,9 @@ private static bool IsEXE(string file)

private static string[] CopyDependentDlls(string exefile)
{
if (exefile == null)
return null;

FileInfo fiExe = new FileInfo(exefile);
Section[] sections = ReadSections(exefile);
BinaryReader breader = new BinaryReader(File.OpenRead(exefile), Encoding.Default);
Expand Down Expand Up @@ -141,6 +153,9 @@ private static string[] CopyDependentDlls(string exefile)

private static Section[] ReadSections(string exefile)
{
if (exefile == null)
return null;

BinaryReader breader = new BinaryReader(File.OpenRead(exefile));
breader.ReadBytes(60);
uint PEHeaderOffset = breader.ReadUInt32();
Expand Down Expand Up @@ -184,6 +199,9 @@ private static uint RVA2Offset(uint RVA, Section[] sections)

public static string SearchProtectDiscVersion(string file)
{
if (file == null)
return string.Empty;

Process exe = new Process();
Process[] processes = new Process[0];
string version = "";
Expand Down Expand Up @@ -339,6 +357,9 @@ public static string SearchProtectDiscVersion(string file)

public static string SearchSafeDiscVersion(string file)
{
if (file == null)
return string.Empty;

Process exe = new Process();
string version = "";
DateTime timestart;
Expand Down
Loading