Skip to content

Commit 45661f3

Browse files
mnadareskimnadareski
authored
Merge pull request #2 from mnadareski/reorg
Reorganization and Update
2 parents 9e48368 + c7a9485 commit 45661f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+3794
-1310
lines changed

‎BurnOutSharp.sln

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27703.2026
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29306.81
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BurnOutSharp", "BurnOutSharp\BurnOutSharp.csproj", "{1DA4212E-6071-4951-B45D-BB74A7838246}"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{88735BA2-778D-4192-8EB2-FFF6843719E2}"
99
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{68D10531-99CB-40B1-8912-73FA286C9433}"
11+
ProjectSection(SolutionItems) = preProject
12+
README.md = README.md
13+
EndProjectSection
14+
EndProject
1015
Global
1116
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1217
Debug|Any CPU = Debug|Any CPU

‎BurnOutSharp/BurnOutSharp.csproj

Lines changed: 21 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,27 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{1DA4212E-6071-4951-B45D-BB74A7838246}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>BurnOutSharp</RootNamespace>
11-
<AssemblyName>BurnOutSharp</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
4+
<TargetFrameworks>net462;net472;netcoreapp3.0</TargetFrameworks>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
146
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
32-
<ItemGroup>
33-
<Reference Include="LessIO, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\packages\LessIO.0.5.0\lib\net40\LessIO.dll</HintPath>
35-
</Reference>
36-
<Reference Include="libmspackn, Version=0.8.0.0, Culture=neutral, processorArchitecture=x86">
37-
<HintPath>..\packages\libmspack4n.0.8.0\lib\net40\libmspackn.dll</HintPath>
38-
</Reference>
39-
<Reference Include="System" />
40-
<Reference Include="System.Core" />
41-
<Reference Include="System.Xml.Linq" />
42-
<Reference Include="System.Data.DataSetExtensions" />
43-
<Reference Include="Microsoft.CSharp" />
44-
<Reference Include="System.Data" />
45-
<Reference Include="System.Net.Http" />
46-
<Reference Include="System.Xml" />
47-
<Reference Include="UnshieldSharp, Version=1.4.2.2, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\UnshieldSharp.1.4.2.2\lib\net461\UnshieldSharp.dll</HintPath>
49-
</Reference>
50-
<Reference Include="zlib.net, Version=1.0.3.0, Culture=neutral, PublicKeyToken=47d7877cb3620160">
51-
<HintPath>..\packages\zlib.net.1.0.4.0\lib\zlib.net.dll</HintPath>
52-
</Reference>
53-
</ItemGroup>
7+
548
<ItemGroup>
55-
<Compile Include="CaseInsensitiveDictionary.cs" />
56-
<Compile Include="EVORE.cs" />
57-
<Compile Include="FileProtection.cs" />
58-
<Compile Include="Properties\AssemblyInfo.cs" />
59-
<Compile Include="ProtectionFind.cs" />
9+
<None Include="BurnOutSharp.nuspec" />
6010
</ItemGroup>
11+
6112
<ItemGroup>
62-
<None Include="BurnOutSharp.nuspec" />
63-
<None Include="packages.config" />
13+
<PackageReference Include="LessIO">
14+
<Version>0.6.16</Version>
15+
</PackageReference>
16+
<PackageReference Include="libmspack4n">
17+
<Version>0.9.10</Version>
18+
</PackageReference>
19+
<PackageReference Include="UnshieldSharp">
20+
<Version>1.4.2.3</Version>
21+
</PackageReference>
22+
<PackageReference Include="zlib.net">
23+
<Version>1.0.4</Version>
24+
</PackageReference>
6425
</ItemGroup>
65-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
66-
</Project>
26+
27+
</Project>

‎BurnOutSharp/BurnOutSharp.nuspec

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,28 @@
22
<package >
33
<metadata>
44
<id>BurnOutSharp</id>
5-
<version>1.03.7.1</version>
5+
<version>1.03.8.0</version>
66
<title>BurnOutSharp</title>
77
<authors>Matt Nadareski, Gernot Knippen</authors>
88
<owners>Matt Nadareski, Gernot Knippen</owners>
99
<licenseUrl>https://www.gnu.org/licenses/gpl-3.0.txt</licenseUrl>
1010
<projectUrl>https://github.com/mnadareski/BurnOutSharp</projectUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>Port of BurnOut to C#, with additions</description>
13-
<copyright>Copyright (c)2005-2010 Gernot Knippen, Copyright (c)2018 Matt Nadareski</copyright>
13+
<copyright>Copyright (c)2005-2010 Gernot Knippen, Copyright (c)2018-2019 Matt Nadareski</copyright>
1414
<tags>protection scan burnout</tags>
1515
<dependencies>
1616
<dependency id="LessIO" version="0.5.0" />
1717
<dependency id="libmspack4n" version="0.8.0" />
18-
<dependency id="UnshieldSharp" version="1.4.2.2" />
18+
<dependency id="UnshieldSharp" version="1.4.2.3" />
1919
</dependencies>
2020
</metadata>
2121
<files>
22-
<file src="bin\Debug\BurnOutSharp.dll" target="lib\net461\BurnOutSharp.dll" />
23-
<file src="bin\Debug\BurnOutSharp.pdb" target="lib\net461\BurnOutSharp.pdb" />
22+
<file src="bin\Debug\net462\BurnOutSharp.dll" target="lib\net462\BurnOutSharp.dll" />
23+
<file src="bin\Debug\net462\BurnOutSharp.pdb" target="lib\net462\BurnOutSharp.pdb" />
24+
<file src="bin\Debug\net472\BurnOutSharp.dll" target="lib\net472\BurnOutSharp.dll" />
25+
<file src="bin\Debug\net472\BurnOutSharp.pdb" target="lib\net472\BurnOutSharp.pdb" />
26+
<file src="bin\Debug\netcoreapp3.0\BurnOutSharp.dll" target="lib\netcoreapp3.0\BurnOutSharp.dll" />
27+
<file src="bin\Debug\netcoreapp3.0\BurnOutSharp.pdb" target="lib\netcoreapp3.0\BurnOutSharp.pdb" />
2428
</files>
2529
</package>

‎BurnOutSharp/CaseInsensitiveDictionary.cs

Lines changed: 0 additions & 95 deletions
This file was deleted.

‎BurnOutSharp/EVORE.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ private struct Section
3737

3838
private static Process StartSafe(string file)
3939
{
40+
if (file == null)
41+
return null;
42+
4043
Process startingprocess = new Process();
4144
startingprocess.StartInfo.FileName = file;
4245
startingprocess.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
@@ -56,6 +59,9 @@ private static Process StartSafe(string file)
5659

5760
private static string MakeTempFile(string file, string sExtension = ".exe")
5861
{
62+
if (file == null)
63+
return string.Empty;
64+
5965
FileInfo filei = new FileInfo(file);
6066
try
6167
{
@@ -69,6 +75,9 @@ private static string MakeTempFile(string file, string sExtension = ".exe")
6975

7076
private static bool IsEXE(string file)
7177
{
78+
if (file == null)
79+
return false;
80+
7281
BinaryReader breader = new BinaryReader(File.OpenRead(file));
7382
breader.ReadBytes(60);
7483
int PEHeaderOffset = breader.ReadInt32();
@@ -85,6 +94,9 @@ private static bool IsEXE(string file)
8594

8695
private static string[] CopyDependentDlls(string exefile)
8796
{
97+
if (exefile == null)
98+
return null;
99+
88100
FileInfo fiExe = new FileInfo(exefile);
89101
Section[] sections = ReadSections(exefile);
90102
BinaryReader breader = new BinaryReader(File.OpenRead(exefile), Encoding.Default);
@@ -141,6 +153,9 @@ private static string[] CopyDependentDlls(string exefile)
141153

142154
private static Section[] ReadSections(string exefile)
143155
{
156+
if (exefile == null)
157+
return null;
158+
144159
BinaryReader breader = new BinaryReader(File.OpenRead(exefile));
145160
breader.ReadBytes(60);
146161
uint PEHeaderOffset = breader.ReadUInt32();
@@ -184,6 +199,9 @@ private static uint RVA2Offset(uint RVA, Section[] sections)
184199

185200
public static string SearchProtectDiscVersion(string file)
186201
{
202+
if (file == null)
203+
return string.Empty;
204+
187205
Process exe = new Process();
188206
Process[] processes = new Process[0];
189207
string version = "";
@@ -339,6 +357,9 @@ public static string SearchProtectDiscVersion(string file)
339357

340358
public static string SearchSafeDiscVersion(string file)
341359
{
360+
if (file == null)
361+
return string.Empty;
362+
342363
Process exe = new Process();
343364
string version = "";
344365
DateTime timestart;

0 commit comments

Comments
 (0)